From 4c0eb8eb9e3ad2ea1807a622f359ab1baa1bf9b3 Mon Sep 17 00:00:00 2001 From: Luflosi Date: Sat, 1 Oct 2022 14:22:33 +0200 Subject: [PATCH 1/3] nsync: add Luflosi as maintainer --- pkgs/development/libraries/nsync/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/nsync/default.nix b/pkgs/development/libraries/nsync/default.nix index a00893c15732..aa5023c08d80 100644 --- a/pkgs/development/libraries/nsync/default.nix +++ b/pkgs/development/libraries/nsync/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/google/nsync"; description = "C library that exports various synchronization primitives"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ puffnfresh ]; + maintainers = with lib.maintainers; [ puffnfresh Luflosi ]; # On macOS we get an error for some reason: # > mkdir: cannot create directory 'build': File exists platforms = lib.platforms.linux; From 3f2381e4bd9144d01bb2f04c79c6e5e7a566b5b3 Mon Sep 17 00:00:00 2001 From: Luflosi Date: Sat, 1 Oct 2022 14:28:18 +0200 Subject: [PATCH 2/3] nsync: fix build on macOS --- pkgs/development/libraries/nsync/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/nsync/default.nix b/pkgs/development/libraries/nsync/default.nix index aa5023c08d80..15c3880d6164 100644 --- a/pkgs/development/libraries/nsync/default.nix +++ b/pkgs/development/libraries/nsync/default.nix @@ -17,13 +17,15 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; + # Needed for case-insensitive filesystems like on macOS + # because a file named BUILD exists already. + cmakeBuildDir = "build_dir"; + meta = { homepage = "https://github.com/google/nsync"; description = "C library that exports various synchronization primitives"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ puffnfresh Luflosi ]; - # On macOS we get an error for some reason: - # > mkdir: cannot create directory 'build': File exists - platforms = lib.platforms.linux; + platforms = lib.platforms.unix; }; } From cd7bcc91744b8d46b0fb882f5b97ff8f123aa02a Mon Sep 17 00:00:00 2001 From: Luflosi Date: Sat, 1 Oct 2022 14:28:36 +0200 Subject: [PATCH 3/3] nsync: 1.24.0 -> 1.25.0 https://github.com/google/nsync/releases/tag/1.25.0 --- pkgs/development/libraries/nsync/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/nsync/default.nix b/pkgs/development/libraries/nsync/default.nix index 15c3880d6164..5a6024189471 100644 --- a/pkgs/development/libraries/nsync/default.nix +++ b/pkgs/development/libraries/nsync/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "nsync"; - version = "1.24.0"; + version = "1.25.0"; src = fetchFromGitHub { owner = "google"; repo = pname; rev = version; - sha256 = "sha256-jQJtlBDR6efBe1tFOUOZ6awaMTT33qM/GbvbwiWTZxw="; + sha256 = "sha256-bdnYrMnBnpnEKGuMlDLILfzgwfu/e5tyMdSDWqreyto="; }; nativeBuildInputs = [ cmake ];