Merge staging-next into staging

doc/build-helpers.md

@@ -17,6 +17,7 @@ There is no uniform interface for build helpers.
 [Language- or framework-specific build helpers](#chap-language-support) usually follow the style of `stdenv.mkDerivation`, which accepts an attribute set or a fixed-point function taking an attribute set.
 
 ```{=include=} chapters
+build-helpers/fixed-point-arguments.chapter.md
 build-helpers/fetchers.chapter.md
 build-helpers/trivial-build-helpers.chapter.md
 build-helpers/testers.chapter.md

doc/build-helpers/fixed-point-arguments.chapter.md

@@ -0,0 +1,74 @@
+# Fixed-point arguments of build helpers {#chap-build-helpers-finalAttrs}
+
+As mentioned in the beginning of this part, `stdenv.mkDerivation` could alternatively accept a fixed-point function. The input of such function, typically named `finalAttrs`, is expected to be the final state of the attribute set.
+A build helper like this is said to accept **fixed-point arguments**.
+
+Build helpers don't always support fixed-point arguments yet, as support in [`stdenv.mkDerivation`](#mkderivation-recursive-attributes) was first included in Nixpkgs 22.05.
+
+## Defining a build helper with `lib.extendMkDerivation` {#sec-build-helper-extendMkDerivation}
+
+Developers can use the Nixpkgs library function [`lib.customisation.extendMkDerivation`](#function-library-lib.customisation.extendMkDerivation) to define a build helper supporting fixed-point arguments from an existing one with such support, with an attribute overlay similar to the one taken by [`<pkg>.overrideAttrs`](#sec-pkg-overrideAttrs).
+
+Beside overriding, `lib.extendMkDerivation` also supports `excludeDrvArgNames` to optionally exclude some arguments in the input fixed-point argumnts from passing down the base build helper (specified as `constructDrv`).
+
+:::{.example #ex-build-helpers-extendMkDerivation}
+
+# Example definition of `mkLocalDerivation` extended from `stdenv.mkDerivation` with `lib.extendMkDerivation`
+
+We want to define a build helper named `mkLocalDerivation` that builds locally without using substitutes by default.
+
+Instead of taking a plain attribute set,
+
+```nix
+{
+  preferLocalBuild ? true,
+  allowSubstitute ? false,
+  specialArg ? (_: false),
+  ...
+}@args:
+
+stdenv.mkDerivation (
+  removeAttrs [
+    # Don't pass specialArg into mkDerivation.
+    "specialArg"
+  ] args
+  // {
+    # Arguments to pass
+    inherit preferLocalBuild allowSubstitute;
+    # Some expressions involving specialArg
+    greeting = if specialArg "hi" then "hi" else "hello";
+  }
+)
+```
+
+we could define with `lib.extendMkDerivation` an attribute overlay to make the result build helper also accepts the the attribute set's fixed point passing to the underlying `stdenv.mkDerivation`, named `finalAttrs` here:
+
+```nix
+lib.extendMkDerivation {
+  constructDrv = stdenv.mkDerivation;
+  excludeDrvArgNames = [
+    # Don't pass specialArg into mkDerivation.
+    "specialArg"
+  ];
+  extendDrvArgs =
+    finalAttrs:
+    {
+      preferLocalBuild ? true,
+      allowSubstitute ? false,
+      specialArg ? (_: false),
+      ...
+    }@args:
+    {
+      # Arguments to pass
+      inherit
+        preferLocalBuild
+        allowSubstitute
+        ;
+      # Some expressions involving specialArg
+      greeting = if specialArg "hi" then "hi" else "hello";
+    };
+}
+```
+:::
+
+If one needs to apply extra changes to the result derivation, pass the derivation transformation function to `lib.extendMkDerivation` as `lib.customisation.extendMkDerivation { transformDrv = drv: ...; }`.

doc/redirects.json

@@ -1,7 +1,13 @@
 {
+  "chap-build-helpers-finalAttrs": [
+    "index.html#chap-build-helpers-finalAttrs"
+  ],
   "chap-release-notes": [
     "release-notes.html#chap-release-notes"
   ],
+  "ex-build-helpers-extendMkDerivation": [
+    "index.html#ex-build-helpers-extendMkDerivation"
+  ],
   "neovim": [
     "index.html#neovim"
   ],
@@ -41,6 +47,9 @@
   "sec-allow-insecure": [
     "index.html#sec-allow-insecure"
   ],
+  "sec-build-helper-extendMkDerivation": [
+    "index.html#sec-build-helper-extendMkDerivation"
+  ],
   "sec-modify-via-packageOverrides": [
     "index.html#sec-modify-via-packageOverrides"
   ],

lib/customisation.nix

@@ -31,6 +31,8 @@ let
     flatten
     deepSeq
     extends
+    toFunction
+    id
     ;
   inherit (lib.strings) levenshtein levenshteinAtMost;
 
@@ -730,4 +732,126 @@ rec {
     in
     self;
 
+  /**
+    Define a `mkDerivation`-like function based on another `mkDerivation`-like function.
+
+    [`stdenv.mkDerivation`](#part-stdenv) gives access to
+    its final set of derivation attributes when it is passed a function,
+    or when it is passed an overlay-style function in `overrideAttrs`.
+
+    Instead of composing new `stdenv.mkDerivation`-like build helpers
+    using normal function composition,
+    `extendMkDerivation` makes sure that the returned build helper
+    supports such first class recursion like `mkDerivation` does.
+
+    `extendMkDerivation` takes an extra attribute set to configure its behaviour.
+    One can optionally specify
+    `transformDrv` to specify a function to apply to the result derivation,
+    or `inheritFunctionArgs` to decide whether to inherit the `__functionArgs`
+    from the base build helper.
+
+    # Inputs
+
+    `extendMkDerivation`-specific configurations
+    : `constructDrv`: Base build helper, the `mkDerivation`-like build helper to extend.
+    : `excludeDrvArgNames`: Argument names not to pass from the input fixed-point arguments to `constructDrv`. Note: It doesn't apply to the updating arguments returned by `extendDrvArgs`.
+    : `extendDrvArgs` : An extension (overlay) of the argument set, like the one taken by [overrideAttrs](#sec-pkg-overrideAttrs) but applied before passing to `constructDrv`.
+    : `inheritFunctionArgs`: Whether to inherit `__functionArgs` from the base build helper (default to `true`).
+    : `transformDrv`: Function to apply to the result derivation (default to `lib.id`).
+
+    # Type
+
+    ```
+    extendMkDerivation ::
+      {
+        constructDrv :: ((FixedPointArgs | AttrSet) -> a)
+        excludeDrvArgNames :: [ String ],
+        extendDrvArgs :: (AttrSet -> AttrSet -> AttrSet)
+        inheritFunctionArgs :: Bool,
+        transformDrv :: a -> a,
+      }
+      -> (FixedPointArgs | AttrSet) -> a
+
+    FixedPointArgs = AttrSet -> AttrSet
+    a = Derivation when defining a build helper
+    ```
+
+    # Examples
+
+    :::{.example}
+    ## `lib.customisation.extendMkDerivation` usage example
+    ```nix-repl
+    mkLocalDerivation = lib.extendMkDerivation {
+      constructDrv = pkgs.stdenv.mkDerivation;
+      excludeDrvArgNames = [ "specialArg" ];
+      extendDrvArgs =
+        finalAttrs: args@{ preferLocalBuild ? true, allowSubstitute ? false, specialArg ? (_: false), ... }:
+        { inherit preferLocalBuild allowSubstitute; passthru = { inherit specialArg; } // args.passthru or { }; };
+    }
+
+    mkLocalDerivation.__functionArgs
+    => { allowSubstitute = true; preferLocalBuild = true; specialArg = true; }
+
+    mkLocalDerivation { inherit (pkgs.hello) pname version src; specialArg = _: false; }
+    => «derivation /nix/store/xirl67m60ahg6jmzicx43a81g635g8z8-hello-2.12.1.drv»
+
+    mkLocalDerivation (finalAttrs: { inherit (pkgs.hello) pname version src; specialArg = _: false; })
+    => «derivation /nix/store/xirl67m60ahg6jmzicx43a81g635g8z8-hello-2.12.1.drv»
+
+    (mkLocalDerivation (finalAttrs: { inherit (pkgs.hello) pname version src; passthru = { foo = "a"; bar = "${finalAttrs.passthru.foo}b"; }; })).bar
+    => "ab"
+    ```
+    :::
+
+    :::{.note}
+    If `transformDrv` is specified,
+    it should take care of existing attributes that perform overriding
+    (e.g., [`overrideAttrs`](#sec-pkg-overrideAttrs))
+    to ensure that the overriding functionality of the result derivation
+    work as expected.
+    Modifications that breaks the overriding include
+    direct [attribute set update](https://nixos.org/manual/nix/stable/language/operators#update)
+    and [`lib.extendDerivation`](#function-library-lib.customisation.extendDerivation).
+    :::
+  */
+  extendMkDerivation =
+    let
+      extendsWithExclusion =
+        excludedNames: g: f: final:
+        let
+          previous = f final;
+        in
+        removeAttrs previous excludedNames // g final previous;
+    in
+    {
+      constructDrv,
+      excludeDrvArgNames ? [ ],
+      extendDrvArgs,
+      inheritFunctionArgs ? true,
+      transformDrv ? id,
+    }:
+    setFunctionArgs
+      # Adds the fixed-point style support
+      (
+        fpargs:
+        transformDrv (
+          constructDrv (extendsWithExclusion excludeDrvArgNames extendDrvArgs (toFunction fpargs))
+        )
+      )
+      # Add __functionArgs
+      (
+        # Inherit the __functionArgs from the base build helper
+        optionalAttrs inheritFunctionArgs (removeAttrs (functionArgs constructDrv) excludeDrvArgNames)
+        # Recover the __functionArgs from the derived build helper
+        // functionArgs (extendDrvArgs { })
+      )
+    // {
+      inherit
+        # Expose to the result build helper.
+        constructDrv
+        excludeDrvArgNames
+        extendDrvArgs
+        transformDrv
+        ;
+    };
 }

lib/default.nix

@@ -121,7 +121,8 @@ let
       noDepEntry fullDepEntry packEntry stringAfter;
     inherit (self.customisation) overrideDerivation makeOverridable
       callPackageWith callPackagesWith extendDerivation hydraJob
-      makeScope makeScopeWithSplicing makeScopeWithSplicing';
+      makeScope makeScopeWithSplicing makeScopeWithSplicing'
+      extendMkDerivation;
     inherit (self.derivations) lazyDerivation optionalDrvAttr warnOnInstantiate;
     inherit (self.meta) addMetaAttrs dontDistribute setName updateName
       appendToName mapDerivationAttrset setPrio lowPrio lowPrioSet hiPrio

maintainers/maintainer-list.nix

@@ -8501,6 +8501,12 @@
     githubId = 60962839;
     name = "Mazen Zahr";
   };
+  GKHWB = {
+    github = "GKHWB";
+    githubId = 68881230;
+    name = "GKHWB";
+    email = "kingdomg@tuta.com";
+  };
   gkleen = {
     name = "Gregor Kleen";
     email = "xpnfr@bouncy.email";

nixos/modules/services/hardware/fancontrol.nix

@@ -41,7 +41,7 @@ in
 
       serviceConfig = {
         Restart = "on-failure";
-        ExecStart = "${pkgs.lm_sensors}/sbin/fancontrol ${configFile}";
+        ExecStart = "${lib.getExe' pkgs.lm_sensors "fancontrol"} ${configFile}";
       };
     };
 

pkgs/applications/misc/tellico/default.nix

@@ -27,14 +27,14 @@
 
 stdenv.mkDerivation rec {
   pname = "tellico";
-  version = "4.0.1";
+  version = "4.1";
 
   src = fetchFromGitLab {
     domain = "invent.kde.org";
     owner = "office";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-5oP/uGUw1oYnrnOU83Pocr9YdwAU+DaUaGHg+6NzmRU=";
+    hash = "sha256-xzMPYze77oajMjS2fprjGu2FsZgI7MjnWVxIxYYN0TY=";
   };
 
   nativeBuildInputs = [

pkgs/build-support/vm/default.nix

@@ -261,8 +261,10 @@ rec {
     cat > ./run-vm <<EOF
     #! ${bash}/bin/sh
     ''${diskImage:+diskImage=$diskImage}
-    ${pkgs.virtiofsd}/bin/virtiofsd --xattr --socket-path virtio-store.sock --sandbox none --shared-dir "${storeDir}" &
-    ${pkgs.virtiofsd}/bin/virtiofsd --xattr --socket-path virtio-xchg.sock --sandbox none --shared-dir xchg &
+    # GitHub Actions runners seems to not allow installing seccomp filter: https://github.com/rcambrj/nix-pi-loader/issues/1#issuecomment-2605497516
+    # Since we are running in a sandbox already, the difference between seccomp and none is minimal
+    ${pkgs.virtiofsd}/bin/virtiofsd --xattr --socket-path virtio-store.sock --sandbox none --seccomp none --shared-dir "${storeDir}" &
+    ${pkgs.virtiofsd}/bin/virtiofsd --xattr --socket-path virtio-xchg.sock --sandbox none --seccomp none --shared-dir xchg &
     ${qemuCommand}
     EOF
 

pkgs/by-name/ai/air/package.nix

@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "air";
-  version = "1.61.5";
+  version = "1.61.7";
 
   src = fetchFromGitHub {
     owner = "air-verse";
     repo = "air";
     rev = "v${version}";
-    hash = "sha256-QKNXEIMsw3MCfPg3Er9r3ncN6dxI2UsD7G/FcBIrP+Y=";
+    hash = "sha256-+PgJR9+adeko86jUs6/mvkZLgVuIMyd6fv8xxOZB4tE=";
   };
 
   vendorHash = "sha256-tct0bWTvZhHslqPAe8uOwBx4z6gLAq57igcbV1tg9OU=";

pkgs/by-name/ap/appgate-sdp/package.nix

@@ -87,11 +87,11 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "appgate-sdp";
-  version = "6.4.0";
+  version = "6.4.1";
 
   src = fetchurl {
     url = "https://bin.appgate-sdp.com/${lib.versions.majorMinor version}/client/appgate-sdp_${version}_amd64.deb";
-    sha256 = "sha256-0h6Mz3B7fADGL5tGbrKNYpVIAvRu7Xx0n9OvjOeVCds=";
+    sha256 = "sha256-wnao0W03vpV9HMnUXEY3pf63jN3gB2jExfuA1hsG00I=";
   };
 
   # just patch interpreter

pkgs/by-name/be/benthos/package.nix

@@ -7,13 +7,13 @@
 
 buildGoModule rec {
   pname = "benthos";
-  version = "4.42.0";
+  version = "4.43.0";
 
   src = fetchFromGitHub {
     owner = "redpanda-data";
     repo = "benthos";
     tag = "v${version}";
-    hash = "sha256-JLBH3eFhqPaLK5kCqsnUF54Izu+fEFQbP+cehvrHL9Q=";
+    hash = "sha256-fk6JyP+41LFQMfuMhbtyM3hwwRvhEdgmNvNNt18DnKk=";
   };
 
   proxyVendor = true;
@@ -22,7 +22,7 @@ buildGoModule rec {
     "cmd/benthos"
   ];
 
-  vendorHash = "sha256-a8FXB3sripwCqCZDQKl1f0rg11LXvwuDrOnsX+Q8UD0=";
+  vendorHash = "sha256-kXR1KTUWumSMEbx0+lJbAgaE3zFCfyUhnhavJzjCDAw=";
 
 #  doCheck = false;
 

pkgs/by-name/br/brave/package.nix

@@ -3,24 +3,24 @@
 
 let
   pname = "brave";
-  version = "1.73.104";
+  version = "1.74.48";
 
   allArchives = {
     aarch64-linux = {
       url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_arm64.deb";
-      hash = "sha256-qSV3b3h09B5Wk0BCuFupsAYNvaBUvbhUfDn6RG6v7Ak=";
+      hash = "sha256-rZl4ftEAXI3q5NYlusR1yFIS0scTc3ZT7O5W9OyHHiQ=";
     };
     x86_64-linux = {
       url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
-      hash = "sha256-LfMquxaern9DqJObgtYJEoHRzI7+FSrFSjHFOpVXsOM=";
+      hash = "sha256-qNP3wsqys8iY/GQtDBL2OW8+jc2sZ20CfethR+L3c3E=";
     };
     aarch64-darwin = {
       url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-arm64.zip";
-      hash = "sha256-VgRAyZn7NmhSku6Yl2pdTiyH96boXkVwNS2yw9dxjY0=";
+      hash = "sha256-KCiPsXf24gOW3gBC1Ajiw6dtdZHHewMj8GTC1pAGiks=";
     };
     x86_64-darwin = {
       url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-x64.zip";
-      hash = "sha256-FBZHhAZvb4eGDKQk1ZPV6HbFurP3Tfers/Qd5NeUv7c=";
+      hash = "sha256-GWVP/qucLc5KbaaK2GSjrp9hslczJ+vFqbNmIo7iWK0=";
     };
   };
 

pkgs/by-name/bu/buildkit/package.nix

@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "buildkit";
-  version = "0.18.2";
+  version = "0.19.0";
 
   src = fetchFromGitHub {
     owner = "moby";
     repo = "buildkit";
     rev = "v${version}";
-    hash = "sha256-VjyrW2PwJ8/36V9PnLoMzAhJW9rKyg12V2KChD10XEw=";
+    hash = "sha256-TN6IJLQxbwhflNdnrPgcqzw2o6di+aHOqwa6efkyV0k=";
   };
 
   vendorHash = null;

pkgs/by-name/c3/c3c/package.nix

@@ -13,13 +13,13 @@
 
 llvmPackages.stdenv.mkDerivation (finalAttrs: {
   pname = "c3c";
-  version = "0.6.5";
+  version = "0.6.6";
 
   src = fetchFromGitHub {
     owner = "c3lang";
     repo = "c3c";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-2OxUHnmFtT/TunfO+fOBOrkaHKlnqpO1wJWs79wkvAY=";
+    hash = "sha256-+rNj1SmiBYBw3Ncx2uS8X5OA/qDvJ8SFpZOQVRCgvmM=";
   };
 
   postPatch = ''

pkgs/by-name/ca/cargo-deny/package.nix

@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-deny";
-  version = "0.16.3";
+  version = "0.16.4";
 
   src = fetchFromGitHub {
     owner = "EmbarkStudios";
     repo = "cargo-deny";
     rev = version;
-    hash = "sha256-vU1MUmMzyKcCi1HR0089+MTtpy0Y+zzK5XC5/jIEhok=";
+    hash = "sha256-DykyIZBlIS4vUrD491boYcUvwcxllnV1PUT+58eOljI=";
   };
 
-  cargoHash = "sha256-jNNmTMeNgUq7uBp2eGrSl5afcKrTUXG2Wr8peEcmG7s=";
+  cargoHash = "sha256-ITtlBKBYXilaZtl4WJLSPoss77wezvNjwgj5FN8ll1w=";
 
   nativeBuildInputs = [
     pkg-config

pkgs/by-name/cl/clang-uml/package.nix

@@ -17,13 +17,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "clang-uml";
-  version = "0.5.6";
+  version = "0.6.0";
 
   src = fetchFromGitHub {
     owner = "bkryza";
     repo = "clang-uml";
     rev = finalAttrs.version;
-    hash = "sha256-fsN9l5sgQ9NIjS0Tn/tAUK/p2mdP7/R7a9BFb+9I0UU=";
+    hash = "sha256-xTM4mrQFEMhyfHLJ8mRd9IwXphbB5ceMXEKMlGuppsU=";
   };
 
   nativeBuildInputs =

pkgs/by-name/da/dart-sass/package.nix

@@ -22,13 +22,13 @@ let
 in
 buildDartApplication rec {
   pname = "dart-sass";
-  version = "1.83.1";
+  version = "1.83.4";
 
   src = fetchFromGitHub {
     owner = "sass";
     repo = pname;
     rev = version;
-    hash = "sha256-uy3kp6oT51AW2qE+qHOvvDDS59Tgw9fEAer94PsQOkg=";
+    hash = "sha256-F2Yj1e+TsuI3MoWJIH4uk1J1n6Vild+BpSgoWnIXTiM=";
   };
 
   pubspecLock = lib.importJSON ./pubspec.lock.json;

pkgs/by-name/da/dart-sass/pubspec.lock.json

@@ -4,27 +4,27 @@
       "dependency": "transitive",
       "description": {
         "name": "_fe_analyzer_shared",
-        "sha256": "45cfa8471b89fb6643fe9bf51bd7931a76b8f5ec2d65de4fb176dba8d4f22c77",
+        "sha256": "16e298750b6d0af7ce8a3ba7c18c69c3785d11b15ec83f6dcd0ad2a0009b3cab",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "73.0.0"
+      "version": "76.0.0"
     },
     "_macros": {
       "dependency": "transitive",
       "description": "dart",
       "source": "sdk",
-      "version": "0.3.2"
+      "version": "0.3.3"
     },
     "analyzer": {
       "dependency": "direct dev",
       "description": {
         "name": "analyzer",
-        "sha256": "4959fec185fe70cce007c57e9ab6983101dbe593d2bf8bbfb4453aaec0cf470a",
+        "sha256": "1f14db053a8c23e260789e9b0980fa27f2680dd640932cae5e1137cce0e46e1e",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.8.0"
+      "version": "6.11.0"
     },
     "archive": {
       "dependency": "direct dev",
@@ -176,25 +176,15 @@
       "source": "hosted",
       "version": "4.3.0"
     },
-    "dart_style": {
-      "dependency": "direct dev",
-      "description": {
-        "name": "dart_style",
-        "sha256": "27eb0ae77836989a3bc541ce55595e8ceee0992807f14511552a898ddd0d88ac",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "3.0.1"
-    },
     "dartdoc": {
       "dependency": "direct dev",
       "description": {
         "name": "dartdoc",
-        "sha256": "818bf58bd0325cb574df31e5c08969f0e690a9cb13826eaac2efc02c7e41655a",
+        "sha256": "edd117eaf5dc752982eccafcb746aa2980c8a35f54e3253b9ceb343d70ba27c3",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "8.1.0"
+      "version": "8.3.2"
     },
     "ffi": {
       "dependency": "transitive",
@@ -270,11 +260,11 @@
       "dependency": "direct main",
       "description": {
         "name": "http",
-        "sha256": "b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010",
+        "sha256": "fe7ab022b76f3034adc518fb6ea04a82387620e19977665ea18d30a1cf43442f",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.2.2"
+      "version": "1.3.0"
     },
     "http_multi_server": {
       "dependency": "transitive",
@@ -330,11 +320,11 @@
       "dependency": "direct dev",
       "description": {
         "name": "lints",
-        "sha256": "3315600f3fb3b135be672bf4a178c55f274bebe368325ae18462c89ac1e3b413",
+        "sha256": "c35bb79562d980e9a453fc715854e1ed39e24e7d0297a880ef54e17f9874a9d7",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "5.0.0"
+      "version": "5.1.1"
     },
     "logging": {
       "dependency": "transitive",
@@ -350,21 +340,21 @@
       "dependency": "transitive",
       "description": {
         "name": "macros",
-        "sha256": "0acaed5d6b7eab89f63350bccd82119e6c602df0f391260d0e32b5e23db79536",
+        "sha256": "1d9e801cd66f7ea3663c45fc708450db1fa57f988142c64289142c9b7ee80656",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.1.2-main.4"
+      "version": "0.1.3-main.0"
     },
     "markdown": {
       "dependency": "transitive",
       "description": {
         "name": "markdown",
-        "sha256": "ef2a1298144e3f985cc736b22e0ccdaf188b5b3970648f2d9dc13efd1d9df051",
+        "sha256": "935e23e1ff3bc02d390bad4d4be001208ee92cc217cb5b5a6c19bc14aaa318c1",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "7.2.2"
+      "version": "7.3.0"
     },
     "matcher": {
       "dependency": "transitive",
@@ -470,11 +460,11 @@
       "dependency": "transitive",
       "description": {
         "name": "petitparser",
-        "sha256": "c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27",
+        "sha256": "07c8f0b1913bcde1ff0d26e57ace2f3012ccbf2b204e070290dad3bb22797646",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.0.2"
+      "version": "6.1.0"
     },
     "pool": {
       "dependency": "direct main",
@@ -530,11 +520,11 @@
       "dependency": "direct dev",
       "description": {
         "name": "pubspec_parse",
-        "sha256": "81876843eb50dc2e1e5b151792c9a985c5ed2536914115ed04e9c8528f6647b0",
+        "sha256": "0560ba233314abbed0a48a2956f7f022cce7c3e1e73df540277da7544cad4082",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.4.0"
+      "version": "1.5.0"
     },
     "retry": {
       "dependency": "transitive",
@@ -818,6 +808,6 @@
     }
   },
   "sdks": {
-    "dart": ">=3.5.0 <4.0.0"
+    "dart": ">=3.6.0 <4.0.0"
   }
 }

pkgs/by-name/ds/dsda-doom/package.nix

@@ -19,13 +19,13 @@
 
 stdenv.mkDerivation rec {
   pname = "dsda-doom";
-  version = "0.28.2";
+  version = "0.28.3";
 
   src = fetchFromGitHub {
     owner = "kraflab";
     repo = "dsda-doom";
     rev = "v${version}";
-    hash = "sha256-TuDiClIq8GLY/3qGildlPpwUUHmpFNATRz5CNTLpfeM=";
+    hash = "sha256-66o/k5DvyKxwa0sZPCfSycVRxEhrRhUJXJVz2p817OE=";
   };
 
   sourceRoot = "${src.name}/prboom2";

pkgs/by-name/ek/eksctl/package.nix

@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "eksctl";
-  version = "0.200.0";
+  version = "0.201.0";
 
   src = fetchFromGitHub {
     owner = "weaveworks";
     repo = pname;
     rev = version;
-    hash = "sha256-FvWNK27bN5NKP/d3UXdDUtYgEOu62h7janQIZ/Ibk1Q=";
+    hash = "sha256-mvIidkr3fUs8TbD8voqE8NAA14XPPuXC9u/2pc2ShK4=";
   };
 
-  vendorHash = "sha256-T8F+auAf07tTzh80fk7PcuVNv8Wx4ArmY2OxXL2FH+I=";
+  vendorHash = "sha256-qOV6mAKwLrF5+/q/PS2qVJcQx84CjNinv/e8KG+lxfI=";
 
   doCheck = false;
 

pkgs/by-name/et/etlegacy-assets/package.nix

@@ -6,7 +6,7 @@
 
 stdenv.mkDerivation {
   pname = "etlegacy-assets";
-  version = "2.83.1";
+  version = "2.83.2";
 
   srcs =
     let

pkgs/by-name/et/etlegacy-unwrapped/package.nix

@@ -3,7 +3,6 @@
   stdenv,
   writeShellApplication,
   fetchFromGitHub,
-  fetchpatch,
   cjson,
   cmake,
   git,
@@ -24,7 +23,7 @@
   zlib,
 }:
 let
-  version = "2.83.1";
+  version = "2.83.2";
   fakeGit = writeShellApplication {
     name = "git";
 
@@ -43,19 +42,9 @@ stdenv.mkDerivation {
     owner = "etlegacy";
     repo = "etlegacy";
     tag = "v${version}";
-    hash = "sha256-k1H3irA9UVOICY3keKGVJMtBczW/b5ObyNvB7fGAcFA=";
+    hash = "sha256-hZwLYaYV0j3YwFi8KRr4DZV73L2yIwFJ3XqCyq6L7hE=";
   };
 
-  patches = lib.optionals stdenv.hostPlatform.isDarwin [
-    # Fix compilation on Darwin archs
-    # Reported upstream at https://github.com/etlegacy/etlegacy/pull/3005
-    # Remove this patch when the PR is merged
-    (fetchpatch {
-      url = "https://github.com/etlegacy/etlegacy/commit/2767d15c67fe0680178d9cc85ed4cf2ad1d88ad0.patch?full_index=1";
-      hash = "sha256-rGfNIWb9zohk1QJLrYg9nqw6sMvXM0IbIl9kvYXRBuk=";
-    })
-  ];
-
   nativeBuildInputs = [
     cjson
     cmake

pkgs/by-name/et/etlegacy/package.nix

@@ -8,7 +8,7 @@
 
 symlinkJoin {
   name = "etlegacy";
-  version = "2.83.1";
+  version = "2.83.2";
   paths = [
     etlegacy-assets
     etlegacy-unwrapped

pkgs/by-name/fe/feishu/package.nix

@@ -66,12 +66,12 @@
 let
   sources = {
     x86_64-linux = fetchurl {
-      url = "https://sf3-cn.feishucdn.com/obj/ee-appcenter/018b8d40/Feishu-linux_x64-7.28.10.deb";
-      sha256 = "sha256-rVi9bRHu1/nu153gAl6xF1IHt6uoABHXd8AN4JoCGo0=";
+      url = "https://sf3-cn.feishucdn.com/obj/ee-appcenter/18b9e5d0/Feishu-linux_x64-7.32.11.deb";
+      sha256 = "sha256-gU+fNiUE2kCE3407vdjQqE7oLgR9vXynaBNuV3EZrqc=";
     };
     aarch64-linux = fetchurl {
-      url = "https://sf3-cn.feishucdn.com/obj/ee-appcenter/8ce25ba1/Feishu-linux_arm64-7.28.10.deb";
-      sha256 = "sha256-IsjGuyHvmDNjJYCBXR1NFShaVsWUYcF3OV5ihY9fJl0=";
+      url = "https://sf3-cn.feishucdn.com/obj/ee-appcenter/8946d4de/Feishu-linux_arm64-7.32.11.deb";
+      sha256 = "sha256-gYIQysbII9Ud1a7eXqQRtOsBA2rI29+xnxntAumFUdk=";
     };
   };
 
@@ -135,7 +135,7 @@ let
   ];
 in
 stdenv.mkDerivation {
-  version = "7.28.10";
+  version = "7.32.11";
   pname = "feishu";
 
   src =

pkgs/by-name/ge/gersemi/package.nix

@@ -6,13 +6,13 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "gersemi";
-  version = "0.17.1";
+  version = "0.18.2";
 
   src = fetchFromGitHub {
     owner = "BlankSpruce";
     repo = "gersemi";
     tag = version;
-    hash = "sha256-AphKC50O9ohywLagyQMfk8A6w4Cm0ceHHWSRAWOnoyM=";
+    hash = "sha256-yd6KbMmk/zVYcaJkZqS+XatJoTX9UzAlMt2jljF91/4=";
   };
 
   propagatedBuildInputs = with python3Packages; [

pkgs/by-name/gl/glamoroustoolkit/package.nix

@@ -29,12 +29,12 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "glamoroustoolkit";
-  version = "1.1.8";
+  version = "1.1.9";
 
   src = fetchzip {
     url = "https://github.com/feenkcom/gtoolkit-vm/releases/download/v${finalAttrs.version}/GlamorousToolkit-x86_64-unknown-linux-gnu.zip";
     stripRoot = false;
-    hash = "sha256-r7q8apszeiON3MPMSY7GHHTh+hSXlAl35pUTxFV78kk=";
+    hash = "sha256-dBUMn5KMSLTfmJnKTS6seEYDRy2JCiR+fi37UIUJ5aM=";
   };
 
   nativeBuildInputs = [

pkgs/by-name/gm/gmetronome/package.nix

@@ -11,14 +11,14 @@
 
 stdenv.mkDerivation rec {
   pname = "gmetronome";
-  version = "0.4.1";
+  version = "0.4.2";
 
   src = fetchFromGitLab {
     domain = "gitlab.gnome.org";
     owner = "dqpb";
     repo = "gmetronome";
     rev = version;
-    hash = "sha256-w7ziWfpaFU8KTJcCTJUsLghy4Q3cCL1Bi0TxrReiP7s=";
+    hash = "sha256-/UWOvVeZILDR29VjBK+mFJt1hzWcOljOr7J7+cMrKtM=";
   };
 
   nativeBuildInputs = [

pkgs/by-name/go/goreleaser/package.nix

@@ -10,13 +10,13 @@
 }:
 buildGoModule rec {
   pname = "goreleaser";
-  version = "2.6.0";
+  version = "2.6.1";
 
   src = fetchFromGitHub {
     owner = "goreleaser";
     repo = "goreleaser";
     rev = "v${version}";
-    hash = "sha256-CZ4t7i253froL2JTdAGN61BLcI5PvJEqWCwn2RgGhfM=";
+    hash = "sha256-MlI76xiHT+JZAaL7LnEqHOgt6UypVoBjZHTmQXrnNxs=";
   };
 
   vendorHash = "sha256-fYYPpf/Hnci5DCvhbWkmenTL+95PvqPtn1RdoRby+jI=";

pkgs/by-name/gu/gum/package.nix

@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "gum";
-  version = "0.14.5";
+  version = "0.15.0";
 
   src = fetchFromGitHub {
     owner = "charmbracelet";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-moKirTXziVo6ESOsnTUmPkcdBYL/VHaG226+UfM0xAk=";
+    hash = "sha256-DHIFU+dfZpeQo9kN9Krc1dhTf2HlnC7PEwTfN6RYmSU=";
   };
 
-  vendorHash = "sha256-wjM2ld4go7OQu6XqsSGurjN09Fd5t9FNLvIzgrZEZ1k=";
+  vendorHash = "sha256-BcHwFj4nGmKcbVnLEVd9rK54DAyVNc2Dlt085N+HtFA=";
 
   nativeBuildInputs = [
     installShellFiles

pkgs/by-name/gv/gvproxy/package.nix

@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "gvproxy";
-  version = "0.8.1";
+  version = "0.8.2";
 
   src = fetchFromGitHub {
     owner = "containers";
     repo = "gvisor-tap-vsock";
     rev = "v${version}";
-    hash = "sha256-f48dcXzzmWZ3ELswENMTmnK98eUqOtGt5GGxDU9WYmM=";
+    hash = "sha256-D+iOnkQcd0MsnC2xSuWvBIQt0v8EosgyLDTvOJF/TI8=";
   };
 
   vendorHash = null;

pkgs/by-name/ha/handheld-daemon/package.nix

@@ -16,14 +16,14 @@
 }:
 python3Packages.buildPythonApplication rec {
   pname = "handheld-daemon";
-  version = "3.10.2";
+  version = "3.11.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "hhd-dev";
     repo = "hhd";
     tag = "v${version}";
-    hash = "sha256-6BjXqqNe2u/rh1cnuJ13L/1KimprcyatIr53b0GOBSM=";
+    hash = "sha256-MeWNHqHV1LLjBSdeHYmM5594ltINPvt19q8UtWvjUMs=";
   };
 
   # Handheld-daemon runs some selinux-related utils which are not in nixpkgs.

pkgs/by-name/ha/haproxy/package.nix

@@ -35,11 +35,11 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "haproxy";
-  version = "3.1.1";
+  version = "3.1.2";
 
   src = fetchurl {
     url = "https://www.haproxy.org/download/${lib.versions.majorMinor finalAttrs.version}/src/haproxy-${finalAttrs.version}.tar.gz";
-    hash = "sha256-jBtdQ5uksnjmAkRcV+IAZ63vIU3JxEwqHPFy+tX30nM=";
+    hash = "sha256-rzXci/MZOHC3InamOSCXS+8UBfxBA41UW4a2QapZ9AA=";
   };
 
   buildInputs =

pkgs/by-name/im/imsprog/package.nix

@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "imsprog";
-  version = "1.4.4";
+  version = "1.4.5";
 
   src = fetchFromGitHub {
     owner = "bigbigmdm";
     repo = "IMSProg";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-dhBg0f7pIbBS8IiUXd1UlAxgGrv6HapzooXafkHIEK8=";
+    hash = "sha256-6UWCcHHHkZsbrhew1fI/1KaGdjRK/mlq9Q72WnU1lbU=";
   };
 
   strictDeps = true;

pkgs/by-name/je/jellyfin-tui/package.nix

@@ -0,0 +1,47 @@
+{
+  lib,
+  fetchFromGitHub,
+  rustPlatform,
+  pkg-config,
+  openssl,
+  mpv,
+  nix-update-script,
+  versionCheckHook,
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "jellyfin-tui";
+  version = "1.0.5";
+
+  src = fetchFromGitHub {
+    owner = "dhonus";
+    repo = "jellyfin-tui";
+    tag = "v${version}";
+    hash = "sha256-dME3oM3k5TGjN8S/93Crt3vw8+KjZWivkVzg+eqwfe4=";
+  };
+
+  cargoHash = "sha256-DFwEcKPc5c+xYas/gI3dHGRW8r4B8GBRXiI9VjdMrpw=";
+
+  nativeBuildInputs = [ pkg-config ];
+  buildInputs = [
+    openssl
+    mpv
+  ];
+
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+  versionCheckProgramArg = "--version";
+  doInstallCheck = true;
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Jellyfin music streaming client for the terminal";
+    mainProgram = "jellyfin-tui";
+    homepage = "https://github.com/dhonus/jellyfin-tui";
+    changelog = "https://github.com/dhonus/jellyfin-tui/releases/tag/v${version}";
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ GKHWB ];
+  };
+}

pkgs/by-name/jf/jfrog-cli/package.nix

@@ -8,17 +8,17 @@
 
 buildGoModule rec {
   pname = "jfrog-cli";
-  version = "2.72.5";
+  version = "2.73.0";
 
   src = fetchFromGitHub {
     owner = "jfrog";
     repo = "jfrog-cli";
     tag = "v${version}";
-    hash = "sha256-owE3mWzVogESko4SeysobC3VmmH37ikk7llJv65ZTfU=";
+    hash = "sha256-GzxJAatMI7H4XaRgza8+nq4JtIlPN9H3WkdKr0PfXWM=";
   };
 
   proxyVendor = true;
-  vendorHash = "sha256-cxuNlIXD4LIBWxbTdC/ygiF/ti4eHYQBR6kZRhhgJtY=";
+  vendorHash = "sha256-tblmLEYHZt8manxuu5OpHeuAW18+0/kSvZIJmhEfQYQ=";
 
   postPatch = ''
     # Patch out broken test cleanup.

pkgs/by-name/li/libretrack/package.nix

@@ -0,0 +1,51 @@
+{
+  lib,
+  fetchFromGitHub,
+  flutterPackages-source,
+  libappindicator,
+}:
+
+flutterPackages-source.stable.buildFlutterApplication rec {
+  pname = "libretrack";
+  version = "1.7.0";
+
+  src = fetchFromGitHub {
+    owner = "proninyaroslav";
+    repo = "libretrack";
+    tag = version;
+    hash = "sha256-USZ243M/0SOvlYns66zkhDQCuq+kgEWYdBZN3iBF9SA=";
+  };
+
+  pubspecLock = lib.importJSON ./pubspec.lock.json;
+  gitHashes = {
+    "receive_sharing_intent" = "sha256-YsvnLOZvYZMyKx3J596Q3/hY2Fn/AFT6nhLTTHdMFOE=";
+  };
+
+  postPatch = ''
+    substituteInPlace linux/CMakeLists.txt \
+     --replace-fail 'find_library(APPINDICATOR_LIBRARY NAMES appindicator3)' 'find_library(${libappindicator} NAMES appindicator3)' \
+     --replace-fail 'target_link_libraries(''${BINARY_NAME} PRIVATE ''${APPINDICATOR_LIBRARY})' 'target_link_libraries(''${BINARY_NAME} PRIVATE ${libappindicator}/lib/libappindicator3.so)'
+  '';
+
+  nativeBuildInputs = [
+    libappindicator
+  ];
+
+  postInstall = ''
+    substituteInPlace snap/gui/org.proninyaroslav.libretrack.desktop \
+      --replace-fail 'Icon=''${SNAP}/meta/gui/libretrack.png' 'Icon=libretrack' \
+
+    install -Dm644 snap/gui/org.proninyaroslav.libretrack.desktop -t $out/share/applications
+    install -Dm644 linux/icons/app-icon.svg $out/share/icons/hicolor/scalable/apps/libretrack.svg
+  '';
+
+  meta = {
+    description = "Private, cross-platform package tracking app";
+    homepage = "https://github.com/proninyaroslav/libretrack";
+    changelog = "https://github.com/proninyaroslav/libretrack/releases/tag/${version}";
+    license = lib.licenses.gpl3;
+    maintainers = with lib.maintainers; [ genga898 ];
+    mainProgram = "libretrack";
+    platforms = lib.platforms.linux;
+  };
+}

pkgs/by-name/ll/llama-cpp/package.nix

@@ -81,13 +81,13 @@ let
 in
 effectiveStdenv.mkDerivation (finalAttrs: {
   pname = "llama-cpp";
-  version = "4450";
+  version = "4525";
 
   src = fetchFromGitHub {
     owner = "ggerganov";
     repo = "llama.cpp";
     tag = "b${finalAttrs.version}";
-    hash = "sha256-YOfG0Bt59P9yOzbbKZ5UZng6W+XG+LBOcdieUONn/hQ=";
+    hash = "sha256-U+JkD61ThCJUSnG2MMR61BSijyoQNg1mPLSKgSgNBCk=";
     leaveDotGit = true;
     postFetch = ''
       git -C "$out" rev-parse --short HEAD > $out/COMMIT

pkgs/by-name/lu/ludusavi/package.nix

@@ -30,16 +30,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "ludusavi";
-  version = "0.27.0";
+  version = "0.28.0";
 
   src = fetchFromGitHub {
     owner = "mtkennerly";
     repo = "ludusavi";
     rev = "v${version}";
-    hash = "sha256-YMTM0UKDGUiFmwmQXVJe5hccu4A8dhm0OFxTKLUb1jo=";
+    hash = "sha256-N2dDi47Z2PifMNlYE6Lk1nHxfpvwoL6h2QkUPthlh4A=";
   };
 
-  cargoHash = "sha256-1IqjoprKwupwJwXyGtMwB7guG3j98ayWmmigY0fY12s=";
+  cargoHash = "sha256-ERMCZikUWWt5QpArAzXjhuZKVVFMP/cPA+pkjNwCWiA=";
 
   nativeBuildInputs = [
     cmake

pkgs/by-name/mm/mmseqs2/package.nix

@@ -26,13 +26,13 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "mmseqs2";
-  version = "16-747c6";
+  version = "17-b804f";
 
   src = fetchFromGitHub {
     owner = "soedinglab";
     repo = "mmseqs2";
     tag = finalAttrs.version;
-    hash = "sha256-O7tx+gdVAmZLihPnWSo9RWNVzfPjI61LGY/XeaGHrI0=";
+    hash = "sha256-nmvFoW+Ey18NcM2w14Ak/3D/Kic52Vka/RxvBd0YoKI=";
   };
 
   nativeBuildInputs =
@@ -89,6 +89,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Ultra fast and sensitive sequence search and clustering suite";
     mainProgram = "mmseqs";
     homepage = "https://mmseqs.com/";
+    changelog = "https://github.com/soedinglab/MMseqs2/releases/tag/${version}";
     license = licenses.mit;
     maintainers = with maintainers; [ natsukium ];
     platforms = platforms.unix;

pkgs/by-name/nb/nb/package.nix

@@ -6,6 +6,7 @@
   testers,
   nix-update-script,
   nb,
+  bashInteractive,
 }:
 
 stdenv.mkDerivation rec {
@@ -21,6 +22,8 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ installShellFiles ];
 
+  buildInputs = [ bashInteractive ];
+
   dontBuild = true;
 
   installPhase = ''

pkgs/by-name/ne/netbird-dashboard/package.nix

@@ -6,16 +6,16 @@
 
 buildNpmPackage rec {
   pname = "netbird-dashboard";
-  version = "2.8.2";
+  version = "2.9.0";
 
   src = fetchFromGitHub {
     owner = "netbirdio";
     repo = "dashboard";
     rev = "v${version}";
-    hash = "sha256-netq6VCZcGBj5jv+pekRTxd6s0Lr45yuqZThs0qoc64=";
+    hash = "sha256-PY/jK96FK6Y0++Ie4Yg/7GrGoLtLcgCSzXIkqySxe2M=";
   };
 
-  npmDepsHash = "sha256-MbVBeZWX9e4eLz2ZRG0qYr9oTkBGhFPJ5m/rVEfGLuc=";
+  npmDepsHash = "sha256-TELyc62l/8IaX9eL2lxRFth0AAZ4LXsV2WNzXSHRnTw=";
   npmFlags = [ "--legacy-peer-deps" ];
 
   installPhase = ''

pkgs/by-name/ol/ollama/package.nix

@@ -129,7 +129,10 @@ let
   wrapperArgs = builtins.concatStringsSep " " wrapperOptions;
 
   goBuild =
-    if enableCuda then buildGoModule.override { stdenv = overrideCC stdenv gcc12; } else buildGoModule;
+    if enableCuda then
+      buildGoModule.override { stdenv = cudaPackages.backendStdenv; }
+    else
+      buildGoModule;
   inherit (lib) licenses platforms maintainers;
 in
 goBuild {
@@ -146,9 +149,7 @@ goBuild {
       CLBlast_DIR = "${clblast}/lib/cmake/CLBlast";
       HIP_PATH = rocmPath;
     }
-    // lib.optionalAttrs enableCuda {
-      CUDA_PATH = cudaPath;
-    };
+    // lib.optionalAttrs enableCuda { CUDA_PATH = cudaPath; };
 
   nativeBuildInputs =
     [
@@ -225,9 +226,7 @@ goBuild {
 
   __darwinAllowLocalNetworking = true;
 
-  nativeInstallCheck = [
-    versionCheckHook
-  ];
+  nativeInstallCheck = [ versionCheckHook ];
   versionCheckProgramArg = [ "--version" ];
   doInstallCheck = true;
 

pkgs/by-name/pa/paperless-ngx/package.nix

@@ -26,13 +26,13 @@
   xorg,
 }:
 let
-  version = "2.14.4";
+  version = "2.14.5";
 
   src = fetchFromGitHub {
     owner = "paperless-ngx";
     repo = "paperless-ngx";
     tag = "v${version}";
-    hash = "sha256-asjTRjEMnJcmyAZNZQ+VxXeyGc+j0j1JAAOrOaQ7ma4=";
+    hash = "sha256-ML38TErINQPjBGweCY673zFlGEjTjgJcYJTJUbTov+4=";
   };
 
   # subpath installation is broken with uvicorn >= 0.26
@@ -86,7 +86,7 @@ let
       cd src-ui
     '';
 
-    npmDepsHash = "sha256-JUmYSHHrNWpJNp01Er2zMgiVVIIOAC+QlKw1HAjD7/E=";
+    npmDepsHash = "sha256-hK7Soop9gBZP4m2UzbEIAsLkPKpbQkLmVruY2So4CSs=";
 
     nativeBuildInputs =
       [

pkgs/by-name/pf/pfetch-rs/package.nix

@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "pfetch-rs";
-  version = "2.11.0";
+  version = "2.11.1";
 
   src = fetchFromGitHub {
     owner = "Gobidev";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-1Br/mO7hisTFxiPJs5vOC+idENYMqfzJEmPBXOFGc58=";
+    hash = "sha256-Kgoo8piv4pNqzw9zQSEj7POSK6l+0KMvaNbvMp+bpF8=";
   };
 
-  cargoHash = "sha256-/gYL32kUA4gKTGogMrOghQ3XYFjw3GsDhzynUC/OyXY=";
+  cargoHash = "sha256-24t2T+YkhDfGrYbT1VWYxA20//q6ElbvVCPY7VsLXRA=";
 
   buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
     darwin.apple_sdk.frameworks.AppKit

pkgs/by-name/pi/pipenv-poetry-migrate/package.nix

@@ -1,21 +1,13 @@
 {
   lib,
-  buildPythonPackage,
   fetchFromGitHub,
-  pytestCheckHook,
-  pythonOlder,
-  poetry-core,
-  tomlkit,
-  typer,
-  setuptools,
+  python3Packages,
 }:
 
-buildPythonPackage rec {
+python3Packages.buildPythonApplication rec {
   pname = "pipenv-poetry-migrate";
   version = "0.6.0";
-  format = "pyproject";
-
-  disabled = pythonOlder "3.8";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "yhino";
@@ -24,22 +16,22 @@ buildPythonPackage rec {
     hash = "sha256-M31bOvKGUlkzfZRQAxTkxhX8m9cCzEvsNZdyIyipwGI=";
   };
 
-  nativeBuildInputs = [ poetry-core ];
+  build-system = [ python3Packages.poetry-core ];
 
-  propagatedBuildInputs = [
+  dependencies = with python3Packages; [
     setuptools # for pkg_resources
     tomlkit
     typer
   ];
 
-  nativeCheckInputs = [ pytestCheckHook ];
+  nativeCheckInputs = [ python3Packages.pytestCheckHook ];
 
-  meta = with lib; {
+  meta = {
     description = "This is simple migration script, migrate pipenv to poetry";
     mainProgram = "pipenv-poetry-migrate";
     homepage = "https://github.com/yhino/pipenv-poetry-migrate";
     changelog = "https://github.com/yhino/pipenv-poetry-migrate/blob/v${version}/CHANGELOG.md";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ gador ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ gador ];
   };
 }

pkgs/by-name/rb/rbenv/package.nix

@@ -7,7 +7,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "rbenv";
-  version = "1.3.0";
+  version = "1.3.2";
 
   nativeBuildInputs = [ installShellFiles ];
 
@@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "rbenv";
     repo = "rbenv";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-AO0z9QtCGHwUr2ji28sbvQmCBDIfjAqbiac+HTH3N7Q=";
+    sha256 = "sha256-vkwYl+cV5laDfevAHfju5G+STA3Y+wcMBtW1NWzJ4po=";
   };
 
   postPatch = ''

pkgs/by-name/sc/scala-next/package.nix

@@ -1,10 +1,10 @@
 { scala, fetchurl }:
 
 scala.bare.overrideAttrs (oldAttrs: {
-  version = "3.5.1";
+  version = "3.6.3";
   pname = "scala-next";
   src = fetchurl {
     inherit (oldAttrs.src) url;
-    hash = "sha256-pRfoCXFVnnEh3zyB9HbUZK3qrQ94Gq3iXX2fWGS/l9o=";
+    hash = "sha256-I+PYPSRLS8Q0SJ/BEAoFwB7EcFERZpN5pGcD5cGwlNU=";
   };
 })

pkgs/by-name/te/termius/package.nix

@@ -16,8 +16,8 @@
 
 stdenv.mkDerivation rec {
   pname = "termius";
-  version = "9.9.0";
-  revision = "211";
+  version = "9.12.0";
+  revision = "212";
 
   src = fetchurl {
     # find the latest version with
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
     # and the sha512 with
     # curl -H 'X-Ubuntu-Series: 16' https://api.snapcraft.io/api/v1/snaps/details/termius-app | jq '.download_sha512' -r
     url = "https://api.snapcraft.io/api/v1/snaps/download/WkTBXwoX81rBe3s3OTt3EiiLKBx2QhuS_${revision}.snap";
-    hash = "sha512-7oaVWe0H4y3tiSD8Cgj14fEaJQj3ekoczJjv5JvrU5I9ylRoe8XHNqD0MwOYFIpICyyKfoj0UonyVgggGLUq5A==";
+    hash = "sha512-w2dp/iwwYsR7LVk7O4FtktctX39lMNufrtTSaRjWq59bIalvPM2mC3DDs1zhsEq1EmKsY+uVsAgsDPMG7bCRUw==";
   };
 
   desktopItem = makeDesktopItem {

pkgs/by-name/up/updatecli/package.nix

@@ -11,16 +11,16 @@
 
 buildGoModule rec {
   pname = "updatecli";
-  version = "0.91.0";
+  version = "0.92.0";
 
   src = fetchFromGitHub {
     owner = "updatecli";
     repo = "updatecli";
     rev = "v${version}";
-    hash = "sha256-r/8QPVJHrvHbDZZ7RFgKBB7isy/P5hTBe84xFcevEH4=";
+    hash = "sha256-cdutmuNcsrAq+b38/QhBjTS3e1f3s6Ffarvnxt3NX3k=";
   };
 
-  vendorHash = "sha256-Y1klBZZvDtCootNXQOlScSgDpaw1/owzBX9ykCD6NCw=";
+  vendorHash = "sha256-J2vARkThxgu0bYLQv80AKIC4XmfWdnabZn0gOyhe43U=";
 
   # tests require network access
   doCheck = false;

pkgs/by-name/wa/wasm-tools/package.nix

@@ -6,19 +6,19 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "wasm-tools";
-  version = "1.223.0";
+  version = "1.224.0";
 
   src = fetchFromGitHub {
     owner = "bytecodealliance";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-Wy/a8U2VEpfNgKMA1lwKOlC5fezX5voW+U5HkL0cH4k=";
+    hash = "sha256-NU8j/qDMCeVFnUhU2P5ZrrpMgE6+IIV/+jmLpPEk3vA=";
     fetchSubmodules = true;
   };
 
   # Disable cargo-auditable until https://github.com/rust-secure-code/cargo-auditable/issues/124 is solved.
   auditable = false;
-  cargoHash = "sha256-P4jPSXvWXQZWQMvVllpAwq2svaBue6HD9KVhV6QTGMU=";
+  cargoHash = "sha256-UEQnlfXZgNprd9w/ZyeqQkN4psmKKhRf2PCBadDnYDo=";
   cargoBuildFlags = [
     "--package"
     "wasm-tools"

pkgs/by-name/wo/wootility/package.nix

@@ -7,10 +7,10 @@
 
 let
   pname = "wootility";
-  version = "4.7.2";
+  version = "4.7.3";
   src = fetchurl {
     url = "https://s3.eu-west-2.amazonaws.com/wooting-update/wootility-lekker-linux-latest/wootility-lekker-${version}.AppImage";
-    sha256 = "sha256-2xIiSMFyJjmjBQ6GJYtc0VbZkTadV2Ov/mXQcJ8yq2U=";
+    sha256 = "sha256-5S4Yz2VymKfT1uBXYufb6MWx1aMbGn4ufT8RITJtuPc=";
   };
 in
 

pkgs/by-name/xp/xpipe/package.nix

@@ -39,7 +39,7 @@ let
 
   hash =
     {
-      x86_64-linux = "sha256-6h6Rtmo9XV9fk6G+ff5A1apwmJ7L5s+pTJDS759OOgk=";
+      x86_64-linux = "sha256-1/sGobiYtOS4GaZZHQHHvXBZlaCMr4EWpP5m/917h8g=";
     }
     .${system} or throwSystem;
 
@@ -48,7 +48,7 @@ let
 in
 stdenvNoCC.mkDerivation rec {
   pname = "xpipe";
-  version = "13.4.4";
+  version = "14.0";
 
   src = fetchzip {
     url = "https://github.com/xpipe-io/xpipe/releases/download/${version}/xpipe-portable-linux-${arch}.tar.gz";

pkgs/development/compilers/idris2/build-idris.nix

@@ -11,13 +11,17 @@
 #            idrisLibraries = [ ];
 #          };
 #        in {
-#          lib = pkg.library { withSource = true; };
+#          lib1 = pkg.library { withSource = true; };
+#
+#          # implicitly without source:
+#          lib2 = pkg.library';
+#
 #          bin = pkg.executable;
 #        }
 #
 {
   src,
-  ipkgName,
+  ipkgName, # ipkg filename without the extension
   version ? "unversioned",
   idrisLibraries, # Other libraries built with buildIdris
   ...
@@ -44,78 +48,91 @@ let
   ipkgFileName = ipkgName + ".ipkg";
   idrName = "idris2-${idris2.version}";
   libSuffix = "lib/${idrName}";
-  propagatedIdrisLibraries = propagate idrisLibraryLibs;
-  libDirs = (lib.makeSearchPath libSuffix propagatedIdrisLibraries) + ":${idris2}/${idrName}";
+  libDirs = libs: (lib.makeSearchPath libSuffix libs) + ":${idris2}/${idrName}";
   supportDir = "${idris2}/${idrName}/lib";
   drvAttrs = builtins.removeAttrs attrs [
     "ipkgName"
     "idrisLibraries"
   ];
 
-  derivation = stdenv.mkDerivation (
-    finalAttrs:
-    drvAttrs
-    // {
-      pname = ipkgName;
-      inherit version;
-      src = src;
-      nativeBuildInputs = [
-        idris2
-        makeBinaryWrapper
-      ] ++ attrs.nativeBuildInputs or [ ];
-      buildInputs = propagatedIdrisLibraries ++ attrs.buildInputs or [ ];
+  mkDerivation =
+    withSource:
+    let
+      applyWithSource = lib: if withSource then lib.withSource else lib;
+      propagatedIdrisLibraries = map applyWithSource (propagate idrisLibraryLibs);
+    in
+    stdenv.mkDerivation (
+      finalAttrs:
+      drvAttrs
+      // {
+        pname = ipkgName;
+        inherit src version;
+        nativeBuildInputs = [
+          idris2
+          makeBinaryWrapper
+        ] ++ attrs.nativeBuildInputs or [ ];
+        buildInputs = propagatedIdrisLibraries ++ attrs.buildInputs or [ ];
 
-      env.IDRIS2_PACKAGE_PATH = libDirs;
+        env.IDRIS2_PACKAGE_PATH = libDirs propagatedIdrisLibraries;
 
-      buildPhase = ''
-        runHook preBuild
-        idris2 --build ${ipkgFileName}
-        runHook postBuild
+        buildPhase = ''
+          runHook preBuild
+          idris2 --build ${ipkgFileName}
+          runHook postBuild
+        '';
+
+        passthru = {
+          inherit propagatedIdrisLibraries;
+        } // (attrs.passthru or { });
+
+        shellHook = ''
+          export IDRIS2_PACKAGE_PATH="${finalAttrs.env.IDRIS2_PACKAGE_PATH}"
+        '';
+      }
+    );
+
+  mkExecutable =
+    withSource:
+    let
+      derivation = mkDerivation withSource;
+    in
+    derivation.overrideAttrs {
+      installPhase = ''
+        runHook preInstall
+        mkdir -p $out/bin
+        scheme_app="$(find ./build/exec -name '*_app')"
+        if [ "$scheme_app" = ''' ]; then
+          mv -- build/exec/* $out/bin/
+          chmod +x $out/bin/*
+          # ^ remove after Idris2 0.8.0 is released. will be superfluous:
+          # https://github.com/idris-lang/Idris2/pull/3189
+        else
+          cd build/exec/*_app
+          rm -f ./libidris2_support.{so,dylib}
+          for file in *.so; do
+            bin_name="''${file%.so}"
+            mv -- "$file" "$out/bin/$bin_name"
+
+            wrapProgram "$out/bin/$bin_name" \
+              --prefix LD_LIBRARY_PATH : ${supportDir} \
+              --prefix DYLD_LIBRARY_PATH : ${supportDir}
+          done
+        fi
+        runHook postInstall
       '';
 
-      passthru = {
-        inherit propagatedIdrisLibraries;
-      } // (attrs.passthru or { });
+      # allow an executable's dependencies to be built with source. this is convenient when
+      # building a development shell for the exectuable using `mkShell`'s `inputsFrom`.
+      passthru = derivation.passthru // {
+        withSource = mkExecutable true;
+      };
+    };
 
-      shellHook = ''
-        export IDRIS2_PACKAGE_PATH="${finalAttrs.env.IDRIS2_PACKAGE_PATH}"
-      '';
-    }
-  );
-
-in
-{
-  executable = derivation.overrideAttrs {
-    installPhase = ''
-      runHook preInstall
-      mkdir -p $out/bin
-      scheme_app="$(find ./build/exec -name '*_app')"
-      if [ "$scheme_app" = ''' ]; then
-        mv -- build/exec/* $out/bin/
-        chmod +x $out/bin/*
-        # ^ remove after Idris2 0.8.0 is released. will be superfluous:
-        # https://github.com/idris-lang/Idris2/pull/3189
-      else
-        cd build/exec/*_app
-        rm -f ./libidris2_support.so
-        for file in *.so; do
-          bin_name="''${file%.so}"
-          mv -- "$file" "$out/bin/$bin_name"
-          wrapProgram "$out/bin/$bin_name" \
-            --prefix LD_LIBRARY_PATH : ${supportDir} \
-            --prefix DYLD_LIBRARY_PATH : ${supportDir}
-        done
-      fi
-      runHook postInstall
-    '';
-  };
-
-  library =
-    {
-      withSource ? false,
-    }:
+  mkLibrary =
+    withSource:
     let
       installCmd = if withSource then "--install-with-src" else "--install";
+      derivation = mkDerivation withSource;
     in
     derivation.overrideAttrs {
       installPhase = ''
@@ -125,5 +142,30 @@ in
         idris2 ${installCmd} ${ipkgFileName}
         runHook postInstall
       '';
+
+      # allow a library built without source to be changed to one with source
+      # via a passthru attribute; i.e. `my-pkg.library'.withSource`.
+      # this is convenient because a library derivation can be distributed as
+      # without-source by default but downstream projects can still build it
+      # with-source. We surface this regardless of whether the original library
+      # was built with source because that allows downstream to call this
+      # property unconditionally.
+      passthru = derivation.passthru // {
+        withSource = mkLibrary true;
+      };
     };
