Merge remote-tracking branch 'origin/master' into staging

This commit is contained in:
Matthew Bauer
2019-02-09 12:14:06 -05:00
478 changed files with 13633 additions and 4732 deletions
+2 -2
View File
@@ -1,6 +1,6 @@
{ fetchurl }:
fetchurl {
url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/c400563a55894c34ae0d7dec415ac8994aa74aa0.tar.gz";
sha256 = "0mqgfw8sc0h4p031gcs4m3n6rbd31zrqx2lh1xgplhxldhw5gg8p";
url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/e95fefd56a6b8de585e92cd34de4870e31fb7bc7.tar.gz";
sha256 = "08pzxwsc4incrl5mv8572xs9332206p2cw2mynxks33n7nh98vmx";
}
@@ -1,7 +1,7 @@
{ stdenv, fetchurl }:
let
version = "20151214";
version = "20190116";
pname = "mobile-broadband-provider-info";
name = "${pname}-${version}";
in
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${version}/${name}.tar.xz";
sha256 = "1905nab1h8p4hx0m1w0rn4mkg9209x680dcr4l77bngy21pmvr4a";
sha256 = "16y5lc7pfdvai9c8xwb825zc3v46039gghbip13fqslf5gw11fic";
};
meta = {
+2 -2
View File
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, osinfo-db-tools, intltool, libxml2 }:
stdenv.mkDerivation rec {
name = "osinfo-db-20181203";
name = "osinfo-db-20181214";
src = fetchurl {
url = "https://releases.pagure.org/libosinfo/${name}.tar.xz";
sha256 = "1wimbj3hqp3ni91l7drj24i7z7xxfdpn6svf1szk9qd93cxc65q2";
sha256 = "18ym54wvhvjk66fqpsfvfd5b7d7743dvfqrcq91w1n71r20fkhcd";
};
nativeBuildInputs = [ osinfo-db-tools intltool libxml2 ];