diff options
Diffstat (limited to 'pkgs/tools/misc')
25 files changed, 171 insertions, 78 deletions
diff --git a/pkgs/tools/misc/autojump/default.nix b/pkgs/tools/misc/autojump/default.nix index 3bd44fb07b7e..ea486dd5154f 100644 --- a/pkgs/tools/misc/autojump/default.nix +++ b/pkgs/tools/misc/autojump/default.nix @@ -22,9 +22,13 @@ in mkdir -p "$out/etc/bash_completion.d" cp -v $out/share/autojump/autojump.bash "$out/etc/bash_completion.d" - # FIXME: What's the right place for `autojump.zsh'? - # This can be used as a workaround in .zshrc: - # . $HOME/.nix-profile/share/autojump/autojump.zsh + cat <<SCRIPT > $out/bin/autojump-share + #!/bin/sh + # Run this script to find the autojump shared folder where all the shell + # integration scripts are living. + echo $out/share/autojump + SCRIPT + chmod +x $out/bin/autojump-share ''; meta = { @@ -52,6 +56,6 @@ in homepage = http://wiki.github.com/joelthelion/autojump; license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.all; - maintainers = [ stdenv.lib.maintainers.iElectric ]; + maintainers = [ stdenv.lib.maintainers.domenkozar ]; }; } diff --git a/pkgs/tools/misc/calamares/default.nix b/pkgs/tools/misc/calamares/default.nix index 9346ce481277..7c7c0b0a5ec3 100644 --- a/pkgs/tools/misc/calamares/default.nix +++ b/pkgs/tools/misc/calamares/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, cmake, polkit-qt, libyamlcpp, python, boost, parted , extra-cmake-modules, kconfig, ki18n, kcoreaddons, solid, utillinux, libatasmart -, ckbcomp, glibc, tzdata, xkeyboard_config, qtbase, qtquick1, qtsvg, qttools }: +, ckbcomp, glibc, tzdata, xkeyboard_config, qtbase, qtsvg, qttools }: stdenv.mkDerivation rec { name = "${pname}-${version}"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - cmake qtbase qtquick1 qtsvg qttools libyamlcpp python boost polkit-qt parted + cmake qtbase qtsvg qttools libyamlcpp python boost polkit-qt parted extra-cmake-modules kconfig ki18n kcoreaddons solid utillinux libatasmart ]; diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index 6836ee46ba14..90c5f953e573 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -73,7 +73,8 @@ let # (http://thread.gmane.org/gmane.comp.gnu.core-utils.bugs/19025), # Darwin (http://thread.gmane.org/gmane.comp.gnu.core-utils.bugs/19351), # and {Open,Free}BSD. - doCheck = stdenv ? glibc; + # With non-standard storeDir: https://github.com/NixOS/nix/issues/512 + doCheck = stdenv ? glibc && builtins.storeDir == "/nix/store"; # Saw random failures like ‘help2man: can't get '--help' info from # man/sha512sum.td/sha512sum’. diff --git a/pkgs/tools/misc/debootstrap/default.nix b/pkgs/tools/misc/debootstrap/default.nix index 9b6c35f41a47..d60b47ca0116 100644 --- a/pkgs/tools/misc/debootstrap/default.nix +++ b/pkgs/tools/misc/debootstrap/default.nix @@ -1,11 +1,8 @@ { stdenv, fetchurl, dpkg, gettext, gawk, perl, wget, coreutils, fakeroot }: let - # USAGE like this: debootstrap sid /tmp/target-chroot-directory - # There is also cdebootstrap now. Is that easier to maintain? - makedev = stdenv.mkDerivation { name = "makedev-for-debootstrap"; src = fetchurl { @@ -27,30 +24,26 @@ let chmod +x $t ''; }; - -in - -stdenv.mkDerivation { - - name = "debootstrap-1.0.67"; +in stdenv.mkDerivation rec { + name = "debootstrap-${version}"; + version = "1.0.80"; src = fetchurl { # git clone git://git.debian.org/d-i/debootstrap.git # I'd like to use the source. However it's lacking the lanny script ? (still true?) - url = mirror://debian/pool/main/d/debootstrap/debootstrap_1.0.67.tar.gz; - sha256 = "06x5zw6fskw37qh62hvqx006319l4wgnnw8sf53ms67zpfif04ha"; + url = "mirror://debian/pool/main/d/debootstrap/debootstrap_${version}.tar.gz"; + sha256 = "06gigscd2327wsvc7n7w2m8xmaixvp4kyqhayn00qrgd9i9w34x6"; }; buildInputs = [ dpkg gettext gawk perl ]; - buildPhase = ":"; + dontBuild = true; # If you have to update the patch for functions a vim regex like this # can help you identify which lines are used to write scripts on TARGET and # which should /bin/ paths should be replaced: # \<echo\>\|\/bin\/\|^\s*\<cat\>\|EOF\|END installPhase = '' - sed -i \ -e 's@/usr/bin/id@id@' \ -e 's@/usr/bin/dpkg@${dpkg}/bin/dpkg@' \ @@ -58,7 +51,6 @@ stdenv.mkDerivation { -e 's@/bin/sha@${coreutils}/bin/sha@' \ debootstrap - for file in functions debootstrap; do substituteInPlace "$file" \ --subst-var-by gunzip "$(type -p gunzip)" \ @@ -102,7 +94,7 @@ stdenv.mkDerivation { inherit makedev; }; - meta = { + meta = { description = "Tool to create a Debian system in a chroot"; homepage = http://packages.debian.org/de/lenny/debootstrap; # http://code.erisian.com.au/Wiki/debootstrap license = stdenv.lib.licenses.gpl2; # gentoo says so.. ? diff --git a/pkgs/tools/misc/ethtool/default.nix b/pkgs/tools/misc/ethtool/default.nix index 16af347e5510..9ffc4723dfd3 100644 --- a/pkgs/tools/misc/ethtool/default.nix +++ b/pkgs/tools/misc/ethtool/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "ethtool-4.0"; + name = "ethtool-4.5"; src = fetchurl { url = "mirror://kernel/software/network/ethtool/${name}.tar.xz"; - sha256 = "1zzcwn6pk8qfasalqkxg8vrhacksfa50xsq4xifw7yfjqyn8fj4h"; + sha256 = "0fyakzpcrjb7hkaj9ccpcgza7r2im17qzxy9w6xzbiss5hrk8a5v"; }; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/fileschanged/default.nix b/pkgs/tools/misc/fileschanged/default.nix index d6ae74e02b5e..29d09ff09c97 100644 --- a/pkgs/tools/misc/fileschanged/default.nix +++ b/pkgs/tools/misc/fileschanged/default.nix @@ -28,6 +28,5 @@ stdenv.mkDerivation rec { ''; platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.simons ]; }; } diff --git a/pkgs/tools/misc/flashrom/default.nix b/pkgs/tools/misc/flashrom/default.nix index b514f1c920f2..9db6fbca6fa6 100644 --- a/pkgs/tools/misc/flashrom/default.nix +++ b/pkgs/tools/misc/flashrom/default.nix @@ -1,15 +1,16 @@ { stdenv, fetchurl, pkgconfig, libftdi, pciutils }: -let version = "0.9.7"; in +let version = "0.9.9"; in stdenv.mkDerivation rec { name = "flashrom-${version}"; src = fetchurl { url = "http://download.flashrom.org/releases/${name}.tar.bz2"; - sha256 = "5a55212d00791981a9a1cb0cdca9d9e58bea6d399864251e7b410b4d3d6137e9"; + sha256 = "0i9wg1lyfg99bld7d00zqjm9f0lk6m0q3h3n9c195c9yysq5ccfb"; }; - buildInputs = [ pkgconfig libftdi pciutils ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libftdi pciutils ]; preConfigure = "export PREFIX=$out"; diff --git a/pkgs/tools/misc/fpp/default.nix b/pkgs/tools/misc/fpp/default.nix new file mode 100644 index 000000000000..5261035b35c5 --- /dev/null +++ b/pkgs/tools/misc/fpp/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchFromGitHub, python27Full }: + +stdenv.mkDerivation rec { + name = "fpp-${version}"; + version = "0.7.1"; + + src = fetchFromGitHub { + owner = "facebook"; + repo = "PathPicker"; + rev = version; + sha256 = "1mfyr9k5s3l1sg3c9vlyiqg8n1wwppzb981az2xaxqyk95wwl1sa"; + }; + + postPatch = '' + substituteInPlace fpp --replace 'PYTHONCMD="python"' 'PYTHONCMD="${python27Full.interpreter}"' + ''; + + installPhase = '' + mkdir -p $out/share/fpp $out/bin + cp -r fpp src $out/share/fpp + ln -s $out/share/fpp/fpp $out/bin/fpp + ''; + + meta = { + description = "CLI program that accepts piped input and presents files for selection"; + homepage = https://facebook.github.io/PathPicker/; + license = stdenv.lib.licenses.bsd3; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/tools/misc/graylog/default.nix b/pkgs/tools/misc/graylog/default.nix index a3952f7903b2..3613625b3a2f 100644 --- a/pkgs/tools/misc/graylog/default.nix +++ b/pkgs/tools/misc/graylog/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "2.0.0"; + version = "2.0.1"; name = "graylog-${version}"; src = fetchurl { url = "https://packages.graylog2.org/releases/graylog/graylog-${version}.tgz"; - sha256 = "0qn2rf2aarfr34387fiv34rmav20c66b4zs9bkm8gpvj0laxrqh2"; + sha256 = "0i9nng361qnnws7jnk5m91nj5ifg4h78yayahsfjn37665rsrdga"; }; dontBuild = true; diff --git a/pkgs/tools/misc/heimdall/default.nix b/pkgs/tools/misc/heimdall/default.nix index e82f61e69f5b..f84ccce4eb99 100644 --- a/pkgs/tools/misc/heimdall/default.nix +++ b/pkgs/tools/misc/heimdall/default.nix @@ -1,17 +1,15 @@ -{ stdenv, fetchFromGitHub, zlib, libusb1, cmake, qt5 -, enableGUI ? false }: +{ stdenv, fetchFromGitHub, zlib, libusb1, cmake, qt5, enableGUI ? false }: -let version = "d0526a3"; in -let verName = "1.4.2pre"; in +let version = "1.4.1-34-g7ebee1e"; in -stdenv.mkDerivation rec { - name = "heimdall-${verName}"; +stdenv.mkDerivation { + name = "heimdall-${version}"; src = fetchFromGitHub { owner = "Benjamin-Dobell"; repo = "Heimdall"; - rev = "${version}"; - sha256 = "1y8gvqprajlml1z6mjcrlj54m9xsr8691nqagakkkis7hs1lgzmp"; + rev = "v${version}"; + sha256 = "10c71k251wxd05j6c76qlar5sd73zam1c1g2cq3cscqayd7rzafg"; }; buildInputs = [ zlib libusb1 cmake ]; @@ -19,30 +17,28 @@ stdenv.mkDerivation rec { sed -i '/heimdall-frontend/d' CMakeLists.txt ''; enableParallelBuilding = true; - cmakeFlags = ["-DQt5Widgets_DIR=${qt5.qtbase}/lib/cmake/Qt5Widgets" - "-DQt5Gui_DIR=${qt5.qtbase}/lib/cmake/Qt5Gui" - "-DQt5Core_DIR=${qt5.qtbase}/lib/cmake/Qt5Core" - "-DBUILD_TYPE=Release"]; + cmakeFlags = [ + "-DQt5Widgets_DIR=${qt5.qtbase}/lib/cmake/Qt5Widgets" + "-DQt5Gui_DIR=${qt5.qtbase}/lib/cmake/Qt5Gui" + "-DQt5Core_DIR=${qt5.qtbase}/lib/cmake/Qt5Core" + "-DBUILD_TYPE=Release" + ]; - preConfigure = - '' - # Give ownership of the Galaxy S USB device to the logged in user. - substituteInPlace heimdall/60-heimdall.rules --replace 'MODE="0666"' 'TAG+="uaccess"' - ''; + preConfigure = '' + # Give ownership of the Galaxy S USB device to the logged in user. + substituteInPlace heimdall/60-heimdall.rules --replace 'MODE="0666"' 'TAG+="uaccess"' + ''; - installPhase = - '' - mkdir -p $out/bin $out/share/doc/heimdall $out/lib/udev/rules.d - cp bin/heimdall $out/bin - cp ../Linux/README $out/share/doc/heimdall - cp ../heimdall/60-heimdall.rules $out/lib/udev/rules.d - '' + stdenv.lib.optionalString enableGUI '' - cp bin/heimdall-frontend $out/bin - ''; + installPhase = '' + mkdir -p $out/bin $out/share/doc/heimdall $out/lib/udev/rules.d + cp "bin/"* $out/bin/ + cp ../Linux/README $out/share/doc/heimdall + cp ../heimdall/60-heimdall.rules $out/lib/udev/rules.d + ''; meta = { - homepage = http://www.glassechidna.com.au/products/heimdall/; - description = "A cross-platform open-source tool suite used to flash firmware onto Samsung Galaxy S devices"; + homepage = "http://www.glassechidna.com.au/products/heimdall/"; + description = "A cross-platform tool suite to flash firmware onto Samsung Galaxy S devices"; license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/tools/misc/i3minator/default.nix b/pkgs/tools/misc/i3minator/default.nix index 45fd27b7f4f9..e51150d68769 100644 --- a/pkgs/tools/misc/i3minator/default.nix +++ b/pkgs/tools/misc/i3minator/default.nix @@ -20,7 +20,7 @@ buildPythonApplication rec { ''; homepage = https://github.com/carlesso/i3minator; license = stdenv.lib.licenses.wtfpl; - maintainers = with maintainers; [ iElectric ]; + maintainers = with maintainers; [ domenkozar ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/tools/misc/ldapvi/default.nix b/pkgs/tools/misc/ldapvi/default.nix index df29341d58b4..d96409809a6e 100644 --- a/pkgs/tools/misc/ldapvi/default.nix +++ b/pkgs/tools/misc/ldapvi/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ''; homepage = http://www.lichteblau.com/ldapvi/; license = licenses.gpl2; - maintainers = with maintainers; [ iElectric ]; + maintainers = with maintainers; [ domenkozar ]; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/misc/lesspipe/default.nix b/pkgs/tools/misc/lesspipe/default.nix new file mode 100644 index 000000000000..46324f912c52 --- /dev/null +++ b/pkgs/tools/misc/lesspipe/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchFromGitHub, perl }: + +stdenv.mkDerivation rec { + name = "lesspipe-${version}"; + version = "1.82"; + + buildInputs = [ perl ]; + preConfigure = "patchShebangs ."; + + src = fetchFromGitHub { + owner = "wofr06"; + repo = "lesspipe"; + rev = version; + sha256 = "0vb7bpap8vy003ha10hc7hxl17y47sgdnrjpihgqxkn8k0bfqbbq"; + }; + + meta = with stdenv.lib; { + description = "A preprocessor for less"; + longDescription = '' + Usually lesspipe.sh is called as an input filter to less. With the help + of that filter less will display the uncompressed contents of compressed + (gzip, bzip2, compress, rar, 7-zip, lzip, xz or lzma) files. For files + containing archives and directories, a table of contents will be + displayed (e.g tar, ar, rar, jar, rpm and deb formats). Other supported + formats include nroff, pdf, ps, dvi, shared library, MS word, OASIS + (e.g. Openoffice), NetCDF, html, mp3, jpg, png, iso images, MacOSX bom, + plist and archive formats, perl storable data and gpg encrypted files. + This does require additional helper programs being installed. + ''; + homepage = https://github.com/wofr06/lesspipe; + platforms = platforms.all; + license = licenses.gpl2; + maintainers = [ maintainers.martijnvermaat ]; + }; +} diff --git a/pkgs/tools/misc/mc/default.nix b/pkgs/tools/misc/mc/default.nix index 94c08fa9ba9b..9347b5f9bbe0 100644 --- a/pkgs/tools/misc/mc/default.nix +++ b/pkgs/tools/misc/mc/default.nix @@ -2,11 +2,11 @@ , libX11, libICE, perl, zip, unzip, gettext, slang}: stdenv.mkDerivation rec { - name = "mc-4.8.12"; + name = "mc-4.8.16"; src = fetchurl { - url = http://www.midnight-commander.org/downloads/mc-4.8.12.tar.bz2; - sha256 = "15lkwcis0labshq9k8c2fqdwv8az2c87qpdqwp5p31s8gb1gqm0h"; + url = http://www.midnight-commander.org/downloads/mc-4.8.16.tar.bz2; + sha256 = "1y5apnp6sc9sn13m6816hlrr0dis1z7wsnffldsx7xlkvyas8zn3"; }; buildInputs = [ pkgconfig perl glib gpm slang zip unzip file gettext libX11 libICE e2fsprogs ]; diff --git a/pkgs/tools/misc/moreutils/default.nix b/pkgs/tools/misc/moreutils/default.nix index 759847b897a0..d7e529dea9e3 100644 --- a/pkgs/tools/misc/moreutils/default.nix +++ b/pkgs/tools/misc/moreutils/default.nix @@ -26,5 +26,6 @@ stdenv.mkDerivation rec { description = "Growing collection of the unix tools that nobody thought to write long ago when unix was young"; homepage = https://joeyh.name/code/moreutils/; maintainers = with maintainers; [ koral ]; + platforms = platforms.all; }; } diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix index b4e793976c7a..659a12dde6b0 100644 --- a/pkgs/tools/misc/parallel/default.nix +++ b/pkgs/tools/misc/parallel/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, perl, makeWrapper, procps }: stdenv.mkDerivation rec { - name = "parallel-20160322"; + name = "parallel-20160422"; src = fetchurl { url = "mirror://gnu/parallel/${name}.tar.bz2"; - sha256 = "020vfcwapla6b4c9pr5ik7kg47fswszdds2mr52kc907xi4zcc34"; + sha256 = "0hmcr5lcg3701rh804fch6qp6pcrmgwcaigbm4c14dk6293qynh6"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/misc/rpm-ostree/default.nix b/pkgs/tools/misc/rpm-ostree/default.nix index 8df9666c10b8..997d8279e04e 100644 --- a/pkgs/tools/misc/rpm-ostree/default.nix +++ b/pkgs/tools/misc/rpm-ostree/default.nix @@ -6,8 +6,8 @@ let libglnx-src = fetchFromGitHub { owner = "GNOME"; repo = "libglnx"; - rev = "08ae6639e522e9b11765245fbecdbbe474ccde98"; - sha256 = "1k7fbivi2mwb2x5bqqbqc3nbnfjjw1l911hs914197hyqpy21dab"; + rev = "85c9dd5c073a8c0d74c4baa2e4a94f5535984e62"; + sha256 = "08m8wxlkymwq5hsc26k7ndwiqiw1ggaaxyi2qfhqznasgbp4g623"; }; in stdenv.mkDerivation rec { rev = "v2016.1"; diff --git a/pkgs/tools/misc/screen/default.nix b/pkgs/tools/misc/screen/default.nix index de9836422e66..652c4f989050 100644 --- a/pkgs/tools/misc/screen/default.nix +++ b/pkgs/tools/misc/screen/default.nix @@ -59,6 +59,6 @@ stdenv.mkDerivation rec { ''; platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ simons jgeerds ]; + maintainers = with stdenv.lib.maintainers; [ peti jgeerds ]; }; } diff --git a/pkgs/tools/misc/svtplay-dl/default.nix b/pkgs/tools/misc/svtplay-dl/default.nix index f8c087aa757b..7848abcf14dc 100644 --- a/pkgs/tools/misc/svtplay-dl/default.nix +++ b/pkgs/tools/misc/svtplay-dl/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "svtplay-dl-${version}"; - version = "1.0"; + version = "1.1"; src = fetchFromGitHub { owner = "spaam"; repo = "svtplay-dl"; rev = version; - sha256 = "0chvljmhj7waq3dfyciiyk3i18hmrczc70qfyhn2ycq0k0nbn0jj"; + sha256 = "0wzh86zjly2r03qpjb5z0ddy79qkbw7k04qfawj22nf2w629r0dk"; }; pythonPaths = [ pycrypto requests2 ]; diff --git a/pkgs/tools/misc/unclutter/default.nix b/pkgs/tools/misc/unclutter/default.nix index 00f08ee07427..d8731f764b33 100644 --- a/pkgs/tools/misc/unclutter/default.nix +++ b/pkgs/tools/misc/unclutter/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { unclutter -idle 1 & ''; - maintainers = with maintainers; [ iElectric ]; + maintainers = with maintainers; [ domenkozar ]; platforms = platforms.unix; }; } diff --git a/pkgs/tools/misc/wakatime/default.nix b/pkgs/tools/misc/wakatime/default.nix new file mode 100644 index 000000000000..cf3b75be3f68 --- /dev/null +++ b/pkgs/tools/misc/wakatime/default.nix @@ -0,0 +1,29 @@ +{ stdenv, pythonPackages, fetchFromGitHub }: + +with pythonPackages; + +buildPythonPackage rec { + namePrefix = ""; + name = "wakatime-${version}"; + version = "6.0.1"; + + src = fetchFromGitHub { + sha256 = "0bkzchivkz39jiz78jy7zkpsg6fd94wd7nsmrnijvxb3dn35l7l2"; + rev = version; + repo = "wakatime"; + owner = "wakatime"; + }; + + meta = with stdenv.lib; { + inherit (src.meta) homepage; + description = "WakaTime command line interface"; + longDescription = '' + Command line interface to WakaTime used by all WakaTime text editor + plugins. You shouldn't need to directly use this package unless you + are building your own plugin or your text editor's plugin asks you + to install the wakatime CLI interface manually. + ''; + license = licenses.bsd3; + maintainers = with maintainers; [ nckx ]; + }; +} diff --git a/pkgs/tools/misc/xfstests/default.nix b/pkgs/tools/misc/xfstests/default.nix index abca512b1d08..b0395b83e7db 100644 --- a/pkgs/tools/misc/xfstests/default.nix +++ b/pkgs/tools/misc/xfstests/default.nix @@ -1,5 +1,5 @@ { stdenv, acl, attr, autoreconfHook, bash, bc, coreutils, e2fsprogs, fetchgit, fio, gawk -, lib, libaio, libcap_progs, libuuid, libxfs, lvm2, openssl, perl, procps, psmisc, su +, lib, libaio, libcap, libuuid, libxfs, lvm2, openssl, perl, procps, psmisc, su , time, utillinux, which, writeScript, xfsprogs }: stdenv.mkDerivation { @@ -74,7 +74,7 @@ stdenv.mkDerivation { ln -s @out@/lib/xfstests/$f $f done - export PATH=${lib.makeBinPath [acl attr bc e2fsprogs fio gawk libcap_progs lvm2 perl procps psmisc su utillinux which xfsprogs]}:$PATH + export PATH=${lib.makeBinPath [acl attr bc e2fsprogs fio gawk libcap lvm2 perl procps psmisc su utillinux which xfsprogs]}:$PATH exec ./check "$@" ''; diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index a10fd37da281..bee8231b64ee 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -40,6 +40,6 @@ buildPythonApplication rec { ''; license = licenses.publicDomain; platforms = with platforms; linux ++ darwin; - maintainers = with maintainers; [ bluescreen303 simons phreedom AndersonTorres fuuzetsu ]; + maintainers = with maintainers; [ bluescreen303 phreedom AndersonTorres fuuzetsu ]; }; } diff --git a/pkgs/tools/misc/yubikey-personalization/default.nix b/pkgs/tools/misc/yubikey-personalization/default.nix index 1562b9e69b8e..8b8b5074fc39 100644 --- a/pkgs/tools/misc/yubikey-personalization/default.nix +++ b/pkgs/tools/misc/yubikey-personalization/default.nix @@ -16,9 +16,11 @@ stdenv.mkDerivation rec { "--with-backend=libusb-1.0" ]; + doCheck = true; + postInstall = '' - mkdir -p $out/lib/udev/rules.d/ - cp -v *.rules $out/lib/udev/rules.d/ + # Don't use 70-yubikey.rules because it depends on ConsoleKit + install -D -t $out/lib/udev/rules.d 69-yubikey.rules ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/zsh-navigation-tools/default.nix b/pkgs/tools/misc/zsh-navigation-tools/default.nix index 8074f78db50b..ffd48bef58c2 100644 --- a/pkgs/tools/misc/zsh-navigation-tools/default.nix +++ b/pkgs/tools/misc/zsh-navigation-tools/default.nix @@ -2,21 +2,24 @@ stdenv.mkDerivation rec { name = "zsh-navigation-tools-${version}"; - version = "1.4"; + version = "2.1.14"; src = fetchFromGitHub { owner = "psprint"; repo = "zsh-navigation-tools"; rev = "v${version}"; - sha256 = "1r24mpx57jyn201mdhd793rlhlr5r83n9137aafkgf86282ghr7y"; + sha256 = "0q0c5kcvwxfyn5hz3ir3s03jhdr6yjs5mmldz6kpkrh45qmzq9zz"; }; dontBuild = true; installPhase = '' mkdir -p $out/share/zsh/site-functions/ + cp zsh-navigation-tools.plugin.zsh $out/share/zsh/site-functions/ cp n-* $out/share/zsh/site-functions/ cp znt-* $out/share/zsh/site-functions/ + mkdir -p $out/share/zsh/site-functions/.config/znt + cp .config/znt/n-* $out/share/zsh/site-functions/.config/znt ''; meta = with stdenv.lib; { |