diff options
Diffstat (limited to 'pkgs/tools')
-rw-r--r-- | pkgs/tools/X11/run-scaled/default.nix | 8 | ||||
-rw-r--r-- | pkgs/tools/X11/skippy-xd/default.nix | 35 | ||||
-rw-r--r-- | pkgs/tools/X11/xprintidle-ng/default.nix | 41 | ||||
-rw-r--r-- | pkgs/tools/cd-dvd/vobsub2srt/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/graphics/qrcode/default.nix | 10 | ||||
-rw-r--r-- | pkgs/tools/misc/clipnotify/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/misc/colorpicker/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/networking/connman/connman_dmenu/default.nix | 12 | ||||
-rw-r--r-- | pkgs/tools/security/tpm-luks/default.nix | 8 | ||||
-rw-r--r-- | pkgs/tools/system/das_watchdog/default.nix | 2 |
10 files changed, 87 insertions, 45 deletions
diff --git a/pkgs/tools/X11/run-scaled/default.nix b/pkgs/tools/X11/run-scaled/default.nix index 012eedf077914..d62b38bdf2872 100644 --- a/pkgs/tools/X11/run-scaled/default.nix +++ b/pkgs/tools/X11/run-scaled/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub, makeWrapper, bc, xorgserver, xpra, xrandr }: stdenv.mkDerivation { - version = "git-2018-06-03"; + version = "unstable-2018-06-03"; pname = "run-scaled"; src = fetchFromGitHub { - owner = "kaueraal"; - repo = "run_scaled"; - rev = "fa71b3c17e627a96ff707ad69f1def5361f2245c"; + owner = "kaueraal"; + repo = "run_scaled"; + rev = "fa71b3c17e627a96ff707ad69f1def5361f2245c"; sha256 = "1ma4ax7ydq4xvyzrc4zapihmf7v3d9zl9mbi8bgpps7nlgz544ys"; }; diff --git a/pkgs/tools/X11/skippy-xd/default.nix b/pkgs/tools/X11/skippy-xd/default.nix index 0519f2c420442..255d4c34e58d3 100644 --- a/pkgs/tools/X11/skippy-xd/default.nix +++ b/pkgs/tools/X11/skippy-xd/default.nix @@ -1,14 +1,33 @@ -{lib, stdenv, fetchgit, xorgproto, libX11, libXft, libXcomposite, libXdamage -, libXext, libXinerama, libjpeg, giflib, pkg-config +{ lib +, stdenv +, fetchgit +, xorgproto +, libX11 +, libXft +, libXcomposite +, libXdamage +, libXext +, libXinerama +, libjpeg +, giflib +, pkg-config }: let buildInputs = [ - xorgproto libX11 libXft libXcomposite libXdamage libXext - libXinerama libjpeg giflib pkg-config + xorgproto + libX11 + libXft + libXcomposite + libXdamage + libXext + libXinerama + libjpeg + giflib + pkg-config ]; in stdenv.mkDerivation rec { - version = "git-2015-03-01"; + version = "unstable-2015-03-01"; pname = "skippy-xd"; inherit buildInputs; src = fetchgit { @@ -16,14 +35,14 @@ stdenv.mkDerivation rec { rev = "397216ca67"; sha256 = "0zcjacilmsv69rv85j6nfr6pxy8z36w1sjz0dbjg6s5m4kga1zl8"; }; - makeFlags = ["PREFIX=$(out)"]; + makeFlags = [ "PREFIX=$(out)" ]; preInstall = '' sed -e "s@/etc/xdg@$out&@" -i Makefile ''; meta = { description = "Expose-style compositing-based standalone window switcher"; - license = lib.licenses.gpl2Plus ; - maintainers = [lib.maintainers.raskin]; + license = lib.licenses.gpl2Plus; + maintainers = [ lib.maintainers.raskin ]; platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/X11/xprintidle-ng/default.nix b/pkgs/tools/X11/xprintidle-ng/default.nix index 61e48de7f5e14..fdb3b7c58a567 100644 --- a/pkgs/tools/X11/xprintidle-ng/default.nix +++ b/pkgs/tools/X11/xprintidle-ng/default.nix @@ -1,11 +1,24 @@ -{ lib, stdenv, fetchFromGitHub, libX11, libXScrnSaver, libXext, gnulib - , autoconf, automake, libtool, gettext, pkg-config - , git, perl, texinfo, help2man +{ lib +, stdenv +, fetchFromGitHub +, libX11 +, libXScrnSaver +, libXext +, gnulib +, autoconf +, automake +, libtool +, gettext +, pkg-config +, git +, perl +, texinfo +, help2man }: stdenv.mkDerivation rec { pname = "xprintidle-ng"; - version = "git-2015-09-01"; + version = "unstable-2015-09-01"; src = fetchFromGitHub { owner = "taktoa"; @@ -20,8 +33,16 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ - autoconf automake gettext git gnulib - help2man libtool perl pkg-config texinfo + autoconf + automake + gettext + git + gnulib + help2man + libtool + perl + pkg-config + texinfo ]; configurePhase = '' @@ -30,15 +51,17 @@ stdenv.mkDerivation rec { ''; buildInputs = [ - libX11 libXScrnSaver libXext + libX11 + libXScrnSaver + libXext ]; meta = { - inherit version; + inherit version; description = "A command-line tool to print idle time from libXss"; homepage = "http://taktoa.me/xprintidle-ng/"; license = lib.licenses.gpl2; - maintainers = [lib.maintainers.raskin]; + maintainers = [ lib.maintainers.raskin ]; platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/cd-dvd/vobsub2srt/default.nix b/pkgs/tools/cd-dvd/vobsub2srt/default.nix index 54df481cd676d..624bcc08b41f0 100644 --- a/pkgs/tools/cd-dvd/vobsub2srt/default.nix +++ b/pkgs/tools/cd-dvd/vobsub2srt/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchgit, cmake, libtiff, pkg-config, tesseract }: stdenv.mkDerivation rec { - pname = "vobsub2srt-git"; - version = "20140817-${builtins.substring 0 7 rev}"; + pname = "vobsub2srt"; + version = "unstable-2014-08-17"; rev = "a6abbd61127a6392d420bbbebdf7612608c943c2"; src = fetchgit { diff --git a/pkgs/tools/graphics/qrcode/default.nix b/pkgs/tools/graphics/qrcode/default.nix index 93a620b57792e..2067d1a97e2e6 100644 --- a/pkgs/tools/graphics/qrcode/default.nix +++ b/pkgs/tools/graphics/qrcode/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation { - pname = "qrcode-git"; - version = "20160804"; + pname = "qrcode"; + version = "unstable-2016-08-04"; src = fetchFromGitHub { - owner = "qsantos"; - repo = "qrcode"; - rev = "ad0fdb4aafd0d56b903f110f697abaeb27deee73"; + owner = "qsantos"; + repo = "qrcode"; + rev = "ad0fdb4aafd0d56b903f110f697abaeb27deee73"; sha256 = "0v81745nx5gny2g05946k8j553j18a29ikmlyh6c3syq6c15k8cf"; }; diff --git a/pkgs/tools/misc/clipnotify/default.nix b/pkgs/tools/misc/clipnotify/default.nix index 5cb3a5114d8ad..51a67f6983f81 100644 --- a/pkgs/tools/misc/clipnotify/default.nix +++ b/pkgs/tools/misc/clipnotify/default.nix @@ -1,12 +1,12 @@ { libX11, libXfixes, lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "clipnotify"; - version = "git-2018-02-20"; + version = "unstable-2018-02-20"; src = fetchFromGitHub { owner = "cdown"; - repo = "clipnotify"; - rev = "9cb223fbe494c5b71678a9eae704c21a97e3bddd"; + repo = "clipnotify"; + rev = "9cb223fbe494c5b71678a9eae704c21a97e3bddd"; sha256 = "1x9avjq0fgw0svcbw6b6873qnsqxbacls9sipmcv86xia4bxh8dn"; }; diff --git a/pkgs/tools/misc/colorpicker/default.nix b/pkgs/tools/misc/colorpicker/default.nix index 07d15469383d5..475041b4f6828 100644 --- a/pkgs/tools/misc/colorpicker/default.nix +++ b/pkgs/tools/misc/colorpicker/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "colorpicker"; - version = "git-2018-01-14"; + version = "unstable-2018-01-14"; src = fetchFromGitHub { owner = "Ancurio"; - repo = "colorpicker"; - rev = "287676947e6e3b5b0cee784aeb1638cf22f0ce17"; + repo = "colorpicker"; + rev = "287676947e6e3b5b0cee784aeb1638cf22f0ce17"; sha256 = "1kj1dpb79llrfpszraaz6r7ci114zqi5rmqxwsvq2dnnpjxyi29r"; }; diff --git a/pkgs/tools/networking/connman/connman_dmenu/default.nix b/pkgs/tools/networking/connman/connman_dmenu/default.nix index 3ac730f471f78..86e5a62fb8dec 100644 --- a/pkgs/tools/networking/connman/connman_dmenu/default.nix +++ b/pkgs/tools/networking/connman/connman_dmenu/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation { pname = "connman_dmenu"; - version = "git-29-9-2015"; + version = "unstable-2015-09-29"; src = fetchFromGitHub { owner = "march-linux"; @@ -26,10 +26,10 @@ stdenv.mkDerivation { ''; meta = { - description = "A dmenu wrapper for connmann"; - homepage = "https://github.com/march-linux/connman_dmenu"; - license = lib.licenses.free; - maintainers = [ lib.maintainers.magnetophon ]; - platforms = lib.platforms.all; + description = "A dmenu wrapper for connmann"; + homepage = "https://github.com/march-linux/connman_dmenu"; + license = lib.licenses.free; + maintainers = [ lib.maintainers.magnetophon ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/tools/security/tpm-luks/default.nix b/pkgs/tools/security/tpm-luks/default.nix index 2af4a742208cc..4aab72cb5dfce 100644 --- a/pkgs/tools/security/tpm-luks/default.nix +++ b/pkgs/tools/security/tpm-luks/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation { pname = "tpm-luks"; - version = "git-2015-07-11"; + version = "unstable-2015-07-11"; src = fetchgit { url = "https://github.com/momiji/tpm-luks"; @@ -23,14 +23,14 @@ stdenv.mkDerivation { make install DESTDIR=$out mv $out/$out/sbin $out/bin rm -r $out/nix - ''; + ''; meta = with lib; { description = "LUKS key storage in TPM NVRAM"; - homepage = "https://github.com/shpedoikal/tpm-luks/"; + homepage = "https://github.com/shpedoikal/tpm-luks/"; maintainers = [ maintainers.tstrobel ]; license = with licenses; [ gpl2Only ]; - platforms = platforms.linux; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/system/das_watchdog/default.nix b/pkgs/tools/system/das_watchdog/default.nix index d9332acc898f5..65be63bffe125 100644 --- a/pkgs/tools/system/das_watchdog/default.nix +++ b/pkgs/tools/system/das_watchdog/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation { pname = "das_watchdog"; - version = "git-2015-09-12"; + version = "unstable-2015-09-12"; src = fetchgit { url = "https://github.com/kmatheussen/das_watchdog.git"; |