summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregor Kleen <gkleen@yggdrasil.li>2021-09-05 13:39:36 +0200
committerGregor Kleen <gkleen@yggdrasil.li>2021-09-05 13:39:36 +0200
commit87589c89dc246a239d59d63c8fffac49eb89af2f (patch)
tree70fe91353c3fd8431836b9b2c97419015cea030a
parent022194be05655ad3938166f9d8683f6648698daf (diff)
downloadnixos-87589c89dc246a239d59d63c8fffac49eb89af2f.tar
nixos-87589c89dc246a239d59d63c8fffac49eb89af2f.tar.gz
nixos-87589c89dc246a239d59d63c8fffac49eb89af2f.tar.bz2
nixos-87589c89dc246a239d59d63c8fffac49eb89af2f.tar.xz
nixos-87589c89dc246a239d59d63c8fffac49eb89af2f.zip
feeds: ...
-rw-r--r--user-profiles/feeds/module.nix32
1 files changed, 14 insertions, 18 deletions
diff --git a/user-profiles/feeds/module.nix b/user-profiles/feeds/module.nix
index 8008a4b8..992bfe37 100644
--- a/user-profiles/feeds/module.nix
+++ b/user-profiles/feeds/module.nix
@@ -13,24 +13,20 @@ let
13 let 13 let
14 oldDepends = filter (attr: if attr ? name then builtins.match "(uri-bytestring|atom-conduit)(-.*)?" attr.name == null else true) (oldAttrs.buildInputs or []); 14 oldDepends = filter (attr: if attr ? name then builtins.match "(uri-bytestring|atom-conduit)(-.*)?" attr.name == null else true) (oldAttrs.buildInputs or []);
15 newDepends = [ 15 newDepends = [
16 (pkgs.haskellPackages.uri-bytestring.overrideAttrs (_: { 16 (pkgs.haskellPackages.callCabal2nix "uri-bytestring" (pkgs.fetchFromGitHub {
17 src = pkgs.fetchFromGitHub { 17 owner = "gkleen";
18 owner = "gkleen"; 18 repo = "uri-bytestring";
19 repo = "uri-bytestring"; 19 rev = "5f7f32c8274bc4d1b81d99582f5148fe3e8b637e";
20 rev = "5f7f32c8274bc4d1b81d99582f5148fe3e8b637e"; 20 sha256 = "XLanwyCDIlMuOkpE5LbTNOBfL+1kZX+URfj9Bhs1Nsc=";
21 sha256 = "XLanwyCDIlMuOkpE5LbTNOBfL+1kZX+URfj9Bhs1Nsc="; 21 fetchSubmodules = true;
22 fetchSubmodules = true; 22 }) {})
23 }; 23 (pkgs.haskellPackages.callCabal2nix "atom-conduit" (pkgs.fetchFromGitHub {
24 })) 24 owner = "gkleen";
25 (pkgs.haskellPackages.atom-conduit.overrideAttrs (_: { 25 repo = "atom-conduit";
26 src = pkgs.fetchFromGitHub { 26 rev = "af33d1162d84f1fca00fe92a2e47f0a1a5275b4b";
27 owner = "gkleen"; 27 sha256 = "FbfA4cvF0Z9Q4ethJmXWAQmWdFZNds7XRIMWFXc+ByA=";
28 repo = "atom-conduit"; 28 fetchSubmodules = true;
29 rev = "af33d1162d84f1fca00fe92a2e47f0a1a5275b4b"; 29 }) {})
30 sha256 = "FbfA4cvF0Z9Q4ethJmXWAQmWdFZNds7XRIMWFXc+ByA=";
31 fetchSubmodules = true;
32 };
33 }))
34 ]; 30 ];
35 in oldDepends ++ newDepends; 31 in oldDepends ++ newDepends;
36 }); 32 });