diff options
| author | aszlig <aszlig@redmoonstudios.org> | 2016-10-27 02:41:26 +0200 |
|---|---|---|
| committer | aszlig <aszlig@redmoonstudios.org> | 2016-10-27 02:43:06 +0200 |
| commit | 8b80f93f6833bd8dc27455be408555a5b0177628 (patch) | |
| tree | f53559f9479ba86171f90613f9fa7a81b4f9569c /pkgs/nixops | |
| parent | 6603d444310cd2c717bf078966a67fee0f175ce3 (diff) | |
pkgs/nixops: Update to latest upstream master
This includes a small patch coming from NixOS/nixops#508 for fixing peer-to-peer tunneling for kernel versions >= 4.5. In addition, I'm patching out the Python sqlite3 module as this also doesn't exist anymore since NixOS/nixpkgs@bee439207bd729eee0bf5dcae5be44320cee45cd. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Diffstat (limited to 'pkgs/nixops')
| -rw-r--r-- | pkgs/nixops/default.nix | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/pkgs/nixops/default.nix b/pkgs/nixops/default.nix index e69a76aa..229b4d23 100644 --- a/pkgs/nixops/default.nix +++ b/pkgs/nixops/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchFromGitHub, fetchpatch, git }: let - rev = "e6f012a95988e52cc6555c04242056d319478b24"; - sha256 = "0xz1nz3a49vwhzkjb0b9c7c83iwfpkpvsnq5bpgm2w3qii75vhkj"; + rev = "06e3a4b961b80ada9293632d0ec62493c0740282"; + sha256 = "0w2b1m9z42g56mw2g2sw5izb7gn0nhlp3v8c96m65r121gdil9fj"; master = stdenv.mkDerivation rec { name = "nixops-upstream-patched"; @@ -15,10 +15,15 @@ let phases = [ "unpackPhase" "patchPhase" "installPhase" ]; + patches = stdenv.lib.singleton (fetchpatch { + url = "https://github.com/NixOS/nixops/pull/508.patch"; + sha256 = "1x0cjjpw7ykavnkz1ndxlkcymp9vx6lkyqhbf9wz5jvplqhpb9z7"; + }); + postPatch = '' sed -i -re 's!<nixpkgs([^>]*)>!${import ../../nixpkgs-path.nix}\1!g' \ release.nix doc/manual/default.nix doc/manual/resource.nix - sed -i -e '/^docbookxsl/s/1\.78\.1/1.79.1/' doc/manual/Makefile + sed -i -e 's/\<sqlite3\>//' release.nix ''; installPhase = '' |