diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2018-09-18 18:44:48 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-09-18 18:44:48 +0200 |
commit | de419917a3bd72c7b60632bd77eff1201c546050 (patch) | |
tree | 972321bd451a0aaffe30c78033ffb1f9fb9d7388 /pkgs/tools/misc/ostree/default.nix | |
parent | 1df2560dde3df459dd0e71883c5eac014100b0b0 (diff) | |
parent | 9064d9db001472e544536daf5ef7381ff4913d82 (diff) | |
download | nixlib-de419917a3bd72c7b60632bd77eff1201c546050.tar nixlib-de419917a3bd72c7b60632bd77eff1201c546050.tar.gz nixlib-de419917a3bd72c7b60632bd77eff1201c546050.tar.bz2 nixlib-de419917a3bd72c7b60632bd77eff1201c546050.tar.lz nixlib-de419917a3bd72c7b60632bd77eff1201c546050.tar.xz nixlib-de419917a3bd72c7b60632bd77eff1201c546050.tar.zst nixlib-de419917a3bd72c7b60632bd77eff1201c546050.zip |
Merge master into staging-next
Diffstat (limited to 'pkgs/tools/misc/ostree/default.nix')
-rw-r--r-- | pkgs/tools/misc/ostree/default.nix | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/pkgs/tools/misc/ostree/default.nix b/pkgs/tools/misc/ostree/default.nix index 98154d9d5628..3cbdd498aa73 100644 --- a/pkgs/tools/misc/ostree/default.nix +++ b/pkgs/tools/misc/ostree/default.nix @@ -4,13 +4,13 @@ }: let - version = "2018.6"; + version = "2018.8"; libglnx-src = fetchFromGitHub { owner = "GNOME"; repo = "libglnx"; - rev = "e1a78cf2f5351d5394ccfb79f3f5a7b4917f73f3"; - sha256 = "10kzyjbrmr98i65hlz8jc1v5bijyqwwfp6qqjbd5g3y0n520iaxc"; + rev = "470af8763ff7b99bec950a6ae0a957c1dcfc8edd"; + sha256 = "1fwik38i6w3r6pn4qkizradcqp1m83n7ljh9jg0y3p3kvrbfxh15"; }; bsdiff-src = fetchFromGitHub { @@ -28,10 +28,15 @@ in stdenv.mkDerivation { rev = "v${version}"; owner = "ostreedev"; repo = "ostree"; - sha256 = "0kk04pznk6m6fqdz609m2zcnkalcw9q8fsx8wm42k6dhf6cw7l3g"; + sha256 = "0i7b7hvlv8m44k39fr5389wskf810vda8s7ivy2whj1nan5951yx"; }; patches = [ + # Workarounds for https://github.com/ostreedev/ostree/issues/1592 + ./fix-1592.patch + # Disable test-gpg-verify-result.test, + # https://github.com/ostreedev/ostree/issues/1634 + ./disable-test-gpg-verify-result.patch # Tests access the helper using relative path # https://github.com/ostreedev/ostree/issues/1593 (fetchpatch { @@ -58,10 +63,13 @@ in stdenv.mkDerivation { cp --no-preserve=mode -r ${bsdiff-src} bsdiff ''; + preConfigure = '' env NOCONFIGURE=1 ./autogen.sh ''; + enableParallelBuilding = true; + configureFlags = [ "--with-systemdsystemunitdir=$(out)/lib/systemd/system" "--with-systemdsystemgeneratordir=$(out)/lib/systemd/system-generators" @@ -73,6 +81,7 @@ in stdenv.mkDerivation { "installed_test_metadir=$(installedTests)/share/installed-tests/libostree" ]; + meta = with stdenv.lib; { description = "Git for operating system binaries"; homepage = https://ostree.readthedocs.io/en/latest/; |