diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2018-07-17 10:04:59 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-07-17 10:04:59 +0200 |
commit | 1ae2f10642ea00a423354dd3176c55e47dbf3f6e (patch) | |
tree | 7f94ddd06e808ad8fafd657badc27ec1d82d354b /pkgs/tools/misc | |
parent | bac995cd9f07f526d66b571331cd17b8eb7c0f62 (diff) | |
parent | 9d0336a2bbe933c1a8e6ea7c7b39eb7ff071ef66 (diff) | |
download | nixlib-1ae2f10642ea00a423354dd3176c55e47dbf3f6e.tar nixlib-1ae2f10642ea00a423354dd3176c55e47dbf3f6e.tar.gz nixlib-1ae2f10642ea00a423354dd3176c55e47dbf3f6e.tar.bz2 nixlib-1ae2f10642ea00a423354dd3176c55e47dbf3f6e.tar.lz nixlib-1ae2f10642ea00a423354dd3176c55e47dbf3f6e.tar.xz nixlib-1ae2f10642ea00a423354dd3176c55e47dbf3f6e.tar.zst nixlib-1ae2f10642ea00a423354dd3176c55e47dbf3f6e.zip |
Merge staging-next into master
Diffstat (limited to 'pkgs/tools/misc')
-rw-r--r-- | pkgs/tools/misc/parted/default.nix | 5 | ||||
-rw-r--r-- | pkgs/tools/misc/xxd/default.nix | 16 |
2 files changed, 5 insertions, 16 deletions
diff --git a/pkgs/tools/misc/parted/default.nix b/pkgs/tools/misc/parted/default.nix index 0a0cece4fce6..3395e0286343 100644 --- a/pkgs/tools/misc/parted/default.nix +++ b/pkgs/tools/misc/parted/default.nix @@ -16,6 +16,11 @@ stdenv.mkDerivation rec { (fetchpatch { url = "https://git.alpinelinux.org/cgit/aports/plain/main/parted/fix-includes.patch?id=9c5cd3c329a40ba4559cc1d8c7d17a9bf95c237b"; sha256 = "117ypyiwvzym6pi8xmy16wa5z3sbpx7gh6haabs6kfb1x2894z7q"; + }) + ++ stdenv.lib.optional (devicemapper == null) + (fetchpatch { + url = https://git.savannah.gnu.org/cgit/parted.git/patch/?id=7e87ca3c531228d35e13e802d2622006138b104c; + sha256 = "0i29lfg8cwj342q5s7qwqhncz2bkifj5rjc7cx6jd4zqb6ykkndj"; }); postPatch = stdenv.lib.optionalString doCheck '' diff --git a/pkgs/tools/misc/xxd/default.nix b/pkgs/tools/misc/xxd/default.nix deleted file mode 100644 index a4cfd4321ba0..000000000000 --- a/pkgs/tools/misc/xxd/default.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ stdenv, vim }: - -stdenv.mkDerivation rec { - name = "xxd-${version}"; - inherit (vim) version; - phases = [ "installPhase" ]; - installPhase = '' - mkdir -p $out/{bin,share/man/man1} - install -m755 ${stdenv.lib.getBin vim}/bin/xxd $out/bin/xxd - install -m644 ${stdenv.lib.getBin vim}/share/man/man1/xxd.1.gz $out/share/man/man1/xxd.1.gz - ''; - meta = with stdenv.lib; { - description = "Make a hexdump or do the reverse."; - inherit (vim.meta) homepage license maintainers platforms; - }; -} |