From c4a0c593c8f26681177d3f3d8282c431efb83c75 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sun, 17 Apr 2022 15:28:52 +0200 Subject: [PATCH] update nixos --- 168810.patch | 32 ++++++++++++++++++++++++++++++++ flake.lock | 6 +++--- flake.nix | 2 +- 3 files changed, 36 insertions(+), 4 deletions(-) create mode 100644 168810.patch diff --git a/168810.patch b/168810.patch new file mode 100644 index 0000000..5518ac5 --- /dev/null +++ b/168810.patch @@ -0,0 +1,32 @@ +From 8def4d308e66b3d145f26500d74c92e9d09a9320 Mon Sep 17 00:00:00 2001 +From: Ben Siraphob +Date: Fri, 15 Apr 2022 13:01:06 -0500 +Subject: [PATCH] Revert "cln: fix darwin build" + +This reverts commit a3e1e9271e0ff87309d44f9817baadb09b305757. +--- + pkgs/development/libraries/cln/default.nix | 9 ++++----- + 1 file changed, 4 insertions(+), 5 deletions(-) + +diff --git a/pkgs/development/libraries/cln/default.nix b/pkgs/development/libraries/cln/default.nix +index 5c5edea0faeca..23bbd84a20963 100644 +--- a/pkgs/development/libraries/cln/default.nix ++++ b/pkgs/development/libraries/cln/default.nix +@@ -1,13 +1,12 @@ +-{ lib, stdenv, fetchgit, gmp }: ++{ lib, stdenv, fetchurl, gmp }: + + stdenv.mkDerivation rec { + pname = "cln"; + version = "1.3.6"; + +- src = fetchgit { +- url = "git://www.ginac.de/cln.git"; +- rev = "cln_${builtins.replaceStrings [ "." ] [ "-" ] version}"; +- sha256 = "sha256-P32F4TIDhE2Dwzydq8iFK6ch3kICJcXeeXHs5PBQG88="; ++ src = fetchurl { ++ url = "${meta.homepage}${pname}-${version}.tar.bz2"; ++ sha256 = "0jlq9l4hphk7qqlgqj9ihjp4m3rwjbhk6q4v00lsbgbri07574pl"; + }; + + buildInputs = [ gmp ]; diff --git a/flake.lock b/flake.lock index 58d008e..f1dbebf 100644 --- a/flake.lock +++ b/flake.lock @@ -17,11 +17,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1649881853, - "narHash": "sha256-g5TaBkbrceYqX5TjnTo1mPfqDO8oBAuuwKww/aHPHGw=", + "lastModified": 1650076401, + "narHash": "sha256-QGxadqKWICchuuLIF2QwmHPVaUk+qO33ml5p1wW4IyA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6ddcd831fa871ecbf311cc5d57501892253ad190", + "rev": "75ad56bdc927f3a9f9e05e3c3614c4c1fcd99fcb", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 47a420b..43b2806 100644 --- a/flake.nix +++ b/flake.nix @@ -15,7 +15,7 @@ channels.nixpkgs.input = nixpkgs; - channels.nixpkgs.patches = [ ]; + channels.nixpkgs.patches = [ ./168810.patch ]; nix.generateRegistryFromInputs = true;