diff options
| author | Dan Peebles <pumpkin@me.com> | 2016-10-12 18:56:10 +0000 |
|---|---|---|
| committer | Dan Peebles <pumpkin@me.com> | 2016-10-12 20:31:02 +0000 |
| commit | f35ab9c2f814e88986ce8ed2b21728d96e71b784 (patch) | |
| tree | cb75e4e432b78e92c621c0e73e3ea2686ca79001 /pkgs/tools/misc/ostree | |
| parent | 1371499530aa99f2568c4dd350eb815fa653501a (diff) | |
| download | nixpkgs-f35ab9c2f814e88986ce8ed2b21728d96e71b784.tar nixpkgs-f35ab9c2f814e88986ce8ed2b21728d96e71b784.tar.gz nixpkgs-f35ab9c2f814e88986ce8ed2b21728d96e71b784.tar.bz2 nixpkgs-f35ab9c2f814e88986ce8ed2b21728d96e71b784.tar.lz nixpkgs-f35ab9c2f814e88986ce8ed2b21728d96e71b784.tar.xz nixpkgs-f35ab9c2f814e88986ce8ed2b21728d96e71b784.tar.zst nixpkgs-f35ab9c2f814e88986ce8ed2b21728d96e71b784.zip | |
rpm-ostree: 2016.1 -> 2016.10
This also updates a bunch of its dependencies to enable the update, and gets rid of libhif because upstream stopped maintaining it as such, instead using it internally in other projects until they can agree on an interface for it. Nothing seemed to be using libhif so I'm not too concerned about removing it.
Diffstat (limited to 'pkgs/tools/misc/ostree')
| -rw-r--r-- | pkgs/tools/misc/ostree/default.nix | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/pkgs/tools/misc/ostree/default.nix b/pkgs/tools/misc/ostree/default.nix index 7d9d5545f40..4655331dbc1 100644 --- a/pkgs/tools/misc/ostree/default.nix +++ b/pkgs/tools/misc/ostree/default.nix @@ -7,8 +7,8 @@ let libglnx-src = fetchFromGitHub { owner = "GNOME"; repo = "libglnx"; - rev = "769522753c25537e520adc322fa62e5390272add"; - sha256 = "0gfc8dl63xpmf73dwb1plj7cymq7z6w6wq5m06yx8jymwhq7x1l8"; + rev = "36396b49ad6636c9959f3dfac5e04d41584b1a92"; + sha256 = "146flrpzybm2s12wg05rnglnfd2f2jx3xzvns2pq28kvg09bgcfn"; }; bsdiff-src = fetchFromGitHub { @@ -17,15 +17,16 @@ let rev = "1edf9f656850c0c64dae260960fabd8249ea9c60"; sha256 = "1h71d2h2d3anp4msvpaff445rnzdxii3id2yglqk7af9i43kdsn1"; }; -in stdenv.mkDerivation rec { - rev = "v2016.5"; - name = "ostree-${rev}"; + + version = "2016.11"; +in stdenv.mkDerivation { + name = "ostree-${version}"; src = fetchFromGitHub { - inherit rev; + rev = "v${version}"; owner = "ostreedev"; repo = "ostree"; - sha256 = "1dfyhzgv94ldjv2l4jxf4xhks2z5ljljqa3k579qskds755n6kvg"; + sha256 = "19xmg01mxdykx74r9ra11hc15qd1fjqbxdn23jrn2pcvz8dw9zgc"; }; nativeBuildInputs = [ @@ -43,6 +44,8 @@ in stdenv.mkDerivation rec { preConfigure = '' env NOCONFIGURE=1 ./autogen.sh + + configureFlags+="--with-systemdsystemunitdir=$out/lib/systemd/system" ''; meta = with stdenv.lib; { |