Merge branch 'master' into staging-next

Hydra nixpkgs: ?compare=1503899
This commit is contained in:
Vladimír Čunát
2019-02-06 14:24:46 +01:00
220 changed files with 6008 additions and 2679 deletions

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";
}

View File

@@ -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 = {