update nixos

This commit is contained in:
Gabriel Ebner 2022-04-17 15:28:52 +02:00
parent ccee0a99bf
commit c4a0c593c8
3 changed files with 36 additions and 4 deletions

32
168810.patch Normal file

@ -0,0 +1,32 @@
From 8def4d308e66b3d145f26500d74c92e9d09a9320 Mon Sep 17 00:00:00 2001
From: Ben Siraphob <bensiraphob@gmail.com>
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 ];

@ -17,11 +17,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1649881853, "lastModified": 1650076401,
"narHash": "sha256-g5TaBkbrceYqX5TjnTo1mPfqDO8oBAuuwKww/aHPHGw=", "narHash": "sha256-QGxadqKWICchuuLIF2QwmHPVaUk+qO33ml5p1wW4IyA=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "6ddcd831fa871ecbf311cc5d57501892253ad190", "rev": "75ad56bdc927f3a9f9e05e3c3614c4c1fcd99fcb",
"type": "github" "type": "github"
}, },
"original": { "original": {

@ -15,7 +15,7 @@
channels.nixpkgs.input = nixpkgs; channels.nixpkgs.input = nixpkgs;
channels.nixpkgs.patches = [ ]; channels.nixpkgs.patches = [ ./168810.patch ];
nix.generateRegistryFromInputs = true; nix.generateRegistryFromInputs = true;