diff options
Diffstat (limited to 'nixpkgs/pkgs/data/misc')
-rw-r--r-- | nixpkgs/pkgs/data/misc/hackage/default.nix | 4 | ||||
-rw-r--r-- | nixpkgs/pkgs/data/misc/osinfo-db/default.nix | 6 | ||||
-rw-r--r-- | nixpkgs/pkgs/data/misc/spdx-license-list-data/default.nix | 26 |
3 files changed, 31 insertions, 5 deletions
diff --git a/nixpkgs/pkgs/data/misc/hackage/default.nix b/nixpkgs/pkgs/data/misc/hackage/default.nix index 2415e94b92dc..96617bb0f278 100644 --- a/nixpkgs/pkgs/data/misc/hackage/default.nix +++ b/nixpkgs/pkgs/data/misc/hackage/default.nix @@ -1,6 +1,6 @@ { fetchurl }: fetchurl { - url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/10e6ea0c54a4aa41de51d1d7e2314115bb2e172a.tar.gz"; - sha256 = "0kjy1dxa2kra4j02ni8lpg74jy7fl361yiha330c52spvd2v8i8h"; + url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/fcb0ed924c8504d54870d6dc2092b9dab8305732.tar.gz"; + sha256 = "0b7dxgj40y9svddrx14scnxls20ww4f717zhz3lwigb16dm4crpi"; } diff --git a/nixpkgs/pkgs/data/misc/osinfo-db/default.nix b/nixpkgs/pkgs/data/misc/osinfo-db/default.nix index 31f7eb7efdb8..9afe4a9e4001 100644 --- a/nixpkgs/pkgs/data/misc/osinfo-db/default.nix +++ b/nixpkgs/pkgs/data/misc/osinfo-db/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "osinfo-db"; - version = "20191125"; + version = "20200214"; src = fetchurl { url = "https://releases.pagure.org/libosinfo/${pname}-${version}.tar.xz"; - sha256 = "102mdykp5pjv7lw7saig640vb5a8ivy4ji8sa68q2wzfwg1yix78"; + 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 ]; diff --git a/nixpkgs/pkgs/data/misc/spdx-license-list-data/default.nix b/nixpkgs/pkgs/data/misc/spdx-license-list-data/default.nix new file mode 100644 index 000000000000..1c68569a29aa --- /dev/null +++ b/nixpkgs/pkgs/data/misc/spdx-license-list-data/default.nix @@ -0,0 +1,26 @@ +{ stdenv, lib, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "spdx-license-list-data"; + version = "3.8"; + + src = fetchFromGitHub { + owner = "spdx"; + repo = "license-list-data"; + rev = "v${version}"; + sha256 = "1pfy0vbs7sk7m670mclmlkpcanizdmgsm1qgwzrw28w3hxfq7gdb"; + }; + + phases = [ "unpackPhase" "installPhase" ]; + + installPhase = '' + install -vDt $out/json json/licenses.json + ''; + + meta = { + description = "Various data formats for the SPDX License List"; + homepage = "https://github.com/spdx/license-list-data"; + license = lib.licenses.cc0; + platforms = lib.platforms.all; + }; +} |