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

Merge branch 'master' into staging-next

Browse Source 
~5k rebuilds per platform.
Hydra nixpkgs: ?compare=1518759
This commit is contained in:
Vladimír Čunát
2019-05-11 09:41:36 +02:00
parent 3b9e3a5a57 76e3af41a5
commit e8f4ad0169
281 changed files with 10743 additions and 7236 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/3f0c3944190bf34286e4e80620fede11dd688f68.tar.gz";
sha256 = "1i4k4wjm6w8hgwia1axwdr3ij0ckxh3ikc1f0nlk8sb0j3yrmxa6";
url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/00d16ba60110e6956b6f7d31d520d0a34377b047.tar.gz";
sha256 = "1f6d0a06g51r01mgg6fm9b8nd2bzkijf6jm6ljm5c62qgi4fkc7k";
}
pkgs/data/misc/osinfo-db/default.nix
+2 -2
View File
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "osinfo-db";
version = "20190301";
version = "20190504";
src = fetchurl {
url = "https://releases.pagure.org/libosinfo/${pname}-${version}.tar.xz";
sha256 = "1rjqizsglgdcjxi7kpbwm26krdkrlxacinjp9684sfzhqwdqi4as";
sha256 = "1yik26gbm3y3wviyabfpyx7pnqx72z5j7267hdgfscdvrwwmyi5z";
};
nativeBuildInputs = [ osinfo-db-tools intltool libxml2 ];