diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2020-02-08 03:36:58 +0100 |
|---|---|---|
| committer | worldofpeace <worldofpeace@protonmail.ch> | 2020-02-10 12:55:23 -0500 |
| commit | f9bc083256e425707bdac986ad2b7f609b300b42 (patch) | |
| tree | 592532126e57d7dc4963073563afedf8d60e88e6 | |
| parent | 3c65622fc5b87b24975f649ce4c2d474fdcb392c (diff) | |
| download | nixlib-f9bc083256e425707bdac986ad2b7f609b300b42.tar nixlib-f9bc083256e425707bdac986ad2b7f609b300b42.tar.gz nixlib-f9bc083256e425707bdac986ad2b7f609b300b42.tar.bz2 nixlib-f9bc083256e425707bdac986ad2b7f609b300b42.tar.lz nixlib-f9bc083256e425707bdac986ad2b7f609b300b42.tar.xz nixlib-f9bc083256e425707bdac986ad2b7f609b300b42.tar.zst nixlib-f9bc083256e425707bdac986ad2b7f609b300b42.zip | |
rpm-ostree: 2019.5 → 2020.1
https://github.com/coreos/rpm-ostree/compare/v2019.5...v2020.1
| -rw-r--r-- | pkgs/tools/misc/rpm-ostree/default.nix | 22 | ||||
| -rw-r--r-- | pkgs/tools/misc/rpm-ostree/fix-introspection-build.patch | 11 |
2 files changed, 5 insertions, 28 deletions
diff --git a/pkgs/tools/misc/rpm-ostree/default.nix b/pkgs/tools/misc/rpm-ostree/default.nix index 5cbe7c09eeba..79003ff1ecfe 100644 --- a/pkgs/tools/misc/rpm-ostree/default.nix +++ b/pkgs/tools/misc/rpm-ostree/default.nix @@ -31,37 +31,24 @@ , check , python , json_c +, zchunk , libmodulemd_1 , utillinux , sqlite , cppunit -, fetchpatch }: stdenv.mkDerivation rec { pname = "rpm-ostree"; - version = "2019.5"; + version = "2020.1"; outputs = [ "out" "dev" "man" "devdoc" ]; src = fetchurl { - url = "https://github.com/projectatomic/${pname}/releases/download/v${version}/${pname}-${version}.tar.xz"; - sha256 = "0innbrjj086mslbf55bcvs9a3rv9hg1y2nhzxdjy3nhpqxqlzdnn"; + url = "https://github.com/coreos/${pname}/releases/download/v${version}/${pname}-${version}.tar.xz"; + sha256 = "1xgfppq4fqqvg3cs327bckjpiz6rrn3bbbhg3q5p4j2bzsq89xiz"; }; - patches = [ - # gobject-introspection requires curl in cflags - # https://github.com/NixOS/nixpkgs/pull/50953#issuecomment-449777169 - # https://github.com/NixOS/nixpkgs/pull/50953#issuecomment-452177080 - ./fix-introspection-build.patch - - # Don't use etc/dbus-1/system.d - (fetchpatch { - url = "https://github.com/coreos/rpm-ostree/commit/60053d0d3d2279d120ae7007c6048e499d2c4d14.patch"; - sha256 = "0ig21zip09iy2da7ksg87jykaj3q8jyzh8r7yrpzyql85qxiwm0m"; - }) - ]; - nativeBuildInputs = [ pkgconfig which @@ -98,6 +85,7 @@ stdenv.mkDerivation rec { python # libdnf json_c + zchunk libmodulemd_1 utillinux sqlite diff --git a/pkgs/tools/misc/rpm-ostree/fix-introspection-build.patch b/pkgs/tools/misc/rpm-ostree/fix-introspection-build.patch deleted file mode 100644 index b82ad5b24b5c..000000000000 --- a/pkgs/tools/misc/rpm-ostree/fix-introspection-build.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -103,7 +103,7 @@ - ostree-1 >= 2018.9 - libsystemd - polkit-gobject-1 -- rpm librepo libsolv -+ rpm librepo libsolv libcurl - libarchive]) - - dnl -ldl: https://github.com/ostreedev/ostree/commit/1f832597fc83fda6cb8daf48c4495a9e1590774c |