summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--pkgs/applications/networking/browsers/firefox/packages/firefox.nix4
-rw-r--r--pkgs/by-name/na/navidrome/package.nix32
-rw-r--r--pkgs/by-name/uv/uv/package.nix6
3 files changed, 23 insertions, 19 deletions
diff --git a/pkgs/applications/networking/browsers/firefox/packages/firefox.nix b/pkgs/applications/networking/browsers/firefox/packages/firefox.nix
index a80c51af84d6..53921e0dbf90 100644
--- a/pkgs/applications/networking/browsers/firefox/packages/firefox.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages/firefox.nix
@@ -9,10 +9,10 @@
buildMozillaMach rec {
pname = "firefox";
- version = "147.0";
+ version = "147.0.1";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
- sha512 = "ac9017b1a2da7b2f139392c394c36341fd3476e3d4ea1a3c7e5e7bf100dc30d185132ef9256be7e6b0f9dbfc69234ac571ea1fc6db9d84543b15772f4ec85161";
+ sha512 = "f1e1bc486451254f33b000fb4513fd948a5a6e84841980ee767c42d326e1856f44a8437c8fdbff2cb34d177fea2b1907fcd72dd33bcec3f06ddb8d88151853a8";
};
meta = {
diff --git a/pkgs/by-name/na/navidrome/package.nix b/pkgs/by-name/na/navidrome/package.nix
index 53520301680e..d1529a52d775 100644
--- a/pkgs/by-name/na/navidrome/package.nix
+++ b/pkgs/by-name/na/navidrome/package.nix
@@ -1,10 +1,10 @@
{
- buildGo124Module,
+ buildGoModule,
buildPackages,
fetchFromGitHub,
fetchNpmDeps,
lib,
- nodejs,
+ nodejs_24,
npmHooks,
pkg-config,
stdenv,
@@ -14,32 +14,33 @@
nixosTests,
nix-update-script,
ffmpegSupport ? true,
+ versionCheckHook,
}:
-buildGo124Module rec {
+buildGoModule (finalAttrs: {
pname = "navidrome";
- version = "0.58.0";
+ version = "0.59.0";
src = fetchFromGitHub {
owner = "navidrome";
repo = "navidrome";
- rev = "v${version}";
- hash = "sha256-MwFACp2RKXz6zTzjknC5nKzaTEG1NWtvYggRZRiX5t0=";
+ rev = "v${finalAttrs.version}";
+ hash = "sha256-YXyNnjaLgu4FXvgsbbzCOZRIuN96h+KDrXmJe1607JI=";
};
- vendorHash = "sha256-CrZqVhvDYemnaCuveOXySqHZhW+nrgzdxaiJRuZfSaI=";
+ vendorHash = "sha256-FFtTQuXb5GYxZmUiNjZNO6K8QYF0TLH4JU2JmAzZhqQ=";
npmRoot = "ui";
npmDeps = fetchNpmDeps {
- inherit src;
- sourceRoot = "${src.name}/ui";
- hash = "sha256-tl6unHz0E0v0ObrfTiE0vZwVSyVFmrLggNM5QsUGsvI=";
+ inherit (finalAttrs) src;
+ sourceRoot = "${finalAttrs.src.name}/ui";
+ hash = "sha256-RTye1ZbxLqfkZUvV0NLN7wcRnri3sC5Lfi8RXVG1bLM=";
};
nativeBuildInputs = [
buildPackages.makeWrapper
- nodejs
+ nodejs_24
npmHooks.npmConfigHook
pkg-config
];
@@ -55,8 +56,8 @@ buildGo124Module rec {
];
ldflags = [
- "-X github.com/navidrome/navidrome/consts.gitSha=${src.rev}"
- "-X github.com/navidrome/navidrome/consts.gitTag=v${version}"
+ "-X github.com/navidrome/navidrome/consts.gitSha=${finalAttrs.src.rev}"
+ "-X github.com/navidrome/navidrome/consts.gitTag=v${finalAttrs.version}"
];
CGO_CFLAGS = lib.optionals stdenv.cc.isGNU [ "-Wno-return-local-addr" ];
@@ -73,6 +74,9 @@ buildGo124Module rec {
"netgo"
];
+ nativeInstallCheckInputs = [ versionCheckHook ];
+ doInstallCheck = true;
+
postFixup = lib.optionalString ffmpegSupport ''
wrapProgram $out/bin/navidrome \
--prefix PATH : ${lib.makeBinPath [ ffmpeg-headless ]}
@@ -97,4 +101,4 @@ buildGo124Module rec {
# Broken on Darwin: sandbox-exec: pattern serialization length exceeds maximum (NixOS/nix#4119)
broken = stdenv.hostPlatform.isDarwin;
};
-}
+})
diff --git a/pkgs/by-name/uv/uv/package.nix b/pkgs/by-name/uv/uv/package.nix
index 96e4f74fcce0..0b19d663b0b3 100644
--- a/pkgs/by-name/uv/uv/package.nix
+++ b/pkgs/by-name/uv/uv/package.nix
@@ -18,16 +18,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "uv";
- version = "0.9.25";
+ version = "0.9.26";
src = fetchFromGitHub {
owner = "astral-sh";
repo = "uv";
tag = finalAttrs.version;
- hash = "sha256-LwfcClkx/apazspYuGJ2wx9wK2/tin9zusSUrqJSmO8=";
+ hash = "sha256-qvfMB62/0Hvc7m5h+QitvUcS6YZWAV1uGPg8JpCKPNU=";
};
- cargoHash = "sha256-9CPxOMFk2lz1UXFN/gvXDLtDlHBkRRs/ayS+UYF06is=";
+ cargoHash = "sha256-3ncKhauappl1MR3EG1bwYVrwhM7gCFRcRyRvYrsDaok=";
buildInputs = [
rust-jemalloc-sys