From 0e4fabb152cc48f59dda37f3357f22505e5117ed Mon Sep 17 00:00:00 2001 From: seth Date: Fri, 15 Nov 2024 22:32:21 -0500 Subject: [PATCH 1/4] ghc_filesystem: pin apple-sdk to v11 Fixes a build failure on x86_64-darwin that appeared in https://hydra.nixos.org/build/275198284 --- pkgs/by-name/gh/ghc_filesystem/package.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/gh/ghc_filesystem/package.nix b/pkgs/by-name/gh/ghc_filesystem/package.nix index d8faf639baea..03e51ec62f26 100644 --- a/pkgs/by-name/gh/ghc_filesystem/package.nix +++ b/pkgs/by-name/gh/ghc_filesystem/package.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, cmake, fetchFromGitHub }: +{ stdenv, lib, apple-sdk_11, cmake, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "filesystem"; @@ -13,6 +13,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11; + meta = with lib; { description = "header-only single-file C++ std::filesystem compatible helper library"; homepage = "https://github.com/gulrak/filesystem"; From 2f1894aebfa9e089d7d086e4c5d9b3666957bc6a Mon Sep 17 00:00:00 2001 From: seth Date: Fri, 15 Nov 2024 22:33:54 -0500 Subject: [PATCH 2/4] ghc_filesystem: format with nixfmt --- pkgs/by-name/gh/ghc_filesystem/package.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/gh/ghc_filesystem/package.nix b/pkgs/by-name/gh/ghc_filesystem/package.nix index 03e51ec62f26..ea34b280c537 100644 --- a/pkgs/by-name/gh/ghc_filesystem/package.nix +++ b/pkgs/by-name/gh/ghc_filesystem/package.nix @@ -1,4 +1,10 @@ -{ stdenv, lib, apple-sdk_11, cmake, fetchFromGitHub }: +{ + stdenv, + lib, + apple-sdk_11, + cmake, + fetchFromGitHub, +}: stdenv.mkDerivation rec { pname = "filesystem"; From 112ad823b989943f49a41c1dc976d8ee3c7dac5c Mon Sep 17 00:00:00 2001 From: seth Date: Fri, 15 Nov 2024 22:35:00 -0500 Subject: [PATCH 3/4] ghc_filesystem: modernize & use best practices --- pkgs/by-name/gh/ghc_filesystem/package.nix | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/gh/ghc_filesystem/package.nix b/pkgs/by-name/gh/ghc_filesystem/package.nix index ea34b280c537..d823cc9fb6f8 100644 --- a/pkgs/by-name/gh/ghc_filesystem/package.nix +++ b/pkgs/by-name/gh/ghc_filesystem/package.nix @@ -1,19 +1,20 @@ { - stdenv, lib, + stdenv, apple-sdk_11, cmake, fetchFromGitHub, + nix-update-script, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "filesystem"; version = "1.5.14"; src = fetchFromGitHub { owner = "gulrak"; repo = "filesystem"; - rev = "v${version}"; + rev = "refs/tags/v${finalAttrs.version}"; hash = "sha256-XZ0IxyNIAs2tegktOGQevkLPbWHam/AOFT+M6wAWPFg="; }; @@ -21,10 +22,15 @@ stdenv.mkDerivation rec { buildInputs = lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11; - meta = with lib; { + passthru = { + updateScript = nix-update-script { }; + }; + + meta = { description = "header-only single-file C++ std::filesystem compatible helper library"; homepage = "https://github.com/gulrak/filesystem"; - license = licenses.mit; - maintainers = with maintainers; [ bbjubjub ]; + changelog = "https://github.com/gulrak/filesystem/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ bbjubjub ]; }; -} +}) From 1a7fedcbe57383be08a9010aa3301b038a0e4d63 Mon Sep 17 00:00:00 2001 From: seth Date: Fri, 15 Nov 2024 22:36:47 -0500 Subject: [PATCH 4/4] ghc_filesystem: add getchoo to maintainers --- pkgs/by-name/gh/ghc_filesystem/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/gh/ghc_filesystem/package.nix b/pkgs/by-name/gh/ghc_filesystem/package.nix index d823cc9fb6f8..ff9d9c351d8f 100644 --- a/pkgs/by-name/gh/ghc_filesystem/package.nix +++ b/pkgs/by-name/gh/ghc_filesystem/package.nix @@ -31,6 +31,9 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/gulrak/filesystem"; changelog = "https://github.com/gulrak/filesystem/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ bbjubjub ]; + maintainers = with lib.maintainers; [ + bbjubjub + getchoo + ]; }; })