Merge master into staging-next

maintainers/maintainer-list.nix

@@ -7353,7 +7353,7 @@
   };
   getpsyched = {
     name = "Priyanshu Tripathi";
-    email = "priyanshu@getpsyched.dev";
+    email = "nixos@getpsyched.dev";
     matrix = "@getpsyched:matrix.org";
     github = "getpsyched";
     githubId = 43472218;
@@ -20101,6 +20101,12 @@
     githubId = 29044;
     name = "Jacek Galowicz";
   };
+  tfkhdyt = {
+    email = "tfkhdyt@proton.me";
+    name = "Taufik Hidayat";
+    github = "tfkhdyt";
+    githubId = 47195537;
+  };
   tfmoraes = {
     name = "Thiago Franco de Moraes";
     github = "tfmoraes";

nixos/modules/services/misc/radicle.nix

@@ -119,7 +119,8 @@ in
       enable = mkEnableOption "Radicle Seed Node";
       package = mkPackageOption pkgs "radicle-node" { };
       privateKeyFile = mkOption {
-        type = types.path;
+        # Note that a key encrypted by systemd-creds is not a path but a str.
+        type = with types; either path str;
         description = ''
           Absolute file path to an SSH private key,
           usually generated by `rad auth`.

pkgs/applications/editors/vim/plugins/generated.nix

@@ -4618,18 +4618,6 @@ final: prev:
     meta.homepage = "https://github.com/mrcjkb/haskell-snippets.nvim/";
   };
 
-  haskell-tools-nvim = buildNeovimPlugin {
-    pname = "haskell-tools.nvim";
-    version = "2024-07-14";
-    src = fetchFromGitHub {
-      owner = "MrcJkb";
-      repo = "haskell-tools.nvim";
-      rev = "b003e20e99aa79bfec7c632e5ab817e1c10c8036";
-      sha256 = "18gjqnf66nxq76bcb0icihyplmzs0nwav6qpxmszqm05cm1m8l30";
-    };
-    meta.homepage = "https://github.com/MrcJkb/haskell-tools.nvim/";
-  };
-
   haskell-vim = buildVimPlugin {
     pname = "haskell-vim";
     version = "2021-01-19";

pkgs/applications/editors/vim/plugins/overrides.nix

@@ -844,6 +844,8 @@
     dependencies = with self; [ nvim-treesitter ];
   };
 
+  haskell-tools-nvim = neovimUtils.buildNeovimPlugin { luaAttr = "haskell-tools-nvim"; };
+
   hex-nvim = super.hex-nvim.overrideAttrs {
     postPatch = ''
       substituteInPlace lua/hex.lua --replace xxd ${xxd}/bin/xxd

pkgs/applications/editors/vim/plugins/vim-plugin-names

@@ -386,7 +386,6 @@ https://github.com/ThePrimeagen/harpoon/,master,
 https://github.com/ThePrimeagen/harpoon/,harpoon2,harpoon2
 https://github.com/kiyoon/haskell-scope-highlighting.nvim/,HEAD,
 https://github.com/mrcjkb/haskell-snippets.nvim/,HEAD,
-https://github.com/MrcJkb/haskell-tools.nvim/,HEAD,
 https://github.com/neovimhaskell/haskell-vim/,,
 https://github.com/wenzel-hoffman/haskell-with-unicode.vim/,HEAD,
 https://github.com/travitch/hasksyn/,,

pkgs/applications/kde/kdenlive/default.nix

@@ -82,7 +82,6 @@ mkDerivation {
     kpurpose
     kdeclarative
     wrapGAppsHook3
-    glaxnimate
   ];
 
   # Both MLT and FFMpeg paths must be set or Kdenlive will complain that it

pkgs/applications/radio/qdmr/default.nix

@@ -21,13 +21,13 @@ in
 
 stdenv.mkDerivation rec {
   pname = "qdmr";
-  version = "0.11.3";
+  version = "0.12.0";
 
   src = fetchFromGitHub {
     owner = "hmatuschek";
     repo = "qdmr";
     rev = "v${version}";
-    hash = "sha256-YLGsKGcKIPd0ihd5IzlT71dYkxZfeH7BpnKQMEyY8dI=";
+    hash = "sha256-8NV0+M9eMcvkP3UERDkaimbapTKxB4rYRLbHZjzG4Ws=";
   };
 
   nativeBuildInputs = [

pkgs/by-name/ar/argc/package.nix

@@ -4,6 +4,7 @@
   pkgsCross,
   rustPlatform,
   stdenv,
+  glibcLocales,
   fetchFromGitHub,
   installShellFiles,
 }:
@@ -13,16 +14,16 @@ let
 in
 rustPlatform.buildRustPackage rec {
   pname = "argc";
-  version = "1.14.0";
+  version = "1.19.0";
 
   src = fetchFromGitHub {
     owner = "sigoden";
     repo = "argc";
     rev = "v${version}";
-    hash = "sha256-Li/K5/SLG6JuoRJDz2DQoj1Oi9LQgZWHNvtZ1HVbj88=";
+    hash = "sha256-I5dx0/aHCGmzgAEBL9gZcG7DFWCkSpndGvv2enQIZGU=";
   };
 
-  cargoHash = "sha256-D1T9FWTvwKtAYoqFlR2OmLRLGWhPJ9D8J7lq/QKcBoM=";
+  cargoHash = "sha256-30BY6ceJj0UeZE30O/LovR+YXSd7jIxFo6ojKFuecFM=";
 
   nativeBuildInputs = [ installShellFiles ] ++ lib.optional (!canExecuteHost) buildPackages.argc;
 
@@ -37,6 +38,14 @@ rustPlatform.buildRustPackage rec {
 
   disallowedReferences = lib.optional (!canExecuteHost) buildPackages.argc;
 
+  env =
+    {
+      LANG = "C.UTF-8";
+    }
+    // lib.optionalAttrs (glibcLocales != null) {
+      LOCALE_ARCHIVE = "${glibcLocales}/lib/locale/locale-archive";
+    };
+
   passthru = {
     tests = {
       cross =

pkgs/by-name/ga/gapless/package.nix

@@ -14,15 +14,15 @@
 , wrapGAppsHook4
 }:
 stdenv.mkDerivation (finalAttrs: {
-  pname = "g4music";
-  version = "3.7.2";
+  pname = "gapless";
+  version = "3.8";
 
   src = fetchFromGitLab {
     domain = "gitlab.gnome.org";
     owner = "neithern";
     repo = "g4music";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-fG8OBAzdCdr3Yo8Vei93HlNa2TIL5gxWG+0jFYjSDZ8=";
+    hash = "sha256-AZoMAbQ3foW2jx+mBam925a8ykMtGvaiVg9N8/Ggny0=";
   };
 
   nativeBuildInputs = [
@@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: {
     mainProgram = "g4music";
     homepage = "https://gitlab.gnome.org/neithern/g4music";
     license = licenses.gpl3Only;
-    maintainers = with maintainers; [ magnouvean ];
+    maintainers = with maintainers; [ aleksana ];
     platforms = platforms.linux;
   };
 })

pkgs/by-name/li/live-server/package.nix

@@ -0,0 +1,45 @@
+{
+  lib,
+  stdenv,
+  rustPlatform,
+  fetchFromGitHub,
+  darwin,
+  openssl,
+  pkg-config,
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "live-server";
+  version = "0.7.0";
+
+  src = fetchFromGitHub {
+    owner = "lomirus";
+    repo = "live-server";
+    rev = "v${version}";
+    hash = "sha256-BSAsD9nRlHaTDbBpLBxN9OOQ9SekRwQeYUWV1CZO4oY=";
+  };
+
+  cargoHash = "sha256-RwueYpa/CMriSOWwGZhkps6jHmqOdRuz+ECRq/ThPs0=";
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs =
+    [ openssl ]
+    ++ lib.optionals stdenv.isDarwin (
+      with darwin.apple_sdk.frameworks;
+      [
+        CoreServices
+        SystemConfiguration
+      ]
+    );
+
+  meta = with lib; {
+    description = "Local network server with live reload feature for static pages";
+    downloadPage = "https://github.com/lomirus/live-server/releases";
+    homepage = "https://github.com/lomirus/live-server";
+    license = licenses.mit;
+    mainProgram = "live-server";
+    maintainers = [ maintainers.philiptaron ];
+    platforms = platforms.unix;
+  };
+}

pkgs/by-name/ur/urban-cli/package.nix

@@ -0,0 +1,32 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+}:
+
+buildGoModule rec {
+  pname = "urban-cli";
+  version = "0.2.4";
+
+  src = fetchFromGitHub {
+    owner = "tfkhdyt";
+    repo = "urban-cli";
+    rev = "v${version}";
+    hash = "sha256-URTEhtOiwb3IDyjRUtUmVTaeDXw4Beg0woWdGxeq098=";
+  };
+
+  vendorHash = "sha256-fEZzX+ecSWKITXczcwm5BGw5OWuixa4XKrEx8z0pxXQ=";
+
+  ldflags = [
+    "-s"
+    "-w"
+  ];
+
+  meta = {
+    description = "Blazingly fast command line interface for Urban Dictionary";
+    homepage = "https://github.com/tfkhdyt/urban-cli";
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ tfkhdyt ];
+    mainProgram = "urban-cli";
+  };
+}

pkgs/data/fonts/font-awesome/default.nix

@@ -1,35 +1,48 @@
-{ lib, stdenvNoCC, fetchFromGitHub }:
+{
+  lib,
+  stdenvNoCC,
+  fetchFromGitHub,
+}:
 let
-  font-awesome = { version, hash, rev ? version }: stdenvNoCC.mkDerivation {
-    pname = "font-awesome";
-    inherit version;
+  font-awesome =
+    {
+      version,
+      hash,
+      rev ? version,
+    }:
+    stdenvNoCC.mkDerivation {
+      pname = "font-awesome";
+      inherit version;
 
-    src = fetchFromGitHub {
-      owner = "FortAwesome";
-      repo = "Font-Awesome";
-      inherit rev hash;
-    };
+      src = fetchFromGitHub {
+        owner = "FortAwesome";
+        repo = "Font-Awesome";
+        inherit rev hash;
+      };
 
-    installPhase = ''
-      runHook preInstall
+      installPhase = ''
+        runHook preInstall
 
-      install -m444 -Dt $out/share/fonts/opentype {fonts,otfs}/*.otf
+        install -m444 -Dt $out/share/fonts/opentype {fonts,otfs}/*.otf
 
-      runHook postInstall
-    '';
-
-    meta = with lib; {
-      description = "Font Awesome - OTF font";
-      longDescription = ''
-        Font Awesome gives you scalable vector icons that can instantly be customized.
-        This package includes only the OTF font. For full CSS etc. see the project website.
+        runHook postInstall
       '';
-      homepage = "https://fontawesome.com/";
-      license = licenses.ofl;
-      platforms = platforms.all;
-      maintainers = with maintainers; [ abaldeau johnazoidberg ];
+
+      meta = with lib; {
+        description = "Font Awesome - OTF font";
+        longDescription = ''
+          Font Awesome gives you scalable vector icons that can instantly be customized.
+          This package includes only the OTF font. For full CSS etc. see the project website.
+        '';
+        homepage = "https://fontawesome.com/";
+        license = licenses.ofl;
+        platforms = platforms.all;
+        maintainers = with maintainers; [
+          abaldeau
+          johnazoidberg
+        ];
+      };
     };
-  };
 in
 {
   # Keeping version 4 and 5 because version 6 is incompatible for some icons. That
@@ -48,7 +61,7 @@ in
     hash = "sha256-gd23ZplNY56sm1lfkU3kPXUOmNmY5SRnT0qlQZRNuBo=";
   };
   v6 = font-awesome {
-    version = "6.5.2";
-    hash = "sha256-kUa/L/Krxb5v8SmtACCSC6CI3qTTOTr4Ss/FMRBlKuw=";
+    version = "6.6.0";
+    hash = "sha256-tQ9Hxph5YiPZMiO9gs2HCkRJ8cdECa2swgS++cytEnM=";
   };
 }

pkgs/development/libraries/dqlite/default.nix

@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   pname = "dqlite";
-  version = "1.16.5";
+  version = "1.16.6";
 
   src = fetchFromGitHub {
     owner = "canonical";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-dk4OEQuADPMfdfAmrgA36Bdzo6qm5Ak4/Rw/L9C75a0=";
+    hash = "sha256-NtBEhtK6PysRqCUNcbFvPMBEmDR9WWJkWdFdzTOKt/8=";
   };
 
   nativeBuildInputs = [ autoreconfHook file pkg-config ];

pkgs/development/lua-modules/generated-packages.nix

@@ -620,14 +620,14 @@ buildLuarocksPackage {
 haskell-tools-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder }:
 buildLuarocksPackage {
   pname = "haskell-tools.nvim";
-  version = "3.1.10-1";
+  version = "4.0.0-1";
   knownRockspec = (fetchurl {
-    url    = "mirror://luarocks/haskell-tools.nvim-3.1.10-1.rockspec";
-    sha256 = "0s7haq3l29b26x9yj88j4xh70gm9bnnqn4q7qnkrwand3bj9m48q";
+    url    = "mirror://luarocks/haskell-tools.nvim-4.0.0-1.rockspec";
+    sha256 = "1iz7bgy7a0zclsg31rmf6hcrjxnikhqwzh5blirif3m9bdi9mv6v";
   }).outPath;
   src = fetchzip {
-    url    = "https://github.com/mrcjkb/haskell-tools.nvim/archive/3.1.10.zip";
-    sha256 = "1cxfv2f4vvkqmx1k936k476mxsy1yn85blg0qyfsjfagca25ymmv";
+    url    = "https://github.com/mrcjkb/haskell-tools.nvim/archive/4.0.0.zip";
+    sha256 = "0k6kw42n4c2hc7mqjv8ahwcwqia7wdgmszy1np96sc9dd0bkiqx9";
   };
 
   disabled = luaOlder "5.1";

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

@@ -0,0 +1,49 @@
+{
+  buildPythonPackage,
+  fetchFromGitHub,
+  git,
+  hatch-vcs,
+  lib,
+  manifestoo-core,
+  pytestCheckHook,
+  pythonOlder,
+  tomli,
+  wheel,
+}:
+
+buildPythonPackage rec {
+  pname = "whool";
+  version = "1.0.1";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "sbidoul";
+    repo = "whool";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-skJoMDIgZgRjfp4tsc6TKYVe09XBvg8Fk2BQfqneCYI=";
+  };
+
+  build-system = [ hatch-vcs ];
+
+  dependencies = [
+    manifestoo-core
+    wheel
+  ] ++ lib.optionals (pythonOlder "3.11") [ tomli ];
+
+  pythonImportsCheck = [ "whool" ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    git
+  ];
+
+  setupHook = ./setup-hook.sh;
+
+  meta = {
+    description = "Standards-compliant Python build backend to package Odoo addons";
+    homepage = "https://github.com/sbidoul/whool";
+    changelog = "https://github.com/sbidoul/whool/blob/${version}/CHANGELOG.md";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.yajo ];
+  };
+}

pkgs/development/python-modules/whool/setup-hook.sh

@@ -0,0 +1,16 @@
+# Avoid using git to auto-bump the addon version
+# DOCS https://github.com/sbidoul/whool/?tab=readme-ov-file#configuration
+whool-post-version-strategy-hook() {
+    # DOCS https://stackoverflow.com/a/13864829/1468388
+    if [ -z ${WHOOL_POST_VERSION_STRATEGY_OVERRIDE+x} ]; then
+        echo Setting WHOOL_POST_VERSION_STRATEGY_OVERRIDE to none
+        export WHOOL_POST_VERSION_STRATEGY_OVERRIDE=none
+    fi
+
+    # Make sure you can import the built addon
+    for manifest in $(find -L . -name __manifest__.py); do
+        export pythonImportsCheck="$pythonImportsCheck odoo.addons.$(basename $(dirname $(realpath $manifest)))"
+    done
+}
+
+preBuildHooks+=(whool-post-version-strategy-hook)

pkgs/development/tools/gnulib/default.nix

@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromSavannah, python3 }:
+{ lib, stdenv, fetchFromSavannah, python3, perl }:
 
 stdenv.mkDerivation rec {
   pname = "gnulib";
@@ -12,6 +12,8 @@ stdenv.mkDerivation rec {
 
   postPatch = ''
     patchShebangs gnulib-tool.py
+    substituteInPlace build-aux/{prefix-gnulib-mk,useless-if-before-free,update-copyright,gitlog-to-changelog,announce-gen} \
+    --replace-fail 'exec perl' 'exec ${lib.getExe perl}'
   '';
 
   buildInputs = [ python3 ];

pkgs/development/tools/rust/cargo-public-api/default.nix

@@ -10,14 +10,14 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-public-api";
-  version = "0.36.0";
+  version = "0.37.0";
 
   src = fetchCrate {
     inherit pname version;
-    hash = "sha256-Umxkm+GCXsb60l9Gq417cynoy7D30Hlh6r04HoWGVPA=";
+    hash = "sha256-BwCqGQJpFjrZtQpjZ7FIIUfIaIXBTJWDzjZoktSa2Zg=";
   };
 
-  cargoHash = "sha256-Aj9SykzdAZJSw8wQ5QHLhtWaxo2tnjjdJZnPIp3fsVw=";
+  cargoHash = "sha256-McqRVfTX8z3NkkIvp3jqJlhtOhOGdcahTghDCMY2E6c=";
 
   nativeBuildInputs = [ pkg-config ];
 

pkgs/kde/gear/kdenlive/default.nix

@@ -36,7 +36,6 @@ mkKdeDerivation {
     mlt
     shared-mime-info
     libv4l
-    glaxnimate
   ];
 
   qtWrapperArgs = [

pkgs/servers/monitoring/grafana/default.nix

@@ -6,19 +6,9 @@
 , faketty
 }:
 
-let
-  # Grafana seems to just set it to the latest version available
-  # nowadays.
-  patchGoVersion = ''
-    substituteInPlace go.{mod,work} pkg/build/wire/go.mod \
-      --replace-fail "go 1.22.4" "go 1.22.3"
-    substituteInPlace Makefile \
-      --replace-fail "GO_VERSION = 1.22.4" "GO_VERSION = 1.22.3"
-  '';
-in
 buildGoModule rec {
   pname = "grafana";
-  version = "11.1.0";
+  version = "11.1.3";
 
   subPackages = [ "pkg/cmd/grafana" "pkg/cmd/grafana-server" "pkg/cmd/grafana-cli" ];
 
@@ -26,7 +16,7 @@ buildGoModule rec {
     owner = "grafana";
     repo = "grafana";
     rev = "v${version}";
-    hash = "sha256-iTTT10YN8jBT4/ukGXNK1QHcyzXnAqg2LiFtNiwnENw=";
+    hash = "sha256-PfkKBKegMk+VjVJMocGj+GPTuUJipjD8+857skwmoco=";
   };
 
   # borrowed from: https://github.com/NixOS/nixpkgs/blob/d70d9425f49f9aba3c49e2c389fe6d42bac8c5b0/pkgs/development/tools/analysis/snyk/default.nix#L20-L22
@@ -46,9 +36,6 @@ buildGoModule rec {
       jq moreutils python3
     # @esfx/equatable@npm:1.0.2 fails to build on darwin as it requires `xcbuild`
     ] ++ lib.optionals stdenv.isDarwin [ xcbuild.xcbuild ];
-    postPatch = ''
-      ${patchGoVersion}
-    '';
     buildPhase = ''
       runHook preBuild
       export HOME="$(mktemp -d)"
@@ -73,17 +60,13 @@ buildGoModule rec {
 
   disallowedRequisites = [ offlineCache ];
 
-  vendorHash = "sha256-Ny/SoelFVPvBBn50QpHcLTuVY3ynKbCegM1uQkJzB9Y=";
+  vendorHash = "sha256-vd3hb7+lmhQPTZO/Xqi59XSPGj5sd218xQAD1bRbUz8=";
 
   proxyVendor = true;
 
   nativeBuildInputs = [ wire yarn jq moreutils removeReferencesTo python3 faketty ]
     ++ lib.optionals stdenv.isDarwin [ xcbuild.xcbuild ];
 
-  postPatch = ''
-    ${patchGoVersion}
-  '';
-
   postConfigure = ''
     # Generate DI code that's required to compile the package.
     # From https://github.com/grafana/grafana/blob/v8.2.3/Makefile#L33-L35

pkgs/top-level/aliases.nix

@@ -486,6 +486,7 @@ mapAliases ({
 
   ### G ###
 
+  g4music = gapless; # Added 2024-07-26
   g4py = python3Packages.geant4; # Added 2020-06-06
   garage_0_7 = throw "garage 0.7.x has been removed as it is EOL. Please upgrade to 0.8 series."; # Added 2023-10-10
   garage_0_7_3 = throw "garage 0.7.x has been removed as it is EOL. Please upgrade to 0.8 series."; # Added 2023-10-10

pkgs/top-level/all-packages.nix

@@ -30861,8 +30861,6 @@ with pkgs;
 
   svox = callPackage ../applications/audio/svox { };
 
-  g4music = callPackage ../applications/audio/g4music { };
-
   genesys = callPackage ../applications/misc/genesys { };
 
   giada = callPackage ../applications/audio/giada { };

pkgs/top-level/python-packages.nix

@@ -17327,6 +17327,8 @@ self: super: with self; {
 
   whoisdomain = callPackage ../development/python-modules/whoisdomain { };
 
+  whool = callPackage ../development/python-modules/whool { };
+
   whoosh = callPackage ../development/python-modules/whoosh { };
 
   widgetsnbextension = callPackage ../development/python-modules/widgetsnbextension { };