Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
5aea0ef461
@ -17865,6 +17865,11 @@
|
||||
githubId = 7439756;
|
||||
name = "Rowan Goemans";
|
||||
};
|
||||
roydubnium = {
|
||||
github = "RoyDubnium";
|
||||
githubId = 72664566;
|
||||
name = "Roy Davison";
|
||||
};
|
||||
royneary = {
|
||||
email = "christian@ulrich.earth";
|
||||
github = "royneary";
|
||||
|
||||
@ -11,13 +11,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fulcrum";
|
||||
version = "1.10.0";
|
||||
version = "1.11.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cculianu";
|
||||
repo = "Fulcrum";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-HTyOlbrmZHN2MbG70auGkuPPo3fTN/oCHi6Lwnq+gKk=";
|
||||
sha256 = "sha256-VY6yUdmU8MLwSH3VeAWCGbdouOxGrhDc1usYj70jrd8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config qmake ];
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
, python3
|
||||
, vala
|
||||
, intltool
|
||||
, autoreconfHook
|
||||
, wrapGAppsHook3
|
||||
, cinnamon
|
||||
, lightdm
|
||||
@ -22,20 +22,20 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lightdm-slick-greeter";
|
||||
version = "2.0.3";
|
||||
version = "2.0.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxmint";
|
||||
repo = "slick-greeter";
|
||||
rev = version;
|
||||
sha256 = "sha256-ROOCxOjqJ8dTZjfQpjmE9oDQJzt6QFVVf3nrJ26mFU8=";
|
||||
sha256 = "sha256-1UOODak5YkoMLdIkN1rBIrlr3Zjj5SS2yx90vmF1prA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
vala
|
||||
intltool
|
||||
autoreconfHook
|
||||
wrapGAppsHook3
|
||||
python3
|
||||
python3.pkgs.wrapPython
|
||||
@ -58,43 +58,28 @@ stdenv.mkDerivation rec {
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace src/slick-greeter.vala \
|
||||
--replace "/usr/bin/numlockx" "${numlockx}/bin/numlockx" \
|
||||
--replace "/usr/share/xsessions/" "/run/current-system/sw/share/xsessions/" \
|
||||
--replace "/usr/share/wayland-sessions/" "/run/current-system/sw/share/wayland-sessions/" \
|
||||
--replace "/usr/bin/slick-greeter" "${placeholder "out"}/bin/slick-greeter"
|
||||
--replace-fail "/usr/bin/numlockx" "${numlockx}/bin/numlockx" \
|
||||
--replace-fail "/usr/share/xsessions/" "/run/current-system/sw/share/xsessions/" \
|
||||
--replace-fail "/usr/share/wayland-sessions/" "/run/current-system/sw/share/wayland-sessions/" \
|
||||
--replace-fail "/usr/bin/slick-greeter" "${placeholder "out"}/bin/slick-greeter"
|
||||
|
||||
substituteInPlace src/session-list.vala \
|
||||
--replace "/usr/share" "${placeholder "out"}/share"
|
||||
--replace-fail "/usr/share" "${placeholder "out"}/share"
|
||||
|
||||
# We prefer stable path here.
|
||||
substituteInPlace data/x.dm.slick-greeter.gschema.xml \
|
||||
--replace "/usr/share/onboard" "/run/current-system/sw/share/onboard"
|
||||
--replace-fail "/usr/share/onboard" "/run/current-system/sw/share/onboard"
|
||||
|
||||
patchShebangs files/usr/bin/*
|
||||
'';
|
||||
|
||||
preAutoreconf = ''
|
||||
# intltoolize fails during autoreconfPhase unless this
|
||||
# directory is created manually.
|
||||
mkdir m4
|
||||
'';
|
||||
|
||||
configureFlags = [
|
||||
"--localstatedir=/var"
|
||||
"--sysconfdir=/etc"
|
||||
mesonFlags = [
|
||||
"--sbindir=${placeholder "out"}/bin"
|
||||
];
|
||||
|
||||
installFlags = [
|
||||
"localstatedir=\${TMPDIR}"
|
||||
"sysconfdir=${placeholder "out"}/etc"
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
substituteInPlace "$out/share/xgreeters/slick-greeter.desktop" \
|
||||
--replace "Exec=slick-greeter" "Exec=$out/bin/slick-greeter"
|
||||
|
||||
cp -r files/usr/* $out
|
||||
--replace-fail "Exec=slick-greeter" "Exec=$out/bin/slick-greeter"
|
||||
'';
|
||||
|
||||
preFixup = ''
|
||||
|
||||
@ -17406,5 +17406,16 @@ final: prev:
|
||||
meta.homepage = "https://github.com/declancm/cinnamon.nvim";
|
||||
};
|
||||
|
||||
cmp-ai = buildVimPlugin {
|
||||
pname = "cmp-ai";
|
||||
version = "2024-06-02";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tzachar";
|
||||
repo = "cmp-ai";
|
||||
rev = "2b787129314c5fb8bfd41a6919d4889210e6b265";
|
||||
sha256 = "sha256-ul2X6kIdreJ9dCQERw7C3l2dss7Mtcwtm7CGhAxjjvY=";
|
||||
};
|
||||
meta.homepage = "https://github.com/tzachar/cmp-ai/";
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
@ -215,6 +215,10 @@
|
||||
'';
|
||||
};
|
||||
|
||||
cmp-ai = super.cmp-ai.overrideAttrs {
|
||||
dependencies = with self; [ nvim-cmp plenary-nvim ];
|
||||
};
|
||||
|
||||
cmp-clippy = super.cmp-clippy.overrideAttrs {
|
||||
dependencies = with self; [ nvim-cmp plenary-nvim ];
|
||||
};
|
||||
|
||||
@ -131,6 +131,7 @@ https://github.com/laytan/cloak.nvim/,HEAD,
|
||||
https://github.com/asheq/close-buffers.vim/,HEAD,
|
||||
https://github.com/Civitasv/cmake-tools.nvim/,,
|
||||
https://github.com/winston0410/cmd-parser.nvim/,,
|
||||
https://github.com/tzachar/cmp-ai/,HEAD,
|
||||
https://codeberg.org/FelipeLema/cmp-async-path/,,
|
||||
https://github.com/crispgm/cmp-beancount/,HEAD,
|
||||
https://github.com/hrsh7th/cmp-buffer/,,
|
||||
@ -304,7 +305,6 @@ https://github.com/konfekt/fastfold/,,
|
||||
https://github.com/lilydjwg/fcitx.vim/,fcitx5,
|
||||
https://github.com/freddiehaddad/feline.nvim/,,
|
||||
https://github.com/bakpakin/fennel.vim/,,
|
||||
https://github.com/lambdalisue/vim-fern,,
|
||||
https://github.com/wincent/ferret/,,
|
||||
https://github.com/j-hui/fidget.nvim/,,
|
||||
https://github.com/bogado/file-line/,,
|
||||
@ -1096,6 +1096,7 @@ https://github.com/tpope/vim-eunuch/,,
|
||||
https://github.com/tommcdo/vim-exchange/,,
|
||||
https://github.com/terryma/vim-expand-region/,,
|
||||
https://github.com/int3/vim-extradite/,,
|
||||
https://github.com/lambdalisue/vim-fern/,,
|
||||
https://github.com/wsdjeg/vim-fetch/,,
|
||||
https://github.com/fadein/vim-figlet/,HEAD,
|
||||
https://github.com/tpope/vim-fireplace/,,
|
||||
|
||||
@ -406,8 +406,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "vscode-neovim";
|
||||
publisher = "asvetliakov";
|
||||
version = "1.14.1";
|
||||
hash = "sha256-taO9jxNC4mvli08Gbl8oO70T+RkfZkztoVZYWeVY4Bs=";
|
||||
version = "1.15.2";
|
||||
hash = "sha256-gurh2DSLH/gM/EZCUACHGlzOf0LPwkc+zYxw7AOcb1E=";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/asvetliakov.vscode-neovim/changelog";
|
||||
|
||||
@ -12,8 +12,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "typst-preview";
|
||||
publisher = "mgt19937";
|
||||
version = "0.11.6";
|
||||
hash = "sha256-8//6eUzMg5AX9NNQm5mzNGlOG50Cxl0Rt1+dPq0J2DU=";
|
||||
version = "0.11.7";
|
||||
hash = "sha256-70dVGoSBDKCtvn7xiC/gAh4OQ8nNDiI/M900r2zlOfU=";
|
||||
};
|
||||
|
||||
buildInputs = [ typst-preview ];
|
||||
|
||||
@ -4,6 +4,7 @@
|
||||
, cmake
|
||||
, corrosion
|
||||
, extra-cmake-modules
|
||||
, fetchpatch2
|
||||
, futuresql
|
||||
, kconfig
|
||||
, kcoreaddons
|
||||
@ -30,6 +31,14 @@
|
||||
mkDerivation rec {
|
||||
pname = "angelfish";
|
||||
|
||||
patches = [
|
||||
(fetchpatch2 {
|
||||
name = "fix-build-with-corrosion-0.5.patch";
|
||||
url = "https://invent.kde.org/network/angelfish/-/commit/b04928e3b62a11b647622b81fb67b7c0db656ac8.patch";
|
||||
hash = "sha256-9rpkMKQKrvGJFIQDwSIeeZyk4/vd348r660mBOKzM2E=";
|
||||
})
|
||||
];
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
# include version in the name so we invalidate the FOD
|
||||
name = "${pname}-${srcs.angelfish.version}";
|
||||
|
||||
@ -70,9 +70,9 @@ rec {
|
||||
|
||||
nomad_1_6 = generic {
|
||||
buildGoModule = buildGo121Module;
|
||||
version = "1.6.8";
|
||||
sha256 = "sha256-lc/HZgyzqWZNW2WHOFZ43gCeL5Y2hwK4lXPgWGboPOY=";
|
||||
vendorHash = "sha256-ecLhq4OHDhA1Bd/97NMpfePqtuCtVje3BdvCzcwWzas=";
|
||||
version = "1.6.10";
|
||||
sha256 = "sha256-kiMdpJzjF0S7lrTX3sBFkWm0Gac9a+qlwCPcMKeVXXQ=";
|
||||
vendorHash = "sha256-qnsPPV/NWTrqUa1v1CL16WfCH7B0zW9ZSnEmtqvotqI=";
|
||||
license = lib.licenses.mpl20;
|
||||
passthru.tests.nomad = nixosTests.nomad;
|
||||
preCheck = ''
|
||||
|
||||
@ -25,13 +25,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "freedv";
|
||||
version = "1.9.9.1";
|
||||
version = "1.9.9.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "drowe67";
|
||||
repo = "freedv-gui";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-i0SVu3txC+JUp0P6cFlmn/66lOmii7JMGIvc43nZoOE=";
|
||||
hash = "sha256-oFuAH81mduiSQGIDgDDy1IPskqqCBmfWbpqQstUIw9g=";
|
||||
};
|
||||
|
||||
postPatch = lib.optionalString stdenv.isDarwin ''
|
||||
|
||||
@ -23,15 +23,15 @@
|
||||
, xorg
|
||||
}:
|
||||
let
|
||||
id = "154421934";
|
||||
id = "168727396";
|
||||
in
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "multiviewer-for-f1";
|
||||
version = "1.31.3";
|
||||
version = "1.32.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://releases.multiviewer.dev/download/${id}/multiviewer-for-f1_${version}_amd64.deb";
|
||||
sha256 = "sha256-lFES+ukkI/GqKQdZwtaB+ov0hqAyFZ2N533LBKJ9oXg=";
|
||||
sha256 = "sha256-cnfye5c3+ZYZLjlZ6F4OD90tXhxDbgbNBn98mgmZ+Hs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -8,13 +8,13 @@
|
||||
}:
|
||||
buildGoModule rec {
|
||||
pname = "artalk";
|
||||
version = "2.8.6";
|
||||
version = "2.8.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ArtalkJS";
|
||||
repo = "artalk";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-ya/by1PaWdYS/Fsbu6wDKuUcPy55/2F5hJEqko4K57o=";
|
||||
hash = "sha256-fOuZiFomXGvRUXkpEM3BpJyMOtSm6/RHd0a7dPOsoT4=";
|
||||
};
|
||||
web = fetchurl {
|
||||
url = "https://github.com/${src.owner}/${src.repo}/releases/download/v${version}/artalk_ui.tar.gz";
|
||||
@ -23,7 +23,7 @@ buildGoModule rec {
|
||||
|
||||
CGO_ENABLED = 1;
|
||||
|
||||
vendorHash = "sha256-R4/keVGCpCZfLrb2OrK9vdK+N+VKFLAvFXEOA1feqKo=";
|
||||
vendorHash = "sha256-Hm388ub/ja3PuSRqPkr6A+pgKUQ+czMj1WKU8W8H5wI=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
37
pkgs/by-name/cl/clang-tidy-sarif/package.nix
Normal file
37
pkgs/by-name/cl/clang-tidy-sarif/package.nix
Normal file
@ -0,0 +1,37 @@
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
rustPlatform,
|
||||
clang-tidy-sarif,
|
||||
testers,
|
||||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "clang-tidy-sarif";
|
||||
version = "0.4.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "psastras";
|
||||
repo = "sarif-rs";
|
||||
rev = "clang-tidy-sarif-v${version}";
|
||||
hash = "sha256-EzWzDeIeSJ11CVcVyAhMjYQJcKHnieRrFkULc5eXAno=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-NzdgfHRDgLB6sMhBflk9rACEocLP23KlZL22iAfBfh8=";
|
||||
cargoBuildFlags = [
|
||||
"--package"
|
||||
"clang-tidy-sarif"
|
||||
];
|
||||
cargoTestFlags = cargoBuildFlags;
|
||||
|
||||
passthru = {
|
||||
tests.version = testers.testVersion { package = clang-tidy-sarif; };
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "A CLI tool to convert clang-tidy diagnostics into SARIF";
|
||||
mainProgram = "clang-tidy-sarif";
|
||||
homepage = "https://psastras.github.io/sarif-rs";
|
||||
maintainers = with lib.maintainers; [ getchoo ];
|
||||
license = lib.licenses.mit;
|
||||
};
|
||||
}
|
||||
@ -9,13 +9,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "git-toolbelt";
|
||||
version = "1.9.1";
|
||||
version = "1.9.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nvie";
|
||||
repo = "git-toolbelt";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-lrVMSItA0Eo7DgB+QjOLPPxwMLaC9+6FNPrhw6pkpKA=";
|
||||
hash = "sha256-0abO3AYpN6TKYFtrK9lP5k57qWI7ByumaO/5dgKDqQc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
39
pkgs/by-name/go/go-symbols/package.nix
Normal file
39
pkgs/by-name/go/go-symbols/package.nix
Normal file
@ -0,0 +1,39 @@
|
||||
{
|
||||
lib,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "go-symbols";
|
||||
version = "0.1.1";
|
||||
|
||||
vendorHash = "sha256-8unWnxTQzPY8tKBtss9qQG+ksWyheKxKRlg65F0vWWU=";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "acroca";
|
||||
repo = "go-symbols";
|
||||
rev = "v${version}";
|
||||
sha256 = "0yyzw6clndb2r5j9isyd727njs98zzp057v314vfvknsm8g7hqrz";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Migrate to Go modules
|
||||
(fetchpatch {
|
||||
url = "https://github.com/acroca/go-symbols/commit/414c2283696b50fc5009055e5bc2590ce45f4400.patch";
|
||||
hash = "sha256-9lndJhyN8eaovjQlfSRGP8lC4F+pAXUoR2AvYvhSx2U=";
|
||||
})
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "A utility for extracting a JSON representation of the package symbols from a go source tree";
|
||||
mainProgram = "go-symbols";
|
||||
homepage = "https://github.com/acroca/go-symbols";
|
||||
maintainers = with lib.maintainers; [
|
||||
luftmensch-luftmensch
|
||||
vdemeester
|
||||
];
|
||||
license = lib.licenses.mit;
|
||||
};
|
||||
}
|
||||
37
pkgs/by-name/ha/hadolint-sarif/package.nix
Normal file
37
pkgs/by-name/ha/hadolint-sarif/package.nix
Normal file
@ -0,0 +1,37 @@
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
rustPlatform,
|
||||
hadolint-sarif,
|
||||
testers,
|
||||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "hadolint-sarif";
|
||||
version = "0.4.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "psastras";
|
||||
repo = "sarif-rs";
|
||||
rev = "hadolint-sarif-v${version}";
|
||||
hash = "sha256-EzWzDeIeSJ11CVcVyAhMjYQJcKHnieRrFkULc5eXAno=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-AMRL1XANyze8bJe3fdgZvBnl/NyuWP13jixixqiPmiw=";
|
||||
cargoBuildFlags = [
|
||||
"--package"
|
||||
"hadolint-sarif"
|
||||
];
|
||||
cargoTestFlags = cargoBuildFlags;
|
||||
|
||||
passthru = {
|
||||
tests.version = testers.testVersion { package = hadolint-sarif; };
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "A CLI tool to convert hadolint diagnostics into SARIF";
|
||||
homepage = "https://psastras.github.io/sarif-rs";
|
||||
mainProgram = "hadolint-sarif";
|
||||
maintainers = with lib.maintainers; [ getchoo ];
|
||||
license = lib.licenses.mit;
|
||||
};
|
||||
}
|
||||
@ -6,7 +6,7 @@
|
||||
}:
|
||||
buildGoModule {
|
||||
pname = "hexxy";
|
||||
version = "0-unstable-2024-02-24";
|
||||
version = "0-unstable-2024-02-23";
|
||||
src = fetchFromGitHub {
|
||||
owner = "sweetbbak";
|
||||
repo = "hexxy";
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
|
||||
let
|
||||
pname = "lefthook";
|
||||
version = "1.6.14";
|
||||
version = "1.6.15";
|
||||
in
|
||||
buildGoModule {
|
||||
inherit pname version;
|
||||
@ -15,10 +15,10 @@ buildGoModule {
|
||||
owner = "evilmartians";
|
||||
repo = "lefthook";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-forbMU7KiPWtO79XMAuckt5wzJFQehqAZ5IYNv6Tr7I=";
|
||||
hash = "sha256-Pc4m4T/+hABX3eGgni12EC8lD9xl5j/eALhfuSVbEJc=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-M5lIfgUYMwLJu5NB54aZLofEegZiW+AUoSaVOul1ud8=";
|
||||
vendorHash = "sha256-ralnfqrP6R58Wjc/AWRf1motWZICPagZxHCkqVcwYoo=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
60
pkgs/by-name/ma/maven/package.nix
Normal file
60
pkgs/by-name/ma/maven/package.nix
Normal file
@ -0,0 +1,60 @@
|
||||
{
|
||||
lib,
|
||||
callPackage,
|
||||
fetchurl,
|
||||
jdk,
|
||||
makeWrapper,
|
||||
stdenvNoCC,
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "apache-maven";
|
||||
version = "3.9.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://apache/maven/maven-3/${finalAttrs.version}/binaries/apache-maven-${finalAttrs.version}-bin.tar.gz";
|
||||
hash = "sha256-bu3SyuNibWrTpcnuMkvSZYU9ZCl/B/AzQwdVvQ4MOks=";
|
||||
};
|
||||
|
||||
sourceRoot = ".";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/maven
|
||||
cp -r apache-maven-${finalAttrs.version}/* $out/maven
|
||||
|
||||
makeWrapper $out/maven/bin/mvn $out/bin/mvn \
|
||||
--set-default JAVA_HOME "${jdk}"
|
||||
makeWrapper $out/maven/bin/mvnDebug $out/bin/mvnDebug \
|
||||
--set-default JAVA_HOME "${jdk}"
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
buildMaven = callPackage ./build-maven.nix {
|
||||
maven = finalAttrs.finalPackage;
|
||||
};
|
||||
buildMavenPackage = callPackage ./build-maven-package.nix {
|
||||
maven = finalAttrs.finalPackage;
|
||||
};
|
||||
};
|
||||
|
||||
meta = {
|
||||
homepage = "https://maven.apache.org/";
|
||||
description = "Build automation tool (used primarily for Java projects)";
|
||||
longDescription = ''
|
||||
Apache Maven is a software project management and comprehension
|
||||
tool. Based on the concept of a project object model (POM), Maven can
|
||||
manage a project's build, reporting and documentation from a central piece
|
||||
of information.
|
||||
'';
|
||||
license = lib.licenses.asl20;
|
||||
mainProgram = "mvn";
|
||||
maintainers = with lib.maintainers; [ cko ];
|
||||
inherit (jdk.meta) platforms;
|
||||
};
|
||||
})
|
||||
@ -5,16 +5,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "okolors";
|
||||
version = "0.5.1";
|
||||
version = "0.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Ivordir";
|
||||
repo = "Okolors";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Cwe6kyhsCU3wbuD0PTnj1JQOnMjH+sLmG5AiJImRGSU=";
|
||||
sha256 = "sha256-xroiiDTm3B2sVC1sO7oe3deqh+j3URmiy/ctwqrvvkI=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-RVUrgz/YddT41N1omoPCW3Cjz7IWjc8sB7OwkCUDjM8=";
|
||||
cargoHash = "sha256-Ru7VZM+vLGkYeLqWilQvpWUnbNZqkJHn1D/Vo/KUmRk=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Generate a color palette from an image using k-means clustering in the Oklab color space";
|
||||
|
||||
@ -213,6 +213,6 @@ goBuild ((lib.optionalAttrs enableRocm {
|
||||
license = licenses.mit;
|
||||
platforms = platforms.unix;
|
||||
mainProgram = "ollama";
|
||||
maintainers = with maintainers; [ abysssol dit7ya elohmeier ];
|
||||
maintainers = with maintainers; [ abysssol dit7ya elohmeier roydubnium ];
|
||||
};
|
||||
})
|
||||
|
||||
@ -2,64 +2,77 @@
|
||||
, fetchFromGitHub
|
||||
, lib
|
||||
, llvmPackages_17
|
||||
, callPackage
|
||||
, cubeb
|
||||
, curl
|
||||
, extra-cmake-modules
|
||||
, fetchpatch
|
||||
, ffmpeg
|
||||
, libaio
|
||||
, libbacktrace
|
||||
, libpcap
|
||||
, libwebp
|
||||
, libXrandr
|
||||
, libzip
|
||||
, lz4
|
||||
, makeWrapper
|
||||
, pkg-config
|
||||
, qtbase
|
||||
, qtsvg
|
||||
, qttools
|
||||
, qtwayland
|
||||
, qt6
|
||||
, SDL2
|
||||
, soundtouch
|
||||
, strip-nondeterminism
|
||||
, vulkan-headers
|
||||
, vulkan-loader
|
||||
, wayland
|
||||
, wrapQtAppsHook
|
||||
, xz
|
||||
, zip
|
||||
, zstd
|
||||
}:
|
||||
|
||||
let
|
||||
shaderc-patched = callPackage ./shaderc-patched.nix { };
|
||||
# The pre-zipped files in releases don't have a versioned link, we need to zip them ourselves
|
||||
pcsx2_patches = fetchFromGitHub {
|
||||
owner = "PCSX2";
|
||||
repo = "pcsx2_patches";
|
||||
rev = "e3b354f144de71d2b87471166cca8911867c1dfd";
|
||||
sha256 = "sha256-H7cFyBYZumcCZ0/FFOFZoChoi0XPs4siA4dHcFt9U7k=";
|
||||
rev = "b3a788e16ea12efac006cbbe1ece45b6b9b34326";
|
||||
sha256 = "sha256-Uvpz2Gpj533Sr6wLruubZxssoXefQDey8GHIDKWhW3s=";
|
||||
};
|
||||
inherit (qt6)
|
||||
qtbase
|
||||
qtsvg
|
||||
qttools
|
||||
qtwayland
|
||||
wrapQtAppsHook
|
||||
;
|
||||
in
|
||||
llvmPackages_17.stdenv.mkDerivation rec {
|
||||
llvmPackages_17.stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "pcsx2";
|
||||
version = "1.7.5587";
|
||||
version = "1.7.5779";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "PCSX2";
|
||||
repo = "pcsx2";
|
||||
fetchSubmodules = true;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-PCZ1r6x28Z5FEVMXWm4oxpTknz/XEiwo0rRGhn4B33g=";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-WiwnP5yoBy8bRLUPuCZ7z4nhIzrY8P29KS5ZjErM/A4=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./define-rev.patch
|
||||
# Backport patches to fix random crashes on startup
|
||||
(fetchpatch {
|
||||
url = "https://github.com/PCSX2/pcsx2/commit/e47bcf8d80df9a93201eefbaf169ec1a0673a833.patch";
|
||||
sha256 = "sha256-7CL1Kpu+/JgtKIenn9rQKAs3A+oJ40W5XHlqSg77Q7Y=";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://github.com/PCSX2/pcsx2/commit/92b707db994f821bccc35d6eef67727ea3ab496b.patch";
|
||||
sha256 = "sha256-HWJ8KZAY/qBBotAJerZg6zi5QUHuTD51zKH1rAtZ3tc=";
|
||||
})
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DDISABLE_ADVANCE_SIMD=ON"
|
||||
"-DUSE_LINKED_FFMPEG=ON"
|
||||
"-DPCSX2_GIT_REV=v${version}"
|
||||
(lib.cmakeBool "DISABLE_ADVANCE_SIMD" true)
|
||||
(lib.cmakeBool "USE_LINKED_FFMPEG" true)
|
||||
(lib.cmakeFeature "PCSX2_GIT_REV" finalAttrs.src.rev)
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -79,17 +92,16 @@ llvmPackages_17.stdenv.mkDerivation rec {
|
||||
libpcap
|
||||
libwebp
|
||||
libXrandr
|
||||
libzip
|
||||
lz4
|
||||
qtbase
|
||||
qtsvg
|
||||
qttools
|
||||
qtwayland
|
||||
SDL2
|
||||
shaderc-patched
|
||||
soundtouch
|
||||
vulkan-headers
|
||||
wayland
|
||||
xz
|
||||
zstd
|
||||
]
|
||||
++ cubeb.passthru.backendLibs;
|
||||
@ -132,9 +144,9 @@ llvmPackages_17.stdenv.mkDerivation rec {
|
||||
PC, with many additional features and benefits.
|
||||
'';
|
||||
homepage = "https://pcsx2.net";
|
||||
license = with licenses; [ gpl3 lgpl3 ];
|
||||
license = with licenses; [ gpl3Plus lgpl3Plus ];
|
||||
maintainers = with maintainers; [ hrdinka govanify ];
|
||||
mainProgram = "pcsx2-qt";
|
||||
platforms = platforms.x86_64;
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
}
|
||||
})
|
||||
20
pkgs/by-name/pc/pcsx2/shaderc-patched.nix
Normal file
20
pkgs/by-name/pc/pcsx2/shaderc-patched.nix
Normal file
@ -0,0 +1,20 @@
|
||||
{
|
||||
fetchpatch,
|
||||
pcsx2,
|
||||
shaderc,
|
||||
}:
|
||||
|
||||
shaderc.overrideAttrs (old: {
|
||||
pname = "shaderc-patched-for-pcsx2";
|
||||
patches = (old.patches or [ ]) ++ [
|
||||
(fetchpatch {
|
||||
url = "file://${pcsx2.src}/.github/workflows/scripts/common/shaderc-changes.patch";
|
||||
hash = "sha256-Ps/D+CdSbjVWg3ZGOEcgbpQbCNkI5Nuizm4E5qiM9Wo=";
|
||||
excludes = [
|
||||
"CHANGES"
|
||||
"CMakeLists.txt"
|
||||
"libshaderc/CMakeLists.txt"
|
||||
];
|
||||
})
|
||||
];
|
||||
})
|
||||
@ -13,13 +13,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "radcli";
|
||||
version = "1.3.1";
|
||||
version = "1.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "radcli";
|
||||
repo = "radcli";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-KBgimvhuHvaVh9hxPr+CtibGWyscSi0KXk8S1/STk+Q=";
|
||||
hash = "sha256-YnZkFYTiU2VNKxuP+JTnH64XYTB/+imeMKN1mZN9VCQ=";
|
||||
};
|
||||
|
||||
postUnpack = ''
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
|
||||
ocamlPackages.buildDunePackage rec {
|
||||
pname = "stanc";
|
||||
version = "2.34.0";
|
||||
version = "2.35.0";
|
||||
|
||||
minimalOCamlVersion = "4.12";
|
||||
duneVersion = "3";
|
||||
@ -15,7 +15,7 @@ ocamlPackages.buildDunePackage rec {
|
||||
owner = "stan-dev";
|
||||
repo = "stanc3";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-ixZCix3oLZhzs08JbmbNCO0lhAu1Jf+KnpHNKlU/FaA=";
|
||||
hash = "sha256-QN/yY4tn0U5yOE0FKkOvvEFXDaj5GDBdeqI2UqjVN2c=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with ocamlPackages; [ menhir ];
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "tenv";
|
||||
version = "1.11.6";
|
||||
version = "2.0.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tofuutils";
|
||||
repo = "tenv";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-k7IKzklqGP676xd6ptIfbPLqAxUwaBZUz1dZ88pJReU=";
|
||||
hash = "sha256-Bx5E/vJe2SjYRJ2o3enBrzMMellRWapu99hH4HRr8nM=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-OrMCzqqOFQkI8IwcfO/JVPyd/sw+Ud0VySV7UPiucwc=";
|
||||
|
||||
@ -6,20 +6,23 @@
|
||||
, zlib
|
||||
, stdenv
|
||||
, darwin
|
||||
, nix-update-script
|
||||
, testers
|
||||
, typstyle
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "typstyle";
|
||||
version = "0.11.24";
|
||||
version = "0.11.25";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Enter-tainer";
|
||||
repo = "typstyle";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-FLvbY+0TozOWZ+JTX//psNjle5GxcyeZXzMOf4/s1v0=";
|
||||
hash = "sha256-wpG+laz1k/zCnEAVOyXzrN2DOECpKWT1nVCuQUwD+p0=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-VA2WNheQltgCaWwtpbEAn2qtlA0fTeEbCjvgkjF+nvw=";
|
||||
cargoHash = "sha256-JeEM2sxVR5qWCPBV1BT097HvkIikwPdZhOa5747e3vQ=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
@ -40,6 +43,11 @@ rustPlatform.buildRustPackage rec {
|
||||
"--skip=e2e"
|
||||
];
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script { };
|
||||
tests.version = testers.testVersion { package = typstyle; };
|
||||
};
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/Enter-tainer/typstyle/blob/${src.rev}/CHANGELOG.md";
|
||||
description = "Format your typst source code";
|
||||
|
||||
@ -40,7 +40,7 @@
|
||||
, lomiri-notifications
|
||||
, lomiri-thumbnailer
|
||||
, maliit-keyboard
|
||||
, mir
|
||||
, mir_2_15
|
||||
, nixos-icons
|
||||
, pam
|
||||
, pkg-config
|
||||
@ -191,7 +191,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
lomiri-system-settings-unwrapped
|
||||
lomiri-ui-toolkit
|
||||
maliit-keyboard
|
||||
mir
|
||||
mir_2_15
|
||||
pam
|
||||
properties-cpp
|
||||
protobuf
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
, lomiri-app-launch
|
||||
, lomiri-url-dispatcher
|
||||
, lttng-ust
|
||||
, mir
|
||||
, mir_2_15
|
||||
, process-cpp
|
||||
, qtbase
|
||||
, qtdeclarative
|
||||
@ -109,7 +109,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
lomiri-app-launch
|
||||
lomiri-url-dispatcher
|
||||
lttng-ust
|
||||
mir
|
||||
mir_2_15
|
||||
process-cpp
|
||||
protobuf
|
||||
qtbase
|
||||
|
||||
@ -11,14 +11,14 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cmdstan";
|
||||
version = "2.34.1";
|
||||
version = "2.35.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "stan-dev";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-gze8kd5zSs9nUlSY7AJwpx+jnc9Y21ahzDJmynlqm1Y=";
|
||||
hash = "sha256-bmzkXbR4KSnpfXjs2MAx8mbNSbNrIWDP/O8S+JGWrcg=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -16,7 +16,8 @@ stdenv.mkDerivation rec {
|
||||
version = "1.27.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://c-ares.org/download/${pname}-${version}.tar.gz";
|
||||
# Note: tag name varies in some versions, e.g. v1.30.0, c-ares-1_17_0.
|
||||
url = "https://github.com/c-ares/${pname}/releases/download/cares-${builtins.replaceStrings ["."] ["_"] version}/${pname}-${version}.tar.gz";
|
||||
hash = "sha256-CnK+ZpWZVcQ+KvL70DQY6Cor1UZGBOyaYhR+N6zrQgs=";
|
||||
};
|
||||
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -6,17 +6,17 @@
|
||||
|
||||
php.buildComposerProject (finalAttrs: {
|
||||
pname = "php-parallel-lint";
|
||||
version = "1.3.2.999";
|
||||
version = "1.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "php-parallel-lint";
|
||||
repo = "PHP-Parallel-Lint";
|
||||
rev = "539292fea03d718cc86e7137ad72ea35b694f2bf";
|
||||
hash = "sha256-VIBuS4PwRt20Ic5gYAXTv8p/5Nq/0B3VwMcp9zKbu5U=";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-g5e/yfvfq55MQDux3JRDvhaYEay68Q4u1VfIwDRgv7I=";
|
||||
};
|
||||
|
||||
composerLock = ./composer.lock;
|
||||
vendorHash = "sha256-PHQ0N1eFCM4s/aPVpTsyZN5gnQpNe9Wfs6CG2RNxxbk=";
|
||||
vendorHash = "sha256-NZLGeX1i+E621UGYeWn5tKufDbCLv4iD1VXJcnhfleY=";
|
||||
|
||||
meta = {
|
||||
description = "Tool to check syntax of PHP files faster than serial check with fancier output";
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "adb-enhanced";
|
||||
version = "2.5.22";
|
||||
version = "2.5.24";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
||||
owner = "ashishb";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-n1CME/swV+NsZdUfWwVY1qQeYzawwy+sm0mkRPQKm6A=";
|
||||
hash = "sha256-0HxeL6VGM+HTiAxs3NFRcEFbmH9q+0/pJdGyF1hl4hU=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -13,7 +13,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aioshelly";
|
||||
version = "10.0.0";
|
||||
version = "10.0.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.10";
|
||||
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
||||
owner = "home-assistant-libs";
|
||||
repo = "aioshelly";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-HHFp1n0oTZznByGMH2DD/LnK8mSuAe7ex2dA951MtpY=";
|
||||
hash = "sha256-+p+AFgqS/9rCDkIiNm4o7GhQ4dPfKl2s7ukEYaAdlgo=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@ -5,29 +5,32 @@
|
||||
pytest-asyncio,
|
||||
pytestCheckHook,
|
||||
pythonOlder,
|
||||
setuptools,
|
||||
typing-extensions,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiostream";
|
||||
version = "0.5.2";
|
||||
format = "setuptools";
|
||||
version = "0.6.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vxgmichel";
|
||||
repo = pname;
|
||||
repo = "aiostream";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-g2W2TtCh2ANPjeTdASVgEu+qKfz/Ugh1rDWJcFvOJpI=";
|
||||
hash = "sha256-RJ+0o8w92GteMRPOIddCBQ4JApi5gXiwkJRNe9t2E7g=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.cfg \
|
||||
--replace " --cov aiostream --cov-report html --cov-report term" ""
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace-fail " --cov aiostream" ""
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [ typing-extensions ];
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [ typing-extensions ];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytest-asyncio
|
||||
|
||||
@ -14,7 +14,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiowaqi";
|
||||
version = "3.0.1";
|
||||
version = "3.1.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.11";
|
||||
@ -23,17 +23,17 @@ buildPythonPackage rec {
|
||||
owner = "joostlek";
|
||||
repo = "python-waqi";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-+4l820FGQI66GGr+KGEeDmPUFwRrMNvYFJuSouesakY=";
|
||||
hash = "sha256-YWTGEOSSkZ0XbZUE3k+Dn9qg8Pmwip9wCp8e/j1D9io=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace "--cov" ""
|
||||
--replace-fail "--cov" ""
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ poetry-core ];
|
||||
build-system = [ poetry-core ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = [
|
||||
aiohttp
|
||||
yarl
|
||||
];
|
||||
|
||||
@ -11,7 +11,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "archspec";
|
||||
version = "0.2.3";
|
||||
version = "0.2.4";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -21,12 +21,12 @@ buildPythonPackage rec {
|
||||
repo = "archspec";
|
||||
rev = "refs/tags/v${version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-Ek+rmgvG6DbtxljAEHVac/JzNI1MaLpPu4G8nhaxzg8=";
|
||||
hash = "sha256-Xg1XdmKk2b6fqzOdedU3SGIgy65CjExxDByt/Xvmr24=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ poetry-core ];
|
||||
build-system = [ poetry-core ];
|
||||
|
||||
propagatedBuildInputs = [ click ];
|
||||
dependecies = [ click ];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
@ -37,7 +37,6 @@ buildPythonPackage rec {
|
||||
|
||||
meta = with lib; {
|
||||
description = "Library for detecting, labeling, and reasoning about microarchitectures";
|
||||
mainProgram = "archspec";
|
||||
homepage = "https://archspec.readthedocs.io/";
|
||||
changelog = "https://github.com/archspec/archspec/releases/tag/v${version}";
|
||||
license = with licenses; [
|
||||
@ -45,5 +44,6 @@ buildPythonPackage rec {
|
||||
asl20
|
||||
];
|
||||
maintainers = with maintainers; [ atila ];
|
||||
mainProgram = "archspec";
|
||||
};
|
||||
}
|
||||
|
||||
@ -12,7 +12,9 @@
|
||||
pytestCheckHook,
|
||||
pythonOlder,
|
||||
pyyaml,
|
||||
setuptools,
|
||||
six,
|
||||
versioneer,
|
||||
xlrd,
|
||||
xlwt,
|
||||
}:
|
||||
@ -20,7 +22,7 @@
|
||||
buildPythonPackage rec {
|
||||
pname = "canmatrix";
|
||||
version = "1.0";
|
||||
format = "setuptools";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
@ -32,11 +34,15 @@ buildPythonPackage rec {
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "version = versioneer.get_version()" 'version = "${version}"'
|
||||
# Remove vendorized versioneer.py
|
||||
rm versioneer.py
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
build-system = [ setuptools ];
|
||||
|
||||
nativeBuildInputs = [ versioneer ];
|
||||
|
||||
dependencies = [
|
||||
attrs
|
||||
click
|
||||
future
|
||||
|
||||
@ -2,6 +2,7 @@
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
substituteAll,
|
||||
cmdstan,
|
||||
pythonRelaxDepsHook,
|
||||
@ -17,14 +18,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "cmdstanpy";
|
||||
version = "1.2.1";
|
||||
version = "1.2.3";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "stan-dev";
|
||||
repo = "cmdstanpy";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-q+AFhWEzjYElJpiHT4h6YfZrwZJ56pv+8R+001vREyQ=";
|
||||
hash = "sha256-PV7W1H4QYIOx1EHrGljrGUhCH1Y8ZPd9gEtCocc7x64=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@ -32,6 +33,11 @@ buildPythonPackage rec {
|
||||
src = ./use-nix-cmdstan-path.patch;
|
||||
cmdstan = "${cmdstan}/opt/cmdstan";
|
||||
})
|
||||
# Fix seed-dependent tests
|
||||
(fetchpatch {
|
||||
url = "https://github.com/stan-dev/cmdstanpy/commit/c72acd0b8123c02b47d5d583bdd7d8408b04562c.patch";
|
||||
hash = "sha256-cliyDDko4spYa62DMwWBavy5pePkofJo4Kf8I0RzueM=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
@ -75,6 +81,9 @@ buildPythonPackage rec {
|
||||
# These tests use the flag -DSTAN_THREADS which doesn't work in cmdstan (missing file)
|
||||
"test_multi_proc_threads"
|
||||
"test_compile_force"
|
||||
# These tests require a writeable cmdstan source directory
|
||||
"test_pathfinder_threads"
|
||||
"test_save_profile"
|
||||
]
|
||||
++ lib.optionals stdenv.isDarwin [
|
||||
"test_init_types" # CmdStan error: error during processing Operation not permitted
|
||||
|
||||
@ -33,21 +33,21 @@ in
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "datafusion";
|
||||
version = "35.0.0";
|
||||
format = "pyproject";
|
||||
version = "38.0.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
name = "datafusion-source";
|
||||
owner = "apache";
|
||||
repo = "arrow-datafusion-python";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-43XY7j/8x+7SCY4W8nysaeWax2nvTTHZXMmy3hSz6pI=";
|
||||
hash = "sha256-rBS6i2HqpdhnhZZfO0ywL/e4a+rnUZkHzezKd8PuG80=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
name = "datafusion-cargo-deps";
|
||||
inherit src pname version;
|
||||
hash = "sha256-YWAyEMojw0bc/fu5kIZKMNPEgsAIpWqjVNodWXbgTl4=";
|
||||
hash = "sha256-M2ZNAFWdsnN9C4+YbqFxZVH9fHR10Bimf1Xzrd9oy9E=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with rustPlatform; [
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "edk2-pytool-library";
|
||||
version = "0.21.6";
|
||||
version = "0.21.7";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.10";
|
||||
@ -26,7 +26,7 @@ buildPythonPackage rec {
|
||||
owner = "tianocore";
|
||||
repo = "edk2-pytool-library";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-vVgqx6qccGNdgt/VkHEfMeiICkLDm8o7iqjNx0UlD38=";
|
||||
hash = "sha256-BWA0Irf6OpUGX/NkHMuxQ45QUr3PRdWLSEs9Bavk8RM=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "fastcore";
|
||||
version = "1.5.44";
|
||||
version = "1.5.45";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
||||
owner = "fastai";
|
||||
repo = "fastcore";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-78PFSLqPmFgdKKYHGID7pHczCXvfFeyBG1vbZSoq7ts=";
|
||||
hash = "sha256-8fpH676g36d+VgJNmlGQf4uwPMAXQpxq7F4fwO0PsZk=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@ -1,34 +1,42 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
flask,
|
||||
fetchFromGitHub,
|
||||
blinker,
|
||||
nose,
|
||||
flask,
|
||||
pytestCheckHook,
|
||||
setuptools,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "flask-principal";
|
||||
version = "0.4.0";
|
||||
format = "setuptools";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "Flask-Principal";
|
||||
inherit version;
|
||||
hash = "sha256-9dYTS1yuv9u4bzLVbRjuRLCAh2onJpVgqW6jX3XJlFM=";
|
||||
src = fetchFromGitHub {
|
||||
owner = "pallets-eco";
|
||||
repo = "flask-principal";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-E9urzZc7/QtzAohSNAJsQtykrplb+MC189VGZI5kmEE=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [
|
||||
flask
|
||||
blinker
|
||||
];
|
||||
|
||||
nativeCheckInputs = [ nose ];
|
||||
pythonImportsCheck = [ "flask_principal" ];
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
pytestFlagsArray = [ "test_principal.py" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://packages.python.org/Flask-Principal/";
|
||||
description = "Identity management for flask";
|
||||
license = licenses.bsd2;
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ abbradar ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -2,36 +2,48 @@
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
nose,
|
||||
pynose,
|
||||
setuptools,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "0.1.4";
|
||||
format = "setuptools";
|
||||
pname = "forbiddenfruit";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "clarete";
|
||||
repo = "forbiddenfruit";
|
||||
rev = version;
|
||||
sha256 = "16chhrxbbmg6lfbzm532fq0v00z8qihcsj0kg2b5jlgnb6qijwn8";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-yHIZsVn2UVmWeBNIzWDE6AOwAXZilPqXo+bVtXqGkJk=";
|
||||
};
|
||||
|
||||
nativeCheckInputs = [ nose ];
|
||||
build-system = [ setuptools ];
|
||||
|
||||
preBuild = ''
|
||||
export FFRUIT_EXTENSION="true";
|
||||
'';
|
||||
env.FFRUIT_EXTENSION = "true";
|
||||
|
||||
pythonImportsCheck = [ "forbiddenfruit" ];
|
||||
|
||||
nativeCheckInputs = [ pynose ];
|
||||
|
||||
# https://github.com/clarete/forbiddenfruit/pull/47 required to switch to pytest
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
|
||||
find ./build -name '*.so' -exec mv {} tests/unit \;
|
||||
nosetests
|
||||
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Patch python built-in objects";
|
||||
homepage = "https://github.com/clarete/forbiddenfruit";
|
||||
license = licenses.mit;
|
||||
changelog = "https://github.com/clarete/forbiddenfruit/releases/tag/${version}";
|
||||
license = with licenses; [
|
||||
mit
|
||||
gpl3Plus
|
||||
];
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -187,12 +187,64 @@ buildPythonPackage rec {
|
||||
|
||||
# tests if pip and other tools are installed
|
||||
"test_get_executable_path"
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
# flaky on darwin (depend on port availability)
|
||||
"test_all_status_messages"
|
||||
"test_async_generators"
|
||||
"test_async_generators_interface"
|
||||
"test_async_iterator_update_with_new_component"
|
||||
"test_concurrency_limits"
|
||||
"test_default_concurrency_limits"
|
||||
"test_default_flagging_callback"
|
||||
"test_end_to_end"
|
||||
"test_end_to_end_cache_examples"
|
||||
"test_event_data"
|
||||
"test_every_does_not_block_queue"
|
||||
"test_example_caching_relaunch"
|
||||
"test_example_caching_relaunch"
|
||||
"test_exit_called_at_launch"
|
||||
"test_file_component_uploads"
|
||||
"test_files_saved_as_file_paths"
|
||||
"test_flagging_does_not_create_unnecessary_directories"
|
||||
"test_flagging_no_permission_error_with_flagging_disabled"
|
||||
"test_info_and_warning_alerts"
|
||||
"test_info_isolation"
|
||||
"test_launch_analytics_does_not_error_with_invalid_blocks"
|
||||
"test_no_empty_audio_files"
|
||||
"test_no_empty_image_files"
|
||||
"test_no_empty_video_files"
|
||||
"test_non_streaming_api"
|
||||
"test_non_streaming_api_async"
|
||||
"test_pil_images_hashed"
|
||||
"test_progress_bar"
|
||||
"test_progress_bar_track_tqdm"
|
||||
"test_queue_when_using_auth"
|
||||
"test_restart_after_close"
|
||||
"test_set_share_in_colab"
|
||||
"test_show_error"
|
||||
"test_simple_csv_flagging_callback"
|
||||
"test_single_request"
|
||||
"test_socket_reuse"
|
||||
"test_start_server"
|
||||
"test_state_holder_is_used_in_postprocess"
|
||||
"test_state_stored_up_to_capacity"
|
||||
"test_static_files_single_app"
|
||||
"test_streaming_api"
|
||||
"test_streaming_api_async"
|
||||
"test_streaming_api_with_additional_inputs"
|
||||
"test_sync_generators"
|
||||
"test_time_to_live_and_delete_callback_for_state"
|
||||
"test_updates_stored_up_to_capacity"
|
||||
"test_varying_output_forms_with_generators"
|
||||
];
|
||||
disabledTestPaths = [
|
||||
# 100% touches network
|
||||
"test/test_networking.py"
|
||||
# makes pytest freeze 50% of the time
|
||||
"test/test_interfaces.py"
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
# Network-related tests that are flaky on darwin (depend on port availability)
|
||||
"test/test_routes.py"
|
||||
];
|
||||
pytestFlagsArray = [
|
||||
"-x" # abort on first failure
|
||||
@ -200,8 +252,6 @@ buildPythonPackage rec {
|
||||
#"-W" "ignore" # uncomment for debugging help
|
||||
];
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
# check the binary works outside the build env
|
||||
doInstallCheck = true;
|
||||
postInstallCheck = ''
|
||||
|
||||
@ -1,29 +1,36 @@
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
buildPythonPackage,
|
||||
six,
|
||||
archspec,
|
||||
pytestCheckHook,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
pytest-xdist,
|
||||
pytestCheckHook,
|
||||
pythonOlder,
|
||||
setuptools,
|
||||
six,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "hpccm";
|
||||
version = "22.10.0";
|
||||
format = "setuptools";
|
||||
version = "23.11.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "NVIDIA";
|
||||
repo = "hpc-container-maker";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-dLMbwtvn7HTVVlWHAzXU19ERdJxytf9NlnqMXW6ShKI=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-uB2+1Nc+SgPzB5hJI1L6yD8gn0hGOkIZF6rejq4rYg8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [
|
||||
six
|
||||
archspec
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
pytest-xdist
|
||||
@ -39,10 +46,11 @@ buildPythonPackage rec {
|
||||
|
||||
meta = with lib; {
|
||||
description = "HPC Container Maker";
|
||||
mainProgram = "hpccm";
|
||||
homepage = "https://github.com/NVIDIA/hpc-container-maker";
|
||||
changelog = "https://github.com/NVIDIA/hpc-container-maker/blob/v${version}/CHANGELOG.md";
|
||||
license = licenses.asl20;
|
||||
platforms = platforms.x86;
|
||||
maintainers = with maintainers; [ atila ];
|
||||
mainProgram = "hpccm";
|
||||
platforms = platforms.x86;
|
||||
};
|
||||
}
|
||||
|
||||
@ -16,14 +16,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "klaus";
|
||||
version = "2.0.3";
|
||||
version = "3.0.0";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jonashaag";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-VAwIdmwdo/Rim2sVlR605Wo5/zkNOMiGkh40qLrENmU=";
|
||||
hash = "sha256-BcLlvZ9Ip3laL0cLkqK+mhB+S7ubB4TuZ0VKXOOX3oA=";
|
||||
};
|
||||
|
||||
prePatch = ''
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "laundrify-aio";
|
||||
version = "1.1.2";
|
||||
version = "1.2.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
owner = "laundrify";
|
||||
repo = "laundrify-pypi";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-+dTvYn4hux3Y19kWZwxhdkBARmfD8SuNlYWM/ET9K2M=";
|
||||
hash = "sha256-mIdw2167H4Ume/DqV+fjRiBrph+8Jj5EEUALDDj4ah8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -16,14 +16,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "nbdev";
|
||||
version = "2.3.23";
|
||||
version = "2.3.25";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-+HbGHyJ2TX6qnBBPNivFVklrf+Ma2QM3u/2a67NxfIs=";
|
||||
hash = "sha256-MntVdZ6LazdFCm+h5FaTxvzEwCtoJjrW/EJPTt2fdnU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pythonRelaxDepsHook ];
|
||||
|
||||
@ -14,7 +14,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "opower";
|
||||
version = "0.4.6";
|
||||
version = "0.4.7";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
||||
owner = "tronikos";
|
||||
repo = "opower";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-Q+BycHN83oD2yJz+jsYRjSdswYVHA7fJPwpWtNsmi9M=";
|
||||
hash = "sha256-4UzgW4+h/9YBA+tDlpneaucQ2lXs9JfnQzKagFPCvGk=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@ -11,7 +11,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyexploitdb";
|
||||
version = "0.2.20";
|
||||
version = "0.2.21";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "pyExploitDb";
|
||||
inherit version;
|
||||
hash = "sha256-vRh99vi+24euDF3FwYs5KgYlWymCRK8fh8yp2FYYHkQ=";
|
||||
hash = "sha256-r57zNuKRUfZy+ipttQSfE/+LKOSnH6/4u/ZC1NzgGt8=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@ -46,6 +46,8 @@ buildPythonPackage rec {
|
||||
"test_migrations_plugin"
|
||||
"func_noerror_model_unicode_lambda"
|
||||
"test_linter_should_be_pickleable_with_pylint_django_plugin_installed"
|
||||
"func_noerror_model_fields"
|
||||
"func_noerror_form_fields"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "pylint_django" ];
|
||||
|
||||
@ -1,47 +1,51 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, pythonOlder
|
||||
, fetchPypi
|
||||
, ptpython
|
||||
, ipython
|
||||
, setuptools
|
||||
, setuptools-scm
|
||||
, setuptools-generate
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
ipython,
|
||||
keyring,
|
||||
ptpython,
|
||||
pytestCheckHook,
|
||||
pythonOlder,
|
||||
setuptools,
|
||||
setuptools-generate,
|
||||
setuptools-scm,
|
||||
}:
|
||||
|
||||
let
|
||||
buildPythonPackage rec {
|
||||
pname = "repl-python-wakatime";
|
||||
version = "0.0.6";
|
||||
in
|
||||
version = "0.0.11";
|
||||
pyproject = true;
|
||||
|
||||
buildPythonPackage {
|
||||
inherit pname version;
|
||||
format = "pyproject";
|
||||
disabled = pythonOlder "3.6";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-s2UelniMn4+wWILbVIIKidRCFaOvo/nNNofA7yf2+9c=";
|
||||
hash = "sha256-HoCdeo03Lf3g5Xg0GgAyWOu2PtGqy33vg5bQrfkEPkE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
build-system = [
|
||||
setuptools
|
||||
setuptools-scm
|
||||
setuptools-generate
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = [
|
||||
ptpython
|
||||
ipython
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"repl_python_wakatime"
|
||||
nativeCheckInputs = [
|
||||
keyring
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "repl_python_wakatime" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python REPL plugin for automatic time tracking and metrics generated from your programming activity";
|
||||
homepage = "https://github.com/wakatime/repl-python-wakatime";
|
||||
changelog = "https://github.com/wakatime/repl-python-wakatime/releases/tag/${version}";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ jfvillablanca ];
|
||||
};
|
||||
|
||||
@ -57,22 +57,25 @@ buildPythonPackage rec {
|
||||
disabledTests =
|
||||
# Hangs forever
|
||||
[ "test_copy_onto" ]
|
||||
# RuntimeError: internal error
|
||||
++ lib.optionals (stdenv.hostPlatform.system == "aarch64-linux") [
|
||||
# RuntimeError: internal error
|
||||
"test_add_scale_sequence"
|
||||
"test_modules"
|
||||
"test_setattr"
|
||||
|
||||
# _queue.Empty errors in multiprocessing tests
|
||||
"test_isend"
|
||||
];
|
||||
|
||||
# ModuleNotFoundError: No module named 'torch._C._distributed_c10d'; 'torch._C' is not a package
|
||||
disabledTestPaths = lib.optionals stdenv.isDarwin [ "test/test_distributed.py" ];
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "A pytorch dedicated tensor container";
|
||||
changelog = "https://github.com/pytorch/tensordict/releases/tag/v${version}";
|
||||
homepage = "https://github.com/pytorch/tensordict";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ GaetanLepage ];
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ GaetanLepage ];
|
||||
# No python 3.12 support yet: https://github.com/pytorch/rl/issues/2035
|
||||
broken = pythonAtLeast "3.12";
|
||||
};
|
||||
|
||||
@ -1,32 +1,46 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
nose,
|
||||
lib,
|
||||
pynose,
|
||||
setuptools,
|
||||
pythonOlder,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "xlwt";
|
||||
version = "1.3.0";
|
||||
format = "setuptools";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "c59912717a9b28f1a3c2a98fd60741014b06b043936dcecbc113eaaada156c88";
|
||||
hash = "sha256-xZkScXqbKPGjwqmP1gdBAUsGsEOTbc7LwRPqqtoVbIg=";
|
||||
};
|
||||
|
||||
nativeCheckInputs = [ nose ];
|
||||
build-system = [ setuptools ];
|
||||
|
||||
nativeCheckInputs = [ pynose ];
|
||||
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
|
||||
nosetests -v
|
||||
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
meta = {
|
||||
pythonImportsCheck = [ "xlwt" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Library to create spreadsheet files compatible with MS";
|
||||
homepage = "https://github.com/python-excel/xlwt";
|
||||
license = with lib.licenses; [
|
||||
license = with licenses; [
|
||||
bsdOriginal
|
||||
bsd3
|
||||
lgpl21
|
||||
lgpl21Plus
|
||||
];
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -8,13 +8,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "scheme-bytestructures";
|
||||
version = "2.0.1";
|
||||
version = "2.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "TaylanUB";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Wvs288K8BVjUuWvvzpDGBwOxL7mAXjVtgIwJAsQd0L4=";
|
||||
sha256 = "sha256-7FK1dXD1Qz6fFYjNUtHMaDGaezHLVaDvdgOboNNw0Lc=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
@ -6,14 +6,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "checkov";
|
||||
version = "3.2.128";
|
||||
version = "3.2.129";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bridgecrewio";
|
||||
repo = "checkov";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-BnfSKEetEofNs/74K0Pxqs6q55YQPGKAhV++pVl2tug=";
|
||||
hash = "sha256-7ZbHhVJ12BmFMlWZPWnrZCcKCSqzO1+38zuEFmUOODU=";
|
||||
};
|
||||
|
||||
patches = [ ./flake8-compat-5.x.patch ];
|
||||
|
||||
@ -1,50 +0,0 @@
|
||||
{ lib
|
||||
, stdenvNoCC
|
||||
, fetchurl
|
||||
, jdk
|
||||
, makeWrapper
|
||||
, callPackage
|
||||
}:
|
||||
|
||||
assert jdk != null;
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "apache-maven";
|
||||
version = "3.9.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://apache/maven/maven-3/${finalAttrs.version}/binaries/${finalAttrs.pname}-${finalAttrs.version}-bin.tar.gz";
|
||||
hash = "sha256-bu3SyuNibWrTpcnuMkvSZYU9ZCl/B/AzQwdVvQ4MOks=";
|
||||
};
|
||||
|
||||
sourceRoot = ".";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/maven
|
||||
cp -r ${finalAttrs.pname}-${finalAttrs.version}/* $out/maven
|
||||
|
||||
makeWrapper $out/maven/bin/mvn $out/bin/mvn \
|
||||
--set-default JAVA_HOME "${jdk}"
|
||||
makeWrapper $out/maven/bin/mvnDebug $out/bin/mvnDebug \
|
||||
--set-default JAVA_HOME "${jdk}"
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.buildMavenPackage = callPackage ./build-package.nix {
|
||||
maven = finalAttrs.finalPackage;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
mainProgram = "mvn";
|
||||
description = "Build automation tool (used primarily for Java projects)";
|
||||
homepage = "https://maven.apache.org/";
|
||||
license = licenses.asl20;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ cko ];
|
||||
};
|
||||
})
|
||||
@ -9,13 +9,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "corrosion";
|
||||
version = "0.4.8";
|
||||
version = "0.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "corrosion-rs";
|
||||
repo = "corrosion";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-ChoeN7qQRR1YmYYvPdJVJ2SVGTDGlM7PsN9jzFjQEyU=";
|
||||
hash = "sha256-vaNXXXaGqYNmhonU+ANN857LAUgwv+PMcON+nBuUoeo=";
|
||||
};
|
||||
|
||||
buildInputs = lib.optional stdenv.isDarwin libiconv;
|
||||
|
||||
@ -7,13 +7,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "clickhouse-backup";
|
||||
version = "2.5.11";
|
||||
version = "2.5.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Altinity";
|
||||
repo = "clickhouse-backup";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-MqtlrAn4FRjZEocGRLRbbTJePvWPZbhE+7MaFZQgyeY=";
|
||||
hash = "sha256-qLBx1QhIefZbENEtJiVHoAMsxM9SqiCnPQpotIAJy5Y=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-vwcItklYe6ljFdGTxef19plaI5OMoOtQohY0xZLBUos=";
|
||||
|
||||
@ -18,13 +18,13 @@ let
|
||||
in
|
||||
buildGoModule rec {
|
||||
pname = "faas-cli";
|
||||
version = "0.16.27";
|
||||
version = "0.16.29";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "openfaas";
|
||||
repo = "faas-cli";
|
||||
rev = version;
|
||||
sha256 = "sha256-CZvIvvkDfpb4YPQIe5i8vZcmhLu7x0zTQGXCL8SxcvM=";
|
||||
sha256 = "sha256-TKrn4ouRcQS1FpySpQCdK7EMjlE+qwa3e/Ze+TAdA7s=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@ -1,24 +0,0 @@
|
||||
{ lib, buildGoPackage, fetchFromGitHub }:
|
||||
|
||||
buildGoPackage rec {
|
||||
pname = "go-symbols";
|
||||
version = "0.1.1";
|
||||
|
||||
goPackagePath = "github.com/acroca/go-symbols";
|
||||
goDeps = ./deps.nix;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "acroca";
|
||||
repo = "go-symbols";
|
||||
rev = "v${version}";
|
||||
sha256 = "0yyzw6clndb2r5j9isyd727njs98zzp057v314vfvknsm8g7hqrz";
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "A utility for extracting a JSON representation of the package symbols from a go source tree";
|
||||
mainProgram = "go-symbols";
|
||||
homepage = "https://github.com/acroca/go-symbols";
|
||||
maintainers = with lib.maintainers; [ vdemeester ];
|
||||
license = lib.licenses.mit;
|
||||
};
|
||||
}
|
||||
11
pkgs/development/tools/go-symbols/deps.nix
generated
11
pkgs/development/tools/go-symbols/deps.nix
generated
@ -1,11 +0,0 @@
|
||||
[
|
||||
{
|
||||
goPackagePath = "golang.org/x/tools";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/golang/tools";
|
||||
rev = "96b5a5404f303f074e6117d832a9873c439508f0";
|
||||
sha256 = "1h6r9xyp1v3w2x8d108vzghn65l6ia2h895irypmrwymfcp30y42";
|
||||
};
|
||||
}
|
||||
]
|
||||
@ -5,16 +5,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "neocmakelsp";
|
||||
version = "0.6.27";
|
||||
version = "0.7.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Decodetalkers";
|
||||
repo = "neocmakelsp";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-In+Z/MCjgV/iPkAh4mTfrlThKZEMQqMYyfOP0m11+ps=";
|
||||
hash = "sha256-rMonXAggCsMWvyNmGu+crtw0a4zfhKJOR5GnIULWe1g=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-fLtbaL0h3tmX5INwYn7fPj+TAxfBQarD44twq0ggXRU=";
|
||||
cargoHash = "sha256-09mpr7ncqK9c5AMhRSAe/K9pE3vXC3bxEXX3hIx3E7c=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A cmake lsp based on tower-lsp and treesitter";
|
||||
|
||||
@ -6,16 +6,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "scriptisto";
|
||||
version = "2.1.1";
|
||||
version = "2.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "igor-petruk";
|
||||
repo = "scriptisto";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-WQSgN1iX26tPPaJXLtU5Eo8kFahT6g+gZKJEDT6zj1E=";
|
||||
hash = "sha256-iaDdOFmi4kfcJSjXOcGAFG9i1SdB+K5Qz4+NDaVQALY=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-trDf6N7PMjxlum8Rx2TxGePM6UPzMlTU6ATyGzmFoNc=";
|
||||
cargoHash = "sha256-LIOsl9qPKJr/ykbXeaHP6lNHGUMcw3omniSWx2FkF28=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
||||
@ -6,13 +6,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pyenv";
|
||||
version = "2.4.1";
|
||||
version = "2.4.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pyenv";
|
||||
repo = "pyenv";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-dzL0wFAm+wUEWX6a8cgZstgdi9NMmyeDIUI5pPjJpZI=";
|
||||
hash = "sha256-hPbXKUg7jl4Dd4m29yaEJVX+jl8c/1oODEcRGTao58w=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -12,16 +12,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-cyclonedx";
|
||||
version = "0.5.1";
|
||||
version = "0.5.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "CycloneDX";
|
||||
repo = "cyclonedx-rust-cargo";
|
||||
rev = "${pname}-${version}";
|
||||
hash = "sha256-FQM2H/W9p0wmI1GGxnleDGU1y9hpz/Fnxi0KhF2RYeA=";
|
||||
hash = "sha256-Hq5yEYikov/+/Vgf4Bn0b23+K6yqefrJOoEbC0YdnFY=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-Y4OoQ3JG0syKBJ2KDJ5qzwu/gI+/unvrTafQ+UYiZYA=";
|
||||
cargoHash = "sha256-Q6Qanjfu5rIIZw4KeZo0kHJML5aq+12Lkn7CTscK8yE=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "elasticmq-server";
|
||||
version = "1.6.2";
|
||||
version = "1.6.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://s3-eu-west-1.amazonaws.com/softwaremill-public/${finalAttrs.pname}-${finalAttrs.version}.jar";
|
||||
sha256 = "sha256-efO6W92RewCum03RBPlR26x5jRXoAhdSvbDXLtIfY44=";
|
||||
sha256 = "sha256-AVvzIx39IdtLzlD7jUJk3NlNRJym0N3VZmKsncYkzFU=";
|
||||
};
|
||||
|
||||
# don't do anything?
|
||||
|
||||
227
pkgs/servers/mir/common.nix
Normal file
227
pkgs/servers/mir/common.nix
Normal file
@ -0,0 +1,227 @@
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
testers,
|
||||
cmake,
|
||||
pkg-config,
|
||||
python3,
|
||||
boost,
|
||||
egl-wayland,
|
||||
freetype,
|
||||
glib,
|
||||
glm,
|
||||
glog,
|
||||
libdrm,
|
||||
libepoxy,
|
||||
libevdev,
|
||||
libglvnd,
|
||||
libinput,
|
||||
libuuid,
|
||||
libxcb,
|
||||
libxkbcommon,
|
||||
libxmlxx,
|
||||
yaml-cpp,
|
||||
lttng-ust,
|
||||
mesa,
|
||||
nettle,
|
||||
udev,
|
||||
wayland,
|
||||
wayland-scanner,
|
||||
xorg,
|
||||
xwayland,
|
||||
dbus,
|
||||
gobject-introspection,
|
||||
gtest,
|
||||
umockdev,
|
||||
wlcs,
|
||||
validatePkgConfig,
|
||||
}:
|
||||
|
||||
{
|
||||
version,
|
||||
pinned ? false,
|
||||
hash,
|
||||
patches ? [ ],
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "mir";
|
||||
inherit version;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "canonical";
|
||||
repo = "mir";
|
||||
rev = "v${finalAttrs.version}";
|
||||
inherit hash;
|
||||
};
|
||||
|
||||
inherit patches;
|
||||
|
||||
postPatch = ''
|
||||
# Fix scripts that get run in tests
|
||||
patchShebangs tools/detect_fd_leaks.bash tests/acceptance-tests/wayland-generator/test_wayland_generator.sh.in
|
||||
|
||||
# Fix LD_PRELOADing in tests
|
||||
substituteInPlace \
|
||||
cmake/MirCommon.cmake \
|
||||
tests/umock-acceptance-tests/CMakeLists.txt \
|
||||
tests/unit-tests/platforms/gbm-kms/kms/CMakeLists.txt \
|
||||
tests/unit-tests/CMakeLists.txt \
|
||||
--replace-warn 'LD_PRELOAD=liblttng-ust-fork.so' 'LD_PRELOAD=${lib.getLib lttng-ust}/lib/liblttng-ust-fork.so' \
|
||||
--replace-warn 'LD_PRELOAD=libumockdev-preload.so.0' 'LD_PRELOAD=${lib.getLib umockdev}/lib/libumockdev-preload.so.0'
|
||||
|
||||
# Fix Xwayland default
|
||||
substituteInPlace src/miral/x11_support.cpp \
|
||||
--replace-fail '/usr/bin/Xwayland' '${lib.getExe xwayland}'
|
||||
|
||||
# Fix paths for generating drm-formats
|
||||
substituteInPlace src/platform/graphics/CMakeLists.txt \
|
||||
--replace-fail "/usr/include/drm/drm_fourcc.h" "${lib.getDev libdrm}/include/libdrm/drm_fourcc.h" \
|
||||
--replace-fail "/usr/include/libdrm/drm_fourcc.h" "${lib.getDev libdrm}/include/libdrm/drm_fourcc.h"
|
||||
'';
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
glib # gdbus-codegen
|
||||
lttng-ust # lttng-gen-tp
|
||||
pkg-config
|
||||
(python3.withPackages (
|
||||
ps:
|
||||
with ps;
|
||||
[ pillow ]
|
||||
++ lib.optionals finalAttrs.finalPackage.doCheck [
|
||||
pygobject3
|
||||
python-dbusmock
|
||||
]
|
||||
))
|
||||
validatePkgConfig
|
||||
wayland-scanner
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
boost
|
||||
egl-wayland
|
||||
freetype
|
||||
glib
|
||||
glm
|
||||
glog
|
||||
libdrm
|
||||
libepoxy
|
||||
libevdev
|
||||
libglvnd
|
||||
libinput
|
||||
libuuid
|
||||
libxcb
|
||||
libxkbcommon
|
||||
libxmlxx
|
||||
yaml-cpp
|
||||
lttng-ust
|
||||
mesa
|
||||
nettle
|
||||
udev
|
||||
wayland
|
||||
xorg.libX11
|
||||
xorg.libXcursor
|
||||
xorg.xorgproto
|
||||
xwayland
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
dbus
|
||||
gobject-introspection
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
gtest
|
||||
umockdev
|
||||
wlcs
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
(lib.cmakeBool "BUILD_DOXYGEN" false)
|
||||
(lib.cmakeFeature "MIR_PLATFORM" (
|
||||
lib.strings.concatStringsSep ";" [
|
||||
"gbm-kms"
|
||||
"x11"
|
||||
"eglstream-kms"
|
||||
"wayland"
|
||||
]
|
||||
))
|
||||
(lib.cmakeBool "MIR_ENABLE_TESTS" finalAttrs.finalPackage.doCheck)
|
||||
# BadBufferTest.test_truncated_shm_file *doesn't* throw an error as the test expected, mark as such
|
||||
# https://github.com/canonical/mir/pull/1947#issuecomment-811810872
|
||||
(lib.cmakeBool "MIR_SIGBUS_HANDLER_ENVIRONMENT_BROKEN" true)
|
||||
(lib.cmakeFeature "MIR_EXCLUDE_TESTS" (lib.strings.concatStringsSep ";" [ ]))
|
||||
# These get built but don't get executed by default, yet they get installed when tests are enabled
|
||||
(lib.cmakeBool "MIR_BUILD_PERFORMANCE_TESTS" false)
|
||||
(lib.cmakeBool "MIR_BUILD_PLATFORM_TEST_HARNESS" false)
|
||||
# https://github.com/canonical/mir/issues/2987
|
||||
# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=106799
|
||||
(lib.cmakeBool "MIR_USE_PRECOMPILED_HEADERS" false)
|
||||
(lib.cmakeFeature "MIR_COMPILER_QUIRKS" (
|
||||
lib.strings.concatStringsSep ";" [
|
||||
# https://github.com/canonical/mir/issues/3017 actually affects x86_64 as well
|
||||
"test_touchspot_controller.cpp:array-bounds"
|
||||
]
|
||||
))
|
||||
];
|
||||
|
||||
doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
|
||||
|
||||
preCheck = ''
|
||||
export XDG_RUNTIME_DIR=$TMP
|
||||
'';
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
"dev"
|
||||
];
|
||||
|
||||
passthru = {
|
||||
tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
|
||||
providedSessions = lib.optionals (lib.strings.versionOlder version "2.16.0") [
|
||||
# More of an example than a fully functioning shell, some notes for the adventurous:
|
||||
# - ~/.config/miral-shell.config is one possible user config location,
|
||||
# accepted options=value are according to `mir-shell --help`
|
||||
# - default icon theme setting is DMZ-White, needs vanilla-dmz installed & on XCURSOR_PATH
|
||||
# or setting to be changed to an available theme
|
||||
# - terminal emulator setting may need to be changed if miral-terminal script
|
||||
# does not know about preferred terminal
|
||||
"mir-shell"
|
||||
];
|
||||
} // lib.optionalAttrs (!pinned) {
|
||||
updateScript = ./update.sh;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "A display server and Wayland compositor developed by Canonical";
|
||||
homepage = "https://mir-server.io";
|
||||
changelog = "https://github.com/canonical/mir/releases/tag/v${finalAttrs.version}";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [
|
||||
onny
|
||||
OPNA2608
|
||||
];
|
||||
platforms = platforms.linux;
|
||||
pkgConfigModules = [
|
||||
"miral"
|
||||
"mircommon"
|
||||
"mircore"
|
||||
"miroil"
|
||||
"mirplatform"
|
||||
"mir-renderer-gl-dev"
|
||||
"mirrenderer"
|
||||
"mirserver"
|
||||
"mirtest"
|
||||
"mirwayland"
|
||||
] ++ lib.optionals (lib.strings.versionOlder version "2.17.0") [
|
||||
"mircookie"
|
||||
] ++ lib.optionals (lib.strings.versionAtLeast version "2.17.0") [
|
||||
"mircommon-internal"
|
||||
"mirserver-internal"
|
||||
];
|
||||
};
|
||||
})
|
||||
@ -1,206 +1,33 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, gitUpdater
|
||||
, testers
|
||||
, cmake
|
||||
, pkg-config
|
||||
, python3
|
||||
, boost
|
||||
, egl-wayland
|
||||
, freetype
|
||||
, glib
|
||||
, glm
|
||||
, glog
|
||||
, libdrm
|
||||
, libepoxy
|
||||
, libevdev
|
||||
, libglvnd
|
||||
, libinput
|
||||
, libuuid
|
||||
, libxcb
|
||||
, libxkbcommon
|
||||
, libxmlxx
|
||||
, yaml-cpp
|
||||
, lttng-ust
|
||||
, mesa
|
||||
, nettle
|
||||
, udev
|
||||
, wayland
|
||||
, xorg
|
||||
, xwayland
|
||||
, dbus
|
||||
, gobject-introspection
|
||||
, gtest
|
||||
, umockdev
|
||||
, wlcs
|
||||
, validatePkgConfig
|
||||
}:
|
||||
{ callPackage, fetchpatch }:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "mir";
|
||||
version = "2.15.0";
|
||||
let
|
||||
common = callPackage ./common.nix { };
|
||||
in
|
||||
{
|
||||
mir = common {
|
||||
version = "2.17.0";
|
||||
hash = "sha256-iDJ7NIFoSSXjMrHK2I6Linf7z0hvShj8fr6BGxgK5gE=";
|
||||
};
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "MirServer";
|
||||
repo = "mir";
|
||||
rev = "v${finalAttrs.version}";
|
||||
mir_2_15 = common {
|
||||
version = "2.15.0";
|
||||
pinned = true;
|
||||
hash = "sha256-c1+gxzLEtNCjR/mx76O5QElQ8+AO4WsfcG7Wy1+nC6E=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix gbm-kms tests
|
||||
# Remove when version > 2.15.0
|
||||
(fetchpatch {
|
||||
name = "0001-mir-Fix-the-signature-of-drmModeCrtcSetGamma.patch";
|
||||
url = "https://github.com/MirServer/mir/commit/98250e9c32c5b9b940da2fb0a32d8139bbc68157.patch";
|
||||
hash = "sha256-tTtOHGNue5rsppOIQSfkOH5sVfFSn/KPGHmubNlRtLI=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# Fix scripts that get run in tests
|
||||
patchShebangs tools/detect_fd_leaks.bash tests/acceptance-tests/wayland-generator/test_wayland_generator.sh.in
|
||||
|
||||
# Fix LD_PRELOADing in tests
|
||||
for needsPreloadFixing in \
|
||||
cmake/MirCommon.cmake \
|
||||
tests/umock-acceptance-tests/CMakeLists.txt \
|
||||
tests/unit-tests/platforms/gbm-kms/kms/CMakeLists.txt \
|
||||
tests/unit-tests/CMakeLists.txt
|
||||
do
|
||||
substituteInPlace $needsPreloadFixing \
|
||||
--replace 'LD_PRELOAD=liblttng-ust-fork.so' 'LD_PRELOAD=${lib.getLib lttng-ust}/lib/liblttng-ust-fork.so' \
|
||||
--replace 'LD_PRELOAD=libumockdev-preload.so.0' 'LD_PRELOAD=${lib.getLib umockdev}/lib/libumockdev-preload.so.0'
|
||||
done
|
||||
|
||||
# Fix Xwayland default
|
||||
substituteInPlace src/miral/x11_support.cpp \
|
||||
--replace '/usr/bin/Xwayland' '${lib.getExe xwayland}'
|
||||
|
||||
# Fix paths for generating drm-formats
|
||||
substituteInPlace src/platform/graphics/CMakeLists.txt \
|
||||
--replace "/usr/include/drm/drm_fourcc.h" "${lib.getDev libdrm}/include/libdrm/drm_fourcc.h" \
|
||||
--replace "/usr/include/libdrm/drm_fourcc.h" "${lib.getDev libdrm}/include/libdrm/drm_fourcc.h"
|
||||
'';
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
glib # gdbus-codegen
|
||||
lttng-ust # lttng-gen-tp
|
||||
pkg-config
|
||||
(python3.withPackages (ps: with ps; [
|
||||
pillow
|
||||
] ++ lib.optionals finalAttrs.finalPackage.doCheck [
|
||||
pygobject3
|
||||
python-dbusmock
|
||||
]))
|
||||
validatePkgConfig
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
boost
|
||||
egl-wayland
|
||||
freetype
|
||||
glib
|
||||
glm
|
||||
glog
|
||||
libdrm
|
||||
libepoxy
|
||||
libevdev
|
||||
libglvnd
|
||||
libinput
|
||||
libuuid
|
||||
libxcb
|
||||
libxkbcommon
|
||||
libxmlxx
|
||||
yaml-cpp
|
||||
lttng-ust
|
||||
mesa
|
||||
nettle
|
||||
udev
|
||||
wayland
|
||||
xorg.libX11
|
||||
xorg.libXcursor
|
||||
xorg.xorgproto
|
||||
xwayland
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
dbus
|
||||
gobject-introspection
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
gtest
|
||||
umockdev
|
||||
wlcs
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DBUILD_DOXYGEN=OFF"
|
||||
"-DMIR_PLATFORM='gbm-kms;x11;eglstream-kms;wayland'"
|
||||
"-DMIR_ENABLE_TESTS=${if finalAttrs.finalPackage.doCheck then "ON" else "OFF"}"
|
||||
# BadBufferTest.test_truncated_shm_file *doesn't* throw an error as the test expected, mark as such
|
||||
# https://github.com/MirServer/mir/pull/1947#issuecomment-811810872
|
||||
"-DMIR_SIGBUS_HANDLER_ENVIRONMENT_BROKEN=ON"
|
||||
"-DMIR_EXCLUDE_TESTS=${lib.strings.concatStringsSep ";" [
|
||||
]}"
|
||||
# These get built but don't get executed by default, yet they get installed when tests are enabled
|
||||
"-DMIR_BUILD_PERFORMANCE_TESTS=OFF"
|
||||
"-DMIR_BUILD_PLATFORM_TEST_HARNESS=OFF"
|
||||
# https://github.com/MirServer/mir/issues/2987
|
||||
# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=106799
|
||||
"-DMIR_USE_PRECOMPILED_HEADERS=OFF"
|
||||
];
|
||||
|
||||
doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
|
||||
|
||||
preCheck = ''
|
||||
# Needs to be exactly /tmp so some failing tests don't get run, don't know why they fail yet
|
||||
# https://github.com/MirServer/mir/issues/2801
|
||||
export XDG_RUNTIME_DIR=/tmp
|
||||
'';
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
passthru = {
|
||||
tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
|
||||
updateScript = gitUpdater {
|
||||
rev-prefix = "v";
|
||||
};
|
||||
# More of an example than a fully functioning shell, some notes for the adventurous:
|
||||
# - ~/.config/miral-shell.config is one possible user config location,
|
||||
# accepted options=value are according to `mir-shell --help`
|
||||
# - default icon theme setting is DMZ-White, needs vanilla-dmz installed & on XCURSOR_PATH
|
||||
# or setting to be changed to an available theme
|
||||
# - terminal emulator setting may need to be changed if miral-terminal script
|
||||
# does not know about preferred terminal
|
||||
providedSessions = [ "mir-shell" ];
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "A display server and Wayland compositor developed by Canonical";
|
||||
homepage = "https://mir-server.io";
|
||||
changelog = "https://github.com/MirServer/mir/releases/tag/v${finalAttrs.version}";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ onny OPNA2608 ];
|
||||
platforms = platforms.linux;
|
||||
pkgConfigModules = [
|
||||
"miral"
|
||||
"mircommon"
|
||||
"mircookie"
|
||||
"mircore"
|
||||
"miroil"
|
||||
"mirplatform"
|
||||
"mir-renderer-gl-dev"
|
||||
"mirrenderer"
|
||||
"mirserver"
|
||||
"mirtest"
|
||||
"mirwayland"
|
||||
patches = [
|
||||
# Fix gbm-kms tests
|
||||
# Remove when version > 2.15.0
|
||||
(fetchpatch {
|
||||
name = "0001-mir-Fix-the-signature-of-drmModeCrtcSetGamma.patch";
|
||||
url = "https://github.com/canonical/mir/commit/98250e9c32c5b9b940da2fb0a32d8139bbc68157.patch";
|
||||
hash = "sha256-tTtOHGNue5rsppOIQSfkOH5sVfFSn/KPGHmubNlRtLI=";
|
||||
})
|
||||
# Fix external_client tests
|
||||
# Remove when version > 2.15.0
|
||||
(fetchpatch {
|
||||
name = "0002-mir-Fix-cannot_start_X_Server_and_outdated_tests.patch";
|
||||
url = "https://github.com/canonical/mir/commit/0704026bd06372ea8286a46d8c939286dd8a8c68.patch";
|
||||
hash = "sha256-k+51piPQandbHdm+ioqpBrb+C7Aqi2kugchAehZ1aiU=";
|
||||
})
|
||||
];
|
||||
};
|
||||
})
|
||||
}
|
||||
|
||||
8
pkgs/servers/mir/update.sh
Executable file
8
pkgs/servers/mir/update.sh
Executable file
@ -0,0 +1,8 @@
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p curl gnused jq common-updater-scripts
|
||||
|
||||
set -eou pipefail
|
||||
|
||||
version="$(curl --silent "https://api.github.com/repos/canonical/mir/releases" | jq '.[0].tag_name' --raw-output)"
|
||||
|
||||
update-source-version mir "${version:1}" --file=./pkgs/servers/mir/default.nix
|
||||
@ -6,13 +6,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "nu_scripts";
|
||||
version = "0-unstable-2024-06-01";
|
||||
version = "0-unstable-2024-06-08";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nushell";
|
||||
repo = pname;
|
||||
rev = "5271d68b7a6770eeade257b298089d14c68ab62b";
|
||||
hash = "sha256-AWra4CO0mfRlyneHel2RPNZ7NSHOmSH6dL+Vy2Pduuk=";
|
||||
rev = "398cc82308d8ddd0fb09bc9e8fc20cced26a0d30";
|
||||
hash = "sha256-zJWZakNxLQI3vxClzS4B0NqY84Oj5R1BjX2aMjCm/+Q=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@ -34,6 +34,9 @@ stdenv.mkDerivation rec {
|
||||
patches = [
|
||||
# Removes hardcoded toolchain for aarch64, allowing successful aarch64 builds.
|
||||
./0001-toolchain.patch
|
||||
# Avoid leaking the build timestamp
|
||||
# https://sourceforge.net/p/refind/code/merge-requests/53/
|
||||
./reproducible.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
67
pkgs/tools/bootloaders/refind/reproducible.patch
Normal file
67
pkgs/tools/bootloaders/refind/reproducible.patch
Normal file
@ -0,0 +1,67 @@
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 4d07160..4ae2a7d 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -150,9 +150,11 @@ edk2: build_edk2
|
||||
cp $(EDK2_BUILDLOC)/refind.efi ./refind/refind_$(FILENAME_CODE).efi
|
||||
cp $(EDK2_BUILDLOC)/gptsync.efi ./gptsync/gptsync_$(FILENAME_CODE).efi
|
||||
ifneq ($(OMIT_SBAT), 1)
|
||||
- $(OBJCOPY) --set-section-alignment '.sbat=512' --add-section .sbat=$(REFIND_SBAT_CSV) \
|
||||
+ $(OBJCOPY) --preserve-dates --set-section-alignment '.sbat=512' \
|
||||
+ --add-section .sbat=$(REFIND_SBAT_CSV) \
|
||||
--adjust-section-vma .sbat+10000000 ./refind/refind_$(FILENAME_CODE).efi
|
||||
- $(OBJCOPY) --set-section-alignment '.sbat=512' --add-section .sbat=$(REFIND_SBAT_CSV) \
|
||||
+ $(OBJCOPY) --preserve-dates --set-section-alignment '.sbat=512' \
|
||||
+ --add-section .sbat=$(REFIND_SBAT_CSV) \
|
||||
--adjust-section-vma .sbat+10000000 ./gptsync/gptsync_$(FILENAME_CODE).efi
|
||||
endif
|
||||
|
||||
@@ -173,7 +175,8 @@ else
|
||||
for BASENAME in $(EDK2_DRIVER_BASENAMES) ; do \
|
||||
echo "Copying $$BASENAME""_$(FILENAME_CODE).efi" ; \
|
||||
cp "$(EDK2_BUILDLOC)/$$BASENAME.efi" ./drivers_$(FILENAME_CODE)/$$BASENAME\_$(FILENAME_CODE).efi ; \
|
||||
- $(OBJCOPY) --set-section-alignment '.sbat=512' --add-section .sbat=$(REFIND_SBAT_CSV) \
|
||||
+ $(OBJCOPY) --preserve-dates --set-section-alignment '.sbat=512' \
|
||||
+ --add-section .sbat=$(REFIND_SBAT_CSV) \
|
||||
--adjust-section-vma .sbat+10000000 ./drivers_$(FILENAME_CODE)/$$BASENAME\_$(FILENAME_CODE).efi ; \
|
||||
done
|
||||
endif
|
||||
diff --git a/filesystems/Make.gnuefi b/filesystems/Make.gnuefi
|
||||
index 70e4ad6..2329659 100644
|
||||
--- a/filesystems/Make.gnuefi
|
||||
+++ b/filesystems/Make.gnuefi
|
||||
@@ -38,7 +38,7 @@ $(TARGET): $(SHLIB_TARGET)
|
||||
-j .rel -j .rela -j .rel.* -j .rela.* -j .rel* -j .rela* \
|
||||
-j .reloc --strip-unneeded $(FORMAT_DRIVER) $< $@
|
||||
ifneq ($(OMIT_SBAT), 1)
|
||||
- $(OBJCOPY) --add-section .sbat=$(SRCDIR)/../$(REFIND_SBAT_CSV) \
|
||||
+ $(OBJCOPY) --preserve-dates --add-section .sbat=$(SRCDIR)/../$(REFIND_SBAT_CSV) \
|
||||
--adjust-section-vma .sbat+10000000 $@
|
||||
endif
|
||||
chmod a-x $(TARGET)
|
||||
diff --git a/gptsync/Make.gnuefi b/gptsync/Make.gnuefi
|
||||
index b6c0763..49aff13 100644
|
||||
--- a/gptsync/Make.gnuefi
|
||||
+++ b/gptsync/Make.gnuefi
|
||||
@@ -35,7 +35,7 @@ $(TARGET): $(SHLIB_TARGET)
|
||||
-j .rel -j .rela -j .rel.* -j .rela.* -j .rel* -j .rela* \
|
||||
-j .reloc --strip-unneeded $(FORMAT) $< $@
|
||||
ifneq ($(OMIT_SBAT), 1)
|
||||
- $(OBJCOPY) --add-section .sbat=../$(REFIND_SBAT_CSV) \
|
||||
+ $(OBJCOPY) --preserve-dates --add-section .sbat=../$(REFIND_SBAT_CSV) \
|
||||
--adjust-section-vma .sbat+10000000 $@
|
||||
endif
|
||||
chmod a-x $(TARGET)
|
||||
diff --git a/refind/Makefile b/refind/Makefile
|
||||
index 73be8e5..880bd22 100644
|
||||
--- a/refind/Makefile
|
||||
+++ b/refind/Makefile
|
||||
@@ -54,7 +54,7 @@ $(TARGET): $(SHLIB_TARGET)
|
||||
-j .rel -j .rela -j .rel.* -j .rela.* -j .rel* -j .rela* \
|
||||
-j .reloc --strip-unneeded $(FORMAT) $< $@
|
||||
ifneq ($(OMIT_SBAT), 1)
|
||||
- $(OBJCOPY) --add-section .sbat=$(SRCDIR)/../$(REFIND_SBAT_CSV) \
|
||||
+ $(OBJCOPY) --preserve-dates --add-section .sbat=$(SRCDIR)/../$(REFIND_SBAT_CSV) \
|
||||
--adjust-section-vma .sbat+10000000 $@
|
||||
endif
|
||||
chmod a-x $(TARGET)
|
||||
@ -10,11 +10,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "btrfs-progs";
|
||||
version = "6.8.1";
|
||||
version = "6.9";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz";
|
||||
hash = "sha256-DkCgaKJsKWnLAqlbqf74iNemNW4/RX/5KtJHfQhzVng=";
|
||||
hash = "sha256-fhSl1ZfzI919G0U+Ok5mGn6fB+oGDvv/T3b/gxWRfeg=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -15,11 +15,11 @@ let
|
||||
in
|
||||
tcl.mkTclDerivation rec {
|
||||
pname = "remind";
|
||||
version = "04.03.07";
|
||||
version = "05.00.01";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://dianne.skoll.ca/projects/remind/download/remind-${version}.tar.gz";
|
||||
sha256 = "sha256-s/jEsNXUBigNHPTCi3e4V2pGUNhK2s5/n+sU1ow7UU0=";
|
||||
sha256 = "sha256-tj36/lLn67/hkNMrRVGXRLqQ9Sx6oDKZHeajiSYn97c=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = tclLibraries;
|
||||
|
||||
@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
|
||||
meta = with lib; {
|
||||
homepage = "https://www.gnu.org/software/screen/";
|
||||
description = "A window manager that multiplexes a physical terminal";
|
||||
license = licenses.gpl2Plus;
|
||||
license = licenses.gpl3Plus;
|
||||
|
||||
longDescription =
|
||||
'' GNU Screen is a full-screen window manager that multiplexes a physical
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "croc";
|
||||
version = "10.0.7";
|
||||
version = "10.0.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "schollz";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-8sC3v59ODNdR3W3spAJi5ZgcQirFVvC3RsfJz9QjRBg=";
|
||||
hash = "sha256-kfvAJT//ZjhjNhKNbaRGjiXO8fsaZZCVZ03BUdD6V6c=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-o/8TFAiee7ANSOFxTCFY9fDS4WOOO4IKQfjiMCXUf8w=";
|
||||
vendorHash = "sha256-URaU6gy+DOChdbuvUTIWY3cUQTVogD5gUH3p17xmXzE=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
||||
@ -11,13 +11,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "sing-box";
|
||||
version = "1.9.1";
|
||||
version = "1.9.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SagerNet";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-5TSsOlQjsw9UAscWstLsX/6MyexdRHRXu4K/EFPnyvQ=";
|
||||
hash = "sha256-pcmY/AU/P0ebGbcJVhp8Moj4y3B2AbyZD56Fw2ZSpt4=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-gmh+0NYOXcBsD+aamCTuOlgvYqmtfDnar2iGWRcepPE=";
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "vale";
|
||||
version = "3.4.2";
|
||||
version = "3.5.0";
|
||||
|
||||
subPackages = [ "cmd/vale" ];
|
||||
|
||||
@ -18,10 +18,10 @@ buildGoModule rec {
|
||||
owner = "errata-ai";
|
||||
repo = "vale";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-9923mmZZmg08Zq+Vbt4zus0UvmsTJ/r1ddVdeOB7yJU=";
|
||||
hash = "sha256-yp3jy0iEO4DHhAskp2Y56KSjTddNTcQRf+HgxKa0o9c=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-4GtMKhxGkNwF6ydFE708SbzBm9mwCDKtINljTQXwz2c=";
|
||||
vendorHash = "sha256-OLlViQKLTark9yknnjJFiEThFtxNNjue5LUp1P/anKU=";
|
||||
|
||||
ldflags = [ "-s" "-w" "-X main.version=${version}" ];
|
||||
|
||||
|
||||
@ -13,13 +13,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "kanshi";
|
||||
version = "1.6.0";
|
||||
version = "1.7.0";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~emersion";
|
||||
repo = "kanshi";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-KjP7EdssaZwa1OupLQgzwJSAADKLsjHltEavPjsS1YM=";
|
||||
sha256 = "sha256-FDt+F5tWHLsMejlExb5yPh0SlWzuUlK9u54Uy+alrzw=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
@ -403,8 +403,6 @@ with pkgs;
|
||||
buildFHSEnvChroot = callPackage ../build-support/build-fhsenv-chroot { }; # Deprecated; use buildFHSEnv/buildFHSEnvBubblewrap
|
||||
buildFHSEnvBubblewrap = callPackage ../build-support/build-fhsenv-bubblewrap { };
|
||||
|
||||
buildMaven = callPackage ../build-support/build-maven.nix { };
|
||||
|
||||
c64-debugger = callPackage ../applications/emulators/c64-debugger { };
|
||||
|
||||
camunda-modeler = callPackage ../applications/misc/camunda-modeler { };
|
||||
@ -2709,8 +2707,6 @@ with pkgs;
|
||||
|
||||
pcem = callPackage ../applications/emulators/pcem { };
|
||||
|
||||
pcsx2 = qt6Packages.callPackage ../applications/emulators/pcsx2 { };
|
||||
|
||||
pcsxr = callPackage ../applications/emulators/pcsxr { };
|
||||
|
||||
ppsspp-sdl = let
|
||||
@ -19067,8 +19063,8 @@ with pkgs;
|
||||
|
||||
math-preview = callPackage ../tools/text/math-review { };
|
||||
|
||||
maven = maven3;
|
||||
maven3 = callPackage ../development/tools/build-managers/apache-maven { };
|
||||
maven3 = maven;
|
||||
inherit (maven) buildMaven;
|
||||
|
||||
mavproxy = python3Packages.callPackage ../applications/science/robotics/mavproxy { };
|
||||
|
||||
@ -22212,7 +22208,8 @@ with pkgs;
|
||||
|
||||
libfabric = callPackage ../development/libraries/libfabric { };
|
||||
|
||||
libfive = qt6Packages.callPackage ../development/libraries/libfive {
|
||||
libfive = libsForQt5.callPackage ../development/libraries/libfive {
|
||||
stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv;
|
||||
python = python3;
|
||||
};
|
||||
|
||||
@ -26188,7 +26185,9 @@ with pkgs;
|
||||
buildGoModule = buildGo122Module;
|
||||
};
|
||||
|
||||
mir = callPackage ../servers/mir { };
|
||||
inherit (callPackage ../servers/mir { })
|
||||
mir
|
||||
mir_2_15;
|
||||
|
||||
miriway = callPackage ../applications/window-managers/miriway { };
|
||||
|
||||
@ -27530,8 +27529,6 @@ with pkgs;
|
||||
|
||||
go-protobuf = callPackage ../development/tools/go-protobuf { };
|
||||
|
||||
go-symbols = callPackage ../development/tools/go-symbols { };
|
||||
|
||||
go-toml = callPackage ../development/tools/go-toml { };
|
||||
|
||||
go-outline = callPackage ../development/tools/go-outline { };
|
||||
|
||||
Loading…
Reference in New Issue
Block a user