diff options
author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2018-07-21 15:41:22 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-07-21 15:41:22 +0100 |
commit | 218298b30fe79be30716438a1906d1abd61b9377 (patch) | |
tree | 65e0041ee5468689142d669c4c4fc4f73f3618ba /pkgs/data/misc | |
parent | cd6e2c9642b8e608c905f350cece21141435deef (diff) | |
parent | e85db6863a546cfdde0150f03ed0d2db28992575 (diff) | |
download | nixlib-218298b30fe79be30716438a1906d1abd61b9377.tar nixlib-218298b30fe79be30716438a1906d1abd61b9377.tar.gz nixlib-218298b30fe79be30716438a1906d1abd61b9377.tar.bz2 nixlib-218298b30fe79be30716438a1906d1abd61b9377.tar.lz nixlib-218298b30fe79be30716438a1906d1abd61b9377.tar.xz nixlib-218298b30fe79be30716438a1906d1abd61b9377.tar.zst nixlib-218298b30fe79be30716438a1906d1abd61b9377.zip |
Merge branch 'master' into unused5
Diffstat (limited to 'pkgs/data/misc')
-rw-r--r-- | pkgs/data/misc/hackage/default.nix | 4 | ||||
-rw-r--r-- | pkgs/data/misc/nixos-artwork/wallpapers.nix | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix index 8d9ba54c9500..a8af8f791a92 100644 --- a/pkgs/data/misc/hackage/default.nix +++ b/pkgs/data/misc/hackage/default.nix @@ -1,6 +1,6 @@ { fetchurl }: fetchurl { - url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/e6e8a920e43237ccd2f66d6a349b5932a5eba1f5.tar.gz"; - sha256 = "0xyw1a5fp6swyxsj79hihivq9fpzzvl4apv34399a1n4ch6qhbf3"; + url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/92b4fe519b988dee70e2ef8f2f1d05edf610ba8a.tar.gz"; + sha256 = "15sh85v57k635q5ir8pwa605cchj12h4sflss8zd1xshy7ywi673"; } diff --git a/pkgs/data/misc/nixos-artwork/wallpapers.nix b/pkgs/data/misc/nixos-artwork/wallpapers.nix index 2eebe61b142e..3a65a9626d14 100644 --- a/pkgs/data/misc/nixos-artwork/wallpapers.nix +++ b/pkgs/data/misc/nixos-artwork/wallpapers.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: let - mkNixBackground = { name, src, description } @ attrs: + mkNixBackground = { name, src, description }: stdenv.mkDerivation { inherit name src; |