summary refs log tree commit diff
path: root/pkgs/tools/misc/ostree
diff options
context:
space:
mode:
authorzowoq <59103226+zowoq@users.noreply.github.com>2020-02-22 21:53:04 +1000
committerzowoq <59103226+zowoq@users.noreply.github.com>2020-02-22 21:53:04 +1000
commit9567d805f01932f4933a07a15a73c64f16166b48 (patch)
treef78722007877d9bcb1c1539e1665bfdaf5558847 /pkgs/tools/misc/ostree
parentd222dc257502709bd42f1eebe686fc61e321539e (diff)
downloadnixpkgs-9567d805f01932f4933a07a15a73c64f16166b48.tar
nixpkgs-9567d805f01932f4933a07a15a73c64f16166b48.tar.gz
nixpkgs-9567d805f01932f4933a07a15a73c64f16166b48.tar.bz2
nixpkgs-9567d805f01932f4933a07a15a73c64f16166b48.tar.lz
nixpkgs-9567d805f01932f4933a07a15a73c64f16166b48.tar.xz
nixpkgs-9567d805f01932f4933a07a15a73c64f16166b48.tar.zst
nixpkgs-9567d805f01932f4933a07a15a73c64f16166b48.zip
ostree: 2019.6 -> 2020.2
https://github.com/ostreedev/ostree/releases/tag/v2020.1
https://github.com/ostreedev/ostree/releases/tag/v2020.2
Diffstat (limited to 'pkgs/tools/misc/ostree')
-rw-r--r--pkgs/tools/misc/ostree/default.nix10
1 files changed, 2 insertions, 8 deletions
diff --git a/pkgs/tools/misc/ostree/default.nix b/pkgs/tools/misc/ostree/default.nix
index 4bc690bc45f..05e7f9c05ef 100644
--- a/pkgs/tools/misc/ostree/default.nix
+++ b/pkgs/tools/misc/ostree/default.nix
@@ -37,13 +37,13 @@ let
   ]));
 in stdenv.mkDerivation rec {
   pname = "ostree";
-  version = "2019.6";
+  version = "2020.2";
 
   outputs = [ "out" "dev" "man" "installedTests" ];
 
   src = fetchurl {
     url = "https://github.com/ostreedev/ostree/releases/download/v${version}/libostree-${version}.tar.xz";
-    sha256 = "1bhrfbjna3rnymijxagzkdq2zl74g71s2xmimihjhvcw2zybi0jl";
+    sha256 = "0bbk0sg4m38g7j00hy358p2azxas87minpgz3avwma6jsylj1qjg";
   };
 
   patches = [
@@ -52,12 +52,6 @@ in stdenv.mkDerivation rec {
     # Patch from https://github.com/ostreedev/ostree/pull/1633
     ./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
     ./fix-1592.patch