public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into unused5

Browse Source
This commit is contained in:
Jörg Thalheim
2018-07-21 15:41:22 +01:00
committed by GitHub
parent cd6e2c9642 e85db6863a
commit 218298b30f
203 changed files with 1655 additions and 627 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/data/misc/hackage/default.nix
+2 -2
View File
@@ -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";
}
pkgs/data/misc/nixos-artwork/wallpapers.nix
+1 -1
View File
@@ -1,7 +1,7 @@
{ stdenv, fetchurl }:
let
mkNixBackground = { name, src, description } @ attrs:
mkNixBackground = { name, src, description }:
stdenv.mkDerivation {
inherit name src;