MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-16 14:54:29 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge pull request #72956 from JohnAZoidberg/rpm-415

Browse source
This commit is contained in:
Daniel Schaefer 2020-06-15 19:55:42 +02:00 committed by GitHub
commit 5f5caaceb4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkgs/tools/package-management/rpm/default.nix
View file

@ -1,15 +1,15 @@
{ stdenv { stdenv, lib
, pkgconfig, autoreconfHook , pkgconfig, autoreconfHook
, fetchurl, cpio, zlib, bzip2, file, elfutils, libbfd, libarchive, nspr, nss, popt, db, xz, python, lua , fetchurl, cpio, zlib, bzip2, file, elfutils, libbfd, libarchive, nspr, nss, popt, db, xz, python, lua
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "rpm"; pname = "rpm";
version = "4.14.2.1"; version = "4.15.1";
src = fetchurl { src = fetchurl {
url = "http://ftp.rpm.org/releases/rpm-4.14.x/rpm-${version}.tar.bz2"; url = "http://ftp.rpm.org/releases/rpm-${lib.versions.majorMinor version}.x/rpm-${version}.tar.bz2";
sha256 = "1nmck2fq9h85fgs3zhh6w1avlw5y16cbz5khd459ry3jfd5w4f8i"; sha256 = "0c6jwail90fhha3bpx70w4a2i8ycxwvnx6zwxm121l8wc3wlbvyx";
}; };
outputs = [ "out" "dev" "man" ]; outputs = [ "out" "dev" "man" ];

4
pkgs/top-level/all-packages.nix
View file

@ -6401,7 +6401,9 @@ in
rpiboot-unstable = callPackage ../development/misc/rpiboot/unstable.nix { }; rpiboot-unstable = callPackage ../development/misc/rpiboot/unstable.nix { };
rpm = callPackage ../tools/package-management/rpm { }; rpm = callPackage ../tools/package-management/rpm {
python = python3;
};
rpm-ostree = callPackage ../tools/misc/rpm-ostree { rpm-ostree = callPackage ../tools/misc/rpm-ostree {
gperf = gperf_3_0; gperf = gperf_3_0;

2
pkgs/top-level/python-packages.nix
View file

@ -5718,7 +5718,7 @@ in {
rply = callPackage ../development/python-modules/rply {}; rply = callPackage ../development/python-modules/rply {};
rpm = toPythonModule (pkgs.rpm.override{inherit python;}); rpm = disabledIf (!isPy3k) (toPythonModule (pkgs.rpm.override{ inherit python; }));
rpmfluff = callPackage ../development/python-modules/rpmfluff {}; rpmfluff = callPackage ../development/python-modules/rpmfluff {};