Merge master into staging-next

This commit is contained in:
nixpkgs-ci[bot] 2025-04-13 00:41:08 +00:00 committed by GitHub
commit bd8d4dc802
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
46 changed files with 189 additions and 677 deletions

View file

@ -50,7 +50,6 @@ sets are
* `pkgs.python27Packages` * `pkgs.python27Packages`
* `pkgs.python3Packages` * `pkgs.python3Packages`
* `pkgs.python39Packages`
* `pkgs.python310Packages` * `pkgs.python310Packages`
* `pkgs.python311Packages` * `pkgs.python311Packages`
* `pkgs.python312Packages` * `pkgs.python312Packages`

View file

@ -158,14 +158,14 @@ lib.mkOption {
::: {#ex-options-declarations-util-mkPackageOption-extraDescription .example} ::: {#ex-options-declarations-util-mkPackageOption-extraDescription .example}
### `mkPackageOption` with additional description text ### `mkPackageOption` with additional description text
```nix ```nix
mkPackageOption pkgs [ "python39Packages" "pytorch" ] { mkPackageOption pkgs [ "python312Packages" "torch" ] {
extraDescription = "This is an example and doesn't actually do anything."; extraDescription = "This is an example and doesn't actually do anything.";
} }
# is like # is like
lib.mkOption { lib.mkOption {
type = lib.types.package; type = lib.types.package;
default = pkgs.python39Packages.pytorch; default = pkgs.python312Packages.torch;
defaultText = lib.literalExpression "pkgs.python39Packages.pytorch"; defaultText = lib.literalExpression "pkgs.python312Packages.torch";
description = "The pytorch package to use. This is an example and doesn't actually do anything."; description = "The pytorch package to use. This is an example and doesn't actually do anything.";
} }
``` ```

View file

@ -722,7 +722,7 @@ in
''; '';
serviceConfig = { serviceConfig = {
Type = "simple"; Type = "notify";
User = cfg.user; User = cfg.user;
Group = cfg.group; Group = cfg.group;
WorkingDirectory = cfg.stateDir; WorkingDirectory = cfg.stateDir;

View file

@ -1,9 +1,8 @@
{ {
lib, lib,
fetchFromGitHub, fetchFromGitHub,
fetchPypi,
replaceVars, replaceVars,
python39, python3,
fluidsynth, fluidsynth,
soundfont-fluid, soundfont-fluid,
wrapGAppsHook3, wrapGAppsHook3,
@ -12,51 +11,18 @@
ghostscript, ghostscript,
}: }:
let python3.pkgs.buildPythonApplication {
# requires python39 due to https://stackoverflow.com/a/71902541 https://github.com/jwdj/EasyABC/issues/52
python = python39.override {
self = python;
packageOverrides = self: super: {
# currently broken with 4.2.1
# https://github.com/jwdj/EasyABC/issues/75
wxpython = super.wxpython.overrideAttrs (args: rec {
version = "4.2.0";
src = fetchPypi {
inherit version;
pname = "wxPython";
hash = "sha256-ZjzrxFCdfl0RNRiGX+J093+VQ0xdV7w4btWNZc7thsc=";
};
});
};
};
in
python.pkgs.buildPythonApplication {
pname = "easyabc"; pname = "easyabc";
version = "1.3.8.6"; version = "1.3.8.7-unstable-2025-01-12";
format = "other";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "jwdj"; owner = "jwdj";
repo = "easyabc"; repo = "easyabc";
rev = "6461b2c14280cb64224fc5299c31cfeef9b7d43c"; rev = "2cfa74d138d485523cae9b889186add3a249f2e4";
hash = "sha256-leC3A4HQMeJNeZXArb3YAYr2mddGPcws618NrRh2Q1Y="; hash = "sha256-96Rh7hFWITIC62vs0bUtatDDgJ27UdZYhku8uqJBJew=";
}; };
nativeBuildInputs = [ wrapGAppsHook3 ];
propagatedBuildInputs = with python.pkgs; [
cx-freeze
wxpython
pygame
];
# apparently setup.py only supports Windows and Darwin
# everything is very non-standard in this project
dontBuild = true;
format = "other";
# https://discourse.nixos.org/t/packaging-mcomix3-python-gtk-missing-gsettings-schemas-issue/10190/2
strictDeps = false;
patches = [ patches = [
(replaceVars ./hardcoded-paths.patch { (replaceVars ./hardcoded-paths.patch {
fluidsynth = "${fluidsynth}/lib/libfluidsynth.so"; fluidsynth = "${fluidsynth}/lib/libfluidsynth.so";
@ -65,6 +31,22 @@ python.pkgs.buildPythonApplication {
}) })
]; ];
nativeBuildInputs = [ wrapGAppsHook3 ];
dependencies = with python3.pkgs; [
cx-freeze
wxpython
pygame
pyparsing
];
# apparently setup.py only supports Windows and Darwin
# everything is very non-standard in this project
dontBuild = true;
# https://discourse.nixos.org/t/packaging-mcomix3-python-gtk-missing-gsettings-schemas-issue/10190/2
strictDeps = false;
installPhase = '' installPhase = ''
runHook preInstall runHook preInstall
@ -76,7 +58,7 @@ python.pkgs.buildPythonApplication {
ln -s ${abcmidi}/bin/abc2abc $out/share/easyabc/bin/abc2abc ln -s ${abcmidi}/bin/abc2abc $out/share/easyabc/bin/abc2abc
ln -s ${abcm2ps}/bin/abcm2ps $out/share/easyabc/bin/abcm2ps ln -s ${abcm2ps}/bin/abcm2ps $out/share/easyabc/bin/abcm2ps
makeWrapper ${python.interpreter} $out/bin/easyabc \ makeWrapper ${python3.interpreter} $out/bin/easyabc \
--set PYTHONPATH "$PYTHONPATH:$out/share/easyabc" \ --set PYTHONPATH "$PYTHONPATH:$out/share/easyabc" \
--add-flags "-O $out/share/easyabc/easy_abc.py" --add-flags "-O $out/share/easyabc/easy_abc.py"

View file

@ -124,6 +124,13 @@ in
''; '';
license = licenses.gpl3; license = licenses.gpl3;
maintainers = with maintainers; [ ttuegel ]; maintainers = with maintainers; [ ttuegel ];
mainProgram =
if monolithic then
"quassel"
else if buildClient then
"quasselclient"
else
"quasselcore";
inherit (qtbase.meta) platforms; inherit (qtbase.meta) platforms;
}; };
} }

View file

@ -8,11 +8,11 @@
stdenvNoCC.mkDerivation (finalAttrs: { stdenvNoCC.mkDerivation (finalAttrs: {
pname = "aldente"; pname = "aldente";
version = "1.31.3"; version = "1.32";
src = fetchurl { src = fetchurl {
url = "https://github.com/davidwernhart/aldente-charge-limiter/releases/download/${finalAttrs.version}/AlDente.dmg"; url = "https://github.com/davidwernhart/aldente-charge-limiter/releases/download/${finalAttrs.version}/AlDente.dmg";
hash = "sha256-O1PGjq5W/BSnfHrmbd4FrtZ7+k+Be9l/5mmvOtlMXRo="; hash = "sha256-pUFcP7J60lLeuX9v3qhCMcsRmurfw0LnoCcbRONnxKM=";
}; };
dontBuild = true; dontBuild = true;

View file

@ -5,7 +5,7 @@
rustPlatform, rustPlatform,
nodejs, nodejs,
which, which,
python39, python3,
libuv, libuv,
util-linux, util-linux,
nixosTests, nixosTests,
@ -37,7 +37,7 @@ rustPlatform.buildRustPackage rec {
nativeBuildInputs = nativeBuildInputs =
[ [
which which
python39 python3
nodejs nodejs
pkg-config pkg-config
] ]
@ -66,11 +66,11 @@ rustPlatform.buildRustPackage rec {
passthru.tests.basic = nixosTests.cjdns; passthru.tests.basic = nixosTests.cjdns;
meta = with lib; { meta = with lib; {
broken = true; # outdated, incompatible with supported python versions
homepage = "https://github.com/cjdelisle/cjdns"; homepage = "https://github.com/cjdelisle/cjdns";
description = "Encrypted networking for regular people"; description = "Encrypted networking for regular people";
license = licenses.gpl3Plus; license = licenses.gpl3Plus;
maintainers = with maintainers; [ ehmry ]; maintainers = with maintainers; [ ehmry ];
platforms = platforms.linux; platforms = platforms.linux;
broken = stdenv.hostPlatform.isAarch64;
}; };
} }

View file

@ -37,13 +37,13 @@ let
in in
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "dxvk"; pname = "dxvk";
version = "2.6"; version = "2.6.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "doitsujin"; owner = "doitsujin";
repo = "dxvk"; repo = "dxvk";
rev = "v${finalAttrs.version}"; rev = "v${finalAttrs.version}";
hash = "sha256-1/9XFqVGW5izlP3rggfB+PK3ewFiOQoGcB/Vjn9MYOQ="; hash = "sha256-edu9JQAKu8yUZLh+37RB1s1A3+s8xeUYQ5Oibdes9ZI=";
fetchSubmodules = true; # Needed for the DirectX headers and libdisplay-info fetchSubmodules = true; # Needed for the DirectX headers and libdisplay-info
}; };

View file

@ -41,6 +41,7 @@ python3.pkgs.buildPythonApplication rec {
homepage = "https://github.com/Exa-Networks/exabgp"; homepage = "https://github.com/Exa-Networks/exabgp";
changelog = "https://github.com/Exa-Networks/exabgp/blob/${src.tag}/CHANGELOG.rst"; changelog = "https://github.com/Exa-Networks/exabgp/blob/${src.tag}/CHANGELOG.rst";
license = licenses.bsd3; license = licenses.bsd3;
mainProgram = "exabgp";
maintainers = with maintainers; [ maintainers = with maintainers; [
hexa hexa
raitobezarius raitobezarius

View file

@ -7,13 +7,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "exploitdb"; pname = "exploitdb";
version = "2025-04-10"; version = "2025-04-11";
src = fetchFromGitLab { src = fetchFromGitLab {
owner = "exploit-database"; owner = "exploit-database";
repo = "exploitdb"; repo = "exploitdb";
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-vbcFCeQv1ZQX/SI6LAr04L2ncaE8fcI7TATfwCRNcQA="; hash = "sha256-sR1VHGFsnLmzO7umcJn88jFWU57LlanPuDu708pSBW0=";
}; };
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];

View file

@ -1,79 +0,0 @@
{
lib,
stdenv,
fetchurl,
ncurses5,
}:
stdenv.mkDerivation rec {
pname = "gcc-arm-embedded";
version = "10.3.1";
release = "10.3-2021.10";
suffix =
{
aarch64-linux = "aarch64-linux";
x86_64-darwin = "mac";
x86_64-linux = "x86_64-linux";
}
.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
src = fetchurl {
url = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${release}/gcc-arm-none-eabi-${release}-${suffix}.tar.bz2";
sha256 =
{
aarch64-linux = "020j8gkzc0i0b74vz98gvngnwjm5222j1gk5nswfk6587krba1gn";
x86_64-darwin = "0fr8pki2g4bfk1rk90dzwql37d0b71ngzs9zyx0g2jainan3sqgv";
x86_64-linux = "18y92vpl22hf74yqdvmpw8adrkl92s4crzzs6avm05md37qb9nwp";
}
.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
};
dontConfigure = true;
dontBuild = true;
dontPatchELF = true;
dontStrip = true;
installPhase = ''
mkdir -p $out
cp -r * $out
ln -s $out/share/doc/gcc-arm-none-eabi/man $out/man
'';
preFixup = ''
find $out -type f | while read f; do
patchelf "$f" > /dev/null 2>&1 || continue
patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f" || true
patchelf --set-rpath ${
lib.makeLibraryPath [
"$out"
stdenv.cc.cc
ncurses5
]
} "$f" || true
done
'';
meta = with lib; {
description = "Pre-built GNU toolchain from ARM Cortex-M & Cortex-R processors";
homepage = "https://developer.arm.com/open-source/gnu-toolchain/gnu-rm";
license = with licenses; [
bsd2
gpl2
gpl3
lgpl21
lgpl3
mit
];
maintainers = with maintainers; [
prusnak
prtzl
];
platforms = [
"x86_64-linux"
"aarch64-linux"
"x86_64-darwin"
];
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
};
}

View file

@ -1,90 +0,0 @@
{
lib,
stdenv,
fetchurl,
ncurses5,
python39,
libxcrypt-legacy,
runtimeShell,
}:
stdenv.mkDerivation rec {
pname = "gcc-arm-embedded";
version = "11.3.rel1";
platform =
{
aarch64-linux = "aarch64";
x86_64-darwin = "darwin-x86_64";
x86_64-linux = "x86_64";
}
.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
src = fetchurl {
url = "https://developer.arm.com/-/media/Files/downloads/gnu/${version}/binrel/arm-gnu-toolchain-${version}-${platform}-arm-none-eabi.tar.xz";
sha256 =
{
aarch64-linux = "0pmm5r0k5mxd5drbn2s8a7qkm8c4fi8j5y31c70yrp0qs08kqwbc";
x86_64-darwin = "1kr9kd9p2xk84fa99zf3gz5lkww2i9spqkjigjwakfkzbva56qw2";
x86_64-linux = "08b1w1zmj4z80k59zmlc1bf34lg8d7z65fwvp5ir2pb1d1zxh86l";
}
.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
};
dontConfigure = true;
dontBuild = true;
dontPatchELF = true;
dontStrip = true;
installPhase = ''
mkdir -p $out
cp -r * $out
'';
preFixup = ''
find $out -type f | while read f; do
patchelf "$f" > /dev/null 2>&1 || continue
patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f" || true
patchelf --set-rpath ${
lib.makeLibraryPath [
"$out"
stdenv.cc.cc
ncurses5
python39
libxcrypt-legacy
]
} "$f" || true
done
'';
postFixup = ''
mv $out/bin/arm-none-eabi-gdb $out/bin/arm-none-eabi-gdb-unwrapped
cat <<EOF > $out/bin/arm-none-eabi-gdb
#!${runtimeShell}
export PYTHONPATH=${python39}/lib/python3.9
export PYTHONHOME=${python39.interpreter}
exec $out/bin/arm-none-eabi-gdb-unwrapped "\$@"
EOF
chmod +x $out/bin/arm-none-eabi-gdb
'';
meta = with lib; {
description = "Pre-built GNU toolchain from ARM Cortex-M & Cortex-R processors";
homepage = "https://developer.arm.com/open-source/gnu-toolchain/gnu-rm";
license = with licenses; [
bsd2
gpl2
gpl3
lgpl21
lgpl3
mit
];
maintainers = with maintainers; [ prusnak ];
platforms = [
"x86_64-linux"
"aarch64-linux"
"x86_64-darwin"
];
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
};
}

View file

@ -3,9 +3,7 @@
stdenv, stdenv,
fetchurl, fetchurl,
ncurses5, ncurses5,
python39,
libxcrypt-legacy, libxcrypt-legacy,
runtimeShell,
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -42,9 +40,11 @@ stdenv.mkDerivation rec {
installPhase = '' installPhase = ''
mkdir -p $out mkdir -p $out
cp -r * $out cp -r * $out
# these binaries require ancient Python 3.8 not available in Nixpkgs
rm $out/bin/{arm-none-eabi-gdb-py,arm-none-eabi-gdb-add-index-py} || :
''; '';
preFixup = '' preFixup = lib.optionalString stdenv.isLinux ''
find $out -type f | while read f; do find $out -type f | while read f; do
patchelf "$f" > /dev/null 2>&1 || continue patchelf "$f" > /dev/null 2>&1 || continue
patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f" || true patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f" || true
@ -53,24 +53,12 @@ stdenv.mkDerivation rec {
"$out" "$out"
stdenv.cc.cc stdenv.cc.cc
ncurses5 ncurses5
python39
libxcrypt-legacy libxcrypt-legacy
] ]
} "$f" || true } "$f" || true
done done
''; '';
postFixup = ''
mv $out/bin/arm-none-eabi-gdb $out/bin/arm-none-eabi-gdb-unwrapped
cat <<EOF > $out/bin/arm-none-eabi-gdb
#!${runtimeShell}
export PYTHONPATH=${python39}/lib/python3.9
export PYTHONHOME=${python39.interpreter}
exec $out/bin/arm-none-eabi-gdb-unwrapped "\$@"
EOF
chmod +x $out/bin/arm-none-eabi-gdb
'';
meta = with lib; { meta = with lib; {
description = "Pre-built GNU toolchain from ARM Cortex-M & Cortex-R processors"; description = "Pre-built GNU toolchain from ARM Cortex-M & Cortex-R processors";
homepage = "https://developer.arm.com/open-source/gnu-toolchain/gnu-rm"; homepage = "https://developer.arm.com/open-source/gnu-toolchain/gnu-rm";

View file

@ -2,15 +2,15 @@
lib, lib,
stdenv, stdenv,
fetchurl, fetchurl,
ncurses5, ncurses6,
python39,
libxcrypt-legacy, libxcrypt-legacy,
runtimeShell, xz,
zstd,
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "gcc-arm-embedded"; pname = "gcc-arm-embedded";
version = "12.3.rel1"; version = "14.2.rel1";
platform = platform =
{ {
@ -23,12 +23,13 @@ stdenv.mkDerivation rec {
src = fetchurl { src = fetchurl {
url = "https://developer.arm.com/-/media/Files/downloads/gnu/${version}/binrel/arm-gnu-toolchain-${version}-${platform}-arm-none-eabi.tar.xz"; url = "https://developer.arm.com/-/media/Files/downloads/gnu/${version}/binrel/arm-gnu-toolchain-${version}-${platform}-arm-none-eabi.tar.xz";
# hashes obtained from location ${url}.sha256asc
sha256 = sha256 =
{ {
aarch64-darwin = "sha256-Oy7uC99xwbvrPDt0JPv3vZ1cPw9aOkp4FZyeOtIZ570="; aarch64-darwin = "c7c78ffab9bebfce91d99d3c24da6bf4b81c01e16cf551eb2ff9f25b9e0a3818";
aarch64-linux = "sha256-FMBIfVdT9gcdJOVoiB98fmf4DdgxZd7FFks3MTlK9DE="; aarch64-linux = "87330bab085dd8749d4ed0ad633674b9dc48b237b61069e3b481abd364d0a684";
x86_64-darwin = "sha256-5u2L+TD62c4z4SCrkLNpV7H3efzKpt5snKmliYLAQpE="; x86_64-darwin = "2d9e717dd4f7751d18936ae1365d25916534105ebcb7583039eff1092b824505";
x86_64-linux = "sha256-EqKBVkQxjrzOr4S+q7Zl0JJLbnniEEhFLFMxpWMyswk="; x86_64-linux = "62a63b981fe391a9cbad7ef51b17e49aeaa3e7b0d029b36ca1e9c3b2a9b78823";
} }
.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
}; };
@ -41,9 +42,11 @@ stdenv.mkDerivation rec {
installPhase = '' installPhase = ''
mkdir -p $out mkdir -p $out
cp -r * $out cp -r * $out
# these binaries require ancient Python 3.8 not available in Nixpkgs
rm $out/bin/{arm-none-eabi-gdb-py,arm-none-eabi-gdb-add-index-py} || :
''; '';
preFixup = '' preFixup = lib.optionalString stdenv.isLinux ''
find $out -type f | while read f; do find $out -type f | while read f; do
patchelf "$f" > /dev/null 2>&1 || continue patchelf "$f" > /dev/null 2>&1 || continue
patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f" || true patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f" || true
@ -51,25 +54,15 @@ stdenv.mkDerivation rec {
lib.makeLibraryPath [ lib.makeLibraryPath [
"$out" "$out"
stdenv.cc.cc stdenv.cc.cc
ncurses5 ncurses6
python39
libxcrypt-legacy libxcrypt-legacy
xz
zstd
] ]
} "$f" || true } "$f" || true
done done
''; '';
postFixup = ''
mv $out/bin/arm-none-eabi-gdb $out/bin/arm-none-eabi-gdb-unwrapped
cat <<EOF > $out/bin/arm-none-eabi-gdb
#!${runtimeShell}
export PYTHONPATH=${python39}/lib/python3.9
export PYTHONHOME=${python39.interpreter}
exec $out/bin/arm-none-eabi-gdb-unwrapped "\$@"
EOF
chmod +x $out/bin/arm-none-eabi-gdb
'';
meta = with lib; { meta = with lib; {
description = "Pre-built GNU toolchain from ARM Cortex-M & Cortex-R processors"; description = "Pre-built GNU toolchain from ARM Cortex-M & Cortex-R processors";
homepage = "https://developer.arm.com/open-source/gnu-toolchain/gnu-rm"; homepage = "https://developer.arm.com/open-source/gnu-toolchain/gnu-rm";

View file

@ -1,74 +0,0 @@
{
lib,
stdenv,
fetchurl,
ncurses5,
}:
stdenv.mkDerivation rec {
pname = "gcc-arm-embedded";
version = "6.3.1";
release = "6-2017-q2-update";
subdir = "6-2017q2";
suffix =
{
x86_64-darwin = "mac";
x86_64-linux = "linux";
}
.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
src = fetchurl {
url = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${subdir}/gcc-arm-none-eabi-${release}-${suffix}.tar.bz2";
sha256 =
{
x86_64-darwin = "0019ylpq4inq7p5gydpmc9m8ni72fz2csrjlqmgx1698998q0c3x";
x86_64-linux = "1hvwi02mx34al525sngnl0cm7dkmzxfkb1brq9kvbv28wcplp3p6";
}
.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
};
dontConfigure = true;
dontBuild = true;
dontPatchELF = true;
dontStrip = true;
installPhase = ''
mkdir -p $out
cp -r * $out
ln -s $out/share/doc/gcc-arm-none-eabi/man $out/man
'';
preFixup = ''
find $out -type f | while read f; do
patchelf "$f" > /dev/null 2>&1 || continue
patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f" || true
patchelf --set-rpath ${
lib.makeLibraryPath [
"$out"
stdenv.cc.cc
ncurses5
]
} "$f" || true
done
'';
meta = with lib; {
description = "Pre-built GNU toolchain from ARM Cortex-M & Cortex-R processors";
homepage = "https://developer.arm.com/open-source/gnu-toolchain/gnu-rm";
license = with licenses; [
bsd2
gpl2
gpl3
lgpl21
lgpl3
mit
];
maintainers = with maintainers; [ prusnak ];
platforms = [
"x86_64-linux"
"x86_64-darwin"
];
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
};
}

View file

@ -1,74 +0,0 @@
{
lib,
stdenv,
fetchurl,
ncurses5,
}:
stdenv.mkDerivation rec {
pname = "gcc-arm-embedded";
version = "7.3.1";
release = "7-2018-q2-update";
subdir = "7-2018q2";
suffix =
{
x86_64-darwin = "mac";
x86_64-linux = "linux";
}
.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
src = fetchurl {
url = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${subdir}/gcc-arm-none-eabi-${release}-${suffix}.tar.bz2";
sha256 =
{
x86_64-darwin = "0nc7m0mpa39qyhfyydxkkyqm7spfc27xf6ygi2vd2aym4r9azi61";
x86_64-linux = "0sgysp3hfpgrkcbfiwkp0a7ymqs02khfbrjabm52b5z61sgi05xv";
}
.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
};
dontConfigure = true;
dontBuild = true;
dontPatchELF = true;
dontStrip = true;
installPhase = ''
mkdir -p $out
cp -r * $out
ln -s $out/share/doc/gcc-arm-none-eabi/man $out/man
'';
preFixup = ''
find $out -type f | while read f; do
patchelf "$f" > /dev/null 2>&1 || continue
patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f" || true
patchelf --set-rpath ${
lib.makeLibraryPath [
"$out"
stdenv.cc.cc
ncurses5
]
} "$f" || true
done
'';
meta = with lib; {
description = "Pre-built GNU toolchain from ARM Cortex-M & Cortex-R processors";
homepage = "https://developer.arm.com/open-source/gnu-toolchain/gnu-rm";
license = with licenses; [
bsd2
gpl2
gpl3
lgpl21
lgpl3
mit
];
maintainers = with maintainers; [ prusnak ];
platforms = [
"x86_64-linux"
"x86_64-darwin"
];
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
};
}

View file

@ -1,74 +0,0 @@
{
lib,
stdenv,
fetchurl,
ncurses5,
}:
stdenv.mkDerivation rec {
pname = "gcc-arm-embedded";
version = "8.3.1";
release = "8-2019-q3-update";
subdir = "8-2019q3/RC1.1";
suffix =
{
x86_64-darwin = "mac";
x86_64-linux = "linux";
}
.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
src = fetchurl {
url = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${subdir}/gcc-arm-none-eabi-${release}-${suffix}.tar.bz2";
sha256 =
{
x86_64-darwin = "fc235ce853bf3bceba46eff4b95764c5935ca07fc4998762ef5e5b7d05f37085";
x86_64-linux = "b50b02b0a16e5aad8620e9d7c31110ef285c1dde28980b1a9448b764d77d8f92";
}
.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
};
dontConfigure = true;
dontBuild = true;
dontPatchELF = true;
dontStrip = true;
installPhase = ''
mkdir -p $out
cp -r * $out
ln -s $out/share/doc/gcc-arm-none-eabi/man $out/man
'';
preFixup = ''
find $out -type f | while read f; do
patchelf "$f" > /dev/null 2>&1 || continue
patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f" || true
patchelf --set-rpath ${
lib.makeLibraryPath [
"$out"
stdenv.cc.cc
ncurses5
]
} "$f" || true
done
'';
meta = with lib; {
description = "Pre-built GNU toolchain from ARM Cortex-M & Cortex-R processors";
homepage = "https://developer.arm.com/open-source/gnu-toolchain/gnu-rm";
license = with licenses; [
bsd2
gpl2
gpl3
lgpl21
lgpl3
mit
];
maintainers = with maintainers; [ prusnak ];
platforms = [
"x86_64-linux"
"x86_64-darwin"
];
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
};
}

View file

@ -1,77 +0,0 @@
{
lib,
stdenv,
fetchurl,
ncurses5,
}:
stdenv.mkDerivation rec {
pname = "gcc-arm-embedded";
version = "9.3.1";
release = "9-2020-q2-update";
subdir = "9-2020q2";
suffix =
{
aarch64-linux = "aarch64-linux";
x86_64-darwin = "mac";
x86_64-linux = "x86_64-linux";
}
.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
src = fetchurl {
url = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${subdir}/gcc-arm-none-eabi-${release}-${suffix}.tar.bz2";
sha256 =
{
aarch64-linux = "1b5q2y710hy7lddj8vj3zl54gfl74j30kx3hk3i81zrcbv16ah8z";
x86_64-darwin = "1ils9z16wrvglh72m428y5irmd36biq79yj86756whib8izbifdv";
x86_64-linux = "07zi2yr5gvhpbij5pnj49zswb9g2gw7zqp4xwwniqmq477h2xp2s";
}
.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
};
dontConfigure = true;
dontBuild = true;
dontPatchELF = true;
dontStrip = true;
installPhase = ''
mkdir -p $out
cp -r * $out
ln -s $out/share/doc/gcc-arm-none-eabi/man $out/man
'';
preFixup = ''
find $out -type f | while read f; do
patchelf "$f" > /dev/null 2>&1 || continue
patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f" || true
patchelf --set-rpath ${
lib.makeLibraryPath [
"$out"
stdenv.cc.cc
ncurses5
]
} "$f" || true
done
'';
meta = with lib; {
description = "Pre-built GNU toolchain from ARM Cortex-M & Cortex-R processors";
homepage = "https://developer.arm.com/open-source/gnu-toolchain/gnu-rm";
license = with licenses; [
bsd2
gpl2
gpl3
lgpl21
lgpl3
mit
];
maintainers = with maintainers; [ prusnak ];
platforms = [
"x86_64-linux"
"aarch64-linux"
"x86_64-darwin"
];
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
};
}

View file

@ -1,4 +1,5 @@
{ {
stdenv,
lib, lib,
buildGo124Module, buildGo124Module,
fetchFromGitHub, fetchFromGitHub,
@ -19,7 +20,6 @@ buildGo124Module rec {
nativeBuildInputs = [ nativeBuildInputs = [
installShellFiles installShellFiles
versionCheckHook
]; ];
vendorHash = null; vendorHash = null;
@ -32,27 +32,25 @@ buildGo124Module rec {
"-X=github.com/cilium/cilium/hubble/pkg.Version=${version}" "-X=github.com/cilium/cilium/hubble/pkg.Version=${version}"
]; ];
# Test fails at Test_getFlowsRequestWithInvalidRawFilters in github.com/cilium/hubble/cmd/observe doCheck = true;
# https://github.com/NixOS/nixpkgs/issues/178976
# https://github.com/cilium/hubble/pull/656
# https://github.com/cilium/hubble/pull/655
doCheck = false;
doInstallCheck = true; doInstallCheck = true;
nativeInstallCheckInputs = [ versionCheckHook ];
versionCheckProgramArg = "version";
postInstall = '' postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
installShellCompletion --cmd hubble \ installShellCompletion --cmd hubble \
--bash <($out/bin/hubble completion bash) \ --bash <($out/bin/hubble completion bash) \
--fish <($out/bin/hubble completion fish) \ --fish <($out/bin/hubble completion fish) \
--zsh <($out/bin/hubble completion zsh) --zsh <($out/bin/hubble completion zsh)
''; '';
meta = with lib; { meta = {
description = "Network, Service & Security Observability for Kubernetes using eBPF"; description = "Network, Service & Security Observability for Kubernetes using eBPF";
homepage = "https://github.com/cilium/hubble/"; homepage = "https://github.com/cilium/hubble/";
changelog = "https://github.com/cilium/hubble/releases/tag/${src.tag}"; changelog = "https://github.com/cilium/hubble/blob/${src.tag}/CHANGELOG.md";
license = licenses.asl20; license = lib.licenses.asl20;
maintainers = with maintainers; [ maintainers = with lib.maintainers; [
humancalico humancalico
bryanasdev000 bryanasdev000
FKouhai FKouhai

View file

@ -15,11 +15,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "magic-vlsi"; pname = "magic-vlsi";
version = "8.3.524"; version = "8.3.526";
src = fetchurl { src = fetchurl {
url = "http://opencircuitdesign.com/magic/archive/magic-${version}.tgz"; url = "http://opencircuitdesign.com/magic/archive/magic-${version}.tgz";
sha256 = "sha256-PmnxTICQlcrdA+Xd0VP9pC66hsOBhxxKRlQUk1NFHcI="; sha256 = "sha256-u6Z/Nfrlzn6JFDbPLPrpaZoR/nUGtE1H1roM6khme1Q=";
}; };
nativeBuildInputs = [ python3 ]; nativeBuildInputs = [ python3 ];

View file

@ -2,7 +2,7 @@
lib, lib,
stdenv, stdenv,
fetchFromGitHub, fetchFromGitHub,
gcc-arm-embedded, gcc-arm-embedded-13,
}: }:
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
"--enable-certdo" "--enable-certdo"
]; ];
nativeBuildInputs = [ gcc-arm-embedded ]; nativeBuildInputs = [ gcc-arm-embedded-13 ];
enableParallelBuilding = true; enableParallelBuilding = true;

View file

@ -21,14 +21,14 @@ let
in in
py.pkgs.buildPythonApplication rec { py.pkgs.buildPythonApplication rec {
pname = "prowler"; pname = "prowler";
version = "5.4.3"; version = "5.4.4";
pyproject = true; pyproject = true;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "prowler-cloud"; owner = "prowler-cloud";
repo = "prowler"; repo = "prowler";
tag = version; tag = version;
hash = "sha256-Rg1r1G1INmDK5bN4NIrs51CTnxNiwOOSoTFC3AlEUoI="; hash = "sha256-OuPhP4PMBqs3dAwY/Ln0Z4hwO3lPaJm4eYcl7AHy9vM=";
}; };
pythonRelaxDeps = true; pythonRelaxDeps = true;

View file

@ -9,7 +9,7 @@
unstableGitUpdater, unstableGitUpdater,
}: }:
stdenv.mkDerivation { stdenv.mkDerivation (finalAttrs: {
pname = "qdl"; pname = "qdl";
version = "0-unstable-2025-03-19"; version = "0-unstable-2025-03-19";
@ -20,18 +20,20 @@ stdenv.mkDerivation {
hash = "sha256-5ZV39whIm8qJIBLNdAsR2e8+f0jYjwE9dGNgh6ARPUY="; hash = "sha256-5ZV39whIm8qJIBLNdAsR2e8+f0jYjwE9dGNgh6ARPUY=";
}; };
postPatch = ''
substituteInPlace Makefile --replace-fail 'pkg-config' '${stdenv.cc.targetPrefix}pkg-config'
'';
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];
buildInputs = [ buildInputs = [
systemd
libxml2 libxml2
libusb1 libusb1
]; ];
installPhase = '' makeFlags = [
runHook preInstall "VERSION=${finalAttrs.src.rev}"
install -Dm755 ./qdl -t $out/bin "prefix=${placeholder "out"}"
runHook postInstall ];
'';
meta = { meta = {
homepage = "https://github.com/linux-msm/qdl"; homepage = "https://github.com/linux-msm/qdl";
@ -46,4 +48,4 @@ stdenv.mkDerivation {
}; };
passthru.updateScript = unstableGitUpdater { }; passthru.updateScript = unstableGitUpdater { };
} })

View file

@ -26,17 +26,17 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "wlx-overlay-s"; pname = "wlx-overlay-s";
version = "25.3.0"; version = "25.4.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "galister"; owner = "galister";
repo = "wlx-overlay-s"; repo = "wlx-overlay-s";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-m2YVXF9bEjovZOWa+X1CYHAUaAsUI4dBMG2ni3jP9L4="; hash = "sha256-lWUfhiHRxu72p9ZG2f2fZH6WZECm/fOKcK05MLZV+MI=";
}; };
useFetchCargoVendor = true; useFetchCargoVendor = true;
cargoHash = "sha256-y4pWUQFPR0jOTdukQZe4d1v0DFDfQtAg0Bi4V4ue5+Y="; cargoHash = "sha256-em5sWSty2/pZp2jTwBnLUIBgPOcoMpwELwj984XYf+k=";
nativeBuildInputs = [ nativeBuildInputs = [
makeWrapper makeWrapper

View file

@ -5,7 +5,6 @@
}: }:
{ {
lib,
stdenv, stdenv,
fetchYarnDeps, fetchYarnDeps,
yarnConfigHook, yarnConfigHook,
@ -29,7 +28,7 @@ let
workDir = "console"; workDir = "console";
bufArgs = "../proto --include-imports --include-wkt"; bufArgs = "../proto --include-imports --include-wkt";
outputPath = "src/app/proto"; outputPath = "src/app/proto";
hash = "sha256-3WvfbhLpp03yP7Nb8bmZXYSlGJuEnBkBuyEzNVkIYZg="; hash = "sha256-UzmwUUYg0my3noAQNtlUEBQ+K6GVnBSkWj4CzoaoLKw=";
}; };
in in
stdenv.mkDerivation { stdenv.mkDerivation {
@ -42,7 +41,7 @@ stdenv.mkDerivation {
offlineCache = fetchYarnDeps { offlineCache = fetchYarnDeps {
yarnLock = "${zitadelRepo}/console/yarn.lock"; yarnLock = "${zitadelRepo}/console/yarn.lock";
hash = "sha256-+7CFBEKfRsqXbJR+BkLdB+pZ/dEEk4POGwZOVQ1LAUo="; hash = "sha256-ekgLd5DTOBZWuT63QnTjx40ZYvLKZh+FXCn+h5vj9qQ=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -16,14 +16,14 @@
}: }:
let let
version = "2.71.1"; version = "2.71.7";
zitadelRepo = fetchFromGitHub { zitadelRepo = fetchFromGitHub {
owner = "zitadel"; owner = "zitadel";
repo = "zitadel"; repo = "zitadel";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-izYsf2Cc0jG8Wf82K6HsTVP+kAhmoEJVU7OJXhSzXLo="; hash = "sha256-0ZOiwJ/ehDBkbd7iTTyVJzLj6Etph5/oxrDrck30ZL8=";
}; };
goModulesHash = "sha256-mE0vhW1nW16SzqIu0C3q8qCXabJO7fZgkp7GeLWCwog="; goModulesHash = "sha256-iZCjHSpQ7Gy41Dd4svRLbyEh1N8VE8U0uCOlN9rfJQU=";
buildZitadelProtocGen = buildZitadelProtocGen =
name: name:
@ -100,7 +100,7 @@ let
protoc-gen-zitadel protoc-gen-zitadel
]; ];
outputPath = ".artifacts"; outputPath = ".artifacts";
hash = "sha256-QUUe3jK9rOWzI1jzevgZ/UB6SqB6GXtd9CVtAqiStdo="; hash = "sha256-rc5A2bQ2iWkybprQ7IWsQ/LLAQxPqhlxzVvPn8Ec56E=";
}; };
in in
buildGoModule rec { buildGoModule rec {

View file

@ -37,7 +37,6 @@
pkg-config, pkg-config,
ninja, ninja,
python312, python312,
python39,
gitMinimal, gitMinimal,
version, version,
flutterVersion, flutterVersion,
@ -58,7 +57,7 @@ let
constants = callPackage ./constants.nix { platform = stdenv.targetPlatform; }; constants = callPackage ./constants.nix { platform = stdenv.targetPlatform; };
python3 = if lib.versionAtLeast flutterVersion "3.20" then python312 else python39; python3 = python312;
src = callPackage ./source.nix { src = callPackage ./source.nix {
inherit inherit

View file

@ -159,7 +159,6 @@ filterAndCreateOverrides {
expat, expat,
libxcrypt-legacy, libxcrypt-legacy,
ncurses6, ncurses6,
python39,
python310, python310,
python311, python311,
python312, python312,
@ -176,7 +175,6 @@ filterAndCreateOverrides {
++ lib.lists.optionals (cudaAtLeast "12.5") [ ++ lib.lists.optionals (cudaAtLeast "12.5") [
libxcrypt-legacy libxcrypt-legacy
ncurses6 ncurses6
python39
python310 python310
python311 python311
python312 python312

View file

@ -29,7 +29,6 @@
patchelf, patchelf,
perl, perl,
python3, # FIXME: CUDAToolkit 10 may still need python27 python3, # FIXME: CUDAToolkit 10 may still need python27
python39,
python310, python310,
python311, python311,
pulseaudio, pulseaudio,
@ -155,7 +154,6 @@ backendStdenv.mkDerivation rec {
# libcrypt.so.1 # libcrypt.so.1
libxcrypt-legacy libxcrypt-legacy
ncurses6 ncurses6
python39
python310 python310
python311 python311
]; ];

View file

@ -309,14 +309,9 @@ stdenv.mkDerivation (finalAttrs: {
] ]
++ buildInputs; ++ buildInputs;
prePatch = prePatch = optionalString stdenv.hostPlatform.isDarwin ''
optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace configure --replace-fail '`/usr/bin/arch`' '"i386"'
substituteInPlace configure --replace-fail '`/usr/bin/arch`' '"i386"' '';
''
+ optionalString (pythonOlder "3.9" && stdenv.hostPlatform.isDarwin && x11Support) ''
# Broken on >= 3.9; replaced with ./3.9/darwin-tcl-tk.patch
substituteInPlace setup.py --replace-fail /Library/Frameworks /no-such-path
'';
patches = patches =
[ [
@ -772,14 +767,6 @@ stdenv.mkDerivation (finalAttrs: {
inherit src; inherit src;
name = "python${pythonVersion}-${version}-doc"; name = "python${pythonVersion}-${version}-doc";
patches = optionals (pythonAtLeast "3.9" && pythonOlder "3.10") [
# https://github.com/python/cpython/issues/98366
(fetchpatch {
url = "https://github.com/python/cpython/commit/5612471501b05518287ed61c1abcb9ed38c03942.patch";
hash = "sha256-p41hJwAiyRgyVjCVQokMSpSFg/VDDrqkCSxsodVb6vY=";
})
];
postPatch = lib.optionalString (pythonAtLeast "3.9" && pythonOlder "3.11") '' postPatch = lib.optionalString (pythonAtLeast "3.9" && pythonOlder "3.11") ''
substituteInPlace Doc/tools/extensions/pyspecific.py \ substituteInPlace Doc/tools/extensions/pyspecific.py \
--replace-fail "from sphinx.util import status_iterator" "from sphinx.util.display import status_iterator" --replace-fail "from sphinx.util import status_iterator" "from sphinx.util.display import status_iterator"

View file

@ -44,18 +44,6 @@
inherit passthruFun; inherit passthruFun;
}; };
python39 = callPackage ./cpython {
self = __splicedPackages.python39;
sourceVersion = {
major = "3";
minor = "9";
patch = "21";
suffix = "";
};
hash = "sha256-MSb1lZLJsNeYWEdV8r97CB+hyjXOem/qmAEI11KgW7E=";
inherit passthruFun;
};
python310 = callPackage ./cpython { python310 = callPackage ./cpython {
self = __splicedPackages.python310; self = __splicedPackages.python310;
sourceVersion = { sourceVersion = {

View file

@ -33,7 +33,7 @@ buildPythonPackage rec {
sed -i /patchelf/d pyproject.toml sed -i /patchelf/d pyproject.toml
# Build system requirements # Build system requirements
substituteInPlace pyproject.toml \ substituteInPlace pyproject.toml \
--replace-fail "setuptools>=70.1,<75" "setuptools" --replace-fail "setuptools>=70.1,<76" "setuptools"
''; '';
build-system = [ build-system = [

View file

@ -1,5 +1,6 @@
{ {
lib, lib,
stdenv,
buildPythonPackage, buildPythonPackage,
fetchFromGitHub, fetchFromGitHub,
@ -59,9 +60,14 @@ buildPythonPackage rec {
disabledTests = [ disabledTests = [
# ValueError: <class 'bool'> can be computed for one-element arrays only. # ValueError: <class 'bool'> can be computed for one-element arrays only.
"test_dot_with_sparse" "test_dot_with_sparse"
# ValueError: `shape` was not provided.
"test_sparse"
]; ];
__darwinAllowLocalNetworking = true; # On darwin, tests saturate the entire system, even when constrained to run single-threaded
# Removing pytest-xdist AND setting --cores to one does not prevent the load from exploding
doCheck = !stdenv.hostPlatform.isDarwin;
meta = { meta = {
description = "Generalized Linear Models with Dask"; description = "Generalized Linear Models with Dask";

View file

@ -67,10 +67,14 @@ buildPythonPackage rec {
# AttributeError: module 'numpy' has no attribute 'product' # AttributeError: module 'numpy' has no attribute 'product'
"test_extended_system" "test_extended_system"
] ]
++
lib.optionals
((stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) || stdenv.hostPlatform.isDarwin)
[
# AssertionError on a numerical test
"test_cell_list"
]
++ lib.optionals stdenv.hostPlatform.isDarwin [ ++ lib.optionals stdenv.hostPlatform.isDarwin [
# AssertionError on a numerical test
"test_cell_list"
# Fatal Python error: Aborted # Fatal Python error: Aborted
# matplotlib/backend_bases.py", line 2654 in create_with_canvas # matplotlib/backend_bases.py", line 2654 in create_with_canvas
"test_examples" "test_examples"

View file

@ -10,7 +10,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "llama-index-indices-managed-llama-cloud"; pname = "llama-index-indices-managed-llama-cloud";
version = "0.6.10"; version = "0.6.11";
pyproject = true; pyproject = true;
disabled = pythonOlder "3.8"; disabled = pythonOlder "3.8";
@ -18,7 +18,7 @@ buildPythonPackage rec {
src = fetchPypi { src = fetchPypi {
pname = "llama_index_indices_managed_llama_cloud"; pname = "llama_index_indices_managed_llama_cloud";
inherit version; inherit version;
hash = "sha256-lI7PRcTYuWy0/pRq6/plk82eXtvhbl8QciScezxW07U="; hash = "sha256-klUy92DNLrsllIKNoxGtrD1UzSyuPf8pCEke67K4vQ8=";
}; };
build-system = [ poetry-core ]; build-system = [ poetry-core ];

View file

@ -10,7 +10,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "lxml-html-clean"; pname = "lxml-html-clean";
version = "0.4.1"; version = "0.4.2";
pyproject = true; pyproject = true;
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "fedora-python"; owner = "fedora-python";
repo = "lxml_html_clean"; repo = "lxml_html_clean";
tag = version; tag = version;
hash = "sha256-tZDFpJg7YySJ6CrSesD9+WWZS/guQFNmpSVsMzfzbpU="; hash = "sha256-KGUFRbcaeDcX2jyoyyZMZsVTbN+h8uy+ugcritkZe38=";
}; };
build-system = [ setuptools ]; build-system = [ setuptools ];

View file

@ -1,4 +1,5 @@
{ {
stdenv,
lib, lib,
pkgs, pkgs,
buildPythonPackage, buildPythonPackage,
@ -9,6 +10,9 @@
numpy, numpy,
pillow, pillow,
pytestCheckHook, pytestCheckHook,
removeReferencesTo,
python,
replaceVars,
}: }:
let let
@ -37,6 +41,12 @@ let
hash = "sha256-3JA7cW/xaEj/DxMHEypROwrKGo7EwUEcipRqALTvydw="; hash = "sha256-3JA7cW/xaEj/DxMHEypROwrKGo7EwUEcipRqALTvydw=";
}; };
patches = [
(replaceVars ./fix-cc-detection.patch {
cc = "${stdenv.cc.targetPrefix}cc";
})
];
build-system = [ build-system = [
setuptools-scm setuptools-scm
]; ];
@ -62,6 +72,10 @@ buildPythonPackage rec {
setuptools-scm setuptools-scm
]; ];
nativeBuildInputs = [
removeReferencesTo
];
propagatedBuildInputs = [ propagatedBuildInputs = [
pdfium-binaries pdfium-binaries
]; ];
@ -104,6 +118,11 @@ buildPythonPackage rec {
''; '';
env.PDFIUM_PLATFORM = "system:${pdfiumVersion}"; env.PDFIUM_PLATFORM = "system:${pdfiumVersion}";
# Remove references to stdenv in comments.
postInstall = ''
remove-references-to -t ${stdenv.cc.cc} $out/${python.sitePackages}/pypdfium2_raw/bindings.py
'';
nativeCheckInputs = [ nativeCheckInputs = [
numpy numpy
pillow pillow

View file

@ -0,0 +1,25 @@
diff --git a/src/ctypesgen/__main__.py b/src/ctypesgen/__main__.py
index 23ee014..2d0cfc1 100644
--- a/src/ctypesgen/__main__.py
+++ b/src/ctypesgen/__main__.py
@@ -89,17 +89,9 @@ def main_impl(args, cmd_str):
assert _is_relative_to(args.output, args.linkage_anchor)
if args.cpp:
- assert shutil.which(args.cpp[0]), f"Given pre-processor {args.cpp[0]!r} is not available."
- else:
- if shutil.which("gcc"):
- args.cpp = ["gcc", "-E"]
- elif shutil.which("cpp"):
- args.cpp = ["cpp"]
- elif shutil.which("clang"):
- args.cpp = ["clang", "-E"]
- else:
- raise RuntimeError("C pre-processor auto-detection failed: neither gcc nor clang available.")
-
+ print("cpp argument ignored for nix build")
+ args.cpp = ["@cc@", "-E"]
+
# Important: must not use +=, this would mutate the original object, which is problematic when default=[] is used and ctypesgen called repeatedly from within python
args.compile_libdirs = args.compile_libdirs + args.universal_libdirs
args.runtime_libdirs = args.runtime_libdirs + args.universal_libdirs

View file

@ -20,14 +20,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "sparse"; pname = "sparse";
version = "0.15.5"; version = "0.16.0";
pyproject = true; pyproject = true;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "pydata"; owner = "pydata";
repo = "sparse"; repo = "sparse";
tag = version; tag = version;
hash = "sha256-W4rcq7G/bQsT9oTLieOzWNst5LnIAelRMbm+uUPeQgs="; hash = "sha256-ChSEb+IwzutDgYBJxhlunRaF8VvkLHW/ae5RdrljWj0=";
}; };
build-system = [ build-system = [
@ -56,10 +56,5 @@ buildPythonPackage rec {
downloadPage = "https://github.com/pydata/sparse/releases/tag/${version}"; downloadPage = "https://github.com/pydata/sparse/releases/tag/${version}";
license = lib.licenses.bsd3; license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [ GaetanLepage ]; maintainers = with lib.maintainers; [ GaetanLepage ];
badPlatforms = [
# Most tests fail with: Fatal Python error: Segmentation fault
# numba/typed/typedlist.py", line 344 in append
"aarch64-linux"
];
}; };
} }

View file

@ -13,20 +13,16 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "ufomerge"; pname = "ufomerge";
version = "1.8.2"; version = "1.8.3";
pyproject = true; pyproject = true;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "googlefonts"; owner = "googlefonts";
repo = "ufomerge"; repo = "ufomerge";
tag = "v${version}"; tag = "v${version}";
hash = "sha256-D+BhKCKWgprQn+eXFgwnSN/06+JF5CiUS0VAS1Kvedw="; hash = "sha256-E/RgFJXyA6/ZktsjydqDecysi03+XQDOD0SeH3rlFZI=";
}; };
nativeBuildInputs = [ pythonRelaxDepsHook ];
pythonRelaxDeps = [ "fonttools" ];
build-system = [ build-system = [
setuptools setuptools
setuptools-scm setuptools-scm
@ -42,9 +38,9 @@ buildPythonPackage rec {
fontfeatures fontfeatures
]; ];
disabledTestPaths = [ disabledTests = [
# Failing due to fonttools being to old # Fails with `KeyError: 'B'`
"tests/test_layout.py" "test_28"
]; ];
pythonImportsCheck = [ "ufomerge" ]; pythonImportsCheck = [ "ufomerge" ];
@ -52,7 +48,7 @@ buildPythonPackage rec {
meta = { meta = {
description = "Command line utility and Python library that merges two UFO source format fonts into a single file"; description = "Command line utility and Python library that merges two UFO source format fonts into a single file";
homepage = "https://github.com/googlefonts/ufomerge"; homepage = "https://github.com/googlefonts/ufomerge";
changelog = "https://github.com/googlefonts/ufomerge/releases/tag/v${version}"; changelog = "https://github.com/googlefonts/ufomerge/releases/tag/${src.tag}";
license = lib.licenses.asl20; license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ jopejoe1 ]; maintainers = with lib.maintainers; [ jopejoe1 ];
}; };

View file

@ -21,14 +21,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "unstructured-client"; pname = "unstructured-client";
version = "0.32.0"; version = "0.32.3";
pyproject = true; pyproject = true;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Unstructured-IO"; owner = "Unstructured-IO";
repo = "unstructured-python-client"; repo = "unstructured-python-client";
tag = "v${version}"; tag = "v${version}";
hash = "sha256-2BAhjLHVWGjjbWTXmG/+GMKQutJaBCMLhU+/Dq/LK5c="; hash = "sha256-bHiYV86c3ViCLix6vR55GiM8qTv64jj9tD8nF/jMUm4=";
}; };
preBuild = '' preBuild = ''

View file

@ -9,7 +9,7 @@
perl, perl,
check, check,
pkg-config, pkg-config,
python39, # crossfire-server relies on a parser wich was removed in python >3.9 python3,
version, version,
rev, rev,
sha256, sha256,
@ -39,7 +39,7 @@ stdenv.mkDerivation {
perl perl
check check
pkg-config pkg-config
python39 python3
]; ];
hardeningDisable = [ "format" ]; hardeningDisable = [ "format" ];
@ -49,13 +49,14 @@ stdenv.mkDerivation {
sh autogen.sh sh autogen.sh
''; '';
configureFlags = [ "--with-python=${python39}" ]; configureFlags = [ "--with-python=${python3}" ];
postInstall = '' postInstall = ''
ln -s ${maps} "$out/share/crossfire/maps" ln -s ${maps} "$out/share/crossfire/maps"
''; '';
meta = with lib; { meta = with lib; {
broken = true; # cfpython.c:63:10: fatal error: node.h: No such file or directory
description = "Server for the Crossfire free MMORPG"; description = "Server for the Crossfire free MMORPG";
homepage = "http://crossfire.real-time.com/"; homepage = "http://crossfire.real-time.com/";
license = licenses.gpl2Plus; license = licenses.gpl2Plus;

View file

@ -14,13 +14,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "outline"; pname = "outline";
version = "0.82.0"; version = "0.83.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "outline"; owner = "outline";
repo = "outline"; repo = "outline";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-nCXyR4k/Ny0OLAE18B+GJDyOMTjt6rc375yj+d+c8zQ="; hash = "sha256-r8E+N6C9EGah7qEomD+c64lW2L3XjAj+TIVHByLckag=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
yarnOfflineCache = fetchYarnDeps { yarnOfflineCache = fetchYarnDeps {
yarnLock = "${src}/yarn.lock"; yarnLock = "${src}/yarn.lock";
hash = "sha256-RDMVlSVYPGAuyOTcI2CBgaaZ5wNT7lznYb4jbirKmqk="; hash = "sha256-XiVg/HesOooj7aJHMMVKx+JUd6cA0E4koxHZAm3cFiQ=";
}; };
configurePhase = '' configurePhase = ''

View file

@ -669,6 +669,13 @@ mapAliases {
gcc8Stdenv = throw "gcc8Stdenv has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-11-20 gcc8Stdenv = throw "gcc8Stdenv has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-11-20
gcc10StdenvCompat = gcc10StdenvCompat =
if stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "11" then gcc10Stdenv else stdenv; # Added 2024-03-21 if stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "11" then gcc10Stdenv else stdenv; # Added 2024-03-21
gcc-arm-embedded-6 = throw "gcc-arm-embedded-6 has been removed from Nixpkgs as it is unmaintained and obsolete"; # Added 2025-04-12
gcc-arm-embedded-7 = throw "gcc-arm-embedded-7 has been removed from Nixpkgs as it is unmaintained and obsolete"; # Added 2025-04-12
gcc-arm-embedded-8 = throw "gcc-arm-embedded-8 has been removed from Nixpkgs as it is unmaintained and obsolete"; # Added 2025-04-12
gcc-arm-embedded-9 = throw "gcc-arm-embedded-9 has been removed from Nixpkgs as it is unmaintained and obsolete"; # Added 2025-04-12
gcc-arm-embedded-10 = throw "gcc-arm-embedded-10 has been removed from Nixpkgs as it is unmaintained and obsolete"; # Added 2025-04-12
gcc-arm-embedded-11 = throw "gcc-arm-embedded-11 has been removed from Nixpkgs as it is unmaintained and obsolete"; # Added 2025-04-12
gcc-arm-embedded-12 = throw "gcc-arm-embedded-12 has been removed from Nixpkgs as it is unmaintained and obsolete"; # Added 2025-04-12
gcj = gcj6; # Added 2024-09-13 gcj = gcj6; # Added 2024-09-13
gcj6 = throw "gcj6 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-13 gcj6 = throw "gcj6 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-13
gcolor2 = throw "'gcolor2' has been removed due to lack of maintenance upstream and depending on gtk2. Consider using 'gcolor3' or 'eyedropper' instead"; # Added 2024-09-15 gcolor2 = throw "'gcolor2' has been removed due to lack of maintenance upstream and depending on gtk2. Consider using 'gcolor3' or 'eyedropper' instead"; # Added 2024-09-15

View file

@ -2541,9 +2541,7 @@ with pkgs;
klipper = callPackage ../servers/klipper { }; klipper = callPackage ../servers/klipper { };
klipper-firmware = callPackage ../servers/klipper/klipper-firmware.nix { klipper-firmware = callPackage ../servers/klipper/klipper-firmware.nix { };
gcc-arm-embedded = gcc-arm-embedded-13;
};
klipper-flash = callPackage ../servers/klipper/klipper-flash.nix { }; klipper-flash = callPackage ../servers/klipper/klipper-flash.nix { };
@ -6371,7 +6369,7 @@ with pkgs;
inherit (llvmPackages_15) llvm; inherit (llvmPackages_15) llvm;
}; };
gcc-arm-embedded = gcc-arm-embedded-12; gcc-arm-embedded = gcc-arm-embedded-14;
# It would be better to match the default gcc so that there are no linking errors # It would be better to match the default gcc so that there are no linking errors
# when using C/C++ libraries in D packages, but right now versions >= 12 are broken. # when using C/C++ libraries in D packages, but right now versions >= 12 are broken.
@ -7591,12 +7589,6 @@ with pkgs;
bluezSupport = lib.meta.availableOn stdenv.hostPlatform bluez; bluezSupport = lib.meta.availableOn stdenv.hostPlatform bluez;
x11Support = true; x11Support = true;
}; };
python39Full = python39.override {
self = python39Full;
pythonAttr = "python39Full";
bluezSupport = lib.meta.availableOn stdenv.hostPlatform bluez;
x11Support = true;
};
python310Full = python310.override { python310Full = python310.override {
self = python310Full; self = python310Full;
pythonAttr = "python310Full"; pythonAttr = "python310Full";
@ -7641,7 +7633,6 @@ with pkgs;
pythonInterpreters = callPackage ./../development/interpreters/python { }; pythonInterpreters = callPackage ./../development/interpreters/python { };
inherit (pythonInterpreters) inherit (pythonInterpreters)
python27 python27
python39
python310 python310
python311 python311
python312 python312
@ -7657,7 +7648,6 @@ with pkgs;
# Python package sets. # Python package sets.
python27Packages = python27.pkgs; python27Packages = python27.pkgs;
python39Packages = python39.pkgs;
python310Packages = python310.pkgs; python310Packages = python310.pkgs;
python311Packages = python311.pkgs; python311Packages = python311.pkgs;
python312Packages = recurseIntoAttrs python312.pkgs; python312Packages = recurseIntoAttrs python312.pkgs;

View file

@ -38,14 +38,12 @@ mapAliases ({
python2Packages = throw "do not use python2Packages when building Python packages, specify each used package as a separate argument"; # do not remove python2Packages = throw "do not use python2Packages when building Python packages, specify each used package as a separate argument"; # do not remove
python27Packages = throw "do not use python27Packages when building Python packages, specify each used package as a separate argument"; # do not remove python27Packages = throw "do not use python27Packages when building Python packages, specify each used package as a separate argument"; # do not remove
python3Packages = throw "do not use python3Packages when building Python packages, specify each used package as a separate argument"; # do not remove python3Packages = throw "do not use python3Packages when building Python packages, specify each used package as a separate argument"; # do not remove
python39Packages = throw "do not use python39Packages when building Python packages, specify each used package as a separate argument"; # do not remove
python310Packages = throw "do not use python310Packages when building Python packages, specify each used package as a separate argument"; # do not remove python310Packages = throw "do not use python310Packages when building Python packages, specify each used package as a separate argument"; # do not remove
python311Packages = throw "do not use python311Packages when building Python packages, specify each used package as a separate argument"; # do not remove python311Packages = throw "do not use python311Packages when building Python packages, specify each used package as a separate argument"; # do not remove
python312Packages = throw "do not use python312Packages when building Python packages, specify each used package as a separate argument"; # do not remove python312Packages = throw "do not use python312Packages when building Python packages, specify each used package as a separate argument"; # do not remove
python313Packages = throw "do not use python313Packages when building Python packages, specify each used package as a separate argument"; # do not remove python313Packages = throw "do not use python313Packages when building Python packages, specify each used package as a separate argument"; # do not remove
python2 = throw "do not use python2 when building Python packages, use the generic python parameter instead"; # do not remove python2 = throw "do not use python2 when building Python packages, use the generic python parameter instead"; # do not remove
python3 = throw "do not use python3 when building Python packages, use the generic python parameter instead"; # do not remove python3 = throw "do not use python3 when building Python packages, use the generic python parameter instead"; # do not remove
python39 = throw "do not use python39 when building Python packages, use the generic python parameter instead"; # do not remove
python310 = throw "do not use python310 when building Python packages, use the generic python parameter instead"; # do not remove python310 = throw "do not use python310 when building Python packages, use the generic python parameter instead"; # do not remove
python311 = throw "do not use python311 when building Python packages, use the generic python parameter instead"; # do not remove python311 = throw "do not use python311 when building Python packages, use the generic python parameter instead"; # do not remove
python312 = throw "do not use python312 when building Python packages, use the generic python parameter instead"; # do not remove python312 = throw "do not use python312 when building Python packages, use the generic python parameter instead"; # do not remove