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

Merge remote-tracking branch 'origin/staging' into mb-cross-fixes-march-2020

Browse Source
This commit is contained in:
Matthew Bauer
2020-03-16 14:34:03 -04:00
parent e9c2957c14 b8cff61c33
commit 67b0ddf3f3
765 changed files with 16014 additions and 9655 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/data/misc/hackage/default.nix
View File

@@ -1,6 +1,6 @@
{ fetchurl }:
fetchurl {
url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/3ff0be5c9ee1ead33e07158b9a4a579fa2fb7a7f.tar.gz";
sha256 = "15jqdjxyzcmg50zvl7szv6s2zi4k82as5wi6mkiwwpbdricg50pl";
url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/fcb0ed924c8504d54870d6dc2092b9dab8305732.tar.gz";
sha256 = "0b7dxgj40y9svddrx14scnxls20ww4f717zhz3lwigb16dm4crpi";
}

6
pkgs/data/misc/osinfo-db/default.nix
View File

@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "osinfo-db";
version = "20200203";
version = "20200214";
src = fetchurl {
url = "https://releases.pagure.org/libosinfo/${pname}-${version}.tar.xz";
sha256 = "1zjq1dhlci00j17dij7s3l30hybzmaykpk5b6bd5xbllp745njn5";
sha256 = "1fpdb8r8kzwp1k5dc9xyy9jr2jr3haq7n9b6spamm599zvzf8nb6";
};
nativeBuildInputs = [ osinfo-db-tools intltool libxml2 ];
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Osinfo database of information about operating systems for virtualization provisioning tools";
homepage = https://libosinfo.org/;
homepage = "https://libosinfo.org/";
license = licenses.gpl2Plus;
platforms = platforms.linux;
maintainers = [ maintainers.bjornfor ];