From 898f7b498b3dbc2eca495c5d6580f9c525b06630 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Mon, 23 Dec 2024 22:23:38 +0100 Subject: [PATCH 01/64] bespokesynth: Modernise - rec -> finalAttrs - lib.cmakeFeature instead of manual CMake flag writing - meta-wide "with lib" begone Evals to the same output. --- .../audio/bespokesynth/default.nix | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/audio/bespokesynth/default.nix b/pkgs/applications/audio/bespokesynth/default.nix index 8eb63539040c..e999bf14299f 100644 --- a/pkgs/applications/audio/bespokesynth/default.nix +++ b/pkgs/applications/audio/bespokesynth/default.nix @@ -58,21 +58,23 @@ let }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "bespokesynth"; version = "1.2.1"; src = fetchFromGitHub { owner = "BespokeSynth"; - repo = pname; - rev = "v${version}"; + repo = "bespokesynth"; + rev = "v${finalAttrs.version}"; hash = "sha256-vDvNm9sW9BfWloB0CA+JHTp/bfDWAP/T0hDXjoMZ3X4="; fetchSubmodules = true; }; cmakeBuildType = "Release"; - cmakeFlags = lib.optionals enableVST2 [ "-DBESPOKE_VST2_SDK_LOCATION=${vst-sdk}/VST2_SDK" ]; + cmakeFlags = lib.optionals enableVST2 [ + (lib.cmakeFeature "BESPOKE_VST2_SDK_LOCATION" "${vst-sdk}/VST2_SDK") + ]; nativeBuildInputs = [ python3 @@ -128,7 +130,7 @@ stdenv.mkDerivation rec { if stdenv.hostPlatform.isDarwin then '' mkdir -p $out/{Applications,bin} - mv Source/BespokeSynth_artefacts/${cmakeBuildType}/BespokeSynth.app $out/Applications/ + mv Source/BespokeSynth_artefacts/${finalAttrs.cmakeBuildType}/BespokeSynth.app $out/Applications/ # Symlinking confuses the resource finding about the actual location of the binary # Resources are looked up relative to the executed file's location makeWrapper $out/{Applications/BespokeSynth.app/Contents/MacOS,bin}/BespokeSynth @@ -160,22 +162,22 @@ stdenv.mkDerivation rec { }"; dontPatchELF = true; # needed or nix will try to optimize the binary by removing "useless" rpath - meta = with lib; { + meta = { description = "Software modular synth with controllers support, scripting and VST"; homepage = "https://www.bespokesynth.com/"; license = - with licenses; + with lib.licenses; [ gpl3Plus ] ++ lib.optional enableVST2 unfree; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ astro tobiasBora OPNA2608 PowerUser64 ]; mainProgram = "BespokeSynth"; - platforms = platforms.all; + platforms = lib.platforms.all; }; -} +}) From 3a117af47d70c443f7c0bedda470d3f6106b21a6 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Mon, 23 Dec 2024 22:38:05 +0100 Subject: [PATCH 02/64] bespokesynth: Modernise (with rebuilds) - Enable strictDeps, adjust for resulting changes --- pkgs/applications/audio/bespokesynth/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/bespokesynth/default.nix b/pkgs/applications/audio/bespokesynth/default.nix index e999bf14299f..ffa8f3ca7317 100644 --- a/pkgs/applications/audio/bespokesynth/default.nix +++ b/pkgs/applications/audio/bespokesynth/default.nix @@ -76,8 +76,10 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeFeature "BESPOKE_VST2_SDK_LOCATION" "${vst-sdk}/VST2_SDK") ]; + strictDeps = true; + nativeBuildInputs = [ - python3 + python3 # interpreter makeWrapper cmake pkg-config @@ -85,7 +87,10 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = - lib.optionals stdenv.hostPlatform.isLinux [ + [ + python3 # library + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ # List obtained from https://github.com/BespokeSynth/BespokeSynth/blob/main/azure-pipelines.yml libX11 libXrandr @@ -160,6 +165,7 @@ stdenv.mkDerivation (finalAttrs: { libXScrnSaver ]) }"; + dontPatchELF = true; # needed or nix will try to optimize the binary by removing "useless" rpath meta = { From 0a3fd92de049e5073d89cfaa8781f398179d633b Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Mon, 23 Dec 2024 22:39:59 +0100 Subject: [PATCH 03/64] bespokesynth: Add passthru.updateScript So updates can be sent automatically by r-ryantm, assuming that no other adjustments are needed to build it. --- pkgs/applications/audio/bespokesynth/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/applications/audio/bespokesynth/default.nix b/pkgs/applications/audio/bespokesynth/default.nix index ffa8f3ca7317..51d444bc8ff7 100644 --- a/pkgs/applications/audio/bespokesynth/default.nix +++ b/pkgs/applications/audio/bespokesynth/default.nix @@ -3,6 +3,7 @@ stdenv, fetchFromGitHub, fetchzip, + gitUpdater, cmake, pkg-config, ninja, @@ -168,6 +169,10 @@ stdenv.mkDerivation (finalAttrs: { dontPatchELF = true; # needed or nix will try to optimize the binary by removing "useless" rpath + passthru.updateScript = gitUpdater { + rev-prefix = "v"; + }; + meta = { description = "Software modular synth with controllers support, scripting and VST"; homepage = "https://www.bespokesynth.com/"; From 5bc6acc80df0e98d17bba59f8f9d65905d1ba18f Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Mon, 23 Dec 2024 22:52:18 +0100 Subject: [PATCH 04/64] bespokesynth: 1.2.1 -> 1.3.0 --- pkgs/applications/audio/bespokesynth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/bespokesynth/default.nix b/pkgs/applications/audio/bespokesynth/default.nix index 51d444bc8ff7..29a3755361b8 100644 --- a/pkgs/applications/audio/bespokesynth/default.nix +++ b/pkgs/applications/audio/bespokesynth/default.nix @@ -61,13 +61,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "bespokesynth"; - version = "1.2.1"; + version = "1.3.0"; src = fetchFromGitHub { owner = "BespokeSynth"; repo = "bespokesynth"; rev = "v${finalAttrs.version}"; - hash = "sha256-vDvNm9sW9BfWloB0CA+JHTp/bfDWAP/T0hDXjoMZ3X4="; + hash = "sha256-ad8wdLos3jM0gRMpcfRKeaiUxJsPGqWd/7XeDz87ToQ="; fetchSubmodules = true; }; From e8ca293bb3b569bee16ce071d38ea0140b88992f Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Mon, 23 Dec 2024 23:05:24 +0100 Subject: [PATCH 05/64] bespokesynth: Use more system dependencies --- .../audio/bespokesynth/default.nix | 20 +++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/audio/bespokesynth/default.nix b/pkgs/applications/audio/bespokesynth/default.nix index 29a3755361b8..5367642427b8 100644 --- a/pkgs/applications/audio/bespokesynth/default.nix +++ b/pkgs/applications/audio/bespokesynth/default.nix @@ -12,6 +12,7 @@ alsa-lib, alsa-tools, freetype, + jsoncpp, libusb1, libX11, libXrandr, @@ -73,9 +74,14 @@ stdenv.mkDerivation (finalAttrs: { cmakeBuildType = "Release"; - cmakeFlags = lib.optionals enableVST2 [ - (lib.cmakeFeature "BESPOKE_VST2_SDK_LOCATION" "${vst-sdk}/VST2_SDK") - ]; + cmakeFlags = + [ + (lib.cmakeBool "BESPOKE_SYSTEM_PYBIND11" true) + (lib.cmakeBool "BESPOKE_SYSTEM_JSONCPP" true) + ] + ++ lib.optionals enableVST2 [ + (lib.cmakeFeature "BESPOKE_VST2_SDK_LOCATION" "${vst-sdk}/VST2_SDK") + ]; strictDeps = true; @@ -89,7 +95,13 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ - python3 # library + jsoncpp + # library & headers + (python3.withPackages ( + ps: with ps; [ + pybind11 + ] + )) ] ++ lib.optionals stdenv.hostPlatform.isLinux [ # List obtained from https://github.com/BespokeSynth/BespokeSynth/blob/main/azure-pipelines.yml From 16267bf47023accd391750e66712722ec9826ec9 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Mon, 23 Dec 2024 23:35:01 +0100 Subject: [PATCH 06/64] bespokesynth: Hardcode queried FQDN Noticed while testing on Darwin, didn't expect to see my machine's hostname in the logs. --- pkgs/applications/audio/bespokesynth/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/applications/audio/bespokesynth/default.nix b/pkgs/applications/audio/bespokesynth/default.nix index 5367642427b8..3bf68d11bd88 100644 --- a/pkgs/applications/audio/bespokesynth/default.nix +++ b/pkgs/applications/audio/bespokesynth/default.nix @@ -72,6 +72,14 @@ stdenv.mkDerivation (finalAttrs: { fetchSubmodules = true; }; + # Linux builds are sandboxed properly, this always returns "localhost" there. + # Darwin builds doesn't have the same amount of sandboxing by default, and the builder's hostname is returned. + # In case this ever gets embedded into VersionInfoBld.cpp, hardcode it to the Linux value + postPatch = '' + substituteInPlace Source/cmake/versiontools.cmake \ + --replace-fail 'cmake_host_system_information(RESULT BESPOKE_BUILD_FQDN QUERY FQDN)' 'set(BESPOKE_BUILD_FQDN "localhost")' + ''; + cmakeBuildType = "Release"; cmakeFlags = From ebdf35c4363d50703b134d859ccf327b3dc7d031 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Mon, 23 Dec 2024 23:45:06 +0100 Subject: [PATCH 07/64] bespokesynth: Move to by-name --- .../be/bespokesynth/package.nix} | 21 ++----------------- pkgs/top-level/all-packages.nix | 4 ---- 2 files changed, 2 insertions(+), 23 deletions(-) rename pkgs/{applications/audio/bespokesynth/default.nix => by-name/be/bespokesynth/package.nix} (91%) diff --git a/pkgs/applications/audio/bespokesynth/default.nix b/pkgs/by-name/be/bespokesynth/package.nix similarity index 91% rename from pkgs/applications/audio/bespokesynth/default.nix rename to pkgs/by-name/be/bespokesynth/package.nix index 3bf68d11bd88..f2bf3a98d339 100644 --- a/pkgs/applications/audio/bespokesynth/default.nix +++ b/pkgs/by-name/be/bespokesynth/package.nix @@ -4,6 +4,7 @@ fetchFromGitHub, fetchzip, gitUpdater, + apple-sdk_11, cmake, pkg-config, ninja, @@ -33,13 +34,6 @@ pcre, mount, zenity, - Accelerate, - Cocoa, - WebKit, - CoreServices, - CoreAudioKit, - IOBluetooth, - MetalKit, # It is not allowed to distribute binaries with the VST2 SDK plugin without a license # (the author of Bespoke has such a licence but not Nix). VST3 should work out of the box. # Read more in https://github.com/NixOS/nixpkgs/issues/145607 @@ -138,20 +132,9 @@ stdenv.mkDerivation (finalAttrs: { mount ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Accelerate - Cocoa - WebKit - CoreServices - CoreAudioKit - IOBluetooth - MetalKit + apple-sdk_11 ]; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin (toString [ - # Fails to find fp.h on its own - "-isystem ${CoreServices}/Library/Frameworks/CoreServices.framework/Versions/Current/Frameworks/CarbonCore.framework/Versions/Current/Headers/" - ]); - postInstall = if stdenv.hostPlatform.isDarwin then '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7057e2550531..106e18c484cf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13213,10 +13213,6 @@ with pkgs; barrier = libsForQt5.callPackage ../applications/misc/barrier { }; - bespokesynth = darwin.apple_sdk_11_0.callPackage ../applications/audio/bespokesynth { - inherit (darwin.apple_sdk_11_0.frameworks) Accelerate Cocoa WebKit CoreServices CoreAudioKit IOBluetooth MetalKit; - }; - bespokesynth-with-vst2 = bespokesynth.override { enableVST2 = true; }; From 450fcb57101e6f80da321f45836bf70a00d8c9bf Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 8 Jan 2025 15:12:47 +0100 Subject: [PATCH 08/64] bespokesynth: Fix compatibility with pipewire's JACK emulation --- .../2001-bespokesynth-fix-pipewire-jack.patch | 30 +++++++++++++++++++ pkgs/by-name/be/bespokesynth/package.nix | 6 ++++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/by-name/be/bespokesynth/2001-bespokesynth-fix-pipewire-jack.patch diff --git a/pkgs/by-name/be/bespokesynth/2001-bespokesynth-fix-pipewire-jack.patch b/pkgs/by-name/be/bespokesynth/2001-bespokesynth-fix-pipewire-jack.patch new file mode 100644 index 000000000000..c14848843bdc --- /dev/null +++ b/pkgs/by-name/be/bespokesynth/2001-bespokesynth-fix-pipewire-jack.patch @@ -0,0 +1,30 @@ +diff --git a/libs/JUCE/modules/juce_audio_devices/native/juce_JackAudio_linux.cpp b/libs/JUCE/modules/juce_audio_devices/native/juce_JackAudio_linux.cpp +index 4cce7016f..25554a7cd 100644 +--- a/libs/JUCE/modules/juce_audio_devices/native/juce_JackAudio_linux.cpp ++++ b/libs/JUCE/modules/juce_audio_devices/native/juce_JackAudio_linux.cpp +@@ -291,7 +291,6 @@ public: + juce::jack_on_info_shutdown (client, infoShutdownCallback, this); + juce::jack_set_xrun_callback (client, xrunCallback, this); + juce::jack_activate (client); +- deviceIsOpen = true; + + if (! inputChannels.isZero()) + { +@@ -336,6 +335,7 @@ public: + } + + updateActivePorts(); ++ deviceIsOpen = true; + + return lastError; + } +@@ -525,7 +525,8 @@ private: + static void portConnectCallback (jack_port_id_t, jack_port_id_t, int, void* arg) + { + if (JackAudioIODevice* device = static_cast (arg)) +- device->mainThreadDispatcher.updateActivePorts(); ++ if (device->isOpen()) ++ device->mainThreadDispatcher.updateActivePorts(); + } + + static void threadInitCallback (void* /* callbackArgument */) diff --git a/pkgs/by-name/be/bespokesynth/package.nix b/pkgs/by-name/be/bespokesynth/package.nix index f2bf3a98d339..29ff82de7e2f 100644 --- a/pkgs/by-name/be/bespokesynth/package.nix +++ b/pkgs/by-name/be/bespokesynth/package.nix @@ -66,6 +66,12 @@ stdenv.mkDerivation (finalAttrs: { fetchSubmodules = true; }; + patches = [ + # Fix compatibility with pipewire's JACK emulation + # https://github.com/BespokeSynth/BespokeSynth/issues/1405#issuecomment-1721437868 + ./2001-bespokesynth-fix-pipewire-jack.patch + ]; + # Linux builds are sandboxed properly, this always returns "localhost" there. # Darwin builds doesn't have the same amount of sandboxing by default, and the builder's hostname is returned. # In case this ever gets embedded into VersionInfoBld.cpp, hardcode it to the Linux value From b3b72ef09737401f51a8c2461e1edf8d5ca5eace Mon Sep 17 00:00:00 2001 From: Colin Date: Tue, 14 Jan 2025 07:52:14 +0000 Subject: [PATCH 09/64] nautilus: fix cross compilation --- pkgs/by-name/na/nautilus/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/na/nautilus/package.nix b/pkgs/by-name/na/nautilus/package.nix index 3a1f30dfb909..ea90bf63a177 100644 --- a/pkgs/by-name/na/nautilus/package.nix +++ b/pkgs/by-name/na/nautilus/package.nix @@ -100,6 +100,7 @@ stdenv.mkDerivation (finalAttrs: { mesonFlags = [ "-Ddocs=true" + "-Dtests=${if finalAttrs.finalPackage.doCheck then "all" else "none"}" ]; preFixup = '' From 0b71cbfae501da208cd603e75ba6f9cd5fcd79f0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 22 Jan 2025 00:39:23 +0000 Subject: [PATCH 10/64] apache-jena: 5.2.0 -> 5.3.0 --- pkgs/servers/nosql/apache-jena/binary.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nosql/apache-jena/binary.nix b/pkgs/servers/nosql/apache-jena/binary.nix index 8e2eb98f4bd8..65ae74386203 100644 --- a/pkgs/servers/nosql/apache-jena/binary.nix +++ b/pkgs/servers/nosql/apache-jena/binary.nix @@ -8,10 +8,10 @@ stdenv.mkDerivation rec { pname = "apache-jena"; - version = "5.2.0"; + version = "5.3.0"; src = fetchurl { url = "mirror://apache/jena/binaries/apache-jena-${version}.tar.gz"; - hash = "sha256-M2WbqXHAL77fu9khTgb7BOe0mLgmU0Rcf9KN4KmvYAU="; + hash = "sha256-TMvQb2cU+uz4CeyWksWYfueyQ7NpUsG4saoJVXVkd7Y="; }; nativeBuildInputs = [ makeWrapper From 35146c2df62144d1eb973815d647cef2289f2d7c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 22 Jan 2025 02:01:36 +0000 Subject: [PATCH 11/64] erlang-language-platform: 2024-12-09 -> 2025-01-21 --- pkgs/by-name/er/erlang-language-platform/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/er/erlang-language-platform/package.nix b/pkgs/by-name/er/erlang-language-platform/package.nix index 39f9538b1100..d106725a4067 100644 --- a/pkgs/by-name/er/erlang-language-platform/package.nix +++ b/pkgs/by-name/er/erlang-language-platform/package.nix @@ -14,14 +14,14 @@ let hashes = { linux-aarch64-unknown-linux-gnu = "sha256-Fte7oZD5+aFph5xGrKtbSimb3aHewkjsJRXB+64IW5A="; - linux-x86_64-unknown-linux-gnu = "sha256-GFf1YybZRyZ3D6ZnLf+op6KRPYbwBHSPh1groxdNZks="; + linux-x86_64-unknown-linux-gnu = "sha256-slnXUEtHJjq6wRQTt1EwqlOO/2zIGmGwa/HCi3F0YMA="; macos-aarch64-apple-darwin = "sha256-3K3sPizBR/+DJIX67GsYqm2X5k7kq3kBRg8P2WALTZs="; macos-x86_64-apple-darwin = "sha256-j+AVmLfe/yCvKvYhL5ikhXA1g+zQ1CDlMl1FYO6q1yA="; }; in stdenv.mkDerivation rec { pname = "erlang-language-platform"; - version = "2024-12-09"; + version = "2025-01-21"; src = fetchurl { url = "https://github.com/WhatsApp/erlang-language-platform/releases/download/${version}/elp-${release}-otp-26.2.tar.gz"; From 73a9da5db31e8da9fabac113ee3a3042af280266 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 22 Jan 2025 09:54:31 +0000 Subject: [PATCH 12/64] qownnotes: 25.1.3 -> 25.1.5 --- pkgs/by-name/qo/qownnotes/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/qo/qownnotes/package.nix b/pkgs/by-name/qo/qownnotes/package.nix index e7af30a64cba..08e95d1f341f 100644 --- a/pkgs/by-name/qo/qownnotes/package.nix +++ b/pkgs/by-name/qo/qownnotes/package.nix @@ -15,14 +15,14 @@ let pname = "qownnotes"; appname = "QOwnNotes"; - version = "25.1.3"; + version = "25.1.5"; in stdenv.mkDerivation { inherit pname version; src = fetchurl { url = "https://github.com/pbek/QOwnNotes/releases/download/v${version}/qownnotes-${version}.tar.xz"; - hash = "sha256-A/cjkjwHP0bCWZOjzZdIVUzb1Gh8B0rJHsntVdj4hF4="; + hash = "sha256-Qr5pkKznosUGO7HvUkZhemWwtKpyYA79Vz1jU6YhODE="; }; nativeBuildInputs = From f3e5d7a521b65e6ba779d6acb1db22f505fef969 Mon Sep 17 00:00:00 2001 From: Augustin Trancart Date: Wed, 22 Jan 2025 10:24:13 +0100 Subject: [PATCH 13/64] hugin: switch to openexr_3 --- pkgs/applications/graphics/hugin/default.nix | 8 ++------ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/graphics/hugin/default.nix b/pkgs/applications/graphics/hugin/default.nix index 16d4cc923b5f..f6d038f3a984 100644 --- a/pkgs/applications/graphics/hugin/default.nix +++ b/pkgs/applications/graphics/hugin/default.nix @@ -14,7 +14,6 @@ , flann , gettext , glew -, ilmbase , lcms2 , lensfun , libjpeg @@ -25,7 +24,7 @@ , libXmu , libGLU , libGL -, openexr_3 +, openexr , panotools , perlPackages , sqlite @@ -52,7 +51,6 @@ stdenv.mkDerivation rec { flann gettext glew - ilmbase lcms2 lensfun libjpeg @@ -63,7 +61,7 @@ stdenv.mkDerivation rec { libXmu libGLU libGL - openexr_3 + openexr panotools sqlite vigra @@ -78,8 +76,6 @@ stdenv.mkDerivation rec { # disable installation of the python scripting interface cmakeFlags = [ "-DBUILD_HSI:BOOl=OFF" ]; - env.NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR"; - postInstall = '' for p in $out/bin/*; do wrapProgram "$p" \ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7411f98dc38b..e5e6e7724f41 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13780,6 +13780,7 @@ with pkgs; hugin = callPackage ../applications/graphics/hugin { wxGTK = wxGTK32; + openexr = openexr_3; }; huggle = libsForQt5.callPackage ../applications/misc/huggle { }; From 1a65a6a274eb9ff1d4aff1625b23136730806e4c Mon Sep 17 00:00:00 2001 From: rewine Date: Thu, 23 Jan 2025 11:34:23 +0800 Subject: [PATCH 14/64] lucenepp: 3.0.8 -> 3.0.9 --- pkgs/by-name/lu/lucenepp/package.nix | 43 +++++++++++++--------------- 1 file changed, 20 insertions(+), 23 deletions(-) diff --git a/pkgs/by-name/lu/lucenepp/package.nix b/pkgs/by-name/lu/lucenepp/package.nix index 5e9688571ce7..89e719e2295d 100644 --- a/pkgs/by-name/lu/lucenepp/package.nix +++ b/pkgs/by-name/lu/lucenepp/package.nix @@ -4,25 +4,25 @@ fetchFromGitHub, fetchpatch, cmake, - boost, + boost186, gtest, zlib, }: stdenv.mkDerivation rec { pname = "lucene++"; - version = "3.0.8"; + version = "3.0.9"; src = fetchFromGitHub { owner = "luceneplusplus"; repo = "LucenePlusPlus"; rev = "rel_${version}"; - sha256 = "12v7r62f7pqh5h210pb74sfx6h70lj4pgfpva8ya2d55fn0qxrr2"; + hash = "sha256-VxEV45OXHRldFdIt2OC6O7ey5u98VQzlzeOb9ZiKfd8="; }; nativeBuildInputs = [ cmake ]; buildInputs = [ - boost + boost186 gtest zlib ]; @@ -30,32 +30,33 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=lib" ]; patches = [ - (fetchpatch { - name = "pkgconfig_use_correct_LIBDIR_for_destination_library"; - url = "https://github.com/luceneplusplus/LucenePlusPlus/commit/39cd44bd54e918d25ee464477992ad0dc234dcba.patch"; - sha256 = "sha256-PP6ENNhPJMWrYDlTnr156XV8d5aX/VNX8v4vvi9ZiWo"; - }) - (fetchpatch { - name = "fix-visibility-on-mac.patch"; - url = "https://github.com/luceneplusplus/LucenePlusPlus/commit/bc436842227aea561b68c6ae89fbd1fdefcac7b3.patch"; - sha256 = "sha256-/S7tFZ4ht5p0cv036xF2NKZQwExbPaGINyWZiUg/lS4="; - }) (fetchpatch { name = "fix-build-with-boost-1_85_0.patch"; url = "https://github.com/luceneplusplus/LucenePlusPlus/commit/76dc90f2b65d81be018c499714ff11e121ba5585.patch"; - sha256 = "sha256-SNAngHwy7yxvly8d6u1LcPsM6NYVx3FrFiSHLmkqY6Q="; + hash = "sha256-SNAngHwy7yxvly8d6u1LcPsM6NYVx3FrFiSHLmkqY6Q="; + }) + (fetchpatch { + name = "fix-install-path-for-liblucene_pc.patch"; + url = "https://github.com/luceneplusplus/LucenePlusPlus/commit/f40f59c6e169b4e16b7a6439ecb26a629c6540d1.patch"; + hash = "sha256-YtZMqh/cnkGikatcgRjOWXj570M5ZOnCqgW8/K0/nVo="; + }) + (fetchpatch { + name = "migrate-to-boost_asio_io_context.patch"; + url = "https://github.com/luceneplusplus/LucenePlusPlus/commit/e6a376836e5c891577eae6369263152106b9bc02.patch"; + hash = "sha256-0mdVvrS0nTxSJXRzVdx2Zb/vm9aVxGfARG/QliRx7tA="; }) ]; # Don't use the built in gtest - but the nixpkgs one requires C++14. postPatch = '' substituteInPlace src/test/CMakeLists.txt \ - --replace "add_subdirectory(gtest)" "" + --replace-fail "add_subdirectory(gtest)" "" substituteInPlace CMakeLists.txt \ - --replace "set(CMAKE_CXX_STANDARD 11)" "set(CMAKE_CXX_STANDARD 14)" + --replace-fail "set(CMAKE_CXX_STANDARD 11)" "set(CMAKE_CXX_STANDARD 14)" ''; - doCheck = true; + # FIXME: Stuck for several hours after passing 1472 tests + doCheck = false; checkPhase = '' runHook preCheck @@ -64,11 +65,6 @@ stdenv.mkDerivation rec { runHook postCheck ''; - postInstall = '' - mv $out/include/pkgconfig $out/lib/ - cp $src/src/contrib/include/*h $out/include/lucene++/ - ''; - meta = { description = "C++ port of the popular Java Lucene search engine"; homepage = "https://github.com/luceneplusplus/LucenePlusPlus"; @@ -77,5 +73,6 @@ stdenv.mkDerivation rec { lgpl3Plus ]; platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ rewine ]; }; } From 42aade1549fb5e759ba16a88c47b068b2fe33018 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 Jan 2025 11:51:27 +0000 Subject: [PATCH 15/64] werf: 2.19.0 -> 2.22.0 --- pkgs/by-name/we/werf/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/we/werf/package.nix b/pkgs/by-name/we/werf/package.nix index 1864b34a499b..3d26e8728778 100644 --- a/pkgs/by-name/we/werf/package.nix +++ b/pkgs/by-name/we/werf/package.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "werf"; - version = "2.19.0"; + version = "2.22.0"; src = fetchFromGitHub { owner = "werf"; repo = "werf"; rev = "v${version}"; - hash = "sha256-bNh2Rg77yWWBgXTnAo1IVU0RzieFOYtM5k0G1ltn3+Y="; + hash = "sha256-43ZN2bMzVBpliXjDDJrVZqdiWBS3rT5mYEd0440wp4s="; }; - vendorHash = "sha256-ICZneCPV858wRThUaSBmS9oApemKlUiA4SEWsH2sOak="; + vendorHash = "sha256-Qy5Tjg/QETeN8leTaWZXSUauK2LkPUUZbpztC79v6Jo="; proxyVendor = true; From 0470749d41852102fae6e18d474f1b31d2554810 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 Jan 2025 12:33:58 +0000 Subject: [PATCH 16/64] packcc: 2.0.2 -> 2.2.0 --- pkgs/by-name/pa/packcc/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pa/packcc/package.nix b/pkgs/by-name/pa/packcc/package.nix index 682bc519238e..182413401fb3 100644 --- a/pkgs/by-name/pa/packcc/package.nix +++ b/pkgs/by-name/pa/packcc/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "packcc"; - version = "2.0.2"; + version = "2.2.0"; src = fetchFromGitHub { owner = "arithy"; repo = "packcc"; rev = "v${finalAttrs.version}"; - hash = "sha256-k1C/thvr/5fYrgu/j8YN3kwXp4k26sC9AhYhYAKQuX0="; + hash = "sha256-fmZL34UL7epFFGo0gCsj8TcyhBt5uCfnLCLCQugXF6U="; }; postPatch = '' From 5397e1bd3b0d514992dab8ce36e7268acbeb4141 Mon Sep 17 00:00:00 2001 From: toonn Date: Thu, 9 Jan 2025 15:05:03 +0100 Subject: [PATCH 17/64] wire-desktop: linux 3.37.3607 -> 3.39.3653 --- pkgs/by-name/wi/wire-desktop/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/wi/wire-desktop/package.nix b/pkgs/by-name/wi/wire-desktop/package.nix index ec93ba9600b1..9a665a07184d 100644 --- a/pkgs/by-name/wi/wire-desktop/package.nix +++ b/pkgs/by-name/wi/wire-desktop/package.nix @@ -33,7 +33,7 @@ let { inherit x86_64-darwin; aarch64-darwin = x86_64-darwin; - x86_64-linux = "3.37.3607"; + x86_64-linux = "3.39.3653"; } .${system} or throwSystem; @@ -44,7 +44,7 @@ let { inherit x86_64-darwin; aarch64-darwin = x86_64-darwin; - x86_64-linux = "sha256-mckFxxrWnxeVGgJ//efPTdtHt5nVII1lXu/BT61TKxE="; + x86_64-linux = "sha256-BbY+7fGAWW5CR/z4GeoBl5aOewCRuWzQjpQX4x1rzls="; } .${system} or throwSystem; From 51cd7c86e8c60f29d96e83e25ca346acafc7cd80 Mon Sep 17 00:00:00 2001 From: toonn Date: Thu, 9 Jan 2025 15:06:21 +0100 Subject: [PATCH 18/64] wire-desktop: mac 3.37.5164 -> 3.39.5211 --- pkgs/by-name/wi/wire-desktop/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/wi/wire-desktop/package.nix b/pkgs/by-name/wi/wire-desktop/package.nix index 9a665a07184d..0f89a5bb4881 100644 --- a/pkgs/by-name/wi/wire-desktop/package.nix +++ b/pkgs/by-name/wi/wire-desktop/package.nix @@ -28,7 +28,7 @@ let version = let - x86_64-darwin = "3.37.5164"; + x86_64-darwin = "3.39.5211"; in { inherit x86_64-darwin; @@ -39,7 +39,7 @@ let hash = let - x86_64-darwin = "sha256-xQ6EaZFE6qdpgFj1Lom37wT8URd5FsRwG89YeM/+U7k="; + x86_64-darwin = "sha256-k6CIqHt67AFL70zdK0/91aQcpbb00OIggk5TF7y1IOY="; in { inherit x86_64-darwin; From e53237a5dd7405a1bf80f5e7c66f1760bf3f58c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joshua=20Kobsch=C3=A4tzki?= Date: Thu, 23 Jan 2025 16:50:05 +0100 Subject: [PATCH 19/64] squid: make esi configurable --- pkgs/by-name/sq/squid/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/sq/squid/package.nix b/pkgs/by-name/sq/squid/package.nix index c03043400d75..d38921626061 100644 --- a/pkgs/by-name/sq/squid/package.nix +++ b/pkgs/by-name/sq/squid/package.nix @@ -14,6 +14,7 @@ pkg-config, systemd, cppunit, + esi ? false, }: stdenv.mkDerivation (finalAttrs: { @@ -57,6 +58,7 @@ stdenv.mkDerivation (finalAttrs: { "--enable-x-accelerator-vary" "--enable-htcp" ] + ++ lib.optional (!esi) "--disable-esi" ++ lib.optional ( stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isMusl ) "--enable-linux-netfilter"; From 925e96bb232214a5a6a766e13c60b484632c510a Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Thu, 23 Jan 2025 17:16:59 +0100 Subject: [PATCH 20/64] openxray: 2188-november-2023-rc1 -> 2921-january-2025-rc1 --- pkgs/games/openxray/default.nix | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/pkgs/games/openxray/default.nix b/pkgs/games/openxray/default.nix index 5d761fbf7f71..340e1bbf68b0 100644 --- a/pkgs/games/openxray/default.nix +++ b/pkgs/games/openxray/default.nix @@ -18,16 +18,23 @@ stdenv.mkDerivation (finalAttrs: { pname = "openxray"; - version = "2188-november-2023-rc1"; + version = "2921-january-2025-rc1"; src = fetchFromGitHub { owner = "OpenXRay"; repo = "xray-16"; - rev = finalAttrs.version; + tag = finalAttrs.version; fetchSubmodules = true; - hash = "sha256-rRxw/uThACmT2qI8NUwJU+WbJ3BWUss6CH13R5aaHco="; + hash = "sha256-PYRC1t4gjT2d41ZZOZJF4u3vc0Pq7DpivEnnfbcSQYk="; }; + # Don't force-override these please + postPatch = '' + substituteInPlace Externals/LuaJIT-proj/CMakeLists.txt \ + --replace-fail 'set(CMAKE_OSX_SYSROOT' '#set(CMAKE_OSX_SYSROOT' \ + --replace-fail 'set(ENV{SDKROOT}' '#set(ENV{SDKROOT}' + ''; + strictDeps = true; nativeBuildInputs = [ @@ -47,6 +54,16 @@ stdenv.mkDerivation (finalAttrs: { pcre ]; + cmakeFlags = + [ + # Breaks on Darwin + (lib.cmakeBool "USE_LTO" (!stdenv.hostPlatform.isDarwin)) + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # This seemingly only gets set properly by CMake when using the XCode generator + (lib.cmakeFeature "CMAKE_OSX_DEPLOYMENT_TARGET" "${stdenv.hostPlatform.darwinMinVersion}") + ]; + # Crashes can happen, we'd like them to be reasonably debuggable cmakeBuildType = "RelWithDebInfo"; dontStrip = true; From 94c85b301d8fcb9e7defc382833aec690ab499d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Thu, 23 Jan 2025 07:47:47 -0300 Subject: [PATCH 21/64] connman-gtk: fix FTBFS with GCC-14 (incompatible pointer types) GCC-14 no longer allows implicitly casting all pointer types to all other pointer types. This now causes an error when compiling src/status.c. Therefore, explicitly cast the first argument in gtk_widget_set_sensitive() call to GTK_WIDGET, which is what it expects. --- pkgs/by-name/co/connman-gtk/package.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/by-name/co/connman-gtk/package.nix b/pkgs/by-name/co/connman-gtk/package.nix index 9475a30d849f..fb784c8aae7a 100644 --- a/pkgs/by-name/co/connman-gtk/package.nix +++ b/pkgs/by-name/co/connman-gtk/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, autoconf, automake, intltool, @@ -37,6 +38,13 @@ stdenv.mkDerivation rec { connman ]; + patches = [ + (fetchpatch { + url = "https://salsa.debian.org/nickm/connman-gtk/-/raw/ef01b52fa02c5cca199b2e47c0cf360691266fd8/debian/patches/incompatible-pointer-type"; + hash = "sha256-T+N9FfDyROBA4/HLK+l/fpnju2imDU4y6nGSbF+JDiA="; + }) + ]; + preConfigure = '' # m4/intltool.m4 is an invalid symbolic link rm m4/intltool.m4 From 650cc76728dd3f69c356ed6197606ed1788af363 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 Jan 2025 01:16:31 +0000 Subject: [PATCH 22/64] fly: 7.12.0 -> 7.12.1 --- pkgs/by-name/fl/fly/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fl/fly/package.nix b/pkgs/by-name/fl/fly/package.nix index 67e3f25c2e01..79ad4b5c6899 100644 --- a/pkgs/by-name/fl/fly/package.nix +++ b/pkgs/by-name/fl/fly/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "fly"; - version = "7.12.0"; + version = "7.12.1"; src = fetchFromGitHub { owner = "concourse"; repo = "concourse"; rev = "v${version}"; - hash = "sha256-lAx9TZVRkPMa5swB74zI0xJ7pbRDApZoens747XcuJk="; + hash = "sha256-3RsFtU2C3XxBddyW5liAwia9I7Fc8f2+TsziiJy6rHg="; }; - vendorHash = "sha256-dXjee2rZn1lVEmL8Cy8rrdpSX1OpS9GHKZo53ur3kew="; + vendorHash = "sha256-up77TV/A/C39LjgQ+1uQExWfMlbruLhY3H6820cRnt0="; subPackages = [ "fly" ]; From 7499313bab33e6d3b42d2d01a4a55bac2934076b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 Jan 2025 01:17:15 +0000 Subject: [PATCH 23/64] qtcreator: 15.0.0 -> 15.0.1 --- pkgs/development/tools/qtcreator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/qtcreator/default.nix b/pkgs/development/tools/qtcreator/default.nix index aed03b72322a..69a6961b55c0 100644 --- a/pkgs/development/tools/qtcreator/default.nix +++ b/pkgs/development/tools/qtcreator/default.nix @@ -31,11 +31,11 @@ stdenv.mkDerivation rec { pname = "qtcreator"; - version = "15.0.0"; + version = "15.0.1"; src = fetchurl { url = "mirror://qt/official_releases/${pname}/${lib.versions.majorMinor version}/${version}/qt-creator-opensource-src-${version}.tar.xz"; - hash = "sha256-I7HGtHjKdgmX7N3Uxyjw2igLBpYAipvd2aEGjxbUj3I="; + hash = "sha256-dDutW7417X9QCffOFh8dovJsF7tRMUc+BhzmWzp64JM="; }; nativeBuildInputs = [ From 26f9a8662c21aa6aae5e5add58457c4fbbeb1356 Mon Sep 17 00:00:00 2001 From: Keto Date: Thu, 23 Jan 2025 22:15:00 -0500 Subject: [PATCH 24/64] tre: 0.8.0 -> 0.9.0 --- pkgs/by-name/tr/tre/package.nix | 51 ++++++++++++++++++++++++--------- 1 file changed, 38 insertions(+), 13 deletions(-) diff --git a/pkgs/by-name/tr/tre/package.nix b/pkgs/by-name/tr/tre/package.nix index e016e510e841..969b17817d71 100644 --- a/pkgs/by-name/tr/tre/package.nix +++ b/pkgs/by-name/tr/tre/package.nix @@ -1,30 +1,55 @@ { lib, stdenv, - fetchurl, - fetchpatch, + fetchFromGitHub, + autoconf, + automake, + darwin, + gettext, + libiconv, + libtool, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "tre"; - version = "0.8.0"; - src = fetchurl { - url = "https://laurikari.net/tre/${pname}-${version}.tar.gz"; - sha256 = "1pd7qsa7vc3ybdc6h2gr4pm9inypjysf92kab945gg4qa6jp11my"; + version = "0.9.0"; + + src = fetchFromGitHub { + owner = "laurikari"; + repo = "tre"; + tag = "v${finalAttrs.version}"; + hash = "sha256-5O8yqzv+SR8x0X7GtC2Pjo94gp0799M2Va8wJ4EKyf8="; }; - patches = [ - (fetchpatch { - url = "https://sources.debian.net/data/main/t/tre/0.8.0-6/debian/patches/03-cve-2016-8859"; - sha256 = "0navhizym6qxd4gngrsslbij8x9r3s67p1jzzhvsnq6ky49j7w3p"; - }) + outputs = [ + "out" + "dev" ]; + nativeBuildInputs = [ + autoconf + automake + libtool + ]; + + buildInputs = + [ + gettext + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + libiconv + ]; + + preConfigure = '' + ./utils/autogen.sh + ''; + meta = { description = "Lightweight and robust POSIX compliant regexp matching library"; homepage = "https://laurikari.net/tre/"; + changelog = "https://github.com/laurikari/tre/releases/tag/v${finalAttrs.version}"; license = lib.licenses.bsd2; mainProgram = "agrep"; platforms = lib.platforms.unix; }; -} +}) From 79c83d718e892756d40f7aaf2f712b345558e34e Mon Sep 17 00:00:00 2001 From: Mel Date: Tue, 29 Oct 2024 23:00:41 +0100 Subject: [PATCH 25/64] ycmd: correct gopls package and link path This fixes built-in Go completion support in vimPlugins.YouCompleteMe. Previously both an outdated package (gotools) and an outdated binary path were used when installing gopls into ycmd, silently breaking after an upstream update. Signed-off-by: Mel --- pkgs/by-name/yc/ycmd/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/yc/ycmd/package.nix b/pkgs/by-name/yc/ycmd/package.nix index 590055955881..92262a993b27 100644 --- a/pkgs/by-name/yc/ycmd/package.nix +++ b/pkgs/by-name/yc/ycmd/package.nix @@ -6,8 +6,8 @@ , python , withGodef ? true , godef -, withGotools ? true -, gotools +, withGopls ? true +, gopls , withRustAnalyzer ? true , rust-analyzer , withTypescript ? true @@ -80,10 +80,10 @@ stdenv.mkDerivation { TARGET=$out/lib/ycmd/third_party/godef mkdir -p $TARGET ln -sf ${godef}/bin/godef $TARGET - '' + lib.optionalString withGotools '' - TARGET=$out/lib/ycmd/third_party/go/src/golang.org/x/tools/cmd/gopls + '' + lib.optionalString withGopls '' + TARGET=$out/lib/ycmd/third_party/go/bin mkdir -p $TARGET - ln -sf ${gotools}/bin/gopls $TARGET + ln -sf ${gopls}/bin/gopls $TARGET '' + lib.optionalString withRustAnalyzer '' TARGET=$out/lib/ycmd/third_party/rust-analyzer mkdir -p $TARGET From 3e90066ad3276c9dc1599568ec0cd91cdb51f477 Mon Sep 17 00:00:00 2001 From: Mel Date: Thu, 31 Oct 2024 20:10:15 +0100 Subject: [PATCH 26/64] maintainers: add mel Signed-off-by: Mel --- maintainers/maintainer-list.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index ddecf2a644bd..a26e5c1c7106 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -14701,6 +14701,14 @@ githubId = 8263431; name = "Matt Miemiec"; }; + mel = { + email = "mel@rnrd.eu"; + github = "melnary"; + githubId = 10659529; + matrix = "@mel:rnrd.eu"; + name = "Mel G."; + keys = [ { fingerprint = "D75A C286 ACA7 00B4 D8EC 377D 2082 F8EC 11CC 009B"; } ]; + }; melchips = { email = "truphemus.francois@gmail.com"; github = "melchips"; From 852e6fd7234e819d8a914c1e76027bc10b0a43f9 Mon Sep 17 00:00:00 2001 From: Mel Date: Thu, 31 Oct 2024 20:16:07 +0100 Subject: [PATCH 27/64] ycmd: replace maintainer siriobalmelli with mel Signed-off-by: Mel --- pkgs/by-name/yc/ycmd/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/yc/ycmd/package.nix b/pkgs/by-name/yc/ycmd/package.nix index 92262a993b27..1484fd64239c 100644 --- a/pkgs/by-name/yc/ycmd/package.nix +++ b/pkgs/by-name/yc/ycmd/package.nix @@ -105,7 +105,7 @@ stdenv.mkDerivation { mainProgram = "ycmd"; homepage = "https://github.com/ycm-core/ycmd"; license = licenses.gpl3; - maintainers = with maintainers; [ rasendubi lnl7 siriobalmelli ]; + maintainers = with maintainers; [ rasendubi lnl7 mel ]; platforms = platforms.all; }; } From 11de0087000d07297df8de28638eb0b7e610b7e4 Mon Sep 17 00:00:00 2001 From: Mel Date: Thu, 31 Oct 2024 20:18:26 +0100 Subject: [PATCH 28/64] vimPlugins.YouCompleteMe: add mel as maintainer Signed-off-by: Mel --- pkgs/applications/editors/vim/plugins/overrides.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index b97ec9349a3b..1b682954f6c1 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -3822,6 +3822,7 @@ in maintainers = with maintainers; [ marcweber jagajaga + mel ]; platforms = platforms.unix; }; From a22a31150802809cadcc6faa55ba369d12aef77d Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Mon, 20 Jan 2025 21:06:08 +0800 Subject: [PATCH 29/64] ecapture: 0.9.2 -> 0.9.3 --- pkgs/by-name/ec/ecapture/package.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ec/ecapture/package.nix b/pkgs/by-name/ec/ecapture/package.nix index 091c65abdaf4..c28ba718d735 100644 --- a/pkgs/by-name/ec/ecapture/package.nix +++ b/pkgs/by-name/ec/ecapture/package.nix @@ -16,18 +16,19 @@ mariadb, openssl, bash, + zsh, nix-update-script, }: buildGoModule rec { pname = "ecapture"; - version = "0.9.2"; + version = "0.9.3"; src = fetchFromGitHub { owner = "gojue"; repo = "ecapture"; tag = "v${version}"; - hash = "sha256-UPWREeyB2YLYU3B4Rxr5oPoOfksL/lnllWyaFxhAe/0="; + hash = "sha256-nqNFbZrmCleWcRM2HsbgmCHqsar3KmiGYxt55ZqhY+U="; fetchSubmodules = true; }; @@ -73,6 +74,12 @@ buildGoModule rec { substituteInPlace user/config/config_nspr_linux.go \ --replace-fail '/usr/lib/firefox/libnspr4.so' '${lib.getLib nspr}/lib/libnspr4.so' + substituteInPlace user/config/config_zsh.go \ + --replace-fail '/bin/zsh' '${lib.getExe zsh}' + + substituteInPlace user/module/probe_zsh.go \ + --replace-fail '/bin/zsh' '${lib.getExe zsh}' + substituteInPlace cli/cmd/postgres.go \ --replace-fail '/usr/bin/postgres' '${postgresql}/bin/postgres' From 8d0549c6bbc1b5b13bd507b12794f19d7812679b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 Jan 2025 05:41:04 +0000 Subject: [PATCH 30/64] myks: 4.3.0 -> 4.3.1 --- pkgs/by-name/my/myks/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/my/myks/package.nix b/pkgs/by-name/my/myks/package.nix index a128c63adce0..b8f1af9891cb 100644 --- a/pkgs/by-name/my/myks/package.nix +++ b/pkgs/by-name/my/myks/package.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "myks"; - version = "4.3.0"; + version = "4.3.1"; src = fetchFromGitHub { owner = "mykso"; repo = "myks"; tag = "v${version}"; - hash = "sha256-r8OT5cbHicJVAVIJ9cfDHPLcJrZGPVYdZ42Sbvu8Jvc="; + hash = "sha256-KTz6Tip6kz8AcRW73+MUHUvwr/QT9Z2CvHQNyFXD054="; }; - vendorHash = "sha256-LmWuztR6X3x0aOYCqRv3aLiFEZQkaSnh3LT7IOu2Xa0="; + vendorHash = "sha256-cTRyQu3lXrIrBHtEYYQIdv0F705KrgyXgDS8meHVRJw="; subPackages = "."; From 079e535f8c961dfa4bc4dd0b3c2cfd9af24d2c9f Mon Sep 17 00:00:00 2001 From: misilelab Date: Fri, 24 Jan 2025 14:47:45 +0900 Subject: [PATCH 31/64] uv: 0.5.23 -> 0.5.24 Signed-off-by: misilelab --- pkgs/by-name/uv/uv/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/uv/uv/package.nix b/pkgs/by-name/uv/uv/package.nix index e87d91e0cc3d..5d44a274a3d5 100644 --- a/pkgs/by-name/uv/uv/package.nix +++ b/pkgs/by-name/uv/uv/package.nix @@ -17,17 +17,17 @@ rustPlatform.buildRustPackage rec { pname = "uv"; - version = "0.5.23"; + version = "0.5.24"; src = fetchFromGitHub { owner = "astral-sh"; repo = "uv"; tag = version; - hash = "sha256-0uYAokw9hjgI+eU/1GrWdCDtFl1qWqkhvh+1qjeGSCQ="; + hash = "sha256-a4SemtzExhQing7CKjNvakoZSkI7wX01JPz4xWwEraQ="; }; useFetchCargoVendor = true; - cargoHash = "sha256-yv5asWS6XLI22Z1kkGB6xJ6XFFMfOvFYcvvFvjRu8D4="; + cargoHash = "sha256-UdS3SiviF3j3XUd1hUD9eIurKaC9ZX7DrvvE158zS5w="; nativeBuildInputs = [ cmake From c0280fbae450a245e149da20510b797a383ac6dd Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 24 Jan 2025 07:53:29 +0100 Subject: [PATCH 32/64] systemctl-tui: 0.3.10 -> 0.4.0 Diff: https://github.com/rgwood/systemctl-tui/compare/refs/tags/v0.3.10...v0.4.0 Changelog: https://github.com/rgwood/systemctl-tui/releases/tag/v0.4.0 --- pkgs/by-name/sy/systemctl-tui/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sy/systemctl-tui/package.nix b/pkgs/by-name/sy/systemctl-tui/package.nix index 8a1d05f3338c..3cd1dab47fe9 100644 --- a/pkgs/by-name/sy/systemctl-tui/package.nix +++ b/pkgs/by-name/sy/systemctl-tui/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "systemctl-tui"; - version = "0.3.10"; + version = "0.4.0"; src = fetchFromGitHub { owner = "rgwood"; repo = "systemctl-tui"; tag = "v${version}"; - hash = "sha256-7I4PM4ZQVtDESfchX0/HGu0Y94BxMCLNIrPw8bSokCQ="; + hash = "sha256-1KYaw4q1+dPHImjjCnUPXNu7ihdEfNuzQfHfPi1uDOw="; }; - cargoHash = "sha256-Ur1/3AAN55doW8xyeoeuU6C1KvjTQQjooCl9WVDAGuM="; + cargoHash = "sha256-QogpwX/s2469h24WO9B84D4ezHD0Rln5lt8naUAZ5rY="; nativeInstallCheckInputs = [ versionCheckHook From cb4ebf996d1c69f428490d4ecb8b23b44b237439 Mon Sep 17 00:00:00 2001 From: "\"Gaetan Lepage\"" <"gaetan@glepage.com"> Date: Fri, 24 Jan 2025 08:02:00 +0100 Subject: [PATCH 33/64] vimPlugins.hlchunk-nvim: init at 2024-11-23 --- .../applications/editors/vim/plugins/generated.nix | 14 +++++++++++++- .../editors/vim/plugins/vim-plugin-names | 1 + 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index af82ec225bc4..61d5aea42d93 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -5219,6 +5219,18 @@ final: prev: meta.homepage = "https://github.com/pimalaya/himalaya-vim/"; }; + hlchunk-nvim = buildVimPlugin { + pname = "hlchunk.nvim"; + version = "2024-11-23"; + src = fetchFromGitHub { + owner = "shellRaining"; + repo = "hlchunk.nvim"; + rev = "5465dd33ade8676d63f6e8493252283060cd72ca"; + sha256 = "0vksi1idliaxk5l3hksfhhbps4sw6d8lk58m5ja4wrnmjxz5b5bz"; + }; + meta.homepage = "https://github.com/shellRaining/hlchunk.nvim/"; + }; + hlint-refactor-vim = buildVimPlugin { pname = "hlint-refactor-vim"; version = "2015-12-05"; @@ -10458,7 +10470,7 @@ final: prev: meta.homepage = "https://github.com/salkin-mada/openscad.nvim/"; }; - orgmode = buildVimPlugin { + orgmode = buildNeovimPlugin { pname = "orgmode"; version = "2025-01-19"; src = fetchFromGitHub { diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 0a373bd6064a..79b1ab4364e7 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -432,6 +432,7 @@ https://github.com/RaafatTurki/hex.nvim/,HEAD, https://github.com/Yggdroot/hiPairs/,, https://github.com/tzachar/highlight-undo.nvim/,HEAD, https://github.com/pimalaya/himalaya-vim/,, +https://github.com/shellRaining/hlchunk.nvim/,HEAD, https://github.com/mpickering/hlint-refactor-vim/,, https://github.com/calops/hmts.nvim/,, https://github.com/edluffy/hologram.nvim/,, From 5aa4b7f130351c016a552436293ea5c2243b4558 Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Sun, 19 Jan 2025 17:12:51 +0800 Subject: [PATCH 34/64] python313Packages.sigstore-rekor-types: add bot-wxt1221 as maintainers --- .../python-modules/sigstore-rekor-types/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/sigstore-rekor-types/default.nix b/pkgs/development/python-modules/sigstore-rekor-types/default.nix index ba523fe259a1..d1a46c8b5d24 100644 --- a/pkgs/development/python-modules/sigstore-rekor-types/default.nix +++ b/pkgs/development/python-modules/sigstore-rekor-types/default.nix @@ -28,11 +28,14 @@ buildPythonPackage rec { # Module has no tests doCheck = false; - meta = with lib; { + meta = { description = "Python models for Rekor's API types"; homepage = "https://github.com/trailofbits/sigstore-rekor-types"; changelog = "https://github.com/trailofbits/sigstore-rekor-types/releases/tag/v${version}"; - license = licenses.asl20; - maintainers = with maintainers; [ fab ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ + fab + bot-wxt1221 + ]; }; } From e9f010a47e73470b5678630b8cb9c199246a3fc6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Thu, 23 Jan 2025 08:50:11 -0600 Subject: [PATCH 35/64] linux/hardened/patches/5.10: v5.10.232-hardened1 -> v5.10.233-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 2344057f8241..cee911741d96 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -2,12 +2,12 @@ "5.10": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-v5.10.232-hardened1.patch", - "sha256": "1bfhnj6k65q6kjlxbxqfzq2l81dvbfdc4khn7n0zp6vm37a34c74", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/v5.10.232-hardened1/linux-hardened-v5.10.232-hardened1.patch" + "name": "linux-hardened-v5.10.233-hardened1.patch", + "sha256": "1dchzjp4dvdla2mpac8bk6cj4ymx2vkwllck9wvlsbi15897a50y", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/v5.10.233-hardened1/linux-hardened-v5.10.233-hardened1.patch" }, - "sha256": "1w5ycdh24j4gsjc2zk7nhbmya59vhi49lbh8333ziprqlj4lb97x", - "version": "5.10.232" + "sha256": "0lkz2g8r032f027j3gih3f7crx991mrpng9qgqc5k4cc1wl5g7i3", + "version": "5.10.233" }, "5.15": { "patch": { From 8a2fcf15bc49fb95972c43db93078faffacb699a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Thu, 23 Jan 2025 08:50:15 -0600 Subject: [PATCH 36/64] linux/hardened/patches/5.15: v5.15.175-hardened1 -> v5.15.176-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index cee911741d96..0334b8a99018 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -12,12 +12,12 @@ "5.15": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-v5.15.175-hardened1.patch", - "sha256": "1j7z487n26jd8npylddflpdksrwk7b7xck2gblsd1rp1zgpd0q4g", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/v5.15.175-hardened1/linux-hardened-v5.15.175-hardened1.patch" + "name": "linux-hardened-v5.15.176-hardened1.patch", + "sha256": "10r86rxixrvclzfpzp449ry7j79gr0n75zvh4x9bzr1860f0mha6", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/v5.15.176-hardened1/linux-hardened-v5.15.176-hardened1.patch" }, - "sha256": "1l59x1f1b29mayhzxxkh9vlba41h51mmfh1vram31bks1v4bpn4g", - "version": "5.15.175" + "sha256": "1cfk55469swywnf4r6pl7b3njxws8w3np81r99f0wnlaihrbajm8", + "version": "5.15.176" }, "5.4": { "patch": { From f34c39dfdcbdf7996831618cc08f733d05a62eb8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Thu, 23 Jan 2025 08:50:21 -0600 Subject: [PATCH 37/64] linux/hardened/patches/5.4: v5.4.288-hardened1 -> v5.4.289-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 0334b8a99018..a74307024df7 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -22,12 +22,12 @@ "5.4": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-v5.4.288-hardened1.patch", - "sha256": "0zqc0xblfy2rj1n8mr2q07apcq1rmqshsi15881df4ml5lkq4y62", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/v5.4.288-hardened1/linux-hardened-v5.4.288-hardened1.patch" + "name": "linux-hardened-v5.4.289-hardened1.patch", + "sha256": "1gg4awiiggks5biyhkqdlxm7xxkpd754lxibflk3nwfj1rs44iwn", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/v5.4.289-hardened1/linux-hardened-v5.4.289-hardened1.patch" }, - "sha256": "1zhsb6gwhb6cvijzh7s8rnm4b06klyhb2mxb06gcyfvj0givlvw7", - "version": "5.4.288" + "sha256": "043dl195h06hs3zdjd6j1m1zgvmky3s0plrpma75zqf8ab05yghy", + "version": "5.4.289" }, "6.1": { "patch": { From e7de0bb2c74de2104e77dc6a94eaf64b5594202f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Thu, 23 Jan 2025 08:50:26 -0600 Subject: [PATCH 38/64] linux/hardened/patches/6.1: v6.1.123-hardened1 -> v6.1.126-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index a74307024df7..9e531c024ba6 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -32,12 +32,12 @@ "6.1": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-v6.1.123-hardened1.patch", - "sha256": "0ara8rw6l77wfsc0ccz74q22693dhbj7pxw7k12i2an3vy10y16j", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.1.123-hardened1/linux-hardened-v6.1.123-hardened1.patch" + "name": "linux-hardened-v6.1.126-hardened1.patch", + "sha256": "096bchjy9n7q48r7xzzky9pmicdzz9pvmg5sk6943s4q5icrhi6s", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.1.126-hardened1/linux-hardened-v6.1.126-hardened1.patch" }, - "sha256": "1g5k9q113nyid3a347abb36v2xfv5vf74ic88af7kf04kzbsr9rk", - "version": "6.1.123" + "sha256": "140pprw2fkyz9qi5wnhi0yzpj65lzwi3zbmnvsk2yhgc9arj06f9", + "version": "6.1.126" }, "6.11": { "patch": { From a54bf0759e9a762c101e8556de3809f522de139d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Thu, 23 Jan 2025 08:50:31 -0600 Subject: [PATCH 39/64] linux/hardened/patches/6.12: v6.12.8-hardened1 -> v6.12.10-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 9e531c024ba6..bdd3d30457ef 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -52,12 +52,12 @@ "6.12": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-v6.12.8-hardened1.patch", - "sha256": "1hb2rvf6p1hwqyb5rhgwd9nwkxw1axjg0x47ym453rs6zddxyqlb", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.12.8-hardened1/linux-hardened-v6.12.8-hardened1.patch" + "name": "linux-hardened-v6.12.10-hardened1.patch", + "sha256": "1m48sf0ihzpcj4ca9420rmhrihhchd2qrv86vw8llq3jmv7xqij5", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.12.10-hardened1/linux-hardened-v6.12.10-hardened1.patch" }, - "sha256": "0y992b484rkkaqdkz5mw2is1l0izxhm3cl7fi5f72jx0bh3dm492", - "version": "6.12.8" + "sha256": "15xjjn8ff7g9q0ljr2g8k098ppxnpvxlgv22rdrplls8sxg6wlaa", + "version": "6.12.10" }, "6.6": { "patch": { From 6e267c2538bdbdb917f5eb2d30a7b1391d9bdbf2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Thu, 23 Jan 2025 08:50:36 -0600 Subject: [PATCH 40/64] linux/hardened/patches/6.6: v6.6.69-hardened1 -> v6.6.73-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index bdd3d30457ef..c14ac3ab6357 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -62,11 +62,11 @@ "6.6": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-v6.6.69-hardened1.patch", - "sha256": "06rr4r927sdzlyixs4blwxdgygb5akm76a81px5xj8a754iaws8x", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.6.69-hardened1/linux-hardened-v6.6.69-hardened1.patch" + "name": "linux-hardened-v6.6.73-hardened1.patch", + "sha256": "18jy2acz7gh4f8gqc6ifq1rkgxqlc53wmrhs0m8ndi5p70wswr6v", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.6.73-hardened1/linux-hardened-v6.6.73-hardened1.patch" }, - "sha256": "0d2gilgh8myavzfdjnx7az4dbwvkk7irvsz6rla9bnbmgdb0aqww", - "version": "6.6.69" + "sha256": "141428a3bxks9w5jj17w8jmp7zp90p3v33dyk046a0f2j2qqs0nj", + "version": "6.6.73" } } From 5b961c87be05a5815a66559bbfccfd4c496f788a Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 24 Jan 2025 11:04:28 +0300 Subject: [PATCH 41/64] nixos/tests/installer: add shellcheck-minimal Required after #375961 --- nixos/tests/installer.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index 54224302e008..6be3346d9850 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -734,6 +734,7 @@ let texinfo unionfs-fuse xorg.lndir + shellcheck-minimal # add curl so that rather than seeing the test attempt to download # curl's tarball, we see what it's trying to download From d549d70c786529f4dcb585331d15de9211406900 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 Jan 2025 08:11:47 +0000 Subject: [PATCH 42/64] vimPlugins.sg-nvim: 1.1.0-unstable-2024-12-15 -> 1.1.0-unstable-2025-01-21 --- .../editors/vim/plugins/non-generated/sg-nvim/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/non-generated/sg-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/sg-nvim/default.nix index 05922d1adaad..7a2f1101decc 100644 --- a/pkgs/applications/editors/vim/plugins/non-generated/sg-nvim/default.nix +++ b/pkgs/applications/editors/vim/plugins/non-generated/sg-nvim/default.nix @@ -9,19 +9,19 @@ vimUtils, }: let - version = "1.1.0-unstable-2024-12-15"; + version = "1.1.0-unstable-2025-01-21"; src = fetchFromGitHub { owner = "sourcegraph"; repo = "sg.nvim"; - rev = "7c423ebeb028b3534eb20fe54972825384dbe7d6"; - hash = "sha256-ALAYX/1MTk0fCA8THunoHz8QTlWkg+pgiSp2n3B4KrU="; + rev = "775f22b75a9826eabf69b0094dd1d51d619fe552"; + hash = "sha256-i5g+pzxB8pAORLbr1wlYWUTsrJJmVj9UwlCg8pU3Suw="; }; sg-nvim-rust = rustPlatform.buildRustPackage { pname = "sg-nvim-rust"; inherit version src; - cargoHash = "sha256-t0+0Zw8NjCD1VB1hTrSjOa1130IVanoTALdFoTloFe4="; + cargoHash = "sha256-4GaBrIMPuPOPeMVlDlb9XBe2txeM4196sdZ1r8bu7Kk="; nativeBuildInputs = [ pkg-config ]; From 08274450f1835aeed1c56dcc682498773db6d26e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 Jan 2025 08:23:43 +0000 Subject: [PATCH 43/64] gh-dash: 4.9.0 -> 4.9.1 --- pkgs/by-name/gh/gh-dash/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gh/gh-dash/package.nix b/pkgs/by-name/gh/gh-dash/package.nix index 6b9bf2a6d8a8..568f7f658ba4 100644 --- a/pkgs/by-name/gh/gh-dash/package.nix +++ b/pkgs/by-name/gh/gh-dash/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "gh-dash"; - version = "4.9.0"; + version = "4.9.1"; src = fetchFromGitHub { owner = "dlvhdr"; repo = "gh-dash"; rev = "v${version}"; - hash = "sha256-25Ik5VsTYLssI9u235pBWD1XNABvWCzbXma04pJX2nQ="; + hash = "sha256-n0+I1URuIOKqBj+BSE6bD3wOxpaKWM9t1X3PkPhawKY="; }; vendorHash = "sha256-lqmz+6Cr9U5IBoJ5OeSN6HKY/nKSAmszfvifzbxG7NE="; From 07d2e6f577f8b6169991906eebeaad7ca4aae617 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sat, 18 Jan 2025 14:49:05 +0100 Subject: [PATCH 44/64] python312Packages.jaxlib: 0.4.38 -> 0.5.0 Diff: https://github.com/jax-ml/jax/compare/jaxlib-v0.4.32...jax-v0.5.0 Changelog: https://github.com/jax-ml/jax/releases/tag/jax-v0.5.0 --- .../development/python-modules/jaxlib/bin.nix | 46 ++++++------------- 1 file changed, 13 insertions(+), 33 deletions(-) diff --git a/pkgs/development/python-modules/jaxlib/bin.nix b/pkgs/development/python-modules/jaxlib/bin.nix index dd82358f03b7..7cc8578a01d3 100644 --- a/pkgs/development/python-modules/jaxlib/bin.nix +++ b/pkgs/development/python-modules/jaxlib/bin.nix @@ -18,7 +18,7 @@ }: let - version = "0.4.38"; + version = "0.5.0"; inherit (python) pythonVersion; # As of 2023-06-06, google/jax upstream is no longer publishing CPU-only wheels to their GCS bucket. Instead the @@ -49,85 +49,65 @@ let "3.10-x86_64-linux" = getSrcFromPypi { platform = "manylinux2014_x86_64"; dist = "cp310"; - hash = "sha256-Ya7MuaJ8Z/24RQ9jVyQAGc1FEcudYqROR2R1bThIU60="; + hash = "sha256-dEQLYyEHM2QA1Pl6Fkgddn8T6pFMU7oU5UTG/aVIGbM="; }; "3.10-aarch64-linux" = getSrcFromPypi { platform = "manylinux2014_aarch64"; dist = "cp310"; - hash = "sha256-7hnBY6j98IOdTBi4il+/tOcxunxDdBbT5Ug+Vwu3ZOQ="; + hash = "sha256-Wy7+Pf6/GKhMRR04A6yITuJCAhwRE7J5wT9LvDeMPcA="; }; "3.10-aarch64-darwin" = getSrcFromPypi { platform = "macosx_11_0_arm64"; dist = "cp310"; - hash = "sha256-MLL1LLUNdHNK8vR3wlM6elg+O7eyyKzes2Hud9lAV3o="; - }; - "3.10-x86_64-darwin" = getSrcFromPypi { - platform = "macosx_10_14_x86_64"; - dist = "cp310"; - hash = "sha256-VcGbnT8zpvxZ9kSqWiH7oCY5zN13bLSptVJmJfV4Of8="; + hash = "sha256-G4psQ0XxN/OHZQ3i28SIwgJRt0ErVd1kjhpPE7z1B/s="; }; "3.11-x86_64-linux" = getSrcFromPypi { platform = "manylinux2014_x86_64"; dist = "cp311"; - hash = "sha256-J1H/cDfWqZfQvg53zEvjgcWp+buLMU7bdVwTpv2Wn0U="; + hash = "sha256-CRE+8Vgro018vEQP7bMY9IVbWbd2cRqKuiRzyXJ9MCU="; }; "3.11-aarch64-linux" = getSrcFromPypi { platform = "manylinux2014_aarch64"; dist = "cp311"; - hash = "sha256-Q9tYxMQnYnKWNmpWwQMY4fAPUDaQ4X+Uu0NEKT4ZleA="; + hash = "sha256-YwiNv6qFu1bNUhqSWjRy/XMosY7JPC2P+oWvMxCVyZU="; }; "3.11-aarch64-darwin" = getSrcFromPypi { platform = "macosx_11_0_arm64"; dist = "cp311"; - hash = "sha256-P7DqrnNpFXr+y+rVCq8p5z/936d6IzXXIb2XlPPFEOQ="; - }; - "3.11-x86_64-darwin" = getSrcFromPypi { - platform = "macosx_10_14_x86_64"; - dist = "cp311"; - hash = "sha256-tn/eq9bf7Qi3do873/tSEWAIX4MFZpvRl77vYdCN4Is="; + hash = "sha256-bNdi7RYjEySZ+nAcQgNEYQLgqcgsojGUuHKI90bRKik="; }; "3.12-x86_64-linux" = getSrcFromPypi { platform = "manylinux2014_x86_64"; dist = "cp312"; - hash = "sha256-2tbAqWVnwG0IPARp/sQPIBIQsJk2W9aYvjGm0uyI/Vk="; + hash = "sha256-+YDHM+mMmYqNqHyajMYbZybQvmZ6WL1mTB1xe0tOrnU="; }; "3.12-aarch64-linux" = getSrcFromPypi { platform = "manylinux2014_aarch64"; dist = "cp312"; - hash = "sha256-SW9FsOABojQTCc0MdK8LZwU33O15wWjLIwz8x3PwqoY"; + hash = "sha256-S0sBr7Dd7JbAg1a/8rtoXdvpf9/+Ttbi2DSzCrqXLyI="; }; "3.12-aarch64-darwin" = getSrcFromPypi { platform = "macosx_11_0_arm64"; dist = "cp312"; - hash = "sha256-8zvK/jLJelYuz2iU18QWdMgMCs3t+lQj1Jr1EUcUmHQ="; - }; - "3.12-x86_64-darwin" = getSrcFromPypi { - platform = "macosx_10_14_x86_64"; - dist = "cp312"; - hash = "sha256-P+/qmF8EFYFvO7r9PwOkNwUCde+brJpywTFOFkSsV8E="; + hash = "sha256-c+M1cVdgxW5jUQnWFCZDWl1/RvM2OhFdrqCUJ9XNDv0="; }; "3.13-x86_64-linux" = getSrcFromPypi { platform = "manylinux2014_x86_64"; dist = "cp313"; - hash = "sha256-LOd7qM2pJZpLypevwcci5CkabEY6Y/jTcsbtyFEX1iU="; + hash = "sha256-Ee7wHTfA8cUwYmW3byB/EALRNIDe0uMf1j7HaRLJPKI="; }; "3.13-aarch64-linux" = getSrcFromPypi { platform = "manylinux2014_aarch64"; dist = "cp313"; - hash = "sha256-JIzKN3Hr8ksHD0lwE2TOraM+YTlEWwbHgsylrFrZK/Q="; + hash = "sha256-fZsXp+oZNV1F7Nsv8NtdcHqG8MWoYtlLibRWjWxFMRo="; }; "3.13-aarch64-darwin" = getSrcFromPypi { platform = "macosx_11_0_arm64"; dist = "cp313"; - hash = "sha256-b+MmuK82Y4fdR8zzElg7Kxf+0ScSybdKZIsYoTy9ur8="; - }; - "3.13-x86_64-darwin" = getSrcFromPypi { - platform = "macosx_10_14_x86_64"; - dist = "cp313"; - hash = "sha256-QeVa5YGKiC5XiehI9vFmh6wTK8+7Wl+hFKXRi3jQXy0="; + hash = "sha256-7RjqcWHQOqj9TRtVSUiC8hQg79/qaOXymMSuvPKsPzQ="; }; }; in From cf23a4de665206bb479cb1d92a39e4a07d51fb7a Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sat, 18 Jan 2025 15:07:09 +0100 Subject: [PATCH 45/64] python312Packages.jax-cuda12-pjrt: 0.4.38 -> 0.5.0 --- pkgs/development/python-modules/jax-cuda12-pjrt/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/jax-cuda12-pjrt/default.nix b/pkgs/development/python-modules/jax-cuda12-pjrt/default.nix index 67f5774a2f49..b22e6fc6350f 100644 --- a/pkgs/development/python-modules/jax-cuda12-pjrt/default.nix +++ b/pkgs/development/python-modules/jax-cuda12-pjrt/default.nix @@ -33,7 +33,7 @@ let srcs = { "x86_64-linux" = fetchurl { url = "https://storage.googleapis.com/jax-releases/cuda12_plugin/jax_cuda12_pjrt-${version}-py3-none-manylinux2014_x86_64.whl"; - hash = "sha256-g75MWfvPMAd6YAhdmOfVncc4sckeDWKOSsF3n94VrCs="; + hash = "sha256-0jgzwbiF2WwnZAAOlQUvK1gnx31JLqaPZ+kDoTJlbbs="; }; "aarch64-linux" = fetchurl { url = "https://storage.googleapis.com/jax-releases/cuda12_plugin/jax_cuda12_pjrt-${version}-py3-none-manylinux2014_aarch64.whl"; From 0e3e09ce0bc58553e99f4274524ce2551b790403 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sat, 18 Jan 2025 15:07:19 +0100 Subject: [PATCH 46/64] python312Packages.jax-cuda12-plugin: 0.4.38 -> 0.5.0 --- .../python-modules/jax-cuda12-plugin/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/jax-cuda12-plugin/default.nix b/pkgs/development/python-modules/jax-cuda12-plugin/default.nix index 0b63fac213a1..572ec530f6d3 100644 --- a/pkgs/development/python-modules/jax-cuda12-plugin/default.nix +++ b/pkgs/development/python-modules/jax-cuda12-plugin/default.nix @@ -39,7 +39,7 @@ let "3.10-x86_64-linux" = getSrcFromPypi { platform = "manylinux2014_x86_64"; dist = "cp310"; - hash = "sha256-nULpmc1k3VZ8FJ7Wj3k5K6iGRDZCGLtjbNzvoBl8kv4="; + hash = "sha256-D0Q6azcpjt+weW/NvR+GzoWksIS2vT8fUKT7/Wfe2Gs="; }; "3.10-aarch64-linux" = getSrcFromPypi { platform = "manylinux2014_aarch64"; @@ -49,7 +49,7 @@ let "3.11-x86_64-linux" = getSrcFromPypi { platform = "manylinux2014_x86_64"; dist = "cp311"; - hash = "sha256-cEZUOG8OYAoCgdquqViCqmekfttoOTthsbFzx+jKdKg="; + hash = "sha256-qYE1oCIwZLj1xoU+It3BpOOGIVLTf7aF8Nve/+DIASI="; }; "3.11-aarch64-linux" = getSrcFromPypi { platform = "manylinux2014_aarch64"; @@ -59,7 +59,7 @@ let "3.12-x86_64-linux" = getSrcFromPypi { platform = "manylinux2014_x86_64"; dist = "cp312"; - hash = "sha256-Ufas/3Ew63LrsCU039NYGg9eoGlx3lLX68Ia1Nh/5x4="; + hash = "sha256-QwWN/FZdjJ2mn0fNTkuVxJXxaG8onvRYTCtygD5vFgc="; }; "3.12-aarch64-linux" = getSrcFromPypi { platform = "manylinux2014_aarch64"; @@ -69,7 +69,7 @@ let "3.13-x86_64-linux" = getSrcFromPypi { platform = "manylinux2014_x86_64"; dist = "cp313"; - hash = "sha256-CSKKTCtEO3aozZqOwikGAInEzINuBiSWh1ptb9xm0x8="; + hash = "sha256-3zbEsXbi01qCqfOM13zDadJx5gBR43GgqO9FFD+PWLY="; }; "3.13-aarch64-linux" = getSrcFromPypi { platform = "manylinux2014_aarch64"; From 1be61a4d0fd9f821318bf6a6aa8a82a5a9447b0c Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sat, 18 Jan 2025 14:49:10 +0100 Subject: [PATCH 47/64] python312Packages.jax: 0.4.38 -> 0.5.0 Diff: https://github.com/jax-ml/jax/compare/jaxlib-v0.4.32...jax-v0.5.0 Changelog: https://github.com/jax-ml/jax/releases/tag/jax-v0.5.0 --- pkgs/development/python-modules/jax/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jax/default.nix b/pkgs/development/python-modules/jax/default.nix index 99154a8ea86a..7c83e9be3a12 100644 --- a/pkgs/development/python-modules/jax/default.nix +++ b/pkgs/development/python-modules/jax/default.nix @@ -40,7 +40,7 @@ let in buildPythonPackage rec { pname = "jax"; - version = "0.4.38"; + version = "0.5.0"; pyproject = true; src = fetchFromGitHub { @@ -48,7 +48,7 @@ buildPythonPackage rec { repo = "jax"; # google/jax contains tags for jax and jaxlib. Only use jax tags! tag = "jax-v${version}"; - hash = "sha256-H8I9Mkz6Ia1RxJmnuJOSevLGHN2J8ey59ZTlFx8YfnA="; + hash = "sha256-D6n9Z34nrCbBd9IS8YW6uio5Yi9GLCo9PViO3YYbkQ8="; }; build-system = [ setuptools ]; @@ -154,6 +154,7 @@ buildPythonPackage rec { "testInAxesPyTreePrefixMismatchErrorKwargs" "testOutAxesPyTreePrefixMismatchError" "test_tree_map" + "test_tree_prefix_error" "test_vjp_rule_inconsistent_pytree_structures_error" "test_vmap_in_axes_tree_prefix_error" "test_vmap_mismatched_axis_sizes_error_message_issue_705" From 17ea2a7abfdc7ac089001659179237e80fe4831b Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 23 Jan 2025 16:01:28 +0100 Subject: [PATCH 48/64] python312Packages.flax: skip failing tests --- pkgs/development/python-modules/flax/default.nix | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/flax/default.nix b/pkgs/development/python-modules/flax/default.nix index ec9b429b8931..e82e53219bc3 100644 --- a/pkgs/development/python-modules/flax/default.nix +++ b/pkgs/development/python-modules/flax/default.nix @@ -102,19 +102,15 @@ buildPythonPackage rec { "flax/nnx/examples/*" # See https://github.com/google/flax/issues/3232. "tests/jax_utils_test.py" - # Too old version of tensorflow: - # ModuleNotFoundError: No module named 'keras.api._v2' - "tests/tensorboard_test.py" ]; disabledTests = [ - # ValueError: Checkpoint path should be absolute - "test_overwrite_checkpoints0" - # Fixed in more recent versions of jax: https://github.com/google/flax/issues/4211 - # TODO: Re-enable when jax>0.4.28 will be available in nixpkgs - "test_vmap_and_cond_passthrough" # ValueError: vmap has mapped output but out_axes is None - "test_vmap_and_cond_passthrough_error" # AssertionError: "at vmap.*'broadcast'.*got axis spec ... + # Failing with AssertionError since the jax update to 0.5.0 + "test_basic_demo_single" + "test_batch_norm_multi_init" + "test_multimetric" + "test_split_merge" ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # SystemError: nanobind::detail::nb_func_error_except(): exception could not be translated! From 01f1d45ff8d95aa082d520fb466c447c49622df5 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 24 Jan 2025 09:37:48 +0100 Subject: [PATCH 49/64] python312Packages.numpyro: skip newly failing tests --- .../python-modules/numpyro/default.nix | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/pkgs/development/python-modules/numpyro/default.nix b/pkgs/development/python-modules/numpyro/default.nix index 89d0c2e0d18b..8decec762030 100644 --- a/pkgs/development/python-modules/numpyro/default.nix +++ b/pkgs/development/python-modules/numpyro/default.nix @@ -90,6 +90,30 @@ buildPythonPackage rec { "test_kl_dirichlet_dirichlet" "test_kl_univariate" "test_mean_var" + # since jax update to 0.5.0 + "test_analytic_kl_2" + "test_analytic_kl_3" + "test_apply_kernel" + "test_beta_bernoulli" + "test_biject_to" + "test_bijective_transforms" + "test_change_point_x64" + "test_cholesky_update" + "test_dais_vae" + "test_discrete_gibbs_multiple_sites_chain" + "test_entropy_categorical" + "test_gaussian_model" + "test_get_proposal_loc_and_scale" + "test_guide_plate_contraction" + "test_kernel_forward" + "test_laplace_approximation_warning" + "test_log_prob_gradient" + "test_logistic_regression" + "test_logistic_regression_x64" + "test_scale" + "test_scan_svi" + "test_stein_particle_loss" + "test_weight_convergence" # Tests want to download data "data_load" From 3372e9a22ef2b6c7e10cf235ff9018d44b75e5fb Mon Sep 17 00:00:00 2001 From: Carl Date: Fri, 24 Jan 2025 10:23:17 +0100 Subject: [PATCH 50/64] OpenTofu: sanity check withPlugins override (#376262) --- pkgs/by-name/op/opentofu/package.nix | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/op/opentofu/package.nix b/pkgs/by-name/op/opentofu/package.nix index 29f009ac5624..85d9952b8c52 100644 --- a/pkgs/by-name/op/opentofu/package.nix +++ b/pkgs/by-name/op/opentofu/package.nix @@ -112,15 +112,21 @@ let provider: if provider ? override then # use opentofu plugin registry over terraform's - provider.override (oldArgs: { - provider-source-address = - lib.replaceStrings - [ "https://registry.terraform.io/providers" ] - [ - "registry.opentofu.org" - ] - oldArgs.homepage; - }) + provider.override ( + oldArgs: + if (builtins.hasAttr "homepage" oldArgs) then + { + provider-source-address = + lib.replaceStrings + [ "https://registry.terraform.io/providers" ] + [ + "registry.opentofu.org" + ] + oldArgs.homepage; + } + else + { } + ) else provider ) (plugins package.plugins); From a1009efabf319a3c83995eb3390ca1c83223102f Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Sun, 19 Jan 2025 17:13:41 +0800 Subject: [PATCH 51/64] python313Packages.rfc3161-client: init at 1.0.0 --- .../python-modules/rfc3161-client/default.nix | 52 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 54 insertions(+) create mode 100644 pkgs/development/python-modules/rfc3161-client/default.nix diff --git a/pkgs/development/python-modules/rfc3161-client/default.nix b/pkgs/development/python-modules/rfc3161-client/default.nix new file mode 100644 index 000000000000..6d56846dbee0 --- /dev/null +++ b/pkgs/development/python-modules/rfc3161-client/default.nix @@ -0,0 +1,52 @@ +{ + buildPythonPackage, + lib, + fetchFromGitHub, + perl, + cryptography, + rustPlatform, + pretend, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "rfc3161-client"; + version = "1.0.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "trailofbits"; + repo = "rfc3161-client"; + tag = "v${version}"; + hash = "sha256-fdNpM5fQnvwBgeL/adIb74pywtK6+8dLxc6kIVgCOCw="; + }; + + cargoDeps = rustPlatform.fetchCargoVendor { + inherit src pname; + hash = "sha256-jpysrco+dybMwiKOa21uLKqsOeYFFERL7XKND7gPwX8="; + }; + + nativeBuildInputs = [ + rustPlatform.cargoSetupHook + rustPlatform.maturinBuildHook + perl + ]; + + dependencies = [ + cryptography + pretend + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + meta = { + homepage = "https://github.com/trailofbits/rfc3161-client"; + maintainers = with lib.maintainers; [ bot-wxt1221 ]; + license = lib.licenses.asl20; + platforms = lib.platforms.all; + changelog = "https://github.com/trailofbits/rfc3161-client/releases/tag/v${version}"; + description = "Opinionated Python RFC3161 Client"; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 54ea65a96643..ff3cd8bb7b51 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -14144,6 +14144,8 @@ self: super: with self; { reverse-geocode = callPackage ../development/python-modules/reverse-geocode { }; + rfc3161-client = callPackage ../development/python-modules/rfc3161-client { }; + rfc3339 = callPackage ../development/python-modules/rfc3339 { }; rfc3339-validator = callPackage ../development/python-modules/rfc3339-validator { }; From 483e9f80b54ce68681b136553fb4381d0b8f8b35 Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Sun, 19 Jan 2025 17:41:07 +0800 Subject: [PATCH 52/64] python313Packages.betterproto: fix build --- .../python-modules/betterproto/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/betterproto/default.nix b/pkgs/development/python-modules/betterproto/default.nix index 48db179f7240..6eb47812b1df 100644 --- a/pkgs/development/python-modules/betterproto/default.nix +++ b/pkgs/development/python-modules/betterproto/default.nix @@ -33,6 +33,11 @@ buildPythonPackage rec { hash = "sha256-ZuVq4WERXsRFUPNNTNp/eisWX1MyI7UtwqEI8X93wYI="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "poetry-core>=1.0.0,<2" "poetry-core" + ''; + build-system = [ poetry-core ]; dependencies = [ @@ -78,7 +83,7 @@ buildPythonPackage rec { "test_binary_compatibility" ]; - meta = with lib; { + meta = { description = "Code generator & library for Protobuf 3 and async gRPC"; mainProgram = "protoc-gen-python_betterproto"; longDescription = '' @@ -88,7 +93,7 @@ buildPythonPackage rec { ''; homepage = "https://github.com/danielgtaylor/python-betterproto"; changelog = "https://github.com/danielgtaylor/python-betterproto/blob/v.${version}/CHANGELOG.md"; - license = licenses.mit; - maintainers = with maintainers; [ nikstur ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ nikstur ]; }; } From be09d1ed947ce4b6b46b5c706a55f3bc2a3d8319 Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Sun, 19 Jan 2025 17:14:01 +0800 Subject: [PATCH 53/64] python313Packages.sigstore: 3.5.3 -> 3.6.1 --- pkgs/development/python-modules/sigstore/default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/sigstore/default.nix b/pkgs/development/python-modules/sigstore/default.nix index f4983e93590c..2bcc833a541a 100644 --- a/pkgs/development/python-modules/sigstore/default.nix +++ b/pkgs/development/python-modules/sigstore/default.nix @@ -19,6 +19,7 @@ securesystemslib, sigstore-protobuf-specs, sigstore-rekor-types, + rfc3161-client, tuf, rfc8785, pyasn1, @@ -27,7 +28,7 @@ buildPythonPackage rec { pname = "sigstore-python"; - version = "3.5.3"; + version = "3.6.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -36,10 +37,13 @@ buildPythonPackage rec { owner = "sigstore"; repo = "sigstore-python"; tag = "v${version}"; - hash = "sha256-pAzS/LU5me3qoJo6EmuSFPDO/lqRDKIl5hjFiysWTdM="; + hash = "sha256-BdVX2LWCsMx9r0bDTJjMdrvy4Hqn6hrw9wAcub0nRMk="; }; - pythonRelaxDeps = [ "sigstore-rekor-types" ]; + pythonRelaxDeps = [ + "sigstore-rekor-types" + "rfc3161-client" + ]; build-system = [ flit-core ]; @@ -53,6 +57,7 @@ buildPythonPackage rec { pyopenssl pyasn1 rfc8785 + rfc3161-client platformdirs requests rich @@ -88,6 +93,7 @@ buildPythonPackage rec { "test_trust_root_bundled_get" "test_fix_bundle_upgrades_bundle" "test_trust_root_tuf_caches_and_requests" + "test_regression_verify_legacy_bundle" ]; passthru.updateScript = nix-update-script { }; From f6ea085167f0833b0b3d0186101797c7026757cd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 Jan 2025 09:52:14 +0000 Subject: [PATCH 54/64] circt: 1.101.0 -> 1.102.0 --- pkgs/by-name/ci/circt/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ci/circt/package.nix b/pkgs/by-name/ci/circt/package.nix index 721ddd3c0ad8..83b1fb8451f1 100644 --- a/pkgs/by-name/ci/circt/package.nix +++ b/pkgs/by-name/ci/circt/package.nix @@ -19,12 +19,12 @@ let in stdenv.mkDerivation rec { pname = "circt"; - version = "1.101.0"; + version = "1.102.0"; src = fetchFromGitHub { owner = "llvm"; repo = "circt"; rev = "firtool-${version}"; - hash = "sha256-4pGdb7CZTYjaGgrwRwI9mtmqJaFY7AwGk36PLASUDFU="; + hash = "sha256-hnmQR9Buu+2z1UkeStVFazbl/czUhV8E7sZrkcPGKFo="; fetchSubmodules = true; }; From cc3d676b47de797192431d5a0c285c4b6d246ce3 Mon Sep 17 00:00:00 2001 From: eljamm Date: Thu, 23 Jan 2025 16:45:19 +0100 Subject: [PATCH 55/64] stract: 0-unstable-2024-09-14 -> 0-unstable-2024-12-11 In the previous version, a fixed-output derivation in the source hash was causing another package to be built instead of stract. This commit updates stract to the latest version, fixing the source and the build of the actual package. --- pkgs/by-name/st/stract/package.nix | 47 +++++++++++++++++++++++++----- 1 file changed, 39 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/st/stract/package.nix b/pkgs/by-name/st/stract/package.nix index ac809562dd9f..d5d583f98f3e 100644 --- a/pkgs/by-name/st/stract/package.nix +++ b/pkgs/by-name/st/stract/package.nix @@ -1,32 +1,63 @@ { lib, + stdenv, fetchFromGitHub, + fetchurl, rustPlatform, pkg-config, + oniguruma, openssl, - curl, + zstd, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage { pname = "stract"; - version = "0-unstable-2024-09-14"; + version = "0-unstable-2024-12-11"; src = fetchFromGitHub { owner = "StractOrg"; repo = "stract"; - rev = "21d28ea86d9ff19ccb4c25b1bdde67e5ec302d79"; - hash = "sha256-7Uvo5+saxwTMQjfDliyOYC6j6LbpMf/FiONfX38xepI="; + rev = "ecb495a66cf6c2f66d817803df38385a3001a38d"; + hash = "sha256-UeIziIihDCjGoz2IdfROnO9/N82S4yextnF4Sbtrn24="; + fetchSubmodules = true; }; - cargoHash = "sha256-7Skbeeev/xBAhlcyOsYpDJB9LnZpT66D0Fu1I/jIBso="; + cargoHash = "sha256-UArPGrcEfFZBOZ4Tv7NraqPzdMtyJXVFsfUM32eSGic="; + useFetchCargoVendor = true; - cargoDepsName = "stract"; nativeBuildInputs = [ pkg-config ]; + buildInputs = [ + oniguruma openssl - curl + zstd ]; + env = { + RUSTONIG_SYSTEM_LIBONIG = true; + ZSTD_SYS_USE_PKG_CONFIG = true; + SWAGGER_UI_DOWNLOAD_URL = + let + # When updating: + # - Look for the version of `utoipa-swagger-ui` at: + # https://github.com/StractOrg/stract/blob//Cargo.toml#L183 + # - Look at the corresponding version of `swagger-ui` at: + # https://github.com/juhaku/utoipa/blob/utoipa-swagger-ui-/utoipa-swagger-ui/build.rs#L21-L22 + swaggerUiVersion = "5.17.12"; + swaggerUi = fetchurl { + url = "https://github.com/swagger-api/swagger-ui/archive/refs/tags/v${swaggerUiVersion}.zip"; + hash = "sha256-HK4z/JI+1yq8BTBJveYXv9bpN/sXru7bn/8g5mf2B/I="; + }; + in + "file://${swaggerUi}"; + }; + + # swagger-ui will once more be copied in the target directory during the check phase + # Not deleting the existing unpacked archive leads to a `PermissionDenied` error + preCheck = '' + rm -rf target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/build/ + ''; + meta = { description = "Open source web search engine hosted at stract.com targeted towards tinkerers and developers."; homepage = "https://github.com/StractOrg/stract"; From f8f19caca1d4df8d139d228891bca0040182f4a0 Mon Sep 17 00:00:00 2001 From: eljamm Date: Thu, 23 Jan 2025 23:16:27 +0100 Subject: [PATCH 56/64] stract: add update script --- pkgs/by-name/st/stract/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/st/stract/package.nix b/pkgs/by-name/st/stract/package.nix index d5d583f98f3e..fac825fe52cb 100644 --- a/pkgs/by-name/st/stract/package.nix +++ b/pkgs/by-name/st/stract/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + unstableGitUpdater, fetchurl, rustPlatform, pkg-config, @@ -58,6 +59,8 @@ rustPlatform.buildRustPackage { rm -rf target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/build/ ''; + passthru.updateScript = unstableGitUpdater { }; + meta = { description = "Open source web search engine hosted at stract.com targeted towards tinkerers and developers."; homepage = "https://github.com/StractOrg/stract"; From 6609b5a3156d0debb7352dcbc7fdce7038f29515 Mon Sep 17 00:00:00 2001 From: eljamm Date: Thu, 23 Jan 2025 16:46:15 +0100 Subject: [PATCH 57/64] stract: add ngi team to maintainers --- pkgs/by-name/st/stract/package.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/st/stract/package.nix b/pkgs/by-name/st/stract/package.nix index fac825fe52cb..671028ddc5fa 100644 --- a/pkgs/by-name/st/stract/package.nix +++ b/pkgs/by-name/st/stract/package.nix @@ -65,6 +65,11 @@ rustPlatform.buildRustPackage { description = "Open source web search engine hosted at stract.com targeted towards tinkerers and developers."; homepage = "https://github.com/StractOrg/stract"; license = lib.licenses.agpl3Only; - maintainers = with lib.maintainers; [ ailsa-sun ]; + maintainers = + with lib.maintainers; + [ + ailsa-sun + ] + ++ lib.teams.ngi.members; }; } From 75d03b45a3977cbe917d882576a76e446d5d0545 Mon Sep 17 00:00:00 2001 From: eljamm Date: Fri, 24 Jan 2025 08:27:02 +0100 Subject: [PATCH 58/64] stract: update meta.description Remove trailing period and move information to a long description for better clarity. --- pkgs/by-name/st/stract/package.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/st/stract/package.nix b/pkgs/by-name/st/stract/package.nix index 671028ddc5fa..bcd2b0fedfe7 100644 --- a/pkgs/by-name/st/stract/package.nix +++ b/pkgs/by-name/st/stract/package.nix @@ -62,7 +62,11 @@ rustPlatform.buildRustPackage { passthru.updateScript = unstableGitUpdater { }; meta = { - description = "Open source web search engine hosted at stract.com targeted towards tinkerers and developers."; + description = "Open source web search engine"; + longDescription = '' + Stract is an open source web search engine targeted towards tinkerers and + developers, with an official instance hosted at stract.com + ''; homepage = "https://github.com/StractOrg/stract"; license = lib.licenses.agpl3Only; maintainers = From dd83dc3f08343f01997f42dd9845f8fc714117b8 Mon Sep 17 00:00:00 2001 From: Charlie Egan Date: Fri, 24 Jan 2025 10:14:02 +0000 Subject: [PATCH 59/64] vimPlugins.llama-vim: init at 2025-01-24 --- pkgs/applications/editors/vim/plugins/generated.nix | 12 ++++++++++++ .../editors/vim/plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 61d5aea42d93..1d08bc253c27 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -6302,6 +6302,18 @@ final: prev: meta.homepage = "https://github.com/smjonas/live-command.nvim/"; }; + llama-vim = buildVimPlugin { + pname = "llama.vim"; + version = "2025-01-24"; + src = fetchFromGitHub { + owner = "ggml-org"; + repo = "llama.vim/"; + rev = "81e6802ebd00f177a8db73d62c7eeaf14a30819a"; + sha256 = "0fcg0xmdjc9z25ssjmg9pl5q0vk1h1k65ipd4dfzxchvmfzirl5j"; + }; + meta.homepage = "https://github.com/ggml-org/llama.vim"; + }; + llm-nvim = buildVimPlugin { pname = "llm.nvim"; version = "2025-01-09"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 79b1ab4364e7..4ebe4530e035 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -522,6 +522,7 @@ https://github.com/ldelossa/litee-filetree.nvim/,, https://github.com/ldelossa/litee-symboltree.nvim/,, https://github.com/ldelossa/litee.nvim/,, https://github.com/smjonas/live-command.nvim/,HEAD, +https://github.com/ggml-org/llama.vim/,HEAD, https://github.com/huggingface/llm.nvim/,HEAD, https://github.com/folke/lsp-colors.nvim/,, https://github.com/lukas-reineke/lsp-format.nvim/,HEAD, From f23503ac99b0fc43684d4641d6e3ce0b7abb19e6 Mon Sep 17 00:00:00 2001 From: Charlie Egan Date: Fri, 24 Jan 2025 10:33:24 +0000 Subject: [PATCH 60/64] vimPlugins.llama-vim: init at 2025-01-24 --- pkgs/applications/editors/vim/plugins/generated.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 1d08bc253c27..6cf9976d9c6f 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -6307,11 +6307,11 @@ final: prev: version = "2025-01-24"; src = fetchFromGitHub { owner = "ggml-org"; - repo = "llama.vim/"; + repo = "llama.vim"; rev = "81e6802ebd00f177a8db73d62c7eeaf14a30819a"; sha256 = "0fcg0xmdjc9z25ssjmg9pl5q0vk1h1k65ipd4dfzxchvmfzirl5j"; }; - meta.homepage = "https://github.com/ggml-org/llama.vim"; + meta.homepage = "https://github.com/ggml-org/llama.vim/"; }; llm-nvim = buildVimPlugin { From 950d12c253b7201b4d766111a14ab4f00fb03e42 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 22 Jan 2025 20:44:02 +0100 Subject: [PATCH 61/64] mistral-rs: 0.3.2 -> 0.4.0 Diff: https://github.com/EricLBuehler/mistral.rs/compare/refs/tags/v0.3.2...v0.4.0 Changelog: https://github.com/EricLBuehler/mistral.rs/releases/tag/v0.4.0 --- pkgs/by-name/mi/mistral-rs/package.nix | 56 +++++++++----------------- 1 file changed, 20 insertions(+), 36 deletions(-) diff --git a/pkgs/by-name/mi/mistral-rs/package.nix b/pkgs/by-name/mi/mistral-rs/package.nix index f432f03702f5..9d643eb54e65 100644 --- a/pkgs/by-name/mi/mistral-rs/package.nix +++ b/pkgs/by-name/mi/mistral-rs/package.nix @@ -1,5 +1,6 @@ { lib, + stdenv, rustPlatform, fetchFromGitHub, @@ -11,8 +12,6 @@ oniguruma, openssl, mkl, - stdenv, - darwin, # env fetchurl, @@ -68,32 +67,26 @@ let (acceleration == "metal") || (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64 && (acceleration == null)); - darwinBuildInputs = - with darwin.apple_sdk.frameworks; - [ - Accelerate - CoreVideo - CoreGraphics - ] - ++ lib.optionals metalSupport [ - MetalKit - MetalPerformanceShaders - ]; in - rustPlatform.buildRustPackage rec { pname = "mistral-rs"; - version = "0.3.2"; + version = "0.4.0"; src = fetchFromGitHub { owner = "EricLBuehler"; repo = "mistral.rs"; tag = "v${version}"; - hash = "sha256-aflzpJZ48AFBqNTssZl2KxkspQb662nGkEU6COIluxk="; + hash = "sha256-dsqW0XpZN2FGZlmNKgAEYGcdY5iGvRwNUko2OuU87Gw="; }; useFetchCargoVendor = true; - cargoHash = "sha256-USp8siEXVjtkPoCHfQjDYPtgLfNHcy02LSUNdwDbxgs="; + cargoHash = "sha256-Fp/5xQ1ib2TTBSayxR5EDKkk7G+5c1QdnVW+kzcE5Jo="; + + # Otherwise, fails with + # failed to get `anyhow` as a dependency of package + postPatch = '' + rm "$cargoDepsCopy"/llguidance-*/build.rs + ''; nativeBuildInputs = [ pkg-config @@ -111,19 +104,12 @@ rustPlatform.buildRustPackage rec { cudaPackages.libcublas cudaPackages.libcurand ] - ++ lib.optionals mklSupport [ mkl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin darwinBuildInputs; + ++ lib.optionals mklSupport [ mkl ]; - cargoBuildFlags = - [ - # This disables the plotly crate which fails to build because of the kaleido feature requiring - # network access at build-time. - # See https://github.com/NixOS/nixpkgs/pull/323788#issuecomment-2206085825 - "--no-default-features" - ] - ++ lib.optionals cudaSupport [ "--features=cuda" ] - ++ lib.optionals mklSupport [ "--features=mkl" ] - ++ lib.optionals (stdenv.hostPlatform.isDarwin && metalSupport) [ "--features=metal" ]; + buildFeatures = + lib.optionals cudaSupport [ "cuda" ] + ++ lib.optionals mklSupport [ "mkl" ] + ++ lib.optionals (stdenv.hostPlatform.isDarwin && metalSupport) [ "metal" ]; env = { @@ -163,16 +149,15 @@ rustPlatform.buildRustPackage rec { rm -rf target/${stdenv.hostPlatform.config}/release/build/ ''; + # Prevent checkFeatures from inheriting buildFeatures because + # - `cargo check ... --features=cuda` requires access to a real GPU + # - `cargo check ... --features=metal` (on darwin) requires the sandbox to be completely disabled + checkFeatures = [ ]; + # Try to access internet checkFlags = [ - "--skip=gguf::gguf_tokenizer::tests::test_decode_gpt2" - "--skip=gguf::gguf_tokenizer::tests::test_decode_llama" "--skip=gguf::gguf_tokenizer::tests::test_encode_decode_gpt2" "--skip=gguf::gguf_tokenizer::tests::test_encode_decode_llama" - "--skip=gguf::gguf_tokenizer::tests::test_encode_gpt2" - "--skip=gguf::gguf_tokenizer::tests::test_encode_llama" - "--skip=sampler::tests::test_argmax" - "--skip=sampler::tests::test_gumbel_speculative" "--skip=util::tests::test_parse_image_url" ]; @@ -187,7 +172,6 @@ rustPlatform.buildRustPackage rec { tests = { version = testers.testVersion { package = mistral-rs; }; - # TODO: uncomment when mkl support will be fixed withMkl = lib.optionalAttrs (stdenv.hostPlatform == "x86_64-linux") ( mistral-rs.override { acceleration = "mkl"; } ); From 933c1b5e5a9cf5edfeb84a5c99f8504c9baf8b1b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 22 Jan 2025 12:32:08 +0000 Subject: [PATCH 62/64] goattracker: 2.76 -> 2.77 --- pkgs/applications/audio/goattracker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/goattracker/default.nix b/pkgs/applications/audio/goattracker/default.nix index 7580bf86dfb0..492f1e8fafd5 100644 --- a/pkgs/applications/audio/goattracker/default.nix +++ b/pkgs/applications/audio/goattracker/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { if isStereo then "2.77" # stereo else - "2.76"; # normal + "2.77"; # normal src = fetchurl { url = "mirror://sourceforge/goattracker2/GoatTracker_${finalAttrs.version}${lib.optionalString isStereo "_Stereo"}.zip"; @@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: { if isStereo then "1hiig2d152sv9kazwz33i56x1c54h5sh21ipkqnp6qlnwj8x1ksy" # stereo else - "0d7a3han4jw4bwiba3j87racswaajgl3pj4sb5lawdqdxicv3dn1"; # normal + "sha256-lsK9amqzrKL1uxixx2SsbqaawkXK4UACpyzYfFVFYe8="; # normal }; sourceRoot = "src"; From dfa21029432108218a091f39dd0ec419f6f9f2dd Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Tue, 26 Nov 2024 15:08:19 +0100 Subject: [PATCH 63/64] tclPackages.wapp: 0-unstable-2024-05-23 -> 0-unstable-2024-11-22 --- pkgs/development/tcl-modules/by-name/wa/wapp/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tcl-modules/by-name/wa/wapp/package.nix b/pkgs/development/tcl-modules/by-name/wa/wapp/package.nix index fc7e14205f9f..993f6c0b3588 100644 --- a/pkgs/development/tcl-modules/by-name/wa/wapp/package.nix +++ b/pkgs/development/tcl-modules/by-name/wa/wapp/package.nix @@ -2,11 +2,11 @@ mkTclDerivation { pname = "wapp"; - version = "0-unstable-2024-05-23"; + version = "0-unstable-2024-11-22"; src = fetchurl { - url = "https://wapp.tcl-lang.org/home/raw/98f23b2160bafc41f34be8e5d8ec414c53d33412eb2f724a07f2476eaf04ac6f?at=wapp.tcl"; - hash = "sha256-A+Ml5h5C+OMoDQtAoB9lHgYEK1A7qHExT3p46PHRTYg="; + url = "https://wapp.tcl-lang.org/home/raw/3b1ce7c0234b4b2750deadc80f524ed28e835aa5e741bf3fe63b416a16a55699?at=wapp.tcl"; + hash = "sha256-0e9yTVFYj1tYGU7EiXRPw35qfDzckzz4i3RV/8TttGw="; }; dontUnpack = true; From bafca6cbe151eb9229555bbf84f0108acc663000 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 24 Jan 2025 12:51:00 +0100 Subject: [PATCH 64/64] =?UTF-8?q?ocamlPackages.cpdf:=202.7.1=20=E2=86=92?= =?UTF-8?q?=202.8=20(#376363)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/by-name/sa/satysfi/package.nix | 6 ++++-- pkgs/development/ocaml-modules/camlpdf/default.nix | 8 ++++---- pkgs/development/ocaml-modules/cpdf/default.nix | 6 ++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/sa/satysfi/package.nix b/pkgs/by-name/sa/satysfi/package.nix index 4b0c4ddab839..b2a393939a60 100644 --- a/pkgs/by-name/sa/satysfi/package.nix +++ b/pkgs/by-name/sa/satysfi/package.nix @@ -6,16 +6,18 @@ junicode, lmodern, lmmath, + which, }: let - camlpdf = ocamlPackages.camlpdf.overrideAttrs { + camlpdf = ocamlPackages.camlpdf.overrideAttrs (o: { src = fetchFromGitHub { owner = "gfngfn"; repo = "camlpdf"; rev = "v2.3.1+satysfi"; sha256 = "1s8wcqdkl1alvfcj67lhn3qdz8ikvd1v64f4q6bi4c0qj9lmp30k"; }; - }; + nativeBuildInputs = [ which ] ++ o.nativeBuildInputs; + }); yojson-with-position = ocamlPackages.buildDunePackage { pname = "yojson-with-position"; version = "1.4.2"; diff --git a/pkgs/development/ocaml-modules/camlpdf/default.nix b/pkgs/development/ocaml-modules/camlpdf/default.nix index 7f4cbe4cf5cc..003e2c0263bc 100644 --- a/pkgs/development/ocaml-modules/camlpdf/default.nix +++ b/pkgs/development/ocaml-modules/camlpdf/default.nix @@ -1,21 +1,21 @@ -{ lib, stdenv, fetchFromGitHub, which, ocaml, findlib }: +{ lib, stdenv, fetchFromGitHub, ocaml, findlib }: if lib.versionOlder ocaml.version "4.10" then throw "camlpdf is not available for OCaml ${ocaml.version}" else stdenv.mkDerivation rec { - version = "2.7.1"; + version = "2.8"; pname = "ocaml${ocaml.version}-camlpdf"; src = fetchFromGitHub { owner = "johnwhitington"; repo = "camlpdf"; rev = "v${version}"; - hash = "sha256-/ZKL80HqLZ9ObOvgfg+ZHFZ8m2CRe0zWT8zHIf9CXes="; + hash = "sha256-+SFuFqlrP0nwm199y0QFWYvlwD+Cbh0PHA5bmXIWdNk="; }; - nativeBuildInputs = [ which ocaml findlib ]; + nativeBuildInputs = [ ocaml findlib ]; strictDeps = true; diff --git a/pkgs/development/ocaml-modules/cpdf/default.nix b/pkgs/development/ocaml-modules/cpdf/default.nix index 7e917482379d..66823ce21fa1 100644 --- a/pkgs/development/ocaml-modules/cpdf/default.nix +++ b/pkgs/development/ocaml-modules/cpdf/default.nix @@ -5,7 +5,6 @@ ocaml, findlib, camlpdf, - ncurses, }: if lib.versionOlder ocaml.version "4.10" then @@ -14,20 +13,19 @@ else stdenv.mkDerivation rec { pname = "ocaml${ocaml.version}-cpdf"; - version = "2.7.1"; + version = "2.8"; src = fetchFromGitHub { owner = "johnwhitington"; repo = "cpdf-source"; rev = "v${version}"; - hash = "sha256-lFI7f1t70Pw0LJjDrhaB7yQKR1N5906xNYB+fnrz55M="; + hash = "sha256-DvTY5EQcvnL76RlQTcVqBiycqbCdGQCXzarSMH2P/pg="; }; nativeBuildInputs = [ ocaml findlib ]; - buildInputs = [ ncurses ]; propagatedBuildInputs = [ camlpdf ]; strictDeps = true;