diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-08-09 14:00:27 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-08-09 14:00:27 +0200 |
| commit | 9bd78cb0488040ea996b27e82135396a45325af5 (patch) | |
| tree | fe8e48ceab8d69e7e51bd1f04ec6aae0ca7dafec /pkgs/data/misc | |
| parent | a12aeebedbac1bbb02d1beec35925c433cf022f5 (diff) | |
| parent | 246c223e877989c5763ce905bfa42b3f32fe2c18 (diff) | |
Merge master into staging-next
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 0eb3dbefe41bd..eeee8d56664cd 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/bee48f46f4c9e9c1195bf81efb61fa5fb0aec0dc.tar.gz"; - sha256 = "0wxj0iakqy1cyncga8s1qlb8c06vj3ilh5z8lpann7xr8yh6sm4b"; + url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/4db96602103463d72e59ce214d0da8af35405f07.tar.gz"; + sha256 = "14r7m3555ngfafk2wgdj4lnv7zzajcc4j4fiws4k3kr3xwbrwrxr"; } diff --git a/pkgs/data/misc/osinfo-db/default.nix b/pkgs/data/misc/osinfo-db/default.nix index 19872bef7fe37..39cdd29c94be4 100644 --- a/pkgs/data/misc/osinfo-db/default.nix +++ b/pkgs/data/misc/osinfo-db/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "osinfo-db"; - version = "20190611"; + version = "20190726"; src = fetchurl { url = "https://releases.pagure.org/libosinfo/${pname}-${version}.tar.xz"; - sha256 = "00gkdkycicl4rlr8by61sfsgpjsiswr8b148fl2arinr4vz3n46h"; + sha256 = "0kcdq8g324a368bqvki718ms5kdcc3dzfmpgzyxwl0mkxbmhmirr"; }; nativeBuildInputs = [ osinfo-db-tools intltool libxml2 ]; |