From 3a77ce578757636bd67a5c8ad275cea3e3e18e7e Mon Sep 17 00:00:00 2001 From: kyehn Date: Sun, 31 Aug 2025 16:12:59 +0800 Subject: [PATCH 1/3] umurmur: 0.3.0 -> 0.3.1 Diff: https://github.com/umurmur/umurmur/compare/v0.3.0...v0.3.1 --- pkgs/by-name/um/umurmur/package.nix | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/um/umurmur/package.nix b/pkgs/by-name/um/umurmur/package.nix index 0c4ee7e9bbba..daf7fee9d33d 100644 --- a/pkgs/by-name/um/umurmur/package.nix +++ b/pkgs/by-name/um/umurmur/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "umurmur"; - version = "0.3.0"; + version = "0.3.1"; src = fetchFromGitHub { owner = "umurmur"; repo = "umurmur"; - rev = version; - sha256 = "sha256-q5k1Lv+/Kz602QFcdb/FoWWaH9peAQIf7u1NTCWKTBM="; + tag = "v${version}"; + hash = "sha256-pJRGyfG5y5wdB+zoWiJ1+2O1L3TThC6IairVDlE76tA="; }; nativeBuildInputs = [ autoreconfHook ]; @@ -28,14 +28,6 @@ stdenv.mkDerivation rec { libconfig ]; - patches = [ - # https://github.com/umurmur/umurmur/issues/175 - (fetchpatch { - url = "https://github.com/umurmur/umurmur/commit/2c7353eaabb88544affc0b0d32d2611994169159.patch"; - hash = "sha256-Ws4Eqb6yI5Vnwfeu869hDtisi8NcobEK6dC7RWnWSJA="; - }) - ]; - configureFlags = [ "--with-ssl=openssl" "--enable-shmapi" From 68cf10a9110df0dc20d45464f83f7af7ada36b6c Mon Sep 17 00:00:00 2001 From: kyehn Date: Sun, 31 Aug 2025 16:13:34 +0800 Subject: [PATCH 2/3] umurmur: use finalAttrs --- pkgs/by-name/um/umurmur/package.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/um/umurmur/package.nix b/pkgs/by-name/um/umurmur/package.nix index daf7fee9d33d..0c0a13dc713a 100644 --- a/pkgs/by-name/um/umurmur/package.nix +++ b/pkgs/by-name/um/umurmur/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, autoreconfHook, openssl, protobufc, @@ -10,14 +9,14 @@ nixosTests, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "umurmur"; version = "0.3.1"; src = fetchFromGitHub { owner = "umurmur"; repo = "umurmur"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-pJRGyfG5y5wdB+zoWiJ1+2O1L3TThC6IairVDlE76tA="; }; @@ -49,4 +48,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ _3JlOy-PYCCKUi ]; mainProgram = "umurmurd"; }; -} +}) From 9a007c1f447456e3be2a160b6ea23cf2b5346022 Mon Sep 17 00:00:00 2001 From: kyehn Date: Sun, 31 Aug 2025 16:14:08 +0800 Subject: [PATCH 3/3] umurmur: remove with lib --- pkgs/by-name/um/umurmur/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/um/umurmur/package.nix b/pkgs/by-name/um/umurmur/package.nix index 0c0a13dc713a..dc5a88d2bfbc 100644 --- a/pkgs/by-name/um/umurmur/package.nix +++ b/pkgs/by-name/um/umurmur/package.nix @@ -38,11 +38,11 @@ stdenv.mkDerivation (finalAttrs: { }; }; - meta = with lib; { + meta = { description = "Minimalistic Murmur (Mumble server)"; - license = licenses.bsd3; + license = lib.licenses.bsd3; homepage = "https://github.com/umurmur/umurmur"; - platforms = platforms.all; + platforms = lib.platforms.all; # never built on aarch64-darwin since first introduction in nixpkgs broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64; maintainers = with lib.maintainers; [ _3JlOy-PYCCKUi ];