diff options
Diffstat (limited to 'pkgs/tools')
-rw-r--r-- | pkgs/tools/filesystems/fuse-overlayfs/default.nix | 9 | ||||
-rw-r--r-- | pkgs/tools/filesystems/nixpart/0.4/blivet.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/misc/arp-scan/default.nix | 12 | ||||
-rw-r--r-- | pkgs/tools/misc/chezmoi/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/misc/powerline-go/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/misc/snapper/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/misc/starship/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/misc/tmux/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/security/aws-okta/default.nix | 5 | ||||
-rw-r--r-- | pkgs/tools/security/vulnix/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/text/snippetpixie/default.nix | 83 | ||||
-rw-r--r-- | pkgs/tools/typesetting/tex/texlive/bin.nix | 9 |
12 files changed, 119 insertions, 27 deletions
diff --git a/pkgs/tools/filesystems/fuse-overlayfs/default.nix b/pkgs/tools/filesystems/fuse-overlayfs/default.nix index c65b2a63f2d..0d7bcdcd0f2 100644 --- a/pkgs/tools/filesystems/fuse-overlayfs/default.nix +++ b/pkgs/tools/filesystems/fuse-overlayfs/default.nix @@ -2,24 +2,25 @@ stdenv.mkDerivation rec { pname = "fuse-overlayfs"; - version = "0.7"; + version = "0.7.2"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = "v${version}"; - sha256 = "1nhqy1fdzhkjhqs54nq66zj5bf85n3gr4k6zl0hswdvhg6flkg75"; + sha256 = "1ybrki63ixrkraynms5i4jiil9901whwxs6p61h2c2ild8w2ir8n"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ fuse3 ]; meta = with lib; { - homepage = https://github.com/containers/fuse-overlayfs; description = "FUSE implementation for overlayfs"; longDescription = "An implementation of overlay+shiftfs in FUSE for rootless containers."; license = licenses.gpl3; + maintainers = with maintainers; [ ma9e ]; platforms = platforms.unix; - maintainers = [ maintainers.ma9e ]; + inherit (src.meta) homepage; }; } diff --git a/pkgs/tools/filesystems/nixpart/0.4/blivet.nix b/pkgs/tools/filesystems/nixpart/0.4/blivet.nix index 48a72c5dd62..da2dff6b77a 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/blivet.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/blivet.nix @@ -3,6 +3,7 @@ { stdenv, fetchurl, buildPythonApplication, pykickstart, pyparted, pyblock , libselinux, cryptsetup, multipath_tools, lsof, utillinux , useNixUdev ? true, systemd ? null +# useNixUdev is here for bw compatibility }: assert useNixUdev -> systemd != null; @@ -28,7 +29,6 @@ buildPythonApplication rec { }' blivet/formats/__init__.py sed -i -e 's|"lsof"|"${lsof}/bin/lsof"|' blivet/formats/fs.py sed -i -r -e 's|"(u?mount)"|"${utillinux.bin}/bin/\1"|' blivet/util.py - '' + stdenv.lib.optionalString useNixUdev '' sed -i -e '/find_library/,/find_library/ { c libudev = "${systemd.lib}/lib/libudev.so.1" }' blivet/pyudev.py diff --git a/pkgs/tools/misc/arp-scan/default.nix b/pkgs/tools/misc/arp-scan/default.nix index 4f50e0f556b..9a3164db5d7 100644 --- a/pkgs/tools/misc/arp-scan/default.nix +++ b/pkgs/tools/misc/arp-scan/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "arp-scan"; - version = "1.9.5"; + version = "1.9.7"; src = fetchFromGitHub { owner = "royhills"; repo = "arp-scan"; - rev = "4de863c2627a05177eda7159692a588f9f520cd1"; - sha256 = "15zpfdybk2kh98shqs8qqd0f9nyi2ch2wcyv729rfj7yp0hif5mb"; + rev = version; + sha256 = "1mf7a4f9vzvnkiavc87aqyciswggsb4fpy7j05jxnvjyyxv3l7gp"; }; perlModules = with perlPackages; [ @@ -19,11 +19,11 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ libpcap makeWrapper ]; + buildInputs = [ perlPackages.perl libpcap makeWrapper ]; postInstall = '' for name in get-{oui,iab}; do - wrapProgram "$out/bin/$name" --set PERL5LIB "${perlPackages.makePerlPath perlModules }" + wrapProgram "$out/bin/$name" --set PERL5LIB "${perlPackages.makeFullPerlPath perlModules}" done; ''; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { Arp-scan is a command-line tool that uses the ARP protocol to discover and fingerprint IP hosts on the local network. ''; - homepage = http://www.nta-monitor.com/wiki/index.php/Arp-scan_Documentation; + homepage = "http://www.nta-monitor.com/wiki/index.php/Arp-scan_Documentation"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ bjornfor mikoim ]; diff --git a/pkgs/tools/misc/chezmoi/default.nix b/pkgs/tools/misc/chezmoi/default.nix index 660dcf34459..897ecadd872 100644 --- a/pkgs/tools/misc/chezmoi/default.nix +++ b/pkgs/tools/misc/chezmoi/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "chezmoi"; - version = "1.7.5"; + version = "1.7.7"; src = fetchFromGitHub { owner = "twpayne"; repo = "chezmoi"; rev = "v${version}"; - sha256 = "1s64468q7hhp42lzgcixhh3jq7i7bgmiakahyfj0mzc49mn6rr0a"; + sha256 = "18v3sgi0aa8cd9sk3nhhyc4dmzpmq28wa21zyc9nvyw40ngmmxsb"; }; modSha256 = "0c2jslcigq9ajchfr7inb7b6cpla7xjibcmjsvwspfzknrlrsbfn"; diff --git a/pkgs/tools/misc/powerline-go/default.nix b/pkgs/tools/misc/powerline-go/default.nix index 5c1b1be2db3..47336e54d67 100644 --- a/pkgs/tools/misc/powerline-go/default.nix +++ b/pkgs/tools/misc/powerline-go/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "powerline-go"; - version = "1.13.0"; + version = "1.15.0"; src = fetchFromGitHub { owner = "justjanne"; repo = pname; rev = "v${version}"; - sha256 = "0hgc0ji9jcsq5qnvx54dvpq8qx80mgdbvkllzavnvqr7md638zk9"; + sha256 = "06i07m68l24v29j01qp2y91rwsfqh4x1nc8sxkjzrc7q1c7fsc1r"; }; - modSha256 = "0800r08rawv4fz08d332z0fy6pd16l1dyflz3h91ba00g59wc2ah"; + modSha256 = "0mz1qrwar9cgrhrgw4z3gwhjj62bnfnn59ji31zkyvwlc1mqh9an"; meta = with stdenv.lib; { description = "A Powerline like prompt for Bash, ZSH and Fish"; diff --git a/pkgs/tools/misc/snapper/default.nix b/pkgs/tools/misc/snapper/default.nix index 26cdbfeab67..ccd43270404 100644 --- a/pkgs/tools/misc/snapper/default.nix +++ b/pkgs/tools/misc/snapper/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "snapper"; - version = "0.8.5"; + version = "0.8.6"; src = fetchFromGitHub { owner = "openSUSE"; repo = "snapper"; rev = "v${version}"; - sha256 = "1h8qpkfcp04xpnaki2hmc7h3536dnjli2cczhzma6q9m985y45kr"; + sha256 = "1czx8brfhbfi614mqw46d38xwq6w7d5aca3pibwx8zz47rn99w6d"; }; nativeBuildInputs = [ diff --git a/pkgs/tools/misc/starship/default.nix b/pkgs/tools/misc/starship/default.nix index 9b749cbc875..820c6c5d17c 100644 --- a/pkgs/tools/misc/starship/default.nix +++ b/pkgs/tools/misc/starship/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "starship"; - version = "0.28.0"; + version = "0.29.0"; src = fetchFromGitHub { owner = "starship"; repo = pname; rev = "v${version}"; - sha256 = "1fwhaz76awgva0j10y5snykc8xb06x9apvpxgyxn53lh87x08q7k"; + sha256 = "07haspmx0wid472jc8p92xqqf34rchc0jzx09089p9jcxi6qdv4y"; }; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/tools/misc/tmux/default.nix b/pkgs/tools/misc/tmux/default.nix index c628ae30e95..1aa221bd59e 100644 --- a/pkgs/tools/misc/tmux/default.nix +++ b/pkgs/tools/misc/tmux/default.nix @@ -21,7 +21,7 @@ in stdenv.mkDerivation rec { pname = "tmux"; - version = "3.0"; + version = "3.0a"; outputs = [ "out" "man" ]; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { owner = "tmux"; repo = "tmux"; rev = version; - sha256 = "0772hajzgpl4cvb9l2bma9hmnh4jg1phvqr2gg4292w34n5dsl3k"; + sha256 = "0y9lv1yr0x50v3k70vzkc8hfr7yijlsi30p7dr7i8akp3lwmmc7h"; }; nativeBuildInputs = [ diff --git a/pkgs/tools/security/aws-okta/default.nix b/pkgs/tools/security/aws-okta/default.nix index 9067e6a4dbf..f960245e2b3 100644 --- a/pkgs/tools/security/aws-okta/default.nix +++ b/pkgs/tools/security/aws-okta/default.nix @@ -1,4 +1,4 @@ -{ buildGoPackage, fetchFromGitHub, libusb1, pkgconfig, stdenv }: +{ buildGoPackage, fetchFromGitHub, libusb1, pkgconfig, stdenv, libiconv }: buildGoPackage rec { pname = "aws-okta"; @@ -18,14 +18,13 @@ buildGoPackage rec { buildFlags = "--tags release"; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libusb1 ]; + buildInputs = [ libusb1 libiconv ]; meta = with stdenv.lib; { inherit version; description = "aws-vault like tool for Okta authentication"; license = licenses.mit; maintainers = [maintainers.imalsogreg]; - broken = stdenv.isDarwin; # test with CoreFoundation 10.11 platforms = platforms.all; homepage = https://github.com/segmentio/aws-okta; downloadPage = "https://github.com/segmentio/aws-okta"; diff --git a/pkgs/tools/security/vulnix/default.nix b/pkgs/tools/security/vulnix/default.nix index 809787508f6..59d8b8c0875 100644 --- a/pkgs/tools/security/vulnix/default.nix +++ b/pkgs/tools/security/vulnix/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "vulnix"; - version = "1.9.2"; + version = "1.9.4"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "06mi4a80g6nzvqxj51c7lc0q0dpdr603ly2r77ksf5m3k4glb6dm"; + sha256 = "06dpdsnz1ih0syas3x25s557qpw0f4kmypvxwaffm734djg8klmi"; }; outputs = [ "out" "doc" "man" ]; diff --git a/pkgs/tools/text/snippetpixie/default.nix b/pkgs/tools/text/snippetpixie/default.nix new file mode 100644 index 00000000000..276fb639205 --- /dev/null +++ b/pkgs/tools/text/snippetpixie/default.nix @@ -0,0 +1,83 @@ +{ stdenv +, fetchFromGitHub +, meson +, ninja +, vala +, pkgconfig +, wrapGAppsHook +, appstream +, desktop-file-utils +, python3 +, libgee +, glib +, gtk3 +, sqlite +, at-spi2-atk +, at-spi2-core +, dbus +, ibus +, json-glib +, pantheon +}: + +stdenv.mkDerivation rec { + pname = "snippetpixie"; + version = "1.2.2"; + + src = fetchFromGitHub { + owner = "bytepixie"; + repo = pname; + rev = version; + sha256 = "096xj7n1ypr8ss8mbwd1hyypvmzw5lc0hjlj2d1x8hbjljldfd13"; + }; + + nativeBuildInputs = [ + meson + ninja + vala + pkgconfig + wrapGAppsHook + appstream + desktop-file-utils + python3 + ]; + + buildInputs = [ + libgee + glib + gtk3 + sqlite + at-spi2-atk + at-spi2-core + dbus + ibus + json-glib + pantheon.granite + pantheon.elementary-gtk-theme + pantheon.elementary-icon-theme + ]; + + doCheck = true; + + postPatch = '' + chmod +x meson/post_install.py + patchShebangs meson/post_install.py + ''; + + meta = with stdenv.lib; { + description = "Your little expandable text snippet helper"; + longDescription = '' + Your little expandable text snippet helper. + + Save your often used text snippets and then expand them whenever you type their abbreviation. + + For example:- "spr`" expands to "Snippet Pixie rules!" + ''; + homepage = https://www.snippetpixie.com; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ + ianmjones + ] ++ pantheon.maintainers; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/typesetting/tex/texlive/bin.nix b/pkgs/tools/typesetting/tex/texlive/bin.nix index d251d55c9f5..2b26d9462bf 100644 --- a/pkgs/tools/typesetting/tex/texlive/bin.nix +++ b/pkgs/tools/typesetting/tex/texlive/bin.nix @@ -302,6 +302,15 @@ dvipng = stdenv.mkDerivation { nativeBuildInputs = [ perl pkgconfig ]; buildInputs = [ core/*kpathsea*/ zlib libpng freetype gd ghostscript makeWrapper ]; + patches = [ + (fetchpatch { + url = "http://git.savannah.nongnu.org/cgit/dvipng.git/patch/?id=f3ff241827a587e3d39eda477041fd3280f5b245"; + sha256 = "1a0ixl9mga24p6xk8dy3v60yifvbzd27vs0hv8996rfkp8jqa7is"; + stripLen = 1; + extraPrefix = "texk/dvipng/dvipng-src/"; + }) + ]; + preConfigure = '' cd texk/dvipng patchShebangs doc/texi2pod.pl |