Merge staging-next into staging
This commit is contained in:
nixpkgs-ci[bot]
@@ -43,7 +43,11 @@ my $kernel = "lts";
|
||||
if (-e "/etc/nixos-generate-config.conf") {
|
||||
my $cfg = new Config::IniFiles -file => "/etc/nixos-generate-config.conf";
|
||||
$outDir = $cfg->val("Defaults", "Directory") // $outDir;
|
||||
$rootDir = $cfg->val("Defaults", "RootDirectory") // $rootDir;
|
||||
if (defined $cfg->val("Defaults", "RootDirectory")) {
|
||||
$rootDir = $cfg->val("Defaults", "RootDirectory");
|
||||
$rootDir =~ s/\/*$//; # remove trailing slashes
|
||||
$rootDir = File::Spec->rel2abs($rootDir); # resolve absolute path
|
||||
}
|
||||
$kernel = $cfg->val("Defaults", "Kernel") // $kernel;
|
||||
}
|
||||
|
||||
@@ -62,6 +66,8 @@ for (my $n = 0; $n < scalar @ARGV; $n++) {
|
||||
$rootDir = $ARGV[$n];
|
||||
die "$0: ‘--root’ requires an argument\n" unless defined $rootDir;
|
||||
die "$0: no need to specify `/` with `--root`, it is the default\n" if $rootDir eq "/";
|
||||
$rootDir =~ s/\/*$//; # remove trailing slashes
|
||||
$rootDir = File::Spec->rel2abs($rootDir); # resolve absolute path
|
||||
}
|
||||
elsif ($arg eq "--force") {
|
||||
$force = 1;
|
||||
@@ -85,8 +91,6 @@ for (my $n = 0; $n < scalar @ARGV; $n++) {
|
||||
}
|
||||
}
|
||||
|
||||
$rootDir =~ s/\/*$//; # remove trailing slashes
|
||||
$rootDir = File::Spec->rel2abs($rootDir); # resolve absolute path
|
||||
die "$0: invalid kernel: '$kernel'" unless $kernel eq "lts" || $kernel eq "latest";
|
||||
|
||||
my @attrs = ();
|
||||
|
||||
@@ -7969,10 +7969,10 @@
|
||||
elpaBuild {
|
||||
pname = "shell-quasiquote";
|
||||
ename = "shell-quasiquote";
|
||||
version = "0.0.20221221.82030";
|
||||
version = "0.0.20250316.162215";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/devel/shell-quasiquote-0.0.20221221.82030.tar";
|
||||
sha256 = "0g2yq64yyim35lvxify65kq3y49qrvgri7jyl9rgz8999gb3h8dj";
|
||||
url = "https://elpa.gnu.org/devel/shell-quasiquote-0.0.20250316.162215.tar";
|
||||
sha256 = "1f19k60y30vnp3dw62fn2wi94bkgdfx6nl8i50yx5nnw0cjp9f7l";
|
||||
};
|
||||
packageRequires = [ ];
|
||||
meta = {
|
||||
|
||||
@@ -40,11 +40,11 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "gajim";
|
||||
version = "2.0.2";
|
||||
version = "2.0.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://gajim.org/downloads/${lib.versions.majorMinor version}/gajim-${version}.tar.gz";
|
||||
hash = "sha256-Qml1ggqjsTXGnGHntApwoa0ySlxUIi2S0IOY+lfxHeU=";
|
||||
hash = "sha256-DbM80fyJ+jwB9Yc9vfoiDqW7Sx7MDR0OEkHdOC6nRG4=";
|
||||
};
|
||||
|
||||
format = "pyproject";
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
let
|
||||
pname = "mendeley";
|
||||
version = "2.130.2";
|
||||
version = "2.131.0";
|
||||
|
||||
executableName = "${pname}-reference-manager";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://static.mendeley.com/bin/desktop/mendeley-reference-manager-${version}-x86_64.AppImage";
|
||||
hash = "sha256-HLUUoW+j0W9iEGu0Irbd/y7Vgj2rCGT7tDGMzmMh3qI=";
|
||||
hash = "sha256-pVykRTs0yI9UArgxuE3RUKI8onv27hjyG1Dy4PXztuQ=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extractType2 {
|
||||
|
||||
@@ -25,14 +25,14 @@ let
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
version = "16.3.9";
|
||||
version = "16.3.11";
|
||||
pname = "jmol";
|
||||
|
||||
src = let
|
||||
baseVersion = "${lib.versions.major version}.${lib.versions.minor version}";
|
||||
in fetchurl {
|
||||
url = "mirror://sourceforge/jmol/Jmol/Version%20${baseVersion}/Jmol%20${version}/Jmol-${version}-binary.tar.gz";
|
||||
hash = "sha256-+Eh5484tW/U/YJb7sMf6W/QrsBz5j/aTrW4vnJobwiY=";
|
||||
hash = "sha256-sa2wYzLtk3rSghNxk/kJfaOIDPEJLfwKRRIXMRNBEuI=";
|
||||
};
|
||||
|
||||
patchPhase = ''
|
||||
|
||||
@@ -2,21 +2,20 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitLab,
|
||||
dune_3,
|
||||
ocamlPackages,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
|
||||
pname = "acgtk";
|
||||
version = "2.0.0";
|
||||
version = "2.1.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.inria.fr";
|
||||
owner = "acg";
|
||||
repo = "dev/acgtk";
|
||||
rev = "release-2.0.0-20231009";
|
||||
hash = "sha256-ZymSQkBMBePPw7pJkfLkmqbIkQyIqB+7Pyrih2WAO50=";
|
||||
tag = "release-2.1.0";
|
||||
hash = "sha256-XuPcubt1lvnQio+km6MhmDu41NXNVXKKpzGd/Y1XzLo=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
|
||||
owner = "joshrotenberg";
|
||||
repo = "adrs";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-BnbI5QsrnyEQFpTWqOPrbZnVa7J3vaByO9fnKd5t64o=";
|
||||
hash = "sha256-C9Kg7xY3Q0xsd2DlUcc3OM+/hyzmwz55oi6Ul3K7zkM=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
|
||||
@@ -9,14 +9,14 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "apktool";
|
||||
version = "2.11.0";
|
||||
version = "2.11.1";
|
||||
|
||||
src = fetchurl {
|
||||
urls = [
|
||||
"https://bitbucket.org/iBotPeaches/apktool/downloads/apktool_${version}.jar"
|
||||
"https://github.com/iBotPeaches/Apktool/releases/download/v${version}/apktool_${version}.jar"
|
||||
];
|
||||
hash = "sha256-j9wXxv4ubYDXG4cY6ypdA3nxzHE5rnd/akmc45eyb1Q=";
|
||||
hash = "sha256-VtWcUk/HZCY7qNNFdU2Nr1WxiHgYsVzTtZT1VdJJ4ts=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
@@ -13,13 +13,13 @@ telegram-desktop.override {
|
||||
unwrapped = telegram-desktop.unwrapped.overrideAttrs (
|
||||
finalAttrs: previousAttrs: {
|
||||
pname = "ayugram-desktop-unwrapped";
|
||||
version = "5.11.1";
|
||||
version = "5.12.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AyuGram";
|
||||
repo = "AyuGramDesktop";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-AiMPbcEvbyhGd1V9mg95Q+mLrBH0DqTEFpC3D9ziCy8=";
|
||||
hash = "sha256-Zjik+9J0YtabVW1VEkJr/Bl3SIakVQ8EiTLYm28rEIk=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -6,17 +6,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "circom";
|
||||
version = "2.2.1";
|
||||
version = "2.2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "iden3";
|
||||
repo = "circom";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Vwu2DAWIqzqgo6oXcQxvhn7ssGojQkRRw9sKk7qjREk=";
|
||||
hash = "sha256-BSInX4owuamRWnlKL1yJJOyzRIiE55TIzCk2TdX7aOQ=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-64mKd3M5EpqWASTPz7cqNbDyh4be7xR4fudjcx029u8=";
|
||||
cargoHash = "sha256-dkgLp6BKuublS97iRXYzbT4ztbWBD5IDMz9rDY9XgcA=";
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
+4
-4
@@ -5,13 +5,13 @@
|
||||
"packages": {
|
||||
"": {
|
||||
"dependencies": {
|
||||
"@anthropic-ai/claude-code": "^0.2.45"
|
||||
"@anthropic-ai/claude-code": "^0.2.48"
|
||||
}
|
||||
},
|
||||
"node_modules/@anthropic-ai/claude-code": {
|
||||
"version": "0.2.45",
|
||||
"resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-0.2.45.tgz",
|
||||
"integrity": "sha512-r8uSA59wuNUHjlU+snwkZBHGsuv7z5+sxDFhLxI+1wz6PU9CU2/V37k26c7YpN9OFfeRmt9hk7gb3KaIlTH2ZA==",
|
||||
"version": "0.2.48",
|
||||
"resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-0.2.48.tgz",
|
||||
"integrity": "sha512-Av9EC7oBGSgNzJ8IFyYQnzCURtzmUZb1fRL+4vKJunCF33nCkTW82DEOKsfcj+Z268/Pf8WhXuI/vLbwpMdymw==",
|
||||
"hasInstallScript": true,
|
||||
"license": "SEE LICENSE IN README.md",
|
||||
"bin": {
|
||||
|
||||
@@ -6,14 +6,14 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "claude-code";
|
||||
version = "0.2.45";
|
||||
version = "0.2.48";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${version}.tgz";
|
||||
hash = "sha256-N0ZJ+DxjT4Xtmd+zE/AXJTaj8c+RnR4umepgWUTh2XE=";
|
||||
hash = "sha256-zocgUMHWAPhA9ebqfeVCMHuJ1QBX3q8Y/dDjsxKhPv4=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-agHCUnVCyqOF85x5tECPlQnV5wNmzIo5gipnVVMKnZE=";
|
||||
npmDepsHash = "sha256-kwq08sKDZDH0eM5gAj+HllQkadDqgyNxMd2xmiTZvq8=";
|
||||
|
||||
postPatch = ''
|
||||
cp ${./package-lock.json} package-lock.json
|
||||
|
||||
@@ -6,6 +6,7 @@
|
||||
bubblewrap,
|
||||
cairo,
|
||||
cargo,
|
||||
gettext,
|
||||
git,
|
||||
gnome,
|
||||
gtk4,
|
||||
@@ -40,6 +41,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
nativeBuildInputs = [
|
||||
cargo
|
||||
gettext # for msgfmt
|
||||
git
|
||||
meson
|
||||
ninja
|
||||
@@ -64,6 +66,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
"-Dvapi=false"
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
passthru = {
|
||||
updateScript = gnome.updateScript {
|
||||
attrPath = "glycin-loaders";
|
||||
|
||||
@@ -41,7 +41,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
passthru.tests = {
|
||||
inherit
|
||||
fwupd-efi
|
||||
ipxe
|
||||
syslinux
|
||||
;
|
||||
};
|
||||
|
||||
@@ -0,0 +1,96 @@
|
||||
{
|
||||
fetchFromGitHub,
|
||||
lib,
|
||||
makeWrapper,
|
||||
ruby,
|
||||
stdenv,
|
||||
versionCheckHook,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "haiti";
|
||||
version = "3.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "noraj";
|
||||
repo = "haiti";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-1PGGlnbw8zg2sNEc85Un7no7elS5aPSfjzfmqovmiHk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
ruby
|
||||
];
|
||||
|
||||
paintSrc = fetchFromGitHub {
|
||||
owner = "janlelis";
|
||||
repo = "paint";
|
||||
rev = "7076784c5d57f178690d19e4f8644441ff73f518";
|
||||
hash = "sha256-uITUfcZjOACeCGsozpUxAYd98Y9oFTgyXems2Q3aYRU=";
|
||||
};
|
||||
|
||||
docoptSrc = fetchFromGitHub {
|
||||
owner = "docopt";
|
||||
repo = "docopt.rb";
|
||||
rev = "794c47d7cb62ca71d65086623a55881449bc2f9e";
|
||||
hash = "sha256-9DbKTPsZRRAqDkN2wMzBtbbtyKDcVSGmVDcekf4WBnw=";
|
||||
};
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
paintBuild=$(mktemp -d)
|
||||
cp -r ${finalAttrs.paintSrc}/* $paintBuild
|
||||
pushd $paintBuild
|
||||
sed -i '/.github/d' paint.gemspec
|
||||
sed -i '/.rspec/d' paint.gemspec
|
||||
gem build -V paint.gemspec
|
||||
popd
|
||||
paintGem=$paintBuild/paint-2.3.0.gem
|
||||
|
||||
docoptBuild=$(mktemp -d)
|
||||
cp -r ${finalAttrs.docoptSrc}/* $docoptBuild
|
||||
pushd $docoptBuild
|
||||
gem build -V docopt.gemspec
|
||||
popd
|
||||
docoptGem=$docoptBuild/docopt-0.6.1.gem
|
||||
|
||||
gem build -V haiti.gemspec
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
gem install -V $paintGem $docoptGem haiti-hash-${finalAttrs.version}.gem \
|
||||
--install-dir=$out/lib \
|
||||
--ignore-dependencies
|
||||
|
||||
for i in $out/lib/bin/*;
|
||||
do
|
||||
filename=$(basename $i)
|
||||
makeWrapper ${lib.getExe ruby} $out/bin/$filename \
|
||||
--set GEM_PATH $out/lib \
|
||||
--add-flags $out/lib/bin/$filename
|
||||
done
|
||||
|
||||
rm -rf $out/lib/{build_info,cache,doc,extensions,plugins}
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
doInstallCheck = true;
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/noraj/haiti/releases/tag/v${finalAttrs.version}";
|
||||
description = "CLI tool to identify hash types";
|
||||
homepage = "https://github.com/noraj/haiti";
|
||||
license = lib.licenses.mit;
|
||||
mainProgram = "haiti";
|
||||
maintainers = with lib.maintainers; [ KSJ2000 ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
})
|
||||
@@ -2,6 +2,8 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
libGL,
|
||||
libGLU,
|
||||
SDL,
|
||||
SDL_mixer,
|
||||
autoreconfHook,
|
||||
@@ -25,6 +27,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libGL
|
||||
libGLU
|
||||
SDL
|
||||
SDL_mixer
|
||||
];
|
||||
|
||||
@@ -4,7 +4,6 @@
|
||||
fetchFromGitHub,
|
||||
unstableGitUpdater,
|
||||
buildPackages,
|
||||
gnu-efi,
|
||||
mtools,
|
||||
openssl,
|
||||
perl,
|
||||
@@ -52,7 +51,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
version = "1.21.1-unstable-2025-01-10";
|
||||
|
||||
nativeBuildInputs = [
|
||||
gnu-efi
|
||||
mtools
|
||||
openssl
|
||||
perl
|
||||
|
||||
@@ -112,12 +112,13 @@ stdenv.mkDerivation {
|
||||
enableParallelBuilding = false;
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p "$out/bin" "$out/etc/john" "$out/share/john" "$out/share/doc/john" "$out/share/john/rules" "$out/${perlPackages.perl.libPrefix}"
|
||||
mkdir -p "$out/bin" "$out/etc/john" "$out/share/john" "$out/share/doc/john" "$out/share/john/rules" "$out/share/john/opencl" "$out/${perlPackages.perl.libPrefix}"
|
||||
find -L ../run -mindepth 1 -maxdepth 1 -type f -executable \
|
||||
-exec cp -d {} "$out/bin" \;
|
||||
cp -vt "$out/etc/john" ../run/*.conf
|
||||
cp -vt "$out/share/john" ../run/*.chr ../run/password.lst
|
||||
cp -vt "$out/share/john/rules" ../run/rules/*.rule
|
||||
cp -vt "$out/share/john/opencl" ../run/opencl/*.cl ../run/opencl/*.h
|
||||
cp -vLrt "$out/share/doc/john" ../doc/*
|
||||
cp -vt "$out/${perlPackages.perl.libPrefix}" ../run/lib/*
|
||||
'';
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "liblouis";
|
||||
version = "3.32.0";
|
||||
version = "3.33.0";
|
||||
|
||||
outputs = [ "out" "dev" "info" "doc" ]
|
||||
# configure: WARNING: cannot generate manual pages while cross compiling
|
||||
@@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
owner = "liblouis";
|
||||
repo = "liblouis";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-gub/XUwbM7wzeQ0eXtpqaWxPDhlksVW7xSnFB6oXNyQ=";
|
||||
hash = "sha256-+p/2eLbQ5aYtxQIkoHaVE1xDqstveedf+56aRNX9C7M=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
@@ -13,13 +13,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libosmium";
|
||||
version = "2.21.0";
|
||||
version = "2.22.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "osmcode";
|
||||
repo = "libosmium";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-IGZQBziXKYVG+uKLjHr6LsIF5H8klq6LGF5j1KrfHZU=";
|
||||
hash = "sha256-b4jdPh6lJ/ALPVblDt16Nabx9ZL8MW8/roI+NqTZshU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@@ -6,17 +6,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "lintspec";
|
||||
version = "0.3.0";
|
||||
version = "0.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "beeb";
|
||||
repo = "lintspec";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-88NPB9aikjHFCqmZpwvPtYECeWv/TYAY9S+YqP5xzNA=";
|
||||
hash = "sha256-QLD2eGuMiNh4qlzGPJOS2VbwpNCQ8+l3qKj2hDNe1oA=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-2G/ycPcyJX1uImqvI+Us5i5GmemuSNW3pQ+dVNk11lg=";
|
||||
cargoHash = "sha256-EECQpihj+N8TmbSLtheyRo/ZtuTvyLT32D0mVPRR2FI=";
|
||||
|
||||
meta = {
|
||||
description = "Blazingly fast linter for NatSpec comments in Solidity code";
|
||||
|
||||
@@ -16,12 +16,12 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "meshoptimizer";
|
||||
version = "0.22";
|
||||
version = "0.23";
|
||||
src = fetchFromGitHub {
|
||||
owner = "zeux";
|
||||
repo = "meshoptimizer";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-/47CfgPtj+e4iz01+rwahP+jCXPXXZhTeLLiLktrJ6g=";
|
||||
hash = "sha256-vA9FXpJuLJS510MZgVZ96LAUbjXth4CFNkXMEV0DpYg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@@ -147,7 +147,5 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
qbisi
|
||||
];
|
||||
platforms = lib.platforms.unix;
|
||||
# Dependency of scalapack for mpiSupport is broken on darwin platform
|
||||
broken = mpiSupport && stdenv.hostPlatform.isDarwin;
|
||||
};
|
||||
})
|
||||
|
||||
@@ -17,7 +17,7 @@ buildNimSbom (finalAttrs: {
|
||||
owner = "~ehmry";
|
||||
repo = "nim_lk";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-1WD1UVi6N7tftE69LAhx86Qxc97oMHKARFsCVGqtEm4=";
|
||||
hash = "sha256-BZNQs8zMtBMcqafvU+WyjtBZQJ8zhQIPSR51j7C9Z6g=";
|
||||
};
|
||||
|
||||
buildInputs = [ openssl ];
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
"bom-ref": "pkg:nim/nim_lk",
|
||||
"name": "nim_lk",
|
||||
"description": "Tool for generating Nim lockfiles",
|
||||
"version": "20241025",
|
||||
"version": "20250309",
|
||||
"authors": [
|
||||
{
|
||||
"name": "Emery Hemingway"
|
||||
|
||||
@@ -37,7 +37,7 @@ for index in "${sources[@]}"; do
|
||||
remote_sources+=("$index")
|
||||
|
||||
base_address=$(
|
||||
curl --compressed --netrc -fsL "$index" |
|
||||
curl --compressed --netrc-optional -fsSL "$index" |
|
||||
jq -r '.resources[] | select(."@type" == "PackageBaseAddress/3.0.0")."@id"'
|
||||
)
|
||||
if [[ ! "$base_address" == */ ]]; then
|
||||
|
||||
@@ -85,12 +85,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
SOURCE_DATE_EPOCH = "0";
|
||||
};
|
||||
|
||||
outputs =
|
||||
[ "out" ]
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [
|
||||
"man"
|
||||
"dev"
|
||||
];
|
||||
outputs = [
|
||||
"out"
|
||||
"man"
|
||||
"dev"
|
||||
];
|
||||
|
||||
buildInputs =
|
||||
[
|
||||
@@ -152,14 +151,16 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
# The file names we need to iterate are a combination of ${p}${s}, and there
|
||||
# are 7x3 such options. We use lib.mapCartesianProduct to iterate them all.
|
||||
fileNamesToIterate = {
|
||||
p = [
|
||||
"mpi"
|
||||
"shmem"
|
||||
"osh"
|
||||
];
|
||||
p =
|
||||
[
|
||||
"mpi"
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [
|
||||
"shmem"
|
||||
"osh"
|
||||
];
|
||||
s =
|
||||
[
|
||||
"CC"
|
||||
"c++"
|
||||
"cxx"
|
||||
"cc"
|
||||
@@ -168,7 +169,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
"f77"
|
||||
"f90"
|
||||
"fort"
|
||||
];
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [ "CC" ];
|
||||
};
|
||||
wrapperDataSubstitutions =
|
||||
{
|
||||
@@ -176,12 +178,16 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
# compiler=_ line that should be replaced by a compiler=#2 string, where
|
||||
# #2 is the 2nd value in the list.
|
||||
"cc" = [
|
||||
"gcc"
|
||||
"${targetPackages.stdenv.cc}/bin/${targetPackages.stdenv.cc.targetPrefix}cc"
|
||||
# "$CC" is expanded by the executing shell in the substituteInPlace
|
||||
# commands to the name of the compiler ("clang" for Darwin and
|
||||
# "gcc" for Linux)
|
||||
"$CC"
|
||||
"${targetPackages.stdenv.cc}/bin/${targetPackages.stdenv.cc.targetPrefix}$CC"
|
||||
];
|
||||
"c++" = [
|
||||
"g++"
|
||||
"${targetPackages.stdenv.cc}/bin/${targetPackages.stdenv.cc.targetPrefix}c++"
|
||||
# Same as with $CC
|
||||
"$CXX"
|
||||
"${targetPackages.stdenv.cc}/bin/${targetPackages.stdenv.cc.targetPrefix}$CXX"
|
||||
];
|
||||
}
|
||||
// lib.optionalAttrs fortranSupport {
|
||||
@@ -198,8 +204,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
wrapperDataFileNames = {
|
||||
part1 = [
|
||||
"mpi"
|
||||
"shmem"
|
||||
];
|
||||
] ++ lib.optionals stdenv.hostPlatform.isLinux [ "shmem" ];
|
||||
part2 = builtins.attrNames wrapperDataSubstitutions;
|
||||
};
|
||||
in
|
||||
@@ -226,12 +231,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
${lib.pipe wrapperDataFileNames [
|
||||
(lib.mapCartesianProduct (
|
||||
{ part1, part2 }:
|
||||
# From some reason the Darwin build doesn't include some of these
|
||||
# wrapperDataSubstitutions strings and even some of the files. Hence
|
||||
# we currently don't perform these substitutions on other platforms,
|
||||
# until a Darwin user will care enough about this cross platform
|
||||
# related substitution.
|
||||
lib.optionalString stdenv.hostPlatform.isLinux ''
|
||||
''
|
||||
substituteInPlace "''${!outputDev}/share/openmpi/${part1}${part2}-wrapper-data.txt" \
|
||||
--replace-fail \
|
||||
compiler=${lib.elemAt wrapperDataSubstitutions.${part2} 0} \
|
||||
@@ -250,19 +250,16 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
done
|
||||
'';
|
||||
|
||||
postFixup =
|
||||
lib.optionalString (lib.elem "man" finalAttrs.outputs) ''
|
||||
remove-references-to -t "''${!outputMan}" $(readlink -f $out/lib/libopen-pal${stdenv.hostPlatform.extensions.library})
|
||||
''
|
||||
+ lib.optionalString (lib.elem "dev" finalAttrs.outputs) ''
|
||||
remove-references-to -t "''${!outputDev}" $out/bin/mpirun
|
||||
remove-references-to -t "''${!outputDev}" $(readlink -f $out/lib/libopen-pal${stdenv.hostPlatform.extensions.library})
|
||||
postFixup = ''
|
||||
remove-references-to -t "''${!outputMan}" $(readlink -f $out/lib/libopen-pal${stdenv.hostPlatform.extensions.library})
|
||||
remove-references-to -t "''${!outputDev}" $out/bin/mpirun
|
||||
remove-references-to -t "''${!outputDev}" $(readlink -f $out/lib/libopen-pal${stdenv.hostPlatform.extensions.library})
|
||||
|
||||
# The path to the wrapper is hard coded in libopen-pal.so, which we just cleared.
|
||||
wrapProgram "''${!outputDev}/bin/opal_wrapper" \
|
||||
--set OPAL_INCLUDEDIR "''${!outputDev}/include" \
|
||||
--set OPAL_PKGDATADIR "''${!outputDev}/share/openmpi"
|
||||
'';
|
||||
# The path to the wrapper is hard coded in libopen-pal.so, which we just cleared.
|
||||
wrapProgram "''${!outputDev}/bin/opal_wrapper" \
|
||||
--set OPAL_INCLUDEDIR "''${!outputDev}/include" \
|
||||
--set OPAL_PKGDATADIR "''${!outputDev}/share/openmpi"
|
||||
'';
|
||||
|
||||
doCheck = true;
|
||||
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "openttd-ttf";
|
||||
version = "0.6";
|
||||
version = "0.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zephyris";
|
||||
repo = "openttd-ttf";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-Nr3oLiCEdpUhB/IczCEoLM8kb1hGDH/d6WYWRbjgOi8=";
|
||||
hash = "sha256-HKOG3Ov0LBCW7Z0FK5BrZRycn2S5gVRnwyU9fM3hb5M=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -46,12 +46,12 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
homepage = "https://github.com/zephyris/openttd-ttf";
|
||||
changelog = "https://github.com/zephyris/openttd-ttf/releases/tag/${finalAttrs.version}";
|
||||
description = "TrueType typefaces for text in a pixel art style, designed for use in OpenTTD";
|
||||
license = [ licenses.gpl2 ];
|
||||
platforms = platforms.all;
|
||||
maintainers = [ maintainers.sfrijters ];
|
||||
license = [ lib.licenses.gpl2 ];
|
||||
platforms = lib.platforms.all;
|
||||
maintainers = [ lib.maintainers.sfrijters ];
|
||||
};
|
||||
})
|
||||
|
||||
Generated
+99
-24
@@ -1,13 +1,13 @@
|
||||
[
|
||||
{
|
||||
"pname": "AtkSharp",
|
||||
"version": "3.24.24.38",
|
||||
"hash": "sha256-J9/+MU+zky18Lk3gfTCox6Jtm1SyjQQAK0vCb5Ecu4k="
|
||||
"version": "3.24.24.95",
|
||||
"hash": "sha256-NgdWbXToBHhEVbvPrFcwXeit5iaqbBmNPQiC0jPKlnQ="
|
||||
},
|
||||
{
|
||||
"pname": "CairoSharp",
|
||||
"version": "3.24.24.38",
|
||||
"hash": "sha256-DeXSAuSiGc7SzHb3HsUkLDLe5HZVpRn7VQFNhAAvflg="
|
||||
"version": "3.24.24.95",
|
||||
"hash": "sha256-ycdgmQyQ1uSshI/9uMaqn5OBxRF8RADf4Tn/TptE2BU="
|
||||
},
|
||||
{
|
||||
"pname": "dotnet-outdated-tool",
|
||||
@@ -16,39 +16,109 @@
|
||||
},
|
||||
{
|
||||
"pname": "Eto.Forms",
|
||||
"version": "2.7.4",
|
||||
"hash": "sha256-Y9VxSjsm3JbPeoETMvwGQkk02QuXMCSLVUVAQwx3oGA="
|
||||
"version": "2.9.0",
|
||||
"hash": "sha256-ByMWsnu3LS1Q35glUOopUS2H5bRkJo7hpS6ublyqpxU="
|
||||
},
|
||||
{
|
||||
"pname": "Eto.Platform.Gtk",
|
||||
"version": "2.7.4",
|
||||
"hash": "sha256-lrko3UKuGUwbkMhJEE+tdSdnizOJLOILGFQRHfgvw38="
|
||||
"version": "2.9.0",
|
||||
"hash": "sha256-4t0DpPfr8VGtC0N7v5CrTxfIOagHchF7LhUY8yCH9Aw="
|
||||
},
|
||||
{
|
||||
"pname": "GdkSharp",
|
||||
"version": "3.24.24.38",
|
||||
"hash": "sha256-JpggYCsUlrGZ1CKjCZMawiCjJDWQQc45YdYuA8L7rzA="
|
||||
"version": "3.24.24.95",
|
||||
"hash": "sha256-NYjADgZG9TUQDIZiSSXDAxj5PyX/B7oKRo9f8Oyb4vI="
|
||||
},
|
||||
{
|
||||
"pname": "GioSharp",
|
||||
"version": "3.24.24.38",
|
||||
"hash": "sha256-RLd7hlelMgp9Eqga+0YxZVHN6GtbCe6IcHct2bPKcaw="
|
||||
"version": "3.24.24.95",
|
||||
"hash": "sha256-5THx4af5PghPnQxXdnsC+wtVcoslh+0636WkB1FaPYg="
|
||||
},
|
||||
{
|
||||
"pname": "GLibSharp",
|
||||
"version": "3.24.24.38",
|
||||
"hash": "sha256-df/8vV4OeQ2v8k7HPNrKcoEQdfPUWrHmM2S1F3DrEag="
|
||||
"version": "3.24.24.95",
|
||||
"hash": "sha256-1pDRkKoUI9fLJBcTA2DBlpVccJl2GyAdL+VKjsFbttA="
|
||||
},
|
||||
{
|
||||
"pname": "GtkSharp",
|
||||
"version": "3.24.24.38",
|
||||
"hash": "sha256-Uvx7/ylLL4HROPWifMZnOYD9fe0qxlc8QsCayN5TyDI="
|
||||
"version": "3.24.24.95",
|
||||
"hash": "sha256-sBvk5Ecf2i6c2fYVjMBVoXz0I6IlucOWeE2czZH9QHg="
|
||||
},
|
||||
{
|
||||
"pname": "Lidgren.Network",
|
||||
"version": "1.0.2",
|
||||
"hash": "sha256-LsJWQ9QVG3teOJL2dlitp6TtTKmhlGBbaBwY4D3fQE0="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.AspNetCore.App.Ref",
|
||||
"version": "8.0.13",
|
||||
"hash": "sha256-b18KQu7MpyC16a29m2lnGjMOS7upOto/L26kjZMskXU="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.AspNetCore.App.Runtime.linux-arm64",
|
||||
"version": "8.0.13",
|
||||
"hash": "sha256-tcjVQYbtKq0i4iFbwrphsg6SpeY6FGruGuFXCRF3+Dk="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.AspNetCore.App.Runtime.linux-x64",
|
||||
"version": "8.0.13",
|
||||
"hash": "sha256-QzXIvImfuh3GJ2OvwhD++QndWsKFaG7h5ucrtlQgLhU="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.AspNetCore.App.Runtime.osx-arm64",
|
||||
"version": "8.0.13",
|
||||
"hash": "sha256-2d5MjWdRU1n89QiNfQ89/TtpgAzJV/AQvCv57o3K5Gs="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.AspNetCore.App.Runtime.osx-x64",
|
||||
"version": "8.0.13",
|
||||
"hash": "sha256-6YC8Oa8Nsf1UPe+msdSiaBH8gC3ZslPT1c+GsE3hBXY="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.NETCore.App.Host.linux-arm64",
|
||||
"version": "8.0.13",
|
||||
"hash": "sha256-X2AqAooaPVCv3L5yEqW7IUBYWHwLmxpKrc9DsJP2xno="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.NETCore.App.Host.linux-x64",
|
||||
"version": "8.0.13",
|
||||
"hash": "sha256-hC1yeXkJtU8aVEeBozSulQmbsajxR+t8gtHsQXsAXBE="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.NETCore.App.Host.osx-arm64",
|
||||
"version": "8.0.13",
|
||||
"hash": "sha256-zkvfXzQR02bSSXuUAAxK09Nz7eOxJujfVtfIO5u/QZI="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.NETCore.App.Host.osx-x64",
|
||||
"version": "8.0.13",
|
||||
"hash": "sha256-KO28ZiI4EsH+t/ax1hR8Tptbz1IbEmyuFon4jeZd/5M="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.NETCore.App.Ref",
|
||||
"version": "8.0.13",
|
||||
"hash": "sha256-nzok5pDT+I1w9iZ8saaBFHk2Bj6jYipiVFlGcS0OnqU="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.NETCore.App.Runtime.linux-arm64",
|
||||
"version": "8.0.13",
|
||||
"hash": "sha256-XMvlGp3IvvV89/7QmOQczW19HkNF3LC/Tqrf02ITHCo="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.NETCore.App.Runtime.linux-x64",
|
||||
"version": "8.0.13",
|
||||
"hash": "sha256-gkFFzbfwUwawXswg21uDvP9b/ejuizH+oHZ2j+JNbTs="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.NETCore.App.Runtime.osx-arm64",
|
||||
"version": "8.0.13",
|
||||
"hash": "sha256-R3QROReDjm10EW6sVvlKjYxKf8PueejrhThwTXFd/Vk="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.NETCore.App.Runtime.osx-x64",
|
||||
"version": "8.0.13",
|
||||
"hash": "sha256-REWfahbBG/XxvXHQXqIALxv0LXtQmWgnoKFfnbTv8xs="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.NETCore.Platforms",
|
||||
"version": "1.1.0",
|
||||
@@ -56,8 +126,8 @@
|
||||
},
|
||||
{
|
||||
"pname": "Mono.Nat",
|
||||
"version": "3.0.3",
|
||||
"hash": "sha256-1BMcebt8V93F0E2j2ixLiewX75WBcuqYMB6JzwOkaqw="
|
||||
"version": "3.0.4",
|
||||
"hash": "sha256-NdOquU2NaKtCv0p1+eY6awjOBwwzf92CwAJ4Dgz2+4M="
|
||||
},
|
||||
{
|
||||
"pname": "NETStandard.Library",
|
||||
@@ -66,13 +136,13 @@
|
||||
},
|
||||
{
|
||||
"pname": "Newtonsoft.Json",
|
||||
"version": "13.0.2",
|
||||
"hash": "sha256-ESyjt/R7y9dDvvz5Sftozk+e/3Otn38bOcLGGh69Ot0="
|
||||
"version": "13.0.3",
|
||||
"hash": "sha256-hy/BieY4qxBWVVsDqqOPaLy1QobiIapkbrESm6v2PHc="
|
||||
},
|
||||
{
|
||||
"pname": "PangoSharp",
|
||||
"version": "3.24.24.38",
|
||||
"hash": "sha256-dq1c/G05iCmWmWZxwLV0e8qvQMS0620Bd0MSz4hEqjI="
|
||||
"version": "3.24.24.95",
|
||||
"hash": "sha256-YhltIz1jisJqR2ZxvbYy0ybi4oGw6qR2SkjF/2aWiBQ="
|
||||
},
|
||||
{
|
||||
"pname": "SharpCompress",
|
||||
@@ -94,6 +164,11 @@
|
||||
"version": "4.5.4",
|
||||
"hash": "sha256-3sCEfzO4gj5CYGctl9ZXQRRhwAraMQfse7yzKoRe65E="
|
||||
},
|
||||
{
|
||||
"pname": "System.Memory",
|
||||
"version": "4.5.5",
|
||||
"hash": "sha256-EPQ9o1Kin7KzGI5O3U3PUQAZTItSbk9h/i4rViN3WiI="
|
||||
},
|
||||
{
|
||||
"pname": "System.Numerics.Vectors",
|
||||
"version": "4.4.0",
|
||||
@@ -111,7 +186,7 @@
|
||||
},
|
||||
{
|
||||
"pname": "System.Text.Encoding.CodePages",
|
||||
"version": "6.0.0",
|
||||
"hash": "sha256-nGc2A6XYnwqGcq8rfgTRjGr+voISxNe/76k2K36coj4="
|
||||
"version": "9.0.0",
|
||||
"hash": "sha256-OvtGrWDjuXdcIuMV504IDiBq9g8vtRIcn5w25x4W9HE="
|
||||
}
|
||||
]
|
||||
|
||||
@@ -1,43 +1,49 @@
|
||||
{ lib
|
||||
, buildDotnetModule
|
||||
, fetchFromGitHub
|
||||
, dotnetCorePackages
|
||||
, wrapGAppsHook3
|
||||
, copyDesktopItems
|
||||
, gtk3
|
||||
, libnotify
|
||||
, makeDesktopItem
|
||||
, stdenv
|
||||
{
|
||||
lib,
|
||||
buildDotnetModule,
|
||||
fetchFromGitHub,
|
||||
dotnetCorePackages,
|
||||
wrapGAppsHook3,
|
||||
copyDesktopItems,
|
||||
gtk3,
|
||||
libnotify,
|
||||
makeDesktopItem,
|
||||
stdenv,
|
||||
}:
|
||||
|
||||
buildDotnetModule rec {
|
||||
pname = "pablodraw";
|
||||
version = "3.3.13-beta";
|
||||
version = "3.1.14-beta";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cwensley";
|
||||
repo = "pablodraw";
|
||||
rev = version;
|
||||
hash = "sha256-PsCFiNcWYh6Bsf5Ihi3IoYyv66xUT1cRBKkx+K5gB/M=";
|
||||
tag = version;
|
||||
hash = "sha256-p2YeWC3ZZOI5zDpgDmEX3C5ByAAjLxJ0CqFAqKeoJ0Q=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace ${projectFile} \
|
||||
--replace-warn '<EnableCompressionInSingleFile>True</EnableCompressionInSingleFile>' ""
|
||||
'';
|
||||
|
||||
projectFile = "Source/PabloDraw/PabloDraw.csproj";
|
||||
|
||||
executables = [ "PabloDraw" ];
|
||||
|
||||
dotnet-sdk = dotnetCorePackages.sdk_7_0-bin;
|
||||
dotnet-runtime = dotnetCorePackages.runtime_7_0-bin;
|
||||
dotnet-sdk = dotnetCorePackages.sdk_9_0;
|
||||
dotnet-runtime = dotnetCorePackages.runtime_9_0;
|
||||
|
||||
nugetDeps = ./deps.json;
|
||||
|
||||
nativeBuildInputs = [ wrapGAppsHook3 copyDesktopItems ];
|
||||
dotnetFlags = [
|
||||
"-p:EnableCompressionInSingleFile=false"
|
||||
];
|
||||
|
||||
runtimeDeps = [ gtk3 libnotify ];
|
||||
nativeBuildInputs = [
|
||||
wrapGAppsHook3
|
||||
copyDesktopItems
|
||||
];
|
||||
|
||||
runtimeDeps = [
|
||||
gtk3
|
||||
libnotify
|
||||
];
|
||||
|
||||
desktopItems = [
|
||||
(makeDesktopItem {
|
||||
@@ -57,13 +63,16 @@ buildDotnetModule rec {
|
||||
install -Dm644 Assets/PabloDraw-64.png $out/share/icons/hicolor/64x64/apps/pablodraw.png
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Ansi/Ascii text and RIPscrip vector graphic art editor/viewer with multi-user capabilities";
|
||||
homepage = "https://picoe.ca/products/pablodraw";
|
||||
license = licenses.mit;
|
||||
license = lib.licenses.mit;
|
||||
mainProgram = "PabloDraw";
|
||||
maintainers = with maintainers; [ aleksana kip93 ];
|
||||
platforms = platforms.all;
|
||||
maintainers = with lib.maintainers; [
|
||||
aleksana
|
||||
kip93
|
||||
];
|
||||
platforms = lib.platforms.all;
|
||||
broken = stdenv.hostPlatform.isDarwin; # Eto.Platform.Mac64 not found in nugetSource
|
||||
};
|
||||
}
|
||||
|
||||
@@ -0,0 +1,41 @@
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchurl,
|
||||
pam,
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pam_rundir";
|
||||
version = "1.0.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://jjacky.com/pam_rundir/pam_rundir-${version}.tar.gz";
|
||||
hash = "sha256-x3m2me0jd3o726h7f2ftOV/pV/PJYTj67kX4eie8wCA=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace Makefile \
|
||||
--replace-fail /usr/share/man /share/man
|
||||
'';
|
||||
|
||||
buildInputs = [
|
||||
pam
|
||||
];
|
||||
|
||||
configureFlags = [
|
||||
"--securedir=/lib/security"
|
||||
"--with-parentdir=/run/user"
|
||||
];
|
||||
|
||||
installFlags = [
|
||||
"DESTDIR=$(out)"
|
||||
];
|
||||
|
||||
meta = {
|
||||
homepage = "http://jjacky.com/pam_rundir";
|
||||
description = "Provide user runtime directory on Linux systems";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = with lib; [ maintainers.aanderse ];
|
||||
};
|
||||
}
|
||||
@@ -2,19 +2,24 @@
|
||||
lib,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
libllvm,
|
||||
}:
|
||||
|
||||
buildGoModule {
|
||||
pname = "pprof";
|
||||
version = "0-unstable-2024-09-25";
|
||||
version = "0-unstable-2025-03-02";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "google";
|
||||
repo = "pprof";
|
||||
rev = "fa3061bff0bcf0d611f07dbdba73665bd2bbac97";
|
||||
hash = "sha256-wUHCbgmJI3YTettVVrLnRPIexaHuAQDmbnHXPTLBBYM=";
|
||||
rev = "9094ed2288e75ea6574fce30e1474932a96bb048";
|
||||
hash = "sha256-pvjKxBHIL1wq24Hsq3UOtYh+MEH4G1dOSz4lEyiTPRc=";
|
||||
};
|
||||
|
||||
nativeCheckInputs = [
|
||||
libllvm
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
rm -rf browsertests # somewhat independent module to ignore.
|
||||
'';
|
||||
|
||||
@@ -11,17 +11,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "proto";
|
||||
version = "0.46.0";
|
||||
version = "0.47.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "moonrepo";
|
||||
repo = "proto";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-zq5zjYljjpriDsTmT0W9zbuJREwYT83N6e6QgWz/4h4=";
|
||||
hash = "sha256-rCn27Lw75a1LOiQTEjQNHal8WuHKBhQVMuPiETpcuT0=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-dQY5mn6f5FhC34T+jpCX1u4s+5yJvTFUBttca7c7G3Y=";
|
||||
cargoHash = "sha256-XCu0jf6mnPSdaeODe0PQ14YeIg02a9iNLBYkLPcenQ4=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
darwin.apple_sdk.frameworks.SystemConfiguration
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "roddhjav-apparmor-rules";
|
||||
version = "0-unstable-2025-03-04";
|
||||
version = "0-unstable-2025-03-14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "roddhjav";
|
||||
repo = "apparmor.d";
|
||||
rev = "334b48749a67f97d2eab517ce8418807965390ea";
|
||||
hash = "sha256-UXgk7P41yeGYfMNfasAhtTqinmkJVltZHulfUdMIIW0=";
|
||||
rev = "07dbb0c7d3bc3038ad9eb4cf3304c7da1af440d3";
|
||||
hash = "sha256-9Sla1i24wzKpm0Zoap+OXzfXYotJvjYVGm3JGcpTvJc=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
@@ -1,45 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
makeWrapper,
|
||||
bc,
|
||||
xorgserver,
|
||||
xpra,
|
||||
xrandr,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
version = "unstable-2018-06-03";
|
||||
pname = "run-scaled";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kaueraal";
|
||||
repo = "run_scaled";
|
||||
rev = "fa71b3c17e627a96ff707ad69f1def5361f2245c";
|
||||
sha256 = "1ma4ax7ydq4xvyzrc4zapihmf7v3d9zl9mbi8bgpps7nlgz544ys";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
cp run_scaled $out/bin
|
||||
wrapProgram $out/bin/run_scaled --prefix PATH ":" \
|
||||
${lib.makeBinPath [
|
||||
bc
|
||||
xorgserver
|
||||
xpra
|
||||
xrandr
|
||||
]}
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Run an X application scaled via xpra";
|
||||
homepage = "https://github.com/kaueraal/run_scaled";
|
||||
maintainers = [ maintainers.snaar ];
|
||||
license = licenses.bsd3;
|
||||
platforms = platforms.unix;
|
||||
mainProgram = "run_scaled";
|
||||
};
|
||||
}
|
||||
@@ -9,11 +9,11 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "sea-orm-cli";
|
||||
version = "1.1.4";
|
||||
version = "1.1.7";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
hash = "sha256-6SFEzbXarfF8FXQqzc8n5S283xKfqqS/sfIBzpGxS04=";
|
||||
hash = "sha256-/Wer+3uNWk9p/l1uVpMLEXrDQ/PB+rcpWPi6tuhucSo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec {
|
||||
buildInputs = [ openssl ];
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-/44i91g0BllvhqZAqvm4cpm4JTWtm1wuydis33pjY+U=";
|
||||
cargoHash = "sha256-9o8HT5GNeqGQqzrDhSzzwoeo//MYV1YPec98j8UMHv4=";
|
||||
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
versionCheckProgramArg = [ "--version" ];
|
||||
|
||||
@@ -15,14 +15,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "varia";
|
||||
version = "2025.1.24";
|
||||
version = "2025.1.24-1";
|
||||
pyproject = false;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "giantpinkrobots";
|
||||
repo = "varia";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-bsSAPKs5iD1CMQ+t0i09odglZre137TOSyvJqE5lqN4=";
|
||||
hash = "sha256-ZTsp2nVqNe+7uEk6HH95AtJMbdKHmKMy3l6q1Xpx4FY=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -6,17 +6,19 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "versatiles";
|
||||
version = "0.14.5"; # When updating: Replace with current version
|
||||
version = "0.15.2"; # When updating: Replace with current version
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "versatiles-org";
|
||||
repo = "versatiles-rs";
|
||||
tag = "v${version}"; # When updating: Replace with long commit hash of new version
|
||||
hash = "sha256-ejMqTMGLbVr/Aaqw8U0ojV43N6t0GeWdYIcP0guAsO0="; # When updating: Use `lib.fakeHash` for recomputing the hash once. Run: 'nix-build -A versatiles'. Swap with new hash and proceed.
|
||||
hash = "sha256-RByNQMPx0vR7D50OiFjVSsq1G4cYvggzezUzUk/52pQ="; # When updating: Use `lib.fakeHash` for recomputing the hash once. Run: 'nix-build -A versatiles'. Swap with new hash and proceed.
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-ZvkuA/6TQc5CsBvjQHlVb2AFA60q6Wa5mrfxjh49uYE="; # When updating: Same as above
|
||||
cargoHash = "sha256-NjGX60unMPWyPggitYUux1+x3EvrFq6gvNbZu7H88Yo="; # When updating: Same as above
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
# Testing only necessary for the `bins` and `lib` features
|
||||
cargoTestFlags = [
|
||||
@@ -26,13 +28,15 @@ rustPlatform.buildRustPackage rec {
|
||||
|
||||
# Skip tests that require network access
|
||||
checkFlags = [
|
||||
"--skip tools::convert::tests::test_remote1"
|
||||
"--skip tools::convert::tests::test_remote2"
|
||||
"--skip tools::probe::tests::test_remote"
|
||||
"--skip tools::serve::tests::test_remote"
|
||||
"--skip utils::io::data_reader_http"
|
||||
"--skip utils::io::data_reader_http::tests::read_range_git"
|
||||
"--skip utils::io::data_reader_http::tests::read_range_googleapis"
|
||||
"--skip=tools::convert::tests::test_remote1"
|
||||
"--skip=tools::convert::tests::test_remote2"
|
||||
"--skip=tools::probe::tests::test_remote"
|
||||
"--skip=tools::serve::tests::test_remote"
|
||||
"--skip=utils::io::data_reader_http"
|
||||
"--skip=utils::io::data_reader_http::tests::read_range_git"
|
||||
"--skip=utils::io::data_reader_http::tests::read_range_googleapis"
|
||||
"--skip=io::data_reader_http::tests::read_range_git"
|
||||
"--skip=io::data_reader_http::tests::read_range_googleapis"
|
||||
];
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -6,6 +6,7 @@
|
||||
SDL,
|
||||
SDL_image,
|
||||
libgbm,
|
||||
libGL,
|
||||
libtheora,
|
||||
libvorbis,
|
||||
libogg,
|
||||
@@ -29,6 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
(lib.getDev SDL)
|
||||
SDL_image
|
||||
libgbm
|
||||
libGL
|
||||
libtheora
|
||||
libvorbis.dev
|
||||
libogg
|
||||
|
||||
File diff suppressed because one or more lines are too long
@@ -16,12 +16,14 @@ mkCoqDerivation {
|
||||
defaultVersion =
|
||||
with lib.versions;
|
||||
lib.switch [ coq.version mathcomp.version ] [
|
||||
{ cases = [ (range "8.18" "8.20") (range "2.2" "2.3") ];
|
||||
out = "2025.02.0"; }
|
||||
{ cases = [ (range "8.19" "9.0") (range "2.2" "2.3") ]; out = "2025.02.0"; }
|
||||
{ cases = [ (isEq "8.18") (isEq "2.2") ]; out = "2024.07.2"; }
|
||||
] null;
|
||||
releaseRev = v: "v${v}";
|
||||
|
||||
release."2025.02.0".sha256 = "sha256-Jlf0+VPuYWXdWyKHKHSp7h/HuCCp4VkcrgDAmh7pi5s=";
|
||||
release."2024.07.3".sha256 = "sha256-n/X8d7ILuZ07l24Ij8TxbQzAG7E8kldWFcUI65W4r+c=";
|
||||
release."2024.07.2".sha256 = "sha256-aF8SYY5jRxQ6iEr7t6mRN3BEmIDhJ53PGhuZiJGB+i8=";
|
||||
|
||||
propagatedBuildInputs = [
|
||||
mathcomp-algebra-tactics
|
||||
|
||||
@@ -19,13 +19,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "waylib";
|
||||
version = "0.6.12";
|
||||
version = "0.6.13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vioken";
|
||||
repo = "waylib";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-wZPya3F0CMXDb/b7d1A2cn55rzQTKwfPMTx+BTRniFQ=";
|
||||
hash = "sha256-djFwUe/+5CNEnOTKL5OAC8zVQqsT8BSqQEWjkbEt7xQ=";
|
||||
};
|
||||
|
||||
depsBuildBuild = [
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
|
||||
@@ -34,7 +33,7 @@
|
||||
uproot,
|
||||
vector,
|
||||
|
||||
# checks
|
||||
# tests
|
||||
distributed,
|
||||
pyinstrument,
|
||||
pytest-xdist,
|
||||
@@ -43,14 +42,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "coffea";
|
||||
version = "2025.1.1";
|
||||
version = "2025.3.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "CoffeaTeam";
|
||||
repo = "coffea";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-AGYi1w4e8XJOWRbuPX5eB/rTY5dCPji49zD0VQ4FvAs=";
|
||||
hash = "sha256-NZ3r/Dyw5bB4qOO29DUAARPzdJJxgR9OO9LxVu3YbNo=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
@@ -98,40 +97,16 @@ buildPythonPackage rec {
|
||||
|
||||
pythonImportsCheck = [ "coffea" ];
|
||||
|
||||
disabledTests =
|
||||
[
|
||||
# Requires internet access
|
||||
# https://github.com/CoffeaTeam/coffea/issues/1094
|
||||
"test_lumimask"
|
||||
disabledTests = [
|
||||
# Requires internet access
|
||||
# https://github.com/CoffeaTeam/coffea/issues/1094
|
||||
"test_lumimask"
|
||||
|
||||
# Flaky: FileNotFoundError: [Errno 2] No such file or directory
|
||||
# https://github.com/scikit-hep/coffea/issues/1246
|
||||
"test_packed_selection_cutflow_dak" # cutflow.npz
|
||||
"test_packed_selection_nminusone_dak" # nminusone.npz
|
||||
|
||||
# AssertionError: bug in Awkward Array: attempt to convert TypeTracerArray into a concrete array
|
||||
"test_apply_to_fileset"
|
||||
"test_lorentz_behavior"
|
||||
|
||||
# ValueError: The array to mask was deleted before it could be masked.
|
||||
# If you want to construct this mask, you must either keep the array alive or use 'ak.mask' explicitly.
|
||||
"test_read_nanomc"
|
||||
]
|
||||
++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [
|
||||
# Fatal Python error: Segmentation fault
|
||||
# coffea/nanoevents/transforms.py", line 287 in index_range
|
||||
"test_KaonParent_to_PionDaughters_Loop"
|
||||
"test_MCRecoAssociations"
|
||||
"test_MC_daughters"
|
||||
"test_MC_parents"
|
||||
"test_field_is_present"
|
||||
|
||||
# Fatal Python error: Segmentation fault
|
||||
# File "/build/source/tests/test_lumi_tools.py", line 37 in test_lumidata
|
||||
"test_lumidata"
|
||||
# coffea/lumi_tools/lumi_tools.py", line 113 in get_lumi
|
||||
"test_lumilist"
|
||||
];
|
||||
# Flaky: FileNotFoundError: [Errno 2] No such file or directory
|
||||
# https://github.com/scikit-hep/coffea/issues/1246
|
||||
"test_packed_selection_cutflow_dak" # cutflow.npz
|
||||
"test_packed_selection_nminusone_dak" # nminusone.npz
|
||||
];
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
|
||||
@@ -2,22 +2,26 @@
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
pythonOlder,
|
||||
|
||||
# build-system
|
||||
setuptools,
|
||||
|
||||
# dependencies
|
||||
future,
|
||||
numpy,
|
||||
scipy,
|
||||
matplotlib,
|
||||
scikit-learn,
|
||||
torch,
|
||||
|
||||
# tests
|
||||
pytestCheckHook,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ezyrb";
|
||||
version = "1.3.0.post2404";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mathLab";
|
||||
@@ -26,12 +30,27 @@ buildPythonPackage rec {
|
||||
hash = "sha256-nu75Geyeu1nTLoGaohXB9pmbUWKgdgch9Z5OJqz9xKQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
# AttributeError: module 'numpy' has no attribute 'VisibleDeprecationWarning'
|
||||
postPatch = ''
|
||||
substituteInPlace \
|
||||
tests/test_k_neighbors_regressor.py \
|
||||
tests/test_linear.py \
|
||||
tests/test_radius_neighbors_regressor.py \
|
||||
--replace-fail \
|
||||
"np.VisibleDeprecationWarning" \
|
||||
"np.exceptions.VisibleDeprecationWarning"
|
||||
'';
|
||||
|
||||
build-system = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
future
|
||||
numpy
|
||||
scipy
|
||||
matplotlib
|
||||
numpy
|
||||
scikit-learn
|
||||
scipy
|
||||
torch
|
||||
];
|
||||
|
||||
@@ -44,11 +63,11 @@ buildPythonPackage rec {
|
||||
"tests/test_podae.py"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Easy Reduced Basis method";
|
||||
homepage = "https://mathlab.github.io/EZyRB/";
|
||||
downloadPage = "https://github.com/mathLab/EZyRB/releases";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ yl3dy ];
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ yl3dy ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -5,6 +5,7 @@
|
||||
gfortran,
|
||||
makeWrapper,
|
||||
setuptools,
|
||||
setuptools-scm,
|
||||
numpy,
|
||||
scipy,
|
||||
distutils,
|
||||
@@ -16,17 +17,20 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "i-pi";
|
||||
version = "3.0";
|
||||
version = "3.1.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "i-pi";
|
||||
repo = "i-pi";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-SJ0qTwwdIOR1nXs9MV6O1oxJPR6/6H86wscDy/sLc/g=";
|
||||
hash = "sha256-Z9xTuRm4go/FGrM7norRHVHgjcOqssNgFQ8R/Mh1yXo=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
build-system = [
|
||||
setuptools
|
||||
setuptools-scm
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
gfortran
|
||||
@@ -45,6 +49,10 @@ buildPythonPackage rec {
|
||||
] ++ lib.optional (pythonAtLeast "3.12") distutils;
|
||||
|
||||
pytestFlagsArray = [ "ipi_tests/unit_tests" ];
|
||||
disabledTests = [
|
||||
"test_driver_base"
|
||||
"test_driver_forcebuild"
|
||||
];
|
||||
|
||||
postFixup = ''
|
||||
wrapProgram $out/bin/i-pi \
|
||||
|
||||
@@ -0,0 +1,59 @@
|
||||
{
|
||||
lib,
|
||||
callPackage,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
setuptools,
|
||||
llm,
|
||||
httpx,
|
||||
ijson,
|
||||
pytestCheckHook,
|
||||
pytest-recording,
|
||||
pytest-asyncio,
|
||||
nest-asyncio,
|
||||
writableTmpDirAsHomeHook,
|
||||
}:
|
||||
buildPythonPackage rec {
|
||||
pname = "llm-gemini";
|
||||
version = "0.15";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "simonw";
|
||||
repo = "llm-gemini";
|
||||
tag = version;
|
||||
hash = "sha256-NNzorEb3dVoKef+9eXzStcFAkQhnhMBVnwLBc2lA2+o=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
llm
|
||||
httpx
|
||||
ijson
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
pytest-recording
|
||||
pytest-asyncio
|
||||
nest-asyncio
|
||||
writableTmpDirAsHomeHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "llm_gemini" ];
|
||||
|
||||
passthru.tests = {
|
||||
llm-plugin = callPackage ./tests/llm-plugin.nix { };
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "LLM plugin to access Google's Gemini family of models";
|
||||
homepage = "https://github.com/simonw/llm-gemini";
|
||||
changelog = "https://github.com/simonw/llm-gemini/releases/tag/${version}";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ josh ];
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,22 @@
|
||||
{
|
||||
runCommand,
|
||||
python,
|
||||
yq,
|
||||
}:
|
||||
let
|
||||
venv = python.withPackages (ps: [
|
||||
ps.llm
|
||||
ps.llm-gemini
|
||||
]);
|
||||
in
|
||||
runCommand "llm-gemini-test-llm-plugin"
|
||||
{
|
||||
nativeBuildInputs = [
|
||||
venv
|
||||
yq
|
||||
];
|
||||
}
|
||||
''
|
||||
llm plugins | yq --exit-status 'any(.name == "llm-gemini")'
|
||||
touch "$out"
|
||||
''
|
||||
@@ -16,7 +16,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "nbxmpp";
|
||||
version = "6.0.0";
|
||||
version = "6.0.2";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.10";
|
||||
@@ -26,7 +26,7 @@ buildPythonPackage rec {
|
||||
owner = "gajim";
|
||||
repo = "python-nbxmpp";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-qy1+N5h2T4mkxuX3aaywuq8WDLuNFH5fDyJf9z57BOg=";
|
||||
hash = "sha256-k7cC1H+o+17sTahsjhkAzq5f8/61DRtK9gi+sbPCM6w=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -34,14 +34,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "orbax-checkpoint";
|
||||
version = "0.11.8";
|
||||
version = "0.11.9";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "google";
|
||||
repo = "orbax";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-h7SXuOhytM9ev0Q53z0UoT9/ShPVlqgFofn7j8gnehM=";
|
||||
hash = "sha256-bvY/ipgVgDzzH0wAqNBdJzCRHZam0WoByRpfde0sJ1c=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/checkpoint";
|
||||
|
||||
@@ -1,64 +1,70 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
|
||||
# build-system
|
||||
setuptools,
|
||||
setuptools-git-versioning,
|
||||
|
||||
# dependencies
|
||||
ezyrb,
|
||||
future,
|
||||
h5netcdf,
|
||||
matplotlib,
|
||||
numpy,
|
||||
pytestCheckHook,
|
||||
pytest-mock,
|
||||
pythonOlder,
|
||||
scipy,
|
||||
ezyrb,
|
||||
xarray,
|
||||
|
||||
# tests
|
||||
pytest-mock,
|
||||
pytestCheckHook,
|
||||
}:
|
||||
|
||||
let
|
||||
self = buildPythonPackage rec {
|
||||
pname = "pydmd";
|
||||
version = "2025.01.01";
|
||||
pyproject = true;
|
||||
buildPythonPackage rec {
|
||||
pname = "pydmd";
|
||||
version = "2025.03.01";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "PyDMD";
|
||||
repo = "PyDMD";
|
||||
tag = version;
|
||||
hash = "sha256-edjBr0LsfyBEi4YZiTY0GegqgESWgSFennZOi2YFhC4=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
future
|
||||
matplotlib
|
||||
numpy
|
||||
scipy
|
||||
ezyrb
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
pytest-mock
|
||||
];
|
||||
|
||||
pytestFlagsArray = [ "tests/test_dmdbase.py" ];
|
||||
|
||||
pythonImportsCheck = [ "pydmd" ];
|
||||
|
||||
passthru.tests = self.overrideAttrs (old: {
|
||||
pytestFlagsArray = [ ];
|
||||
});
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python Dynamic Mode Decomposition";
|
||||
homepage = "https://pydmd.github.io/PyDMD/";
|
||||
changelog = "https://github.com/PyDMD/PyDMD/releases/tag/${src.tag}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ yl3dy ];
|
||||
};
|
||||
src = fetchFromGitHub {
|
||||
owner = "PyDMD";
|
||||
repo = "PyDMD";
|
||||
tag = version;
|
||||
hash = "sha256-2pfWW+CLSDr6tJrcLpodil/RnhLTZ5Yqw0ThTCqO0MY=";
|
||||
};
|
||||
in
|
||||
self
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace-fail "setuptools-git-versioning>=2.0,<3" "setuptools-git-versioning"
|
||||
'';
|
||||
|
||||
build-system = [
|
||||
setuptools
|
||||
setuptools-git-versioning
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
ezyrb
|
||||
future
|
||||
h5netcdf
|
||||
matplotlib
|
||||
numpy
|
||||
scipy
|
||||
xarray
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "pydmd" ];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytest-mock
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Python Dynamic Mode Decomposition";
|
||||
homepage = "https://pydmd.github.io/PyDMD/";
|
||||
changelog = "https://github.com/PyDMD/PyDMD/releases/tag/${src.tag}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ yl3dy ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,14 +1,23 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
buildPythonPackage,
|
||||
|
||||
# build-system
|
||||
setuptools-scm,
|
||||
|
||||
# dependencies
|
||||
numpy,
|
||||
scipy,
|
||||
torch,
|
||||
|
||||
# tests
|
||||
autograd,
|
||||
jax,
|
||||
matplotlib,
|
||||
pytestCheckHook,
|
||||
setuptools-scm,
|
||||
tensorflow,
|
||||
torch,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
@@ -24,42 +33,40 @@ buildPythonPackage rec {
|
||||
};
|
||||
|
||||
preConfigure = ''
|
||||
substituteInPlace pyproject.toml --replace-fail "\"pip==22.3.1\"," ""
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace-fail '"pip==22.3.1",' ""
|
||||
'';
|
||||
|
||||
build-system = [
|
||||
setuptools-scm
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
numpy
|
||||
scipy
|
||||
torch
|
||||
];
|
||||
nativeCheckInputs = [
|
||||
autograd
|
||||
matplotlib
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
substituteInPlace "tests/conftest.py" \
|
||||
--replace-fail "import tensorflow as tf" ""
|
||||
substituteInPlace "tests/conftest.py" \
|
||||
--replace-fail "tf.random.set_seed(seed)" ""
|
||||
'';
|
||||
|
||||
disabledTestPaths = [
|
||||
"tests/test_examples.py"
|
||||
"tests/backends/test_tensorflow.py"
|
||||
"tests/backends/test_jax.py"
|
||||
"tests/test_problem.py"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "pymanopt" ];
|
||||
|
||||
nativeCheckInputs = [
|
||||
autograd
|
||||
jax
|
||||
matplotlib
|
||||
pytestCheckHook
|
||||
tensorflow
|
||||
torch
|
||||
];
|
||||
|
||||
pytestFlagsArray = lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
# FloatingPointError: divide by zero encountered in det
|
||||
"--deselect=tests/manifolds/test_positive_definite.py::TestMultiSpecialHermitianPositiveDefiniteManifold::test_retraction"
|
||||
"--deselect=tests/manifolds/test_positive_definite.py::TestSingleSpecialHermitianPositiveDefiniteManifold::test_retraction"
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Python toolbox for optimization on Riemannian manifolds with support for automatic differentiation";
|
||||
homepage = "https://www.pymanopt.org/";
|
||||
changelog = "https://github.com/pymanopt/pymanopt/releases/tag/${version}";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = with lib.maintainers; [ yl3dy ];
|
||||
};
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "sasmodels";
|
||||
version = "1.0.8";
|
||||
version = "1.0.9";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@@ -26,7 +26,7 @@ buildPythonPackage rec {
|
||||
owner = "SasView";
|
||||
repo = "sasmodels";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-fa6/13z11AuTRItZOEmTbjpU1aT6Ur7evi6UvVvXQck=";
|
||||
hash = "sha256-eD0YTQYR64tKwG7VxmQkHV2ZACs24hx/sS4me7qTcu4=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
|
||||
@@ -7,19 +8,19 @@
|
||||
setuptools,
|
||||
|
||||
# dependencies
|
||||
scipy,
|
||||
matplotlib,
|
||||
opencv-python,
|
||||
pandas,
|
||||
pillow,
|
||||
psutil,
|
||||
py-cpuinfo,
|
||||
pyyaml,
|
||||
requests,
|
||||
scipy,
|
||||
seaborn,
|
||||
torch,
|
||||
torchvision,
|
||||
tqdm,
|
||||
psutil,
|
||||
py-cpuinfo,
|
||||
pandas,
|
||||
seaborn,
|
||||
ultralytics-thop,
|
||||
|
||||
# tests
|
||||
@@ -30,38 +31,37 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ultralytics";
|
||||
version = "8.3.86";
|
||||
version = "8.3.92";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ultralytics";
|
||||
repo = "ultralytics";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-9z6f/48jQVCR744ojNH+T22+JDg31+WEKWi48k5/GoY=";
|
||||
hash = "sha256-+SwhQVEl7tLrhwuCruVLAtVS3U/RJb0ysIKG3bmuZk4=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace-fail "numpy>=1.23.0,<=2.1.1" "numpy"
|
||||
'';
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"numpy"
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
scipy
|
||||
matplotlib
|
||||
opencv-python
|
||||
pandas
|
||||
pillow
|
||||
psutil
|
||||
py-cpuinfo
|
||||
pyyaml
|
||||
requests
|
||||
scipy
|
||||
scipy
|
||||
seaborn
|
||||
torch
|
||||
torchvision
|
||||
tqdm
|
||||
psutil
|
||||
py-cpuinfo
|
||||
pandas
|
||||
seaborn
|
||||
ultralytics-thop
|
||||
];
|
||||
|
||||
@@ -73,34 +73,50 @@ buildPythonPackage rec {
|
||||
onnxruntime
|
||||
];
|
||||
|
||||
# rest of the tests require internet access
|
||||
pytestFlagsArray = [ "tests/test_python.py" ];
|
||||
|
||||
disabledTests = [
|
||||
# also remove the individual tests that require internet
|
||||
"test_model_methods"
|
||||
"test_predict_txt"
|
||||
"test_predict_img"
|
||||
"test_predict_visualize"
|
||||
"test_predict_grey_and_4ch"
|
||||
"test_val"
|
||||
"test_train_scratch"
|
||||
"test_train_pretrained"
|
||||
"test_all_model_yamls"
|
||||
"test_workflow"
|
||||
"test_predict_callback_and_setup"
|
||||
"test_results"
|
||||
"test_labels_and_crops"
|
||||
"test_data_annotator"
|
||||
"test_model_embeddings"
|
||||
"test_yolov10"
|
||||
"test_utils_torchutils"
|
||||
"test_yolo_world"
|
||||
pytestFlagsArray = [
|
||||
# rest of the tests require internet access
|
||||
"tests/test_python.py"
|
||||
];
|
||||
|
||||
disabledTests =
|
||||
[
|
||||
# also remove the individual tests that require internet
|
||||
"test_all_model_yamls"
|
||||
"test_data_annotator"
|
||||
"test_labels_and_crops"
|
||||
"test_model_embeddings"
|
||||
"test_model_methods"
|
||||
"test_predict_callback_and_setup"
|
||||
"test_predict_grey_and_4ch"
|
||||
"test_predict_img"
|
||||
"test_predict_txt"
|
||||
"test_predict_visualize"
|
||||
"test_results"
|
||||
"test_train_pretrained"
|
||||
"test_train_scratch"
|
||||
"test_utils_torchutils"
|
||||
"test_val"
|
||||
"test_workflow"
|
||||
"test_yolo_world"
|
||||
"test_yolov10"
|
||||
]
|
||||
++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [
|
||||
# Fatal Python error: Aborted
|
||||
# onnxruntime/capi/_pybind_state.py", line 32 in <module>
|
||||
"test_utils_benchmarks"
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
# Fatal Python error: Aborted
|
||||
# ultralytics/utils/checks.py", line 598 in check_imshow
|
||||
"test_utils_checks"
|
||||
|
||||
# RuntimeError: required keyword attribute 'value' has the wrong type
|
||||
"test_utils_benchmarks"
|
||||
];
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/ultralytics/ultralytics";
|
||||
changelog = "https://github.com/ultralytics/ultralytics/releases/tag/${src.tag}";
|
||||
changelog = "https://github.com/ultralytics/ultralytics/releases/tag/v${version}";
|
||||
description = "Train YOLO models for computer vision tasks";
|
||||
mainProgram = "yolo";
|
||||
license = lib.licenses.agpl3Only;
|
||||
|
||||
@@ -1,32 +1,41 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
setuptools,
|
||||
fetchFromGitHub,
|
||||
|
||||
# build-system
|
||||
hatchling,
|
||||
|
||||
# dependencies
|
||||
einx,
|
||||
einops,
|
||||
loguru,
|
||||
packaging,
|
||||
torch,
|
||||
|
||||
# tests
|
||||
pytestCheckHook,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "x-transformers";
|
||||
version = "1.44.4";
|
||||
version = "2.1.36";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "x_transformers";
|
||||
inherit version;
|
||||
hash = "sha256-m6Vx/D4rTur4n/DqWEAjD7jK43wEgwhdrQi8+ndsN+E=";
|
||||
src = fetchFromGitHub {
|
||||
owner = "lucidrains";
|
||||
repo = "x-transformers";
|
||||
tag = version;
|
||||
hash = "sha256-/L0nzpOG6kbBiujaHsZvb6iakA22BIccvnTvYy1NAa8=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
sed -i '/setup_requires=\[/,/\],/d' setup.py
|
||||
'';
|
||||
|
||||
build-system = [ setuptools ];
|
||||
build-system = [ hatchling ];
|
||||
|
||||
dependencies = [
|
||||
einx
|
||||
einops
|
||||
loguru
|
||||
packaging
|
||||
torch
|
||||
];
|
||||
|
||||
|
||||
@@ -19,7 +19,10 @@
|
||||
SDL2,
|
||||
SDL2_image,
|
||||
SDL2_mixer,
|
||||
libGL,
|
||||
libGLU,
|
||||
libpng,
|
||||
libX11,
|
||||
libxml2,
|
||||
protobuf,
|
||||
xvfb-run,
|
||||
@@ -54,6 +57,9 @@ let
|
||||
inherit version;
|
||||
src = fetchArmagetron rev hash;
|
||||
extraBuildInputs = lib.optionals (!dedicatedServer) [
|
||||
libGL
|
||||
libGLU
|
||||
libX11
|
||||
libpng
|
||||
SDL
|
||||
SDL_image
|
||||
@@ -79,6 +85,9 @@ let
|
||||
glew
|
||||
ftgl
|
||||
freetype
|
||||
libGL
|
||||
libGLU
|
||||
libX11
|
||||
SDL2
|
||||
SDL2_image
|
||||
SDL2_mixer
|
||||
@@ -96,6 +105,9 @@ let
|
||||
version = "${latestVersionMajor}-sty+ct+ap-${builtins.substring 0 8 rev}";
|
||||
src = fetchArmagetron rev hash;
|
||||
extraBuildInputs = lib.optionals (!dedicatedServer) [
|
||||
libGL
|
||||
libGLU
|
||||
libX11
|
||||
libpng
|
||||
SDL
|
||||
SDL_image
|
||||
|
||||
@@ -1350,6 +1350,7 @@ mapAliases {
|
||||
rtx = mise; # Added 2024-01-05
|
||||
runCommandNoCC = runCommand;
|
||||
runCommandNoCCLocal = runCommandLocal;
|
||||
run-scaled = throw "run-scaled has been removed due to being deprecated. Consider using run_scaled from 'xpra' instead"; # Added 2025-03-17
|
||||
rust-synapse-state-compress = rust-synapse-compress-state;
|
||||
rustc-wasm32 = rustc; # Added 2023-12-01
|
||||
rustfilt = throw "'rustfilt' has been removed due to lack of upstream maintenance"; # Added 2025-01-26
|
||||
|
||||
@@ -7816,6 +7816,8 @@ self: super: with self; {
|
||||
|
||||
llm-cmd = callPackage ../development/python-modules/llm-cmd { };
|
||||
|
||||
llm-gemini = callPackage ../development/python-modules/llm-gemini { };
|
||||
|
||||
llm-gguf = callPackage ../development/python-modules/llm-gguf { };
|
||||
|
||||
llm-jq = callPackage ../development/python-modules/llm-jq { };
|
||||
|
||||
Reference in New Issue
Block a user