diff options
author | Simon Hollingshead <me@simonhollingshead.com> | 2024-01-21 01:45:18 +0000 |
---|---|---|
committer | Simon Hollingshead <me@simonhollingshead.com> | 2024-01-21 01:45:18 +0000 |
commit | aa776b2f66cf1a02110ca907d0f6831164806b29 (patch) | |
tree | 2ca7afb555fbd5cdf64ba2b0fd127b71116dda82 /pkgs/development/libraries/libbsd | |
parent | 28330aa2040cb412315ea884f2864b17cade222e (diff) |
libbsd: unstable-2023-04-29 -> 0.11.8
Diffstat (limited to 'pkgs/development/libraries/libbsd')
-rw-r--r-- | pkgs/development/libraries/libbsd/default.nix | 33 |
1 files changed, 7 insertions, 26 deletions
diff --git a/pkgs/development/libraries/libbsd/default.nix b/pkgs/development/libraries/libbsd/default.nix index 4f06eb7f8624d..9e80d17b8a033 100644 --- a/pkgs/development/libraries/libbsd/default.nix +++ b/pkgs/development/libraries/libbsd/default.nix @@ -1,25 +1,18 @@ { lib , stdenv -, fetchFromGitLab -, fetchpatch +, fetchurl , autoreconfHook , libmd , gitUpdater }: -# Run `./get-version` for the new value when bumping the Git revision. -let gitVersion = "0.11.7-55-g73b2"; in - -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "libbsd"; - version = "unstable-2023-04-29"; + version = "0.11.8"; - src = fetchFromGitLab { - domain = "gitlab.freedesktop.org"; - owner = "libbsd"; - repo = "libbsd"; - rev = "73b25a8f871b3a20f6ff76679358540f95d7dbfd"; - hash = "sha256-LS28taIMjRCl6xqg75eYOIrTDl8PzSa+OvrdiEOP1+U="; + src = fetchurl { + url = "https://libbsd.freedesktop.org/releases/${pname}-${version}.tar.xz"; + hash = "sha256-Vf36Jpb7TVWlkvqa0Uqd+JfHsACN2zswxBmRSEH4XzM="; }; outputs = [ "out" "dev" "man" ]; @@ -31,24 +24,12 @@ stdenv.mkDerivation { nativeBuildInputs = [ autoreconfHook ]; propagatedBuildInputs = [ libmd ]; - patches = [ - # Fix `{get,set}progname(3bsd)` conditionalization - # https://gitlab.freedesktop.org/libbsd/libbsd/-/issues/24 - (fetchpatch { - url = "https://github.com/emilazy/libbsd/commit/0381f8d92873c5a19ced3ff861ee8ffe7825953e.patch"; - hash = "sha256-+RMg5eHLgC4gyX9zXM0ttNf7rd9E3UzJX/7UVCYGXx4="; - }) - ] ++ lib.optionals stdenv.isDarwin [ + patches = lib.optionals stdenv.isDarwin [ # Temporary build system hack from upstream maintainer # https://gitlab.freedesktop.org/libbsd/libbsd/-/issues/19#note_2017684 ./darwin-fix-libbsd.sym.patch ]; - postPatch = '' - substituteInPlace configure.ac \ - --replace 'm4_esyscmd([./get-version])' '[${gitVersion}]' - ''; - passthru.updateScript = gitUpdater { # No nicer place to find latest release. url = "https://gitlab.freedesktop.org/libbsd/libbsd.git"; |