ostree: 2019.6 -> 2020.2
https://github.com/ostreedev/ostree/releases/tag/v2020.1 https://github.com/ostreedev/ostree/releases/tag/v2020.2
This commit is contained in:
parent
d222dc2575
commit
9567d805f0
@ -37,13 +37,13 @@ let
|
|||||||
]));
|
]));
|
||||||
in stdenv.mkDerivation rec {
|
in stdenv.mkDerivation rec {
|
||||||
pname = "ostree";
|
pname = "ostree";
|
||||||
version = "2019.6";
|
version = "2020.2";
|
||||||
|
|
||||||
outputs = [ "out" "dev" "man" "installedTests" ];
|
outputs = [ "out" "dev" "man" "installedTests" ];
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://github.com/ostreedev/ostree/releases/download/v${version}/libostree-${version}.tar.xz";
|
url = "https://github.com/ostreedev/ostree/releases/download/v${version}/libostree-${version}.tar.xz";
|
||||||
sha256 = "1bhrfbjna3rnymijxagzkdq2zl74g71s2xmimihjhvcw2zybi0jl";
|
sha256 = "0bbk0sg4m38g7j00hy358p2azxas87minpgz3avwma6jsylj1qjg";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
@ -52,12 +52,6 @@ in stdenv.mkDerivation rec {
|
|||||||
# Patch from https://github.com/ostreedev/ostree/pull/1633
|
# Patch from https://github.com/ostreedev/ostree/pull/1633
|
||||||
./01-Drop-ostree-trivial-httpd-CLI-move-to-tests-director.patch
|
./01-Drop-ostree-trivial-httpd-CLI-move-to-tests-director.patch
|
||||||
|
|
||||||
# Fix tests running in Catalan instead of C locale.
|
|
||||||
(fetchpatch {
|
|
||||||
url = "https://github.com/ostreedev/ostree/commit/5135a1e58ade2bfafc8c1fda359540eafd72531e.patch";
|
|
||||||
sha256 = "1crzaagw1zzx8v6rsnxb9jnc3ij9hlpvdl91w3skqdm28adx7yx8";
|
|
||||||
})
|
|
||||||
|
|
||||||
# Workarounds for https://github.com/ostreedev/ostree/issues/1592
|
# Workarounds for https://github.com/ostreedev/ostree/issues/1592
|
||||||
./fix-1592.patch
|
./fix-1592.patch
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user