+
+in
+{
+  executable = mkExecutable false;
+
+  library =
+    {
+      withSource ? false,
+    }:
+    mkLibrary withSource;
+
+  # Make a library without source; you can still use the `withSource` attribute
+  # on the resulting derivation to build the library with source at a later time.
+  library' = mkLibrary false;
 }

pkgs/development/compilers/idris2/tests.nix

@@ -55,12 +55,13 @@ let
     {
       testName,
       buildIdrisArgs,
-      makeExecutable,
+      # function that takes result of `buildIdris` and transforms it (commonly
+      # by calling `.executable` or `.library {}` upon it):
+      transformBuildIdrisOutput,
       expectedTree,
     }:
     let
-      final = pkg: if makeExecutable then pkg.executable else pkg.library { };
-      idrisPkg = final (idris2Packages.buildIdris buildIdrisArgs);
+      idrisPkg = transformBuildIdrisOutput (idris2Packages.buildIdris buildIdrisArgs);
     in
     runCommand "${pname}-${testName}"
       {
@@ -140,7 +141,7 @@ in
         EOF
       '';
     };
-    makeExecutable = false;
+    transformBuildIdrisOutput = pkg: pkg.library { withSource = false; };
     expectedTree = ''
       `-- lib
           `-- idris2-0.7.0
