diff options
author | Jonathan Ringer <jonringer117@gmail.com> | 2021-05-18 08:57:04 -0700 |
---|---|---|
committer | Jonathan Ringer <jonringer117@gmail.com> | 2021-05-18 08:57:16 -0700 |
commit | f7a112f6c44b95d0af2954942fb10c39fdd478f8 (patch) | |
tree | a229be340073afa38a7bc73d583695354eff0265 /pkgs/tools/package-management | |
parent | c227fb4b17469864298087f8c9367e4cfc8dd6b9 (diff) | |
parent | d189df235ae14d4c8b1742b0f77ac1ae860d2fa3 (diff) | |
download | nixpkgs-f7a112f6c44b95d0af2954942fb10c39fdd478f8.tar nixpkgs-f7a112f6c44b95d0af2954942fb10c39fdd478f8.tar.gz nixpkgs-f7a112f6c44b95d0af2954942fb10c39fdd478f8.tar.bz2 nixpkgs-f7a112f6c44b95d0af2954942fb10c39fdd478f8.tar.lz nixpkgs-f7a112f6c44b95d0af2954942fb10c39fdd478f8.tar.xz nixpkgs-f7a112f6c44b95d0af2954942fb10c39fdd478f8.tar.zst nixpkgs-f7a112f6c44b95d0af2954942fb10c39fdd478f8.zip |
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts: pkgs/applications/graphics/emulsion/default.nix pkgs/development/tools/misc/texlab/default.nix pkgs/development/tools/rust/bindgen/default.nix pkgs/development/tools/rust/cargo-udeps/default.nix pkgs/misc/emulators/ruffle/default.nix pkgs/tools/misc/code-minimap/default.nix
Diffstat (limited to 'pkgs/tools/package-management')
-rw-r--r-- | pkgs/tools/package-management/createrepo_c/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/package-management/nvd/default.nix | 32 |
2 files changed, 34 insertions, 2 deletions
diff --git a/pkgs/tools/package-management/createrepo_c/default.nix b/pkgs/tools/package-management/createrepo_c/default.nix index 92696a8d75f..fc0628e0908 100644 --- a/pkgs/tools/package-management/createrepo_c/default.nix +++ b/pkgs/tools/package-management/createrepo_c/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "createrepo_c"; - version = "0.17.1"; + version = "0.17.2"; src = fetchFromGitHub { owner = "rpm-software-management"; repo = "createrepo_c"; rev = version; - sha256 = "G2xioH9XWntHFmUfTN2s2mdtIqgTTLKr5jZflwpaC8Q="; + sha256 = "sha256-rcrJjcWj+cTAE3k11Ynr7CQCOWD+rb60lcar0G2w06A="; }; patches = [ diff --git a/pkgs/tools/package-management/nvd/default.nix b/pkgs/tools/package-management/nvd/default.nix new file mode 100644 index 00000000000..1218ac01f9a --- /dev/null +++ b/pkgs/tools/package-management/nvd/default.nix @@ -0,0 +1,32 @@ +{ fetchFromGitLab, installShellFiles, lib, python3, stdenv }: + +stdenv.mkDerivation rec { + pname = "nvd"; + version = "0.1.1"; + + src = fetchFromGitLab { + owner = "khumba"; + repo = pname; + rev = "v${version}"; + sha256 = "0accq0cw6qsxin1fb2bp2ijgjf9akb9qlivkykpfsgnk5qjafv2n"; + }; + + buildInputs = [ python3 ]; + + nativeBuildInputs = [ installShellFiles ]; + + installPhase = '' + runHook preInstall + install -m555 -Dt $out/bin src/nvd + installManPage src/nvd.1 + runHook postInstall + ''; + + meta = with lib; { + description = "Nix/NixOS package version diff tool"; + homepage = "https://gitlab.com/khumba/nvd"; + license = licenses.asl20; + maintainers = with maintainers; [ khumba ]; + platforms = platforms.all; + }; +} |