From 8d5abcd1bb3d5d9483aa1a1261e15b96650f500c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 27 Mar 2023 20:08:22 +0200 Subject: [PATCH 01/51] nixos/install-grub: use more modern make_path mkpath is a legacy interface. --- nixos/modules/system/boot/loader/grub/install-grub.pl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl index 6f0f62546a01..d6d92ffa0e9a 100644 --- a/nixos/modules/system/boot/loader/grub/install-grub.pl +++ b/nixos/modules/system/boot/loader/grub/install-grub.pl @@ -3,7 +3,7 @@ use warnings; use Class::Struct; use XML::LibXML; use File::Basename; -use File::Path; +use File::Path qw(make_path); use File::stat; use File::Copy; use File::Copy::Recursive qw(rcopy pathrm); @@ -98,7 +98,7 @@ $ENV{'PATH'} = get("path"); print STDERR "updating GRUB 2 menu...\n"; -mkpath("$bootPath/grub", 0, 0700); +make_path("$bootPath/grub", { mode => 0700 }); # Discover whether the bootPath is on the same filesystem as / and # /nix/store. If not, then all kernels and initrds must be copied to @@ -438,7 +438,7 @@ $conf .= "$extraConfig\n"; $conf .= "\n"; my %copied; -mkpath("$bootPath/kernels", 0, 0755) if $copyKernels; +make_path("$bootPath/kernels", { mode => 0755 }) if $copyKernels; sub copyToKernelsDir { my ($path) = @_; @@ -471,7 +471,7 @@ sub addEntry { my $systemName = basename(Cwd::abs_path("$path")); my $initrdSecretsPath = "$bootPath/kernels/$systemName-secrets"; - mkpath(dirname($initrdSecretsPath), 0, 0755); + make_path(dirname($initrdSecretsPath), { mode => 0755 }); my $oldUmask = umask; # Make sure initrd is not world readable (won't work if /boot is FAT) umask 0137; From 33c2472b6925510fb565acdecb9a0dcc4d40aa39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 27 Mar 2023 20:09:26 +0200 Subject: [PATCH 02/51] nixos/install-grub: don't use bare file handles and 3 argument open this is not best practice perl since a long time. --- .../system/boot/loader/grub/install-grub.pl | 37 ++++++++++--------- 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl index d6d92ffa0e9a..bf34859ec1e3 100644 --- a/nixos/modules/system/boot/loader/grub/install-grub.pl +++ b/nixos/modules/system/boot/loader/grub/install-grub.pl @@ -37,7 +37,8 @@ sub readFile { my ($fn) = @_; # enable slurp mode: read entire file in one go local $/ = undef; - open my $fh, "<$fn" or return undef; + open my $fh, "<", $fn + or return; my $s = <$fh>; close $fh; # disable slurp mode @@ -48,7 +49,7 @@ sub readFile { sub writeFile { my ($fn, $s) = @_; - open my $fh, ">$fn" or die "cannot create $fn: $!\n"; + open my $fh, ">", $fn or die "cannot create $fn: $!\n"; print $fh $s or die "cannot write to $fn: $!\n"; close $fh or die "cannot close $fn: $!\n"; } @@ -690,17 +691,17 @@ struct(GrubState => { # because it is read line-by-line. sub readGrubState { my $defaultGrubState = GrubState->new(name => "", version => "", efi => "", devices => "", efiMountPoint => "", extraGrubInstallArgs => () ); - open FILE, "<$bootPath/grub/state" or return $defaultGrubState; + open my $fh, "<", "$bootPath/grub/state" or return $defaultGrubState; local $/ = "\n"; - my $name = ; + my $name = <$fh>; chomp($name); - my $version = ; + my $version = <$fh>; chomp($version); - my $efi = ; + my $efi = <$fh>; chomp($efi); - my $devices = ; + my $devices = <$fh>; chomp($devices); - my $efiMountPoint = ; + my $efiMountPoint = <$fh>; chomp($efiMountPoint); # Historically, arguments in the state file were one per each line, but that # gets really messy when newlines are involved, structured arguments @@ -708,7 +709,7 @@ sub readGrubState { # when we need to remove a setting in the future. Thus, the 6th line is a JSON # object that can store structured data, with named keys, and all new state # should go in there. - my $jsonStateLine = ; + my $jsonStateLine = <$fh>; # For historical reasons we do not check the values above for un-definedness # (that is, when the state file has too few lines and EOF is reached), # because the above come from the first version of this logic and are thus @@ -720,7 +721,7 @@ sub readGrubState { } my %jsonState = %{decode_json($jsonStateLine)}; my @extraGrubInstallArgs = exists($jsonState{'extraGrubInstallArgs'}) ? @{$jsonState{'extraGrubInstallArgs'}} : (); - close FILE; + close $fh; my $grubState = GrubState->new(name => $name, version => $version, efi => $efi, devices => $devices, efiMountPoint => $efiMountPoint, extraGrubInstallArgs => \@extraGrubInstallArgs ); return $grubState } @@ -787,18 +788,18 @@ if ($requireNewInstall != 0) { my $stateFile = "$bootPath/grub/state"; my $stateFileTmp = $stateFile . ".tmp"; - open FILE, ">$stateFileTmp" or die "cannot create $stateFileTmp: $!\n"; - print FILE get("fullName"), "\n" or die; - print FILE get("fullVersion"), "\n" or die; - print FILE $efiTarget, "\n" or die; - print FILE join( ",", @deviceTargets ), "\n" or die; - print FILE $efiSysMountPoint, "\n" or die; + open my $fh, ">", "$stateFileTmp" or die "cannot create $stateFileTmp: $!\n"; + print $fh get("fullName"), "\n" or die; + print $fh get("fullVersion"), "\n" or die; + print $fh $efiTarget, "\n" or die; + print $fh join( ",", @deviceTargets ), "\n" or die; + print $fh $efiSysMountPoint, "\n" or die; my %jsonState = ( extraGrubInstallArgs => \@extraGrubInstallArgs ); my $jsonStateLine = encode_json(\%jsonState); - print FILE $jsonStateLine, "\n" or die; - close FILE or die; + print $fh $jsonStateLine, "\n" or die; + close $fh or die; # Atomically switch to the new state file rename $stateFileTmp, $stateFile or die "cannot rename $stateFileTmp to $stateFile: $!\n"; From 1f4629016e312f0daad599d9b08d545763e90e70 Mon Sep 17 00:00:00 2001 From: RAVENz46 Date: Wed, 15 Jan 2025 19:55:26 +0900 Subject: [PATCH 03/51] oculante: fix icon, add wayland support wayland linux only --- pkgs/by-name/oc/oculante/package.nix | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/oc/oculante/package.nix b/pkgs/by-name/oc/oculante/package.nix index 643cddcf2aca..e3febb9abccd 100644 --- a/pkgs/by-name/oc/oculante/package.nix +++ b/pkgs/by-name/oc/oculante/package.nix @@ -54,7 +54,6 @@ rustPlatform.buildRustPackage rec { libXi libXrandr gtk3 - libxkbcommon wayland ] @@ -69,20 +68,28 @@ rustPlatform.buildRustPackage rec { ]; postInstall = '' - install -Dm444 $src/res/icons/icon.png -t $out/share/icons/hicolor/128x128/apps/ + install -Dm444 $src/res/icons/icon.png $out/share/icons/hicolor/128x128/apps/oculante.png install -Dm444 $src/res/oculante.desktop -t $out/share/applications wrapProgram $out/bin/oculante \ - --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libGL ]} + --prefix LD_LIBRARY_PATH : ${ + lib.makeLibraryPath ( + [ + libGL + libxkbcommon + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ wayland ] + ) + } ''; - meta = with lib; { + meta = { broken = stdenv.hostPlatform.isDarwin; description = "Minimalistic crossplatform image viewer written in Rust"; homepage = "https://github.com/woelper/oculante"; changelog = "https://github.com/woelper/oculante/blob/${version}/CHANGELOG.md"; - license = licenses.mit; + license = lib.licenses.mit; mainProgram = "oculante"; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ dit7ya figsoda ]; From 4880951aea16680accaf7253577243b045542864 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Thu, 13 Feb 2025 17:55:13 -0500 Subject: [PATCH 04/51] yoda: move to by-name --- .../yoda/default.nix => by-name/yo/yoda/package.nix} | 10 +++++----- pkgs/top-level/all-packages.nix | 3 --- pkgs/top-level/python-packages.nix | 2 +- 3 files changed, 6 insertions(+), 9 deletions(-) rename pkgs/{development/libraries/physics/yoda/default.nix => by-name/yo/yoda/package.nix} (89%) diff --git a/pkgs/development/libraries/physics/yoda/default.nix b/pkgs/by-name/yo/yoda/package.nix similarity index 89% rename from pkgs/development/libraries/physics/yoda/default.nix rename to pkgs/by-name/yo/yoda/package.nix index 581c9b4362dd..d6eb417897c7 100644 --- a/pkgs/development/libraries/physics/yoda/default.nix +++ b/pkgs/by-name/yo/yoda/package.nix @@ -4,7 +4,7 @@ fetchFromGitLab, autoreconfHook, bash, - python, + python3, root, makeWrapper, zlib, @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { hash = "sha256-sHvwgLH22fvdlh4oLjr4fzZ2WtBJMAlvr4Vxi9Xdf84="; }; - nativeBuildInputs = with python.pkgs; [ + nativeBuildInputs = with python3.pkgs; [ autoreconfHook bash cython @@ -31,9 +31,9 @@ stdenv.mkDerivation rec { buildInputs = [ - python + python3 ] - ++ (with python.pkgs; [ + ++ (with python3.pkgs; [ numpy matplotlib ]) @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { patchShebangs . substituteInPlace pyext/yoda/plotting/script_generator.py \ - --replace '/usr/bin/env python' '${python.interpreter}' + --replace '/usr/bin/env python' '${python3.interpreter}' ''; postInstall = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d1fad5c7dcd1..d9e0ac03ab52 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17422,9 +17422,6 @@ with pkgs; imagemagick = graphicsmagick-imagemagick-compat; }; - yoda = callPackage ../development/libraries/physics/yoda { - python = python3; - }; yoda-with-root = lowPrio (yoda.override { withRootSupport = true; }); diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 856f229a15d8..bf8346e038fe 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -18597,7 +18597,7 @@ self: super: with self; { yfinance = callPackage ../development/python-modules/yfinance { }; - yoda = toPythonModule (pkgs.yoda.override { inherit python; }); + yoda = toPythonModule (pkgs.yoda.override { python3 = python; }); yolink-api = callPackage ../development/python-modules/yolink-api { }; From e763d4a526c6df45f4f25ebd7282f94367e6866b Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Thu, 13 Feb 2025 18:03:10 -0500 Subject: [PATCH 05/51] yoda: 2.0.2 -> 2.0.3 --- pkgs/by-name/yo/yoda/package.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/yo/yoda/package.nix b/pkgs/by-name/yo/yoda/package.nix index d6eb417897c7..838eb0733065 100644 --- a/pkgs/by-name/yo/yoda/package.nix +++ b/pkgs/by-name/yo/yoda/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "yoda"; - version = "2.0.2"; + version = "2.0.3"; src = fetchFromGitLab { owner = "hepcedar"; repo = pname; rev = "yoda-${version}"; - hash = "sha256-sHvwgLH22fvdlh4oLjr4fzZ2WtBJMAlvr4Vxi9Xdf84="; + hash = "sha256-No2Lr4nmYNfFnJVpg7xYjd35g12CbQtpW9QMjM3owko="; }; nativeBuildInputs = with python3.pkgs; [ @@ -70,12 +70,12 @@ stdenv.mkDerivation rec { installCheckTarget = "check"; - meta = with lib; { + meta = { description = "Provides small set of data analysis (specifically histogramming) classes"; - license = licenses.gpl3Only; + license = lib.licenses.gpl3Only; homepage = "https://yoda.hepforge.org"; changelog = "https://gitlab.com/hepcedar/yoda/-/blob/yoda-${version}/ChangeLog"; - platforms = platforms.unix; - maintainers = with maintainers; [ veprbl ]; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ veprbl ]; }; } From 34cfba36429056072972a0f12a7470375cc8eeaf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=A9clairevoyant?= <848000+eclairevoyant@users.noreply.github.com> Date: Thu, 13 Feb 2025 22:34:52 -0500 Subject: [PATCH 06/51] unixcw: cleanup, fix license --- pkgs/applications/radio/unixcw/default.nix | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/radio/unixcw/default.nix b/pkgs/applications/radio/unixcw/default.nix index 8565b691802d..e1fbfe65ec9a 100644 --- a/pkgs/applications/radio/unixcw/default.nix +++ b/pkgs/applications/radio/unixcw/default.nix @@ -11,23 +11,28 @@ mkDerivation rec { pname = "unixcw"; version = "3.5.1"; + src = fetchurl { url = "mirror://sourceforge/unixcw/unixcw_${version}.orig.tar.gz"; - sha256 = "5f3aacd8a26e16e6eff437c7ae1e9b389956fb137eeb3de24670ce05de479e7a"; + hash = "sha256-Xzqs2KJuFubv9DfHrh6bOJlW+xN+6z3iRnDOBd5Hnno="; }; + patches = [ ./remove-use-of-dlopen.patch ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libpulseaudio alsa-lib qtbase ]; + CFLAGS = "-lasound -lpulse-simple"; - meta = with lib; { - description = "sound characters as Morse code on the soundcard or console speaker"; + meta = { + description = "Sound characters as Morse code on the soundcard or console speaker"; longDescription = '' unixcw is a project providing libcw library and a set of programs using the library: cw, cwgen, cwcp and xcwcp. @@ -44,8 +49,8 @@ mkDerivation rec { cw reports any errors in embedded commands ''; homepage = "https://unixcw.sourceforge.net"; - maintainers = [ maintainers.mafo ]; - license = licenses.gpl2; - platforms = platforms.linux; + maintainers = [ lib.maintainers.mafo ]; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; }; } From 296a46fa94ba07a19b1324f3ab90355dc0f3a06a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=A9clairevoyant?= <848000+eclairevoyant@users.noreply.github.com> Date: Thu, 13 Feb 2025 22:38:33 -0500 Subject: [PATCH 07/51] unixcw: move to by-name --- .../default.nix => by-name/un/unixcw/package.nix} | 13 ++++++++----- .../un}/unixcw/remove-use-of-dlopen.patch | 0 pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 8 insertions(+), 7 deletions(-) rename pkgs/{applications/radio/unixcw/default.nix => by-name/un/unixcw/package.nix} (92%) rename pkgs/{applications/radio => by-name/un}/unixcw/remove-use-of-dlopen.patch (100%) diff --git a/pkgs/applications/radio/unixcw/default.nix b/pkgs/by-name/un/unixcw/package.nix similarity index 92% rename from pkgs/applications/radio/unixcw/default.nix rename to pkgs/by-name/un/unixcw/package.nix index e1fbfe65ec9a..df8e8fe0469f 100644 --- a/pkgs/applications/radio/unixcw/default.nix +++ b/pkgs/by-name/un/unixcw/package.nix @@ -1,14 +1,14 @@ { lib, - mkDerivation, + stdenv, fetchurl, libpulseaudio, alsa-lib, pkg-config, - qtbase, + qt5, }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "unixcw"; version = "3.5.1"; @@ -21,12 +21,15 @@ mkDerivation rec { ./remove-use-of-dlopen.patch ]; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ + pkg-config + qt5.wrapQtAppsHook + ]; buildInputs = [ libpulseaudio alsa-lib - qtbase + qt5.qtbase ]; CFLAGS = "-lasound -lpulse-simple"; diff --git a/pkgs/applications/radio/unixcw/remove-use-of-dlopen.patch b/pkgs/by-name/un/unixcw/remove-use-of-dlopen.patch similarity index 100% rename from pkgs/applications/radio/unixcw/remove-use-of-dlopen.patch rename to pkgs/by-name/un/unixcw/remove-use-of-dlopen.patch diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0a58cf1edb0c..274a3ad66cdc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17979,8 +17979,6 @@ with pkgs; unityhub = callPackage ../development/tools/unityhub { }; - unixcw = libsForQt5.callPackage ../applications/radio/unixcw { }; - vaultenv = haskell.lib.justStaticExecutables haskellPackages.vaultenv; vaultwarden = callPackage ../tools/security/vaultwarden { From 6288f880889a22e30696302d55b8e1e0ec4f68f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=A9clairevoyant?= <848000+eclairevoyant@users.noreply.github.com> Date: Thu, 13 Feb 2025 22:41:50 -0500 Subject: [PATCH 08/51] unixcw: build cwcp --- pkgs/by-name/un/unixcw/package.nix | 13 ++++++++++++ pkgs/by-name/un/unixcw/unixcw-3.6-tinfo.patch | 20 +++++++++++++++++++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/by-name/un/unixcw/unixcw-3.6-tinfo.patch diff --git a/pkgs/by-name/un/unixcw/package.nix b/pkgs/by-name/un/unixcw/package.nix index df8e8fe0469f..fc169b90d32f 100644 --- a/pkgs/by-name/un/unixcw/package.nix +++ b/pkgs/by-name/un/unixcw/package.nix @@ -6,6 +6,8 @@ alsa-lib, pkg-config, qt5, + ncurses, + autoreconfHook, }: stdenv.mkDerivation rec { @@ -19,9 +21,19 @@ stdenv.mkDerivation rec { patches = [ ./remove-use-of-dlopen.patch + + # fix pkg-config searching for ncurses + # yoinked from gentoo (https://gitweb.gentoo.org/repo/gentoo.git/tree/media-radio/unixcw/files/unixcw-3.6-tinfo.patch), with modifications + ./unixcw-3.6-tinfo.patch ]; + postPatch = '' + substituteInPlace src/cwcp/Makefile.am \ + --replace-fail '-lcurses' '-lncurses' + ''; + nativeBuildInputs = [ + autoreconfHook pkg-config qt5.wrapQtAppsHook ]; @@ -30,6 +42,7 @@ stdenv.mkDerivation rec { libpulseaudio alsa-lib qt5.qtbase + ncurses ]; CFLAGS = "-lasound -lpulse-simple"; diff --git a/pkgs/by-name/un/unixcw/unixcw-3.6-tinfo.patch b/pkgs/by-name/un/unixcw/unixcw-3.6-tinfo.patch new file mode 100644 index 000000000000..01038fa1fdd8 --- /dev/null +++ b/pkgs/by-name/un/unixcw/unixcw-3.6-tinfo.patch @@ -0,0 +1,20 @@ +--- a/configure.ac 2017-03-07 13:31:46.074580930 +0100 ++++ b/configure.ac 2017-03-07 13:33:25.640924331 +0100 +@@ -347,7 +347,7 @@ + AC_DEFINE([LIBCW_WITH_PULSEAUDIO], [1], [Define as 1 if your build machine can support PulseAudio.]) + fi + +- ++PKG_PROG_PKG_CONFIG + + if test "$enable_cwcp" = "no" ; then + WITH_CWCP='no' +@@ -355,6 +355,7 @@ + AC_CHECK_LIB(curses, initscr) +- if test $ac_cv_lib_curses_initscr = 'yes' ; then ++ if true ; then + WITH_CWCP='yes' ++ PKG_CHECK_MODULES(ncurses, ncurses, [NCURSES_LIB="$ncurses_LIBS"], ) + else + WITH_CWCP='no' + AC_MSG_WARN([Cannot find libcurses - unable to build cwcp]) From 4a43c439aed1b1dd75c5727865bbb38778924017 Mon Sep 17 00:00:00 2001 From: RoGreat Date: Fri, 14 Feb 2025 00:06:12 -0600 Subject: [PATCH 09/51] goverlay: move to `pkgs/by-name` --- .../goverlay/default.nix => by-name/go/goverlay/package.nix} | 0 pkgs/top-level/all-packages.nix | 4 ---- 2 files changed, 4 deletions(-) rename pkgs/{tools/graphics/goverlay/default.nix => by-name/go/goverlay/package.nix} (100%) diff --git a/pkgs/tools/graphics/goverlay/default.nix b/pkgs/by-name/go/goverlay/package.nix similarity index 100% rename from pkgs/tools/graphics/goverlay/default.nix rename to pkgs/by-name/go/goverlay/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a5745a474153..77a80db8782c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3487,10 +3487,6 @@ with pkgs; gdown = with python3Packages; toPythonApplication gdown; - goverlay = qt6Packages.callPackage ../tools/graphics/goverlay { - inherit (qt6Packages) libqtpas wrapQtAppsHook; - }; - gpt4all-cuda = gpt4all.override { cudaSupport = true; }; From dd8b25abd71a7d0813d8da446ca00fe3c0fd3480 Mon Sep 17 00:00:00 2001 From: RoGreat Date: Fri, 14 Feb 2025 00:06:33 -0600 Subject: [PATCH 10/51] maintainers: add RoGreat --- maintainers/maintainer-list.nix | 6 ++++++ pkgs/by-name/go/goverlay/package.nix | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 5570d588f74a..b8f67fd8ffd4 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -19948,6 +19948,12 @@ githubId = 69053978; name = "rogarb"; }; + RoGreat = { + email = "roguegreat@gmail.com"; + github = "RoGreat"; + githubId = 64620440; + name = "RoGreat"; + }; rohanssrao = { email = "rohanssrao@gmail.com"; github = "rohanssrao"; diff --git a/pkgs/by-name/go/goverlay/package.nix b/pkgs/by-name/go/goverlay/package.nix index b59d5de8ac3c..ad6550692c68 100644 --- a/pkgs/by-name/go/goverlay/package.nix +++ b/pkgs/by-name/go/goverlay/package.nix @@ -101,7 +101,7 @@ stdenv.mkDerivation rec { description = "Opensource project that aims to create a Graphical UI to help manage Linux overlays"; homepage = "https://github.com/benjamimgois/goverlay"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ RoGreat ]; platforms = platforms.linux; mainProgram = "goverlay"; }; From eb845bbbd29ff2f05f8a47f51304dfaa834f959e Mon Sep 17 00:00:00 2001 From: RoGreat Date: Fri, 14 Feb 2025 00:09:40 -0600 Subject: [PATCH 11/51] goverlay: qt6Packages --- pkgs/by-name/go/goverlay/package.nix | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/go/goverlay/package.nix b/pkgs/by-name/go/goverlay/package.nix index ad6550692c68..db9051fe10b4 100644 --- a/pkgs/by-name/go/goverlay/package.nix +++ b/pkgs/by-name/go/goverlay/package.nix @@ -12,17 +12,15 @@ libGL, libGLU, libnotify, - libqtpas, libX11, nix-update-script, polkit, procps, - qt6, + qt6Packages, systemd, util-linux, vulkan-tools, which, - wrapQtAppsHook, }: stdenv.mkDerivation rec { @@ -54,15 +52,15 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ fpc lazarus-qt6 - wrapQtAppsHook + qt6Packages.wrapQtAppsHook ]; buildInputs = [ libGL libGLU - libqtpas + qt6Packages.libqtpas libX11 - qt6.qtbase + qt6Packages.qtbase ]; NIX_LDFLAGS = "-lGLU -rpath ${lib.makeLibraryPath buildInputs}"; @@ -89,10 +87,6 @@ stdenv.mkDerivation rec { which ] }" - - # Force xcb since libqt5pas doesn't support Wayland - # See https://github.com/benjamimgois/goverlay/issues/107 - "--set QT_QPA_PLATFORM xcb" ]; passthru.updateScript = nix-update-script { }; From 8a5a751302ead877db4258fcbe4181f8bd4ff250 Mon Sep 17 00:00:00 2001 From: RoGreat Date: Fri, 14 Feb 2025 00:20:11 -0600 Subject: [PATCH 12/51] goverlay: link libGL --- pkgs/by-name/go/goverlay/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/go/goverlay/package.nix b/pkgs/by-name/go/goverlay/package.nix index db9051fe10b4..fe52673ef1ea 100644 --- a/pkgs/by-name/go/goverlay/package.nix +++ b/pkgs/by-name/go/goverlay/package.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { qt6Packages.qtbase ]; - NIX_LDFLAGS = "-lGLU -rpath ${lib.makeLibraryPath buildInputs}"; + NIX_LDFLAGS = "-lGLU -lGL -rpath ${lib.makeLibraryPath buildInputs}"; buildPhase = '' runHook preBuild From b6fe99db9f128e8f9a92da5d635b9280970549f9 Mon Sep 17 00:00:00 2001 From: RoGreat Date: Fri, 14 Feb 2025 00:55:34 -0600 Subject: [PATCH 13/51] goverlay: distro info --- pkgs/by-name/go/goverlay/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/go/goverlay/package.nix b/pkgs/by-name/go/goverlay/package.nix index fe52673ef1ea..4e4e6f90028c 100644 --- a/pkgs/by-name/go/goverlay/package.nix +++ b/pkgs/by-name/go/goverlay/package.nix @@ -13,6 +13,7 @@ libGLU, libnotify, libX11, + lsb-release, nix-update-script, polkit, procps, @@ -46,7 +47,9 @@ stdenv.mkDerivation rec { substituteInPlace overlayunit.pas \ --replace-fail '/usr/share/icons/hicolor/128x128/apps/goverlay.png' "$out/share/icons/hicolor/128x128/apps/goverlay.png" \ --replace-fail '/sbin/ip' "${lib.getExe' iproute2 "ip"}" \ - --replace-fail '/bin/bash' "${lib.getExe' bash "bash"}" + --replace-fail '/bin/bash' "${lib.getExe' bash "bash"}" \ + --replace-fail '/usr/lib/os-release' '/etc/os-release' \ + --replace-fail 'lsb_release' "${lib.getExe' lsb-release "lsb_release"} 2> /dev/null" ''; nativeBuildInputs = [ From c84ff169cceb1fdac7c6cff38f50b90f9eca787a Mon Sep 17 00:00:00 2001 From: Jonas Rembser Date: Mon, 23 Dec 2024 05:15:28 +0100 Subject: [PATCH 14/51] root: 6.34.02 -> 6.34.04 Also enables one more feature of ROOT (support of convolutions via fftw). Furthermore removes a patch related to building Clad from source that is not needed anymore thanks to https://github.com/root-project/root/pull/17308. --- pkgs/by-name/ro/root/package.nix | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/pkgs/by-name/ro/root/package.nix b/pkgs/by-name/ro/root/package.nix index a1948927f76a..a7804f7bf050 100644 --- a/pkgs/by-name/ro/root/package.nix +++ b/pkgs/by-name/ro/root/package.nix @@ -11,18 +11,14 @@ coreutils, git, davix, + fftw, ftgl, gl2ps, glew, gnugrep, gnused, gsl, - gtest, lapack, - libX11, - libXpm, - libXft, - libXext, libGLU, libGL, libxcrypt, @@ -30,6 +26,7 @@ llvm_18, lsof, lz4, + xorg, xz, man, openblas, @@ -56,7 +53,7 @@ stdenv.mkDerivation rec { pname = "root"; - version = "6.34.02"; + version = "6.34.04"; passthru = { tests = import ./tests { inherit callPackage; }; @@ -64,7 +61,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://root.cern.ch/download/root_v${version}.source.tar.gz"; - hash = "sha256-FmvsVi5CDhd6rzEz+j+wn4Ls3avoouGQY0W61EJRP5Q="; + hash = "sha256-4yDFNzqOh7sptygJVMqDVa2MQpXPSSNWBvDIsgCss3Q="; }; clad_src = fetchgit { @@ -87,12 +84,12 @@ stdenv.mkDerivation rec { buildInputs = [ davix + fftw ftgl giflib gl2ps glew gsl - gtest lapack libjpeg libpng @@ -117,12 +114,12 @@ stdenv.mkDerivation rec { ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk.privateFrameworksHook ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ - libX11 - libXpm - libXft - libXext libGLU libGL + xorg.libX11 + xorg.libXpm + xorg.libXft + xorg.libXext ]; preConfigure = @@ -135,9 +132,6 @@ stdenv.mkDerivation rec { substituteInPlace cmake/modules/SearchInstalledSoftware.cmake \ --replace-fail 'set(lcgpackages ' '#set(lcgpackages ' - # Make sure that clad is not downloaded when building - substituteInPlace interpreter/cling/tools/plugins/clad/CMakeLists.txt \ - --replace-fail 'UPDATE_COMMAND ""' 'DOWNLOAD_COMMAND "" UPDATE_COMMAND ""' # Make sure that clad is finding the right llvm version substituteInPlace interpreter/cling/tools/plugins/clad/CMakeLists.txt \ --replace-fail '-DLLVM_DIR=''${LLVM_BINARY_DIR}' '-DLLVM_DIR=''${LLVM_CMAKE_PATH}' @@ -151,6 +145,9 @@ stdenv.mkDerivation rec { # Eliminate impure reference to /System/Library/PrivateFrameworks substituteInPlace core/macosx/CMakeLists.txt \ --replace-fail "-F/System/Library/PrivateFrameworks " "" + # Just like in libpng/12.nix to build the builtin libpng on macOS + substituteInPlace graf2d/asimage/src/libAfterImage/libpng/pngpriv.h \ + --replace-fail '' '' '' + lib.optionalString @@ -167,6 +164,7 @@ stdenv.mkDerivation rec { "-DCMAKE_INSTALL_LIBDIR=lib" "-Dbuiltin_llvm=OFF" "-Dfail-on-missing=ON" + "-Dfftw3=ON" "-Dfitsio=OFF" "-Dgnuinstall=ON" "-Dmathmore=ON" From 2f5acdf8d6f3f9091b08a1c91a9d7e22c5a2d071 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 15 Feb 2025 00:35:37 +0000 Subject: [PATCH 15/51] clinfo: 3.0.23.01.25 -> 3.0.25.02.14 --- pkgs/tools/system/clinfo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/clinfo/default.nix b/pkgs/tools/system/clinfo/default.nix index 48b5d4672b8a..4db3a1d780ba 100644 --- a/pkgs/tools/system/clinfo/default.nix +++ b/pkgs/tools/system/clinfo/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "clinfo"; - version = "3.0.23.01.25"; + version = "3.0.25.02.14"; src = fetchFromGitHub { owner = "Oblomov"; repo = "clinfo"; rev = version; - sha256 = "sha256-1jZP4SnLIHh3vQJLBp+j/eQ1c8XBGFR2hjYxflhpWAU="; + sha256 = "sha256-UkkrRpmY5vZtTeEqPNYfxAGaJDoTSrNUG9N1Bknozow="; }; buildInputs = From 605d136cb9ec701e28906ae310d743528c72a4f1 Mon Sep 17 00:00:00 2001 From: Petr Zahradnik Date: Sat, 15 Feb 2025 18:55:07 +0100 Subject: [PATCH 16/51] root5: remove broken symlink --- pkgs/by-name/ro/root5/package.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/by-name/ro/root5/package.nix b/pkgs/by-name/ro/root5/package.nix index 375fff26a01c..760eda7bb7e8 100644 --- a/pkgs/by-name/ro/root5/package.nix +++ b/pkgs/by-name/ro/root5/package.nix @@ -115,7 +115,6 @@ stdenv.mkDerivation rec { done patchShebangs build/unix/ - ln -s ${lib.getDev stdenv.cc.libc}/include/AvailabilityMacros.h cint/cint/include/ # __malloc_hook is deprecated substituteInPlace misc/memstat/src/TMemStatHook.cxx \ From 8e4badef58a7636c8eb912feea04b4fedea101e7 Mon Sep 17 00:00:00 2001 From: nayeko <196556004+nayeko@users.noreply.github.com> Date: Sat, 15 Feb 2025 18:00:31 +0000 Subject: [PATCH 17/51] clapper: remove with lib --- pkgs/by-name/cl/clapper/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/cl/clapper/package.nix b/pkgs/by-name/cl/clapper/package.nix index 9d23eda1830c..17f6dc26406b 100644 --- a/pkgs/by-name/cl/clapper/package.nix +++ b/pkgs/by-name/cl/clapper/package.nix @@ -72,15 +72,15 @@ stdenv.mkDerivation (finalAttrs: { ) ''; - meta = with lib; { + meta = { description = "GNOME media player built using GTK4 toolkit and powered by GStreamer with OpenGL rendering"; longDescription = '' Clapper is a GNOME media player built using the GTK4 toolkit. The media player is using GStreamer as a media backend. ''; homepage = "https://github.com/Rafostar/clapper"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ aleksana ]; - platforms = platforms.linux; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ aleksana ]; + platforms = lib.platforms.linux; }; }) From 77136a98791cbe597512836d009d82de3a35b072 Mon Sep 17 00:00:00 2001 From: nayeko <196556004+nayeko@users.noreply.github.com> Date: Sat, 15 Feb 2025 18:00:59 +0000 Subject: [PATCH 18/51] clapper: 0.6.1 -> 0.8.0 --- pkgs/by-name/cl/clapper/package.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/cl/clapper/package.nix b/pkgs/by-name/cl/clapper/package.nix index 17f6dc26406b..b1219422261a 100644 --- a/pkgs/by-name/cl/clapper/package.nix +++ b/pkgs/by-name/cl/clapper/package.nix @@ -20,17 +20,18 @@ libmicrodns, gtuber, glib-networking, + libpeas2, }: stdenv.mkDerivation (finalAttrs: { pname = "clapper"; - version = "0.6.1"; + version = "0.8.0"; src = fetchFromGitHub { owner = "Rafostar"; repo = "clapper"; - rev = finalAttrs.version; - hash = "sha256-IQJTnLB6FzYYPONOqBkvi89iF0U6fx/aWYvNOOJpBvc="; + tag = finalAttrs.version; + hash = "sha256-Yb2fWsdd8jhxkGWKanLn7CAuF4MjyQ27XTrO8ja3hfs="; }; nativeBuildInputs = [ @@ -59,6 +60,7 @@ stdenv.mkDerivation (finalAttrs: { libadwaita libsoup_3 libmicrodns + libpeas2 ]; postPatch = '' From 28bb35e52c6522d67f9dc3833b9ac0f06bc556bb Mon Sep 17 00:00:00 2001 From: Olli Helenius Date: Sun, 16 Feb 2025 10:50:18 +0200 Subject: [PATCH 19/51] gradle: use pname and version in symlinkJoin An actual `version` attribute is needed for the automatic updates to work. --- pkgs/development/tools/build-managers/gradle/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index 1db388194007..3b22a9c2fedb 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -259,7 +259,8 @@ rec { gradle = gradle-unwrapped.override args; in symlinkJoin { - name = "gradle-${gradle.version}"; + pname = "gradle"; + inherit (gradle) version; paths = [ (makeSetupHook { name = "gradle-setup-hook"; } (concatTextFile { From 7fb913f890b46456ef5d403ff40202914c57f021 Mon Sep 17 00:00:00 2001 From: Olli Helenius Date: Sun, 16 Feb 2025 10:50:36 +0200 Subject: [PATCH 20/51] gradle: 8.12 -> 8.12.1 --- pkgs/development/tools/build-managers/gradle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index 3b22a9c2fedb..ff23eda5f569 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -230,8 +230,8 @@ rec { # https://docs.gradle.org/current/userguide/compatibility.html gradle_8 = gen { - version = "8.12"; - hash = "sha256-egDVH7kxR4Gaq3YCT+7OILa4TkIGlBAfJ2vpUuCL7wM="; + version = "8.12.1"; + hash = "sha256-jZepeYT2y9K4X+TGCnQ0QKNHVEvxiBgEjmEfUojUbJQ="; defaultJava = jdk21; }; From 2776956ea567b701d37c244f8de951024952ab82 Mon Sep 17 00:00:00 2001 From: Nikolaos Karaolidis Date: Fri, 10 Jan 2025 10:18:51 +0000 Subject: [PATCH 21/51] telepresence: fix compilation error Signed-off-by: Nikolaos Karaolidis --- pkgs/tools/networking/telepresence/default.nix | 4 ++++ .../networking/telepresence/fix-versioneer.patch | 16 ++++++++++++++++ 2 files changed, 20 insertions(+) create mode 100644 pkgs/tools/networking/telepresence/fix-versioneer.patch diff --git a/pkgs/tools/networking/telepresence/default.nix b/pkgs/tools/networking/telepresence/default.nix index 244b190fe60b..a02f6e5c9936 100644 --- a/pkgs/tools/networking/telepresence/default.nix +++ b/pkgs/tools/networking/telepresence/default.nix @@ -29,6 +29,10 @@ pythonPackages.buildPythonPackage rec { sha256 = "1ccc8bzcdxp6rh6llk7grcnmyc05fq7dz5w0mifdzjv3a473hsky"; }; + patches = [ + ./fix-versioneer.patch + ]; + nativeBuildInputs = [ makeWrapper ]; postInstall = '' diff --git a/pkgs/tools/networking/telepresence/fix-versioneer.patch b/pkgs/tools/networking/telepresence/fix-versioneer.patch new file mode 100644 index 000000000000..5d3e521f068f --- /dev/null +++ b/pkgs/tools/networking/telepresence/fix-versioneer.patch @@ -0,0 +1,16 @@ +diff --git a/versioneer.py b/versioneer.py +index 7e5bb402e..60d65ef76 100644 +--- a/versioneer.py ++++ b/versioneer.py +@@ -339,9 +339,9 @@ def get_config_from_root(root): + # configparser.NoOptionError (if it lacks "VCS="). See the docstring at + # the top of versioneer.py for instructions on writing your setup.cfg . + setup_cfg = os.path.join(root, "setup.cfg") +- parser = configparser.SafeConfigParser() ++ parser = configparser.ConfigParser() + with open(setup_cfg, "r") as f: +- parser.readfp(f) ++ parser.read_file(f) + VCS = parser.get("versioneer", "VCS") # mandatory + + def get(parser, name): From 3153339a75d34653c550bbcb095c0c01bb62768b Mon Sep 17 00:00:00 2001 From: nayeko Date: Sun, 16 Feb 2025 08:05:30 +0800 Subject: [PATCH 22/51] clashtui: init at 0.2.3 --- pkgs/by-name/cl/clashtui/package.nix | 52 ++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 pkgs/by-name/cl/clashtui/package.nix diff --git a/pkgs/by-name/cl/clashtui/package.nix b/pkgs/by-name/cl/clashtui/package.nix new file mode 100644 index 000000000000..d97f89a9c687 --- /dev/null +++ b/pkgs/by-name/cl/clashtui/package.nix @@ -0,0 +1,52 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, + versionCheckHook, + nix-update-script, +}: + +rustPlatform.buildRustPackage rec { + pname = "clashtui"; + version = "0.2.3"; + + src = fetchFromGitHub { + owner = "JohanChane"; + repo = "clashtui"; + tag = "v${version}"; + hash = "sha256-2iQVYZrqo55EO0ZGn6ktP/3Py5v+LiVgrSYTtaxYXyQ="; + }; + + sourceRoot = "${src.name}/clashtui"; + + useFetchCargoVendor = true; + + cargoHash = "sha256-8oDnumyn0Ry1AIWNLO2+1HSPsxkVLRLItgEVEXqSRFI="; + + cargoBuildFlags = [ "--all-features" ]; + + checkFlags = [ + # need fhs + "--skip=utils::config::test::test_save_and_load" + ]; + + doInstallCheck = true; + + versionCheckProgramArg = "--version"; + + nativeInstallCheckInputs = [ + versionCheckHook + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Mihomo (Clash.Meta) TUI Client"; + homepage = "https://github.com/JohanChane/clashtui"; + changelog = "https://github.com/JohanChane/clashtui/releases/tag/v${version}"; + mainProgram = "clashtui"; + license = lib.licenses.mit; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ nayeko ]; + }; +} From bf86849152860c2fb7e64ff64b21e128b92b3091 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 16 Feb 2025 20:24:43 +0000 Subject: [PATCH 23/51] mitra: 3.14.0 -> 3.16.0 --- pkgs/by-name/mi/mitra/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/mi/mitra/package.nix b/pkgs/by-name/mi/mitra/package.nix index 9168ed8b5596..e5db5f942940 100644 --- a/pkgs/by-name/mi/mitra/package.nix +++ b/pkgs/by-name/mi/mitra/package.nix @@ -6,18 +6,18 @@ rustPlatform.buildRustPackage rec { pname = "mitra"; - version = "3.14.0"; + version = "3.16.0"; src = fetchFromGitea { domain = "codeberg.org"; owner = "silverpill"; repo = "mitra"; rev = "v${version}"; - hash = "sha256-4f0zh7rdS0lTnN4OzUEL8tn6S18cYTj92vA8akyt4K4="; + hash = "sha256-jVm1ftFSOxEseNgze6xsF9k8G02UJc3f/CGxzdNzfhw="; }; useFetchCargoVendor = true; - cargoHash = "sha256-MA/C/8x7Bmh6ekd4iHvjX9Lf/hG43Qb5nhEHINpeBHA="; + cargoHash = "sha256-QQRl9/Rc0cVs1ug5LXN9OFZI4uTO7Jgu1vQQM/RQsLo="; # require running database doCheck = false; From 1a379815bb9a330585abba05df47468527c1bb4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 16 Feb 2025 15:43:27 -0800 Subject: [PATCH 24/51] python313Packages.explorerscript: 0.2.1.post2 -> 0.2.3 Diff: https://github.com/SkyTemple/explorerscript/compare/refs/tags/0.2.1.post2...0.2.3 --- .../python-modules/explorerscript/default.nix | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/explorerscript/default.nix b/pkgs/development/python-modules/explorerscript/default.nix index 76d92bb173c2..329e6baf2149 100644 --- a/pkgs/development/python-modules/explorerscript/default.nix +++ b/pkgs/development/python-modules/explorerscript/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "explorerscript"; - version = "0.2.1.post2"; + version = "0.2.3"; pyproject = true; src = fetchFromGitHub { owner = "SkyTemple"; repo = "explorerscript"; tag = version; - hash = "sha256-cKEceWr7XmZbuomPOmjQ32ptAjz3LZDQBWAgZEFadDY="; + hash = "sha256-fh40HCU12AVA3cZ5xvRott+93qo8VzHFsbPzTkoV3x4="; # Include a pinned antlr4 fork used as a C++ library fetchSubmodules = true; }; @@ -29,19 +29,17 @@ buildPythonPackage rec { build-system = [ setuptools scikit-build-core - ninja - cmake pybind11 ]; + nativeBuildInputs = [ + cmake + ninja + ]; + # The source include some auto-generated ANTLR code that could be recompiled, but trying that resulted in a crash while decompiling unionall.ssb. # We thus do not rebuild them. - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail "scikit-build-core<=0.9.8" scikit-build-core - ''; - dontUseCmakeConfigure = true; pythonRelaxDeps = [ From 3b9f1f11a55abf6135b407687052ed900590213d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 17 Feb 2025 13:35:48 +0000 Subject: [PATCH 25/51] prometheus-node-exporter: 1.8.2 -> 1.9.0 --- pkgs/by-name/pr/prometheus-node-exporter/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pr/prometheus-node-exporter/package.nix b/pkgs/by-name/pr/prometheus-node-exporter/package.nix index b3be17cd9998..e847682b2821 100644 --- a/pkgs/by-name/pr/prometheus-node-exporter/package.nix +++ b/pkgs/by-name/pr/prometheus-node-exporter/package.nix @@ -9,17 +9,17 @@ buildGoModule rec { pname = "node_exporter"; - version = "1.8.2"; + version = "1.9.0"; rev = "v${version}"; src = fetchFromGitHub { inherit rev; owner = "prometheus"; repo = "node_exporter"; - hash = "sha256-b2uior67RcCCpUE+qx55G1eWiT2wWDVsnosSH9fd3/I="; + hash = "sha256-mm4ZQjpIxaCbKIhZak0ZD4HVx3t+0m6YwjtIWak8RXc="; }; - vendorHash = "sha256-sly8AJk+jNZG8ijTBF1Pd5AOOUJJxIG8jHwBUdlt8fM="; + vendorHash = "sha256-rItbct0UIWs9zulyoQF647RwLJkTsBTDJHLORCgVDo8="; # FIXME: tests fail due to read-only nix store doCheck = false; From 69dd0734e0b2e699d6c1a24de9aeeae350c42a99 Mon Sep 17 00:00:00 2001 From: Javi Merino Date: Mon, 10 Feb 2025 14:00:21 +0000 Subject: [PATCH 26/51] python3Packages.jira: fix build 7e7963d8736b (python3Packages.jira: 3.8.0 -> 3.9.4, 2025-01-19) update python3Packages.jira to 3.9.4. After that commit, python-jira fails to build: $ nix build -L --impure --expr '(import ./. {}).python3.withPackages(ps: [ ps.jira ])' [...] error: builder for '/nix/store/bfr24lmgw4izl9ixh2sdm794a9kky7w6-python3.12-jira-3.9.4.drv' failed with exit code 1; last 19 log lines: > Sourcing python-remove-tests-dir-hook > Sourcing python-catch-conflicts-hook.sh > Sourcing python-remove-bin-bytecode-hook.sh > Sourcing pypa-build-hook > Using pypaBuildPhase > Sourcing python-runtime-deps-check-hook > Using pythonRuntimeDepsCheckHook > Sourcing pypa-install-hook > Using pypaInstallPhase > Sourcing python-imports-check-hook.sh > Using pythonImportsCheckPhase > Sourcing python-namespaces-hook > Sourcing python-catch-conflicts-hook.sh > Running phase: unpackPhase > unpacking source archive /nix/store/ck51dycsghmkf7449p615crsqdn2xsni-source > source root is source > setting SOURCE_DATE_EPOCH to timestamp 315619200 of file "source/tox.ini" > Running phase: patchPhase > substitute(): ERROR: file 'setup.cfg' does not exist For full logs, run 'nix log /nix/store/bfr24lmgw4izl9ixh2sdm794a9kky7w6-python3.12-jira-3.9.4.drv'. error: 1 dependencies of derivation '/nix/store/i5xib9msa42grs3cwa1ibw0cfdi799f9-python3-3.12.8-env.drv' failed to build The functionality in setup.cfg was moved to pyproject.toml in pycontribs/jira@668562a3f8c7 (migrate `setup.cfg` to `pyproject.toml` (pycontribs/jira#1776), 2024-03-25). Use pytest-cov-stub instead of the `postPatch` hack. --- pkgs/development/python-modules/jira/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/jira/default.nix b/pkgs/development/python-modules/jira/default.nix index 370b70457660..27c7de4f7b47 100644 --- a/pkgs/development/python-modules/jira/default.nix +++ b/pkgs/development/python-modules/jira/default.nix @@ -10,6 +10,7 @@ pillow, pyjwt, pytestCheckHook, + pytest-cov-stub, pythonOlder, requests, requests-futures, @@ -67,14 +68,10 @@ buildPythonPackage rec { nativeCheckInputs = [ flaky pytestCheckHook + pytest-cov-stub requests-mock ]; - postPatch = '' - substituteInPlace setup.cfg \ - --replace "--cov-report=xml --cov jira" "" - ''; - pythonImportsCheck = [ "jira" ]; # impure tests because of connectivity attempts to jira servers From 50eeaac136f85c9a60d40623991f0c26542a880b Mon Sep 17 00:00:00 2001 From: Javi Merino Date: Mon, 17 Feb 2025 14:45:24 +0000 Subject: [PATCH 27/51] python3Packages.jira: don't use repo = pname In issue #277994 it was discussed that it's better to hardcode the package name. --- pkgs/development/python-modules/jira/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/jira/default.nix b/pkgs/development/python-modules/jira/default.nix index 27c7de4f7b47..950c08989aac 100644 --- a/pkgs/development/python-modules/jira/default.nix +++ b/pkgs/development/python-modules/jira/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pycontribs"; - repo = pname; + repo = "jira"; tag = version; hash = "sha256-P3dbrBKpHvLNIA+JBeSXEQl4QVZ0FdKkNIU8oPHWw6k="; }; From 8b4b5dbefc546e6bab9fe64728b8ce2af33473d5 Mon Sep 17 00:00:00 2001 From: Javi Merino Date: Mon, 17 Feb 2025 14:50:58 +0000 Subject: [PATCH 28/51] python3Packages.jira: use build-system and dependencies --- pkgs/development/python-modules/jira/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jira/default.nix b/pkgs/development/python-modules/jira/default.nix index 950c08989aac..d7c1d60f66c1 100644 --- a/pkgs/development/python-modules/jira/default.nix +++ b/pkgs/development/python-modules/jira/default.nix @@ -36,12 +36,12 @@ buildPythonPackage rec { hash = "sha256-P3dbrBKpHvLNIA+JBeSXEQl4QVZ0FdKkNIU8oPHWw6k="; }; - nativeBuildInputs = [ + build-system = [ setuptools setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ defusedxml packaging requests From 23e2902b9d00a4a5ba5575690e8178363a6faaee Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 17 Feb 2025 16:40:32 +0100 Subject: [PATCH 29/51] python312Packages.transformers: 4.48.3 -> 4.49.0 Diff: https://github.com/huggingface/transformers/compare/refs/tags/v4.48.3...v4.49.0 Changelog: https://github.com/huggingface/transformers/releases/tag/v4.49.0 --- .../python-modules/transformers/default.nix | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/transformers/default.nix b/pkgs/development/python-modules/transformers/default.nix index 92027cd34943..3fcb2b6a4923 100644 --- a/pkgs/development/python-modules/transformers/default.nix +++ b/pkgs/development/python-modules/transformers/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - fetchpatch, # build-system setuptools, @@ -59,25 +58,16 @@ buildPythonPackage rec { pname = "transformers"; - version = "4.48.3"; + version = "4.49.0"; pyproject = true; src = fetchFromGitHub { owner = "huggingface"; repo = "transformers"; tag = "v${version}"; - hash = "sha256-gDPJx/kgFa8KCoX8XCMtFrSY/z2as22yDSNEW3UDm/0="; + hash = "sha256-drq7RWoRaRejiQjCUHIYuzaKa9rA4eQZI2do74scp1c="; }; - patches = [ - # Remove on the next major version bump - (fetchpatch { - url = "https://github.com/huggingface/transformers/commit/db864b5526d56fd99143619abff969bfcb5596d5.patch?full_index=1"; - name = "dont-import-torch-distributed-if-not-available.patch"; - hash = "sha256-XOraJmSt9Rp/oNiil6vDUBqZhd8MDbA0nz1Tx16Mk14="; - }) - ]; - build-system = [ setuptools ]; dependencies = [ @@ -200,7 +190,7 @@ buildPythonPackage rec { homepage = "https://github.com/huggingface/transformers"; description = "Natural Language Processing for TensorFlow 2.0 and PyTorch"; mainProgram = "transformers-cli"; - changelog = "https://github.com/huggingface/transformers/releases/tag/${src.tag}"; + changelog = "https://github.com/huggingface/transformers/releases/tag/v${version}"; license = lib.licenses.asl20; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ From d59886879681c44a52836dacbb714bc95fc61c1d Mon Sep 17 00:00:00 2001 From: Quentin Frey <51170829+Limosine@users.noreply.github.com> Date: Mon, 17 Feb 2025 18:31:57 +0100 Subject: [PATCH 30/51] ncmpc: 0.51 -> 0.52 --- pkgs/by-name/nc/ncmpc/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/nc/ncmpc/package.nix b/pkgs/by-name/nc/ncmpc/package.nix index caddc5019736..ea251ac8cd1b 100644 --- a/pkgs/by-name/nc/ncmpc/package.nix +++ b/pkgs/by-name/nc/ncmpc/package.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "ncmpc"; - version = "0.51"; + version = "0.52"; src = fetchFromGitHub { owner = "MusicPlayerDaemon"; repo = "ncmpc"; - rev = "v${version}"; - sha256 = "sha256-mFZ8szJT7eTPHQHxjpP5pThCcY0YERGkGR8528Xu9MA="; + tag = "v${version}"; + sha256 = "sha256-j/hZdKl1LQ/yEGDUv9k5PQJ6pngAl52mVCpfacWrRw0="; }; buildInputs = [ From a5b2caac92f37f372585738634bb5e10c72107a3 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Sun, 16 Feb 2025 20:50:08 +0100 Subject: [PATCH 31/51] humblebundle-downloader: init at 0.4.3 --- .../hu/humblebundle-downloader/package.nix | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 pkgs/by-name/hu/humblebundle-downloader/package.nix diff --git a/pkgs/by-name/hu/humblebundle-downloader/package.nix b/pkgs/by-name/hu/humblebundle-downloader/package.nix new file mode 100644 index 000000000000..3d5e4c15861d --- /dev/null +++ b/pkgs/by-name/hu/humblebundle-downloader/package.nix @@ -0,0 +1,36 @@ +{ + fetchFromGitHub, + lib, + python3Packages, +}: + +python3Packages.buildPythonApplication rec { + pname = "humblebundle-downloader"; + version = "0.4.3"; + pyproject = true; + + src = fetchFromGitHub { + owner = "xtream1101"; + repo = "humblebundle-downloader"; + tag = version; + hash = "sha256-fLfAGDKn6AWHJKsgQ0fBYdN6mGfZNrVs9n6Zo9VRgIY="; + }; + + build-system = with python3Packages; [ + poetry-core + ]; + + dependencies = with python3Packages; [ + parsel + requests + ]; + + meta = { + description = "Download your Humble Bundle Library"; + mainProgram = "hbd"; + homepage = "https://github.com/xtream1101/humblebundle-downloader"; + changelog = "https://github.com/xtream1101/humblebundle-downloader/blob/${src.tag}/CHANGELOG.md"; + license = with lib.licenses; [ mit ]; + maintainers = with lib.maintainers; [ jopejoe1 ]; + }; +} From eb4009247f671b346012a87302b8e3c29f496f41 Mon Sep 17 00:00:00 2001 From: Mitchell Pleune Date: Mon, 17 Feb 2025 19:17:52 +0000 Subject: [PATCH 32/51] python3Packages.onnxruntime: buildInputs dep on onnxruntime The onnxruntime libs are patched to look for additional runtime libraries in `${onnxruntime}/lib`, so we must depend on it. Alternatively, onnxruntime could be built twice, once for each lib path patch, but onnxruntime takes a vert long time to build with cuda support. --- pkgs/development/python-modules/onnxruntime/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/python-modules/onnxruntime/default.nix b/pkgs/development/python-modules/onnxruntime/default.nix index 48c342c1626f..90df4cb2aff0 100644 --- a/pkgs/development/python-modules/onnxruntime/default.nix +++ b/pkgs/development/python-modules/onnxruntime/default.nix @@ -50,6 +50,13 @@ buildPythonPackage { oneDNN re2 onnxruntime.protobuf + + # https://github.com/NixOS/nixpkgs/pull/357656 patches the onnx lib to ${pkgs.onnxruntime}/lib + # but these files are copied into this package too. If the origional non-python onnxruntime + # package is GC-ed, cuda support in this python package will break. + # Two options, rebuild onnxruntime twice with the different paths hard-coded, or just hold a runtime + # dependency between the two. Option 2, because onnxruntime takes forever to build with cuda support. + onnxruntime ] ++ lib.optionals onnxruntime.passthru.cudaSupport ( with onnxruntime.passthru.cudaPackages; From 7bb85613ab4006bb95465a939780dfa42c9cff59 Mon Sep 17 00:00:00 2001 From: Patrick Date: Mon, 17 Feb 2025 21:55:07 +0100 Subject: [PATCH 33/51] rimgo: pin tailwindcss --- pkgs/by-name/ri/rimgo/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ri/rimgo/package.nix b/pkgs/by-name/ri/rimgo/package.nix index 9a97990bee56..f28667bbe7db 100644 --- a/pkgs/by-name/ri/rimgo/package.nix +++ b/pkgs/by-name/ri/rimgo/package.nix @@ -2,7 +2,7 @@ lib, fetchFromGitea, buildGoModule, - tailwindcss, + tailwindcss_3, }: buildGoModule rec { pname = "rimgo"; @@ -18,7 +18,7 @@ buildGoModule rec { vendorHash = "sha256-nk1Pl9K62RjmBUgTlbp3u6cCoiEwpUHavfT3Oy0iyGU="; - nativeBuildInputs = [ tailwindcss ]; + nativeBuildInputs = [ tailwindcss_3 ]; preBuild = '' tailwindcss -i static/tailwind.css -o static/app.css -m From 34a56602304b90ec7f242ebec133f5fb6051fd55 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Mon, 17 Feb 2025 22:09:45 +0100 Subject: [PATCH 34/51] php83: 8.3.16 -> 8.3.17 diff: https://github.com/php/php-src/compare/php-8.3.16..php-8.3.17 changelog: https://www.php.net/ChangeLog-8.php#8.3.17 --- pkgs/development/interpreters/php/8.3.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/php/8.3.nix b/pkgs/development/interpreters/php/8.3.nix index 7b4b5c6d438b..4475da8d8940 100644 --- a/pkgs/development/interpreters/php/8.3.nix +++ b/pkgs/development/interpreters/php/8.3.nix @@ -4,8 +4,8 @@ let base = callPackage ./generic.nix ( _args // { - version = "8.3.16"; - hash = "sha256-6SCCGMvcuBaDS2xe2N3FdI+xL/d3z54OA7tIlidmCLY="; + version = "8.3.17"; + hash = "sha256-TgNNynqxb8YGLIxTBnUo9OyqJGvyIxDmhB9wCAlCZKw="; } ); in From e22c687f399091727b8f70341a76e593b4a8b39a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 17 Feb 2025 12:51:10 -0800 Subject: [PATCH 35/51] deltachat-desktop: 1.52.1 -> 1.54.1 Diff: https://github.com/deltachat/deltachat-desktop/compare/refs/tags/v1.52.1...v1.54.1 Changelog: https://github.com/deltachat/deltachat-desktop/blob/v1.54.1/CHANGELOG.md --- pkgs/by-name/de/deltachat-desktop/package.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/de/deltachat-desktop/package.nix b/pkgs/by-name/de/deltachat-desktop/package.nix index 3cdbafdc33f0..966aaba0c1a3 100644 --- a/pkgs/by-name/de/deltachat-desktop/package.nix +++ b/pkgs/by-name/de/deltachat-desktop/package.nix @@ -1,6 +1,6 @@ { lib , copyDesktopItems -, electron_32 +, electron_34 , fetchFromGitHub , deltachat-rpc-server , makeDesktopItem @@ -19,36 +19,36 @@ let deltachat-rpc-server' = deltachat-rpc-server.overrideAttrs rec { - version = "1.155.1"; + version = "1.155.5"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-core-rust"; tag = "v${version}"; - hash = "sha256-XZLKvOvdyvR5poRY/oo9MHi1f2XzBmSDR8VqjW3wq74="; + hash = "sha256-U0phIPkR4lt/WsCDt2TQv8NfjG04JdmCVDbMA1/ySdo="; }; cargoDeps = rustPlatform.fetchCargoVendor { pname = "deltachat-core-rust"; inherit version src; - hash = "sha256-ZxKR1M9wqmzKVbSdBKzTsKF9tDVRGHnd+Ra9Jy5CQQY="; + hash = "sha256-lkqBC/b128GSMpvAWpWmkrrf/E0twCDtDM1EBPOnp7Y="; }; }; - electron = electron_32; + electron = electron_34; pnpm = pnpm_9; in stdenv.mkDerivation (finalAttrs: { pname = "deltachat-desktop"; - version = "1.52.1"; + version = "1.54.1"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-desktop"; tag = "v${finalAttrs.version}"; - hash = "sha256-L/dgdg7Yrosy054Jdo2ST3x37kQ+CHOEN92/YNjnTYc="; + hash = "sha256-mt0y7W16ThRYQNALFPBNcnR34MDqs6m3Vt+mYALqGs8="; }; pnpmDeps = pnpm.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-ovwdFpVFqXaGqsYc1ldhimqgdi0CXjQYMMMcmUXtMFc="; + hash = "sha256-/1utoiKw/BycWPuwWykcJniUw9kUGk/WtPCqqZu8E+U="; }; nativeBuildInputs = [ From 43bb03239a2a277c28b9246ad6a04d13a5f690b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 17 Feb 2025 13:20:39 -0800 Subject: [PATCH 36/51] libdeltachat: 1.155.4 -> 1.155.6 Diff: https://github.com/deltachat/deltachat-core-rust/compare/refs/tags/v1.155.4...v1.155.6 Changelog: https://github.com/deltachat/deltachat-core-rust/blob/v1.155.6/CHANGELOG.md --- pkgs/by-name/li/libdeltachat/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/li/libdeltachat/package.nix b/pkgs/by-name/li/libdeltachat/package.nix index ba90468edaf9..cdf2886963fd 100644 --- a/pkgs/by-name/li/libdeltachat/package.nix +++ b/pkgs/by-name/li/libdeltachat/package.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "libdeltachat"; - version = "1.155.4"; + version = "1.155.6"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-core-rust"; tag = "v${version}"; - hash = "sha256-cSk3GK6jlFkZ7XckB9PKIYHyK1Yj1qoJvWDrlbRmrhw="; + hash = "sha256-d7EmmyLSJjFIZM1j6LP8f4WnXiptNTAqOdJD/oPL02Y="; }; patches = [ @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { cargoDeps = rustPlatform.fetchCargoVendor { pname = "deltachat-core-rust"; inherit version src; - hash = "sha256-+j6ENk6wvA3t2I2C8J2tOYJUVSS6s1Wa/8sDwGqF9Ho="; + hash = "sha256-E01aEzNi06LQntrlA+342a8Nl5API6v7HbdmuKpfajs="; }; nativeBuildInputs = [ From b8de31feded8d1c5dca4f2648c20fe0975961ba9 Mon Sep 17 00:00:00 2001 From: Patrick Date: Mon, 17 Feb 2025 22:22:09 +0100 Subject: [PATCH 37/51] plausible: pin tailwindcss --- pkgs/servers/web-apps/plausible/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/web-apps/plausible/default.nix b/pkgs/servers/web-apps/plausible/default.nix index bdf9b93b9a61..5ccaa0fa9566 100644 --- a/pkgs/servers/web-apps/plausible/default.nix +++ b/pkgs/servers/web-apps/plausible/default.nix @@ -9,7 +9,7 @@ nixosTests, npm-lockfile-fix, brotli, - tailwindcss, + tailwindcss_3, esbuild, ... }: @@ -141,7 +141,7 @@ beamPackages.mixRelease rec { cp -r ${tracker} tracker cat >> config/config.exs < Date: Mon, 17 Feb 2025 22:38:30 +0100 Subject: [PATCH 38/51] stalwart: pin tailwindcss --- pkgs/by-name/st/stalwart-mail/webadmin.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/st/stalwart-mail/webadmin.nix b/pkgs/by-name/st/stalwart-mail/webadmin.nix index cf7c06a17ead..53c44fa5d017 100644 --- a/pkgs/by-name/st/stalwart-mail/webadmin.nix +++ b/pkgs/by-name/st/stalwart-mail/webadmin.nix @@ -3,7 +3,7 @@ rustPlatform, fetchFromGitHub, trunk, - tailwindcss, + tailwindcss_3, fetchNpmDeps, nix-update-script, nodejs, @@ -44,7 +44,7 @@ rustPlatform.buildRustPackage rec { llvmPackages.bintools-unwrapped nodejs npmHooks.npmConfigHook - tailwindcss + tailwindcss_3 trunk # needs to match with wasm-bindgen version in upstreams Cargo.lock wasm-bindgen-cli_0_2_93 From 48afbbe751cadc291f9c3f17a57488e63b2cb203 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 17 Feb 2025 21:39:55 +0000 Subject: [PATCH 39/51] python312Packages.docling-ibm-models: 3.3.0 -> 3.3.2 --- .../development/python-modules/docling-ibm-models/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/docling-ibm-models/default.nix b/pkgs/development/python-modules/docling-ibm-models/default.nix index 660f009e55ec..86c1c595d7b1 100644 --- a/pkgs/development/python-modules/docling-ibm-models/default.nix +++ b/pkgs/development/python-modules/docling-ibm-models/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "docling-ibm-models"; - version = "3.3.0"; + version = "3.3.2"; pyproject = true; src = fetchFromGitHub { owner = "DS4SD"; repo = "docling-ibm-models"; tag = "v${version}"; - hash = "sha256-wxkHd+TCBibOTWO09JOsjX6oBtUxZ/9IOmyLdeptzeQ="; + hash = "sha256-8mqDgbTj5g6jXEumj16Me9NjHLCOdR+pXmAwn2dghfg="; }; build-system = [ From f71056ce9a6faafa733335526bf31679d8c8e7e4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 17 Feb 2025 22:54:31 +0000 Subject: [PATCH 40/51] vscode-extensions.ms-dotnettools.csharp: 2.61.28 -> 2.63.32 --- .../extensions/ms-dotnettools.csharp/lockfile.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csharp/lockfile.json b/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csharp/lockfile.json index 0807d5d30d5d..70521c0013e6 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csharp/lockfile.json +++ b/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csharp/lockfile.json @@ -1,7 +1,7 @@ { - "version": "2.61.28", + "version": "2.63.32", "linux-x64": { - "hash": "sha256-lyP/NCvpaVW8dbZp/8OS9qrBa7yuO4rTo8Wwo/7wD7g=", + "hash": "sha256-laI6zoydOKAkRHZvHXQ6eFEJoFrb2I2Fe6gvti3eoJg=", "binaries": [ ".debugger/createdump", ".debugger/vsdbg", @@ -11,7 +11,7 @@ ] }, "linux-arm64": { - "hash": "sha256-bZ5ABDh3MnO33MQEXhLlF4UVGTCrcj5pCYgQDS6AP58=", + "hash": "sha256-3XWSzNhPSoAUlVVe3RNQ/Ttxm4WIuWahH0hGd4FXFhw=", "binaries": [ ".debugger/createdump", ".debugger/vsdbg", @@ -21,7 +21,7 @@ ] }, "darwin-x64": { - "hash": "sha256-5yDTJp3GDb7HYAG9q8wvr4QKwjGJ214ifUjwxZMwIts=", + "hash": "sha256-TfI6XR2jCxKCNt3mNu+ndH3KqHctWK+JF52eNd+QaLQ=", "binaries": [ ".debugger/x86_64/createdump", ".debugger/x86_64/vsdbg", @@ -31,7 +31,7 @@ ] }, "darwin-arm64": { - "hash": "sha256-58fz7IFzYgvC9Eruz1JgF4/ftHQV4FGdcfOODlCmGBA=", + "hash": "sha256-SoTaPgFYuxilmXZ/QXrc8xrMa58u6HnmuhiNK9knfME=", "binaries": [ ".debugger/arm64/createdump", ".debugger/arm64/vsdbg", From db8416a302be009f88602c1223bcc581367b2ca8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 19 Oct 2024 16:30:26 +0200 Subject: [PATCH 41/51] Revert "python312Packages.tempest: add missing pynacl checkInput to fix build" This reverts commit 284e618ce5b9f917ed435daa9bbc4e9407870484. --- pkgs/development/python-modules/tempest/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/python-modules/tempest/default.nix b/pkgs/development/python-modules/tempest/default.nix index 1e9762bbaf0c..980165a6c29f 100644 --- a/pkgs/development/python-modules/tempest/default.nix +++ b/pkgs/development/python-modules/tempest/default.nix @@ -19,7 +19,6 @@ paramiko, pbr, prettytable, - pynacl, python, pythonOlder, pyyaml, @@ -75,7 +74,6 @@ buildPythonPackage rec { nativeCheckInputs = [ hacking oslotest - pynacl stestr ]; From 8a254de229d2d1ecfed4c36d33788774a820d4bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 19 Oct 2024 16:31:14 +0200 Subject: [PATCH 42/51] Revert "python312Packages.smart-open: add pynacl to checkInputs" This reverts commit a26a95a9a75c630a77796d4178c960ab8bd90dd8. --- pkgs/development/python-modules/smart-open/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/python-modules/smart-open/default.nix b/pkgs/development/python-modules/smart-open/default.nix index 5bce34054cc9..14ab3f7d467b 100644 --- a/pkgs/development/python-modules/smart-open/default.nix +++ b/pkgs/development/python-modules/smart-open/default.nix @@ -11,7 +11,6 @@ requests, moto, paramiko, - pynacl, pytestCheckHook, responses, setuptools, @@ -57,7 +56,6 @@ buildPythonPackage rec { moto pytestCheckHook responses - pynacl ] ++ lib.flatten (lib.attrValues optional-dependencies); pytestFlagsArray = [ "smart_open" ]; From be2336e18b42773635e8cf556e0143a13dedf165 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 19 Oct 2024 16:33:46 +0200 Subject: [PATCH 43/51] treewide: cleanup paramiko.optional-dependency.ed25519 --- pkgs/development/python-modules/docker/default.nix | 2 +- pkgs/development/python-modules/ncclient/default.nix | 2 +- pkgs/development/python-modules/sshtunnel/default.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/docker/default.nix b/pkgs/development/python-modules/docker/default.nix index 64b6c50be537..4698aa19f811 100644 --- a/pkgs/development/python-modules/docker/default.nix +++ b/pkgs/development/python-modules/docker/default.nix @@ -48,7 +48,7 @@ buildPythonPackage rec { ]; optional-dependencies = { - ssh = [ paramiko paramiko.optional-dependencies.ed25519 ]; + ssh = [ paramiko ]; tls = []; websockets = [ websocket-client ]; }; diff --git a/pkgs/development/python-modules/ncclient/default.nix b/pkgs/development/python-modules/ncclient/default.nix index 3f1d8462e7fd..cff31090db63 100644 --- a/pkgs/development/python-modules/ncclient/default.nix +++ b/pkgs/development/python-modules/ncclient/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { paramiko lxml six - ] ++ paramiko.optional-dependencies.ed25519; + ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/sshtunnel/default.nix b/pkgs/development/python-modules/sshtunnel/default.nix index ecb8e24d01a4..08d6bf114082 100644 --- a/pkgs/development/python-modules/sshtunnel/default.nix +++ b/pkgs/development/python-modules/sshtunnel/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { build-system = [ setuptools ]; - dependencies = [ paramiko ] ++ paramiko.optional-dependencies.ed25519; + dependencies = [ paramiko ]; nativeCheckInputs = [ pytestCheckHook From ab44f18e2143c5af93c2b818388368ca5bb50a07 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 18 Feb 2025 01:10:58 +0000 Subject: [PATCH 44/51] b3sum: 1.5.5 -> 1.6.0 --- pkgs/by-name/b3/b3sum/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/b3/b3sum/package.nix b/pkgs/by-name/b3/b3sum/package.nix index 93de50e805ed..12f7dc3c20ca 100644 --- a/pkgs/by-name/b3/b3sum/package.nix +++ b/pkgs/by-name/b3/b3sum/package.nix @@ -6,15 +6,15 @@ rustPlatform.buildRustPackage rec { pname = "b3sum"; - version = "1.5.5"; + version = "1.6.0"; src = fetchCrate { inherit version pname; - hash = "sha256-PgtQc8rwIbiHAue323POh15png7DerZbCuAKLi+jEYE="; + hash = "sha256-nsixj/zskHNIkv/qiD1DvrjeqkzVuN76tH+vCLGvPW8="; }; useFetchCargoVendor = true; - cargoHash = "sha256-4RD6GcBGUHMXS8BYs1NqpR3fVul2J3qh5E4MFnMbwoE="; + cargoHash = "sha256-HAbL/3StlK+VlonoviB2hFxCj7oyG93ReUytE3pFOMQ="; meta = { description = "BLAKE3 cryptographic hash function"; From 2a349d9d3854bffe62fe0208feadc0d0af7221ab Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 18 Feb 2025 01:42:06 +0000 Subject: [PATCH 45/51] civo: 1.1.95 -> 1.1.97 --- pkgs/by-name/ci/civo/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ci/civo/package.nix b/pkgs/by-name/ci/civo/package.nix index 8b2729ca6998..66b9dc84160d 100644 --- a/pkgs/by-name/ci/civo/package.nix +++ b/pkgs/by-name/ci/civo/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "civo"; - version = "1.1.95"; + version = "1.1.97"; src = fetchFromGitHub { owner = "civo"; repo = "cli"; rev = "v${version}"; - hash = "sha256-/byI9QFxkCiyVvxF0K1RjK5xW4EE8l/+LqqKy9GW1Pw="; + hash = "sha256-0BIvKzG+ePN4VyXPj4VfCoZiq/pDZb9/7k/kTIa4Fqs="; }; - vendorHash = "sha256-ZylfnOeS6tXYaBbXg5znus6CKE+IZXmPSOc9UwYtscc="; + vendorHash = "sha256-V1R5MQ3y8mcm8ffc2INKk6BTYUROEvr8lHBs6MvbpkQ="; nativeBuildInputs = [ installShellFiles ]; From 99fb5230c6d1ef31ee47109c6b1fc178e5a9a4c8 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 18 Feb 2025 02:46:53 +0100 Subject: [PATCH 46/51] python313Packages.esphome-glyphsets: init at 0.1.0 --- .../esphome-glyphsets/default.nix | 34 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/development/python-modules/esphome-glyphsets/default.nix diff --git a/pkgs/development/python-modules/esphome-glyphsets/default.nix b/pkgs/development/python-modules/esphome-glyphsets/default.nix new file mode 100644 index 000000000000..faa4c5663464 --- /dev/null +++ b/pkgs/development/python-modules/esphome-glyphsets/default.nix @@ -0,0 +1,34 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, +}: + +buildPythonPackage rec { + pname = "esphome-glyphsets"; + version = "0.1.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "esphome"; + repo = "esphome-glyphsets"; + tag = "v${version}"; + hash = "sha256-kST2AsZRWZrVmInUNN153+FOXa/t9vbHN3hAReKQJaU="; + fetchSubmodules = true; + }; + + build-system = [ setuptools ]; + + pythonImportsCheck = [ + "esphome_glyphsets" + ]; + + meta = { + description = "A lightweight version of glyphsets for ESPHome"; + homepage = "https://github.com/esphome/esphome-glyphsets"; + changelog = "https://github.com/esphome/esphome-glyphsets/blob/${src.tag}/CHANGELOG.md"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ hexa ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index af53309e3a83..333f70755e08 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4275,6 +4275,8 @@ self: super: with self; { esphome-dashboard-api = callPackage ../development/python-modules/esphome-dashboard-api { }; + esphome-glyphsets = callPackage ../development/python-modules/esphome-glyphsets { }; + esprima = callPackage ../development/python-modules/esprima { }; escapism = callPackage ../development/python-modules/escapism { }; From abacc56123bb7ca3a0a33472e61bad12c0a089db Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 18 Feb 2025 03:04:36 +0100 Subject: [PATCH 47/51] python313Packages.aioesphomeapi: 29.0.0 -> 29.1.0 https://github.com/esphome/aioesphomeapi/releases/tag/v29.1.0 --- .../python-modules/aioesphomeapi/default.nix | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/aioesphomeapi/default.nix b/pkgs/development/python-modules/aioesphomeapi/default.nix index 374123cb8239..c6f618b22e88 100644 --- a/pkgs/development/python-modules/aioesphomeapi/default.nix +++ b/pkgs/development/python-modules/aioesphomeapi/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pname = "aioesphomeapi"; - version = "29.0.0"; + version = "29.1.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "esphome"; repo = "aioesphomeapi"; tag = "v${version}"; - hash = "sha256-1H6+/V87mjkBvHwPTs3sgrqY24Gc/MCKb97r2ly6oTA="; + hash = "sha256-/4/FNb6lGlitsAzO0OadWqP02Wx+mnlrA6yzXFm72sg="; }; build-system = [ @@ -62,17 +62,13 @@ buildPythonPackage rec { ]; disabledTests = [ - # https://github.com/esphome/aioesphomeapi/issues/837 - "test_reconnect_logic_stop_callback" - # python3.12.4 regression - # https://github.com/esphome/aioesphomeapi/issues/889 - "test_start_connection_cannot_increase_recv_buffer" - "test_start_connection_can_only_increase_buffer_size_to_262144" + # https://github.com/esphome/aioesphomeapi/pull/1081 + "test_request_while_handshaking" ]; disabledTestPaths = [ # benchmarking requires pytest-codespeed - "tests/test_bluetooth_benchmarks.py" + "tests/benchmarks" ]; pythonImportsCheck = [ "aioesphomeapi" ]; From 9e6de4ab6d1b85e1faf5bf9ebdd29a071ccc0b47 Mon Sep 17 00:00:00 2001 From: "Adam C. Stephens" Date: Mon, 17 Feb 2025 22:11:40 -0500 Subject: [PATCH 48/51] tailwindcss: revert back to v3 as default v4 is too much of a breaking change at this point, including other packages in tree --- pkgs/by-name/ta/tailwindcss/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ta/tailwindcss/package.nix b/pkgs/by-name/ta/tailwindcss/package.nix index e981f68a88e5..2c945ebfeadb 100644 --- a/pkgs/by-name/ta/tailwindcss/package.nix +++ b/pkgs/by-name/ta/tailwindcss/package.nix @@ -1 +1 @@ -{ tailwindcss_4 }: tailwindcss_4 +{ tailwindcss_3 }: tailwindcss_3 From a2b85d4ef550b8dd77b04ee58769114f674b5c4d Mon Sep 17 00:00:00 2001 From: Mutsuha Asada Date: Tue, 14 Jan 2025 15:25:54 +0900 Subject: [PATCH 49/51] ocamlPackages.bitv: 1.3 -> 2.0 Changelog: https://github.com/backtracking/bitv/releases/tag/2.0 Diff: https://github.com/backtracking/bitv/compare/1.3...2.0 --- .../ocaml-modules/bitv/default.nix | 54 +++++++------------ 1 file changed, 19 insertions(+), 35 deletions(-) diff --git a/pkgs/development/ocaml-modules/bitv/default.nix b/pkgs/development/ocaml-modules/bitv/default.nix index 6b9325dc0c52..fa8444261740 100644 --- a/pkgs/development/ocaml-modules/bitv/default.nix +++ b/pkgs/development/ocaml-modules/bitv/default.nix @@ -1,42 +1,26 @@ { - stdenv, lib, fetchFromGitHub, - autoreconfHook, - which, - ocaml, - findlib, + buildDunePackage, }: -if lib.versionOlder ocaml.version "4.02" then - throw "bitv is not available for OCaml ${ocaml.version}" -else +buildDunePackage rec { + pname = "bitv"; + version = "2.0"; + minimalOCamlVersion = "4.08"; - stdenv.mkDerivation rec { - pname = "ocaml${ocaml.version}-bitv"; - version = "1.3"; + src = fetchFromGitHub { + owner = "backtracking"; + repo = "bitv"; + tag = version; + hash = "sha256-llfbdrvxrz6323G2LBAtKaXOrHQriFzaz3ulvFVhH6s="; + }; - src = fetchFromGitHub { - owner = "backtracking"; - repo = "bitv"; - rev = version; - sha256 = "sha256-sZwq6c10hBBS9tGvKlWD9GE3JBrZPByfDrXE6xIPcG4="; - }; - - nativeBuildInputs = [ - autoreconfHook - which - ocaml - findlib - ]; - - createFindlibDestdir = true; - - meta = { - description = "Bit vector library for OCaml"; - license = lib.licenses.lgpl21; - homepage = "https://github.com/backtracking/bitv"; - maintainers = [ lib.maintainers.vbgl ]; - inherit (ocaml.meta) platforms; - }; - } + meta = { + description = "Bit vector library for OCaml"; + license = lib.licenses.lgpl21; + homepage = "https://github.com/backtracking/bitv"; + changelog = "https://github.com/backtracking/bitv/releases/tag/${version}"; + maintainers = [ lib.maintainers.vbgl ]; + }; +} From 3452fcb15f63a5b6f0b2cee3a8366af59563f8d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Tue, 18 Feb 2025 04:38:16 +0000 Subject: [PATCH 50/51] devenv: 1.4 -> 1.4.1 --- pkgs/by-name/de/devenv/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/de/devenv/package.nix b/pkgs/by-name/de/devenv/package.nix index 6e64ccf592e2..d3ebaef3882a 100644 --- a/pkgs/by-name/de/devenv/package.nix +++ b/pkgs/by-name/de/devenv/package.nix @@ -27,7 +27,7 @@ let doInstallCheck = false; }); - version = "1.4"; + version = "1.4.1"; in rustPlatform.buildRustPackage { pname = "devenv"; @@ -37,11 +37,11 @@ rustPlatform.buildRustPackage { owner = "cachix"; repo = "devenv"; rev = "v${version}"; - hash = "sha256-ax0264nOyPcTJvIJAnPKGfkfXQ8Oe8ZVFziKf3UV26o="; + hash = "sha256-OjdnHKQ+eWA8YvPUpl3xxyaNK91c9sMebqXgVdN8Lm4="; }; useFetchCargoVendor = true; - cargoHash = "sha256-K06D4tD3IOCA7/iqQ7fhybsgcSmMxPUcoUi+VNPtgAY="; + cargoHash = "sha256-Z7xf1fuXi2Lx005rQwWa7ZNw8nJGz1z33KPnX/pxO3E="; buildAndTestSubdir = "devenv"; From 814ecdf1a43cf3b88a0a934c9af31c2b8d24bbc4 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 11 Feb 2025 07:21:29 +0100 Subject: [PATCH 51/51] =?UTF-8?q?ocamlPackages.js=5Fof=5Focaml:=205.9.1=20?= =?UTF-8?q?=E2=86=92=206.0.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ocaml-modules/ctypes_stubs_js/default.nix | 8 ++++++-- .../ocaml-modules/gen_js_api/ojs.nix | 1 - .../ocaml-modules/janestreet/0.15.nix | 10 ++++++++++ .../ocaml-modules/janestreet/0.16.nix | 10 ++++++++++ .../ocaml-modules/janestreet/0.17.nix | 10 ++++++++++ .../tools/ocaml/js_of_ocaml/compiler.nix | 3 ++- .../development/tools/ocaml/js_of_ocaml/lwt.nix | 5 +---- .../development/tools/ocaml/js_of_ocaml/ppx.nix | 7 ++----- .../ocaml/js_of_ocaml/ppx_deriving_json.nix | 5 +---- .../tools/ocaml/js_of_ocaml/tyxml.nix | 5 +---- pkgs/top-level/ocaml-packages.nix | 17 +++++++++++++++-- 11 files changed, 58 insertions(+), 23 deletions(-) diff --git a/pkgs/development/ocaml-modules/ctypes_stubs_js/default.nix b/pkgs/development/ocaml-modules/ctypes_stubs_js/default.nix index 2b4ce1472e94..d80c1c5f3d10 100644 --- a/pkgs/development/ocaml-modules/ctypes_stubs_js/default.nix +++ b/pkgs/development/ocaml-modules/ctypes_stubs_js/default.nix @@ -14,7 +14,6 @@ buildDunePackage rec { pname = "ctypes_stubs_js"; version = "0.1"; - duneVersion = "3"; minimalOCamlVersion = "4.08"; src = fetchFromGitLab { @@ -27,7 +26,12 @@ buildDunePackage rec { propagatedBuildInputs = [ integers_stubs_js ]; nativeCheckInputs = [ nodejs - js_of_ocaml-compiler + ( + if lib.versionAtLeast js_of_ocaml-compiler.version "6.0" then + js_of_ocaml-compiler.override { version = "5.9.1"; } + else + js_of_ocaml-compiler + ) ]; checkInputs = [ ctypes diff --git a/pkgs/development/ocaml-modules/gen_js_api/ojs.nix b/pkgs/development/ocaml-modules/gen_js_api/ojs.nix index 7a77574be7e7..0d64ef2d2250 100644 --- a/pkgs/development/ocaml-modules/gen_js_api/ojs.nix +++ b/pkgs/development/ocaml-modules/gen_js_api/ojs.nix @@ -8,7 +8,6 @@ buildDunePackage rec { pname = "ojs"; inherit (gen_js_api) version src; - duneVersion = "3"; propagatedBuildInputs = [ js_of_ocaml-compiler ]; diff --git a/pkgs/development/ocaml-modules/janestreet/0.15.nix b/pkgs/development/ocaml-modules/janestreet/0.15.nix index 49c28ae5381b..a56a58865cfa 100644 --- a/pkgs/development/ocaml-modules/janestreet/0.15.nix +++ b/pkgs/development/ocaml-modules/janestreet/0.15.nix @@ -9,6 +9,16 @@ zstd, }: +let + js_of_ocaml-compiler = self.js_of_ocaml-compiler.override { version = "5.9.1"; }; + js_of_ocaml = self.js_of_ocaml.override { inherit js_of_ocaml-compiler; }; + gen_js_api = self.gen_js_api.override { + inherit js_of_ocaml-compiler; + ojs = self.ojs.override { inherit js_of_ocaml-compiler; }; + }; + js_of_ocaml-ppx = self.js_of_ocaml-ppx.override { inherit js_of_ocaml; }; +in + with self; { diff --git a/pkgs/development/ocaml-modules/janestreet/0.16.nix b/pkgs/development/ocaml-modules/janestreet/0.16.nix index 74e8b2c9a62a..60358dc4f574 100644 --- a/pkgs/development/ocaml-modules/janestreet/0.16.nix +++ b/pkgs/development/ocaml-modules/janestreet/0.16.nix @@ -9,6 +9,16 @@ krb5, }: +let + js_of_ocaml-compiler = self.js_of_ocaml-compiler.override { version = "5.9.1"; }; + js_of_ocaml = self.js_of_ocaml.override { inherit js_of_ocaml-compiler; }; + gen_js_api = self.gen_js_api.override { + inherit js_of_ocaml-compiler; + ojs = self.ojs.override { inherit js_of_ocaml-compiler; }; + }; + js_of_ocaml-ppx = self.js_of_ocaml-ppx.override { inherit js_of_ocaml; }; +in + with self; { diff --git a/pkgs/development/ocaml-modules/janestreet/0.17.nix b/pkgs/development/ocaml-modules/janestreet/0.17.nix index 8e43fde337bf..f4a515c58f54 100644 --- a/pkgs/development/ocaml-modules/janestreet/0.17.nix +++ b/pkgs/development/ocaml-modules/janestreet/0.17.nix @@ -8,6 +8,16 @@ zstd, }: +let + js_of_ocaml-compiler = self.js_of_ocaml-compiler.override { version = "5.9.1"; }; + js_of_ocaml = self.js_of_ocaml.override { inherit js_of_ocaml-compiler; }; + gen_js_api = self.gen_js_api.override { + inherit js_of_ocaml-compiler; + ojs = self.ojs.override { inherit js_of_ocaml-compiler; }; + }; + js_of_ocaml-ppx = self.js_of_ocaml-ppx.override { inherit js_of_ocaml; }; +in + with self; { diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix b/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix index b1855a49d133..61792e7e2cd4 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix @@ -10,7 +10,7 @@ menhir, menhirLib, sedlex, - version ? if lib.versionAtLeast ocaml.version "4.11" then "5.9.1" else "5.8.2", + version ? if lib.versionAtLeast ocaml.version "4.11" then "6.0.1" else "5.8.2", }: buildDunePackage { @@ -22,6 +22,7 @@ buildDunePackage { url = "https://github.com/ocsigen/js_of_ocaml/releases/download/${version}/js_of_ocaml-${version}.tbz"; hash = { + "6.0.1" = "sha256-gT2+4rYuFUEEnqI6IOQFzyROJ+v6mFl4XPpT4obSxhQ="; "5.9.1" = "sha256-aMlcYIcdjpyaVMgvNeLtUEE7y0QPIg0LNRayoe4ccwc="; "5.8.2" = "sha256-ciAZS9L5sU2VgVOlogZ1A1nXtJ3hL+iNdFDThc7L8Eo="; } diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix b/pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix index ebbd742549e1..c05039ce967e 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix @@ -1,6 +1,5 @@ { buildDunePackage, - js_of_ocaml-compiler, js_of_ocaml-ppx, js_of_ocaml, lwt, @@ -10,7 +9,7 @@ buildDunePackage { pname = "js_of_ocaml-lwt"; - inherit (js_of_ocaml-compiler) version src; + inherit (js_of_ocaml) version src meta; buildInputs = [ js_of_ocaml-ppx ]; @@ -19,6 +18,4 @@ buildDunePackage { lwt lwt_log ]; - - meta = builtins.removeAttrs js_of_ocaml-compiler.meta [ "mainProgram" ]; } diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/ppx.nix b/pkgs/development/tools/ocaml/js_of_ocaml/ppx.nix index 959567ad612a..bf9310a7c620 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/ppx.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/ppx.nix @@ -1,17 +1,14 @@ { buildDunePackage, - js_of_ocaml-compiler, - ppxlib, js_of_ocaml, + ppxlib, }: buildDunePackage { pname = "js_of_ocaml-ppx"; - inherit (js_of_ocaml-compiler) version src; + inherit (js_of_ocaml) version src meta; buildInputs = [ js_of_ocaml ]; propagatedBuildInputs = [ ppxlib ]; - - meta = builtins.removeAttrs js_of_ocaml-compiler.meta [ "mainProgram" ]; } diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix b/pkgs/development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix index 7239ae3cd75c..17efff930fb2 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix @@ -1,6 +1,5 @@ { buildDunePackage, - js_of_ocaml-compiler, js_of_ocaml, ppxlib, }: @@ -8,12 +7,10 @@ buildDunePackage { pname = "js_of_ocaml-ppx_deriving_json"; - inherit (js_of_ocaml-compiler) version src; + inherit (js_of_ocaml) version src meta; propagatedBuildInputs = [ js_of_ocaml ppxlib ]; - - meta = builtins.removeAttrs js_of_ocaml-compiler.meta [ "mainProgram" ]; } diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/tyxml.nix b/pkgs/development/tools/ocaml/js_of_ocaml/tyxml.nix index 1124e700e685..57a7e132e877 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/tyxml.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/tyxml.nix @@ -1,6 +1,5 @@ { buildDunePackage, - js_of_ocaml-compiler, js_of_ocaml-ppx, js_of_ocaml, reactivedata, @@ -10,7 +9,7 @@ buildDunePackage { pname = "js_of_ocaml-tyxml"; - inherit (js_of_ocaml-compiler) version src; + inherit (js_of_ocaml) version src meta; buildInputs = [ js_of_ocaml-ppx ]; @@ -19,6 +18,4 @@ buildDunePackage { reactivedata tyxml ]; - - meta = builtins.removeAttrs js_of_ocaml-compiler.meta [ "mainProgram" ]; } diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 9eff14a8fea6..73a1ce489819 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -460,7 +460,15 @@ let stdenv = pkgs.gcc13Stdenv; }; - eliom = callPackage ../development/ocaml-modules/eliom { }; + eliom = let + js_of_ocaml-compiler = self.js_of_ocaml-compiler.override { version = "5.9.1"; }; + js_of_ocaml = self.js_of_ocaml.override { inherit js_of_ocaml-compiler; }; + in callPackage ../development/ocaml-modules/eliom rec { + js_of_ocaml-ppx = self.js_of_ocaml-ppx.override { inherit js_of_ocaml; }; + js_of_ocaml-ppx_deriving_json = self.js_of_ocaml-ppx_deriving_json.override { inherit js_of_ocaml; }; + js_of_ocaml-lwt = self.js_of_ocaml-lwt.override { inherit js_of_ocaml js_of_ocaml-ppx; }; + js_of_ocaml-tyxml = self.js_of_ocaml-tyxml.override { inherit js_of_ocaml js_of_ocaml-ppx; }; + }; elpi = callPackage ../development/ocaml-modules/elpi ( let ppxlib_0_15 = if lib.versionAtLeast ppxlib.version "0.15" @@ -1425,7 +1433,12 @@ let ocsigen-start = callPackage ../development/ocaml-modules/ocsigen-start { }; - ocsigen-toolkit = callPackage ../development/ocaml-modules/ocsigen-toolkit { }; + ocsigen-toolkit = let + js_of_ocaml-compiler = self.js_of_ocaml-compiler.override { version = "5.9.1"; }; + js_of_ocaml = self.js_of_ocaml.override { inherit js_of_ocaml-compiler; }; + in callPackage ../development/ocaml-modules/ocsigen-toolkit { + js_of_ocaml-ppx_deriving_json = self.js_of_ocaml-ppx_deriving_json.override { inherit js_of_ocaml; }; + }; ocsipersist = callPackage ../development/ocaml-modules/ocsipersist {};