diff options
Diffstat (limited to 'pkgs/tools/misc')
-rw-r--r-- | pkgs/tools/misc/autorandr/default.nix | 112 | ||||
-rw-r--r-- | pkgs/tools/misc/bcunit/default.nix | 1 | ||||
-rw-r--r-- | pkgs/tools/misc/clac/default.nix | 1 | ||||
-rw-r--r-- | pkgs/tools/misc/clasp/default.nix | 8 | ||||
-rw-r--r-- | pkgs/tools/misc/cp437/default.nix | 7 | ||||
-rw-r--r-- | pkgs/tools/misc/dijo/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/misc/diskscan/default.nix | 1 | ||||
-rw-r--r-- | pkgs/tools/misc/edid-decode/default.nix | 7 | ||||
-rw-r--r-- | pkgs/tools/misc/edid-generator/default.nix | 7 | ||||
-rw-r--r-- | pkgs/tools/misc/fsql/default.nix | 1 | ||||
-rw-r--r-- | pkgs/tools/misc/gringo/default.nix | 8 | ||||
-rw-r--r-- | pkgs/tools/misc/hdaps-gl/default.nix | 37 | ||||
-rw-r--r-- | pkgs/tools/misc/lbdb/default.nix | 5 | ||||
-rw-r--r-- | pkgs/tools/misc/unclutter-xfixes/default.nix | 1 | ||||
-rw-r--r-- | pkgs/tools/misc/yubikey-manager-qt/default.nix | 1 |
15 files changed, 90 insertions, 113 deletions
diff --git a/pkgs/tools/misc/autorandr/default.nix b/pkgs/tools/misc/autorandr/default.nix index 1d4a3a2b6ec9..793204014541 100644 --- a/pkgs/tools/misc/autorandr/default.nix +++ b/pkgs/tools/misc/autorandr/default.nix @@ -4,63 +4,59 @@ , systemd , xrandr }: -let - python = python3Packages.python; +stdenv.mkDerivation rec { + pname = "autorandr"; version = "1.11"; -in - stdenv.mkDerivation { - pname = "autorandr"; - inherit version; - buildInputs = [ python ]; - - # no wrapper, as autorandr --batch does os.environ.clear() - buildPhase = '' - substituteInPlace autorandr.py \ - --replace 'os.popen("xrandr' 'os.popen("${xrandr}/bin/xrandr' \ - --replace '["xrandr"]' '["${xrandr}/bin/xrandr"]' - ''; - - outputs = [ "out" "man" ]; - - installPhase = '' - runHook preInstall - make install TARGETS='autorandr' PREFIX=$out - - make install TARGETS='bash_completion' DESTDIR=$out/share/bash-completion/completions - - make install TARGETS='autostart_config' PREFIX=$out DESTDIR=$out - - make install TARGETS='manpage' PREFIX=$man - - ${if systemd != null then '' - make install TARGETS='systemd udev' PREFIX=$out DESTDIR=$out \ - SYSTEMD_UNIT_DIR=/lib/systemd/system \ - UDEV_RULES_DIR=/etc/udev/rules.d - substituteInPlace $out/etc/udev/rules.d/40-monitor-hotplug.rules \ - --replace /bin/systemctl "/run/current-system/systemd/bin/systemctl" - '' else '' - make install TARGETS='pmutils' DESTDIR=$out \ - PM_SLEEPHOOKS_DIR=/lib/pm-utils/sleep.d - make install TARGETS='udev' PREFIX=$out DESTDIR=$out \ - UDEV_RULES_DIR=/etc/udev/rules.d - ''} - - runHook postInstall - ''; - - src = fetchFromGitHub { - owner = "phillipberndt"; - repo = "autorandr"; - rev = version; - sha256 = "0rmnqk2bi6bbd2if1rll37mlzlqxzmnazfffdhcpzskxwyaj4yn5"; - }; - - meta = with lib; { - homepage = "https://github.com/phillipberndt/autorandr/"; - description = "Automatically select a display configuration based on connected devices"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ coroa globin ]; - platforms = platforms.unix; - }; - } + buildInputs = [ python3Packages.python ]; + + # no wrapper, as autorandr --batch does os.environ.clear() + buildPhase = '' + substituteInPlace autorandr.py \ + --replace 'os.popen("xrandr' 'os.popen("${xrandr}/bin/xrandr' \ + --replace '["xrandr"]' '["${xrandr}/bin/xrandr"]' + ''; + + outputs = [ "out" "man" ]; + + installPhase = '' + runHook preInstall + make install TARGETS='autorandr' PREFIX=$out + + make install TARGETS='bash_completion' DESTDIR=$out/share/bash-completion/completions + + make install TARGETS='autostart_config' PREFIX=$out DESTDIR=$out + + make install TARGETS='manpage' PREFIX=$man + + ${if systemd != null then '' + make install TARGETS='systemd udev' PREFIX=$out DESTDIR=$out \ + SYSTEMD_UNIT_DIR=/lib/systemd/system \ + UDEV_RULES_DIR=/etc/udev/rules.d + substituteInPlace $out/etc/udev/rules.d/40-monitor-hotplug.rules \ + --replace /bin/systemctl "/run/current-system/systemd/bin/systemctl" + '' else '' + make install TARGETS='pmutils' DESTDIR=$out \ + PM_SLEEPHOOKS_DIR=/lib/pm-utils/sleep.d + make install TARGETS='udev' PREFIX=$out DESTDIR=$out \ + UDEV_RULES_DIR=/etc/udev/rules.d + ''} + + runHook postInstall + ''; + + src = fetchFromGitHub { + owner = "phillipberndt"; + repo = "autorandr"; + rev = version; + sha256 = "0rmnqk2bi6bbd2if1rll37mlzlqxzmnazfffdhcpzskxwyaj4yn5"; + }; + + meta = with lib; { + homepage = "https://github.com/phillipberndt/autorandr/"; + description = "Automatically select a display configuration based on connected devices"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ coroa globin ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/misc/bcunit/default.nix b/pkgs/tools/misc/bcunit/default.nix index 099ae294bec9..61fc84fef7e7 100644 --- a/pkgs/tools/misc/bcunit/default.nix +++ b/pkgs/tools/misc/bcunit/default.nix @@ -20,7 +20,6 @@ stdenv.mkDerivation rec { }; meta = with lib; { - inherit version; description = "A fork of CUnit test framework"; homepage = "https://gitlab.linphone.org/BC/public/bcunit"; license = licenses.lgpl2Plus; diff --git a/pkgs/tools/misc/clac/default.nix b/pkgs/tools/misc/clac/default.nix index 4f26b2036a7d..acf9b6b867de 100644 --- a/pkgs/tools/misc/clac/default.nix +++ b/pkgs/tools/misc/clac/default.nix @@ -19,7 +19,6 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - inherit version; description = "Interactive stack-based calculator"; homepage = "https://github.com/soveran/clac"; license = licenses.bsd2; diff --git a/pkgs/tools/misc/clasp/default.nix b/pkgs/tools/misc/clasp/default.nix index 4fc0d2c2f8cb..401a2006c6f9 100644 --- a/pkgs/tools/misc/clasp/default.nix +++ b/pkgs/tools/misc/clasp/default.nix @@ -1,12 +1,8 @@ { lib, stdenv, fetchurl }: -let - version = "3.1.4"; -in - -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "clasp"; - inherit version; + version = "3.1.4"; src = fetchurl { url = "mirror://sourceforge/project/potassco/clasp/${version}/clasp-${version}-source.tar.gz"; diff --git a/pkgs/tools/misc/cp437/default.nix b/pkgs/tools/misc/cp437/default.nix index ac9282ae4344..c08214ff548b 100644 --- a/pkgs/tools/misc/cp437/default.nix +++ b/pkgs/tools/misc/cp437/default.nix @@ -1,9 +1,8 @@ { lib, stdenv, fetchFromGitHub }: -let version = "0.6"; -in -stdenv.mkDerivation { + +stdenv.mkDerivation rec { pname = "cp437"; - inherit version; + version = "0.6"; src = fetchFromGitHub { owner = "keaston"; diff --git a/pkgs/tools/misc/dijo/default.nix b/pkgs/tools/misc/dijo/default.nix index 9a6bd7999212..606bba0dff92 100644 --- a/pkgs/tools/misc/dijo/default.nix +++ b/pkgs/tools/misc/dijo/default.nix @@ -1,8 +1,8 @@ { stdenv, lib, rustPlatform, fetchFromGitHub, ncurses, CoreServices }: -let version = "0.2.7"; in -rustPlatform.buildRustPackage { + +rustPlatform.buildRustPackage rec { pname = "dijo"; - inherit version; + version = "0.2.7"; buildInputs = [ ncurses ] ++ lib.optional stdenv.isDarwin CoreServices; src = fetchFromGitHub { owner = "NerdyPepper"; diff --git a/pkgs/tools/misc/diskscan/default.nix b/pkgs/tools/misc/diskscan/default.nix index 1e7bbd6bfcec..265218dfcfd5 100644 --- a/pkgs/tools/misc/diskscan/default.nix +++ b/pkgs/tools/misc/diskscan/default.nix @@ -20,7 +20,6 @@ stdenv.mkDerivation rec { description = "Scan HDD/SSD for failed and near failed sectors"; platforms = with platforms; linux; maintainers = with maintainers; [ peterhoeg ]; - inherit version; license = licenses.gpl3; }; } diff --git a/pkgs/tools/misc/edid-decode/default.nix b/pkgs/tools/misc/edid-decode/default.nix index 99a21e28b075..f39fc1b55243 100644 --- a/pkgs/tools/misc/edid-decode/default.nix +++ b/pkgs/tools/misc/edid-decode/default.nix @@ -1,9 +1,8 @@ { lib, stdenv, fetchgit }: -let - version = "2018-12-06"; -in stdenv.mkDerivation { + +stdenv.mkDerivation rec { pname = "edid-decode-unstable"; - inherit version; + version = "unstable-2018-12-06"; src = fetchgit { url = "git://linuxtv.org/edid-decode.git"; diff --git a/pkgs/tools/misc/edid-generator/default.nix b/pkgs/tools/misc/edid-generator/default.nix index 89ac21db5f57..d3abb37b9f47 100644 --- a/pkgs/tools/misc/edid-generator/default.nix +++ b/pkgs/tools/misc/edid-generator/default.nix @@ -6,11 +6,10 @@ , zsh , modelines ? [] # Modeline "1280x800" 83.50 1280 1352 1480 1680 800 803 809 831 -hsync +vsync }: -let - version = "unstable-2018-03-15"; -in stdenv.mkDerivation { + +stdenv.mkDerivation rec { pname = "edid-generator"; - inherit version; + version = "unstable-2018-03-15"; src = fetchFromGitHub { owner = "akatrevorjay"; diff --git a/pkgs/tools/misc/fsql/default.nix b/pkgs/tools/misc/fsql/default.nix index 100e70232321..dac33eaedb30 100644 --- a/pkgs/tools/misc/fsql/default.nix +++ b/pkgs/tools/misc/fsql/default.nix @@ -19,7 +19,6 @@ buildGoPackage rec { license = licenses.mit; maintainers = with maintainers; [ pSub ]; platforms = platforms.unix; - inherit version; }; } diff --git a/pkgs/tools/misc/gringo/default.nix b/pkgs/tools/misc/gringo/default.nix index f08bad03916a..87902de0cb03 100644 --- a/pkgs/tools/misc/gringo/default.nix +++ b/pkgs/tools/misc/gringo/default.nix @@ -3,13 +3,9 @@ libcxx }: -let - version = "4.5.4"; -in - -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "gringo"; - inherit version; + version = "4.5.4"; src = fetchurl { url = "mirror://sourceforge/project/potassco/gringo/${version}/gringo-${version}-source.tar.gz"; diff --git a/pkgs/tools/misc/hdaps-gl/default.nix b/pkgs/tools/misc/hdaps-gl/default.nix index 41de7ef5d28b..8ea863f46417 100644 --- a/pkgs/tools/misc/hdaps-gl/default.nix +++ b/pkgs/tools/misc/hdaps-gl/default.nix @@ -1,24 +1,23 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, freeglut, libGL, libGLU }: -let version = "0.0.7"; in -stdenv.mkDerivation { - pname = "hdaps-gl"; - inherit version; - src = fetchFromGitHub { - owner = "linux-thinkpad"; - repo = "hdaps-gl"; - rev = version; - sha256 = "0jywsrcr1wzkjig5cvz014c3r026sbwscbkv7zh1014lkjm0kyyh"; - }; +stdenv.mkDerivation rec { + pname = "hdaps-gl"; + version = "0.0.7"; + src = fetchFromGitHub { + owner = "linux-thinkpad"; + repo = "hdaps-gl"; + rev = version; + sha256 = "0jywsrcr1wzkjig5cvz014c3r026sbwscbkv7zh1014lkjm0kyyh"; + }; - nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ freeglut libGL libGLU ]; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ freeglut libGL libGLU ]; - meta = with lib; { - description = "GL-based laptop model that rotates in real-time via hdaps"; - homepage = "https://github.com/linux-thinkpad/hdaps-gl"; - license = licenses.gpl2; - platforms = platforms.linux; - maintainers = [ maintainers.symphorien ]; - }; + meta = with lib; { + description = "GL-based laptop model that rotates in real-time via hdaps"; + homepage = "https://github.com/linux-thinkpad/hdaps-gl"; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = [ maintainers.symphorien ]; + }; } diff --git a/pkgs/tools/misc/lbdb/default.nix b/pkgs/tools/misc/lbdb/default.nix index ea4b2a9cbbc5..ce3a5acd4c9d 100644 --- a/pkgs/tools/misc/lbdb/default.nix +++ b/pkgs/tools/misc/lbdb/default.nix @@ -7,12 +7,11 @@ }: let - version = "0.48.1"; perl' = perl.withPackages (p: with p; [ ConvertASN1 perlldap AuthenSASL ]); in -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "lbdb"; - inherit version; + version = "0.48.1"; src = fetchurl { url = "https://www.spinnaker.de/lbdb/download/lbdb_${version}.tar.gz"; sha256 = "1gr5l2fr9qbdccga8bhsrpvz6jxigvfkdxrln9wyf2xpps5cdjxh"; diff --git a/pkgs/tools/misc/unclutter-xfixes/default.nix b/pkgs/tools/misc/unclutter-xfixes/default.nix index 464183cf579e..d59b759503f8 100644 --- a/pkgs/tools/misc/unclutter-xfixes/default.nix +++ b/pkgs/tools/misc/unclutter-xfixes/default.nix @@ -24,7 +24,6 @@ stdenv.mkDerivation rec { description = "Rewrite of unclutter using the X11 Xfixes extension"; platforms = platforms.unix; license = lib.licenses.mit; - inherit version; maintainers = [ maintainers.globin ]; }; } diff --git a/pkgs/tools/misc/yubikey-manager-qt/default.nix b/pkgs/tools/misc/yubikey-manager-qt/default.nix index 00e3ec1fbdcd..cb575adf75ee 100644 --- a/pkgs/tools/misc/yubikey-manager-qt/default.nix +++ b/pkgs/tools/misc/yubikey-manager-qt/default.nix @@ -59,7 +59,6 @@ mkDerivation rec { ''; meta = with lib; { - inherit version; description = "Cross-platform application for configuring any YubiKey over all USB interfaces"; homepage = "https://developers.yubico.com/yubikey-manager-qt/"; license = licenses.bsd2; |