diff options
Diffstat (limited to 'pkgs/tools')
-rw-r--r-- | pkgs/tools/games/joystickwake/default.nix | 26 | ||||
-rw-r--r-- | pkgs/tools/misc/birdfont/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/misc/bunnyfetch/default.nix | 14 | ||||
-rw-r--r-- | pkgs/tools/misc/esphome/dashboard.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/misc/esphome/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/misc/fsearch/default.nix | 58 | ||||
-rw-r--r-- | pkgs/tools/networking/dnsproxy/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/security/metasploit/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/system/cm-rgb/default.nix | 10 | ||||
-rw-r--r-- | pkgs/tools/system/fio/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/system/taskspooler/default.nix | 31 | ||||
-rw-r--r-- | pkgs/tools/typesetting/tectonic/default.nix | 31 | ||||
-rw-r--r-- | pkgs/tools/virtualization/linode-cli/default.nix | 25 |
13 files changed, 172 insertions, 47 deletions
diff --git a/pkgs/tools/games/joystickwake/default.nix b/pkgs/tools/games/joystickwake/default.nix new file mode 100644 index 00000000000..01800aff849 --- /dev/null +++ b/pkgs/tools/games/joystickwake/default.nix @@ -0,0 +1,26 @@ +{ lib, python3, fetchFromGitHub }: +python3.pkgs.buildPythonApplication rec { + pname = "joystickwake"; + version = "0.2.4"; + + src = fetchFromGitHub { + owner = "foresto"; + repo = pname; + rev = "v${version}"; + sha256 = "0j8xwfmzzmc9s88zvzc3lv67821r6x28vy6vli3srvx859wprppd"; + }; + + propagatedBuildInputs = with python3.pkgs; [ pyudev xlib ]; + + meta = with lib; { + description = "A joystick-aware screen waker"; + longDescription = '' + Linux gamers often find themselves unexpectedly staring at a blank screen, because their display server fails to recognize game controllers as input devices, allowing the screen blanker to activate during gameplay. + This program works around the problem by temporarily disabling screen blankers when joystick activity is detected. + ''; + homepage = "https://github.com/foresto/joystickwake"; + maintainers = with maintainers; [ bertof ]; + license = licenses.mit; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/misc/birdfont/default.nix b/pkgs/tools/misc/birdfont/default.nix index 1b1fefc0a7c..57b42952c85 100644 --- a/pkgs/tools/misc/birdfont/default.nix +++ b/pkgs/tools/misc/birdfont/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkg-config, python3, xmlbird, -cairo, gdk-pixbuf, libgee, glib, gtk3, webkitgtk, libnotify, sqlite, vala_0_44, +cairo, gdk-pixbuf, libgee, glib, gtk3, webkitgtk, libnotify, sqlite, vala, gobject-introspection, gsettings-desktop-schemas, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-caNY6PrsqBrYwC61MxNsf8B9E8it1Ls1d+hdbf8u+o8="; }; - nativeBuildInputs = [ python3 pkg-config vala_0_44 gobject-introspection wrapGAppsHook ]; + nativeBuildInputs = [ python3 pkg-config vala gobject-introspection wrapGAppsHook ]; buildInputs = [ xmlbird libgee cairo gdk-pixbuf glib gtk3 webkitgtk libnotify sqlite gsettings-desktop-schemas ]; postPatch = '' diff --git a/pkgs/tools/misc/bunnyfetch/default.nix b/pkgs/tools/misc/bunnyfetch/default.nix index 37e1be80e3c..37a65d8c071 100644 --- a/pkgs/tools/misc/bunnyfetch/default.nix +++ b/pkgs/tools/misc/bunnyfetch/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "bunnyfetch"; - version = "unstable-2021-05-24"; + version = "unstable-2021-06-19"; src = fetchFromGitHub { - owner = "Mewyuna"; - repo = pname; - rev = "7bcc45fb590b37f410e60af893e679eb0729ecb1"; - sha256 = "1lgqrwmxdxd1d99rr0akydfwcsbcmz75fkbq9zrl842rksnp5q3r"; + owner = "Rosettea"; + repo = "bunnyfetch"; + rev = "24370338b936bae1ebdefea73e8372ac0b4d2858"; + sha256 = "09wcffx6ak4djm2lrxq43n27p9qmczng4rf11qpwx3w4w67jvpz9"; }; vendorSha256 = "1vv69y0x06kn99lw995sbkb7vgd0yb18flkr2ml8ss7q2yvz37vi"; @@ -16,11 +16,9 @@ buildGoModule rec { # No upstream tests doCheck = false; - subPackages = [ "." ]; - meta = with lib; { description = "Tiny system info fetch utility"; - homepage = "https://github.com/Mewyuna/bunnyfetch"; + homepage = "https://github.com/Rosettea/bunnyfetch"; license = licenses.mit; maintainers = with maintainers; [ devins2518 ]; platforms = platforms.linux; diff --git a/pkgs/tools/misc/esphome/dashboard.nix b/pkgs/tools/misc/esphome/dashboard.nix index bdaac762101..a701fbd73b5 100644 --- a/pkgs/tools/misc/esphome/dashboard.nix +++ b/pkgs/tools/misc/esphome/dashboard.nix @@ -4,11 +4,11 @@ with python3.pkgs; buildPythonPackage rec { pname = "esphome-dashboard"; - version = "20210622.0"; + version = "20210623.0"; src = fetchPypi { inherit pname version; - sha256 = "00qndincn8m7ap6ficsrl7vlr4dwb9q9ybjyj947r1fwprnbbj0l"; + sha256 = "0fc6xgi1naydm3wgk5lljnf6zggzdk6558cpyqlriw031gqnab77"; }; # no tests diff --git a/pkgs/tools/misc/esphome/default.nix b/pkgs/tools/misc/esphome/default.nix index 79bfdb28d11..945af40a717 100644 --- a/pkgs/tools/misc/esphome/default.nix +++ b/pkgs/tools/misc/esphome/default.nix @@ -12,13 +12,13 @@ let in python3.pkgs.buildPythonApplication rec { pname = "esphome"; - version = "1.19.3"; + version = "1.19.4"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "013bnzcpyp1vh1aik3bl7i7hxvfwlg1skvc83biqva1vbllah7w1"; + sha256 = "029ykjk24h21b0s0gha6kv9pvgallin6marzkb2vfbvr3icsmbz2"; }; patches = [ diff --git a/pkgs/tools/misc/fsearch/default.nix b/pkgs/tools/misc/fsearch/default.nix new file mode 100644 index 00000000000..e2782ef652b --- /dev/null +++ b/pkgs/tools/misc/fsearch/default.nix @@ -0,0 +1,58 @@ +{ lib +, stdenv +, fetchFromGitHub +, gtk3 +, pcre +, glib +, desktop-file-utils +, meson +, ninja +, pkg-config +, wrapGAppsHook +, unstableGitUpdater +, gettext +}: + +stdenv.mkDerivation { + pname = "fsearch"; + version = "unstable-2021-06-23"; + + src = fetchFromGitHub { + owner = "cboxdoerfer"; + repo = "fsearch"; + rev = "9300cc03ab2f0cea3a70abb5477bda8b52c4afd1"; + sha256 = "16qh2si48j113yhay5wawr7dvldks6jb32za41j2sng7n4ryw221"; + }; + + nativeBuildInputs = [ + desktop-file-utils + meson + ninja + pkg-config + wrapGAppsHook + gettext + ]; + + buildInputs = [ + glib + gtk3 + pcre + ]; + + preFixup = '' + substituteInPlace $out/share/applications/io.github.cboxdoerfer.FSearch.desktop \ + --replace "Exec=fsearch" "Exec=$out/bin/fsearch" + ''; + + passthru.updateScript = unstableGitUpdater { + url = "https://github.com/cboxdoerfer/fsearch.git"; + }; + + meta = with lib; { + description = "A fast file search utility for Unix-like systems based on GTK+3"; + homepage = "https://github.com/cboxdoerfer/fsearch.git"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ artturin ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/networking/dnsproxy/default.nix b/pkgs/tools/networking/dnsproxy/default.nix index f3ffaecb5f9..a16ebf79241 100644 --- a/pkgs/tools/networking/dnsproxy/default.nix +++ b/pkgs/tools/networking/dnsproxy/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "dnsproxy"; - version = "0.37.6"; + version = "0.37.7"; src = fetchFromGitHub { owner = "AdguardTeam"; repo = pname; rev = "v${version}"; - sha256 = "sha256-NP3d2ZTvC4qKYOklUcPCvkhPsV/tU9JOCPp9s8m1CwQ="; + sha256 = "sha256-5/ggeNBMNlwX6AzYO0haAU18xY0rYpELts6lqZmJxj4="; }; vendorSha256 = null; diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix index ebc2e52746e..b8ad99b9178 100644 --- a/pkgs/tools/security/metasploit/default.nix +++ b/pkgs/tools/security/metasploit/default.nix @@ -8,13 +8,13 @@ let }; in stdenv.mkDerivation rec { pname = "metasploit-framework"; - version = "6.0.49"; + version = "6.0.50"; src = fetchFromGitHub { owner = "rapid7"; repo = "metasploit-framework"; rev = version; - sha256 = "sha256-qpUzFA4nowrveI3N6kiiM1a4EQq9Y3m94VRjhHLIvn8="; + sha256 = "sha256-ZtIpkUt3jIhe4st8JlxE0rvLe6P+QBGdjyTL13Avwj0="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/system/cm-rgb/default.nix b/pkgs/tools/system/cm-rgb/default.nix index 47fdba50c5e..3a6c7c6e57c 100644 --- a/pkgs/tools/system/cm-rgb/default.nix +++ b/pkgs/tools/system/cm-rgb/default.nix @@ -12,13 +12,13 @@ buildPythonApplication rec { pname = "cm-rgb"; - version = "0.3.4"; + version = "0.3.6"; src = fetchFromGitHub { owner = "gfduszynski"; repo = pname; rev = "v${version}"; - sha256 = "04brldaa2zpvzkcg43i5hpbj03d1nqrgiplm5nh4shn12cif19ag"; + sha256 = "sha256-m0ZAjSLRzcjzygLEbvCiDd7krc1gRqTg1ZV4H/o2c68="; }; nativeBuildInputs = [ @@ -37,10 +37,6 @@ buildPythonApplication rec { ]; postInstall = '' - # Remove this line when/if this PR gets merged: - # https://github.com/gfduszynski/cm-rgb/pull/43 - install -m0755 scripts/cm-rgb-gui $out/bin/cm-rgb-gui - mkdir -p $out/etc/udev/rules.d echo 'SUBSYSTEM=="usb", ATTR{idVendor}=="2516", ATTR{idProduct}=="0051", TAG+="uaccess"' \ > $out/etc/udev/rules.d/60-cm-rgb.rules @@ -51,7 +47,7 @@ buildPythonApplication rec { longDescription = '' cm-rgb controls AMD Wraith Prism RGB LEDS. - To permit non-root accounts to change use this utility on + To permit non-root accounts to use this utility on NixOS, add this package to <literal>services.udev.packages</literal> in <filename>configuration.nix</filename>. ''; diff --git a/pkgs/tools/system/fio/default.nix b/pkgs/tools/system/fio/default.nix index fc4ea8d6b33..b108c9dd3d1 100644 --- a/pkgs/tools/system/fio/default.nix +++ b/pkgs/tools/system/fio/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "fio"; - version = "3.26"; + version = "3.27"; src = fetchFromGitHub { owner = "axboe"; repo = "fio"; rev = "fio-${version}"; - sha256 = "sha256-/Si0McndJ6Xp3ifDr+BStv89LmZyAgof95QkHGT8MGQ="; + sha256 = "sha256-/VzqmDbCTOOwFBMDj9nYuAW7ZJNM8B2LQ3QxReWG+iw="; }; buildInputs = [ python3 zlib ] diff --git a/pkgs/tools/system/taskspooler/default.nix b/pkgs/tools/system/taskspooler/default.nix new file mode 100644 index 00000000000..9899a9fb3f6 --- /dev/null +++ b/pkgs/tools/system/taskspooler/default.nix @@ -0,0 +1,31 @@ +{ stdenv, lib, fetchurl, makeWrapper, coreutils }: + +stdenv.mkDerivation rec { + pname = "taskspooler"; + version = "1.0.1"; + + src = fetchurl { + url = "https://vicerveza.homeunix.net/%7Eviric/wsgi-bin/hgweb.wsgi/ts/archive/7cf9a8bda6d3.tar.gz"; + sha256 = "11i21s8sdmjl4gy5f3dyfsxsmg1japgs4r5ym0b3jdyp99xhpbl1"; + }; + + nativeBuildInputs = [ makeWrapper ]; + + postPatch = '' + substituteInPlace Makefile \ + --replace "PREFIX?=/usr/local" "PREFIX=$out" + ''; + + postFixup = '' + wrapProgram $out/bin/ts \ + --set-default TS_SLOTS "$(${coreutils}/bin/nproc --all)" + ''; + + meta = with lib; { + description = "Simple single node task scheduler"; + license = licenses.gpl2Plus; + homepage = "https://vicerveza.homeunix.net/~viric/wsgi-bin/hgweb.wsgi/ts"; + platforms = platforms.unix; + maintainers = [ maintainers.sheepforce ]; + }; +} diff --git a/pkgs/tools/typesetting/tectonic/default.nix b/pkgs/tools/typesetting/tectonic/default.nix index 3209ccf6029..9cbf9ac7e2f 100644 --- a/pkgs/tools/typesetting/tectonic/default.nix +++ b/pkgs/tools/typesetting/tectonic/default.nix @@ -1,26 +1,43 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform -, darwin, fontconfig, harfbuzz, openssl, pkg-config }: +{ lib +, stdenv +, fetchFromGitHub +, rustPlatform +, darwin +, fontconfig +, harfbuzz +, openssl +, pkg-config +, makeWrapper +, biber +}: rustPlatform.buildRustPackage rec { pname = "tectonic"; - version = "0.6.4"; + version = "0.7.0"; src = fetchFromGitHub { owner = "tectonic-typesetting"; repo = "tectonic"; rev = "tectonic@${version}"; fetchSubmodules = true; - sha256 = "11q0vwgjlailkw4l9z7r54wkxi8dwh40pm7bd74dcvm0x4323fpd"; + sha256 = "sha256-CMvT9DouwERhDtBsLDesxN/QgEEfXLgtJaQLjq+SzOI="; }; - cargoSha256 = "1drfgrsfz44yqz15bcmb3dyyz7dr9zbs3idl1ssaiir24d4z1m9z"; + cargoSha256 = "sha256-zGsb49yt6SRFfvNHZY+RpjihGpV9ziLsg9BII7WTX2Y="; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config makeWrapper ]; buildInputs = [ fontconfig harfbuzz openssl ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ ApplicationServices Cocoa Foundation ]); - postInstall = lib.optionalString stdenv.isLinux '' + # Tectonic runs biber when it detects it needs to run it, see: + # https://github.com/tectonic-typesetting/tectonic/releases/tag/tectonic%400.7.0 + postInstall = '' + wrapProgram $out/bin/tectonic \ + --prefix PATH "${lib.getBin biber}/bin" + '' + lib.optionalString stdenv.isLinux '' + substituteInPlace dist/appimage/tectonic.desktop \ + --replace Exec=tectonic Exec=$out/bin/tectonic install -D dist/appimage/tectonic.desktop -t $out/share/applications/ install -D dist/appimage/tectonic.svg -t $out/share/icons/hicolor/scalable/apps/ ''; diff --git a/pkgs/tools/virtualization/linode-cli/default.nix b/pkgs/tools/virtualization/linode-cli/default.nix index 155daf41a7f..b30c4b88651 100644 --- a/pkgs/tools/virtualization/linode-cli/default.nix +++ b/pkgs/tools/virtualization/linode-cli/default.nix @@ -1,33 +1,33 @@ { lib -, buildPythonApplication , fetchFromGitHub , fetchurl -, terminaltables +, buildPythonApplication , colorclass -, requests +, installShellFiles , pyyaml +, requests , setuptools -, installShellFiles +, terminaltables }: let - + specVersion = "4.96.0"; # Version taken from: https://www.linode.com/docs/api/openapi.yaml at `info.version`. spec = fetchurl { - url = "https://raw.githubusercontent.com/linode/linode-api-docs/v4.89.0/openapi.yaml"; - sha256 = "sha256-R7Dmq8ifGEjh47ftuoGrbymYBsPCj/ULz0j1OqJDcwY="; + url = "https://raw.githubusercontent.com/linode/linode-api-docs/v${specVersion}/openapi.yaml"; + sha256 = "sha256-4+j5BBTOFLLiA+n0YEUH/ICK4Iuxr6nNB7ZRrYACW2I="; }; in buildPythonApplication rec { pname = "linode-cli"; - version = "5.0.1"; + version = "5.4.3"; src = fetchFromGitHub { owner = "linode"; repo = pname; rev = version; - sha256 = "sha256-zelopRaHaDCnbYA/y7dNMBh70g0+wuc6t9LH/VLaUIk="; + sha256 = "sha256-hljvcYtck89Lzje0XgnvYqh+jebOEOFnOkgEnGZJm0o="; }; # remove need for git history @@ -37,11 +37,11 @@ buildPythonApplication rec { ''; propagatedBuildInputs = [ - terminaltables colorclass - requests pyyaml + requests setuptools + terminaltables ]; postConfigure = '' @@ -60,10 +60,9 @@ buildPythonApplication rec { ''; meta = with lib; { - homepage = "https://github.com/linode/linode-cli"; description = "The Linode Command Line Interface"; + homepage = "https://github.com/linode/linode-cli"; license = licenses.bsd3; maintainers = with maintainers; [ ryantm superherointj ]; }; - } |