From c2805bddc16492a516e2bc0c875adf1217d67164 Mon Sep 17 00:00:00 2001 From: Charles Duffy Date: Sat, 22 Jul 2023 19:12:09 -0500 Subject: [PATCH 001/158] freeplane: 1.9.14 -> 1.11.4 Thanks to @yuuyins for the desktop items and JVM configuration tweaks. --- pkgs/applications/misc/freeplane/default.nix | 137 +++++++++++-------- 1 file changed, 83 insertions(+), 54 deletions(-) diff --git a/pkgs/applications/misc/freeplane/default.nix b/pkgs/applications/misc/freeplane/default.nix index e2931698d1ac..dd778fbc247a 100644 --- a/pkgs/applications/misc/freeplane/default.nix +++ b/pkgs/applications/misc/freeplane/default.nix @@ -1,31 +1,46 @@ -{ stdenv, lib, fetchpatch, fetchFromGitHub, makeWrapper, writeText, runtimeShell, jdk11, perl, gradle_6, which }: +{ stdenv +, lib +, fetchpatch +, fetchFromGitHub +, makeWrapper +, makeDesktopItem +, writeText +, runtimeShell +, jdk17 +, perl +, gradle_7 +, which +}: let pname = "freeplane"; - version = "1.9.14"; + version = "1.11.4"; - src_sha256 = "UiXtGJs+hibB63BaDDLXgjt3INBs+NfMsKcX2Q/kxKw="; - deps_outputHash = "tHhRaMIQK8ERuzm+qB9tRe2XSesL0bN3rComB9/qWgg="; - emoji_outputHash = "w96or4lpKCRK8A5HaB4Eakr7oVSiQALJ9tCJvKZaM34="; + src_hash = "sha256-LuXvGNpnkinHuukZEYZjo5l7TiwumEFd2H06JcC9Qd8="; + deps_outputHash = "sha256-exiP37gFcJfxzcS2bNjVntb0Wthy8kPSgaHJF9cvmRU="; - jdk = jdk11; - gradle = gradle_6; + jdk = jdk17; + gradle = gradle_7; src = fetchFromGitHub { owner = pname; repo = pname; rev = "release-${version}"; - sha256 = src_sha256; + hash = src_hash; }; deps = stdenv.mkDerivation { name = "${pname}-deps"; inherit src; - nativeBuildInputs = [ jdk perl gradle ]; + nativeBuildInputs = [ + jdk + perl + gradle + ]; buildPhase = '' - GRADLE_USER_HOME=$PWD gradle -Dorg.gradle.java.home=${jdk} --no-daemon jar + GRADLE_USER_HOME=$PWD gradle -Dorg.gradle.java.home=${jdk} --no-daemon build ''; # Mavenize dependency paths @@ -34,6 +49,12 @@ let find ./caches/modules-2 -type f -regex '.*\.\(jar\|pom\)' \ | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/$5" #e' \ | sh + # com/squareup/okio/okio/2.10.0/okio-jvm-2.10.0.jar expected to exist under name okio-2.10.0.jar + while IFS="" read -r -d "" path; do + dir=''${path%/*}; file=''${path##*/}; dest=''${file//-jvm-/-} + [[ -e $dir/$dest ]] && continue + ln -s "$dir/$file" "$dir/$dest" + done < <(find "$out" -type f -name 'okio-jvm-*.jar' -print0) ''; outputHashAlgo = "sha256"; @@ -43,72 +64,78 @@ let # Point to our local deps repo gradleInit = writeText "init.gradle" '' - logger.lifecycle 'Replacing Maven repositories with ${deps}...' - gradle.projectsLoaded { - rootProject.allprojects { - buildscript { - repositories { - clear() - maven { url '${deps}' } - } - } + settingsEvaluated { settings -> + settings.pluginManagement { repositories { clear() maven { url '${deps}' } } } } - settingsEvaluated { settings -> - settings.pluginManagement { + gradle.projectsLoaded { + rootProject.allprojects { repositories { + clear() maven { url '${deps}' } } } } ''; - emoji = stdenv.mkDerivation rec { - name = "${pname}-emoji"; - inherit src; - - nativeBuildInputs = [ jdk gradle ]; - - buildPhase = '' - GRADLE_USER_HOME=$PWD gradle -Dorg.gradle.java.home=${jdk} --no-daemon --offline --init-script ${gradleInit} :freeplane:downloadEmoji - ''; - - installPhase = '' - mkdir -p $out/emoji/txt $out/resources/images - cp freeplane/build/emoji/txt/emojilist.txt $out/emoji/txt - cp -r freeplane/build/emoji/resources/images/emoji/. $out/resources/images/emoji - ''; - - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - outputHash = emoji_outputHash; - }; - in stdenv.mkDerivation rec { inherit pname version src; - nativeBuildInputs = [ makeWrapper jdk gradle ]; + nativeBuildInputs = [ + makeWrapper + jdk + gradle + ]; buildPhase = '' - mkdir -p -- ./freeplane/build/emoji/{txt,resources/images} - cp ${emoji}/emoji/txt/emojilist.txt ./freeplane/build/emoji/txt/emojilist.txt - cp -r ${emoji}/resources/images/emoji ./freeplane/build/emoji/resources/images/emoji - GRADLE_USER_HOME=$PWD gradle -Dorg.gradle.java.home=${jdk} --no-daemon --offline --init-script ${gradleInit} -x test -x :freeplane:downloadEmoji build + mkdir -p -- ./freeplane/build + + GRADLE_USER_HOME=$PWD \ + gradle -Dorg.gradle.java.home=${jdk} \ + --no-daemon --offline --init-script ${gradleInit} \ + -x test \ + build ''; + desktopItems = [ + (makeDesktopItem { + name = "freeplane"; + desktopName = "freeplane"; + genericName = "Mind-mapper"; + exec = "freeplane"; + icon = "freeplane"; + comment = meta.description; + mimeTypes = [ + "application/x-freemind" + "application/x-freeplane" + "text/x-troff-mm" + ]; + categories = [ + "2DGraphics" + "Chart" + "Graphics" + "Office" + ]; + }) + ]; + installPhase = '' runHook preInstall - mkdir -p $out/bin $out/share - cp -a ./BIN/. $out/share/${pname} - makeWrapper $out/share/${pname}/${pname}.sh $out/bin/${pname} \ - --set FREEPLANE_BASE_DIR $out/share/${pname} \ + mkdir -p $out/bin $out/share + cp -a ./BIN/. $out/share/freeplane + + makeWrapper $out/share/freeplane/freeplane.sh $out/bin/freeplane \ + --set FREEPLANE_BASE_DIR $out/share/freeplane \ --set JAVA_HOME ${jdk} \ - --prefix PATH : ${lib.makeBinPath [ jdk which ]} + --prefix PATH : ${lib.makeBinPath [ jdk which ]} \ + --prefix _JAVA_AWT_WM_NONREPARENTING : 1 \ + --prefix _JAVA_OPTIONS : "-Dawt.useSystemAAFontSettings=on" + runHook postInstall ''; @@ -116,7 +143,9 @@ in stdenv.mkDerivation rec { description = "Mind-mapping software"; homepage = "https://freeplane.org/"; license = licenses.gpl2Plus; - platforms = platforms.linux; - maintainers = with maintainers; [ chaduffy ]; + # platforms = platforms.linux; + maintainers = with maintainers; [ + chaduffy + ]; }; } From 8585568d7d9f895b928d297f2df7b0d73c069d7c Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Wed, 9 Aug 2023 23:41:22 +0200 Subject: [PATCH 002/158] lib.fixedPoints.extends: Improve documentation The previous one was unnecessarily confusing. --- lib/fixed-points.nix | 73 ++++++++++++++++++++++++++++---------------- 1 file changed, 47 insertions(+), 26 deletions(-) diff --git a/lib/fixed-points.nix b/lib/fixed-points.nix index a63f349b713d..1b9504cb4533 100644 --- a/lib/fixed-points.nix +++ b/lib/fixed-points.nix @@ -53,39 +53,60 @@ rec { else converge f x'; /* - Modify the contents of an explicitly recursive attribute set in a way that - honors `self`-references. This is accomplished with a function + `extends overlay f` applies the overlay `overlay` to the fixed-point function `f` to get a new fixed-point function. + Overlays allow modifying and extending fixed-point functions, specifically ones returning attribute sets. - ```nix - g = self: super: { foo = super.foo + " + "; } + A fixed-point function is a function which is intended to be evaluated by passing the result of itself as the argument, only possible due to Nix's lazy evaluation. + Here's an example of one: + ``` + f = final: { + # Constant value a + a = 1; + + # b depends on the final value of a, available as final.a + b = final.a + 2; + } + ``` + We can evaluated this using [`lib.fix`](#function-library-lib.fixedPoints.fix) to get the final result: + ``` + fix f + => { a = 1; b = 3; } ``` - that has access to the unmodified input (`super`) as well as the final - non-recursive representation of the attribute set (`self`). `extends` - differs from the native `//` operator insofar as that it's applied *before* - references to `self` are resolved: - + An overlay represents a modification or extension of such a fixed-point function. + Here's an example of an overlay: ``` - nix-repl> fix (extends g f) - { bar = "bar"; foo = "foo + "; foobar = "foo + bar"; } + overlay = final: prev: { + # Modify the previous value of a, available as prev.a + a = prev.a + 10; + + # Extend the attribute set with c, letting it depend on the final values of a and b + c = final.a + final.b; + } ``` - The name of the function is inspired by object-oriented inheritance, i.e. - think of it as an infix operator `g extends f` that mimics the syntax from - Java. It may seem counter-intuitive to have the "base class" as the second - argument, but it's nice this way if several uses of `extends` are cascaded. - - To get a better understanding how `extends` turns a function with a fix - point (the package set we start with) into a new function with a different fix - point (the desired packages set) lets just see, how `extends g f` - unfolds with `g` and `f` defined above: - + We can now use `extends overlay f` to apply the overlay to the fixed-point function `f`, giving us a new fixed-point function `g` with the combined behavior of `f` and `overlay`. ``` - extends g f = self: let super = f self; in super // g self super; - = self: let super = { foo = "foo"; bar = "bar"; foobar = self.foo + self.bar; }; in super // g self super - = self: { foo = "foo"; bar = "bar"; foobar = self.foo + self.bar; } // g self { foo = "foo"; bar = "bar"; foobar = self.foo + self.bar; } - = self: { foo = "foo"; bar = "bar"; foobar = self.foo + self.bar; } // { foo = "foo" + " + "; } - = self: { foo = "foo + "; bar = "bar"; foobar = self.foo + self.bar; } + g = extends overlay f + ``` + The result is a function, so we can't print it directly, but it's the same as: + ``` + g = final: { + # The constant from f, but changed with the overlay + a = 1 + 10; + + # Unchanged from f + b = final.a + 2; + + # Extended in the overlay + c = final.a + final.b; + } + ``` + + We can evaluate this using [`lib.fix`](#function-library-lib.fixedPoints.fix) again to get the final result: + ``` + fix g + => { a = 11; b = 13; c = 24; } ``` */ extends = f: rattrs: self: let super = rattrs self; in super // f self super; From 327f1c2d09fec31ae38665911bd6383c10498dad Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Thu, 10 Aug 2023 00:10:31 +0200 Subject: [PATCH 003/158] lib.fixedPoints.extends: Add type and examples --- lib/fixed-points.nix | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/lib/fixed-points.nix b/lib/fixed-points.nix index 1b9504cb4533..8b76d2010e93 100644 --- a/lib/fixed-points.nix +++ b/lib/fixed-points.nix @@ -108,6 +108,26 @@ rec { fix g => { a = 11; b = 13; c = 24; } ``` + + Type: + extends :: (Attrs -> Attrs -> Attrs) # The overlay to apply to the fixed-point function + -> (Attrs -> Attrs) # A fixed-point function + -> (Attrs -> Attrs) # The resulting fixed-point function + + Example: + f = final: { a = 1; b = final.a + 2; } + + fix f + => { a = 1; b = 3; } + + fix (extends (final: prev: { a = prev.a + 10; }) f) + => { a = 11; b = 13; } + + fix (extends (final: prev: { b = final.a + 5; }) f) + => { a = 1; b = 6; } + + fix (extends (final: prev: { c = final.a + final.b; }) f) + => { a = 1; b = 3; c = 4; } */ extends = f: rattrs: self: let super = rattrs self; in super // f self super; From 149a793c07e07965c8941658e59056d11a010668 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Thu, 10 Aug 2023 00:18:08 +0200 Subject: [PATCH 004/158] lib.fixedPoints.extends: Refactor implementation and document arguments - Better names: - self -> final - super -> prev - rattrs -> f - f -> overlay - Add documentation to the function arguments - Add some spacing --- lib/fixed-points.nix | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/lib/fixed-points.nix b/lib/fixed-points.nix index 8b76d2010e93..9020fa5f3555 100644 --- a/lib/fixed-points.nix +++ b/lib/fixed-points.nix @@ -129,7 +129,20 @@ rec { fix (extends (final: prev: { c = final.a + final.b; }) f) => { a = 1; b = 3; c = 4; } */ - extends = f: rattrs: self: let super = rattrs self; in super // f self super; + extends = + # The overlay to apply to the fixed-point function + overlay: + # The fixed-point function + f: + # Wrap with parenthesis to prevent nixdoc from rendering the `final` argument in the documentation + # The result should be thought of as a function, the argument of that function is not an argument to `extends` itself + ( + final: + let + prev = f final; + in + prev // overlay final prev + ); /* Compose two extending functions of the type expected by 'extends' From 13c278cb1cd8503f5ab9a550315a75a0001bc247 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Thu, 28 Sep 2023 17:21:34 +0200 Subject: [PATCH 005/158] lib.fixedPoints.extends: Doc improvements Co-Authored-By: Valentin Gagarin --- lib/fixed-points.nix | 85 +++++++++++++++++++++++++++++++++++++------- 1 file changed, 72 insertions(+), 13 deletions(-) diff --git a/lib/fixed-points.nix b/lib/fixed-points.nix index 9020fa5f3555..52e0879bf9ff 100644 --- a/lib/fixed-points.nix +++ b/lib/fixed-points.nix @@ -53,12 +53,55 @@ rec { else converge f x'; /* - `extends overlay f` applies the overlay `overlay` to the fixed-point function `f` to get a new fixed-point function. - Overlays allow modifying and extending fixed-point functions, specifically ones returning attribute sets. + Extend a function using an overlay. - A fixed-point function is a function which is intended to be evaluated by passing the result of itself as the argument, only possible due to Nix's lazy evaluation. - Here's an example of one: + Overlays allow modifying and extending fixed-point functions, specifically ones returning attribute sets. + A fixed-point function is a function which is intended to be evaluated by passing the result of itself as the argument. + This is possible due to Nix's lazy evaluation. + + + A fixed-point function returning an attribute set has the form + + ```nix + final: { # attributes } ``` + + where `final` refers to the lazily evaluated attribute set returned by the fixed-point function. + + An overlay to such a fixed-point function has the form + + ```nix + final: prev: { # attributes } + ``` + + where `prev` refers to the result of the original function to `final`, and `final` is the result of the composition of the overlay and the original function. + + Applying an overlay is done with `extends`: + + ```nix + let + f = final: { # attributes }; + overlay = final: prev: { # attributes }; + in extends overlay f; + ``` + + To get the value of `final`, use `lib.fix`: + + ```nix + let + f = final: { # attributes }; + overlay = final: prev: { # attributes }; + g = extends overlay f; + in fix g + ``` + + :::{.example} + + # Extend a fixed-point function with an overlay + + Define a fixed-point function `f` that expects its own output as the argument `final`: + + ```nix-repl f = final: { # Constant value a a = 1; @@ -67,15 +110,18 @@ rec { b = final.a + 2; } ``` - We can evaluated this using [`lib.fix`](#function-library-lib.fixedPoints.fix) to get the final result: - ``` + + Evaluate this using [`lib.fix`](#function-library-lib.fixedPoints.fix) to get the final result: + + ```nix-repl fix f => { a = 1; b = 3; } ``` An overlay represents a modification or extension of such a fixed-point function. Here's an example of an overlay: - ``` + + ```nix-repl overlay = final: prev: { # Modify the previous value of a, available as prev.a a = prev.a + 10; @@ -85,13 +131,17 @@ rec { } ``` - We can now use `extends overlay f` to apply the overlay to the fixed-point function `f`, giving us a new fixed-point function `g` with the combined behavior of `f` and `overlay`. - ``` + Use `extends overlay f` to apply the overlay to the fixed-point function `f`. + This produces a new fixed-point function `g` with the combined behavior of `f` and `overlay`: + + ```nix-repl g = extends overlay f ``` + The result is a function, so we can't print it directly, but it's the same as: - ``` - g = final: { + + ```nix-repl + g' = final: { # The constant from f, but changed with the overlay a = 1 + 10; @@ -103,11 +153,13 @@ rec { } ``` - We can evaluate this using [`lib.fix`](#function-library-lib.fixedPoints.fix) again to get the final result: - ``` + Evaluate this using [`lib.fix`](#function-library-lib.fixedPoints.fix) again to get the final result: + + ```nix-repl fix g => { a = 11; b = 13; c = 24; } ``` + ::: Type: extends :: (Attrs -> Attrs -> Attrs) # The overlay to apply to the fixed-point function @@ -128,6 +180,13 @@ rec { fix (extends (final: prev: { c = final.a + final.b; }) f) => { a = 1; b = 3; c = 4; } + + :::{.note} + The argument to the given fixed-point function after applying an overlay will *not* refer to its own return value, but rather to the value after evaluating the overlay function. + + The given fixed-point function is called with a separate argument than if it was evaluated with `lib.fix`. + The new argument + ::: */ extends = # The overlay to apply to the fixed-point function From 3e54fa949cdcd4d69ecb99267c29c8aeb70a30d6 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Thu, 14 Dec 2023 22:33:08 +0000 Subject: [PATCH 006/158] hedgewars: hold SDL2_image back on 2.6 branch Without the holdback hedgewars fails to start game sessions on `SDL2_image-2.8.1` as: "Surface2Tex failed, expecting 32 bit surface" It is caused by lack of support of palette-based .png files by `hedgewars`. Those were added in `SDL2_image-2.8` in https://github.com/libsdl-org/SDL_image/commit/bf0821bcc71f16ba3c4282ec2e6aad29684faf57 --- pkgs/games/hedgewars/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 6 ++++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/games/hedgewars/default.nix b/pkgs/games/hedgewars/default.nix index 94f8a28add9b..763dc3f63a6c 100644 --- a/pkgs/games/hedgewars/default.nix +++ b/pkgs/games/hedgewars/default.nix @@ -1,4 +1,4 @@ -{ stdenv, SDL2_image, SDL2_ttf, SDL2_net, fpc, ghcWithPackages, ffmpeg_4, freeglut +{ stdenv, SDL2_image_2_6, SDL2_ttf, SDL2_net, fpc, ghcWithPackages, ffmpeg_4, freeglut , lib, fetchurl, cmake, pkg-config, lua5_1, SDL2, SDL2_mixer , zlib, libpng, libGL, libGLU, physfs , qtbase, qttools, wrapQtAppsHook @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config qttools wrapQtAppsHook ]; buildInputs = [ - SDL2_ttf SDL2_net SDL2 SDL2_mixer SDL2_image + SDL2_ttf SDL2_net SDL2 SDL2_mixer SDL2_image_2_6 fpc lua5_1 llvm # hard-requirement on aarch64, for some reason not strictly necessary on x86-64 ffmpeg_4 freeglut physfs @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = lib.concatMapStringsSep " " (e: "-rpath ${e}/lib") [ SDL2.out - SDL2_image + SDL2_image_2_6 SDL2_mixer SDL2_net SDL2_ttf diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cd2434bcb4df..74c04480e8da 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24925,6 +24925,12 @@ with pkgs; version = "2.0.5"; hash = "sha256-vdX24CZoL31+G+C2BRsgnaL0AqLdi9HEvZwlrSYxCNA"; }); + SDL2_image_2_6 = SDL2_image.override({ + # Pinned for hedgewars: + # https://github.com/NixOS/nixpkgs/pull/274185#issuecomment-1856764786 + version = "2.6.3"; + hash = "sha256-kxyb5b8dfI+um33BV4KLfu6HTiPH8ktEun7/a0g2MSw="; + }); SDL2_mixer = callPackage ../development/libraries/SDL2_mixer { inherit (darwin.apple_sdk.frameworks) CoreServices AudioUnit AudioToolbox; From fca2aa2345be283b8be90ebc21fee69573f4c992 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Mon, 25 Dec 2023 18:52:37 +0000 Subject: [PATCH 007/158] synfig: pull upstream patch for `autoconf-2.72` support Without the change build fails against `autoconf-2.72` as: ./configure: line 22560: syntax error near unexpected token `;;' ./configure: line 22560: ` ;;' --- pkgs/applications/graphics/synfigstudio/default.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/applications/graphics/synfigstudio/default.nix b/pkgs/applications/graphics/synfigstudio/default.nix index 61fcb3a24bc6..34f9baad6804 100644 --- a/pkgs/applications/graphics/synfigstudio/default.nix +++ b/pkgs/applications/graphics/synfigstudio/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , pkg-config , autoreconfHook , wrapGAppsHook @@ -54,6 +55,17 @@ let pname = "synfig"; inherit version src; + patches = [ + # Pull upstream fix for autoconf-2.72 support: + # https://github.com/synfig/synfig/pull/2930 + (fetchpatch { + name = "autoconf-2.72.patch"; + url = "https://github.com/synfig/synfig/commit/80a3386c701049f597cf3642bb924d2ff832ae05.patch"; + stripLen = 1; + hash = "sha256-7gX8tJCR81gw8ZDyNYa8UaeZFNOx4o1Lnq0cAcaKb2I="; + }) + ]; + sourceRoot = "${src.name}/synfig-core"; configureFlags = [ From d11fe979a28cb6ae98705512b0e5b226ba909476 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Sun, 31 Dec 2023 16:52:08 +0300 Subject: [PATCH 008/158] nixos/nginx: use new variant of http2 option for angie package --- nixos/modules/services/web-servers/nginx/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix index 6c08d0aee3d7..f36801215e04 100644 --- a/nixos/modules/services/web-servers/nginx/default.nix +++ b/nixos/modules/services/web-servers/nginx/default.nix @@ -472,7 +472,7 @@ let mkCertOwnershipAssertion = import ../../../security/acme/mk-cert-ownership-assertion.nix; - oldHTTP2 = versionOlder cfg.package.version "1.25.1"; + oldHTTP2 = (versionOlder cfg.package.version "1.25.1" && !(cfg.package.pname == "angie" || cfg.package.pname == "angieQuic")); in { From 0639693d0dd991ed103272e3364649f86c0a92b1 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Thu, 14 Dec 2023 09:20:16 +0000 Subject: [PATCH 009/158] SDL2_image: 2.6.3 -> 2.8.2 Changes: - https://github.com/libsdl-org/SDL_image/releases/tag/release-2.8.2 - https://github.com/libsdl-org/SDL_image/releases/tag/release-2.8.1 - https://github.com/libsdl-org/SDL_image/releases/tag/release-2.8.0 --- pkgs/development/libraries/SDL2_image/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/SDL2_image/default.nix b/pkgs/development/libraries/SDL2_image/default.nix index a8824904aea8..a472083c2569 100644 --- a/pkgs/development/libraries/SDL2_image/default.nix +++ b/pkgs/development/libraries/SDL2_image/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchurl , pkg-config , SDL2, libpng, libjpeg, libtiff, giflib, libwebp, libXpm, zlib, Foundation -, version ? "2.6.3" -, hash ? "sha256-kxyb5b8dfI+um33BV4KLfu6HTiPH8ktEun7/a0g2MSw=" +, version ? "2.8.2" +, hash ? "sha256-j0hrv7z4Rk3VjJ5dkzlKsCVc5otRxalmqRgkSCCnbdw=" }: let From 4e0c1225ea66b67df6463c39c878c2d1a5210c3f Mon Sep 17 00:00:00 2001 From: Minijackson Date: Tue, 2 Jan 2024 21:05:45 +0100 Subject: [PATCH 010/158] netbox_3_6: 3.6.6 -> 3.6.9 --- pkgs/servers/web-apps/netbox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/web-apps/netbox/default.nix b/pkgs/servers/web-apps/netbox/default.nix index 4c19eaf0a4d2..245c7591dc73 100644 --- a/pkgs/servers/web-apps/netbox/default.nix +++ b/pkgs/servers/web-apps/netbox/default.nix @@ -22,8 +22,8 @@ lib.fix (self: { }; netbox_3_6 = callPackage generic { - version = "3.6.6"; - hash = "sha256-viC4grOqpWvG2pqcSi+MJykpEXSQYqfpkKF9it9Tj1g="; + version = "3.6.9"; + hash = "sha256-R/hcBKrylW3GnEy10DkrLVr8YJtsSCvCP9H9LhafO9I="; extraPatches = [ # Allow setting the STATIC_ROOT from within the configuration and setting a custom redis URL ./config.patch From ba7a904f9f284f944e65f608302c982df3fe454f Mon Sep 17 00:00:00 2001 From: Maximilian Huber Date: Tue, 19 Dec 2023 14:37:42 +0100 Subject: [PATCH 011/158] freeplane: 1.11.4 -> 1.11.8 Signed-off-by: Maximilian Huber --- pkgs/applications/misc/freeplane/default.nix | 32 ++++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/pkgs/applications/misc/freeplane/default.nix b/pkgs/applications/misc/freeplane/default.nix index dd778fbc247a..4c790c5e814f 100644 --- a/pkgs/applications/misc/freeplane/default.nix +++ b/pkgs/applications/misc/freeplane/default.nix @@ -14,10 +14,10 @@ let pname = "freeplane"; - version = "1.11.4"; + version = "1.11.8"; - src_hash = "sha256-LuXvGNpnkinHuukZEYZjo5l7TiwumEFd2H06JcC9Qd8="; - deps_outputHash = "sha256-exiP37gFcJfxzcS2bNjVntb0Wthy8kPSgaHJF9cvmRU="; + src_hash = "sha256-Qh2V265FvQpqGKmPsiswnC5yECwIcNwMI3/Ka9sBqXE="; + deps_outputHash = "sha256-2Zaw4FW12dThdr082dEB1EYkGwNiayz501wIPGXUfBw="; jdk = jdk17; gradle = gradle_7; @@ -30,8 +30,8 @@ let }; deps = stdenv.mkDerivation { - name = "${pname}-deps"; - inherit src; + pname = "${pname}-deps"; + inherit src version; nativeBuildInputs = [ jdk @@ -49,13 +49,15 @@ let find ./caches/modules-2 -type f -regex '.*\.\(jar\|pom\)' \ | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/$5" #e' \ | sh - # com/squareup/okio/okio/2.10.0/okio-jvm-2.10.0.jar expected to exist under name okio-2.10.0.jar - while IFS="" read -r -d "" path; do - dir=''${path%/*}; file=''${path##*/}; dest=''${file//-jvm-/-} - [[ -e $dir/$dest ]] && continue - ln -s "$dir/$file" "$dir/$dest" - done < <(find "$out" -type f -name 'okio-jvm-*.jar' -print0) + # com/squareup/okio/okio/2.10.0/okio-jvm-2.10.0.jar expected to exist under name okio-2.10.0.jar + while IFS="" read -r -d "" path; do + dir=''${path%/*}; file=''${path##*/}; dest=''${file//-jvm-/-} + [[ -e $dir/$dest ]] && continue + ln -s "$dir/$file" "$dir/$dest" + done < <(find "$out" -type f -name 'okio-jvm-*.jar' -print0) ''; + # otherwise the package with a namespace starting with info/... gets moved to share/info/... + forceShare = [ "dummy" ]; outputHashAlgo = "sha256"; outputHashMode = "recursive"; @@ -92,7 +94,7 @@ in stdenv.mkDerivation rec { ]; buildPhase = '' - mkdir -p -- ./freeplane/build + mkdir -p freeplane/build GRADLE_USER_HOME=$PWD \ gradle -Dorg.gradle.java.home=${jdk} \ @@ -143,9 +145,7 @@ in stdenv.mkDerivation rec { description = "Mind-mapping software"; homepage = "https://freeplane.org/"; license = licenses.gpl2Plus; - # platforms = platforms.linux; - maintainers = with maintainers; [ - chaduffy - ]; + platforms = platforms.linux; + maintainers = with maintainers; [ chaduffy ]; }; } From cda3c92942ade144d40d419d4c247f41bf59714a Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Wed, 3 Jan 2024 18:53:17 +0100 Subject: [PATCH 012/158] jdepend: make deterministic and clean up --- .../tools/analysis/jdepend/default.nix | 53 +++++++++++++------ 1 file changed, 38 insertions(+), 15 deletions(-) diff --git a/pkgs/development/tools/analysis/jdepend/default.nix b/pkgs/development/tools/analysis/jdepend/default.nix index faa68dadc3b4..498a484a89f0 100644 --- a/pkgs/development/tools/analysis/jdepend/default.nix +++ b/pkgs/development/tools/analysis/jdepend/default.nix @@ -1,35 +1,58 @@ -{ lib, stdenv, fetchFromGitHub, ant, jdk, runtimeShell }: +{ lib +, stdenv +, fetchFromGitHub +, ant +, jdk +, makeWrapper +, canonicalize-jars-hook +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "jdepend"; version = "2.10"; src = fetchFromGitHub { owner = "clarkware"; repo = "jdepend"; - rev = version; - sha256 = "1lxf3j9vflky7a2py3i59q7cwd1zvjv2b88l3za39vc90s04dz6k"; + rev = finalAttrs.version; + hash = "sha256-0/xGgAaJ7TTUHxShJbbcPzTODk4lDn+FOn5St5McrtM="; }; - nativeBuildInputs = [ ant jdk ]; - buildPhase = "ant jar"; + nativeBuildInputs = [ + ant + jdk + makeWrapper + canonicalize-jars-hook + ]; + + buildPhase = '' + runHook preBuild + ant jar + runHook postBuild + ''; installPhase = '' - mkdir -p $out/bin $out/share - install dist/${pname}-${version}.jar $out/share + runHook preInstall - cat > "$out/bin/jdepend" < Date: Wed, 3 Jan 2024 22:07:24 +0100 Subject: [PATCH 013/158] javaCup: make deterministic and clean up --- .../libraries/java/cup/default.nix | 54 ++++++++++++------- 1 file changed, 36 insertions(+), 18 deletions(-) diff --git a/pkgs/development/libraries/java/cup/default.nix b/pkgs/development/libraries/java/cup/default.nix index f7732ff637af..2f673a8e5a67 100644 --- a/pkgs/development/libraries/java/cup/default.nix +++ b/pkgs/development/libraries/java/cup/default.nix @@ -1,38 +1,56 @@ -{ lib, stdenv, fetchurl, jdk, ant } : +{ lib +, stdenv +, fetchurl +, ant +, jdk +, makeWrapper +, canonicalize-jars-hook +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "java-cup"; version = "11b-20160615"; src = fetchurl { - url = "http://www2.cs.tum.edu/projects/cup/releases/java-cup-src-${version}.tar.gz"; - sha256 = "1ymz3plngxclh7x3xr31537rvvak7lwyd0qkmnl1mkj5drh77rz0"; + url = "http://www2.cs.tum.edu/projects/cup/releases/java-cup-src-${finalAttrs.version}.tar.gz"; + hash = "sha256-4OdzYG5FzhqorROD5jk9U+2dzyhh5D76gZT1Z+kdv/o="; }; sourceRoot = "."; - nativeBuildInputs = [ jdk ant ]; - patches = [ ./javacup-0.11b_beta20160615-build-xml-git.patch ]; - buildPhase = "ant"; + nativeBuildInputs = [ + ant + jdk + makeWrapper + canonicalize-jars-hook + ]; + + buildPhase = '' + runHook preBuild + ant + runHook postBuild + ''; installPhase = '' - mkdir -p $out/{bin,share/{java,java-cup}} - cp dist/java-cup-11b.jar $out/share/java-cup/ - cp dist/java-cup-11b-runtime.jar $out/share/java/ - cat > $out/bin/javacup < Date: Wed, 3 Jan 2024 22:33:33 +0100 Subject: [PATCH 014/158] javacc: make deterministic and clean up --- .../tools/parsing/javacc/default.nix | 55 ++++++++++++++----- 1 file changed, 40 insertions(+), 15 deletions(-) diff --git a/pkgs/development/tools/parsing/javacc/default.nix b/pkgs/development/tools/parsing/javacc/default.nix index 9af0b7374598..42e1a536de04 100644 --- a/pkgs/development/tools/parsing/javacc/default.nix +++ b/pkgs/development/tools/parsing/javacc/default.nix @@ -1,39 +1,64 @@ -{ stdenv, lib, fetchFromGitHub, ant, jdk, jre, makeWrapper }: +{ lib +, stdenv +, fetchFromGitHub +, ant +, jdk +, jre +, makeWrapper +, canonicalize-jars-hook +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "javacc"; version = "7.0.13"; src = fetchFromGitHub { - owner = pname; - repo = pname; - rev = "${pname}-${version}"; - sha256 = "sha256-nDJvKIbJc23Tvfn7Zqvt5tDDffNf4KQ0juGQQCZ+i1c="; + owner = "javacc"; + repo = "javacc"; + rev = "javacc-${finalAttrs.version}"; + hash = "sha256-nDJvKIbJc23Tvfn7Zqvt5tDDffNf4KQ0juGQQCZ+i1c="; }; - nativeBuildInputs = [ ant jdk makeWrapper ]; + nativeBuildInputs = [ + ant + jdk + makeWrapper + canonicalize-jars-hook + ]; buildPhase = '' + runHook preBuild ant jar + runHook postBuild ''; installPhase = '' - mkdir -p $out/target - mv scripts $out/bin - mv target/javacc.jar $out/target/ - find -L "$out/bin" -type f -executable -print0 \ - | while IFS= read -r -d ''' file; do + runHook preInstall + + install -Dm644 target/javacc.jar -t $out/target + install -Dm755 scripts/{javacc,jjdoc,jjtree,jjrun} -t $out/bin + + for file in $out/bin/*; do wrapProgram "$file" --suffix PATH : ${jre}/bin done + + runHook postInstall ''; doCheck = true; - checkPhase = "ant test"; + + checkPhase = '' + runHook preCheck + ant test + runHook postCheck + ''; meta = with lib; { - homepage = "https://javacc.github.io/javacc"; + changelog = "https://github.com/javacc/javacc/blob/${finalAttrs.src.rev}/docs/release-notes.md"; description = "A parser generator for building parsers from grammars"; + homepage = "https://javacc.github.io/javacc"; license = licenses.bsd2; + mainProgram = "javacc"; maintainers = teams.deshaw.members; }; -} +}) From 0e5b3663c4f50af22909c91ab82be7a1971d7314 Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Thu, 4 Jan 2024 19:13:18 +0100 Subject: [PATCH 015/158] hydraAntLogger: make deterministic and clean up --- .../java/hydra-ant-logger/default.nix | 29 +++++++++++++++---- 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/java/hydra-ant-logger/default.nix b/pkgs/development/libraries/java/hydra-ant-logger/default.nix index 4b18cd7cfadc..96b6cd05ed1a 100644 --- a/pkgs/development/libraries/java/hydra-ant-logger/default.nix +++ b/pkgs/development/libraries/java/hydra-ant-logger/default.nix @@ -1,4 +1,10 @@ -{ fetchFromGitHub, lib, stdenv, ant, jdk }: +{ lib +, stdenv +, fetchFromGitHub +, ant +, jdk +, canonicalize-jars-hook +}: stdenv.mkDerivation { pname = "hydra-ant-logger"; @@ -8,19 +14,30 @@ stdenv.mkDerivation { owner = "NixOS"; repo = "hydra-ant-logger"; rev = "dae3224f4ed42418d3492bdf5bee4f825819006f"; - sha256 = "sha256-5oQ/jZfz7izTcYR+N801HYh4lH2MF54PCMnmA4CpRwc="; + hash = "sha256-5oQ/jZfz7izTcYR+N801HYh4lH2MF54PCMnmA4CpRwc="; }; - buildInputs = [ ant jdk ]; + nativeBuildInputs = [ + ant + jdk + canonicalize-jars-hook + ]; - buildPhase = "mkdir lib; ant"; + buildPhase = '' + runHook preBuild + mkdir lib + ant + runHook postBuild + ''; installPhase = '' - mkdir -p $out/share/java - cp -v *.jar $out/share/java + runHook preBuild + install -Dm644 *.jar -t $out/share/java + runHook postBuild ''; meta = { + homepage = "https://github.com/NixOS/hydra-ant-logger"; platforms = lib.platforms.unix; }; } From 51b6d44f8b156a6bc916214521453f3732d3319b Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Thu, 4 Jan 2024 21:42:18 +0100 Subject: [PATCH 016/158] trimmomatic: make deterministic and clean up --- .../science/biology/trimmomatic/default.nix | 34 ++++++++++++------- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 22 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/science/biology/trimmomatic/default.nix b/pkgs/applications/science/biology/trimmomatic/default.nix index ad1dc45c5c26..53cff76badce 100644 --- a/pkgs/applications/science/biology/trimmomatic/default.nix +++ b/pkgs/applications/science/biology/trimmomatic/default.nix @@ -1,30 +1,36 @@ { lib , stdenv -, ant , fetchFromGitHub -, jdk11_headless +, ant +, jdk , jre , makeWrapper +, canonicalize-jars-hook }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "trimmomatic"; version = "0.39"; src = fetchFromGitHub { owner = "usadellab"; repo = "Trimmomatic"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-u+ubmacwPy/vsEi0YQCv0fTnVDesQvqeQDEwCbS8M6I="; }; - # Set source and target version to 11 + # Remove jdk version requirement postPatch = '' substituteInPlace ./build.xml \ - --replace 'source="1.5" target="1.5"' 'release="11"' + --replace 'source="1.5" target="1.5"' "" ''; - nativeBuildInputs = [ jdk11_headless ant makeWrapper ]; + nativeBuildInputs = [ + ant + jdk + makeWrapper + canonicalize-jars-hook + ]; buildPhase = '' runHook preBuild @@ -37,16 +43,17 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall - mkdir -p $out/bin $out/share - cp dist/jar/trimmomatic-${version}.jar $out/share/ - cp -r adapters $out/share/ + install -Dm644 dist/jar/trimmomatic-*.jar -t $out/share/trimmomatic + cp -r adapters $out/share/trimmomatic + makeWrapper ${jre}/bin/java $out/bin/trimmomatic \ - --add-flags "-cp $out/share/trimmomatic-${version}.jar org.usadellab.trimmomatic.Trimmomatic" + --add-flags "-jar $out/share/trimmomatic/trimmomatic-*.jar" runHook postInstall ''; meta = { + changelog = "https://github.com/usadellab/Trimmomatic/blob/main/versionHistory.txt"; description = "A flexible read trimming tool for Illumina NGS data"; longDescription = '' Trimmomatic performs a variety of useful trimming tasks for illumina @@ -59,8 +66,9 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl3Only; sourceProvenance = [ lib.sourceTypes.fromSource - lib.sourceTypes.binaryBytecode # source bundles dependencies as jars + lib.sourceTypes.binaryBytecode # source bundles dependencies as jars ]; + mainProgram = "trimmomatic"; maintainers = [ lib.maintainers.kupac ]; }; -} +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9162a406235d..1b75bd1894a1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -39100,6 +39100,7 @@ with pkgs; trimal = callPackage ../applications/science/biology/trimal { }; trimmomatic = callPackage ../applications/science/biology/trimmomatic { + jdk = pkgs.jdk11_headless; # Reduce closure size jre = pkgs.jre_minimal.override { modules = [ "java.base" "java.logging" ]; From 03d7223d8e443ca526fd64b699befdca12e65d79 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sat, 6 Jan 2024 23:42:20 +0100 Subject: [PATCH 017/158] vrpn: 2016-08-27 -> 07.35, refactor --- pkgs/development/libraries/vrpn/default.nix | 46 ++++++++++++++------- 1 file changed, 31 insertions(+), 15 deletions(-) diff --git a/pkgs/development/libraries/vrpn/default.nix b/pkgs/development/libraries/vrpn/default.nix index f9eed6b2f747..e233269fafd1 100644 --- a/pkgs/development/libraries/vrpn/default.nix +++ b/pkgs/development/libraries/vrpn/default.nix @@ -1,22 +1,38 @@ -{ lib, stdenv, fetchFromGitHub, unzip, cmake, libGLU, libGL }: +{ lib +, stdenv +, fetchFromGitHub +, unzip +, cmake +, darwin +, libGLU +, libGL +}: stdenv.mkDerivation rec { - name = "${pname}-${date}"; - pname = "vrpn"; - date = "2016-08-27"; + pname = "vrpn"; + version = "07.35"; src = fetchFromGitHub { - owner = "vrpn"; - repo = "vrpn"; - rev = "9fa0ab3676a43527301c9efd3637f80220eb9462"; - sha256 = "032q295d68w34rk5q8nfqdd29s55n00bfik84y7xzkjrpspaprlh"; + owner = "vrpn"; + repo = "vrpn"; + rev = "version_${version}"; + hash = "sha256-vvlwhm5XHWD4Nh1hwY427pe36RQaqTDJiEtkCxHeCig="; }; - nativeBuildInputs = [ cmake unzip ]; - buildInputs = [ libGLU libGL ]; + nativeBuildInputs = [ + cmake + unzip + ]; - doCheck = false; # FIXME: test failure - checkTarget = "test"; + buildInputs = lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.CoreFoundation + darwin.apple_sdk.frameworks.GLUT + darwin.apple_sdk.frameworks.IOKit + darwin.apple_sdk.frameworks.OpenGL + ] ++ lib.optionals stdenv.isLinux [ + libGLU + libGL + ]; meta = with lib; { description = "Virtual Reality Peripheral Network"; @@ -27,9 +43,9 @@ stdenv.mkDerivation rec { set of physical devices (tracker, etc.) used in a virtual-reality (VR) system. ''; - homepage = "https://github.com/vrpn/vrpn"; - license = licenses.boost; # see https://github.com/vrpn/vrpn/wiki/License - platforms = platforms.linux; + homepage = "https://github.com/vrpn/vrpn"; + license = licenses.boost; # see https://github.com/vrpn/vrpn/wiki/License + platforms = platforms.darwin ++ platforms.linux; maintainers = with maintainers; [ ludo ]; }; } From a4a1b149e54a3f843dfde0580882325ea3d799af Mon Sep 17 00:00:00 2001 From: Alexander Kiselyov Date: Sun, 7 Jan 2024 19:12:09 +0300 Subject: [PATCH 018/158] python3Packages.scikit-image: 0.21.0 -> 0.22.0 --- .../python-modules/scikit-image/default.nix | 13 +++----- .../suppress-deprecation-warning.patch | 30 ------------------- 2 files changed, 4 insertions(+), 39 deletions(-) delete mode 100644 pkgs/development/python-modules/scikit-image/suppress-deprecation-warning.patch diff --git a/pkgs/development/python-modules/scikit-image/default.nix b/pkgs/development/python-modules/scikit-image/default.nix index 7987f3bba1cb..de4075522d13 100644 --- a/pkgs/development/python-modules/scikit-image/default.nix +++ b/pkgs/development/python-modules/scikit-image/default.nix @@ -19,6 +19,7 @@ , pooch , pyamg , pytestCheckHook +, numpydoc , pythran , pywavelets , scikit-learn @@ -34,7 +35,7 @@ let installedPackageRoot = "${builtins.placeholder "out"}/${python.sitePackages}"; self = buildPythonPackage rec { pname = "scikit-image"; - version = "0.21.0"; + version = "0.22.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -43,15 +44,9 @@ let owner = "scikit-image"; repo = "scikit-image"; rev = "v${version}"; - hash = "sha256-WJ2WNlcFCEtPr+bV/af6MoBBhbXDpOBEsJu4FmudoIo="; + hash = "sha256-M18y5JBPf3DR7SlJcCf82nG2MzwILg2w1AhJMzZXslg="; }; - patches = [ - # https://github.com/scikit-image/scikit-image/pull/7052 - # prepare a patch file because the commit contains additional changes - ./suppress-deprecation-warning.patch - ]; - postPatch = '' patchShebangs skimage/_build_utils/{version,cythoner}.py @@ -100,7 +95,7 @@ let # test suite is very cpu intensive, move to passthru.tests doCheck = false; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook numpydoc ]; # (1) The package has cythonized modules, whose .so libs will appear only in the wheel, i.e. in nix store; # (2) To stop Python from importing the wrong directory, i.e. the one in the build dir, not the one in nix store, `skimage` dir should be removed or renamed; diff --git a/pkgs/development/python-modules/scikit-image/suppress-deprecation-warning.patch b/pkgs/development/python-modules/scikit-image/suppress-deprecation-warning.patch deleted file mode 100644 index f51f1d9860a4..000000000000 --- a/pkgs/development/python-modules/scikit-image/suppress-deprecation-warning.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/skimage/exposure/tests/test_exposure.py b/skimage/exposure/tests/test_exposure.py -index ed8dd6bc8..8ec7d13bf 100644 ---- a/skimage/exposure/tests/test_exposure.py -+++ b/skimage/exposure/tests/test_exposure.py -@@ -368,19 +368,16 @@ def test_rescale_nan_warning(in_range, out_range): - ) - - # 2019/11/10 Passing NaN to np.clip raises a DeprecationWarning for -- # versions above 1.17 -- # TODO: Remove once NumPy removes this DeprecationWarning -+ # versions above 1.17, "|\A\Z" marks as optional warning -+ # TODO: Remove once NumPy 1.25.0 is minimal dependency - numpy_warning_1_17_plus = ( -- "Passing `np.nan` to mean no clipping in np.clip" -+ "|\\A\\ZPassing `np.nan` to mean no clipping in np.clip" - ) - -- if in_range == "image": -- exp_warn = [msg, numpy_warning_1_17_plus] -- else: -- exp_warn = [msg] -+ with expected_warnings([msg, numpy_warning_1_17_plus]): -+ result = exposure.rescale_intensity(image, in_range, out_range) - -- with expected_warnings(exp_warn): -- exposure.rescale_intensity(image, in_range, out_range) -+ assert np.all(np.isnan(result)) - - - @pytest.mark.parametrize( From 2536bb426a3d05b7d0d621a4530910259d740694 Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Sun, 7 Jan 2024 18:45:46 +0100 Subject: [PATCH 019/158] martyr: remove --- pkgs/development/libraries/martyr/default.nix | 25 ------------------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 27 deletions(-) delete mode 100644 pkgs/development/libraries/martyr/default.nix diff --git a/pkgs/development/libraries/martyr/default.nix b/pkgs/development/libraries/martyr/default.nix deleted file mode 100644 index 3221f2950c17..000000000000 --- a/pkgs/development/libraries/martyr/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{lib, stdenv, fetchurl, ant, jdk}: - -stdenv.mkDerivation rec { - pname = "martyr"; - version = "0.3.9"; - src = fetchurl { - url = "mirror://sourceforge/martyr/${pname}-${version}.tar.gz"; - sha256 = "1ks8j413bcby345kmq1i7av8kwjvz5vxdn1zpv0p7ywxq54i4z59"; - }; - - buildInputs = [ ant jdk ]; - - buildPhase = "ant"; - - installPhase = '' - mkdir -p "$out/share/java" - cp -v *.jar "$out/share/java" - ''; - - meta = { - description = "Java framework around the IRC protocol to allow application writers easy manipulation of the protocol and client state"; - homepage = "https://martyr.sourceforge.net/"; - license = lib.licenses.lgpl21; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 76bfc95600b9..18b83dae4989 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -40478,8 +40478,6 @@ with pkgs; mamba = callPackage ../applications/audio/mamba { }; - martyr = callPackage ../development/libraries/martyr { }; - mas = callPackage ../os-specific/darwin/mas { }; micromamba = callPackage ../tools/package-management/micromamba { }; From dd123afdf616a3cf4a3d9baa85932a7f915509bd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 8 Jan 2024 06:57:44 +0000 Subject: [PATCH 020/158] docker-slim: 1.40.7 -> 1.40.8 --- pkgs/applications/virtualization/docker-slim/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/docker-slim/default.nix b/pkgs/applications/virtualization/docker-slim/default.nix index 226e29ebd3ff..44c3c6330068 100644 --- a/pkgs/applications/virtualization/docker-slim/default.nix +++ b/pkgs/applications/virtualization/docker-slim/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "docker-slim"; - version = "1.40.7"; + version = "1.40.8"; src = fetchFromGitHub { owner = "slimtoolkit"; repo = "slim"; rev = version; - hash = "sha256-X+7FMdIotnafUEKQUrvxYgN4qGqbtVJaZD+V4/whylM="; + hash = "sha256-t02zshwSN+egKx+ySluvKK+BR4b0huuQW/BdjnCxOMU="; }; vendorHash = null; From 0aef6bf5521c10c24ffe35d1639a1aaf74f9c9e2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 8 Jan 2024 10:02:07 +0000 Subject: [PATCH 021/158] pocketbase: 0.20.2 -> 0.20.5 --- pkgs/servers/pocketbase/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/pocketbase/default.nix b/pkgs/servers/pocketbase/default.nix index 2afdd2fb7206..fc12e6dd4071 100644 --- a/pkgs/servers/pocketbase/default.nix +++ b/pkgs/servers/pocketbase/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "pocketbase"; - version = "0.20.2"; + version = "0.20.5"; src = fetchFromGitHub { owner = "pocketbase"; repo = "pocketbase"; rev = "v${version}"; - hash = "sha256-+8D562PwSwplSI4vXXeMO2e3DazpANA4hcJGkVCspOw="; + hash = "sha256-a6UraZzl4mtacjrK3CbuJaOJ2jDw/8+t77w/JDMy9XA="; }; vendorHash = "sha256-Y70GNXThSZdG+28/ZQgxXhyZWAtMu0OM97Yhmo0Eigc="; From f2e669deb9b9fb8b190ed89ded824048bd3b94bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Fri, 5 Jan 2024 15:30:39 -0300 Subject: [PATCH 022/158] labwc-tweaks: add update script --- pkgs/by-name/la/labwc-tweaks/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/la/labwc-tweaks/package.nix b/pkgs/by-name/la/labwc-tweaks/package.nix index 08ae71867114..b09d4d4b6fe8 100644 --- a/pkgs/by-name/la/labwc-tweaks/package.nix +++ b/pkgs/by-name/la/labwc-tweaks/package.nix @@ -7,6 +7,7 @@ , gtk3 , libxml2 , wrapGAppsHook +, unstableGitUpdater }: stdenv.mkDerivation (finalAttrs: { @@ -39,6 +40,8 @@ stdenv.mkDerivation (finalAttrs: { sed -i '/{ NULL, "\/usr\/share" },/i { NULL, "/run/current-system/sw/share" },' theme.c ''; + passthru.updateScript = unstableGitUpdater { }; + meta = { homepage = "https://github.com/labwc/labwc-tweaks"; description = "Configuration gui app for labwc"; From 9284c4bbd6c6ded13f15dc629c7006e42c24fe1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Fri, 5 Jan 2024 15:32:38 -0300 Subject: [PATCH 023/158] lawbc-tweaks: fix license --- pkgs/by-name/la/labwc-tweaks/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/la/labwc-tweaks/package.nix b/pkgs/by-name/la/labwc-tweaks/package.nix index b09d4d4b6fe8..29d4462e49df 100644 --- a/pkgs/by-name/la/labwc-tweaks/package.nix +++ b/pkgs/by-name/la/labwc-tweaks/package.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/labwc/labwc-tweaks"; description = "Configuration gui app for labwc"; mainProgram = "labwc-tweaks"; - license = lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Only; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ romildo ]; }; From 991c4fb907ceb2b48ca9787fa9f12fa0b3fa202a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Fri, 5 Jan 2024 15:33:04 -0300 Subject: [PATCH 024/158] labwc-tweaks: add maintainer --- pkgs/by-name/la/labwc-tweaks/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/la/labwc-tweaks/package.nix b/pkgs/by-name/la/labwc-tweaks/package.nix index 29d4462e49df..fee5d5927a1c 100644 --- a/pkgs/by-name/la/labwc-tweaks/package.nix +++ b/pkgs/by-name/la/labwc-tweaks/package.nix @@ -48,6 +48,6 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "labwc-tweaks"; license = lib.licenses.gpl2Only; platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ romildo ]; + maintainers = with lib.maintainers; [ AndersonTorres romildo ]; }; }) From 665b266049503312b4ca992842542aa8a2fa67d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Tue, 9 Jan 2024 09:24:34 -0300 Subject: [PATCH 025/158] labwc-tweaks: add dependence on xkeyboard_config --- pkgs/by-name/la/labwc-tweaks/package.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/la/labwc-tweaks/package.nix b/pkgs/by-name/la/labwc-tweaks/package.nix index fee5d5927a1c..95ec7f1b1f4d 100644 --- a/pkgs/by-name/la/labwc-tweaks/package.nix +++ b/pkgs/by-name/la/labwc-tweaks/package.nix @@ -6,6 +6,7 @@ , pkg-config , gtk3 , libxml2 +, xkeyboard_config , wrapGAppsHook , unstableGitUpdater }: @@ -36,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; postPatch = '' - substituteInPlace stack-lang.c --replace /usr/share /run/current-system/sw/share + substituteInPlace stack-lang.c --replace /usr/share/X11/xkb ${xkeyboard_config}/share/X11/xkb sed -i '/{ NULL, "\/usr\/share" },/i { NULL, "/run/current-system/sw/share" },' theme.c ''; From 90847e9a044400bf81a5a54e00943b9debe58d1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Tue, 9 Jan 2024 09:26:46 -0300 Subject: [PATCH 026/158] labwc-tweaks: unstable-2023-12-08 -> unstable-2024-01-04 --- pkgs/by-name/la/labwc-tweaks/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/la/labwc-tweaks/package.nix b/pkgs/by-name/la/labwc-tweaks/package.nix index 95ec7f1b1f4d..5d699d8999b7 100644 --- a/pkgs/by-name/la/labwc-tweaks/package.nix +++ b/pkgs/by-name/la/labwc-tweaks/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "labwc-tweaks"; - version = "unstable-2023-12-08"; + version = "unstable-2024-01-04"; src = fetchFromGitHub { owner = "labwc"; - repo = finalAttrs.pname; - rev = "1c79d6a5ee3ac3d1a6140a1a98ae89674ef36635"; - hash = "sha256-RD1VCKVoHsoY7SezY7tjZzomikMgA7N6B5vaYkIo9Es="; + repo = "labwc-tweaks"; + rev = "1604f64cc62e4800ee04a6e1c323a48ee8140d83"; + hash = "sha256-xFvc+Y03HjSvj846o84Wpk5tEXI49z8xkILSX2oas8A="; }; nativeBuildInputs = [ @@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' substituteInPlace stack-lang.c --replace /usr/share/X11/xkb ${xkeyboard_config}/share/X11/xkb - sed -i '/{ NULL, "\/usr\/share" },/i { NULL, "/run/current-system/sw/share" },' theme.c + substituteInPlace theme.c --replace /usr/share /run/current-system/sw/share ''; passthru.updateScript = unstableGitUpdater { }; From c73505f25e793067b6f0c601520e195b5a7ba481 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 9 Jan 2024 13:15:25 +0000 Subject: [PATCH 027/158] tflint: 0.50.0 -> 0.50.1 --- pkgs/development/tools/analysis/tflint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/tflint/default.nix b/pkgs/development/tools/analysis/tflint/default.nix index 0a917ac86bbc..afdd4fe022b5 100644 --- a/pkgs/development/tools/analysis/tflint/default.nix +++ b/pkgs/development/tools/analysis/tflint/default.nix @@ -10,13 +10,13 @@ buildGoModule rec { pname = "tflint"; - version = "0.50.0"; + version = "0.50.1"; src = fetchFromGitHub { owner = "terraform-linters"; repo = pname; rev = "v${version}"; - hash = "sha256-+DTq9gb2zaXT7bSgRCJpco4ppRkTAyrWcxJfBLnwGMI="; + hash = "sha256-r/mVLgJudHyNvQa9H9pQ1qhiFx11RikIg4IIz5tC6Us="; }; vendorHash = "sha256-iyJx5dp+NYbaJhZL67ZjFd28ms3vyF38z9P8qJscryQ="; From 0ddbaa8102cd03ad80a870e4b2a651c2d4285091 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 9 Jan 2024 13:45:11 +0000 Subject: [PATCH 028/158] flow: 0.225.1 -> 0.226.0 --- pkgs/development/tools/analysis/flow/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index 040e44ea5bc2..2f3820c555fd 100644 --- a/pkgs/development/tools/analysis/flow/default.nix +++ b/pkgs/development/tools/analysis/flow/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "flow"; - version = "0.225.1"; + version = "0.226.0"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "v${version}"; - hash = "sha256-tJWq2l5axnukjqJGZwrVF/UDcPdPGDyjol8fs0a777g="; + hash = "sha256-mWC98FLh5m2gYFlFUjrJBeaFBuNx8fm5ojiidE7c2rU="; }; postPatch = '' From 95e0b5c60cfacc1e99ce98b61aed8aa89936712d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 9 Jan 2024 14:01:16 +0000 Subject: [PATCH 029/158] libpg_query: 16-5.0.0 -> 16-5.1.0 --- pkgs/development/libraries/libpg_query/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libpg_query/default.nix b/pkgs/development/libraries/libpg_query/default.nix index e74c0b781055..ad7043e064e3 100644 --- a/pkgs/development/libraries/libpg_query/default.nix +++ b/pkgs/development/libraries/libpg_query/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libpg_query"; - version = "16-5.0.0"; + version = "16-5.1.0"; src = fetchFromGitHub { owner = "pganalyze"; repo = "libpg_query"; rev = version; - hash = "sha256-nO4ZqjEpQqmIZcsrhayGhjD4HKUBD1tEZg/khmdgK68="; + hash = "sha256-X48wjKdgkAc4wUubQ5ip1zZYiCKzQJyQTgGvO/pOY3I="; }; nativeBuildInputs = [ which ]; From 98bbfbbf6511cf4da64be4209f7a7d24a234cd97 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 9 Jan 2024 20:12:33 +0000 Subject: [PATCH 030/158] cava: 0.9.1 -> 0.10.0 --- pkgs/applications/audio/cava/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/cava/default.nix b/pkgs/applications/audio/cava/default.nix index af3d35e0b91f..6b8390629829 100644 --- a/pkgs/applications/audio/cava/default.nix +++ b/pkgs/applications/audio/cava/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "cava"; - version = "0.9.1"; + version = "0.10.0"; src = fetchFromGitHub { owner = "karlstav"; repo = "cava"; rev = version; - hash = "sha256-W/2B9iTcO2F2vHQzcbg/6pYBwe+rRNfADdOiw4NY9Jk="; + hash = "sha256-AQR1qc6HgkUkXBRf7kGy4QdtfCj+YVDlYSEIWOutkTk="; }; buildInputs = [ From eb30af1ec3c6f68cd39bda96d223ee5bf78e74e8 Mon Sep 17 00:00:00 2001 From: Georg Haas Date: Tue, 9 Jan 2024 22:22:08 +0100 Subject: [PATCH 031/158] ghorg: add shell completion --- pkgs/applications/version-management/ghorg/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/version-management/ghorg/default.nix b/pkgs/applications/version-management/ghorg/default.nix index f76a0f77e54f..4137b1c37484 100644 --- a/pkgs/applications/version-management/ghorg/default.nix +++ b/pkgs/applications/version-management/ghorg/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: buildGoModule rec { pname = "ghorg"; @@ -18,6 +18,14 @@ buildGoModule rec { ldflags = [ "-s" "-w" "-X main.version=${version}" ]; + nativeBuildInputs = [ installShellFiles ]; + postInstall = '' + installShellCompletion --cmd ghorg \ + --bash <($out/bin/ghorg completion bash) \ + --fish <($out/bin/ghorg completion fish) \ + --zsh <($out/bin/ghorg completion zsh) + ''; + meta = with lib; { description = "Quickly clone an entire org/users repositories into one directory"; longDescription = '' From 444dfe5657465d4fab5a9a06a048dc46d00a6abd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 10 Jan 2024 01:31:16 +0000 Subject: [PATCH 032/158] du-dust: 0.8.6 -> 0.9.0 --- pkgs/tools/misc/dust/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/dust/default.nix b/pkgs/tools/misc/dust/default.nix index 3851a026a921..c3994f05b6a4 100644 --- a/pkgs/tools/misc/dust/default.nix +++ b/pkgs/tools/misc/dust/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "du-dust"; - version = "0.8.6"; + version = "0.9.0"; src = fetchFromGitHub { owner = "bootandy"; repo = "dust"; rev = "v${version}"; - sha256 = "sha256-PEW13paHNQ1JAz9g3pIdCB1f1KqIz8XC4gGE0z/glOk="; + sha256 = "sha256-5X7gRMTUrG6ecZnwExBTadOJo/HByohTMDsgxFmp1HM="; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. postFetch = '' @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { ''; }; - cargoHash = "sha256-VJBmVidLkx4nIQULtDoywV4QGmgf53YAAXLJH/LZ/j0="; + cargoHash = "sha256-uc7jbA8HqsH1bSJgbnUVT/f7F7kZJ4Jf3yyFvseH7no="; nativeBuildInputs = [ installShellFiles ]; From 0e7c6f71911e079a9f10b380919d2ef5161eb6cb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 10 Jan 2024 05:00:16 +0000 Subject: [PATCH 033/158] limesctl: 3.3.1 -> 3.3.2 --- pkgs/applications/misc/limesctl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/limesctl/default.nix b/pkgs/applications/misc/limesctl/default.nix index 4228d5eec0ab..119d8488ed47 100644 --- a/pkgs/applications/misc/limesctl/default.nix +++ b/pkgs/applications/misc/limesctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "limesctl"; - version = "3.3.1"; + version = "3.3.2"; src = fetchFromGitHub { owner = "sapcc"; repo = pname; rev = "v${version}"; - hash = "sha256-osXwVZuMB9cMj0tEMBOQ8hrKWAmfXui4ELoi0dm9yB4="; + hash = "sha256-UYQe2C50tB1uc5ij8oh+RBaFg9UYWwPmJ77LCJ11Ml4="; }; vendorHash = null; From 8bf17d903dfc2386bfba8a2b86c23a350a8af473 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 8 Jan 2024 15:10:27 +0100 Subject: [PATCH 034/158] =?UTF-8?q?ocamlPackages.trace:=200.3=20=E2=86=92?= =?UTF-8?q?=200.5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/trace/default.nix | 6 +++--- pkgs/development/ocaml-modules/trace/tef.nix | 9 +++++++++ 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/trace/default.nix b/pkgs/development/ocaml-modules/trace/default.nix index a27a61d4baf1..2c7356669860 100644 --- a/pkgs/development/ocaml-modules/trace/default.nix +++ b/pkgs/development/ocaml-modules/trace/default.nix @@ -2,13 +2,13 @@ buildDunePackage rec { pname = "trace"; - version = "0.3"; + version = "0.5"; minimalOCamlVersion = "4.07"; src = fetchurl { - url = "https://github.com/c-cube/ocaml-trace/releases/download/${version}/trace-${version}.tbz"; - hash = "sha256-Krq6qYO7tKJktTRjFrdmONPHfjrd81Ighsb9nmG9ZQU="; + url = "https://github.com/c-cube/ocaml-trace/releases/download/v${version}/trace-${version}.tbz"; + hash = "sha256-l0NvWPGBd1WR+b50WXEYfptuCUjda8MlZ/o5YngRNIg="; }; meta = { diff --git a/pkgs/development/ocaml-modules/trace/tef.nix b/pkgs/development/ocaml-modules/trace/tef.nix index c1a6f9251554..eeeda78f580d 100644 --- a/pkgs/development/ocaml-modules/trace/tef.nix +++ b/pkgs/development/ocaml-modules/trace/tef.nix @@ -4,6 +4,15 @@ buildDunePackage { pname = "trace-tef"; inherit (trace) src version; + # This removes the dependency on the “atomic” package + # (not available in nixpkgs) + # Said package for OCaml ≥ 4.12 is empty + postPatch = '' + substituteInPlace src/tef/dune --replace 'atomic ' "" + ''; + + minimalOCamlVersion = "4.12"; + propagatedBuildInputs = [ mtime trace ]; doCheck = true; From d681b2827612de796c1b3853975d2da310dee60a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 10 Jan 2024 14:56:04 +0000 Subject: [PATCH 035/158] python310Packages.types-protobuf: 4.24.0.4 -> 4.24.0.20240106 --- pkgs/development/python-modules/types-protobuf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-protobuf/default.nix b/pkgs/development/python-modules/types-protobuf/default.nix index 1004c671a1c7..841edf89f4c6 100644 --- a/pkgs/development/python-modules/types-protobuf/default.nix +++ b/pkgs/development/python-modules/types-protobuf/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "types-protobuf"; - version = "4.24.0.4"; + version = "4.24.0.20240106"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-V6tCyxcd/bosdLtbUMJQR4U4zDxe2VuLNokprQyfkKU="; + hash = "sha256-Ak8DTzteK7K7/1XrxNWR7Q0igNkPrO7csUi55xSj8+4="; }; propagatedBuildInputs = [ From 19f3b6d72b2e8e6ab6852c4e859418f58343494d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 10 Jan 2024 14:56:12 +0000 Subject: [PATCH 036/158] python310Packages.types-pyopenssl: 23.3.0.0 -> 23.3.0.20240106 --- pkgs/development/python-modules/types-pyopenssl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-pyopenssl/default.nix b/pkgs/development/python-modules/types-pyopenssl/default.nix index b7f751a0cca1..3af4ba92b01a 100644 --- a/pkgs/development/python-modules/types-pyopenssl/default.nix +++ b/pkgs/development/python-modules/types-pyopenssl/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "types-pyopenssl"; - version = "23.3.0.0"; + version = "23.3.0.20240106"; format = "setuptools"; src = fetchPypi { pname = "types-pyOpenSSL"; inherit version; - hash = "sha256-X/sHf+cLaZyI1cqrmZroDhkv4ov2zaeYm355seTi3NM="; + hash = "sha256-PW80Yr7AwmDKrfk/uzdyJcEmZht3nH2auZttrVyhDbk="; }; propagatedBuildInputs = [ From 140de3ce881f38c942b7172dae906fe92d6cb301 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 10 Jan 2024 14:56:48 +0000 Subject: [PATCH 037/158] python310Packages.types-pillow: 10.1.0.2 -> 10.1.0.20240106 --- pkgs/development/python-modules/types-pillow/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-pillow/default.nix b/pkgs/development/python-modules/types-pillow/default.nix index 45d4c9bedf18..f4dad0490d5c 100644 --- a/pkgs/development/python-modules/types-pillow/default.nix +++ b/pkgs/development/python-modules/types-pillow/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "types-pillow"; - version = "10.1.0.2"; + version = "10.1.0.20240106"; format = "setuptools"; src = fetchPypi { inherit version; pname = "types-Pillow"; - hash = "sha256-UlwcXuZ7CsFyHEDSvGGCJu8hI8NH5SfhTgW5IHIaE7k="; + hash = "sha256-0sLtfs5rC+y02vFQ4jdMj02Xf+bv7GJe+VLiYldhkOc="; }; # Modules doesn't have tests From bdde4d5ee74712b74787ff81951281828aafabea Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 10 Jan 2024 16:10:38 +0100 Subject: [PATCH 038/158] python311Packages.mitmproxy-macos: 0.4.1 -> 0.5.1 Changelog: https://github.com/mitmproxy/mitmproxy_rs/blob/0.5.1/CHANGELOG.md --- .../python-modules/mitmproxy-macos/default.nix | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/mitmproxy-macos/default.nix b/pkgs/development/python-modules/mitmproxy-macos/default.nix index 0ce125e691e1..ce0b19120f1c 100644 --- a/pkgs/development/python-modules/mitmproxy-macos/default.nix +++ b/pkgs/development/python-modules/mitmproxy-macos/default.nix @@ -2,30 +2,37 @@ , buildPythonPackage , fetchFromGitHub , hatchling +, pythonOlder }: buildPythonPackage rec { pname = "mitmproxy-macos"; - version = "0.4.1"; + version = "0.5.1"; pyproject = true; + disabled = pythonOlder "3.10"; + src = fetchFromGitHub { owner = "mitmproxy"; repo = "mitmproxy_rs"; - rev = version; - hash = "sha256-Vc7ez/W40CefO2ZLAHot14p478pDPtQor865675vCtI="; + rev = "refs/tags/${version}"; + hash = "sha256-nrm1T2yaGVmYsubwNJHPnPDC/A/jYiKVzwBKmuc9MD4="; }; sourceRoot = "${src.name}/mitmproxy-macos"; - pythonImportsCheck = [ "mitmproxy_macos" ]; + nativeBuildInputs = [ hatchling ]; + pythonImportsCheck = [ + "mitmproxy_macos" + ]; + meta = with lib; { description = "The MacOS Rust bits in mitmproxy"; homepage = "https://github.com/mitmproxy/mitmproxy_rs/tree/main/mitmproxy-macos"; - changelog = "https://github.com/mitmproxy/mitmproxy_rs/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/mitmproxy/mitmproxy_rs/blob/${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ boltzmannrain ]; platforms = platforms.darwin; From 44d96641884293e75bf2dadc12aac44fcd28a807 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 10 Jan 2024 16:12:49 +0100 Subject: [PATCH 039/158] python311Packages.mitmproxy-rs: 0.4.1 -> 0.5.1 Diff: https://github.com/mitmproxy/mitmproxy_rs/compare/0.4.1...0.5.1 Changelog: https://github.com/mitmproxy/mitmproxy_rs/blob/0.5.1/CHANGELOG.md --- .../python-modules/mitmproxy-rs/Cargo.lock | 151 ++++++++++++------ .../python-modules/mitmproxy-rs/default.nix | 7 +- 2 files changed, 108 insertions(+), 50 deletions(-) diff --git a/pkgs/development/python-modules/mitmproxy-rs/Cargo.lock b/pkgs/development/python-modules/mitmproxy-rs/Cargo.lock index 3c0c5cc67535..9efa7356904c 100644 --- a/pkgs/development/python-modules/mitmproxy-rs/Cargo.lock +++ b/pkgs/development/python-modules/mitmproxy-rs/Cargo.lock @@ -612,9 +612,9 @@ dependencies = [ [[package]] name = "data-encoding" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308" +checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" [[package]] name = "defmt" @@ -667,9 +667,9 @@ checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" [[package]] name = "env_logger" -version = "0.10.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0" +checksum = "95b3f3e67048839cb0d0781f445682a35113da7121f7c949db0e2be96a4fbece" dependencies = [ "humantime", "is-terminal", @@ -1126,10 +1126,12 @@ checksum = "fc6d6206008e25125b1f97fbe5d309eb7b85141cf9199d52dbd3729a1584dd16" [[package]] name = "internet-packet" -version = "0.1.0" -source = "git+https://github.com/mhils/internet-packet.git#9d706e0f6a28da91f63e3417c7bb4c2e977a2385" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95d8d20ad61a92e71edf571fa568e14aeba0c5f00548acd491fbf694ce9a5ad8" dependencies = [ "internet-checksum", + "smoltcp", ] [[package]] @@ -1221,9 +1223,9 @@ checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" [[package]] name = "libc" -version = "0.2.148" +version = "0.2.150" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cdc71e17332e86d2e1d38c1f99edcb6288ee11b815fb1a4b049eaa2114d369b" +checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" [[package]] name = "linux-raw-sys" @@ -1255,7 +1257,7 @@ checksum = "9106e1d747ffd48e6be5bb2d97fa706ed25b144fbee4d5c02eae110cd8d6badd" [[package]] name = "macos-certificate-truster" -version = "0.4.1" +version = "0.5.1" dependencies = [ "apple-security-framework", ] @@ -1320,9 +1322,9 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.8" +version = "0.8.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" +checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0" dependencies = [ "libc", "wasi", @@ -1331,7 +1333,7 @@ dependencies = [ [[package]] name = "mitm-wg-test-client" -version = "0.4.1" +version = "0.5.1" dependencies = [ "anyhow", "boringtun", @@ -1342,7 +1344,7 @@ dependencies = [ [[package]] name = "mitmproxy" -version = "0.4.1" +version = "0.5.1" dependencies = [ "anyhow", "apple-security-framework", @@ -1353,7 +1355,9 @@ dependencies = [ "env_logger", "futures-util", "image", + "internet-packet", "log", + "lru_time_cache", "nix 0.27.1", "once_cell", "pretty-hex", @@ -1363,13 +1367,13 @@ dependencies = [ "smoltcp", "tokio", "tokio-util", - "windows 0.51.1", + "windows 0.52.0", "x25519-dalek", ] [[package]] name = "mitmproxy_rs" -version = "0.4.1" +version = "0.5.1" dependencies = [ "anyhow", "boringtun", @@ -1507,7 +1511,7 @@ dependencies = [ "libc", "redox_syscall", "smallvec", - "windows-targets", + "windows-targets 0.48.5", ] [[package]] @@ -1614,9 +1618,9 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "pretty-hex" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6fa0831dd7cc608c38a5e323422a0077678fa5744aa2be4ad91c4ece8eec8d5" +checksum = "23c6b968ed37d62e35b4febaba13bfa231b0b7929d68b8a94e65445a17e2d35f" [[package]] name = "proc-macro-error" @@ -1653,9 +1657,9 @@ dependencies = [ [[package]] name = "prost" -version = "0.12.1" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4fdd22f3b9c31b53c060df4a0613a1c7f062d4115a2b984dd15b1858f7e340d" +checksum = "146c289cda302b98a28d40c8b3b90498d6e526dd24ac2ecea73e4e491685b94a" dependencies = [ "bytes", "prost-derive", @@ -1663,9 +1667,9 @@ dependencies = [ [[package]] name = "prost-derive" -version = "0.12.1" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "265baba7fabd416cf5078179f7d2cbeca4ce7a9041111900675ea7c4cb8a4c32" +checksum = "efb6c9a1dd1def8e2124d17e83a20af56f1570d6c2d2bd9e266ccb768df3840e" dependencies = [ "anyhow", "itertools 0.11.0", @@ -2063,9 +2067,9 @@ dependencies = [ [[package]] name = "socket2" -version = "0.5.4" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4031e820eb552adee9295814c0ced9e5cf38ddf1e8b7d566d6de8e2538ea989e" +checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" dependencies = [ "libc", "windows-sys", @@ -2205,9 +2209,9 @@ dependencies = [ [[package]] name = "tokio" -version = "1.33.0" +version = "1.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f38200e3ef7995e5ef13baec2f432a6da0aa9ac495b2c0e8f3b7eec2c92d653" +checksum = "d0c014766411e834f7af5b8f4cf46257aab4036ca95e9d2c144a10f59ad6f5b9" dependencies = [ "backtrace", "bytes", @@ -2216,7 +2220,7 @@ dependencies = [ "num_cpus", "pin-project-lite", "signal-hook-registry", - "socket2 0.5.4", + "socket2 0.5.5", "tokio-macros", "tracing", "windows-sys", @@ -2234,9 +2238,9 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" +checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", @@ -2597,31 +2601,31 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" dependencies = [ - "windows-targets", + "windows-targets 0.48.5", ] [[package]] name = "windows" -version = "0.51.1" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca229916c5ee38c2f2bc1e9d8f04df975b4bd93f9955dc69fabb5d91270045c9" +checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" dependencies = [ "windows-core", - "windows-targets", + "windows-targets 0.52.0", ] [[package]] name = "windows-core" -version = "0.51.1" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets", + "windows-targets 0.52.0", ] [[package]] name = "windows-redirector" -version = "0.4.1" +version = "0.5.1" dependencies = [ "anyhow", "env_logger", @@ -2642,7 +2646,7 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ - "windows-targets", + "windows-targets 0.48.5", ] [[package]] @@ -2651,13 +2655,28 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", +] + +[[package]] +name = "windows-targets" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +dependencies = [ + "windows_aarch64_gnullvm 0.52.0", + "windows_aarch64_msvc 0.52.0", + "windows_i686_gnu 0.52.0", + "windows_i686_msvc 0.52.0", + "windows_x86_64_gnu 0.52.0", + "windows_x86_64_gnullvm 0.52.0", + "windows_x86_64_msvc 0.52.0", ] [[package]] @@ -2666,42 +2685,84 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" + [[package]] name = "windows_aarch64_msvc" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" + [[package]] name = "windows_i686_gnu" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" +[[package]] +name = "windows_i686_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" + [[package]] name = "windows_i686_msvc" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" +[[package]] +name = "windows_i686_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" + [[package]] name = "windows_x86_64_gnu" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" + [[package]] name = "windows_x86_64_gnullvm" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" + [[package]] name = "windows_x86_64_msvc" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" + [[package]] name = "winres" version = "0.1.12" diff --git a/pkgs/development/python-modules/mitmproxy-rs/default.nix b/pkgs/development/python-modules/mitmproxy-rs/default.nix index 33b0d7acee18..78fd4b42f232 100644 --- a/pkgs/development/python-modules/mitmproxy-rs/default.nix +++ b/pkgs/development/python-modules/mitmproxy-rs/default.nix @@ -10,21 +10,18 @@ buildPythonPackage rec { pname = "mitmproxy-rs"; - version = "0.4.1"; + version = "0.5.1"; pyproject = true; src = fetchFromGitHub { owner = "mitmproxy"; repo = "mitmproxy_rs"; rev = version; - hash = "sha256-Vc7ez/W40CefO2ZLAHot14p478pDPtQor865675vCtI="; + hash = "sha256-nrm1T2yaGVmYsubwNJHPnPDC/A/jYiKVzwBKmuc9MD4="; }; cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; - outputHashes = { - "internet-packet-0.1.0" = "sha256-VtEuCE1sulBIFVymh7YW7VHCuIBjtb6tHoPz2tjxX+Q="; - }; }; buildAndTestSubdir = "mitmproxy-rs"; From 11a4abdf1aac3abd1b3763e0473aa4356606722d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 10 Jan 2024 15:14:06 +0000 Subject: [PATCH 040/158] python310Packages.types-redis: 4.6.0.11 -> 4.6.0.20240106 --- pkgs/development/python-modules/types-redis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-redis/default.nix b/pkgs/development/python-modules/types-redis/default.nix index 03fe60ce33d2..dcdc6d1575cf 100644 --- a/pkgs/development/python-modules/types-redis/default.nix +++ b/pkgs/development/python-modules/types-redis/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "types-redis"; - version = "4.6.0.11"; + version = "4.6.0.20240106"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-yM/IRjUYPeyi20pSiWbFVmRF/TcTmD8ANPsPWgngiQ0="; + hash = "sha256-Ky+jp4+EVZYWJC0j+G3l9BMN/Ww7g/stjOMynlA/dW4="; }; propagatedBuildInputs = [ From 2ea8367d3cfbdcea0459716a5be56267e7cbae03 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 10 Jan 2024 16:25:33 +0100 Subject: [PATCH 041/158] python311Packages.mitmproxy: 10.1.6 -> 10.2.1 Diff: https://github.com/mitmproxy/mitmproxy/compare/refs/tags/10.1.6...10.2.1 Changelog: https://github.com/mitmproxy/mitmproxy/blob/10.2.1/CHANGELOG.md --- pkgs/development/python-modules/mitmproxy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mitmproxy/default.nix b/pkgs/development/python-modules/mitmproxy/default.nix index d64fbf32614a..86b6bcac9f3f 100644 --- a/pkgs/development/python-modules/mitmproxy/default.nix +++ b/pkgs/development/python-modules/mitmproxy/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { pname = "mitmproxy"; - version = "10.1.6"; + version = "10.2.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -53,7 +53,7 @@ buildPythonPackage rec { owner = "mitmproxy"; repo = "mitmproxy"; rev = "refs/tags/${version}"; - hash = "sha256-W+gxK5bNCit1jK9ojwE/HVjUz6OJcNw6Ac1lN5FxGgw="; + hash = "sha256-BO7oQ4TVuZ4dCtROq2M24V6HVo0jzyBdQfb67dYA07U="; }; propagatedBuildInputs = [ From 2e7dfe311e2d766e56833ed15df3578c34fc2d81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20Reyrol?= Date: Wed, 10 Jan 2024 17:43:45 +0100 Subject: [PATCH 042/158] jira-cli-go: 1.4.0 -> 1.5.0 Diff: https://github.com/ankitpokhrel/jira-cli/compare/v1.4.0...v1.5.0 Changelog: https://github.com/ankitpokhrel/jira-cli/releases/tag/v1.5.0 --- pkgs/development/tools/jira-cli-go/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/jira-cli-go/default.nix b/pkgs/development/tools/jira-cli-go/default.nix index cfc37cc015fe..51b847769cbb 100644 --- a/pkgs/development/tools/jira-cli-go/default.nix +++ b/pkgs/development/tools/jira-cli-go/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "jira-cli-go"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "ankitpokhrel"; repo = "jira-cli"; rev = "v${version}"; - hash = "sha256-+8OPXyOTEnX864Lr8IugHh890XtmRtUr1pEN1/QxMz4="; + hash = "sha256-FdDoKww/6WzKCZBrgvh72TRovMXLOOzlmoFreMGWAeo="; }; - vendorHash = "sha256-sG/ZKQRVxBfaMKnLk2+HdmRhojI6BZVob1XDIAYMfY0="; + vendorHash = "sha256-DAdzbANqr0fa4uO8k/yJFoirgbZiKOQhOH8u8d+ncao="; ldflags = [ "-s" "-w" From c377bc91477293d106346ee634373851e191b65e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 10 Jan 2024 18:00:10 +0000 Subject: [PATCH 043/158] kustomize-sops: 4.3.0 -> 4.3.1 --- pkgs/development/tools/kustomize/kustomize-sops.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/kustomize/kustomize-sops.nix b/pkgs/development/tools/kustomize/kustomize-sops.nix index 777a4466e6f9..adc354d496de 100644 --- a/pkgs/development/tools/kustomize/kustomize-sops.nix +++ b/pkgs/development/tools/kustomize/kustomize-sops.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kustomize-sops"; - version = "4.3.0"; + version = "4.3.1"; src = fetchFromGitHub { owner = "viaduct-ai"; repo = pname; rev = "v${version}"; - hash = "sha256-fN83o84GbfMVG20c1/ROwxYPgnJ4g1U2wsM6j/VGtMY="; + hash = "sha256-zEiRbbQzUqFHNtrzyZDNEaXT/T+TfB6KqOXkdjrCiW4="; }; - vendorHash = "sha256-3AA7Zn9KYAJrcotiIpwm5eOfiuJuvLb0rl6FrcwGgSA="; + vendorHash = "sha256-aNrhS4oCG5DB3yjolWL49DtNqZA5dNRqQ2YPBeKQzWI="; installPhase = '' mkdir -p $out/lib/viaduct.ai/v1/ksops-exec/ From c374c81d1ae225dacdfadd78f073ac066aece809 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 10 Jan 2024 18:39:11 +0000 Subject: [PATCH 044/158] pipes-rs: 1.6.2 -> 1.6.3 --- pkgs/misc/screensavers/pipes-rs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/screensavers/pipes-rs/default.nix b/pkgs/misc/screensavers/pipes-rs/default.nix index 612f7b925001..f0e4eca9fa54 100644 --- a/pkgs/misc/screensavers/pipes-rs/default.nix +++ b/pkgs/misc/screensavers/pipes-rs/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "pipes-rs"; - version = "1.6.2"; + version = "1.6.3"; src = fetchFromGitHub { owner = "lhvy"; repo = pname; rev = "v${version}"; - sha256 = "sha256-PUCbirnOPYIqt56IF6UQ7Jd0bJLsVY2pGIn/C95HTrQ="; + sha256 = "sha256-NrBmkA7sV1RhfG9KEqQNMR5s0l2u66b7KK0toDjQIps="; }; - cargoHash = "sha256-6OTiciRqZyuX4FaDg131DEaVssUT2OYXdw/cxxJmLso="; + cargoHash = "sha256-cOLPkmUwNdaexgauULraBVVx6mznI9GXhHV3mSEhL0g="; doInstallCheck = true; From 576d41792da6e6df226693ffeba478cbb05ba2c7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 10 Jan 2024 19:13:28 +0000 Subject: [PATCH 045/158] skaffold: 2.9.0 -> 2.10.0 --- pkgs/development/tools/skaffold/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/skaffold/default.nix b/pkgs/development/tools/skaffold/default.nix index 320079099512..cd6250ff3c72 100644 --- a/pkgs/development/tools/skaffold/default.nix +++ b/pkgs/development/tools/skaffold/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "skaffold"; - version = "2.9.0"; + version = "2.10.0"; src = fetchFromGitHub { owner = "GoogleContainerTools"; repo = "skaffold"; rev = "v${version}"; - hash = "sha256-ddb1+h4mcQ1Uu4UvCL4IL4sjEbI70HZ4B/MMsUHbhSk="; + hash = "sha256-onJ/WEGsDhIfM+y3OeVbWjZSYHc7oWlkbLCrbLm8JZk="; }; vendorHash = null; From fca7d47f5a5d4e57c268d86d1abab1992c9a78c9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 10 Jan 2024 20:00:56 +0000 Subject: [PATCH 046/158] tf-summarize: 0.3.6 -> 0.3.7 --- pkgs/applications/networking/cluster/tf-summarize/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/tf-summarize/default.nix b/pkgs/applications/networking/cluster/tf-summarize/default.nix index 1381ba664222..840e221ec9ce 100644 --- a/pkgs/applications/networking/cluster/tf-summarize/default.nix +++ b/pkgs/applications/networking/cluster/tf-summarize/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "tf-summarize"; - version = "0.3.6"; + version = "0.3.7"; src = fetchFromGitHub { owner = "dineshba"; repo = "tf-summarize"; rev = "v${version}"; - hash = "sha256-8TRX7gAbBlCIOHbwRIVoke2WBSgwLx9121Fg5h0LPF0="; + hash = "sha256-IdtIcWnriCwghAWay+GzVf30difsDNHrHDNHDkkTxLg="; }; vendorHash = "sha256-YdfZt8SHBJHk5VUC8Em97EzX79EV4hxvo0B05npBA2U="; From ca89f3eb87e9b08e4aeb386f561fee69bfaac29c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 10 Jan 2024 21:10:00 +0000 Subject: [PATCH 047/158] vale: 2.30.0 -> 3.0.0 --- pkgs/tools/text/vale/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/vale/default.nix b/pkgs/tools/text/vale/default.nix index b001a7fd6c3d..f6582572278a 100644 --- a/pkgs/tools/text/vale/default.nix +++ b/pkgs/tools/text/vale/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "vale"; - version = "2.30.0"; + version = "3.0.0"; subPackages = [ "cmd/vale" ]; outputs = [ "out" "data" ]; @@ -11,10 +11,10 @@ buildGoModule rec { owner = "errata-ai"; repo = "vale"; rev = "v${version}"; - hash = "sha256-XTbm1wWm8+nBDN2G1Bm+FUFDV/21deGptMN5XrckMHA="; + hash = "sha256-qov9DWpHzxgDhgF9LwPGxjuOdmnYt4YcFeCO6Xb+QAw="; }; - vendorHash = "sha256-FnzuumOIvjpoDr+yBaRc8UjMDNW8mgrJiz1ZyzNW0Ts="; + vendorHash = "sha256-AsBbJJQs+pU2UNfEFvNnPwaaabTrXvFBQLcriIA2ST4="; postInstall = '' mkdir -p $data/share/vale From 0b6565057c49806e5b5b6b4fac28ea0a49579481 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 10 Jan 2024 22:06:32 +0000 Subject: [PATCH 048/158] otpclient: 3.2.1 -> 3.3.0 --- pkgs/applications/misc/otpclient/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/otpclient/default.nix b/pkgs/applications/misc/otpclient/default.nix index c01d141e7894..15e2154bdfc0 100644 --- a/pkgs/applications/misc/otpclient/default.nix +++ b/pkgs/applications/misc/otpclient/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "otpclient"; - version = "3.2.1"; + version = "3.3.0"; src = fetchFromGitHub { owner = "paolostivanin"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-R4vxggZ9bUSPar/QLRc172RGgPXuf9jUwK19kBKpT2w="; + hash = "sha256-ca0lGlpR9ynaGQPNLoe7/MegXcyRxLltF/65DJC3830="; }; nativeBuildInputs = [ From 4010ced2a6046d08fb2f7d08795612709254c7cc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 10 Jan 2024 23:54:32 +0000 Subject: [PATCH 049/158] web-ext: 7.9.0 -> 7.10.0 --- pkgs/development/tools/web-ext/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/web-ext/default.nix b/pkgs/development/tools/web-ext/default.nix index f75f8a66142e..da414797c2bc 100644 --- a/pkgs/development/tools/web-ext/default.nix +++ b/pkgs/development/tools/web-ext/default.nix @@ -7,16 +7,16 @@ buildNpmPackage rec { pname = "web-ext"; - version = "7.9.0"; + version = "7.10.0"; src = fetchFromGitHub { owner = "mozilla"; repo = "web-ext"; rev = version; - hash = "sha256-7fBUWQFUsIGQnyNhZISvdtAQMAMZ38mbzGuC+6Cwu1Y="; + hash = "sha256-VXvs4Z5cOt+lJ1JReApynpz/TufJgIVaO3dszS3Gvb4="; }; - npmDepsHash = "sha256-3Dq4sNPZm9fDxPxOZL+rDxFA/FEs2/+zdz8sF3JFJ3s="; + npmDepsHash = "sha256-ovLVWOrQ//aJPJqzCJQS+/Tnn4Z75OR69e7ACevKWCA="; npmBuildFlags = [ "--production" ]; From ef2003073a6ee51553756dccb869b06c43350331 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 11 Jan 2024 02:59:29 +0000 Subject: [PATCH 050/158] python310Packages.xml2rfc: 3.19.0 -> 3.19.1 --- pkgs/development/python-modules/xml2rfc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/xml2rfc/default.nix b/pkgs/development/python-modules/xml2rfc/default.nix index 505d5259f1db..0bcbbdda09e0 100644 --- a/pkgs/development/python-modules/xml2rfc/default.nix +++ b/pkgs/development/python-modules/xml2rfc/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pname = "xml2rfc"; - version = "3.19.0"; + version = "3.19.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -36,7 +36,7 @@ buildPythonPackage rec { owner = "ietf-tools"; repo = "xml2rfc"; rev = "refs/tags/v${version}"; - hash = "sha256-J7++NSmh0JfNEd0qQx39pr5dD8u0w8Hvlx14nTnOFmA="; + hash = "sha256-kKbetvJDzvsUUWEYgFb7G86v9/Iiy49Wyl25p/zzBHo="; }; postPatch = '' From 01be89c5c93617db74a195c993c0742404802412 Mon Sep 17 00:00:00 2001 From: Misaka13514 Date: Thu, 11 Jan 2024 11:57:57 +0800 Subject: [PATCH 051/158] nuclei: 3.1.4 -> 3.1.5 Diff: https://github.com/projectdiscovery/nuclei/compare/v3.1.4...v3.1.5 Changelog: https://github.com/projectdiscovery/nuclei/releases/tag/v3.1.5 --- pkgs/tools/security/nuclei/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/nuclei/default.nix b/pkgs/tools/security/nuclei/default.nix index 7763aff3cdbb..bf8eac8f4c25 100644 --- a/pkgs/tools/security/nuclei/default.nix +++ b/pkgs/tools/security/nuclei/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "nuclei"; - version = "3.1.4"; + version = "3.1.5"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-ueZnsP53+BYsU8ooYgz/IZYQ6AXj/nkOYuLdNGKGB2Q="; + hash = "sha256-U6FEVlW7fr2COyPASja42M3hJX6eAo4pH3kyl9APfG0="; }; - vendorHash = "sha256-YZNjhTspsGk1xWlPav99hPKgxolpuwNF6PMjh/Zc6h4="; + vendorHash = "sha256-/Pw1m8cWYDPCS7EcveqDdmRQtP7R3sr3hvLLw/FBftU="; subPackages = [ "cmd/nuclei/" From b4172435737d9a7eb3315c111b7521b79f3c02ca Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 11 Jan 2024 04:37:29 +0000 Subject: [PATCH 052/158] kaf: 0.2.6 -> 0.2.7 --- pkgs/development/tools/kaf/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/kaf/default.nix b/pkgs/development/tools/kaf/default.nix index 5b9a1bfc7d53..7ca0f6d7a26d 100644 --- a/pkgs/development/tools/kaf/default.nix +++ b/pkgs/development/tools/kaf/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kaf"; - version = "0.2.6"; + version = "0.2.7"; src = fetchFromGitHub { owner = "birdayz"; repo = "kaf"; rev = "v${version}"; - hash = "sha256-BH956k2FU855cKT+ftFOtRR2IjQ4sViiGy0tvrMWpEQ="; + hash = "sha256-H21l8TXCl5UH7h0WXnJqFv/rozIzxBKJJcNzfqIATsQ="; }; - vendorHash = "sha256-Y8jma4M+7ndJARfLmGCUmkIL+Pkey599dRO7M4iXU2Y="; + vendorHash = "sha256-//16AAQ2NK3yf9BKWECz5Mdy0lYuft9Em5cyM8osans="; # Many tests require a running Kafka instance doCheck = false; From 4008376f2ef924892ab2823fd9b8be309f6ee676 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 11 Jan 2024 06:04:04 +0000 Subject: [PATCH 053/158] python311Packages.nibe: 2.6.0 -> 2.7.0 --- pkgs/development/python-modules/nibe/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nibe/default.nix b/pkgs/development/python-modules/nibe/default.nix index 7994543ac4bd..c84164c9d65d 100644 --- a/pkgs/development/python-modules/nibe/default.nix +++ b/pkgs/development/python-modules/nibe/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "nibe"; - version = "2.6.0"; + version = "2.7.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "yozik04"; repo = "nibe"; rev = "refs/tags/${version}"; - hash = "sha256-VDK6ZCyW8fmp9Ap/AwgLbU5vlyhYXIGYD6eZ3esSCiU="; + hash = "sha256-hNxOB/H/KK9qHd+3FQHn9zjmCZRtY6H0nYKNqUc0FIg="; }; nativeBuildInputs = [ From a0e3bed45684a647fc126e99dc547c29f9fcab37 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 11 Jan 2024 06:15:24 +0000 Subject: [PATCH 054/158] python311Packages.oslo-concurrency: 5.2.0 -> 5.3.0 --- pkgs/development/python-modules/oslo-concurrency/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/oslo-concurrency/default.nix b/pkgs/development/python-modules/oslo-concurrency/default.nix index 795ab46d8d90..ef388c34a18f 100644 --- a/pkgs/development/python-modules/oslo-concurrency/default.nix +++ b/pkgs/development/python-modules/oslo-concurrency/default.nix @@ -18,13 +18,13 @@ buildPythonPackage rec { pname = "oslo-concurrency"; - version = "5.2.0"; + version = "5.3.0"; format = "setuptools"; src = fetchPypi { pname = "oslo.concurrency"; inherit version; - hash = "sha256-ihnsV07QV+k9UWdDJgX/h0xLkBelIV/QIaIDTGzVKpI="; + hash = "sha256-yqaSBw0hVZ73H/WQeAb3USoXgsRby1ChlP4+DNeNfe0="; }; postPatch = '' From 3a5b2d8e95249bb08ab8334f56a7eba81e4b722c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 11 Jan 2024 06:15:32 +0000 Subject: [PATCH 055/158] python311Packages.oracledb: 2.0.0 -> 2.0.1 --- pkgs/development/python-modules/oracledb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/oracledb/default.nix b/pkgs/development/python-modules/oracledb/default.nix index f5cb156932d2..33dc53175f58 100644 --- a/pkgs/development/python-modules/oracledb/default.nix +++ b/pkgs/development/python-modules/oracledb/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "oracledb"; - version = "2.0.0"; + version = "2.0.1"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-+0SB560anoEhSCiiGaRbZTMB2AxaHMR+A4VxBbYa4sk="; + hash = "sha256-wSI1qe7xIwOBhOV/O5sUXhSbImVOgkICTPToHNiQ9SM="; }; nativeBuildInputs = [ From 53c6d0a53dbce47bbfefdc6d8cc123ba13d6817d Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 11 Jan 2024 07:19:17 +0100 Subject: [PATCH 056/158] pkgsCross.mingwW64.gettext: fix build --- pkgs/development/libraries/gettext/default.nix | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix index 0222cb448045..f787560c3009 100644 --- a/pkgs/development/libraries/gettext/default.nix +++ b/pkgs/development/libraries/gettext/default.nix @@ -1,5 +1,4 @@ -{ stdenv, lib, fetchurl, fetchpatch, libiconv, xz, bash -, gnulib +{ stdenv, lib, fetchurl, libiconv, xz, bash }: # Note: this package is used for bootstrapping fetchurl, and thus @@ -20,11 +19,7 @@ stdenv.mkDerivation rec { # fix reproducibile output, in particular in the grub2 build # https://savannah.gnu.org/bugs/index.php?59658 ./0001-msginit-Do-not-use-POT-Creation-Date.patch - ] ++ lib.optional stdenv.hostPlatform.isWindows (fetchpatch { - url = "https://aur.archlinux.org/cgit/aur.git/plain/gettext_formatstring-ruby.patch?h=mingw-w64-gettext&id=e8b577ee3d399518d005e33613f23363a7df07ee"; - name = "gettext_formatstring-ruby.patch"; - sha256 = "sha256-6SxZObOMkQDxuKJuJY+mQ/VuJJxSeGbf97J8ZZddCV0="; - }); + ]; outputs = [ "out" "man" "doc" "info" ]; @@ -50,6 +45,8 @@ stdenv.mkDerivation rec { '' + lib.optionalString stdenv.hostPlatform.isCygwin '' sed -i -e "s/\(cldr_plurals_LDADD = \)/\\1..\/gnulib-lib\/libxml_rpl.la /" gettext-tools/src/Makefile.in sed -i -e "s/\(libgettextsrc_la_LDFLAGS = \)/\\1..\/gnulib-lib\/libxml_rpl.la /" gettext-tools/src/Makefile.in + '' + lib.optionalString stdenv.hostPlatform.isMinGW '' + sed -i "s/@GNULIB_CLOSE@/1/" */*/unistd.in.h ''; strictDeps = true; From 346d3f23228aa5b3346aba6314cecae3192dfc98 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 11 Jan 2024 06:27:20 +0000 Subject: [PATCH 057/158] python311Packages.posthog: 3.1.0 -> 3.3.1 --- pkgs/development/python-modules/posthog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/posthog/default.nix b/pkgs/development/python-modules/posthog/default.nix index a8af71d51a64..704a1f7ebf03 100644 --- a/pkgs/development/python-modules/posthog/default.nix +++ b/pkgs/development/python-modules/posthog/default.nix @@ -14,7 +14,7 @@ }: let pname = "posthog"; - version = "3.1.0"; + version = "3.3.1"; in buildPythonPackage { inherit pname version; @@ -24,7 +24,7 @@ buildPythonPackage { owner = "PostHog"; repo = "posthog-python"; rev = "refs/tags/v${version}"; - hash = "sha256-+FxRC1NxDaZHjMQFTyRymvHp6A3VE76kANgpVtq2WEs="; + hash = "sha256-aF2Q3ztoFV7j47edtHiLddw+PZyMz6EHj3Zu55rOcF8="; }; propagatedBuildInputs = [ From 1cfa5d73e56fcc4cb99015941618e3684836121f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 11 Jan 2024 07:06:00 +0000 Subject: [PATCH 058/158] python311Packages.zope-size: 4.4 -> 5.0 --- pkgs/development/python-modules/zope-size/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zope-size/default.nix b/pkgs/development/python-modules/zope-size/default.nix index 32a08b5add6f..a6ef2a588550 100644 --- a/pkgs/development/python-modules/zope-size/default.nix +++ b/pkgs/development/python-modules/zope-size/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "zope.size"; - version = "4.4"; + version = "5.0"; src = fetchPypi { inherit pname version; - hash = "sha256-bhv3QJdZtNpyAuL6/aZXWD1Acx8661VweWaItJPpkHk="; + hash = "sha256-sVRT40+Bb/VFmtg82TUCmqWBxqRTRj4DxeLZe9IKQyo="; }; propagatedBuildInputs = [ zope-i18nmessageid zope-interface ]; From e3b510d01e28e6a0a8142f00abfbd70b84b3d1fb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 11 Jan 2024 07:20:39 +0000 Subject: [PATCH 059/158] qcad: 3.28.2.2 -> 3.29.0.0 --- pkgs/applications/misc/qcad/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/qcad/default.nix b/pkgs/applications/misc/qcad/default.nix index c7cfbbbb65d3..fc599f20c6db 100644 --- a/pkgs/applications/misc/qcad/default.nix +++ b/pkgs/applications/misc/qcad/default.nix @@ -18,14 +18,14 @@ mkDerivation rec { pname = "qcad"; - version = "3.28.2.2"; + version = "3.29.0.0"; src = fetchFromGitHub { name = "qcad-${version}-src"; owner = "qcad"; repo = "qcad"; rev = "v${version}"; - sha256 = "sha256-0iH+fuh7jurk7FmEdTig+Tfm7ts3b2Azqv6T5kUNpg4="; + sha256 = "sha256-Nx16TJrtxUUdeSobTYdgoDUzm1IcTGbaKnW/9YXozgo="; }; patches = [ From afc467ae76555b2199902abc031478371c821631 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 11 Jan 2024 08:02:31 +0000 Subject: [PATCH 060/158] cargo-nextest: 0.9.66 -> 0.9.67 --- pkgs/development/tools/rust/cargo-nextest/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-nextest/default.nix b/pkgs/development/tools/rust/cargo-nextest/default.nix index 0e808f060823..a9418f51c5fe 100644 --- a/pkgs/development/tools/rust/cargo-nextest/default.nix +++ b/pkgs/development/tools/rust/cargo-nextest/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-nextest"; - version = "0.9.66"; + version = "0.9.67"; src = fetchFromGitHub { owner = "nextest-rs"; repo = "nextest"; rev = "cargo-nextest-${version}"; - hash = "sha256-MHXQnOUtFIRak05IX6oge3AyRC6M1XHwjpAPWBc8ByQ="; + hash = "sha256-M2WkgECTAKux+sq+1rYt2rg/LP4ctMMprY3MsBO5cn4="; }; - cargoHash = "sha256-AqWySq72teaVv6xFmIgcL7uufBQdaFO5DrAIy8mfh34="; + cargoHash = "sha256-hJAsmT8T3YGSWjishSQeVMFty6HmdNewRR9nr66fRN0="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration From 2e84597ff4cda448f5ae6c733d0bb09293a299a4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 11 Jan 2024 09:20:20 +0000 Subject: [PATCH 061/158] python311Packages.litellm: 1.16.19 -> 1.17.0 --- pkgs/development/python-modules/litellm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/litellm/default.nix b/pkgs/development/python-modules/litellm/default.nix index a2640ffe428f..b6d29b5501f9 100644 --- a/pkgs/development/python-modules/litellm/default.nix +++ b/pkgs/development/python-modules/litellm/default.nix @@ -15,7 +15,7 @@ , httpx }: let - version = "1.16.19"; + version = "1.17.0"; in buildPythonPackage rec { pname = "litellm"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "BerriAI"; repo = "litellm"; rev = "refs/tags/v${version}"; - hash = "sha256-KNQuTgJj7oLJsxfi8g9ShC5WHyrdpZGI5Nfgxzu/eak="; + hash = "sha256-lH0J5QFjSHOkHZWZQaH5ig6d9vWm7Mj02ssVc6lE4Uo="; }; postPatch = '' From a8d54c894c16a8c614233fa80ac9b96c4a822f84 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 11 Jan 2024 10:27:43 +0100 Subject: [PATCH 062/158] python311Packages.aioambient: 2023.12.0 -> 2024.01.0 Diff: https://github.com/bachya/aioambient/compare/refs/tags/2023.12.0...2024.01.0 Changelog: https://github.com/bachya/aioambient/releases/tag/2024.01.0 --- pkgs/development/python-modules/aioambient/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioambient/default.nix b/pkgs/development/python-modules/aioambient/default.nix index 4044f1b8a07e..9619b26a0b97 100644 --- a/pkgs/development/python-modules/aioambient/default.nix +++ b/pkgs/development/python-modules/aioambient/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "aioambient"; - version = "2023.12.0"; + version = "2024.01.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "bachya"; repo = "aioambient"; rev = "refs/tags/${version}"; - hash = "sha256-O9MlXtX7UzFN1w/vxpcZ/nRPDFPK5wFKBl42rhaAu94="; + hash = "sha256-eqZVY0L+2BWF7cCXW/VLQYYXNPtUF6tJHQmeZNW1W5o="; }; nativeBuildInputs = [ From 21b2dc940539fbbd09f0c22e229d89fe96c116ab Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 11 Jan 2024 06:32:53 +0000 Subject: [PATCH 063/158] python311Packages.python-heatclient: 3.3.0 -> 3.4.0 --- .../python-modules/python-heatclient/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/python-heatclient/default.nix b/pkgs/development/python-modules/python-heatclient/default.nix index 97cacf1b0642..2af9483dd264 100644 --- a/pkgs/development/python-modules/python-heatclient/default.nix +++ b/pkgs/development/python-modules/python-heatclient/default.nix @@ -1,5 +1,4 @@ { lib -, babel , buildPythonPackage , cliff , fetchPypi @@ -22,18 +21,17 @@ buildPythonPackage rec { pname = "python-heatclient"; - version = "3.3.0"; + version = "3.4.0"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-opBb9Zf60kgMtBNis2c+22VGS7psFEDPYvlz7WyKIHs="; + hash = "sha256-ggfhDJW2qn0o4Wi5cdPsEpoHb9miZbr4Ba8mgLkStvI="; }; propagatedBuildInputs = [ - babel cliff iso8601 keystoneauth1 From a1523e9b9ff9e713fb69f6c6ea530ccd55d528cb Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 11 Jan 2024 10:34:33 +0100 Subject: [PATCH 064/158] nuclei: add ldflags --- pkgs/tools/security/nuclei/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/security/nuclei/default.nix b/pkgs/tools/security/nuclei/default.nix index bf8eac8f4c25..9ad920d9a44f 100644 --- a/pkgs/tools/security/nuclei/default.nix +++ b/pkgs/tools/security/nuclei/default.nix @@ -9,7 +9,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "projectdiscovery"; - repo = pname; + repo = "nuclei"; rev = "refs/tags/v${version}"; hash = "sha256-U6FEVlW7fr2COyPASja42M3hJX6eAo4pH3kyl9APfG0="; }; @@ -20,6 +20,11 @@ buildGoModule rec { "cmd/nuclei/" ]; + ldflags = [ + "-w" + "-s" + ]; + # Test files are not part of the release tarball doCheck = false; From 52312db68fdab416c2b1ff211952d6a5a8daa2aa Mon Sep 17 00:00:00 2001 From: Sylvain Fankhauser Date: Thu, 11 Jan 2024 10:36:43 +0100 Subject: [PATCH 065/158] python3Packages.django-phonenumber-field: 7.2.0 -> 7.3.0 --- .../django-phonenumber-field/default.nix | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/django-phonenumber-field/default.nix b/pkgs/development/python-modules/django-phonenumber-field/default.nix index 41b3dee76f42..6f952c9865a9 100644 --- a/pkgs/development/python-modules/django-phonenumber-field/default.nix +++ b/pkgs/development/python-modules/django-phonenumber-field/default.nix @@ -3,7 +3,7 @@ , buildPythonPackage , django , djangorestframework -, fetchFromGitHub +, fetchPypi , phonenumbers , python , pythonOlder @@ -12,20 +12,16 @@ buildPythonPackage rec { pname = "django-phonenumber-field"; - version = "7.2.0"; + version = "7.3.0"; format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; - src = fetchFromGitHub { - owner = "stefanfoulis"; - repo = pname; - rev = "refs/tags/${version}"; - hash = "sha256-QEmwCdSiaae7mhmCPcV5F01f1GRxmIur3tyhv0XK7I4="; + src = fetchPypi { + inherit pname version; + hash = "sha256-+c2z3ghfmcJJMoKTo7k9Tl+kQMDI47mesND1R0hil5c="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools-scm ]; From f7e93f294ba3ff9bd3321cb7c859c0b5431d989d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 11 Jan 2024 10:38:57 +0100 Subject: [PATCH 066/158] python311Packages.archinfo: 9.2.83 -> 9.2.84 Diff: https://github.com/angr/archinfo/compare/refs/tags/v9.2.83...v9.2.84 --- pkgs/development/python-modules/archinfo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/archinfo/default.nix b/pkgs/development/python-modules/archinfo/default.nix index 03fc6be31d8c..35fc62a91b76 100644 --- a/pkgs/development/python-modules/archinfo/default.nix +++ b/pkgs/development/python-modules/archinfo/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "archinfo"; - version = "9.2.83"; + version = "9.2.84"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-vZajNUc+bgULs6bvX9g/VE3pJCvQUlPGD/h0FmLsLHE="; + hash = "sha256-drZuQRQ2XukCimH/SG6CRCL4avyMEcKxuj+Rinp7lJQ="; }; nativeBuildInputs = [ From c7964f25476020ee4b04de650b3e97ac539a3283 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 11 Jan 2024 10:38:59 +0100 Subject: [PATCH 067/158] python311Packages.ailment: 9.2.83 -> 9.2.84 Diff: https://github.com/angr/ailment/compare/refs/tags/v9.2.83...v9.2.84 --- pkgs/development/python-modules/ailment/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ailment/default.nix b/pkgs/development/python-modules/ailment/default.nix index a3d503248c49..1131a4b9c93f 100644 --- a/pkgs/development/python-modules/ailment/default.nix +++ b/pkgs/development/python-modules/ailment/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "ailment"; - version = "9.2.83"; + version = "9.2.84"; pyproject = true; disabled = pythonOlder "3.11"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-C1Dw+tsJr3QfezLskAGxtgKYEkDs7kfajYJibcigwSs="; + hash = "sha256-I4lZrp4coJOBB8gREmeQsCiNhMC0MqhYxd5BmYXq9BA="; }; nativeBuildInputs = [ From 0a137f6ca405d8506fde2cc1622ef51fb2de5096 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 11 Jan 2024 10:39:01 +0100 Subject: [PATCH 068/158] python311Packages.pyvex: 9.2.83 -> 9.2.84 --- pkgs/development/python-modules/pyvex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix index e5d676177676..fad27ac9a574 100644 --- a/pkgs/development/python-modules/pyvex/default.nix +++ b/pkgs/development/python-modules/pyvex/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "pyvex"; - version = "9.2.83"; + version = "9.2.84"; pyproject = true; disabled = pythonOlder "3.11"; src = fetchPypi { inherit pname version; - hash = "sha256-EJjSsS2BOtw40w+dGMlORefRGrJCz4RbDNW91nSn9Ys="; + hash = "sha256-asTvaSwoT1yD6nqHTr6vICeukynMq1WRRn3gEvvnoVA="; }; nativeBuildInputs = [ From 8858fbf1fd21c39009596fd14199299901d5d1e0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 11 Jan 2024 10:39:04 +0100 Subject: [PATCH 069/158] python311Packages.claripy: 9.2.83 -> 9.2.84 Diff: https://github.com/angr/claripy/compare/refs/tags/v9.2.83...v9.2.84 --- pkgs/development/python-modules/claripy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/claripy/default.nix b/pkgs/development/python-modules/claripy/default.nix index 91dc925abc03..b5c0dcd06150 100644 --- a/pkgs/development/python-modules/claripy/default.nix +++ b/pkgs/development/python-modules/claripy/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "claripy"; - version = "9.2.83"; + version = "9.2.84"; pyproject = true; disabled = pythonOlder "3.11"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "angr"; repo = "claripy"; rev = "refs/tags/v${version}"; - hash = "sha256-hy1JYQ89m5gq6oQTl04yZC8Q0Ob1sdEZ0dMmPp1P9Kc="; + hash = "sha256-wgCWMngda0gB+AEDFpRxQ2ots5YXE4bkBSxMtYJqLEo="; }; nativeBuildInputs = [ From a3c9d6e9abbd8b4d4990eae6de540c409aebf154 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 11 Jan 2024 10:39:07 +0100 Subject: [PATCH 070/158] python311Packages.angr: 9.2.83 -> 9.2.84 Diff: https://github.com/angr/angr/compare/refs/tags/v9.2.83...v9.2.84 --- pkgs/development/python-modules/angr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/angr/default.nix b/pkgs/development/python-modules/angr/default.nix index f20e0cc7a79d..3fee462c620b 100644 --- a/pkgs/development/python-modules/angr/default.nix +++ b/pkgs/development/python-modules/angr/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { pname = "angr"; - version = "9.2.83"; + version = "9.2.84"; pyproject = true; disabled = pythonOlder "3.11"; @@ -41,7 +41,7 @@ buildPythonPackage rec { owner = "angr"; repo = "angr"; rev = "refs/tags/v${version}"; - hash = "sha256-yj3ULPhuJENxsNkpNUxe3KOBUlqCOWYm38saWr7HZfk="; + hash = "sha256-qav9SUvQtcEad9lvgyrMhOcFhPAhzU/9s7ekTfohqRc="; }; propagatedBuildInputs = [ From 05dd8c32f652f3ae60daabd394d0b761c1bbe9ff Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 11 Jan 2024 10:41:50 +0100 Subject: [PATCH 071/158] python311Packages.cle: 9.2.83 -> 9.2.84 Diff: https://github.com/angr/cle/compare/refs/tags/v9.2.83...v9.2.84 --- pkgs/development/python-modules/cle/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/cle/default.nix b/pkgs/development/python-modules/cle/default.nix index bb67ce9effb9..20ac0c60435d 100644 --- a/pkgs/development/python-modules/cle/default.nix +++ b/pkgs/development/python-modules/cle/default.nix @@ -16,14 +16,14 @@ let # The binaries are following the argr projects release cycle - version = "9.2.83"; + version = "9.2.84"; # Binary files from https://github.com/angr/binaries (only used for testing and only here) binaries = fetchFromGitHub { owner = "angr"; repo = "binaries"; rev = "refs/tags/v${version}"; - hash = "sha256-WlKBuMaAuiNzDp0yP9FDY8NocLeZZZO/UoqpyvvAP0Q="; + hash = "sha256-sU9Rv2kTLYMpaalrkcOv6HlHt1u4oG482M+d7OSjJ3Y="; }; in @@ -38,7 +38,7 @@ buildPythonPackage rec { owner = "angr"; repo = "cle"; rev = "refs/tags/v${version}"; - hash = "sha256-42fsiUoPn6IeOvrsYxgp9bX8TAOY97RL0r+PAWHjjeo="; + hash = "sha256-N0z5wgaeWkoPuhIUj7bj1kDKgZ7pWChm1uEU4MjXjqI="; }; nativeBuildInputs = [ From 9158dc0bd93ebc58f8825194561b41c8b7d6441d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 11 Jan 2024 11:03:17 +0100 Subject: [PATCH 072/158] nuclei: add mainProgram --- pkgs/tools/security/nuclei/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/security/nuclei/default.nix b/pkgs/tools/security/nuclei/default.nix index 9ad920d9a44f..6deca949204f 100644 --- a/pkgs/tools/security/nuclei/default.nix +++ b/pkgs/tools/security/nuclei/default.nix @@ -41,5 +41,6 @@ buildGoModule rec { changelog = "https://github.com/projectdiscovery/nuclei/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ fab Misaka13514 ]; + mainProgram = "nuclei"; }; } From f4d565bdb854af1a1d314493d76cfc5ec3c48722 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 11 Jan 2024 11:06:59 +0100 Subject: [PATCH 073/158] python311Packages.aiomysensors: 0.3.10 -> 0.3.11 Diff: https://github.com/MartinHjelmare/aiomysensors/compare/refs/tags/v0.3.10...v0.3.11 Changelog: https://github.com/MartinHjelmare/aiomysensors/releases/tag/v0.3.11 --- .../python-modules/aiomysensors/default.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/aiomysensors/default.nix b/pkgs/development/python-modules/aiomysensors/default.nix index e26c6eb53bd9..5d92471c472c 100644 --- a/pkgs/development/python-modules/aiomysensors/default.nix +++ b/pkgs/development/python-modules/aiomysensors/default.nix @@ -15,24 +15,23 @@ buildPythonPackage rec { pname = "aiomysensors"; - version = "0.3.10"; - format = "pyproject"; + version = "0.3.11"; + pyproject = true; disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "MartinHjelmare"; - repo = pname; + repo = "aiomysensors"; rev = "refs/tags/v${version}"; - hash = "sha256-b462OZzRS9aldfJ+4ztczxbCMK76UM0pSOI1cIi1NM8="; + hash = "sha256-uBmFJFmUClTkaAg8jTThygzmZv7UZDPSt0bXo8BLu00="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace " --cov=src --cov-report=term-missing:skip-covered" "" \ - --replace 'marshmallow = "^3.17"' 'marshmallow = "*"' \ - --replace 'awesomeversion = "^22.6"' 'awesomeversion = "*"' + --replace " --cov=src --cov-report=term-missing:skip-covered" "" ''; + nativeBuildInputs = [ poetry-core ]; From 874a0c6592788527f9d69783fe45483985c35a18 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 11 Jan 2024 11:19:49 +0100 Subject: [PATCH 074/158] python311Packages.boto3-stubs: 1.34.15 -> 1.34.16 --- pkgs/development/python-modules/boto3-stubs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix index 29990c02ed09..6477dafa2380 100644 --- a/pkgs/development/python-modules/boto3-stubs/default.nix +++ b/pkgs/development/python-modules/boto3-stubs/default.nix @@ -365,14 +365,14 @@ buildPythonPackage rec { pname = "boto3-stubs"; - version = "1.34.15"; + version = "1.34.16"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-kzIc/TsvFh7Tuf30F25a7UpvWg0STLlmHMI4hDGA5uA="; + hash = "sha256-DkT5LqkXJ2fubbw6kv0h83//cyqoXMVxunITz5l8XzQ="; }; nativeBuildInputs = [ From 84ebfd402d76c995a58bcb488b94fa1d93f57b90 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 11 Jan 2024 11:20:18 +0100 Subject: [PATCH 075/158] python311Packages.botocore-stubs: 1.34.15 -> 1.34.16 --- pkgs/development/python-modules/botocore-stubs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/botocore-stubs/default.nix b/pkgs/development/python-modules/botocore-stubs/default.nix index 844a045d6dd1..cc1213c43419 100644 --- a/pkgs/development/python-modules/botocore-stubs/default.nix +++ b/pkgs/development/python-modules/botocore-stubs/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "botocore-stubs"; - version = "1.34.15"; + version = "1.34.16"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "botocore_stubs"; inherit version; - hash = "sha256-tCxap70AoR/ymcrCBRbbKQElSpsautUxvdyEACE9kc0="; + hash = "sha256-8RNpyo5TyRZBOQc0pN/Ok0MuKeXU0me8t33tfQixgwI="; }; nativeBuildInputs = [ From f1527fb317d6b861ec6b9868c41e89386519481e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 11 Jan 2024 11:21:39 +0100 Subject: [PATCH 076/158] python311Packages.govee-ble: 0.24.0 -> 0.27.2 Diff: https://github.com/Bluetooth-Devices/govee-ble/compare/refs/tags/v0.24.0...v0.27.2 Changelog: https://github.com/bluetooth-devices/govee-ble/blob/v0.27.2/CHANGELOG.md --- pkgs/development/python-modules/govee-ble/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/govee-ble/default.nix b/pkgs/development/python-modules/govee-ble/default.nix index 354a1569b002..1eb334a53989 100644 --- a/pkgs/development/python-modules/govee-ble/default.nix +++ b/pkgs/development/python-modules/govee-ble/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "govee-ble"; - version = "0.24.0"; + version = "0.27.2"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-uuC7CVf/KKr36mvd0TqNJd2OtK/xshCGYJXEtllE9is="; + hash = "sha256-UYVvZdg8az4Lb4RJEnj1J51iS65lzm8uJ66vBDXExts="; }; nativeBuildInputs = [ From 6e3c680db68aa057e0b336cd9e3ce9ecbf615174 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 11 Jan 2024 11:22:12 +0100 Subject: [PATCH 077/158] python311Packages.xiaomi-ble: 0.21.1 -> 0.21.2 Diff: https://github.com/Bluetooth-Devices/xiaomi-ble/compare/refs/tags/v0.21.1...v0.21.2 Changelog: https://github.com/Bluetooth-Devices/xiaomi-ble/releases/tag/v0.21.2 --- pkgs/development/python-modules/xiaomi-ble/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/xiaomi-ble/default.nix b/pkgs/development/python-modules/xiaomi-ble/default.nix index 45edddf408c0..985acfef6758 100644 --- a/pkgs/development/python-modules/xiaomi-ble/default.nix +++ b/pkgs/development/python-modules/xiaomi-ble/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "xiaomi-ble"; - version = "0.21.1"; + version = "0.21.2"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-5AzqsCWDgGhJ1EgJrbA8QHjP/Y14cIdSA0GKwZMrxX0="; + hash = "sha256-x9FQk3oGSxFrFj/F+QU9n7UMRTn0N4HsGonuNEEe9ug="; }; postPatch = '' From de650f6bbbc002e64df93ac7022c404b2a1be27e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 11 Jan 2024 11:23:44 +0100 Subject: [PATCH 078/158] python311Packages.pyunifiprotect: 4.22.5 -> 4.23.2 Diff: https://github.com/briis/pyunifiprotect/compare/refs/tags/v4.22.5...v4.23.2 Changelog: https://github.com/AngellusMortis/pyunifiprotect/releases/tag/v4.23.2 --- pkgs/development/python-modules/pyunifiprotect/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyunifiprotect/default.nix b/pkgs/development/python-modules/pyunifiprotect/default.nix index 929ea0dbaf22..d25f8fa2775a 100644 --- a/pkgs/development/python-modules/pyunifiprotect/default.nix +++ b/pkgs/development/python-modules/pyunifiprotect/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { pname = "pyunifiprotect"; - version = "4.22.5"; + version = "4.23.2"; pyproject = true; disabled = pythonOlder "3.9"; @@ -41,7 +41,7 @@ buildPythonPackage rec { owner = "briis"; repo = "pyunifiprotect"; rev = "refs/tags/v${version}"; - hash = "sha256-xfpEI5aI1WGaD63mTMzLlDqIxfCrXWLpIpO6tIlObxE="; + hash = "sha256-X4LRi2hNpKgnmk3GeoI+ziboBKIosSZye5lPWaBPL1s="; }; env.SETUPTOOLS_SCM_PRETEND_VERSION = version; From be4869c51e5a4af94fe5123c9c30794c4df76be6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 11 Jan 2024 11:25:16 +0100 Subject: [PATCH 079/158] python311Packages.pyenphase: 1.15.2 -> 1.16.0 Diff: https://github.com/pyenphase/pyenphase/compare/refs/tags/v1.15.2...v1.16.0 Changelog: https://github.com/pyenphase/pyenphase/blob/1.16.0/CHANGELOG.md --- pkgs/development/python-modules/pyenphase/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyenphase/default.nix b/pkgs/development/python-modules/pyenphase/default.nix index 55a23f8f8d03..e88b05820039 100644 --- a/pkgs/development/python-modules/pyenphase/default.nix +++ b/pkgs/development/python-modules/pyenphase/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "pyenphase"; - version = "1.15.2"; + version = "1.16.0"; format = "pyproject"; disabled = pythonOlder "3.11"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "pyenphase"; repo = "pyenphase"; rev = "refs/tags/v${version}"; - hash = "sha256-4vKfgpCo28btFCTbj7xge7bDImafbOWsabhdMJK5p3Q="; + hash = "sha256-4oxYa05TSmhqv/f9gzq+zRsCNU0KSyHt0nZSEmfpx7k="; }; postPatch = '' From ec80f162fae3753118b0e2b805f176b76b423e76 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 11 Jan 2024 11:25:54 +0100 Subject: [PATCH 080/158] python311Packages.bthome-ble: 3.3.1 -> 3.4.1 Diff: https://github.com/Bluetooth-Devices/bthome-ble/compare/refs/tags/v3.3.1...v3.4.1 Changelog: https://github.com/bluetooth-devices/bthome-ble/blob/v3.4.1/CHANGELOG.md --- pkgs/development/python-modules/bthome-ble/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bthome-ble/default.nix b/pkgs/development/python-modules/bthome-ble/default.nix index 7370bf814c93..746c918120ec 100644 --- a/pkgs/development/python-modules/bthome-ble/default.nix +++ b/pkgs/development/python-modules/bthome-ble/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "bthome-ble"; - version = "3.3.1"; + version = "3.4.1"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = "bthome-ble"; rev = "refs/tags/v${version}"; - hash = "sha256-dFnEgUmmB9P8bKownMp0NsTWPAeMmdKiaxII3O1gT6A="; + hash = "sha256-1Srimb+MfWiX5NdmDQHJsmn6LatWd8nmXaB4uXdHKWY="; }; nativeBuildInputs = [ From ea4f9803d72ce265b50e709ae5ff893318e3a718 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 11 Jan 2024 11:26:28 +0100 Subject: [PATCH 081/158] python311Packages.sonos-websocket: 0.1.2 -> 0.1.3 Diff: https://github.com/jjlawren/sonos-websocket/compare/refs/tags/0.1.2...0.1.3 Changelog: https://github.com/jjlawren/sonos-websocket/releases/tag/0.1.3 --- pkgs/development/python-modules/sonos-websocket/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sonos-websocket/default.nix b/pkgs/development/python-modules/sonos-websocket/default.nix index 594469400cae..ce182adb8fac 100644 --- a/pkgs/development/python-modules/sonos-websocket/default.nix +++ b/pkgs/development/python-modules/sonos-websocket/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "sonos-websocket"; - version = "0.1.2"; + version = "0.1.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "jjlawren"; repo = "sonos-websocket"; rev = "refs/tags/${version}"; - hash = "sha256-QUX724Q8HtOiWuCfKouy7be0gTn6Vo3QHnw3MXJcMZo="; + hash = "sha256-1sgYLwIW7VWnHJGsfIQ95AGZ5j/DPMKQr5n7F+/MsuY="; }; nativeBuildInputs = [ From e2350923cdea18c80a5a53cd7bb5ea0a11bfd6c1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 11 Jan 2024 11:28:44 +0100 Subject: [PATCH 082/158] python311Packages.pyenphase: update changelog entry --- pkgs/development/python-modules/pyenphase/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyenphase/default.nix b/pkgs/development/python-modules/pyenphase/default.nix index e88b05820039..550142666bdb 100644 --- a/pkgs/development/python-modules/pyenphase/default.nix +++ b/pkgs/development/python-modules/pyenphase/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "pyenphase"; version = "1.16.0"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.11"; @@ -68,7 +68,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library to control enphase envoy"; homepage = "https://github.com/pyenphase/pyenphase"; - changelog = "https://github.com/pyenphase/pyenphase/blob/${version}/CHANGELOG.md"; + changelog = "https://github.com/pyenphase/pyenphase/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; From ea491c8b883d1932c038ed556e0e74e944319c72 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 11 Jan 2024 10:31:09 +0000 Subject: [PATCH 083/158] wgcf: 2.2.20 -> 2.2.21 --- pkgs/applications/networking/wgcf/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/wgcf/default.nix b/pkgs/applications/networking/wgcf/default.nix index a6f728c1bf37..b088c61e599d 100644 --- a/pkgs/applications/networking/wgcf/default.nix +++ b/pkgs/applications/networking/wgcf/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "wgcf"; - version = "2.2.20"; + version = "2.2.21"; src = fetchFromGitHub { owner = "ViRb3"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-k4oOejJiVZk9s4niG/r0mSoI363uuQh3C9OWVweELWc="; + hash = "sha256-FzzPDTRmDCBS7EZOgj4ckytbtlRPqPdHpyn3nF0yHdc="; }; subPackages = "."; - vendorHash = "sha256-U1VHbD2l5C5ws7Mt5a7PmtHQkZJ6hzDU1TyiEFqMYEM="; + vendorHash = "sha256-cGtm+rUgYppwwL/BizWikPUyFExHzLucL2o2g9PgGNw="; meta = with lib; { description = "Cross-platform, unofficial CLI for Cloudflare Warp"; From f81e20320fba0ebb0517a44226b68ded82fd9fca Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 11 Jan 2024 10:31:51 +0000 Subject: [PATCH 084/158] python311Packages.pyunifiprotect: 4.22.5 -> 4.23.2 --- pkgs/development/python-modules/pyunifiprotect/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyunifiprotect/default.nix b/pkgs/development/python-modules/pyunifiprotect/default.nix index 929ea0dbaf22..d25f8fa2775a 100644 --- a/pkgs/development/python-modules/pyunifiprotect/default.nix +++ b/pkgs/development/python-modules/pyunifiprotect/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { pname = "pyunifiprotect"; - version = "4.22.5"; + version = "4.23.2"; pyproject = true; disabled = pythonOlder "3.9"; @@ -41,7 +41,7 @@ buildPythonPackage rec { owner = "briis"; repo = "pyunifiprotect"; rev = "refs/tags/v${version}"; - hash = "sha256-xfpEI5aI1WGaD63mTMzLlDqIxfCrXWLpIpO6tIlObxE="; + hash = "sha256-X4LRi2hNpKgnmk3GeoI+ziboBKIosSZye5lPWaBPL1s="; }; env.SETUPTOOLS_SCM_PRETEND_VERSION = version; From d2f581db7ba74e27dc35ef53f0e4bfea7b10508e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 11 Jan 2024 11:32:43 +0100 Subject: [PATCH 085/158] python311Packages.kasa-crypt: 0.4.0 -> 0.4.1 Diff: https://github.com/bdraco/kasa-crypt/compare/refs/tags/v0.4.0...v0.4.1 Changelog: https://github.com/bdraco/kasa-crypt/blob/v0.4.1/CHANGELOG.md --- pkgs/development/python-modules/kasa-crypt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/kasa-crypt/default.nix b/pkgs/development/python-modules/kasa-crypt/default.nix index c02c0043eacc..2247b2ece99d 100644 --- a/pkgs/development/python-modules/kasa-crypt/default.nix +++ b/pkgs/development/python-modules/kasa-crypt/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "kasa-crypt"; - version = "0.4.0"; + version = "0.4.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = "kasa-crypt"; rev = "refs/tags/v${version}"; - hash = "sha256-wjZnro5sIRt8+vQYxA62sGnPi7Ittp3oSqph7aBBEg0="; + hash = "sha256-ZAynSL6tIQoe9veYGusel9GQEffeLQ8dBA9HfA6TMzI="; }; postPatch = '' From 0dfbbda609a710988e48fe6e5b49da6282e32a34 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 11 Jan 2024 12:27:10 +0100 Subject: [PATCH 086/158] python311Packages.glances-api: 0.5.0 -> 0.5.1 Diff: https://github.com/home-assistant-ecosystem/python-glances-api/compare/refs/tags/0.5.0...0.5.1 Changelog: https://github.com/home-assistant-ecosystem/python-glances-api/releases/tag/0.5.1 --- pkgs/development/python-modules/glances-api/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/glances-api/default.nix b/pkgs/development/python-modules/glances-api/default.nix index fc8d2edac2be..416dc4e36c17 100644 --- a/pkgs/development/python-modules/glances-api/default.nix +++ b/pkgs/development/python-modules/glances-api/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "glances-api"; - version = "0.5.0"; + version = "0.5.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "home-assistant-ecosystem"; repo = "python-glances-api"; rev = "refs/tags/${version}"; - hash = "sha256-DUTZLLWO4xUeUlxHGGVr/MD5uKqRxUf+p0crYsELgzw="; + hash = "sha256-hRzSNpmyZ91Ca45o0A3rnvsrGPFQRBcWBjryYXqZPH4="; }; nativeBuildInputs = [ From d7886c5d8744578c859be099e4f147f2bb3664ab Mon Sep 17 00:00:00 2001 From: the-furry-hubofeverything Date: Mon, 1 Jan 2024 12:01:34 -0800 Subject: [PATCH 087/158] obs-studio: set libfdk build flag and add the license for it --- pkgs/applications/video/obs-studio/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index 02875950acb4..dad21756b24c 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/pkgs/applications/video/obs-studio/default.nix @@ -35,6 +35,7 @@ , libcef , pciutils , pipewireSupport ? stdenv.isLinux +, withFdk ? true , pipewire , libdrm , libajantv2 @@ -86,7 +87,6 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ curl - fdk_aac ffmpeg_4 jansson libcef @@ -118,7 +118,8 @@ stdenv.mkDerivation (finalAttrs: { ++ optionals scriptingSupport [ luajit python3 ] ++ optional alsaSupport alsa-lib ++ optional pulseaudioSupport libpulseaudio - ++ optionals pipewireSupport [ pipewire libdrm ]; + ++ optionals pipewireSupport [ pipewire libdrm ] + ++ optional withFdk fdk_aac; # Copied from the obs-linuxbrowser postUnpack = '' @@ -140,6 +141,7 @@ stdenv.mkDerivation (finalAttrs: { "-DCEF_ROOT_DIR=../../cef" "-DENABLE_JACK=ON" (lib.cmakeBool "ENABLE_QSV11" stdenv.hostPlatform.isx86_64) + (lib.cmakeBool "ENABLE_LIBFDK" withFdk) ]; dontWrapGApps = true; @@ -178,7 +180,7 @@ stdenv.mkDerivation (finalAttrs: { ''; homepage = "https://obsproject.com"; maintainers = with maintainers; [ jb55 MP2E materus fpletz ]; - license = licenses.gpl2Plus; + license = with licenses; [ gpl2Plus ] ++ optional withFdk fraunhofer-fdk; platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" ]; mainProgram = "obs"; }; From dc28dea4a10e39115c770949ceb1d164a6aa68c7 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Wed, 10 Jan 2024 16:41:34 +0100 Subject: [PATCH 088/158] newcomputermodern: init at 5.1 --- pkgs/by-name/ne/newcomputermodern/package.nix | 48 +++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 pkgs/by-name/ne/newcomputermodern/package.nix diff --git a/pkgs/by-name/ne/newcomputermodern/package.nix b/pkgs/by-name/ne/newcomputermodern/package.nix new file mode 100644 index 000000000000..6f20905a3089 --- /dev/null +++ b/pkgs/by-name/ne/newcomputermodern/package.nix @@ -0,0 +1,48 @@ +{ lib +, stdenvNoCC +, fetchgit +, fontforge +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "newcomputermodern"; + version = "5.1"; + + src = fetchgit { + url = "https://git.gnu.org.ua/newcm.git"; + rev = finalAttrs.version; + hash = "sha256-a6paSdF754jCp4DePbx2in9316H9EjyrAKOQpyc3hEo="; + }; + + nativeBuildInputs = [ fontforge ]; + + dontConfigure = true; + + buildPhase = '' + runHook preBuild + for i in sfd/*.sfd; do + fontforge -lang=ff -c \ + 'Open($1); + Generate($1:r + ".otf"); + ' $i; + done + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + install -m444 -Dt $out/share/fonts/opentype/public sfd/*.otf + runHook postInstall + ''; + + meta = { + description = "Computer Modern fonts including matching non-latin alphabets"; + homepage = "https://ctan.org/pkg/newcomputermodern"; + # "The GUST Font License (GFL), which is a free license, legally + # equivalent to the LaTeX Project Public License (LPPL), version 1.3c or + # later." - GUST website + license = lib.licenses.lppl13c; + maintainers = [ lib.maintainers.drupol ]; + platforms = lib.platforms.all; + }; +}) From 25e0d2a0e555dc8f40a4696215e1bf2dcc07d827 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 11 Jan 2024 11:52:55 +0000 Subject: [PATCH 089/158] groonga: 13.1.0 -> 13.1.1 --- pkgs/servers/search/groonga/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/search/groonga/default.nix b/pkgs/servers/search/groonga/default.nix index b9747ab7d096..07f86a9ae808 100644 --- a/pkgs/servers/search/groonga/default.nix +++ b/pkgs/servers/search/groonga/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "groonga"; - version = "13.1.0"; + version = "13.1.1"; src = fetchurl { url = "https://packages.groonga.org/source/groonga/groonga-${finalAttrs.version}.tar.gz"; - hash = "sha256-7Wt90UNzfSi/L0UyWYQQCxaRfFG5HH/89njV3eW/5wQ="; + hash = "sha256-eggMegWTpv+WIbzYq2GjSD66+Tj7zcvVUcbD2EkrFO8="; }; patches = [ From 9b156b4bfca64c0165acf8a8966859d113a88a29 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 11 Jan 2024 13:05:11 +0100 Subject: [PATCH 090/158] singularity: 4.0.2 -> 4.0.3 Changelog: https://github.com/sylabs/singularity/releases/tag/v4.0.3 --- pkgs/applications/virtualization/singularity/packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/virtualization/singularity/packages.nix b/pkgs/applications/virtualization/singularity/packages.nix index 80e7d2c2a39f..50a8fc103ad1 100644 --- a/pkgs/applications/virtualization/singularity/packages.nix +++ b/pkgs/applications/virtualization/singularity/packages.nix @@ -38,20 +38,20 @@ let singularity = callPackage (import ./generic.nix rec { pname = "singularity-ce"; - version = "4.0.2"; + version = "4.0.3"; projectName = "singularity"; src = fetchFromGitHub { owner = "sylabs"; repo = "singularity"; rev = "refs/tags/v${version}"; - hash = "sha256-R+vAKYR4lJmC7PIITYyg4UeGYjGXoPqqUai3HmPzwG0="; + hash = "sha256-sT5nW/7xE2TT4TO9H7Y3CDf87LvwPbT1NjVQVK9yyVY="; }; # Update by running # nix-prefetch -E "{ sha256 }: ((import ./. { }).singularity.override { vendorHash = sha256; }).goModules" # at the root directory of the Nixpkgs repository - vendorHash = "sha256-z3VozeMpaqh4ddZxB3xqo25Gm+8JYeIwASOq+Mmerr4="; + vendorHash = "sha256-q7n1LymH5KGYHg73r30xryVWupzDheBp7Gpr3XZiZHI="; # Do not build conmon and squashfuse from the Git submodule sources, # Use Nixpkgs provided version From b7c06ddecbab57dd800e22daace473011ce5d79c Mon Sep 17 00:00:00 2001 From: John Garcia Date: Thu, 11 Jan 2024 12:22:42 +0000 Subject: [PATCH 091/158] vlang: 0.4.3 -> 0.4.4 --- pkgs/development/compilers/vlang/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/vlang/default.nix b/pkgs/development/compilers/vlang/default.nix index 66b871559057..a0acfd263474 100644 --- a/pkgs/development/compilers/vlang/default.nix +++ b/pkgs/development/compilers/vlang/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, glfw, freetype, openssl, makeWrapper, upx, boehmgc, xorg, binaryen, darwin }: let - version = "0.4.3"; + version = "0.4.4"; ptraceSubstitution = '' #include #include @@ -10,12 +10,12 @@ let # So we fix its rev to correspond to the V version. vc = stdenv.mkDerivation { pname = "v.c"; - version = "0.4.3"; + version = "0.4.4"; src = fetchFromGitHub { owner = "vlang"; repo = "vc"; - rev = "5e691a82c01957870b451e06216a9fb3a4e83a18"; - hash = "sha256-Ti2b88NDG1pppj34BeK8+UsT2HiG/jcAF2mHgiBBRaI="; + rev = "66eb8eae253d31fa5622e35a69580d9ad8efcccb"; + hash = "sha256-YGlzr0Qq7+NtrnbaFPBuclzjOZBOnTe3BOhsuwdsQ5c="; }; # patch the ptrace reference for darwin @@ -46,7 +46,7 @@ stdenv.mkDerivation { owner = "vlang"; repo = "v"; rev = version; - hash = "sha256-ZFBQD7SP38VnEMoOnwr/n8zZuLtR7GR3OCYhvfz3apI="; + hash = "sha256-Aqecw8K+igHx5R34lQiWtdNfeGn+umcjcS4w0vXgpLM="; }; propagatedBuildInputs = [ glfw freetype openssl ] From 344981f07c1ca802c17bcd42660fa48c0101384c Mon Sep 17 00:00:00 2001 From: natsukium Date: Thu, 11 Jan 2024 21:42:50 +0900 Subject: [PATCH 092/158] python311Packages.jupyter-core: 5.7.0 -> 5.7.1 Diff: https://github.com/jupyter/jupyter_core/compare/refs/tags/v5.7.0...v5.7.1 Changelog: https://github.com/jupyter/jupyter_core/blob/refs/tags/v5.7.1/CHANGELOG.md --- pkgs/development/python-modules/jupyter-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jupyter-core/default.nix b/pkgs/development/python-modules/jupyter-core/default.nix index 68f66994d180..ece119e7b529 100644 --- a/pkgs/development/python-modules/jupyter-core/default.nix +++ b/pkgs/development/python-modules/jupyter-core/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "jupyter-core"; - version = "5.7.0"; + version = "5.7.1"; disabled = pythonOlder "3.7"; pyproject = true; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "jupyter"; repo = "jupyter_core"; rev = "refs/tags/v${version}"; - hash = "sha256-y3a2pSk+6QNSVg0skosbf6uHSXpvMubyflP6jQleI44="; + hash = "sha256-Uh7slD8mQg2R++wltXrYiPSJnmM5w9tej8GN/0GMBmA="; }; patches = [ From 9081a064404fbb99a1fdfbfbf6c2910e65ebb9fb Mon Sep 17 00:00:00 2001 From: natsukium Date: Thu, 11 Jan 2024 21:43:23 +0900 Subject: [PATCH 093/158] python311Packages.jupyter-server: 2.12.2 -> 2.12.4 Changelog: https://github.com/jupyter-server/jupyter_server/blob/v2.12.4/CHANGELOG.md --- pkgs/development/python-modules/jupyter-server/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jupyter-server/default.nix b/pkgs/development/python-modules/jupyter-server/default.nix index f938497d3412..240d2064168c 100644 --- a/pkgs/development/python-modules/jupyter-server/default.nix +++ b/pkgs/development/python-modules/jupyter-server/default.nix @@ -34,14 +34,14 @@ buildPythonPackage rec { pname = "jupyter-server"; - version = "2.12.2"; + version = "2.12.4"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { pname = "jupyter_server"; inherit version; - hash = "sha256-Xq6GvhUiS1N1zewMNULOcv8g96JSl6KoFmolC7RVpRk="; + hash = "sha256-QfSh5rkSzCSnxsaUhRs309hBKxgPQ9cjFf5CLLK4XMI="; }; nativeBuildInputs = [ From f7e20aedeedb7fb49998c751a5e124b22025c303 Mon Sep 17 00:00:00 2001 From: natsukium Date: Thu, 11 Jan 2024 21:44:46 +0900 Subject: [PATCH 094/158] python311Packages.nbconvert: 7.14.0 -> 7.14.1 Changelog: https://github.com/jupyter/nbconvert/blob/v7.14.1/CHANGELOG.md --- pkgs/development/python-modules/nbconvert/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nbconvert/default.nix b/pkgs/development/python-modules/nbconvert/default.nix index 922b7259bf05..1242d018adad 100644 --- a/pkgs/development/python-modules/nbconvert/default.nix +++ b/pkgs/development/python-modules/nbconvert/default.nix @@ -32,14 +32,14 @@ let }; in buildPythonPackage rec { pname = "nbconvert"; - version = "7.14.0"; + version = "7.14.1"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-krmkS2Plp/tPb6DvQSYeNcFpJQRszRwEpcgJm/EAR24="; + hash = "sha256-IMuhDgRI3Hazvr/hrfkjZj47mDONr3e5e0JRHvWohhg="; }; # Add $out/share/jupyter to the list of paths that are used to search for From 80d7cb182234dd0609b3e99ea1c35d696f0f74c3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 11 Jan 2024 12:58:15 +0000 Subject: [PATCH 095/158] python310Packages.yfinance: 0.2.33 -> 0.2.35 --- pkgs/development/python-modules/yfinance/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/yfinance/default.nix b/pkgs/development/python-modules/yfinance/default.nix index 69b193c5b1f4..b8ec40d9e03b 100644 --- a/pkgs/development/python-modules/yfinance/default.nix +++ b/pkgs/development/python-modules/yfinance/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "yfinance"; - version = "0.2.33"; + version = "0.2.35"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "ranaroussi"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-dj5ZGmvroUCK43q7cykwdJLQBWlpsN1FpKGcJrman+I="; + hash = "sha256-uLcnTH3teLxW6LZCJUD3jOPLm1a2jAK1bg4tKSSNXKU="; }; propagatedBuildInputs = [ From 2ec4c5285d290d760b4e62eccceff9d538a99f4b Mon Sep 17 00:00:00 2001 From: Alexander Kiselyov Date: Thu, 11 Jan 2024 15:59:39 +0300 Subject: [PATCH 096/158] python3Packages.scikit-image: fixed tests on darwin Expanded disabling of fit tests to both darwin platforms (thanks to @risicle for testing there). --- pkgs/development/python-modules/scikit-image/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/scikit-image/default.nix b/pkgs/development/python-modules/scikit-image/default.nix index de4075522d13..9d57c585c2fc 100644 --- a/pkgs/development/python-modules/scikit-image/default.nix +++ b/pkgs/development/python-modules/scikit-image/default.nix @@ -121,9 +121,10 @@ let "skimage/feature/tests/test_util.py::test_plot_matches" "skimage/filters/tests/test_thresholding.py::TestSimpleImage::test_try_all_threshold" "skimage/io/tests/test_mpl_imshow.py::" + # See https://github.com/scikit-image/scikit-image/issues/7061 and https://github.com/scikit-image/scikit-image/issues/7104 + "skimage/measure/tests/test_fit.py" ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ # https://github.com/scikit-image/scikit-image/issues/7104 - "skimage/measure/tests/test_fit.py" "skimage/measure/tests/test_moments.py" ]); From 9c4b42cd18ea058fb2c24f568952fe2dbc0f2426 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 11 Jan 2024 13:12:52 +0000 Subject: [PATCH 097/158] python310Packages.yubico: 1.3.2 -> 1.3.3 --- pkgs/development/python-modules/yubico/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/yubico/default.nix b/pkgs/development/python-modules/yubico/default.nix index 0fe6a90bfd7f..441b313be406 100644 --- a/pkgs/development/python-modules/yubico/default.nix +++ b/pkgs/development/python-modules/yubico/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "python-yubico"; - version = "1.3.2"; + version = "1.3.3"; src = fetchPypi { inherit pname version; - sha256 = "1gd3an1cdcq328nr1c9ijrsf32v0crv6dgq7knld8m9cadj517c7"; + sha256 = "sha256-2EZkJ6pZIqxdS36cZbaTEIQnz1N9ZT1oyyEsBxPo5vU="; }; propagatedBuildInputs = [ pyusb ]; From d7d1f3db1d197a662962d4aa0485bffd94f77b5b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 11 Jan 2024 13:42:16 +0000 Subject: [PATCH 098/158] python310Packages.zcbor: 0.7.0 -> 0.8.0 --- pkgs/development/python-modules/zcbor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zcbor/default.nix b/pkgs/development/python-modules/zcbor/default.nix index 21d6e7e790ed..dfacdb646075 100644 --- a/pkgs/development/python-modules/zcbor/default.nix +++ b/pkgs/development/python-modules/zcbor/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "zcbor"; - version = "0.7.0"; + version = "0.8.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-0mGp7Hnq8ZNEUx/9eQ6UD9/cOuLl6S5Aif1qNh1+jYA="; + hash = "sha256-47HwITfFcHNze3tt4vJxHB4BQ7oyl17DM8IV0WomM5Q="; }; nativeBuildInputs = [ From 47aa17f9a99051b9fb9ec78ab4e63a7ebe7768aa Mon Sep 17 00:00:00 2001 From: SystematicError Date: Thu, 11 Jan 2024 14:16:20 +0000 Subject: [PATCH 099/158] grimblast: unstable-2023-10-03 -> unstable-2024-01-11 --- pkgs/by-name/gr/grimblast/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gr/grimblast/package.nix b/pkgs/by-name/gr/grimblast/package.nix index c997f6205ef4..9f0d29ff74a2 100644 --- a/pkgs/by-name/gr/grimblast/package.nix +++ b/pkgs/by-name/gr/grimblast/package.nix @@ -15,13 +15,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "grimblast"; - version = "unstable-2023-10-03"; + version = "unstable-2024-01-11"; src = fetchFromGitHub { owner = "hyprwm"; repo = "contrib"; - rev = "2e3f8ac2a3f1334fd2e211b07ed76b4215bb0542"; - hash = "sha256-rb954Rc+IyUiiXoIuQOJRp0//zH/WeMYZ3yJ5CccODA="; + rev = "89c56351e48785070b60e224ea1717ac50c3befb"; + hash = "sha256-EjdQsk5VIQs7INBugbgX1I9Q3kPAOZSwkXXqEjZL0E0="; }; strictDeps = true; From e0792883aa16ad8d153fa69cdb1413cc9faefabc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 11 Jan 2024 14:23:37 +0000 Subject: [PATCH 100/158] python310Packages.zephyr-python-api: 0.0.3 -> 0.0.4 --- pkgs/development/python-modules/zephyr-python-api/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zephyr-python-api/default.nix b/pkgs/development/python-modules/zephyr-python-api/default.nix index 07cc6a2b7a19..8ff111b605fa 100644 --- a/pkgs/development/python-modules/zephyr-python-api/default.nix +++ b/pkgs/development/python-modules/zephyr-python-api/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "zephyr-python-api"; - version = "0.0.3"; + version = "0.0.4"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-M9Kf0RtoSeDFAAgAuks+Ek+Wg5OM8qmd3eDoaAgAa3A="; + hash = "sha256-GIXxpItbRH31PJ7dX48w92LrYY0axbZQoAFXrRGeLas="; }; nativeBuildInputs = [ setuptools ]; From 878978152fabb7aa9a2804df7a8d05a9ac7ff07d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 11 Jan 2024 15:41:51 +0100 Subject: [PATCH 101/158] python311Packages.aio-geojson-generic-client: 0.3 -> 0.4 Diff: https://github.com/exxamalte/python-aio-geojson-generic-client/compare/refs/tags/v0.3...v0.4 Changelog: https://github.com/exxamalte/python-aio-geojson-generic-client/blob/v0.4/CHANGELOG.md --- .../aio-geojson-generic-client/default.nix | 27 ++++++++++++------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/aio-geojson-generic-client/default.nix b/pkgs/development/python-modules/aio-geojson-generic-client/default.nix index 4ff502a2cf83..4d10c5724970 100644 --- a/pkgs/development/python-modules/aio-geojson-generic-client/default.nix +++ b/pkgs/development/python-modules/aio-geojson-generic-client/default.nix @@ -1,39 +1,46 @@ { lib -, aiohttp -, aresponses -, buildPythonPackage , aio-geojson-client +, aiohttp +, aioresponses +, buildPythonPackage , fetchFromGitHub +, geojson , pytest-asyncio , pytestCheckHook , pythonOlder , pytz +, setuptools }: buildPythonPackage rec { pname = "aio-geojson-generic-client"; - version = "0.3"; - format = "setuptools"; + version = "0.4"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "exxamalte"; repo = "python-aio-geojson-generic-client"; rev = "refs/tags/v${version}"; - hash = "sha256-toDvliFMxicaEhlxb7wCadDJErpsIPcZbJz7TpO83GE="; + hash = "sha256-065aPocJFOTn+naedxRJ7U/b7hjrYViu2MEUsBpQ9cY="; }; + __darwinAllowLocalNetworking = true; + + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ aiohttp aio-geojson-client + geojson pytz ]; - __darwinAllowLocalNetworking = true; - nativeCheckInputs = [ - aresponses + aioresponses pytest-asyncio pytestCheckHook ]; From ba51a5210d47e9b74adf5dde9b40d1fc68938e20 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 11 Jan 2024 15:06:14 +0000 Subject: [PATCH 102/158] python310Packages.zodb: 5.8.0 -> 5.8.1 --- pkgs/development/python-modules/zodb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zodb/default.nix b/pkgs/development/python-modules/zodb/default.nix index 30b00e9ea7c6..5389eec5f53f 100644 --- a/pkgs/development/python-modules/zodb/default.nix +++ b/pkgs/development/python-modules/zodb/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "ZODB"; - version = "5.8.0"; + version = "5.8.1"; src = fetchPypi { inherit pname version; - hash = "sha256-KNugDvYm3hBYnt7auFrQ8O33KSXnXTahXJnGOsBf52Q="; + hash = "sha256-xsc6vTZg1gb/wfIfl97xS1K0b0pwLsnm7kSabiviZN8="; }; # remove broken test From 05d63de612ae2753704c2454fdbb4a224de63699 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 11 Jan 2024 07:00:43 -0800 Subject: [PATCH 103/158] python311Packages.xsdata: 23.8 -> 24.1 Changelog: https://github.com/tefra/xsdata/blob/v24.1/CHANGES.rst --- .../python-modules/xsdata/default.nix | 29 ++++++++++++------- .../python-modules/xsdata/paths.patch | 13 +++++++++ 2 files changed, 32 insertions(+), 10 deletions(-) create mode 100644 pkgs/development/python-modules/xsdata/paths.patch diff --git a/pkgs/development/python-modules/xsdata/default.nix b/pkgs/development/python-modules/xsdata/default.nix index d44bd2d8d7da..78bec78444c5 100644 --- a/pkgs/development/python-modules/xsdata/default.nix +++ b/pkgs/development/python-modules/xsdata/default.nix @@ -1,7 +1,9 @@ { lib , buildPythonPackage , pythonOlder -, fetchPypi +, fetchFromGitHub +, substituteAll +, ruff , click , click-default-group , docformatter @@ -12,21 +14,29 @@ , requests , pytestCheckHook , setuptools -, wheel }: buildPythonPackage rec { pname = "xsdata"; - version = "23.8"; - format = "pyproject"; + version = "24.1"; + pyproject = true; disabled = pythonOlder "3.8"; - src = fetchPypi { - inherit pname version; - hash = "sha256-VfA9TIgjbwRyZq/+VQug3RlHat/OagHz4K76x8gHjlY="; + src = fetchFromGitHub { + owner = "tefra"; + repo = "xsdata"; + rev = "v${version}"; + hash = "sha256-vdcCTJqvaRehGWfTd9GR/DypF9ftY4ite7SDMPc2Ups="; }; + patches = [ + (substituteAll { + src = ./paths.patch; + ruff = lib.getExe ruff; + }) + ]; + postPatch = '' substituteInPlace pyproject.toml \ --replace "--benchmark-skip" "" @@ -34,7 +44,6 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools - wheel ]; propagatedBuildInputs = [ @@ -83,9 +92,9 @@ buildPythonPackage rec { ]; meta = { - description = "Python XML Binding"; + description = "Naive XML & JSON bindings for Python"; homepage = "https://github.com/tefra/xsdata"; - changelog = "https://github.com/tefra/xsdata/blob/v${version}/CHANGES.rst"; + changelog = "https://github.com/tefra/xsdata/blob/${src.rev}/CHANGES.rst"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ dotlambda ]; }; diff --git a/pkgs/development/python-modules/xsdata/paths.patch b/pkgs/development/python-modules/xsdata/paths.patch new file mode 100644 index 000000000000..aad522371322 --- /dev/null +++ b/pkgs/development/python-modules/xsdata/paths.patch @@ -0,0 +1,13 @@ +diff --git a/xsdata/codegen/writer.py b/xsdata/codegen/writer.py +index 0301631f..3185c526 100644 +--- a/xsdata/codegen/writer.py ++++ b/xsdata/codegen/writer.py +@@ -73,7 +73,7 @@ class CodeWriter: + """Run ruff format on the src code.""" + commands = [ + [ +- "ruff", ++ "@ruff@", + "format", + "--stdin-filename", + str(file_path), From 4d125bac2790ca90d1ad1426f1d28a03ec3e989f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 11 Jan 2024 07:08:08 -0800 Subject: [PATCH 104/158] dmarc-metrics-exporter: 0.9.4 -> 0.10.1 Diff: https://github.com/jgosmann/dmarc-metrics-exporter/compare/refs/tags/v0.9.4...v0.10.1 Changelog: https://github.com/jgosmann/dmarc-metrics-exporter/blob/v0.10.1/CHANGELOG.rst --- .../prometheus/dmarc-metrics-exporter/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/dmarc-metrics-exporter/default.nix b/pkgs/servers/monitoring/prometheus/dmarc-metrics-exporter/default.nix index d2d37c04a819..d4d2d48a0bbc 100644 --- a/pkgs/servers/monitoring/prometheus/dmarc-metrics-exporter/default.nix +++ b/pkgs/servers/monitoring/prometheus/dmarc-metrics-exporter/default.nix @@ -5,17 +5,17 @@ python3.pkgs.buildPythonApplication rec { pname = "dmarc-metrics-exporter"; - version = "0.9.4"; + version = "0.10.1"; disabled = python3.pythonOlder "3.8"; - format = "pyproject"; + pyproject = true; src = fetchFromGitHub { owner = "jgosmann"; repo = "dmarc-metrics-exporter"; rev = "refs/tags/v${version}"; - hash = "sha256-doKG191rQvUpjOb3HvkzZP9XbtQXYGFtDJIdDSFRLSU="; + hash = "sha256-gur0+2yHqxySXECMboW7dAyyf0ckSdS0FEy7HvA5Y5w="; }; pythonRelaxDeps = true; @@ -29,7 +29,6 @@ python3.pkgs.buildPythonApplication rec { bite-parser dataclasses-serialization prometheus-client - typing-extensions uvicorn xsdata ] From 0be0d8a860120de3d78400e6e358535a60817a70 Mon Sep 17 00:00:00 2001 From: Marcel <34819524+MarcelCoding@users.noreply.github.com> Date: Sun, 7 Jan 2024 03:00:05 +0100 Subject: [PATCH 105/158] nixos/pgadmin: disable upgrade check --- nixos/modules/services/admin/pgadmin.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/admin/pgadmin.nix b/nixos/modules/services/admin/pgadmin.nix index 5eaa911e37f1..3d820db59f4c 100644 --- a/nixos/modules/services/admin/pgadmin.nix +++ b/nixos/modules/services/admin/pgadmin.nix @@ -117,6 +117,7 @@ in services.pgadmin.settings = { DEFAULT_SERVER_PORT = cfg.port; SERVER_MODE = true; + UPGRADE_CHECK_ENABLED = false; } // (optionalAttrs cfg.openFirewall { DEFAULT_SERVER = mkDefault "::"; }) // (optionalAttrs cfg.emailServer.enable { From b2447f8c24dee0bcbcc8eee686281740f9a71125 Mon Sep 17 00:00:00 2001 From: Muhammad Falak R Wani Date: Thu, 11 Jan 2024 20:53:31 +0530 Subject: [PATCH 106/158] docker-compose: 2.23.3 -> 2.24.0 Diff: https://github.com/docker/compose/compare/v2.23.3...v2.24.0 Signed-off-by: Muhammad Falak R Wani --- pkgs/applications/virtualization/docker/compose.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/virtualization/docker/compose.nix b/pkgs/applications/virtualization/docker/compose.nix index 24809f9450b4..aadc42643577 100644 --- a/pkgs/applications/virtualization/docker/compose.nix +++ b/pkgs/applications/virtualization/docker/compose.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "docker-compose"; - version = "2.23.3"; + version = "2.24.0"; src = fetchFromGitHub { owner = "docker"; repo = "compose"; rev = "v${version}"; - hash = "sha256-Rp13xK7pRyjHaDclAfL+yzNf4ppOy9S+XFbydj4TDL4="; + hash = "sha256-6wa4kIl65z3kk+wzDX+WhS50J+e0AZ+W8A++bdnRc2M="; }; postPatch = '' @@ -16,7 +16,7 @@ buildGoModule rec { rm -rf e2e/ ''; - vendorHash = "sha256-iKBMd4e1oVNdKuk08tYPexQqs9JLofhdf4yEP1s97EQ="; + vendorHash = "sha256-03jlomVb3jS+SkmIxRtPsaMx2VKLYX/Lp9JH/mlJvK4="; ldflags = [ "-X github.com/docker/compose/v2/internal.Version=${version}" "-s" "-w" ]; From ec33394a85b51a21c0762fa4e6723399751c3fe9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 11 Jan 2024 16:26:39 +0100 Subject: [PATCH 107/158] trivy: 0.48.2 -> 0.48.3 Diff: https://github.com/aquasecurity/trivy/compare/refs/tags/v0.48.2...v0.48.3 Changelog: https://github.com/aquasecurity/trivy/releases/tag/v0.48.3 --- pkgs/tools/admin/trivy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/trivy/default.nix b/pkgs/tools/admin/trivy/default.nix index 8a9a521ca4b3..c3a8a71947af 100644 --- a/pkgs/tools/admin/trivy/default.nix +++ b/pkgs/tools/admin/trivy/default.nix @@ -10,19 +10,19 @@ buildGoModule rec { pname = "trivy"; - version = "0.48.2"; + version = "0.48.3"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-b7lwy1erESjSg+pPZelYNBfIcbdcfDdM3klefQ6+L00="; + hash = "sha256-zWv/4dDzWfR9qbbBaMaHFMId1OVhcOja7lTy3gcm77w="; }; # Hash mismatch on across Linux and Darwin proxyVendor = true; - vendorHash = "sha256-1jznsC6VFUph7AKk86iGAV7GKFoAcA87Ltt4n0EaX4c="; + vendorHash = "sha256-EOu4VHfrQbIP1vSWF3UkZDMyEIcbjQKjzdch9c6cVg4="; subPackages = [ "cmd/trivy" ]; From 305b723bfdbba0a90439bf39cc24021e39b55b6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christina=20S=C3=B8rensen?= Date: Thu, 11 Jan 2024 16:30:04 +0100 Subject: [PATCH 108/158] eza: 0.17.0 -> 0.17.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Christina Sørensen --- pkgs/by-name/ez/eza/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ez/eza/package.nix b/pkgs/by-name/ez/eza/package.nix index 192176d19827..8bc5951ddeb7 100644 --- a/pkgs/by-name/ez/eza/package.nix +++ b/pkgs/by-name/ez/eza/package.nix @@ -17,16 +17,16 @@ rustPlatform.buildRustPackage rec { pname = "eza"; - version = "0.17.0"; + version = "0.17.1"; src = fetchFromGitHub { owner = "eza-community"; repo = "eza"; rev = "v${version}"; - hash = "sha256-BYzt8PLqMbxlp8CdBJuBXGbTsC9e/dWhB4j1Ak2Fjbo="; + hash = "sha256-PItKMPaqDG8L0dYHl8cLoyieljNpP41HLIFfpcLerNg="; }; - cargoHash = "sha256-xyIFGPQkXZZLLXY5qwiRvFPvjhAIRc90RD2NpsuwrB4="; + cargoHash = "sha256-PrKP9Akv+qionFTHtlrY8bzaX9HaobhBJGVRMvXWfZU="; nativeBuildInputs = [ cmake pkg-config installShellFiles pandoc ]; buildInputs = [ zlib ] From 4dccdcfbf54a2a9bfee094f41cb36f58ce99e340 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 11 Jan 2024 15:53:35 +0000 Subject: [PATCH 109/158] qownnotes: 24.1.1 -> 24.1.2 --- pkgs/applications/office/qownnotes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/qownnotes/default.nix b/pkgs/applications/office/qownnotes/default.nix index 5c3dc0f2c296..162d4e2683db 100644 --- a/pkgs/applications/office/qownnotes/default.nix +++ b/pkgs/applications/office/qownnotes/default.nix @@ -19,14 +19,14 @@ let pname = "qownnotes"; appname = "QOwnNotes"; - version = "24.1.1"; + version = "24.1.2"; in stdenv.mkDerivation { inherit pname appname version; src = fetchurl { url = "https://github.com/pbek/QOwnNotes/releases/download/v${version}/qownnotes-${version}.tar.xz"; - hash = "sha256-yCsYIi1StZOYutDAWS04u3DccrPB+2oqaynnH4GBEPc="; + hash = "sha256-UlHLGO5Rictj0/eZKxyFKxa/2XasQOAixnejOc+dH0M="; }; nativeBuildInputs = [ From cb89165fb9a5e80a05356af4d75ed826d7d417e0 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Thu, 11 Jan 2024 17:40:24 +0100 Subject: [PATCH 110/158] pkgs/README.md: Clarify versioning on projects lacking proper releases --- pkgs/README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/README.md b/pkgs/README.md index 0649d9415a26..f614f1f72976 100644 --- a/pkgs/README.md +++ b/pkgs/README.md @@ -354,6 +354,10 @@ There are a few naming guidelines: Example: Given a project had its latest releases `2.2` in November 2021, and `3.0` in January 2022, a commit authored on March 15, 2022 for an upcoming bugfix release `2.2.1` would have `version = "2.2-unstable-2022-03-15"`. +- If a project has no suitable preceding releases - e.g., no versions at all, or an incompatible versioning / tagging schema - then the latest upstream version in the above schema should be `0`. + +Example: Given a project that has no tags / released versions at all, or applies versionless tags like `latest` or `YYYY-MM-DD-Build`, a commit authored on March 15, 2022 would have `version = "0-unstable-2022-03-15"`. + - Dashes in the package `pname` _should_ be preserved in new variable names, rather than converted to underscores or camel cased — e.g., `http-parser` instead of `http_parser` or `httpParser`. The hyphenated style is preferred in all three package names. - If there are multiple versions of a package, this _should_ be reflected in the variable names in `all-packages.nix`, e.g. `json-c_0_9` and `json-c_0_11`. If there is an obvious “default” version, make an attribute like `json-c = json-c_0_9;`. See also [versioning][versioning]. From 38b39dd404feb6229110ddbc08bdb834a797b4ee Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Thu, 11 Jan 2024 17:25:31 +0000 Subject: [PATCH 111/158] ruby-modules/bundled-common: do not define `gemType` for `null` packages MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Without the change `gemType` gets defined via `null` attrset that exposes unevaluatable attribute: nix-repl> ronin.gemType error: … while evaluating the attribute 'gemType' at pkgs/development/ruby-modules/bundled-common/default.nix:122:30: 121| inherit ruby bundler gems confFiles envPaths; 122| inherit (gems.${pname}) gemType; | ^ 123| … while evaluating an attribute name error: value is null while a string was expected After the change `passthru` does not expose a `gemType` if `pname` is `null`. --- pkgs/development/ruby-modules/bundled-common/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ruby-modules/bundled-common/default.nix b/pkgs/development/ruby-modules/bundled-common/default.nix index 86c885b52dcb..6aca502550b6 100644 --- a/pkgs/development/ruby-modules/bundled-common/default.nix +++ b/pkgs/development/ruby-modules/bundled-common/default.nix @@ -117,9 +117,10 @@ let meta = { platforms = ruby.meta.platforms; } // meta; - passthru = rec { - inherit ruby bundler gems confFiles envPaths; + passthru = (lib.optionalAttrs (pname != null) { inherit (gems.${pname}) gemType; + } // rec { + inherit ruby bundler gems confFiles envPaths; wrappedRuby = stdenv.mkDerivation { name = "wrapped-ruby-${pname'}"; @@ -172,7 +173,7 @@ let exit 1 ''; }; - }; + }); }; basicEnv = From 5df4d57a2225f8033ef91f85149184628110a139 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 11 Jan 2024 09:36:38 -0800 Subject: [PATCH 112/158] signal-desktop: 6.43.1 -> 6.44.0 Changelog: https://github.com/signalapp/Signal-Desktop/releases/tag/v6.43.2 https://github.com/signalapp/Signal-Desktop/releases/tag/v6.44.0 --- .../instant-messengers/signal-desktop/signal-desktop.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix index f9afe7b680fa..5c37bff9d2a5 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix @@ -2,7 +2,7 @@ callPackage ./generic.nix {} rec { pname = "signal-desktop"; dir = "Signal"; - version = "6.43.1"; + version = "6.44.0"; url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - hash = "sha256-mDxZFs+rI2eHkkvkmflras1WqBa/HBVBDpdk9NKaC2E="; + hash = "sha256-04KhjExUx+X2/vxSlobVOk9A50XwTlXcdVuttnUmJEw="; } From 93bd40ca0c84469fcc97ef26148d212002dababa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 11 Jan 2024 17:53:06 +0000 Subject: [PATCH 113/158] raiseorlaunch: 2.3.3 -> 2.3.5 --- pkgs/applications/misc/raiseorlaunch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/raiseorlaunch/default.nix b/pkgs/applications/misc/raiseorlaunch/default.nix index 4eb924544be8..9c5f35be9a9e 100644 --- a/pkgs/applications/misc/raiseorlaunch/default.nix +++ b/pkgs/applications/misc/raiseorlaunch/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "raiseorlaunch"; - version = "2.3.3"; + version = "2.3.5"; src = fetchPypi { inherit pname version; - sha256 = "3d694015d020a888b42564d56559213b94981ca2b32b952a49b2de4d029d2e59"; + sha256 = "sha256-L/hu0mYCAxHkp5me96a6HlEY6QsuJDESpTNhlzVRHWs="; }; nativeBuildInputs = [ python3Packages.setuptools-scm ]; From 56df644cb4b71a2d8e219cf8a8d1d1df68364993 Mon Sep 17 00:00:00 2001 From: Ryan Lahfa Date: Thu, 11 Jan 2024 19:14:39 +0100 Subject: [PATCH 114/158] Revert "nixVersions.stable: 2.18.1 -> 2.19.2" This version does not pass our NixOS tests, e.g. `nixosTests.misc` and potentially other fundamental tests such as lib-tests. --- nixos/modules/installer/tools/nix-fallback-paths.nix | 10 +++++----- pkgs/tools/package-management/nix/default.nix | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/nixos/modules/installer/tools/nix-fallback-paths.nix b/nixos/modules/installer/tools/nix-fallback-paths.nix index d1cdef213551..e4241e965403 100644 --- a/nixos/modules/installer/tools/nix-fallback-paths.nix +++ b/nixos/modules/installer/tools/nix-fallback-paths.nix @@ -1,7 +1,7 @@ { - x86_64-linux = "/nix/store/smfmnz0ylx80wkbqbjibj7zcw4q668xp-nix-2.19.2"; - i686-linux = "/nix/store/knp0akbpj2k0rf26fmysmxdysmayihax-nix-2.19.2"; - aarch64-linux = "/nix/store/761hq0abn07nrydrf6mls61bscx2vz2i-nix-2.19.2"; - x86_64-darwin = "/nix/store/zlqvxis1dfcfgmy5fza4hllg6h03vhpb-nix-2.19.2"; - aarch64-darwin = "/nix/store/53r8ay20mygy2sifn7j2p8wjqlx2kxik-nix-2.19.2"; + x86_64-linux = "/nix/store/azvn85cras6xv4z5j85fiy406f24r1q0-nix-2.18.1"; + i686-linux = "/nix/store/9bnwy7f9h0kzdzmcnjjsjg0aak5waj40-nix-2.18.1"; + aarch64-linux = "/nix/store/hh65xwqm9s040s3cgn9vzcmrxj0sf5ij-nix-2.18.1"; + x86_64-darwin = "/nix/store/6zi5fqzn9n17wrk8r41rhdw4j7jqqsi3-nix-2.18.1"; + aarch64-darwin = "/nix/store/0pbq6wzr2f1jgpn5212knyxpwmkjgjah-nix-2.18.1"; } diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 411030ee5733..4652ddb76a5b 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -259,7 +259,7 @@ in lib.makeExtensible (self: ({ else nix; - stable = addFallbackPathsCheck self.nix_2_19; + stable = addFallbackPathsCheck self.nix_2_18; unstable = self.nix_2_19; } // lib.optionalAttrs config.allowAliases { From dd5ca8a66dd47e1832ed3502ae1dd63fa99f0c3f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 11 Jan 2024 18:17:01 +0000 Subject: [PATCH 115/158] rbspy: 0.18.0 -> 0.18.1 --- pkgs/development/tools/rbspy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rbspy/default.nix b/pkgs/development/tools/rbspy/default.nix index bc86461caf6a..eb23c8c62f04 100644 --- a/pkgs/development/tools/rbspy/default.nix +++ b/pkgs/development/tools/rbspy/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "rbspy"; - version = "0.18.0"; + version = "0.18.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-lVZLUQDDEQcysQI1oRbBCV/1PGvDO4ipH1ngTL6fuY8="; + hash = "sha256-MfXXqty5ZE7wFbc/qJB/FnMxM+Hzfa4GEGgGKwurXp8="; }; - cargoHash = "sha256-PgYeJcCg/WvQR8XEwVqlb/OXueSsMILT7zIvJkSaRSo="; + cargoHash = "sha256-gs9m3hUH75T8kGfKRpPLc1CR1n2Jc+uZKE1SZi25VFA="; # error: linker `aarch64-linux-gnu-gcc` not found postPatch = '' From a327fd0f71622b7ec25ebd20a308b9b605d433ab Mon Sep 17 00:00:00 2001 From: Raito Bezarius Date: Thu, 11 Jan 2024 19:18:08 +0100 Subject: [PATCH 116/158] CODEOWNERS: add myself as code owner of the Nix package manager Given the prior attempts to encourage Nix package bumps to be more stable, we failed, failed and failed again. Today again, we shipped a broken Nix (2.19.2) without sufficient testing to unstable-small and it broke some users. As announced in the past, I am taking ownership of the package manager bumps and modifications as seemingly no one is interested to do it inside of Nixpkgs. --- .github/CODEOWNERS | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index f60b20dd8527..01fa32e397c3 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -66,6 +66,10 @@ /doc/build-helpers/images/makediskimage.section.md @raitobezarius /nixos/lib/make-disk-image.nix @raitobezarius +# Nix, the package manager +pkgs/tools/package-management/nix/ @raitobezarius +nixos/modules/installer/tools/nix-fallback-paths.nix @raitobezarius + # Nixpkgs documentation /maintainers/scripts/db-to-md.sh @jtojnar @ryantm /maintainers/scripts/doc @jtojnar @ryantm From 6ae414b6deacc85dc7938da9cbe3def10fe1117a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 11 Jan 2024 04:31:42 +0000 Subject: [PATCH 117/158] gtkwave: 3.3.117 -> 3.3.118 --- pkgs/applications/science/electronics/gtkwave/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/electronics/gtkwave/default.nix b/pkgs/applications/science/electronics/gtkwave/default.nix index 3259f0f4ca95..7b7b54201bf7 100644 --- a/pkgs/applications/science/electronics/gtkwave/default.nix +++ b/pkgs/applications/science/electronics/gtkwave/default.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { pname = "gtkwave"; - version = "3.3.117"; + version = "3.3.118"; src = fetchurl { url = "mirror://sourceforge/gtkwave/${pname}-gtk3-${version}.tar.gz"; - sha256 = "sha256-PPFTdYapEcuwYBr4+hjPbacIyKFKcfac48uRGOhXHbk="; + sha256 = "sha256-D0MwwCiiqz0vTUzur222kl2wEMS2/VLRECLQ5d6gSGo="; }; nativeBuildInputs = [ pkg-config wrapGAppsHook ]; From fc9ded6c400b560b7eb5dc8a801afcd1c30f2f1a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 11 Jan 2024 19:02:15 +0000 Subject: [PATCH 118/158] docker-credential-helpers: 0.8.0 -> 0.8.1 --- pkgs/tools/admin/docker-credential-helpers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/docker-credential-helpers/default.nix b/pkgs/tools/admin/docker-credential-helpers/default.nix index 151da67fe91f..ba5aa38860ef 100644 --- a/pkgs/tools/admin/docker-credential-helpers/default.nix +++ b/pkgs/tools/admin/docker-credential-helpers/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "docker-credential-helpers"; - version = "0.8.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "docker"; repo = pname; rev = "v${version}"; - sha256 = "sha256-3zWlYW+2LA/JK/lv/OTzMlF2HlQPID0WYks0dQrP3GY="; + sha256 = "sha256-Q1SdDfTT0W+eG/F5HX+pk4B06IG5ZoeZxe36l71gMc8="; }; vendorHash = null; From f938ef533e3fb7eed98f960de2b8870d89538452 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 11 Jan 2024 19:29:27 +0000 Subject: [PATCH 119/158] gvm-libs: 22.7.3 -> 22.8.0 --- pkgs/development/libraries/gvm-libs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gvm-libs/default.nix b/pkgs/development/libraries/gvm-libs/default.nix index 96a6f99925de..651dc26ca1ae 100644 --- a/pkgs/development/libraries/gvm-libs/default.nix +++ b/pkgs/development/libraries/gvm-libs/default.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { pname = "gvm-libs"; - version = "22.7.3"; + version = "22.8.0"; src = fetchFromGitHub { owner = "greenbone"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Vo+lFUGLeGPKq3aUCiiBcBYu6BZ4KQI5vCtnQyRUUiU="; + hash = "sha256-nFqYpt9OWEPgSbaNsHLhs9mg7ChQcmfcgHh7nFfQh18="; }; nativeBuildInputs = [ From ce21c597aaebf9e44b2b148f367c33d875f41814 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 11 Jan 2024 20:32:35 +0100 Subject: [PATCH 120/158] python311Packages.pytoolconfig: 1.2.6 -> 1.3.0 Diff: https://github.com/bagel897/pytoolconfig/compare/refs/tags/v1.2.6...1.3.0 Changelog: https://github.com/bagel897/pytoolconfig/releases/tag/v1.3.0 --- .../python-modules/pytoolconfig/default.nix | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/pytoolconfig/default.nix b/pkgs/development/python-modules/pytoolconfig/default.nix index fb0b5399f52b..012a470c1b5f 100644 --- a/pkgs/development/python-modules/pytoolconfig/default.nix +++ b/pkgs/development/python-modules/pytoolconfig/default.nix @@ -18,8 +18,8 @@ buildPythonPackage rec { pname = "pytoolconfig"; - version = "1.2.6"; - format = "pyproject"; + version = "1.3.0"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "bagel897"; repo = "pytoolconfig"; rev = "refs/tags/v${version}"; - hash = "sha256-KmmaxFJbvdOGG9T9iiHKnJpFzZiLVkPJki+qHPxPTdY="; + hash = "sha256-V7dANGnvhBhRy8IyO/gg73BMwpWRaV/xTF8JmRC7DPA="; }; outputs = [ @@ -47,11 +47,6 @@ buildPythonPackage rec { sphinxHook ] ++ passthru.optional-dependencies.doc; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace "packaging>=22.0" "packaging" - ''; - propagatedBuildInputs = [ packaging ] ++ lib.optionals (pythonOlder "3.11") [ From aed36f12382dfb0c32ddb4401215cdd237ff76f3 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sun, 7 Jan 2024 15:52:22 +0100 Subject: [PATCH 121/158] python311Packages.querystring-parser: rename from querystring_parser --- pkgs/development/python-modules/mlflow/default.nix | 4 ++-- .../python-modules/querystring-parser/default.nix | 5 +++-- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/mlflow/default.nix b/pkgs/development/python-modules/mlflow/default.nix index 41ebc9545cef..7070f1fd1cf7 100644 --- a/pkgs/development/python-modules/mlflow/default.nix +++ b/pkgs/development/python-modules/mlflow/default.nix @@ -26,7 +26,7 @@ , pyarrow , pytz , pyyaml -, querystring_parser +, querystring-parser , requests , scikit-learn , scipy @@ -83,7 +83,7 @@ buildPythonPackage rec { pyarrow pytz pyyaml - querystring_parser + querystring-parser requests scikit-learn scipy diff --git a/pkgs/development/python-modules/querystring-parser/default.nix b/pkgs/development/python-modules/querystring-parser/default.nix index 6288d196bb4e..7a58fd2a0db1 100644 --- a/pkgs/development/python-modules/querystring-parser/default.nix +++ b/pkgs/development/python-modules/querystring-parser/default.nix @@ -3,12 +3,13 @@ }: buildPythonPackage rec { - pname = "querystring_parser"; + pname = "querystring-parser"; version = "1.2.4"; disabled = isPy27; src = fetchPypi { - inherit pname version; + pname = "querystring_parser"; + inherit version; sha256 = "644fce1cffe0530453b43a83a38094dbe422ccba8c9b2f2a1c00280e14ca8a62"; }; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index fcc3497480b0..d4d59161faad 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -408,6 +408,7 @@ mapAliases ({ qasm2image = throw "qasm2image is no longer maintained (since November 2018), and is not compatible with the latest pythonPackages.qiskit versions."; # added 2020-12-09 qds_sdk = qds-sdk; # added 2023-10-21 Quandl = quandl; # added 2023-02-19 + querystring_parser = querystring-parser; # added 2024-01-07 qcodes-loop = throw "qcodes-loop has been removed due to deprecation"; # added 2023-11-30 qiskit-aqua = throw "qiskit-aqua has been removed due to deprecation, with its functionality moved to different qiskit packages"; rabbitpy = throw "rabbitpy has been removed, since it is unmaintained and broken"; # added 2023-07-01 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 35c07c5c5a50..be17248e77c4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12271,7 +12271,7 @@ self: super: with self; { qudida = callPackage ../development/python-modules/qudida { }; - querystring_parser = callPackage ../development/python-modules/querystring-parser { }; + querystring-parser = callPackage ../development/python-modules/querystring-parser { }; questionary = callPackage ../development/python-modules/questionary { }; From 564aa3d529b5f88ecd840df601854fbf142969f9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 11 Jan 2024 20:59:21 +0100 Subject: [PATCH 122/158] rbspy: refactor --- pkgs/development/tools/rbspy/default.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/development/tools/rbspy/default.nix b/pkgs/development/tools/rbspy/default.nix index eb23c8c62f04..ef2a32003b1b 100644 --- a/pkgs/development/tools/rbspy/default.nix +++ b/pkgs/development/tools/rbspy/default.nix @@ -12,9 +12,9 @@ rustPlatform.buildRustPackage rec { version = "0.18.1"; src = fetchFromGitHub { - owner = pname; - repo = pname; - rev = "v${version}"; + owner = "rbspy"; + repo = "rbspy"; + rev = "refs/tags/v${version}"; hash = "sha256-MfXXqty5ZE7wFbc/qJB/FnMxM+Hzfa4GEGgGKwurXp8="; }; @@ -44,16 +44,17 @@ rustPlatform.buildRustPackage rec { "--skip=test_sample_subprocesses" ]; - nativeBuildInputs = [ ruby which ] - ++ lib.optional stdenv.isDarwin rustPlatform.bindgenHook; + nativeBuildInputs = [ + ruby + which + ] ++ lib.optional stdenv.isDarwin rustPlatform.bindgenHook; passthru.updateScript = nix-update-script { }; meta = with lib; { homepage = "https://rbspy.github.io/"; - description = '' - A Sampling CPU Profiler for Ruby. - ''; + description = "A Sampling CPU Profiler for Ruby"; + changelog = "https://github.com/rbspy/rbspy/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ viraptor ]; platforms = platforms.linux ++ platforms.darwin; From 2995ed074f2e4138e62bf464b1c3529a9ee05115 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 11 Jan 2024 21:00:55 +0100 Subject: [PATCH 123/158] python311Packages.zcbor: add changelog to meta --- pkgs/development/python-modules/zcbor/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/zcbor/default.nix b/pkgs/development/python-modules/zcbor/default.nix index dfacdb646075..1525a7610c73 100644 --- a/pkgs/development/python-modules/zcbor/default.nix +++ b/pkgs/development/python-modules/zcbor/default.nix @@ -36,6 +36,7 @@ buildPythonPackage rec { meta = with lib; { description = "A low footprint CBOR library in the C language (C++ compatible), tailored for use in microcontrollers"; homepage = "https://pypi.org/project/zcbor/"; + changelog = "https://github.com/NordicSemiconductor/zcbor/releases/tag/${version}"; license = licenses.asl20; maintainers = with maintainers; [ otavio ]; }; From 6cfac2acb1cb4fbab8e79da3f677979a0904191e Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Thu, 11 Jan 2024 20:04:49 +0000 Subject: [PATCH 124/158] zlib-ng: 2.1.5 -> 2.1.6 Changes: https://github.com/zlib-ng/zlib-ng/releases/tag/2.1.6 --- pkgs/development/libraries/zlib-ng/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/zlib-ng/default.nix b/pkgs/development/libraries/zlib-ng/default.nix index 6eaf9f84c6e8..c4d2aa2c5334 100644 --- a/pkgs/development/libraries/zlib-ng/default.nix +++ b/pkgs/development/libraries/zlib-ng/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "zlib-ng"; - version = "2.1.5"; + version = "2.1.6"; src = fetchFromGitHub { owner = "zlib-ng"; repo = "zlib-ng"; rev = version; - hash = "sha256-EIAeRpmPFodbqQfMOFuGq7cZOnfR9xg8KN+5xa7e9J8="; + hash = "sha256-Auu7DS4qNm9/8t/nCjEJBaXfPPxA18oZr2qqybVY4Es="; }; outputs = [ "out" "dev" "bin" ]; From a29d0ee2d6434b3c0796f6787214ffa4c99a2f9f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 11 Jan 2024 21:16:47 +0100 Subject: [PATCH 125/158] python311Packages.dvc-objects: 3.0.3 -> 3.0.6 Diff: iterative/dvc-objects@refs/tags/3.0.3...3.0.6 Changelog: https://github.com/iterative/dvc-objects/releases/tag/3.0.6 --- pkgs/development/python-modules/dvc-objects/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/dvc-objects/default.nix b/pkgs/development/python-modules/dvc-objects/default.nix index 1f07fe7b8707..3a62161c871f 100644 --- a/pkgs/development/python-modules/dvc-objects/default.nix +++ b/pkgs/development/python-modules/dvc-objects/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , fsspec , funcy +, pytest-asyncio , pytest-mock , pytestCheckHook , pythonOlder @@ -13,7 +14,7 @@ buildPythonPackage rec { pname = "dvc-objects"; - version = "3.0.0"; + version = "3.0.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -22,7 +23,7 @@ buildPythonPackage rec { owner = "iterative"; repo = "dvc-objects"; rev = "refs/tags/${version}"; - hash = "sha256-hpiDbECVXbBkewJa+RwrgTQFEFAb3Ir2qs0ENYuJtwI="; + hash = "sha256-JQ3UDUOpuxPavXkoJqbS0T7y3kpwuJ8NvqAl3DahoLU="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -38,14 +39,16 @@ buildPythonPackage rec { propagatedBuildInputs = [ fsspec + ] ++ lib.optionals (pythonOlder "3.12") [ funcy - shortuuid ]; nativeCheckInputs = [ + pytest-asyncio pytest-mock pytestCheckHook reflink + shortuuid ]; pythonImportsCheck = [ From cbdd9abbb5d3678c1549f49f5f267d6ee4711455 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 11 Jan 2024 21:26:20 +0100 Subject: [PATCH 126/158] python311Packages.nibe: add optional-dependencies --- pkgs/development/python-modules/nibe/default.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pkgs/development/python-modules/nibe/default.nix b/pkgs/development/python-modules/nibe/default.nix index c84164c9d65d..74b025014759 100644 --- a/pkgs/development/python-modules/nibe/default.nix +++ b/pkgs/development/python-modules/nibe/default.nix @@ -3,12 +3,15 @@ , aresponses , async-modbus , async-timeout +, asyncclick , buildPythonPackage , construct , exceptiongroup , fetchFromGitHub +, pandas , pytest-asyncio , pytestCheckHook +, python-slugify , pythonOlder , setuptools , tenacity @@ -40,6 +43,16 @@ buildPythonPackage rec { tenacity ]; + passthru.optional-dependencies = { + convert = [ + pandas + python-slugify + ]; + cli = [ + asyncclick + ]; + }; + nativeCheckInputs = [ aresponses pytest-asyncio From 8f50243ce2f0c2b22cb78f0b04905c2aca1a0be8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 11 Jan 2024 21:28:58 +0100 Subject: [PATCH 127/158] python311Packages.gitignore-parser: 0.1.9 -> 0.1.10 Diff: https://github.com/mherrmann/gitignore_parser/compare/refs/tags/v0.1.9...v0.1.10 Changelog: https://github.com/mherrmann/gitignore_parser/releases/tag/v0.1.10 --- pkgs/development/python-modules/gitignore-parser/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gitignore-parser/default.nix b/pkgs/development/python-modules/gitignore-parser/default.nix index a50d7ce2e235..7f3b41b5899e 100644 --- a/pkgs/development/python-modules/gitignore-parser/default.nix +++ b/pkgs/development/python-modules/gitignore-parser/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "gitignore-parser"; - version = "0.1.9"; + version = "0.1.10"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "mherrmann"; repo = "gitignore_parser"; rev = "refs/tags/v${version}"; - hash = "sha256-T1XgcOHVFv/+oCEFKSoJeFAspJguimHasuREzjQwgWE="; + hash = "sha256-uILXtozXRTOJeVpF1lpM19xaibebiwIMyHzdrlnfoec="; }; nativeCheckInputs = [ From 61ff92983d09ef922954ae861a08956b80b2b843 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 11 Jan 2024 21:30:04 +0100 Subject: [PATCH 128/158] python311Packages.hahomematic: 2024.1.3 -> 2024.1.6 Diff: https://github.com/danielperna84/hahomematic/compare/refs/tags/2024.1.3...2024.1.6 Changelog: https://github.com/danielperna84/hahomematic/releases/tag/2024.1.6 --- pkgs/development/python-modules/hahomematic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hahomematic/default.nix b/pkgs/development/python-modules/hahomematic/default.nix index a23a313c8ee2..364e5a0f40ae 100644 --- a/pkgs/development/python-modules/hahomematic/default.nix +++ b/pkgs/development/python-modules/hahomematic/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "hahomematic"; - version = "2024.1.3"; + version = "2024.1.6"; pyproject = true; disabled = pythonOlder "3.11"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "danielperna84"; repo = "hahomematic"; rev = "refs/tags/${version}"; - hash = "sha256-8kkiZC4Xg8BlNCfVFb4keRVS/zvHK+34YwXpKqAtoDc="; + hash = "sha256-LE5bdcsEPd40w/qQu4Dwxxn2q3fcC0W+u8Dm00r1P40="; }; __darwinAllowLocalNetworking = true; From e65f8787d5461b615fb9697775635d220336d995 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 11 Jan 2024 21:32:07 +0100 Subject: [PATCH 129/158] python311Packages.scmrepo: 2.0.2 -> 2.0.3 Diff: https://github.com/iterative/scmrepo/compare/refs/tags/2.0.2...2.0.3 Changelog: https://github.com/iterative/scmrepo/releases/tag/2.0.3 --- pkgs/development/python-modules/scmrepo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/scmrepo/default.nix b/pkgs/development/python-modules/scmrepo/default.nix index 6e10bb5a1882..e30c367a1bdf 100644 --- a/pkgs/development/python-modules/scmrepo/default.nix +++ b/pkgs/development/python-modules/scmrepo/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "scmrepo"; - version = "2.0.2"; + version = "2.0.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-qY8puMt6ogMjx2QmAhPjCkimKp4Zfghur//MXRhsfFg="; + hash = "sha256-P+Mbf8adSvQPkUgnTSPrqzvHc6lR0ns2mJ0/x9YGPKs="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From 3243aca09004b29363075b7b0b09225f92c7dc51 Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Thu, 11 Jan 2024 22:17:24 +0100 Subject: [PATCH 130/158] =?UTF-8?q?gnome-decoder:=200.3.3=20=E2=86=92=200.?= =?UTF-8?q?4.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/graphics/gnome-decoder/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/graphics/gnome-decoder/default.nix b/pkgs/applications/graphics/gnome-decoder/default.nix index a7e895fb4b6b..c105ba1fad0a 100644 --- a/pkgs/applications/graphics/gnome-decoder/default.nix +++ b/pkgs/applications/graphics/gnome-decoder/default.nix @@ -24,20 +24,20 @@ clangStdenv.mkDerivation rec { pname = "gnome-decoder"; - version = "0.3.3"; + version = "0.4.1"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = "decoder"; rev = version; - hash = "sha256-eMyPN3UxptqavY9tEATW2AP+kpoWaLwUKCwhNQrarVc="; + hash = "sha256-ZEt4QaT2w7PgsnwBCYeDbhcYX0yd0boes/LoejQx0XU="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-3j1hoFffQzWBy4IKtmoMkLBJmNbntpyn0sjv1K0MmDo="; + hash = "sha256-acYOSPSUgm0Kg/bo2WF4sRWfCt03AZdTyNNt3Qv7Zjg="; }; nativeBuildInputs = [ From dd9da8e28be8f0957af2947eff6751d07a2f5d8c Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Thu, 11 Jan 2024 16:42:48 -0500 Subject: [PATCH 131/158] python311Packages.edk2-pytool-library: 0.19.8 -> 0.19.9 Diff: https://github.com/tianocore/edk2-pytool-library/compare/refs/tags/v0.19.8...v0.19.9 Changelog: https://github.com/tianocore/edk2-pytool-library/releases/tag/v0.19.9 --- .../python-modules/edk2-pytool-library/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/edk2-pytool-library/default.nix b/pkgs/development/python-modules/edk2-pytool-library/default.nix index c93ddff879be..4b032f382201 100644 --- a/pkgs/development/python-modules/edk2-pytool-library/default.nix +++ b/pkgs/development/python-modules/edk2-pytool-library/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "edk2-pytool-library"; - version = "0.19.8"; + version = "0.19.9"; pyproject = true; disabled = pythonOlder "3.10"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "tianocore"; repo = "edk2-pytool-library"; rev = "refs/tags/v${version}"; - hash = "sha256-KZCY/bHrhQNARK8UMxhI9rvpcBDa/Qp+yvpQG8HCIho="; + hash = "sha256-eQcto4pd+y9fCjuiaSezA3okfW+xrR01Kc/N2tQdf5A="; }; nativeBuildInputs = [ From 57ea7fc6128d3d198cd8d8017aa4541f5a8559cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 11 Jan 2024 14:29:27 -0800 Subject: [PATCH 132/158] python311Packages.polars: revert version to 0.19.12 In 99de747e114427ccc5b31740a6f35bb59f52c2b0 the version was increased without updating the hash. --- pkgs/development/python-modules/polars/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/polars/default.nix b/pkgs/development/python-modules/polars/default.nix index d967ca27c8ff..9a9bc9f3ead4 100644 --- a/pkgs/development/python-modules/polars/default.nix +++ b/pkgs/development/python-modules/polars/default.nix @@ -13,7 +13,7 @@ }: let pname = "polars"; - version = "0.20.0"; + version = "0.19.12"; rootSource = fetchFromGitHub { owner = "pola-rs"; repo = "polars"; From 23904e58207f48ffcd8077295e28d3f06f6fc002 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 12 Jan 2024 00:00:57 +0100 Subject: [PATCH 133/158] python311Packages.base2048: init at 0.1.3 Binary encoding with base-2048 in Python with Rust https://github.com/ionite34/base2048 --- .../python-modules/base2048/Cargo.lock | 498 ++++++++++++++++++ .../python-modules/base2048/default.nix | 63 +++ pkgs/top-level/python-packages.nix | 2 + 3 files changed, 563 insertions(+) create mode 100644 pkgs/development/python-modules/base2048/Cargo.lock create mode 100644 pkgs/development/python-modules/base2048/default.nix diff --git a/pkgs/development/python-modules/base2048/Cargo.lock b/pkgs/development/python-modules/base2048/Cargo.lock new file mode 100644 index 000000000000..d48278fb00a1 --- /dev/null +++ b/pkgs/development/python-modules/base2048/Cargo.lock @@ -0,0 +1,498 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "ahash" +version = "0.7.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a824f2aa7e75a0c98c5a504fceb80649e9c35265d44525b5f94de4771a395cd" +dependencies = [ + "getrandom", + "once_cell", + "version_check", +] + +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "base2048" +version = "0.1.3" +dependencies = [ + "hashbrown", + "lazy_static", + "pyo3", + "rstest", +] + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "futures" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da0290714b38af9b4a7b094b8a37086d1b4e61f2df9122c3cad2577669145335" +dependencies = [ + "futures-channel", + "futures-core", + "futures-executor", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-channel" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb" +dependencies = [ + "futures-core", + "futures-sink", +] + +[[package]] +name = "futures-core" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c" + +[[package]] +name = "futures-executor" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f4fb8693db0cf099eadcca0efe2a5a22e4550f98ed16aba6c48700da29597bc" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-io" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa" + +[[package]] +name = "futures-macro" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", +] + +[[package]] +name = "futures-sink" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817" + +[[package]] +name = "futures-task" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2" + +[[package]] +name = "futures-timer" +version = "3.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c" + +[[package]] +name = "futures-util" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104" +dependencies = [ + "futures-channel", + "futures-core", + "futures-io", + "futures-macro", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] +name = "getrandom" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" +dependencies = [ + "cfg-if", + "libc", + "wasi", +] + +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" +dependencies = [ + "ahash", +] + +[[package]] +name = "indoc" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa799dd5ed20a7e349f3b4639aa80d74549c81716d9ec4f994c9b5815598306" + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] +name = "libc" +version = "0.2.150" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" + +[[package]] +name = "lock_api" +version = "0.4.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "memchr" +version = "2.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" + +[[package]] +name = "memoffset" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" +dependencies = [ + "autocfg", +] + +[[package]] +name = "once_cell" +version = "1.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" + +[[package]] +name = "parking_lot" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +dependencies = [ + "lock_api", + "parking_lot_core", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall", + "smallvec", + "windows-targets", +] + +[[package]] +name = "pin-project-lite" +version = "0.2.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "proc-macro2" +version = "1.0.70" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "pyo3" +version = "0.17.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "268be0c73583c183f2b14052337465768c07726936a260f480f0857cb95ba543" +dependencies = [ + "cfg-if", + "indoc", + "libc", + "memoffset", + "parking_lot", + "pyo3-build-config", + "pyo3-ffi", + "pyo3-macros", + "unindent", +] + +[[package]] +name = "pyo3-build-config" +version = "0.17.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28fcd1e73f06ec85bf3280c48c67e731d8290ad3d730f8be9dc07946923005c8" +dependencies = [ + "once_cell", + "target-lexicon", +] + +[[package]] +name = "pyo3-ffi" +version = "0.17.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f6cb136e222e49115b3c51c32792886defbfb0adead26a688142b346a0b9ffc" +dependencies = [ + "libc", + "pyo3-build-config", +] + +[[package]] +name = "pyo3-macros" +version = "0.17.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94144a1266e236b1c932682136dc35a9dee8d3589728f68130c7c3861ef96b28" +dependencies = [ + "proc-macro2", + "pyo3-macros-backend", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "pyo3-macros-backend" +version = "0.17.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8df9be978a2d2f0cdebabb03206ed73b11314701a5bfe71b0d753b81997777f" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "quote" +version = "1.0.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "redox_syscall" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +dependencies = [ + "bitflags", +] + +[[package]] +name = "rstest" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e9c9dc66cc29792b663ffb5269be669f1613664e69ad56441fdb895c2347b930" +dependencies = [ + "futures", + "futures-timer", + "rstest_macros", + "rustc_version", +] + +[[package]] +name = "rstest_macros" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5015e68a0685a95ade3eee617ff7101ab6a3fc689203101ca16ebc16f2b89c66" +dependencies = [ + "cfg-if", + "proc-macro2", + "quote", + "rustc_version", + "syn 1.0.109", +] + +[[package]] +name = "rustc_version" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +dependencies = [ + "semver", +] + +[[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + +[[package]] +name = "semver" +version = "1.0.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" + +[[package]] +name = "slab" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" +dependencies = [ + "autocfg", +] + +[[package]] +name = "smallvec" +version = "1.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" + +[[package]] +name = "syn" +version = "1.0.109" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "syn" +version = "2.0.39" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "target-lexicon" +version = "0.12.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14c39fd04924ca3a864207c66fc2cd7d22d7c016007f9ce846cbb9326331930a" + +[[package]] +name = "unicode-ident" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" + +[[package]] +name = "unindent" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1766d682d402817b5ac4490b3c3002d91dfa0d22812f341609f97b08757359c" + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "windows-targets" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" diff --git a/pkgs/development/python-modules/base2048/default.nix b/pkgs/development/python-modules/base2048/default.nix new file mode 100644 index 000000000000..889ef9f81f17 --- /dev/null +++ b/pkgs/development/python-modules/base2048/default.nix @@ -0,0 +1,63 @@ +{ lib +, buildPythonPackage +, cargo +, fetchFromGitHub +, frelatage +, maturin +, pytestCheckHook +, pythonOlder +, rustc +, rustPlatform +}: + +buildPythonPackage rec { + pname = "base2048"; + version = "0.1.3"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "ionite34"; + repo = "base2048"; + rev = "refs/tags/v${version}"; + hash = "sha256-OXlfycJB1IrW2Zq0xPDGjjwCdRTWtX/ixPGWcd+YjAg="; + }; + + cargoDeps = rustPlatform.importCargoLock { + lockFile = ./Cargo.lock; + }; + + postPatch = '' + ln -s ${./Cargo.lock} Cargo.lock + ''; + + nativeBuildInputs = [ + cargo + rustPlatform.cargoSetupHook + rustPlatform.maturinBuildHook + rustc + ]; + + passthru.optional-dependencies = { + fuzz = [ + frelatage + ]; + }; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "base2048" + ]; + + meta = with lib; { + description = "Binary encoding with base-2048 in Python with Rust"; + homepage = "https://github.com/ionite34/base2048"; + changelog = "https://github.com/ionite34/base2048/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9ace4959843c..4e6379679d98 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1323,6 +1323,8 @@ self: super: with self; { baron = callPackage ../development/python-modules/baron { }; + base2048 = callPackage ../development/python-modules/base2048 { }; + base36 = callPackage ../development/python-modules/base36 { }; base58 = callPackage ../development/python-modules/base58 { }; From 1192f828230c6b404e18f087e21fb7bf78f42fbb Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 9 Dec 2023 17:46:54 +0100 Subject: [PATCH 134/158] python311Packages.frelatage: init at 0.1.0 Greybox and Coverage-based library to fuzz Python applications https://github.com/Rog3rSm1th/frelatage --- .../python-modules/frelatage/default.nix | 49 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 51 insertions(+) create mode 100644 pkgs/development/python-modules/frelatage/default.nix diff --git a/pkgs/development/python-modules/frelatage/default.nix b/pkgs/development/python-modules/frelatage/default.nix new file mode 100644 index 000000000000..519e981b6999 --- /dev/null +++ b/pkgs/development/python-modules/frelatage/default.nix @@ -0,0 +1,49 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, numpy +, poetry-core +, pytestCheckHook +, pythonOlder +, timeout-decorator +}: + +buildPythonPackage rec { + pname = "frelatage"; + version = "0.1.0"; + pyproject = true; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "Rog3rSm1th"; + repo = "frelatage"; + rev = "refs/tags/v${version}"; + hash = "sha256-eHVqp6govBV9FvSQyaZuEEImHQRs/mbLaW86RCvtDbM="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + numpy + timeout-decorator + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "frelatage" + ]; + + meta = with lib; { + description = "Greybox and Coverage-based library to fuzz Python applications"; + homepage = "https://github.com/Rog3rSm1th/frelatage"; + changelog = "https://github.com/Rog3rSm1th/frelatage/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4e6379679d98..4be19096e2f9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4273,6 +4273,8 @@ self: super: with self; { freezegun = callPackage ../development/python-modules/freezegun { }; + frelatage = callPackage ../development/python-modules/frelatage { }; + frida-python = callPackage ../development/python-modules/frida-python { }; frigidaire = callPackage ../development/python-modules/frigidaire { }; From a79db02fe4cad23d36b90b75f62c9244f21f4779 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 12 Jan 2024 00:33:08 +0100 Subject: [PATCH 135/158] nucleiparser: source is now tagged --- pkgs/by-name/nu/nucleiparser/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/nu/nucleiparser/package.nix b/pkgs/by-name/nu/nucleiparser/package.nix index 6814b4e94575..58ff98d1a9f1 100644 --- a/pkgs/by-name/nu/nucleiparser/package.nix +++ b/pkgs/by-name/nu/nucleiparser/package.nix @@ -1,18 +1,17 @@ { lib -, python3 , fetchFromGitHub +, python3 }: python3.pkgs.buildPythonApplication rec { pname = "nucleiparser"; - version = "unstable-2023-12-26"; + version = "0.2.1"; pyproject = true; src = fetchFromGitHub { owner = "sinkmanu"; repo = "nucleiparser"; - # https://github.com/Sinkmanu/nucleiparser/issues/1 - rev = "42f3d57c70300c436497c2539cdb3c49977fc48d"; + rev = "refs/tags/${version}"; hash = "sha256-/SLaRuO06rF7aLV7zY7tfIxkJRzsx+/Z+mc562RX2OQ="; }; @@ -31,6 +30,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "A Nuclei output parser for CLI"; homepage = "https://github.com/sinkmanu/nucleiparser"; + changelog = "https://github.com/Sinkmanu/nucleiparser/releases/tag/${version}"; license = licenses.gpl3Only; maintainers = with maintainers; [ fab ]; mainProgram = "nparser"; From d00f6821b912b7cf9665a87a579c64ac0a680153 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 12 Jan 2024 00:35:29 +0100 Subject: [PATCH 136/158] pdfrip: init at 2.0.1 PDF password cracking utility https://github.com/mufeedvh/pdfrip --- pkgs/by-name/pd/pdfrip/Cargo.lock | 1028 ++++++++++++++++++++++++++++ pkgs/by-name/pd/pdfrip/package.nix | 33 + 2 files changed, 1061 insertions(+) create mode 100644 pkgs/by-name/pd/pdfrip/Cargo.lock create mode 100644 pkgs/by-name/pd/pdfrip/package.nix diff --git a/pkgs/by-name/pd/pdfrip/Cargo.lock b/pkgs/by-name/pd/pdfrip/Cargo.lock new file mode 100644 index 000000000000..58c91b5a09d2 --- /dev/null +++ b/pkgs/by-name/pd/pdfrip/Cargo.lock @@ -0,0 +1,1028 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "adler32" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234" + +[[package]] +name = "aes" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac1f845298e95f983ff1944b728ae08b8cebab80d684f0a832ed0fc74dfa27e2" +dependencies = [ + "cfg-if", + "cipher", + "cpufeatures", +] + +[[package]] +name = "aho-corasick" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" +dependencies = [ + "memchr", +] + +[[package]] +name = "anstream" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d664a92ecae85fd0a7392615844904654d1d5f5514837f471ddef4a057aba1b6" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" + +[[package]] +name = "anstyle-parse" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "anstyle-wincon" +version = "3.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" +dependencies = [ + "anstyle", + "windows-sys 0.52.0", +] + +[[package]] +name = "anyhow" +version = "1.0.79" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca" + +[[package]] +name = "async-trait" +version = "0.1.77" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bitflags" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" + +[[package]] +name = "block-buffer" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" +dependencies = [ + "generic-array", +] + +[[package]] +name = "block-padding" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8894febbff9f758034a5b8e12d87918f56dfc64a8e1fe757d65e29041538d93" +dependencies = [ + "generic-array", +] + +[[package]] +name = "bytecount" +version = "0.6.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1e5f035d16fc623ae5f74981db80a439803888314e3a555fd6f04acd51a3205" + +[[package]] +name = "cbc" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26b52a9543ae338f279b96b0b9fed9c8093744685043739079ce85cd58f289a6" +dependencies = [ + "cipher", +] + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "cipher" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" +dependencies = [ + "crypto-common", + "inout", +] + +[[package]] +name = "clap" +version = "4.4.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c12ed66a79a555082f595f7eb980d08669de95009dd4b3d61168c573ebe38fc9" +dependencies = [ + "clap_builder", + "clap_derive", +] + +[[package]] +name = "clap_builder" +version = "4.4.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f4645eab3431e5a8403a96bea02506a8b35d28cd0f0330977dd5d22f9c84f43" +dependencies = [ + "anstream", + "anstyle", + "clap_lex", + "strsim", +] + +[[package]] +name = "clap_derive" +version = "4.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "clap_lex" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" + +[[package]] +name = "colorchoice" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" + +[[package]] +name = "colored" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cbf2150cce219b664a8a70df7a1f933836724b503f8a413af9365b4dcc4d90b8" +dependencies = [ + "lazy_static", + "windows-sys 0.48.0", +] + +[[package]] +name = "console" +version = "0.15.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb" +dependencies = [ + "encode_unicode", + "lazy_static", + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "cpufeatures" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" +dependencies = [ + "libc", +] + +[[package]] +name = "crossbeam" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1137cd7e7fc0fb5d3c5a8678be38ec56e819125d8d7907411fe24ccb943faca8" +dependencies = [ + "crossbeam-channel", + "crossbeam-deque", + "crossbeam-epoch", + "crossbeam-queue", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-channel" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "176dc175b78f56c0f321911d9c8eb2b77a78a4860b9c19db83835fea1a46649b" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-deque" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" +dependencies = [ + "crossbeam-epoch", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.9.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-queue" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df0346b5d5e76ac2fe4e327c5fd1118d6be7c51dfb18f9b7922923f287471e35" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" + +[[package]] +name = "crypto-common" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +dependencies = [ + "generic-array", + "typenum", +] + +[[package]] +name = "datasize" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e65c07d59e45d77a8bda53458c24a828893a99ac6cdd9c84111e09176ab739a2" +dependencies = [ + "datasize_derive", +] + +[[package]] +name = "datasize_derive" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613e4ee15899913285b7612004bbd490abd605be7b11d35afada5902fb6b91d5" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "deflate" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c86f7e25f518f4b81808a2cf1c50996a61f5c2eb394b2393bd87f2a4780a432f" +dependencies = [ + "adler32", +] + +[[package]] +name = "digest" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +dependencies = [ + "block-buffer", + "crypto-common", +] + +[[package]] +name = "doc-comment" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" + +[[package]] +name = "either" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" + +[[package]] +name = "encode_unicode" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" + +[[package]] +name = "env_logger" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95b3f3e67048839cb0d0781f445682a35113da7121f7c949db0e2be96a4fbece" +dependencies = [ + "humantime", + "is-terminal", + "log", + "regex", + "termcolor", +] + +[[package]] +name = "errno" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "fax" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2cec1797683c06c2f3de5edb3fde4d99c70e96f3204f6aaff944078353e5c55" +dependencies = [ + "fax_derive", +] + +[[package]] +name = "fax_derive" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c1d7ffc9f2dc8316348c75281a99c8fdc60c1ddf4f82a366d117bf1b74d5a39" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "finl_unicode" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fcfdc7a0362c9f4444381a9e697c79d435fe65b52a37466fc2c1184cee9edc6" + +[[package]] +name = "generic-array" +version = "0.14.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" +dependencies = [ + "typenum", + "version_check", +] + +[[package]] +name = "globalcache" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ccd40efe5b4f0021ca3c36a140cb365563be3c579653b573a5a8ac69bd6f9028" +dependencies = [ + "async-trait", + "tuple", +] + +[[package]] +name = "heck" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" + +[[package]] +name = "hermit-abi" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" + +[[package]] +name = "humantime" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" + +[[package]] +name = "indicatif" +version = "0.16.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d207dc617c7a380ab07ff572a6e52fa202a2a8f355860ac9c38e23f8196be1b" +dependencies = [ + "console", + "lazy_static", + "number_prefix", + "regex", +] + +[[package]] +name = "inflate" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cdb29978cc5797bd8dcc8e5bf7de604891df2a8dc576973d71a281e916db2ff" +dependencies = [ + "adler32", +] + +[[package]] +name = "inout" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" +dependencies = [ + "block-padding", + "generic-array", +] + +[[package]] +name = "is-terminal" +version = "0.4.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bad00257d07be169d870ab665980b06cdb366d792ad690bf2e76876dc503455" +dependencies = [ + "hermit-abi", + "rustix", + "windows-sys 0.52.0", +] + +[[package]] +name = "istring" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "875cc6fb9aecbc1a9bd736f2d18b12e0756b4c80c5e35e28262154abcb077a39" +dependencies = [ + "datasize", +] + +[[package]] +name = "itertools" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" +dependencies = [ + "either", +] + +[[package]] +name = "jpeg-decoder" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc0000e42512c92e31c2252315bda326620a4e034105e900c98ec492fa077b3e" + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] +name = "libc" +version = "0.2.152" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13e3bf6590cbc649f4d1a3eefc9d5d6eb746f5200ffb04e5e142700b8faa56e7" + +[[package]] +name = "linux-raw-sys" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456" + +[[package]] +name = "log" +version = "0.4.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" + +[[package]] +name = "md5" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "490cc448043f947bae3cbee9c203358d62dbee0db12107a74be5c30ccfd09771" + +[[package]] +name = "memchr" +version = "2.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" + +[[package]] +name = "num-traits" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" +dependencies = [ + "autocfg", +] + +[[package]] +name = "number_prefix" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" + +[[package]] +name = "once_cell" +version = "1.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" + +[[package]] +name = "pdf" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e375ec076445f61d4dbc4636e9e788f841d279c65d6fea8a3875caddd4f2dd82" +dependencies = [ + "aes", + "bitflags 1.3.2", + "cbc", + "datasize", + "deflate", + "fax", + "globalcache", + "inflate", + "istring", + "itertools", + "jpeg-decoder", + "log", + "md5", + "once_cell", + "pdf_derive", + "sha2", + "snafu", + "stringprep", + "weezl", +] + +[[package]] +name = "pdf_derive" +version = "0.1.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f4007262775d0798de87b15cbc64cf1aed5f7ee87eec847e297b69d8ed4b4f8" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "pdfrip" +version = "2.0.1" +dependencies = [ + "anyhow", + "bytecount", + "clap", + "colored", + "crossbeam", + "indicatif", + "log", + "pdf", + "pretty_env_logger", +] + +[[package]] +name = "pretty_env_logger" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "865724d4dbe39d9f3dd3b52b88d859d66bcb2d6a0acfd5ea68a65fb66d4bdc1c" +dependencies = [ + "env_logger", + "log", +] + +[[package]] +name = "proc-macro2" +version = "1.0.76" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quote" +version = "1.0.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "regex" +version = "1.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" + +[[package]] +name = "rustix" +version = "0.38.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72e572a5e8ca657d7366229cdde4bd14c4eb5499a9573d4d366fe1b599daa316" +dependencies = [ + "bitflags 2.4.1", + "errno", + "libc", + "linux-raw-sys", + "windows-sys 0.52.0", +] + +[[package]] +name = "serde" +version = "1.0.195" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "63261df402c67811e9ac6def069e4786148c4563f4b50fd4bf30aa370d626b02" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.195" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46fe8f8603d81ba86327b23a2e9cdf49e1255fb94a4c5f297f6ee0547178ea2c" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "sha2" +version = "0.10.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "snafu" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4de37ad025c587a29e8f3f5605c00f70b98715ef90b9061a815b9e59e9042d6" +dependencies = [ + "doc-comment", + "snafu-derive", +] + +[[package]] +name = "snafu-derive" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "990079665f075b699031e9c08fd3ab99be5029b96f3b78dc0709e8f77e4efebf" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "stringprep" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb41d74e231a107a1b4ee36bd1214b11285b77768d2e3824aedafa988fd36ee6" +dependencies = [ + "finl_unicode", + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "strsim" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + +[[package]] +name = "syn" +version = "1.0.109" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "syn" +version = "2.0.48" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "termcolor" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "tinyvec" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" + +[[package]] +name = "tuple" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9bb9f6bd73479481158ba8ee3edf17aca93354623d13f02e96a2014fdbc1c37e" +dependencies = [ + "num-traits", + "serde", +] + +[[package]] +name = "typenum" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" + +[[package]] +name = "unicode-bidi" +version = "0.3.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f2528f27a9eb2b21e69c95319b30bd0efd85d09c379741b0f78ea1d86be2416" + +[[package]] +name = "unicode-ident" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" + +[[package]] +name = "unicode-normalization" +version = "0.1.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +dependencies = [ + "tinyvec", +] + +[[package]] +name = "utf8parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "weezl" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb" + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-util" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" +dependencies = [ + "winapi", +] + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.0", +] + +[[package]] +name = "windows-targets" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", +] + +[[package]] +name = "windows-targets" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +dependencies = [ + "windows_aarch64_gnullvm 0.52.0", + "windows_aarch64_msvc 0.52.0", + "windows_i686_gnu 0.52.0", + "windows_i686_msvc 0.52.0", + "windows_x86_64_gnu 0.52.0", + "windows_x86_64_gnullvm 0.52.0", + "windows_x86_64_msvc 0.52.0", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" diff --git a/pkgs/by-name/pd/pdfrip/package.nix b/pkgs/by-name/pd/pdfrip/package.nix new file mode 100644 index 000000000000..04ba06049976 --- /dev/null +++ b/pkgs/by-name/pd/pdfrip/package.nix @@ -0,0 +1,33 @@ +{ lib +, rustPlatform +, fetchFromGitHub +}: + +rustPlatform.buildRustPackage rec { + pname = "pdfrip"; + version = "2.0.1"; + + src = fetchFromGitHub { + owner = "mufeedvh"; + repo = "pdfrip"; + rev = "refs/tags/v${version}"; + hash = "sha256-9KDWd71MJ2W9Xp3uqp0iZMmkBwIay+L4gnPUt7hylS0="; + }; + + cargoLock = { + lockFile = ./Cargo.lock; + }; + + postPatch = '' + ln -s ${./Cargo.lock} Cargo.lock + ''; + + meta = with lib; { + description = "PDF password cracking utility"; + homepage = "https://github.com/mufeedvh/pdfrip"; + changelog = "https://github.com/mufeedvh/pdfrip/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + mainProgram = "pdfrip"; + }; +} From 9e935e69fac3566480fbc4af239e5756a74798d6 Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Thu, 11 Jan 2024 22:07:05 +0100 Subject: [PATCH 137/158] =?UTF-8?q?curtail:=201.3.1=20=E2=86=92=201.8.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/graphics/curtail/default.nix | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/graphics/curtail/default.nix b/pkgs/applications/graphics/curtail/default.nix index 1d7df76c214e..30ca2289526b 100644 --- a/pkgs/applications/graphics/curtail/default.nix +++ b/pkgs/applications/graphics/curtail/default.nix @@ -5,7 +5,8 @@ , appstream-glib , desktop-file-utils , gettext -, gtk3 +, gtk4 +, libadwaita , meson , ninja , pkg-config @@ -14,18 +15,19 @@ , libwebp , optipng , pngquant +, oxipng }: python3.pkgs.buildPythonApplication rec { pname = "curtail"; - version = "1.3.1"; + version = "1.8.0"; format = "other"; src = fetchFromGitHub { owner = "Huluti"; repo = "Curtail"; rev = "refs/tags/${version}"; - sha256 = "sha256-/xvkRXs1EVu+9RZM+TnyIGxFV2stUR9XHEmaJxsJ3V8="; + sha256 = "sha256-LLz4nZ9WFQMogQR2gCKn80gvHUG5hlpQpcNjpr4fs2s="; }; nativeBuildInputs = [ @@ -33,7 +35,8 @@ python3.pkgs.buildPythonApplication rec { appstream-glib desktop-file-utils gettext - gtk3 + gtk4 + libadwaita meson ninja pkg-config @@ -43,7 +46,8 @@ python3.pkgs.buildPythonApplication rec { buildInputs = [ appstream-glib gettext - gtk3 + gtk4 + libadwaita ]; propagatedBuildInputs = [ @@ -59,7 +63,7 @@ python3.pkgs.buildPythonApplication rec { preFixup = '' makeWrapperArgs+=( "''${gappsWrapperArgs[@]}" - "--prefix" "PATH" ":" "${lib.makeBinPath [ jpegoptim libwebp optipng pngquant ]}" + "--prefix" "PATH" ":" "${lib.makeBinPath [ jpegoptim libwebp optipng pngquant oxipng ]}" ) ''; From 35c7a488f857bd30d6b3601f621b506a00be28fa Mon Sep 17 00:00:00 2001 From: Matthew_Cash Date: Wed, 10 Jan 2024 11:48:48 -0800 Subject: [PATCH 138/158] firefox: set meta.mainProgram to launcherName in wrapper After #235912 changed the binary name for some Firefox packages, the meta.mainProgram value was no longer accurate and commands such as nix run nixpkgs#firefox-devedition failed because /bin/firefox was executed instead of /bin/firefox-devedition. This sets meta.mainProgram to launcherName, which contains the nameSuffix set in #235912, instead of inheriting the unwrapped package's mainProgram, which is always firefox with no suffix. --- pkgs/applications/networking/browsers/firefox/wrapper.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index dcb8923c423c..a2b97577c8d3 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -416,6 +416,7 @@ let meta = browser.meta // { inherit (browser.meta) description; + mainProgram = launcherName; hydraPlatforms = []; priority = (browser.meta.priority or 0) - 1; # prefer wrapper over the package }; From 29bc446b5c6942d4f613ab78aa8166e389d148cd Mon Sep 17 00:00:00 2001 From: Yureka Date: Fri, 12 Jan 2024 02:00:49 +0100 Subject: [PATCH 139/158] Revert "nixos/gitlab: fix database config when no passwordfile is defined" (#280392) --- nixos/modules/services/misc/gitlab.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index d8e4aab4feea..ca6910b795d8 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -1359,7 +1359,6 @@ in { '' else '' jq <${pkgs.writeText "database.yml" (builtins.toJSON databaseConfig)} \ - '${if lib.versionAtLeast (lib.getVersion cfg.packages.gitlab) "15.9" then ".production.main as $main | del(.production.main) | .production |= {main: $main} + ." else ""}' \ >'${cfg.statePath}/config/database.yml' '' } From 1a1c53c271b385705d7d98fbff37f820565a7f32 Mon Sep 17 00:00:00 2001 From: Yureka Date: Fri, 12 Jan 2024 02:03:23 +0100 Subject: [PATCH 140/158] Revert "nixos/gitlab: Add CI database connection for >=15.9" (#280395) --- nixos/modules/services/misc/gitlab.nix | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index ca6910b795d8..6756d59cf367 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -27,13 +27,7 @@ let encoding = "utf8"; pool = cfg.databasePool; } // cfg.extraDatabaseConfig; - in if lib.versionAtLeast (lib.getVersion cfg.packages.gitlab) "15.9" then { - production.main = val; - # Starting with GitLab 15.9, single connections were deprecated and will be - # removed in GitLab 17.0. The CI connection however requires database_tasks set - # to false. - production.ci = val // { database_tasks = false; }; - } else if lib.versionAtLeast (lib.getVersion cfg.packages.gitlab) "15.0" then { + in if lib.versionAtLeast (lib.getVersion cfg.packages.gitlab) "15.0" then { production.main = val; } else { production = val; @@ -1354,7 +1348,7 @@ in { fi jq <${pkgs.writeText "database.yml" (builtins.toJSON databaseConfig)} \ - '.${if lib.versionAtLeast (lib.getVersion cfg.packages.gitlab) "15.0" then "production.main" else "production"}.password = $ENV.db_password ${if lib.versionAtLeast (lib.getVersion cfg.packages.gitlab) "15.9" then "| .production.ci.password = $ENV.db_password | .production.main as $main | del(.production.main) | .production |= {main: $main} + ." else ""}' \ + '.${if lib.versionAtLeast (lib.getVersion cfg.packages.gitlab) "15.0" then "production.main" else "production"}.password = $ENV.db_password' \ >'${cfg.statePath}/config/database.yml' '' else '' From dc8a34cf0f162018bf5cba4d5ea92df46cba970a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 6 Jan 2024 16:38:54 +0000 Subject: [PATCH 141/158] deno: 1.39.1 -> 1.39.2 --- pkgs/development/web/deno/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/web/deno/default.nix b/pkgs/development/web/deno/default.nix index ae2d9e9e26c3..acc2a8c5c2dc 100644 --- a/pkgs/development/web/deno/default.nix +++ b/pkgs/development/web/deno/default.nix @@ -13,16 +13,16 @@ rustPlatform.buildRustPackage rec { pname = "deno"; - version = "1.39.1"; + version = "1.39.2"; src = fetchFromGitHub { owner = "denoland"; repo = pname; rev = "v${version}"; - hash = "sha256-Rlt8gRlZlxC/axHsicbQizoMNbQJsv6egZXj4SKUARw="; + hash = "sha256-R5LF3PwH8LZeBM7biR+QLo5+MJ9KvM41fk5IHR7oAOs="; }; - cargoHash = "sha256-P0g5rhnSjMd9bD7/FBYaRyXwbeC5nAjDBA2EsQ4gfXA="; + cargoHash = "sha256-OPHQltS+3GZTIhMSg6ldLWy6L5skYzZxJLM06rLiDzs="; postPatch = '' # upstream uses lld on aarch64-darwin for faster builds From 65949313b456c1630c14a118ebb8287aa0d63035 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 12 Jan 2024 04:20:00 +0000 Subject: [PATCH 142/158] vale: 3.0.0 -> 3.0.3 Diff: https://github.com/errata-ai/vale/compare/v3.0.0...v3.0.3 Changelog: https://github.com/errata-ai/vale/releases/tag/v3.0.3 --- pkgs/tools/text/vale/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/vale/default.nix b/pkgs/tools/text/vale/default.nix index f6582572278a..d25753651ada 100644 --- a/pkgs/tools/text/vale/default.nix +++ b/pkgs/tools/text/vale/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "vale"; - version = "3.0.0"; + version = "3.0.3"; subPackages = [ "cmd/vale" ]; outputs = [ "out" "data" ]; @@ -11,7 +11,7 @@ buildGoModule rec { owner = "errata-ai"; repo = "vale"; rev = "v${version}"; - hash = "sha256-qov9DWpHzxgDhgF9LwPGxjuOdmnYt4YcFeCO6Xb+QAw="; + hash = "sha256-KBqs8hSotVt7+DOpBoDyBTTVhtkk1v5DyhflaPmcWS8="; }; vendorHash = "sha256-AsBbJJQs+pU2UNfEFvNnPwaaabTrXvFBQLcriIA2ST4="; From 1eeef06673db79a16b79ef45a7cfa74ea6cd655c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 12 Jan 2024 04:54:32 +0000 Subject: [PATCH 143/158] postgresql12JitPackages.pgroonga: 3.1.5 -> 3.1.6 --- pkgs/servers/sql/postgresql/ext/pgroonga.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pgroonga.nix b/pkgs/servers/sql/postgresql/ext/pgroonga.nix index bb0f33490b7e..ee582067dd85 100644 --- a/pkgs/servers/sql/postgresql/ext/pgroonga.nix +++ b/pkgs/servers/sql/postgresql/ext/pgroonga.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "pgroonga"; - version = "3.1.5"; + version = "3.1.6"; src = fetchurl { url = "https://packages.groonga.org/source/${pname}/${pname}-${version}.tar.gz"; - hash = "sha256-ddJe+3l11O5vXfSzIT03AF6ekVmGQPVos54dSpjQnpI="; + hash = "sha256-XfHpKstgdBQ6Oo0cDpOphUJNTu9KgfBuxAa8RadvjyA="; }; nativeBuildInputs = [ pkg-config ]; From 27d3d4721993d87b8c171590ab84d7de56b1dc4a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 12 Jan 2024 04:54:46 +0000 Subject: [PATCH 144/158] python311Packages.id: 1.2.1 -> 1.3.0 --- pkgs/development/python-modules/id/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/id/default.nix b/pkgs/development/python-modules/id/default.nix index f2e6bbf7579b..bf72a46b6f1b 100644 --- a/pkgs/development/python-modules/id/default.nix +++ b/pkgs/development/python-modules/id/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "id"; - version = "1.2.1"; + version = "1.3.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "di"; repo = "id"; rev = "refs/tags/v${version}"; - hash = "sha256-njX4kL8pCv6+SyYUtmzUh/BWWsaueKO+IiJ96sAXMVo="; + hash = "sha256-Yq8tlDh27UEd+NeYuxjPSL8Qh1i19BmF2ZTLJTzXt7E="; }; nativeBuildInputs = [ From 997d2d718fd79e8229cab49114f08390f734d5a9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 12 Jan 2024 05:09:31 +0000 Subject: [PATCH 145/158] python311Packages.peaqevcore: 19.6.3 -> 19.6.5 --- pkgs/development/python-modules/peaqevcore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/peaqevcore/default.nix b/pkgs/development/python-modules/peaqevcore/default.nix index af32abc4e856..7128231e50e4 100644 --- a/pkgs/development/python-modules/peaqevcore/default.nix +++ b/pkgs/development/python-modules/peaqevcore/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "peaqevcore"; - version = "19.6.3"; + version = "19.6.5"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-SPZlzJCrYzJEuqmGXuC4AZkPKRqiZWFLnfSO3bqYMM0="; + hash = "sha256-afW5uR7QrgOCP38aZkmAEs6jsr77TI16RBhYeWZgr20="; }; postPatch = '' From 18e59521cdae3154060aa4fda0fc5f5424a2b836 Mon Sep 17 00:00:00 2001 From: Cyril Cohen Date: Fri, 12 Jan 2024 07:07:15 +0100 Subject: [PATCH 146/158] coqPackages.hierarchy-builder: 1.5.0 -> 1.7.0 (#280269) * coqPackages.hierarchy-builder: 1.5.0 -> 1.7.0 * removing trakt for 8.18 for now at least --- pkgs/development/coq-modules/coq-elpi/default.nix | 5 +++-- pkgs/development/coq-modules/hierarchy-builder/default.nix | 4 ++++ pkgs/development/coq-modules/trakt/default.nix | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/development/coq-modules/coq-elpi/default.nix b/pkgs/development/coq-modules/coq-elpi/default.nix index cffd58620566..db82458f4a20 100644 --- a/pkgs/development/coq-modules/coq-elpi/default.nix +++ b/pkgs/development/coq-modules/coq-elpi/default.nix @@ -9,7 +9,7 @@ with builtins; with lib; let { case = "8.15"; out = { version = "1.15.0"; };} { case = "8.16"; out = { version = "1.17.0"; };} { case = "8.17"; out = { version = "1.17.0"; };} - { case = "8.18"; out = { version = "1.17.0"; };} + { case = "8.18"; out = { version = "1.18.1"; };} { case = "8.19"; out = { version = "1.18.1"; };} ] {} ); in mkCoqDerivation { @@ -19,7 +19,7 @@ in mkCoqDerivation { inherit version; defaultVersion = lib.switch coq.coq-version [ { case = "8.19"; out = "2.0.1"; } - { case = "8.18"; out = "1.19.0"; } + { case = "8.18"; out = "2.0.0"; } { case = "8.17"; out = "1.18.0"; } { case = "8.16"; out = "1.15.6"; } { case = "8.15"; out = "1.14.0"; } @@ -29,6 +29,7 @@ in mkCoqDerivation { { case = "8.11"; out = "1.6.3_8.11"; } ] null; release."2.0.1".sha256 = "sha256-cuoPsEJ+JRLVc9Golt2rJj4P7lKltTrrmQijjoViooc="; + release."2.0.0".sha256 = "sha256-A/cH324M21k3SZ7+YWXtaYEbu6dZQq3K0cb1RMKjbsM="; release."1.19.0".sha256 = "sha256-kGoo61nJxeG/BqV+iQaV3iinwPStND+7+fYMxFkiKrQ="; release."1.18.0".sha256 = "sha256-2fCOlhqi4YkiL5n8SYHuc3pLH+DArf9zuMH7IhpBc2Y="; release."1.17.0".sha256 = "sha256-J8GatRKFU0ekNCG3V5dBI+FXypeHcLgC5QJYGYzFiEM="; diff --git a/pkgs/development/coq-modules/hierarchy-builder/default.nix b/pkgs/development/coq-modules/hierarchy-builder/default.nix index 725f7654de9b..d229f89875b4 100644 --- a/pkgs/development/coq-modules/hierarchy-builder/default.nix +++ b/pkgs/development/coq-modules/hierarchy-builder/default.nix @@ -5,12 +5,16 @@ let hb = mkCoqDerivation { owner = "math-comp"; inherit version; defaultVersion = with lib.versions; lib.switch coq.coq-version [ + { case = range "8.18" "8.19"; out = "1.7.0"; } + { case = range "8.16" "8.18"; out = "1.6.0"; } { case = range "8.15" "8.18"; out = "1.5.0"; } { case = range "8.15" "8.17"; out = "1.4.0"; } { case = range "8.13" "8.14"; out = "1.2.0"; } { case = range "8.12" "8.13"; out = "1.1.0"; } { case = isEq "8.11"; out = "0.10.0"; } ] null; + release."1.7.0".sha256 = "sha256-WqSeuJhmqicJgXw/xGjGvbRzfyOK7rmkVRb6tPDTAZg="; + release."1.6.0".sha256 = "sha256-E8s20veOuK96knVQ7rEDSt8VmbtYfPgItD0dTY/mckg="; release."1.5.0".sha256 = "sha256-Lia3o156Pbe8rDHOA1IniGYsG5/qzZkzDKdHecfmS+c="; release."1.4.0".sha256 = "sha256-tOed9UU3kMw6KWHJ5LVLUFEmzHx1ImutXQvZ0ldW9rw="; release."1.3.0".sha256 = "17k7rlxdx43qda6i1yafpgc64na8br285cb0mbxy5wryafcdrkrc"; diff --git a/pkgs/development/coq-modules/trakt/default.nix b/pkgs/development/coq-modules/trakt/default.nix index 3cb6c78e6cd3..e08d7b8d50ca 100644 --- a/pkgs/development/coq-modules/trakt/default.nix +++ b/pkgs/development/coq-modules/trakt/default.nix @@ -11,7 +11,7 @@ mkCoqDerivation { inherit version; defaultVersion = with lib.versions; lib.switch [ coq.version ] [ - { cases = [ (range "8.15" "8.18") ]; out = "1.2"; } + { cases = [ (range "8.15" "8.17") ]; out = "1.2"; } { cases = [ (isEq "8.13") ]; out = "1.2+8.13"; } { cases = [ (range "8.13" "8.17") ]; out = "1.1"; } ] null; From bbb0fe11fef1f1009eee7c99fbc92f674b4653b2 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 5 Jan 2024 14:47:57 +0100 Subject: [PATCH 147/158] ocamlPackages.{async_ssl,ppx_accessor,streamable}: fix version --- pkgs/development/ocaml-modules/janestreet/0.16.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/ocaml-modules/janestreet/0.16.nix b/pkgs/development/ocaml-modules/janestreet/0.16.nix index 2df4c08e7d58..2c7044540574 100644 --- a/pkgs/development/ocaml-modules/janestreet/0.16.nix +++ b/pkgs/development/ocaml-modules/janestreet/0.16.nix @@ -141,6 +141,7 @@ with self; }; async_ssl = janePackage { + version = "0.16.1"; pname = "async_ssl"; hash = "sha256-83YKxvVb/JwBnQG4R/R1Ztik9T/hO4cbiNTfFnErpG4="; meta.description = "Async wrappers for SSL"; @@ -647,6 +648,7 @@ with self; }; ppx_accessor = janePackage { + version = "0.16.1"; pname = "ppx_accessor"; hash = "sha256-o70q8eSbPeuGkIcCnKoK0BpaqPhy/NS7x2YYR6wfki8="; meta.description = "[@@deriving] plugin to generate accessors for use with the Accessor libraries"; @@ -1143,6 +1145,7 @@ with self; }; streamable = janePackage { + version = "0.16.1"; pname = "streamable"; hash = "sha256-3djrUW2tPKaEmoOIpdjN6ok7U9i07yreqbi1kP+6pnY="; meta.description = "A collection of types suitable for incremental serialization"; From 1d833f7bba9efb9ec570cb1c95694a775dbc108c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 12 Jan 2024 06:52:15 +0000 Subject: [PATCH 148/158] terragrunt: 0.54.12 -> 0.54.16 --- pkgs/applications/networking/cluster/terragrunt/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix index 49154561a503..0b1f6c783912 100644 --- a/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "terragrunt"; - version = "0.54.12"; + version = "0.54.16"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-fKZd4WlU011LCrh6jLyEecm5jEbX/CF5Vk0PMQbznx0="; + hash = "sha256-UWldCHuRZI3pKl65VVorik9ucN0+xWyfl6r3X5m2xoI="; }; - vendorHash = "sha256-ey2PHpNK4GBE6FlXTYlbYhtG1re3OflbYnQmti9fS9k="; + vendorHash = "sha256-kGHcVWO59LyFGDjh9fC++z6PSirepa5QNHDJoojT5kA="; doCheck = false; From 24dc95214b05fc074f916e24d24244b0dcce6bfc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 12 Jan 2024 07:02:18 +0000 Subject: [PATCH 149/158] python311Packages.pyswitchbot: 0.43.0 -> 0.44.0 --- pkgs/development/python-modules/pyswitchbot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyswitchbot/default.nix b/pkgs/development/python-modules/pyswitchbot/default.nix index 527d4ab0167f..7f831e1d8e47 100644 --- a/pkgs/development/python-modules/pyswitchbot/default.nix +++ b/pkgs/development/python-modules/pyswitchbot/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pyswitchbot"; - version = "0.43.0"; + version = "0.44.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "pySwitchbot"; rev = "refs/tags/${version}"; - hash = "sha256-+YolfvzyJVZ+EkEmPrmAXUbttxYzCFl5DT3nUaUCnuc="; + hash = "sha256-8F0mcZuGU3CiB3pGbAVReKAjvqFLMNa3EHLOOVujgAo="; }; nativeBuildInputs = [ From 57f2e7869eb9cc5bc05f7685126888415998976f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 12 Jan 2024 07:22:03 +0000 Subject: [PATCH 150/158] rofi-rbw: 1.2.0 -> 1.3.0 --- pkgs/applications/misc/rofi-rbw/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/rofi-rbw/default.nix b/pkgs/applications/misc/rofi-rbw/default.nix index 337cd54d5c23..ede6912a2764 100644 --- a/pkgs/applications/misc/rofi-rbw/default.nix +++ b/pkgs/applications/misc/rofi-rbw/default.nix @@ -17,14 +17,14 @@ buildPythonApplication rec { pname = "rofi-rbw"; - version = "1.2.0"; + version = "1.3.0"; format = "pyproject"; src = fetchFromGitHub { owner = "fdw"; repo = "rofi-rbw"; rev = "refs/tags/${version}"; - hash = "sha256-6ZM+qJvVny/h5W/+7JqD/CCf9eayExvZfC/z9rHssVU="; + hash = "sha256-aTMKwb4BLupY0UmvPC86RnElZ9DFep8sApaMrlGbJ0M="; }; nativeBuildInputs = [ From 8ef54ae956f2d82475700c362583531ed4014d4e Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 12 Jan 2024 10:27:19 +0300 Subject: [PATCH 151/158] pkgs/release: don't interpolate store paths unnecessarily Avoids Nix 2.19 screaming about a path named ".version", also avoids creating store paths of random subsets of nixpkgs. --- pkgs/test/release/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/test/release/default.nix b/pkgs/test/release/default.nix index f112ee6b9212..2ab730b5c482 100644 --- a/pkgs/test/release/default.nix +++ b/pkgs/test/release/default.nix @@ -31,13 +31,13 @@ pkgs.runCommand "all-attrs-eval-under-tryEval" { nix-store --init - cp -r ${pkgs-path + "/lib"} lib - cp -r ${pkgs-path + "/pkgs"} pkgs - cp -r ${pkgs-path + "/default.nix"} default.nix - cp -r ${pkgs-path + "/nixos"} nixos - cp -r ${pkgs-path + "/maintainers"} maintainers - cp -r ${pkgs-path + "/.version"} .version - cp -r ${pkgs-path + "/doc"} doc + cp -r ${pkgs-path}/lib lib + cp -r ${pkgs-path}/pkgs pkgs + cp -r ${pkgs-path}/default.nix default.nix + cp -r ${pkgs-path}/nixos nixos + cp -r ${pkgs-path}/maintainers maintainers + cp -r ${pkgs-path}/.version .version + cp -r ${pkgs-path}/doc doc echo "Running pkgs/top-level/release-attrpaths-superset.nix" nix-instantiate --eval --strict --json pkgs/top-level/release-attrpaths-superset.nix -A names > /dev/null From cc2a3d3904b56eda92c3e500b59010d5c5ec749a Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 12 Jan 2024 10:28:42 +0300 Subject: [PATCH 152/158] release-checks: remove unnecessary escape --- pkgs/top-level/nixpkgs-basic-release-checks.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/nixpkgs-basic-release-checks.nix b/pkgs/top-level/nixpkgs-basic-release-checks.nix index 0b4af4114ef8..4acdab996787 100644 --- a/pkgs/top-level/nixpkgs-basic-release-checks.nix +++ b/pkgs/top-level/nixpkgs-basic-release-checks.nix @@ -18,7 +18,7 @@ pkgs.runCommand "nixpkgs-release-checks" echo 'abort "Illegal use of in Nixpkgs."' > $TMPDIR/barf.nix # Make sure that Nixpkgs does not use . - badFiles=$(find $src/pkgs -type f -name '*.nix' -print | xargs grep -l '^[^#]* to refer to itself." echo "The offending files: $badFiles" From feab83792948416260d13fee7cc6b0b95f182014 Mon Sep 17 00:00:00 2001 From: WilliamHsieh Date: Fri, 12 Jan 2024 17:20:17 +0800 Subject: [PATCH 153/158] tmux-fingers: 1.0.1 -> 2.1.1 (#280173) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --------- Co-authored-by: williamhsieh Co-authored-by: Jörg Thalheim --- pkgs/misc/tmux-plugins/default.nix | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/pkgs/misc/tmux-plugins/default.nix b/pkgs/misc/tmux-plugins/default.nix index ed9dae360230..8fa8f654d76b 100644 --- a/pkgs/misc/tmux-plugins/default.nix +++ b/pkgs/misc/tmux-plugins/default.nix @@ -244,23 +244,26 @@ in rec { fingers = mkTmuxPlugin rec { pluginName = "fingers"; - rtpFilePath = "tmux-fingers.tmux"; - version = "1.0.1"; + rtpFilePath = "load-config.tmux"; + version = "2.1.1"; src = fetchFromGitHub { owner = "Morantron"; repo = "tmux-fingers"; - rev = version; - sha256 = "0gp37m3d0irrsih96qv2yalvr1wmf1n64589d4qzyzq16lzyjcr0"; - fetchSubmodules = true; + rev = "${version}"; + sha256 = "sha256-1YMh6m8M6FKf8RPXsOfWCVC5CXSr/MynguwkG7O+oEY="; }; - nativeBuildInputs = [ pkgs.makeWrapper ]; + nativeBuildInputs = [ pkgs.makeWrapper pkgs.crystal pkgs.shards ]; postInstall = '' - for f in config.sh tmux-fingers.sh setup-fingers-mode-bindings.sh; do - wrapProgram $target/scripts/$f \ + shards build --production + rm -rf $target/* $target/.* + cp -r bin $target/bin + echo "$target/bin/${pluginName} load-config" > $target/${rtpFilePath} + chmod +x $target/${rtpFilePath} + + wrapProgram $target/${rtpFilePath} \ --prefix PATH : ${with pkgs; lib.makeBinPath ( [ gawk ] ++ lib.optionals stdenv.isDarwin [ reattach-to-user-namespace ] )} - done ''; }; From b6d824354397c702b56e7c827598207781d215c5 Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Sun, 24 Dec 2023 12:47:42 +0200 Subject: [PATCH 154/158] eurofurence: init at 2000-04-21 Collection of free san-serif fonts. https://web.archive.org/web/20200131023120/http://eurofurence.net/eurofurence.html --- pkgs/by-name/eu/eurofurence/package.nix | 58 +++++++++++++++++++++++++ 1 file changed, 58 insertions(+) create mode 100644 pkgs/by-name/eu/eurofurence/package.nix diff --git a/pkgs/by-name/eu/eurofurence/package.nix b/pkgs/by-name/eu/eurofurence/package.nix new file mode 100644 index 000000000000..132c13cee755 --- /dev/null +++ b/pkgs/by-name/eu/eurofurence/package.nix @@ -0,0 +1,58 @@ +{ lib, stdenvNoCC, fetchzip }: + +stdenvNoCC.mkDerivation { + pname = "eurofurence"; + version = "2000-04-21"; + + srcs = map ({ url, hash }: + fetchzip { + name = builtins.baseNameOf url; + stripRoot = false; + inherit url hash; + }) [ + { + url = + "https://web.archive.org/web/20200131023120/http://eurofurence.net/eurof_tt.zip"; + hash = "sha256-Al4tT2/qV9/K5le/OctybxgPcNMVDJi0OPr2EUBk8cE="; + } + { + url = + "https://web.archive.org/web/20200130083325/http://eurofurence.net/eurofctt.zip"; + hash = "sha256-ZF0Neysp0+TQgNAN+2IrfR/7dn043rSq6S3NHJ3gLUI="; + } + { + url = + "https://web.archive.org/web/20200206093756/http://eurofurence.net/monof_tt.zip"; + hash = "sha256-Kvcsp/0LzHhwPudP1qWLxhaiJ5/su1k7FBuV9XPKIGs="; + } + { + url = + "https://web.archive.org/web/20200206171841/http://eurofurence.net/pagebxtt.zip"; + hash = "sha256-CvKhzvxSQqdEHihQBfCSu1QgjzKn38DWaONdz5BpM4M="; + } + { + url = + "https://web.archive.org/web/20190812003003/http://eurofurence.net/unifurtt.zip"; + hash = "sha256-n9xnzJi8wvK6oCVQUQnQ1X9jW6WgyMKKIiDsT4j2Aas="; + } + ]; + + dontUnpack = true; + + installPhase = '' + runHook preInstall + for src in $srcs; do + install -D $src/*.ttf -t $out/share/fonts/truetype + install -D $src/*.txt -t $out/share/doc/$name + done + runHook postInstall + ''; + + meta = { + homepage = + "https://web.archive.org/web/20200131023120/http://eurofurence.net/eurofurence.html"; + description = "Family of geometric rounded sans serif fonts"; + maintainers = with lib.maintainers; [ ehmry ]; + license = lib.licenses.free; + }; +} From a2d2b1a66544eb4dfec25b78636af344831c2ac1 Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Mon, 1 Jan 2024 11:52:55 +0200 Subject: [PATCH 155/158] pharo: cleanup, add more library paths to wrapper --- .../ph/pharo/package.nix} | 84 +++++++++---------- pkgs/top-level/all-packages.nix | 2 - 2 files changed, 40 insertions(+), 46 deletions(-) rename pkgs/{development/pharo/default.nix => by-name/ph/pharo/package.nix} (67%) diff --git a/pkgs/development/pharo/default.nix b/pkgs/by-name/ph/pharo/package.nix similarity index 67% rename from pkgs/development/pharo/default.nix rename to pkgs/by-name/ph/pharo/package.nix index 3c17b2bd7933..dd505def7162 100644 --- a/pkgs/development/pharo/default.nix +++ b/pkgs/by-name/ph/pharo/package.nix @@ -1,11 +1,9 @@ -{ cairo +{ lib +, stdenv +, cairo , cmake , fetchurl , freetype -, gcc -, git -, gnumake -, lib , libffi , libgit2 , libpng @@ -13,51 +11,38 @@ , makeBinaryWrapper , openssl , pixman -, runtimeShell , SDL2 -, stdenv , unzip }: -let - inherit (lib.strings) makeLibraryPath; - pharo-sources = fetchurl { + +stdenv.mkDerivation { + pname = "pharo"; + version = "10.0.8"; + + src = fetchurl { # It is necessary to download from there instead of from the repository because that archive # also contains artifacts necessary for the bootstrapping. url = "https://files.pharo.org/vm/pharo-spur64-headless/Linux-x86_64/source/PharoVM-10.0.8-b323c5f-Linux-x86_64-c-src.zip"; hash = "sha256-5IHymk6yl3pMLG3FeM4nqos0yLYMa3B2+hYW08Yo1V0="; }; - library_path = makeLibraryPath [ - libgit2 - SDL2 - cairo - "$out" - ]; -in -stdenv.mkDerivation { - pname = "pharo"; - version = "10.0.8"; - src = pharo-sources; + + strictDeps = true; buildInputs = [ cairo + freetype + libffi libgit2 libpng + libuuid + openssl pixman SDL2 ]; nativeBuildInputs = [ cmake - freetype - gcc - git - gnumake - libffi - libuuid makeBinaryWrapper - openssl - pixman - SDL2 unzip ]; @@ -71,31 +56,42 @@ stdenv.mkDerivation { "-DBUILD_BUNDLE=OFF" ]; - installPhase = '' - runHook preInstall + installPhase = + let + library_path = lib.strings.makeLibraryPath [ + "$out" + cairo + freetype + libgit2 + SDL2 + ]; + in + '' + runHook preInstall - cmake --build . --target=install - mkdir -p "$out/lib" - mkdir "$out/bin" - cp build/vm/*.so* "$out/lib/" - cp build/vm/pharo "$out/bin/pharo" - patchelf --allowed-rpath-prefixes "$NIX_STORE" --shrink-rpath "$out/bin/pharo" - wrapProgram "$out/bin/pharo" --set LD_LIBRARY_PATH "${library_path}" + cmake --build . --target=install + mkdir -p "$out/lib" + mkdir "$out/bin" + cp build/vm/*.so* "$out/lib/" + cp build/vm/pharo "$out/bin/pharo" + patchelf --allowed-rpath-prefixes "$NIX_STORE" --shrink-rpath "$out/bin/pharo" + wrapProgram "$out/bin/pharo" --set LD_LIBRARY_PATH "${library_path}" - runHook postInstall - ''; + runHook postInstall + ''; - meta = with lib; { + meta = { description = "Clean and innovative Smalltalk-inspired environment"; homepage = "https://pharo.org"; - license = licenses.mit; + license = lib.licenses.mit; longDescription = '' Pharo's goal is to deliver a clean, innovative, free open-source Smalltalk-inspired environment. By providing a stable and small core system, excellent dev tools, and maintained releases, Pharo is an attractive platform to build and deploy mission critical applications. ''; - maintainers = [ ]; + maintainers = with lib.maintainers; [ ehmry ]; + mainProgram = "pharo"; platforms = lib.platforms.linux; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 34e5cb140b62..52646f263732 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18179,8 +18179,6 @@ with pkgs; rappel = callPackage ../development/misc/rappel { }; - pharo = callPackage ../development/pharo { }; - protege-distribution = callPackage ../development/web/protege-distribution { }; publii = callPackage ../development/web/publii {}; From b58b9d1002080fe7bdc36f9f013ade14ab3baf18 Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Mon, 1 Jan 2024 12:01:11 +0200 Subject: [PATCH 156/158] pharo: 10.0.8 -> 10.0.9-de76067 --- pkgs/by-name/ph/pharo/package.nix | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/ph/pharo/package.nix b/pkgs/by-name/ph/pharo/package.nix index dd505def7162..aaf9a2762ddd 100644 --- a/pkgs/by-name/ph/pharo/package.nix +++ b/pkgs/by-name/ph/pharo/package.nix @@ -2,7 +2,7 @@ , stdenv , cairo , cmake -, fetchurl +, fetchzip , freetype , libffi , libgit2 @@ -12,18 +12,17 @@ , openssl , pixman , SDL2 -, unzip }: -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "pharo"; - version = "10.0.8"; + version = "10.0.9-de76067"; - src = fetchurl { + src = fetchzip { # It is necessary to download from there instead of from the repository because that archive # also contains artifacts necessary for the bootstrapping. - url = "https://files.pharo.org/vm/pharo-spur64-headless/Linux-x86_64/source/PharoVM-10.0.8-b323c5f-Linux-x86_64-c-src.zip"; - hash = "sha256-5IHymk6yl3pMLG3FeM4nqos0yLYMa3B2+hYW08Yo1V0="; + url = "https://files.pharo.org/vm/pharo-spur64-headless/Linux-x86_64/source/PharoVM-${finalAttrs.version}-Linux-x86_64-c-src.zip"; + hash = "sha256-INeQGYCxBu7DvFmlDRXO0K2nhxcd9K9Xwp55iNdlvhk="; }; strictDeps = true; @@ -43,7 +42,6 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake makeBinaryWrapper - unzip ]; cmakeFlags = [ @@ -94,4 +92,4 @@ stdenv.mkDerivation { mainProgram = "pharo"; platforms = lib.platforms.linux; }; -} +}) From a1aae1ffb16464d7483b579434a72e6141e4d047 Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 12 Jan 2024 12:34:14 +0300 Subject: [PATCH 157/158] gamescope: 3.12.5 -> 3.13.19, refactor This mostly brings in changes from Jovian, but also splits the dependencies between the WSI layer and the Gamescope executable, which simplifies i686 layer builds a whole lot. --- .../window-managers/gamescope/default.nix | 115 ++++++++++-------- .../gamescope/shaders-path.patch | 13 ++ .../gamescope/use-pkgconfig.patch | 6 +- pkgs/top-level/all-packages.nix | 8 +- 4 files changed, 83 insertions(+), 59 deletions(-) create mode 100644 pkgs/applications/window-managers/gamescope/shaders-path.patch diff --git a/pkgs/applications/window-managers/gamescope/default.nix b/pkgs/applications/window-managers/gamescope/default.nix index 99ecf86e20a1..2326d686c2a2 100644 --- a/pkgs/applications/window-managers/gamescope/default.nix +++ b/pkgs/applications/window-managers/gamescope/default.nix @@ -8,7 +8,6 @@ , vulkan-loader , vulkan-headers , wayland -, wayland-scanner , wayland-protocols , libxkbcommon , glm @@ -16,11 +15,8 @@ , libcap , SDL2 , pipewire -, udev , pixman , libinput -, seatd -, xwayland , glslang , hwdata , openvr @@ -30,32 +26,51 @@ , libdisplay-info , lib , makeBinaryWrapper +, enableExecutable ? true +, enableWsi ? true }: let - pname = "gamescope"; - version = "3.12.5"; - - vkroots = fetchFromGitHub { + joshShaders = fetchFromGitHub { owner = "Joshua-Ashton"; - repo = "vkroots"; - rev = "26757103dde8133bab432d172b8841df6bb48155"; - hash = "sha256-eet+FMRO2aBQJcCPOKNKGuQv5oDIrgdVPRO00c5gkL0="; + repo = "GamescopeShaders"; + rev = "v0.1"; + hash = "sha256-gR1AeAHV/Kn4ntiEDUSPxASLMFusV6hgSGrTbMCBUZA="; }; in -stdenv.mkDerivation { - inherit pname version; +stdenv.mkDerivation (finalAttrs: { + pname = "gamescope"; + version = "3.13.19"; src = fetchFromGitHub { owner = "ValveSoftware"; repo = "gamescope"; - rev = "refs/tags/${version}"; - hash = "sha256-u4pnKd5ZEC3CS3E2i8E8Wposd8Tu4ZUoQXFmr0runwE="; + rev = "refs/tags/${finalAttrs.version}"; + fetchSubmodules = true; + hash = "sha256-WKQgVbuHvTbZnvTU5imV35AKZ4AF0EDsdESBZwVH7+M="; }; patches = [ + # Unvendor dependencies ./use-pkgconfig.patch + + # Make it look for shaders in the right place + ./shaders-path.patch ]; + # We can't substitute the patch itself because substituteAll is itself a derivation, + # so `placeholder "out"` ends up pointing to the wrong place + postPatch = '' + substituteInPlace src/reshade_effect_manager.cpp --replace "@out@" "$out" + ''; + + mesonFlags = [ + (lib.mesonBool "enable_gamescope" enableExecutable) + (lib.mesonBool "enable_gamescope_wsi_layer" enableWsi) + ]; + + # don't install vendored vkroots etc + mesonInstallFlags = ["--skip-subprojects"]; + strictDeps = true; depsBuildBuild = [ @@ -66,70 +81,62 @@ stdenv.mkDerivation { meson pkg-config ninja - wayland-scanner - glslang + ] ++ lib.optionals enableExecutable [ makeBinaryWrapper + glslang ]; buildInputs = [ - xorg.libXdamage - xorg.libXcomposite - xorg.libXrender - xorg.libXext - xorg.libXxf86vm - xorg.libXtst - xorg.libXres - xorg.libXi - xorg.libXmu - libdrm - libliftoff - vulkan-loader - vulkan-headers - SDL2 + pipewire + hwdata + xorg.libX11 wayland wayland-protocols + vulkan-loader + openvr + glm + ] ++ lib.optionals enableWsi [ + vulkan-headers + ] ++ lib.optionals enableExecutable [ + xorg.libXcomposite + xorg.libXcursor + xorg.libXdamage + xorg.libXext + xorg.libXi + xorg.libXmu + xorg.libXrender + xorg.libXres + xorg.libXtst + xorg.libXxf86vm + libdrm + libliftoff + SDL2 wlroots - xwayland - seatd libinput libxkbcommon - glm gbenchmark - udev pixman - pipewire libcap stb - hwdata - openvr - vkroots libdisplay-info ]; - outputs = [ "out" "lib" ]; - - postUnpack = '' - rm -rf source/subprojects/vkroots - ln -s ${vkroots} source/subprojects/vkroots - ''; - - # --debug-layers flag expects these in the path - postInstall = '' + postInstall = lib.optionalString enableExecutable '' + # --debug-layers flag expects these in the path wrapProgram "$out/bin/gamescope" \ --prefix PATH : ${with xorg; lib.makeBinPath [xprop xwininfo]} - # Install Vulkan layer in lib output - install -d $lib/share/vulkan - mv $out/share/vulkan/implicit_layer.d $lib/share/vulkan - rm -r $out/share/vulkan + # Install ReShade shaders + mkdir -p $out/share/gamescope/reshade + cp -r ${joshShaders}/* $out/share/gamescope/reshade/ ''; meta = with lib; { description = "SteamOS session compositing window manager"; homepage = "https://github.com/ValveSoftware/gamescope"; license = licenses.bsd2; - maintainers = with maintainers; [ nrdxp pedrohlc Scrumplex zhaofengli ]; + maintainers = with maintainers; [ nrdxp pedrohlc Scrumplex zhaofengli k900 ]; platforms = platforms.linux; mainProgram = "gamescope"; }; -} +}) diff --git a/pkgs/applications/window-managers/gamescope/shaders-path.patch b/pkgs/applications/window-managers/gamescope/shaders-path.patch new file mode 100644 index 000000000000..bbdaf21a2e6f --- /dev/null +++ b/pkgs/applications/window-managers/gamescope/shaders-path.patch @@ -0,0 +1,13 @@ +diff --git a/src/reshade_effect_manager.cpp b/src/reshade_effect_manager.cpp +index 3597ca1..de45250 100644 +--- a/src/reshade_effect_manager.cpp ++++ b/src/reshade_effect_manager.cpp +@@ -34,7 +34,7 @@ static std::string GetLocalUsrDir() + + static std::string GetUsrDir() + { +- return "/usr"; ++ return "@out@"; + } + + static LogScope reshade_log("gamescope_reshade"); diff --git a/pkgs/applications/window-managers/gamescope/use-pkgconfig.patch b/pkgs/applications/window-managers/gamescope/use-pkgconfig.patch index 29345952433e..2b4de54ae54d 100644 --- a/pkgs/applications/window-managers/gamescope/use-pkgconfig.patch +++ b/pkgs/applications/window-managers/gamescope/use-pkgconfig.patch @@ -1,11 +1,9 @@ -diff --git a/meson.build b/meson.build -index 1311784..77043ac 100644 --- a/meson.build +++ b/meson.build @@ -6,7 +6,6 @@ project( default_options: [ - 'cpp_std=c++14', + 'cpp_std=c++20', 'warning_level=2', -- 'force_fallback_for=wlroots,libliftoff', +- 'force_fallback_for=wlroots,libliftoff,vkroots', ], ) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 34e5cb140b62..37667a9689af 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1812,7 +1812,13 @@ with pkgs; }; gamescope = callPackage ../applications/window-managers/gamescope { - wlroots = wlroots_0_16; + enableExecutable = true; + enableWsi = false; + }; + + gamescope-wsi = callPackage ../applications/window-managers/gamescope { + enableExecutable = false; + enableWsi = true; }; gay = callPackage ../tools/misc/gay { }; From 96478c43ec80609cd6da1385560eb0bf0a4e27ea Mon Sep 17 00:00:00 2001 From: ajs124 Date: Fri, 12 Jan 2024 11:55:48 +0100 Subject: [PATCH 158/158] gitlab: 16.7.0 -> 16.7.2 (#280369) --- .../applications/version-management/gitlab/data.json | 12 ++++++------ .../version-management/gitlab/gitaly/default.nix | 4 ++-- .../gitlab/gitlab-pages/default.nix | 4 ++-- .../gitlab/gitlab-workhorse/default.nix | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index 8247763e63ba..461c83695d5c 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,15 +1,15 @@ { - "version": "16.7.0", - "repo_hash": "sha256-l5TkjkVny2zQLUfbscG6adkmkC1KjxMAeFbSyUA1UbI=", + "version": "16.7.2", + "repo_hash": "sha256-YIwZkmTVmxXlZ07lCUco9VEbylMvE92LQdFOeZXWB2M=", "yarn_hash": "1qxz2p969qg7kzyvhwxws5zwdw986gdq9gxllzi58c5c56jz49zf", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v16.7.0-ee", + "rev": "v16.7.2-ee", "passthru": { - "GITALY_SERVER_VERSION": "16.7.0", - "GITLAB_PAGES_VERSION": "16.7.0", + "GITALY_SERVER_VERSION": "16.7.2", + "GITLAB_PAGES_VERSION": "16.7.2", "GITLAB_SHELL_VERSION": "14.32.0", "GITLAB_ELASTICSEARCH_INDEXER_VERSION": "4.5.0", - "GITLAB_WORKHORSE_VERSION": "16.7.0" + "GITLAB_WORKHORSE_VERSION": "16.7.2" } } diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index b56edca8fa9c..c2f295b3b589 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -6,7 +6,7 @@ }: let - version = "16.7.0"; + version = "16.7.2"; package_version = "v${lib.versions.major version}"; gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}"; @@ -18,7 +18,7 @@ let owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - hash = "sha256-YLynUHE1lb0dfsZsalz91jSSk1Y5r7kqT2AcE27xf04="; + hash = "sha256-3R7x8eaUJqJ1mKlQ4kYThKyaSfSaow7lGx5EfNo+GNY="; }; vendorHash = "sha256-btWHZMy1aBSsUVs30IqrdBCO79XQvTMXxkxYURF2Nqs="; diff --git a/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix b/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix index 596e5770edb2..c5a4065d4ccb 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "gitlab-pages"; - version = "16.7.0"; + version = "16.7.2"; # nixpkgs-update: no auto update src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-pages"; rev = "v${version}"; - hash = "sha256-8jODsK5+o1fEaTuFv6bXfZp4oA87JUQbTdYQn66DKJA="; + hash = "sha256-rUSZDsQt6faNES3ibzo7fJqpzEmXRbbTXOkhOn7jggA="; }; vendorHash = "sha256-NMky8v0YmN2pSeKJ7G0+DWAZvUx2JlwFbqPHvciYroM="; diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index c839269a1f93..b3dec6385c28 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -5,7 +5,7 @@ in buildGoModule rec { pname = "gitlab-workhorse"; - version = "16.7.0"; + version = "16.7.2"; # nixpkgs-update: no auto update src = fetchFromGitLab {