diff options
author | Orivej Desh <orivej@gmx.fr> | 2018-06-01 17:44:35 +0000 |
---|---|---|
committer | Orivej Desh <orivej@gmx.fr> | 2018-06-01 17:44:35 +0000 |
commit | 4b2735fd9fe26efb885e4dd53181237ddf9c2140 (patch) | |
tree | 44638c82dfd627d17d5b032f9c4f04975744d829 /pkgs/tools/misc | |
parent | fd9cfc4db512f41612727a4a4fe0303fe8f67bef (diff) | |
parent | bc069622dde963680f3e71c24f96a6fd32ed412e (diff) | |
download | nixlib-4b2735fd9fe26efb885e4dd53181237ddf9c2140.tar nixlib-4b2735fd9fe26efb885e4dd53181237ddf9c2140.tar.gz nixlib-4b2735fd9fe26efb885e4dd53181237ddf9c2140.tar.bz2 nixlib-4b2735fd9fe26efb885e4dd53181237ddf9c2140.tar.lz nixlib-4b2735fd9fe26efb885e4dd53181237ddf9c2140.tar.xz nixlib-4b2735fd9fe26efb885e4dd53181237ddf9c2140.tar.zst nixlib-4b2735fd9fe26efb885e4dd53181237ddf9c2140.zip |
Merge branch 'master' into staging
* master: (153 commits) coqPackages.contribs.aac-tactics: enable for Coq 8.7 and 8.8 (#41351) haskell.packages.ghcjs.terminfo: Bump version (#41337) nixos/mpd: allow services.mpd.dbFile to be null prometheus-snmp-exporter: 0.9.0 -> 0.11.0 (#41363) tdesktopPackages.preview: 1.2.24 -> 1.3.0 signal-desktop: Refactor the package description rrootage: init at 0.23a bulletml: init at 0.0.6 signal-desktop: Fix a possible crash when saving an attachment linux_rpi: More downstream device tree name fixups nixos/sd-image-raspberrypi: Support Raspberry Pi Zero U-Boot: Add ubootRaspberryPiZero variant U-Boot: 2018.03 -> 2018.05 linux_rpi: 1.20171029 -> 1.20180417 raspberrypifw: 1.20180328 -> 1.20180417 scite: 3.7.5 -> 4.0.5 (#41345) neo4j: 3.3.4 -> 3.4.0 (#41338) bat: 0.3.0 -> 0.4.1 (#41348) perlPackages.Git: init at 0.42 nodePackages_8_x.pnpm: wrap nodejs.passthru.python ...
Diffstat (limited to 'pkgs/tools/misc')
-rw-r--r-- | pkgs/tools/misc/bat/default.nix | 10 | ||||
-rw-r--r-- | pkgs/tools/misc/grub/2.0x.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/misc/opentsdb/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/misc/os-prober/default.nix | 46 |
4 files changed, 28 insertions, 38 deletions
diff --git a/pkgs/tools/misc/bat/default.nix b/pkgs/tools/misc/bat/default.nix index b869f1e634c5..7a3231ce85c2 100644 --- a/pkgs/tools/misc/bat/default.nix +++ b/pkgs/tools/misc/bat/default.nix @@ -1,19 +1,19 @@ -{ stdenv, pkgs, rustPlatform, fetchFromGitHub }: +{ stdenv, rustPlatform, fetchFromGitHub, cmake, pkgconfig, zlib }: rustPlatform.buildRustPackage rec { name = "bat-${version}"; - version = "0.3.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "sharkdp"; repo = "bat"; rev = "v${version}"; - sha256 = "15d7i0iy5lks3jg9js6n6fy4xanjk76fpryl2kq88kdkq67hpzfp"; + sha256 = "0fiif6b8g2hdb05s028dbcpav6ax0qap2hbsr9p2bld4z7j7321m"; }; - cargoSha256 = "179a7abhzpxjp3cc820jzxg0qk1fiv9rkpazwnzhkjl8yd7b7qi3"; + cargoSha256 = "0w0y3sfrpk8sn9rls90kjqrqr62pd690ripdfbvb5ipkzizp429l"; - buildInputs = with pkgs; [ pkgconfig cmake zlib file perl curl ]; + nativeBuildInputs = [ cmake pkgconfig zlib ]; meta = with stdenv.lib; { description = "A cat(1) clone with syntax highlighting and Git integration"; diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix index 96ce38ea9e85..84c06a49f843 100644 --- a/pkgs/tools/misc/grub/2.0x.nix +++ b/pkgs/tools/misc/grub/2.0x.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, fetchFromSavannah, autogen, flex, bison, python, autoconf, automake , gettext, ncurses, libusb, freetype, qemu, devicemapper, unifont, pkgconfig +, fuse # only needed for grub-mount , zfs ? null , efiSupport ? false , zfsSupport ? true @@ -47,7 +48,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ bison flex python pkgconfig ]; - buildInputs = [ ncurses libusb freetype gettext devicemapper ] + buildInputs = [ ncurses libusb freetype gettext devicemapper fuse ] ++ optional doCheck qemu ++ optional zfsSupport zfs; @@ -83,7 +84,8 @@ stdenv.mkDerivation rec { patches = [ ./fix-bash-completion.patch ]; - configureFlags = optional zfsSupport "--enable-libzfs" + configureFlags = [ "--enable-grub-mount" ] # dep of os-prober + ++ optional zfsSupport "--enable-libzfs" ++ optionals efiSupport [ "--with-platform=efi" "--target=${efiSystemsBuild.${stdenv.system}.target}" "--program-prefix=" ] ++ optionals xenSupport [ "--with-platform=xen" "--target=${efiSystemsBuild.${stdenv.system}.target}"]; diff --git a/pkgs/tools/misc/opentsdb/default.nix b/pkgs/tools/misc/opentsdb/default.nix index 31375eeaf85d..f6aea4a92ab9 100644 --- a/pkgs/tools/misc/opentsdb/default.nix +++ b/pkgs/tools/misc/opentsdb/default.nix @@ -6,11 +6,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "opentsdb-${version}"; - version = "2.3.0"; + version = "2.3.1"; src = fetchurl { url = "https://github.com/OpenTSDB/opentsdb/releases/download/v${version}/${name}.tar.gz"; - sha256 = "0nip40rh3vl5azfc27yha4ngnm9sw47hf110c90hg0warzz85sch"; + sha256 = "1lf1gynr11silla4bsrkwqv023dxirsb88ncs2qmc2ng35593fjd"; }; buildInputs = [ autoconf automake curl jdk makeWrapper nettools python git ]; diff --git a/pkgs/tools/misc/os-prober/default.nix b/pkgs/tools/misc/os-prober/default.nix index b879f621e142..c4a304e0d284 100644 --- a/pkgs/tools/misc/os-prober/default.nix +++ b/pkgs/tools/misc/os-prober/default.nix @@ -1,32 +1,27 @@ { stdenv, fetchurl, makeWrapper, -systemd, # udevadm -busybox, -coreutils, # os-prober desn't seem to work with pure busybox -devicemapper, # lvs -# optional dependencies -cryptsetup ? null, -libuuid ? null, # blkid and blockdev -dmraid ? null, -ntfs3g ? null +# optional dependencies, the command(s) they provide +coreutils, # mktemp +grub2, # grub-mount and grub-probe +cryptsetup, # cryptsetup +libuuid, # blkid and blockdev +libudev, # udevadm udevinfo +ntfs3g # ntfs3g }: stdenv.mkDerivation rec { version = "1.76"; name = "os-prober-${version}"; src = fetchurl { - url = "mirror://debian/pool/main/o/os-prober/os-prober_${version}.tar.xz"; - sha256 = "1vb45i76bqivlghrq7m3n07qfmmq4wxrkplqx8gywj011rhq19fk"; + url = "https://salsa.debian.org/philh/os-prober/-/archive/${version}/os-prober-${version}.tar.bz2"; + sha256 = "07rw3092pckh21vx6y4hzqcn3wn4cqmwxaaiq100lncnhmszg11g"; }; buildInputs = [ makeWrapper ]; installPhase = '' # executables - mkdir -p $out/bin - mkdir -p $out/lib - mkdir -p $out/share - cp os-prober linux-boot-prober $out/bin - cp newns $out/lib - cp common.sh $out/share + install -Dt $out/bin os-prober linux-boot-prober + install -Dt $out/lib newns + install -Dt $out/share common.sh # probes case "${stdenv.system}" in @@ -36,8 +31,7 @@ stdenv.mkDerivation rec { *) ARCH=other;; esac; for probes in os-probes os-probes/mounted os-probes/init linux-boot-probes linux-boot-probes/mounted; do - mkdir -p $out/lib/$probes; - cp $probes/common/* $out/lib/$probes; + install -Dt $out/lib/$probes $probes/common/*; if [ -e "$probes/$ARCH" ]; then mkdir -p $out/lib/$probes cp -r $probes/$ARCH/* $out/lib/$probes; @@ -57,21 +51,15 @@ stdenv.mkDerivation rec { done; for file in $out/bin/*; do wrapProgram $file \ - --set LVM_SYSTEM_DIR ${devicemapper} \ - --suffix PATH : "$out/bin${builtins.foldl' (x: y: x + ":" + y) "" ( - map (x: (toString x) + "/bin") ( - builtins.filter (x: x!=null) - [ devicemapper systemd coreutils cryptsetup libuuid dmraid ntfs3g busybox ] - ) - ) - }" \ + --suffix PATH : ${stdenv.lib.makeBinPath [ grub2 libudev coreutils cryptsetup libuuid ntfs3g ]} \ --run "[ -d /var/lib/os-prober ] || mkdir /var/lib/os-prober" done; ''; - meta = { + meta = with stdenv.lib; { description = "Utility to detect other OSs on a set of drives"; homepage = http://packages.debian.org/source/sid/os-prober; - license = stdenv.lib.licenses.gpl2Plus; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ symphorien ]; }; } |