diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-09-18 16:55:42 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-09-18 16:55:42 -0400 |
| commit | 7319013ea14f94cb360c7bef9e403de7f1db83b0 (patch) | |
| tree | cb6d4763cee2cc982648762c019b3b77b9ba18b2 /pkgs/data/misc | |
| parent | ce6e72a11cc2f52d6e92224791fe5db7f9e2ecdd (diff) | |
| parent | 35378f014161c1d794dc89b6969275396cb601de (diff) | |
| download | nixpkgs-7319013ea14f94cb360c7bef9e403de7f1db83b0.tar nixpkgs-7319013ea14f94cb360c7bef9e403de7f1db83b0.tar.gz nixpkgs-7319013ea14f94cb360c7bef9e403de7f1db83b0.tar.bz2 nixpkgs-7319013ea14f94cb360c7bef9e403de7f1db83b0.tar.lz nixpkgs-7319013ea14f94cb360c7bef9e403de7f1db83b0.tar.xz nixpkgs-7319013ea14f94cb360c7bef9e403de7f1db83b0.tar.zst nixpkgs-7319013ea14f94cb360c7bef9e403de7f1db83b0.zip | |
Merge remote-tracking branch 'upstream/master' into staging
Diffstat (limited to 'pkgs/data/misc')
| -rw-r--r-- | pkgs/data/misc/hackage/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/data/misc/osinfo-db/default.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix index a2d04640d59..a72c94759fa 100644 --- a/pkgs/data/misc/hackage/default.nix +++ b/pkgs/data/misc/hackage/default.nix @@ -1,6 +1,6 @@ { fetchurl }: fetchurl { - url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/22cb611adaf63739fc7e3956d83d450154ec766b.tar.gz"; - sha256 = "0wxggabwz8qs2hmnr3k3iwy9rmvicx4a1n22l7f6krk1hym5bkpl"; + url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/e44c7d34b0e57883da9cc0e09b0b5de3b065fe98.tar.gz"; + sha256 = "1manarsja8lsvs75zd3jnjhy5yb1576yv8ba0jqa4a1rszrkil1d"; } diff --git a/pkgs/data/misc/osinfo-db/default.nix b/pkgs/data/misc/osinfo-db/default.nix index 9919fb57f7c..93ee6d38c7c 100644 --- a/pkgs/data/misc/osinfo-db/default.nix +++ b/pkgs/data/misc/osinfo-db/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, osinfo-db-tools, intltool, libxml2 }: stdenv.mkDerivation rec { - name = "osinfo-db-20180531"; + name = "osinfo-db-20180903"; src = fetchurl { url = "https://releases.pagure.org/libosinfo/${name}.tar.xz"; - sha256 = "0vw6hn7xdfj0q7wc3k9b0nvbghdp1b9dl63xz2v7frr55qv59m5x"; + sha256 = "0xkxqyn2b03d4rd91f5rw3xar5vnv2n8l5pp8sm3hqm1wm5z5my9"; }; nativeBuildInputs = [ osinfo-db-tools intltool libxml2 ]; |