@@ -153,6 +154,82 @@ in
       5 directories, 3 files'';
   };
 
+  buildLibraryWithSource = testBuildIdris {
+    testName = "library-with-source-package";
+    buildIdrisArgs = {
+      ipkgName = "pkg";
+      idrisLibraries = [ idris2Packages.idris2Api ];
+      src = runCommand "library-package-src" { } ''
+        mkdir $out
+
+        cat > $out/Main.idr <<EOF
+        module Main
+
+        import Compiler.ANF -- from Idris2Api
+
+        hello : String
+        hello = "world"
+        EOF
+
+        cat > $out/pkg.ipkg <<EOF
+        package pkg
+        modules = Main
+        depends = idris2
+        EOF
+      '';
+    };
+    transformBuildIdrisOutput = pkg: pkg.library { withSource = true; };
+    expectedTree = ''
+      `-- lib
+          `-- idris2-0.7.0
+              `-- pkg-0
+                  |-- 2023090800
+                  |   |-- Main.ttc
+                  |   `-- Main.ttm
+                  |-- Main.idr
+                  `-- pkg.ipkg
+
+      5 directories, 4 files'';
+  };
+
+  buildLibraryWithSourceRetroactively = testBuildIdris {
+    testName = "library-with-source-retro-package";
+    buildIdrisArgs = {
+      ipkgName = "pkg";
+      idrisLibraries = [ idris2Packages.idris2Api ];
+      src = runCommand "library-package-src" { } ''
+        mkdir $out
+
+        cat > $out/Main.idr <<EOF
+        module Main
+
+        import Compiler.ANF -- from Idris2Api
+
+        hello : String
+        hello = "world"
+        EOF
+
+        cat > $out/pkg.ipkg <<EOF
+        package pkg
+        modules = Main
+        depends = idris2
+        EOF
+      '';
+    };
+    transformBuildIdrisOutput = pkg: pkg.library'.withSource;
+    expectedTree = ''
+      `-- lib
+          `-- idris2-0.7.0
+              `-- pkg-0
+                  |-- 2023090800
+                  |   |-- Main.ttc
+                  |   `-- Main.ttm
+                  |-- Main.idr
+                  `-- pkg.ipkg
+
+      5 directories, 4 files'';
+  };
+
   buildExecutable = testBuildIdris {
     testName = "executable-package";
     buildIdrisArgs = {
@@ -176,7 +253,7 @@ in
         EOF
       '';
     };
-    makeExecutable = true;
+    transformBuildIdrisOutput = pkg: pkg.executable;
     expectedTree = ''
       `-- bin
           `-- mypkg

pkgs/development/compilers/scala/2.x.nix

@@ -18,18 +18,6 @@ let
   repo = "git@github.com:scala/scala.git";
 
   versionMap = {
-    "2.10" = {
-      version = "2.10.7";
-      hash = "sha256-koMRmRb2u3cU4HaihAzPItWIGbNVIo7RWRrm92kp8RE=";
-      pname = "scala_2_10";
-    };
-
-    "2.11" = {
-      version = "2.11.12";
-      hash = "sha256-sR19M2mcpPYLw7K2hY/ZU+PeK4UiyUP0zaS2dDFhlqg=";
-      pname = "scala_2_11";
-    };
-
     "2.12" = {
       version = "2.12.18";
       hash = "sha256-naIJCET+YPrbXln39F9aU3DBdnjcn7PYMmhDxETOA5g=";

pkgs/development/compilers/scala/bare.nix

@@ -8,12 +8,12 @@
 }:
 
 stdenv.mkDerivation (finalAttrs: {
-  version = "3.3.3";
+  version = "3.3.4";
   pname = "scala-bare";
 
   src = fetchurl {
     url = "https://github.com/scala/scala3/releases/download/${finalAttrs.version}/scala3-${finalAttrs.version}.tar.gz";
-    hash = "sha256-61lAETEvqkEqr5pbDltFkh+Qvp+EnCDilXN9X67NFNE=";
+    hash = "sha256-/Q7KKe8fbEGHS2cR57ZRTx3Hw4fAh3QvuHP25yCWN3A=";
   };
 
   propagatedBuildInputs = [

pkgs/development/python-modules/astropy/default.nix

@@ -1,10 +1,12 @@
 {
   lib,
   fetchPypi,
+  fetchpatch,
   buildPythonPackage,
   pythonOlder,
 
   # build time
+  stdenv,
   cython,
   extension-helpers,
   setuptools,
@@ -42,7 +44,6 @@
 
   # testing
   pytestCheckHook,
-  stdenv,
   pytest-xdist,
   pytest-astropy-header,
   pytest-astropy,
@@ -55,12 +56,18 @@ buildPythonPackage rec {
   version = "7.0.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.10";
+  disabled = pythonOlder "3.11";
 
   src = fetchPypi {
     inherit pname version;
     hash = "sha256-6S18n+6G6z34cU5d1Bu/nxY9ND4aGD2Vv2vQnkMTyUA=";
   };
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/astropy/astropy/commit/13b89edc9acd6d5f12eea75983084c57cb458130.patch";
+      hash = "sha256-2MgmW4kKBrZnTE1cjYYLOH5hStv5Q6tv4gN4sPSLBpM=";
+    })
+  ];
 
   env = lib.optionalAttrs stdenv.cc.isClang {
     NIX_CFLAGS_COMPILE = "-Wno-error=unused-command-line-argument";
@@ -132,35 +139,21 @@ buildPythonPackage rec {
 
   __darwinAllowLocalNetworking = true;
 
-  # Not running it inside the build directory. See:
-  # https://github.com/astropy/astropy/issues/15316#issuecomment-1722190547
   preCheck = ''
-    cd "$out"
     export HOME="$(mktemp -d)"
     export OMP_NUM_THREADS=$(( $NIX_BUILD_CORES / 4 ))
+    # See https://github.com/astropy/astropy/issues/17649 and see
+    # --hypothesis-profile=ci pytest flag below.
+    cp conftest.py $out/
+    # https://github.com/NixOS/nixpkgs/issues/255262
+    cd "$out"
+  '';
+  pytestFlagsArray = [
+    "--hypothesis-profile=ci"
+  ];
+  postCheck = ''
+    rm conftest.py
   '';
-
-  disabledTests = [
-    # tests for all availability of all optional deps
-    "test_basic_testing_completeness"
-    "test_all_included"
-
-    # May fail due to parallelism, see:
-    # https://github.com/astropy/astropy/issues/15441
-    "TestUnifiedOutputRegistry"
-
-    # flaky
-    "test_timedelta_conversion"
-    # More flaky tests, see: https://github.com/NixOS/nixpkgs/issues/294392
-    "test_sidereal_lon_independent"
-    "test_timedelta_full_precision_arithmetic"
-    "test_datetime_to_timedelta"
-
-    "test_datetime_difference_agrees_with_timedelta_no_hypothesis"
-
-    # SAMPProxyError 1: 'Timeout expired!'
-    "TestStandardProfile.test_main"
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "test_sidereal_lat_independent" ];
 
   meta = {
     description = "Astronomy/Astrophysics library for Python";

pkgs/development/python-modules/coffea/default.nix

@@ -98,9 +98,14 @@ buildPythonPackage rec {
     # https://github.com/CoffeaTeam/coffea/issues/1094
     "test_lumimask"
 
-    # Flaky: FileNotFoundError: [Errno 2] No such file or directory: 'nminusone.npz'
+    # Flaky: FileNotFoundError: [Errno 2] No such file or directory
     # https://github.com/scikit-hep/coffea/issues/1246
-    "test_packed_selection_nminusone_dak"
+    "test_packed_selection_cutflow_dak" # cutflow.npz
+    "test_packed_selection_nminusone_dak" # nminusone.npz
+
+    # AssertionError: bug in Awkward Array: attempt to convert TypeTracerArray into a concrete array
+    "test_apply_to_fileset"
+    "test_lorentz_behavior"
   ];
 
   __darwinAllowLocalNetworking = true;

pkgs/development/python-modules/cohere/default.nix

@@ -10,7 +10,6 @@
   fastavro,
   httpx,
   httpx-sse,
-  parameterized,
   pydantic,
   pydantic-core,
   requests,
@@ -21,14 +20,14 @@
 
 buildPythonPackage rec {
   pname = "cohere";
-  version = "5.13.6";
+  version = "5.13.11";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "cohere-ai";
     repo = "cohere-python";
     tag = version;
-    hash = "sha256-LfEHyZT/x8cIXN9eMpMTVoY22uPNaBCMfw5Y9rI7WGk=";
+    hash = "sha256-vDf5EoXCnYJhPnn9uj9L2cAnj7z1HVG1KxtxXByjwt8=";
   };
 
   build-system = [ poetry-core ];
@@ -37,7 +36,6 @@ buildPythonPackage rec {
     fastavro
     httpx
     httpx-sse
-    parameterized
     pydantic
     pydantic-core
     requests

pkgs/development/python-modules/datasette/default.nix

@@ -73,6 +73,7 @@ buildPythonPackage rec {
     platformdirs
     pluggy
     pyyaml
+    setuptools
     typing-extensions
     uvicorn
   ];

pkgs/development/python-modules/keras-applications/default.nix

@@ -1,37 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchPypi,
-  numpy,
-  h5py,
-}:
-
-buildPythonPackage rec {
-  pname = "keras-applications";
-  version = "1.0.8";
-
-  src = fetchPypi {
-    pname = "Keras_Applications";
-    inherit version;
-    sha256 = "5579f9a12bcde9748f4a12233925a59b93b73ae6947409ff34aa2ba258189fe5";
-  };
-
-  # Cyclic dependency: keras-applications requires keras, which requires keras-applications
-  postPatch = ''
-    sed -i "s/keras>=[^']*//" setup.py
-  '';
-
-  # No tests in PyPI tarball
-  doCheck = false;
-
-  propagatedBuildInputs = [
-    numpy
-    h5py
-  ];
-
-  meta = with lib; {
-    description = "Reference implementations of popular deep learning models";
-    homepage = "https://github.com/keras-team/keras-applications";
-    license = licenses.mit;
-  };
-}

pkgs/development/python-modules/keras-preprocessing/default.nix

@@ -1,49 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchPypi,
-  numpy,
-  six,
-  scipy,
-  pillow,
-  pytest,
-  keras,
-}:
-
-buildPythonPackage rec {
-  pname = "keras-preprocessing";
-  version = "1.1.2";
-
-  src = fetchPypi {
-    pname = "Keras_Preprocessing";
-    inherit version;
-    sha256 = "add82567c50c8bc648c14195bf544a5ce7c1f76761536956c3d2978970179ef3";
-  };
-
-  propagatedBuildInputs = [
-    # required
-    numpy
-    six
-    # optional
-    scipy
-    pillow
-  ];
-
-  nativeCheckInputs = [
-    pytest
-    keras
-  ];
-
-  checkPhase = ''
-    py.test tests/
-  '';
-
-  # Cyclic dependency: keras-preprocessing's tests require Keras, which requires keras-preprocessing
-  doCheck = false;
-
-  meta = with lib; {
-    description = "Easy data preprocessing and data augmentation for deep learning models";
-    homepage = "https://github.com/keras-team/keras-preprocessing";
-    license = licenses.mit;
-  };
-}

pkgs/development/python-modules/manim-slides/default.nix

@@ -10,12 +10,12 @@
   ffmpeg,
 
   av,
+  beautifulsoup4,
   click,
   click-default-group,
   jinja2,
   lxml,
   numpy,
-  opencv-python,
   pillow,
   pydantic,
   pydantic-extra-types,
@@ -35,7 +35,7 @@
 }:
 buildPythonPackage rec {
   pname = "manim-slides";
-  version = "5.1.9";
+  version = "5.4.0";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -44,7 +44,7 @@ buildPythonPackage rec {
     owner = "jeertmans";
     repo = "manim-slides";
     tag = "v${version}";
-    hash = "sha256-M500u7x0jQqcqCd3RbS0CpI1nuwNs9URFlHPeGkiT7E=";
+    hash = "sha256-9BPBjTepb1CdCEk1j471NhndLG5Ai1P81VUV6msQPus=";
   };
 
   build-system = [
@@ -60,12 +60,12 @@ buildPythonPackage rec {
   dependencies =
     [
       av
+      beautifulsoup4
       click
       click-default-group
       jinja2
       lxml
       numpy
-      opencv-python
       pillow
       pydantic
       pydantic-extra-types
@@ -89,12 +89,12 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "manim_slides" ];
 
-  meta = with lib; {
+  meta = {
     changelog = "https://github.com/jeertmans/manim-slides/blob/${src.rev}/CHANGELOG.md";
     description = "Tool for live presentations using manim";
     homepage = "https://github.com/jeertmans/manim-slides";
-    license = licenses.mit;
+    license = lib.licenses.mit;
     mainProgram = "manim-slides";
-    maintainers = with maintainers; [ soispha ];
+    maintainers = with lib.maintainers; [ soispha ];
   };
 }

pkgs/development/python-modules/molecule/default.nix

@@ -23,14 +23,14 @@
 
 buildPythonPackage rec {
   pname = "molecule";
-  version = "24.12.0";
+  version = "25.1.0";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-ckP/WOC4FZqiz0ZbqWBdZX8dYUYXJkMHvvWzJRhGev4=";
+    hash = "sha256-09M0ZGXj5M+GFNtrCD41K2XHa74F5RGvhfv0L1lQrd4=";
   };
 
   nativeBuildInputs = [

pkgs/development/python-modules/tensorflow/bin.nix

@@ -29,8 +29,6 @@
   cudaPackages,
   zlib,
   python,
-  keras-applications,
-  keras-preprocessing,
   addDriverRunpath,
   astunparse,
   flatbuffers,
@@ -90,8 +88,6 @@ buildPythonPackage rec {
     wrapt
     tensorflow-estimator-bin
     tensorboard
-    keras-applications
-    keras-preprocessing
     h5py
   ] ++ lib.optional (!isPy3k) mock;
 

pkgs/development/python-modules/tensorflow/default.nix

@@ -22,7 +22,6 @@
   packaging,
   setuptools,
   wheel,
-  keras-preprocessing,
   google-pasta,
   opt-einsum,
   astunparse,
@@ -197,7 +196,6 @@ let
     google-pasta
     grpcio
     h5py
-    keras-preprocessing
     numpy
     opt-einsum
     packaging
@@ -652,7 +650,6 @@ buildPythonPackage {
     google-pasta
     grpcio
     h5py
-    keras-preprocessing
     numpy
     opt-einsum
     packaging

pkgs/development/python-modules/unstructured-inference/default.nix

@@ -23,14 +23,14 @@
 
 buildPythonPackage rec {
   pname = "unstructured-inference";
-  version = "0.8.1";
+  version = "0.8.5";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "Unstructured-IO";
     repo = "unstructured-inference";
     tag = version;
-    hash = "sha256-U4mB3A0a1el7lmzsqTzjDBxp6lA4RpsceUt0OVGYVG4=";
+    hash = "sha256-v5gYs6gXSDaGu7ygb4lCcg3kI96PHN6aPSYBMVVYtQk=";
   };
 
   propagatedBuildInputs =

pkgs/development/tools/build-managers/scala-cli/sources.json

@@ -1,21 +1,21 @@
 {
-  "version": "1.5.4",
+  "version": "1.6.1",
   "assets": {
     "aarch64-darwin": {
       "asset": "scala-cli-aarch64-apple-darwin.gz",
-      "sha256": "sha256-DnaNaBeNbCB5f2ul9YyJ5GCYmFX6588j04UTIeJFz6M="
+      "sha256": "0qvd3899bw19d7mavx5n50n3w5qry9jmzdyfmkql2r5xb8sb071z"
     },
     "aarch64-linux": {
       "asset": "scala-cli-aarch64-pc-linux.gz",
-      "sha256": "sha256-UZ7VTxfCatPsUdynohTGnxTOZiBJ07NXXULPBPT00YU="
+      "sha256": "1xmz5lb1d3k5jya3kk6bdymrdl1856gl95c4h736pramlc275277"
     },
     "x86_64-darwin": {
       "asset": "scala-cli-x86_64-apple-darwin.gz",
-      "sha256": "sha256-lLyfOWhrxGfUp3puwg01Cs4pIIfDCz+HGxvQ/MtnLYc="
+      "sha256": "12hgknbxvj2d193rap01qjqh1scl7a359rx4mcy5mvjb5ah977i6"
     },
     "x86_64-linux": {
       "asset": "scala-cli-x86_64-pc-linux.gz",
-      "sha256": "sha256-V8EqA60n7CxOlJ9FH27klfO8GCXwVw7oYtQ+Qg/zoMU="
+      "sha256": "1k6ym1ak097q0biwll3jajq86mi7wyvzmhp4wkia63vmnimgkdzz"
     }
   }
 }

pkgs/development/tools/buildah/default.nix

@@ -18,13 +18,13 @@
 
 buildGoModule rec {
   pname = "buildah";
-  version = "1.38.0";
+  version = "1.38.1";
 
   src = fetchFromGitHub {
     owner = "containers";
     repo = "buildah";
     rev = "v${version}";
-    hash = "sha256-avQdK7+kMrPc8rp/2nTiUC/ZTW8nUem9v3u0xsE0oGM=";
+    hash = "sha256-Pc+JHUkGeLRfzgQCrYzsdvLEYctqPCDweS2H/ky8ltA=";
   };
 
   outputs = [

pkgs/development/tools/misc/blackfire/php-probe.nix

@@ -16,47 +16,47 @@ let
   phpMajor = lib.versions.majorMinor php.version;
   inherit (stdenv.hostPlatform) system;
 
-  version = "1.92.30";
+  version = "1.92.32";
 
   hashes = {
     "x86_64-linux" = {
       system = "amd64";
       hash = {
-        "8.1" = "sha256-jUMiUtmv+6uwo2t1qiKnCb0WUyelULd5E4Lbjcp1M0Y=";
-        "8.2" = "sha256-ZITGC0065QoFEwYEmKDyZmCBOmxhZnUoWbYSBuQnf0E=";
-        "8.3" = "sha256-3GlAYpY8KeOHzdv+WbE6VPIvKgEDmqQfCt1Txe160tI=";
+        "8.1" = "sha256-oRd6PbBLOboH9EVRfZl5u71ZoVMFO4K/uftxlL/vm18=";
+        "8.2" = "sha256-95qBidNHIGLGCb3QbUIzBMHsRi2GTPhwAjJg+JTteDk=";
+        "8.3" = "sha256-8TO28o4YYFK1r2tInjXKenki/izHzZL0Dblaippekl8=";
       };
     };
     "i686-linux" = {
       system = "i386";
       hash = {
-        "8.1" = "sha256-uRaaN2pFFRvMyTfWH4kmzoItvdsK2F/elH+24E9PJl4=";
-        "8.2" = "sha256-bhK42K4ud9gwTGcepgmOAnHuqdhnFl5BVAVhnBO/7gE=";
-        "8.3" = "sha256-8/CymHXqfcC5ewZjvNOIaZelcq4YfLX5M+EJZkWpJFA=";
+        "8.1" = "sha256-mXJ1hO8NcODG7Wj3lQ+5lkSjcbkKLN5OOzcobigScKI=";
+        "8.2" = "sha256-P5fQTVfE/DvLD4E3kUPE+eeOM9YVNNixgWVRq3Ca5M4=";
+        "8.3" = "sha256-rMUv2EUlepBahMaEvs60i7RFTmaBe4P4qB1hcARqP9Y=";
       };
     };
     "aarch64-linux" = {
       system = "arm64";
       hash = {
-        "8.1" = "sha256-s/cLlOptINpFsiZxVdgupRhZC8qE+pASNLssJ0w032Q=";
-        "8.2" = "sha256-v+NBLaEMD22CX7DuhxqcWA0gaWsg51qhY8AorTzOV30=";
-        "8.3" = "sha256-9FZHvOuP5dgymgE1O12X7dH4Mk5TIm7nfK8+/lqET1k=";
+        "8.1" = "sha256-Tj7LHXS4m9hF9gY/9vfOQPJVP+vHM1h8XdBY9vyRhFo=";
+        "8.2" = "sha256-6kfotMptfVLPL414mr6LeJZ3ODnjepYQYnKvg4fHIAg=";
+        "8.3" = "sha256-M/GTdinOi3Em7GJOm1iUKkuDNg8La3iQpG+wGHp0ycE=";
       };
     };
     "aarch64-darwin" = {
       system = "arm64";
       hash = {
-        "8.1" = "sha256-oee6g+jpMT79xROeJngpSTk7jId4WMlrGpu4glCUu+I=";
-        "8.2" = "sha256-4oeYCScZK/x+GzcF3cqwuIxVJ/CZfVgD1RHdIlpB4B0=";
-        "8.3" = "sha256-BOQuR/uqiRtCVtq/OTiEWb1w7wJF1ikrjwEyOXnu6B0=";
+        "8.1" = "sha256-TZ6D8sTlLuM+8707ncECPNQlpySc7BYKIwSEth3MUT8=";
+        "8.2" = "sha256-4VJBo1TzEkstKo2ed9bxb/3g0JFjHlfTIfmDq2dCfUk=";
+        "8.3" = "sha256-gIIoRRNCed5cgbcFxvwXKgWZs4HgoOMCx6k0urVPxbs=";
       };
     };
     "x86_64-darwin" = {
       system = "amd64";
       hash = {
-        "8.1" = "sha256-tXfzioFSOlM65ZT5lxmr2xK/RipDjTR9pQdOZfDdgCU=";
-        "8.2" = "sha256-4iz9HQMjDoybwQJiDkdtt/MCQ3OeIz3x9rh9RZo1Zug=";
-        "8.3" = "sha256-ZLlRxfnDA9/AZmLH5kNofG/s3nlxj0rfh2oUgUG9Dyc=";
+        "8.1" = "sha256-tO52c8FKZXXgx7+0IGiwy5rPLEsU/5ji/c79wzb1S34=";
+        "8.2" = "sha256-eUkM5KzZLPK2hCnFqRN8eOwLiX54qXuLkdfxJdjuZTk=";
+        "8.3" = "sha256-CaRs3DI5TTHNSk91pqFaHt1OVQzGozATOUs7GNi8cqY=";
       };
     };
   };

pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.8

@@ -500,7 +500,7 @@ Builder options:
 .Fl K Ns ,
 .Fl -fallback Ns ,
 .Fl I Ns ,
-.Fl -option Ns
+.Fl -option Ns ,
 .Fl -repair Ns ,
 .Fl -builders Ns ,
 .Fl -accept-flake-config Ns ,

pkgs/test/overriding.nix

@@ -5,7 +5,7 @@
 }:
 
 let
-  tests = tests-stdenv // tests-go // tests-python;
+  tests = tests-stdenv // test-extendMkDerivation // tests-go // tests-python;
 
   tests-stdenv =
     let
@@ -64,6 +64,73 @@ let
       };
     };
 
+  test-extendMkDerivation =
+    let
+      mkLocalDerivation = lib.extendMkDerivation {
+        constructDrv = pkgs.stdenv.mkDerivation;
+        excludeDrvArgNames = [
+          "specialArg"
+        ];
+        extendDrvArgs =
+          finalAttrs:
+          {
+            preferLocalBuild ? true,
+            allowSubstitute ? false,
+            specialArg ? (_: false),
+            ...
+          }@args:
+          {
+            inherit preferLocalBuild allowSubstitute;
+            passthru = args.passthru or { } // {
+              greeting = if specialArg "Hi!" then "Hi!" else "Hello!";
+            };
+          };
+      };
+
+      helloLocalPlainAttrs = {
+        inherit (pkgs.hello) pname version src;
+        specialArg = throw "specialArg is broken.";
+      };
+
+      helloLocalPlain = mkLocalDerivation helloLocalPlainAttrs;
+
+      helloLocal = mkLocalDerivation (
+        finalAttrs:
+        helloLocalPlainAttrs
+        // {
+          passthru = pkgs.hello.passthru or { } // {
+            foo = "a";
+            bar = "${finalAttrs.passthru.foo}b";
+          };
+        }
+      );
+
+      hiLocal = mkLocalDerivation (
+        helloLocalPlainAttrs
+        // {
+          specialArg = s: lib.stringLength s == 3;
+        }
+      );
+    in
+    {
+      extendMkDerivation-helloLocal-imp-arguments = {
+        expr = helloLocal.preferLocalBuild;
+        expected = true;
+      };
+      extendMkDerivation-helloLocal-plain-equivalence = {
+        expr = helloLocal.drvPath == helloLocalPlain.drvPath;
+        expected = true;
+      };
+      extendMkDerivation-helloLocal-finalAttrs = {
+        expr = helloLocal.bar == "ab";
+        expected = true;
+      };
+      extendMkDerivation-helloLocal-specialArg = {
+        expr = hiLocal.greeting == "Hi!";
+        expected = true;
+      };
+    };
+
   tests-go =
     let
       pet_0_3_4 = pkgs.buildGoModule rec {
@@ -194,6 +261,7 @@ let
         expected = true;
       };
     };
+
 in
 
 stdenvNoCC.mkDerivation {

pkgs/tools/misc/opentelemetry-collector/builder.nix

@@ -7,13 +7,13 @@ buildGoModule rec {
   pname = "ocb";
   # Also update `pkgs/tools/misc/opentelemetry-collector/releases.nix`
   # whenever that version changes.
-  version = "0.116.0";
+  version = "0.118.0";
 
   src = fetchFromGitHub {
     owner = "open-telemetry";
     repo = "opentelemetry-collector";
     rev = "cmd/builder/v${version}";
-    hash = "sha256-1wFLeRbiNytPEe262TEhBrAOLUkbsdLzKYngN2S3O4E=";
+    hash = "sha256-dx60Ai+IBF0lzAj73LqMm1oeP0o5FI9B7n+dk5vBloc=";
   };
 
   sourceRoot = "${src.name}/cmd/builder";

pkgs/top-level/all-packages.nix

@@ -6746,8 +6746,6 @@ with pkgs;
   rustup-toolchain-install-master = callPackage ../development/tools/rust/rustup-toolchain-install-master {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
-  scala_2_10 = callPackage ../development/compilers/scala/2.x.nix { majorVersion = "2.10"; jre = jdk8; };
-  scala_2_11 = callPackage ../development/compilers/scala/2.x.nix { majorVersion = "2.11"; jre = jdk8; };
   scala_2_12 = callPackage ../development/compilers/scala/2.x.nix { majorVersion = "2.12"; };
   scala_2_13 = callPackage ../development/compilers/scala/2.x.nix { majorVersion = "2.13"; };
   scala_3 = callPackage ../development/compilers/scala { };

pkgs/top-level/python-aliases.nix

@@ -328,6 +328,8 @@ mapAliases ({
   Kajiki = kajiki; # added 2023-02-19
   keepkey_agent = keepkey-agent; # added 2024-01-06
   Keras = keras; # added 2021-11-25
+  keras-applications = throw "keras-applications has been removed because it's abandoned since 2022"; # added 2025-01-12
+  keras-preprocessing = throw "keras-preprocessing has been removed because it's abandoned since 2024"; # added 2025-01-12
   keyring_24 = throw "keyring_24 has been removed, use keyring instead"; # added 2025-01-01
   ldap = python-ldap; # added 2022-09-16
   lammps-cython = throw "lammps-cython no longer builds and is unmaintained"; # added 2021-07-04
@@ -433,6 +435,7 @@ mapAliases ({
   pdfx = throw "pdfx has been removed because the upstream repository was archived in 2023"; # Added 2024-10-04
   pep257 = pydocstyle; # added 2022-04-12
   pillow-simd = throw "pillow-simd has been removed for lagging behind pillow upstream, which exposes it to various security issues."; # Added 2024-10-24
+  pipenv-poetry-migrate = throw "pipenv-poetry-migrate was promoted to a top-level attribute"; # added 2025-01-14
   pixelmatch = "pixelmatch has been removed as it was unmaintained"; # Added 2024-08-18
   pkutils = throw "pkutils was removed as it was unused and is not applicable to modern Python build tools"; # added 2024-07-28
   poetry = throw "poetry was promoted to a top-level attribute, use poetry-core to build Python packages"; # added 2023-01-09

pkgs/top-level/python-packages.nix

@@ -6971,12 +6971,8 @@ self: super: with self; {
 
   keke = callPackage ../development/python-modules/keke { };
 
-  keras-applications = callPackage ../development/python-modules/keras-applications { };
-
   keras = callPackage ../development/python-modules/keras { };
 
-  keras-preprocessing = callPackage ../development/python-modules/keras-preprocessing { };
-
   kerberos = callPackage ../development/python-modules/kerberos { };
 
   kestra = callPackage ../development/python-modules/kestra { };
@@ -10469,8 +10465,6 @@ self: super: with self; {
 
   pipe = callPackage ../development/python-modules/pipe { };
 
-  pipenv-poetry-migrate = callPackage ../development/python-modules/pipenv-poetry-migrate { };
-
   piper-phonemize = callPackage ../development/python-modules/piper-phonemize {
     onnxruntime-native = pkgs.onnxruntime;
     piper-phonemize-native = pkgs.piper-phonemize;