diff options
Diffstat (limited to 'pkgs/tools')
-rw-r--r-- | pkgs/tools/admin/oxidized/Gemfile | 5 | ||||
-rw-r--r-- | pkgs/tools/admin/oxidized/Gemfile.lock | 69 | ||||
-rw-r--r-- | pkgs/tools/admin/oxidized/default.nix | 18 | ||||
-rw-r--r-- | pkgs/tools/admin/oxidized/gemset.nix | 206 | ||||
-rw-r--r-- | pkgs/tools/admin/oxidized/temporary-x-series.patch | 22 | ||||
-rw-r--r-- | pkgs/tools/audio/abcm2ps/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/filesystems/9pfs/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/filesystems/ntfs-3g/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/misc/parted/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/package-management/nix-du/default.nix | 8 | ||||
-rw-r--r-- | pkgs/tools/security/gopass/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/system/efivar/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/system/gohai/default.nix | 32 | ||||
-rw-r--r-- | pkgs/tools/system/gohai/deps.nix | 30 | ||||
-rw-r--r-- | pkgs/tools/typesetting/pdfgrep/default.nix | 4 |
15 files changed, 404 insertions, 12 deletions
diff --git a/pkgs/tools/admin/oxidized/Gemfile b/pkgs/tools/admin/oxidized/Gemfile new file mode 100644 index 000000000000..6a9a4254b11b --- /dev/null +++ b/pkgs/tools/admin/oxidized/Gemfile @@ -0,0 +1,5 @@ +source 'https://rubygems.org' + +gem 'oxidized' +gem 'oxidized-web' +gem 'oxidized-script' diff --git a/pkgs/tools/admin/oxidized/Gemfile.lock b/pkgs/tools/admin/oxidized/Gemfile.lock new file mode 100644 index 000000000000..1570adbcf089 --- /dev/null +++ b/pkgs/tools/admin/oxidized/Gemfile.lock @@ -0,0 +1,69 @@ +GEM + remote: https://rubygems.org/ + specs: + asetus (0.3.0) + backports (3.11.2) + emk-sinatra-url-for (0.2.1) + sinatra (>= 0.9.1.1) + ffi (1.9.23) + haml (4.0.7) + tilt + htmlentities (4.3.4) + multi_json (1.13.1) + net-ssh (4.1.0) + oxidized (0.21.0) + asetus (~> 0.1) + net-ssh (~> 4.1.0) + rugged (~> 0.21, >= 0.21.4) + slop (~> 3.5) + oxidized-script (0.5.0) + oxidized (~> 0.21.0) + slop (~> 3.5) + oxidized-web (0.9.3) + emk-sinatra-url-for (~> 0.2) + haml (~> 4.0) + htmlentities (~> 4.3) + oxidized (~> 0.21.0) + puma (~> 3) + sass (~> 3.3) + sinatra (~> 1.4, >= 1.4.6) + sinatra-contrib (~> 1.4, >= 1.4.6) + puma (3.11.3) + rack (1.6.9) + rack-protection (1.5.5) + rack + rack-test (1.0.0) + rack (>= 1.0, < 3) + rb-fsevent (0.10.3) + rb-inotify (0.9.10) + ffi (>= 0.5.0, < 2) + rugged (0.27.0) + sass (3.5.6) + sass-listen (~> 4.0.0) + sass-listen (4.0.0) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + sinatra (1.4.8) + rack (~> 1.5) + rack-protection (~> 1.4) + tilt (>= 1.3, < 3) + sinatra-contrib (1.4.7) + backports (>= 2.0) + multi_json + rack-protection + rack-test + sinatra (~> 1.4.0) + tilt (>= 1.3, < 3) + slop (3.6.0) + tilt (2.0.8) + +PLATFORMS + ruby + +DEPENDENCIES + oxidized + oxidized-script + oxidized-web + +BUNDLED WITH + 1.14.6 diff --git a/pkgs/tools/admin/oxidized/default.nix b/pkgs/tools/admin/oxidized/default.nix new file mode 100644 index 000000000000..590f6ea55ca7 --- /dev/null +++ b/pkgs/tools/admin/oxidized/default.nix @@ -0,0 +1,18 @@ +{ lib, fetchFromGitHub, ruby, git, bundlerApp }: + +bundlerApp rec { + pname = "oxidized"; + gemdir = ./.; + + inherit ruby; + + exes = [ "oxidized" "oxidized-web" "oxidized-script" ]; + + meta = with lib; { + description = "Oxidized is a network device configuration backup tool. It's a RANCID replacement!"; + homepage = https://github.com/ytti/oxidized; + license = licenses.asl20; + maintainers = [ maintainers.willibutz ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/admin/oxidized/gemset.nix b/pkgs/tools/admin/oxidized/gemset.nix new file mode 100644 index 000000000000..f472b14e7967 --- /dev/null +++ b/pkgs/tools/admin/oxidized/gemset.nix @@ -0,0 +1,206 @@ +{ + asetus = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1zkr8cbp8klanqmhzz7qmimzlxh6zmsy98zb3s75af34l7znq790"; + type = "gem"; + }; + version = "0.3.0"; + }; + backports = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0sw58rsz1hl821ia1jj3nnl3jr7xwfkcljgs56kpq3fakzcljcdz"; + type = "gem"; + }; + version = "3.11.2"; + }; + emk-sinatra-url-for = { + dependencies = ["sinatra"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0rd5b1lraklv0hblzdnmw2z3dragfg0qqk7wxbpn58f8y7jxzjgj"; + type = "gem"; + }; + version = "0.2.1"; + }; + ffi = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0zw6pbyvmj8wafdc7l5h7w20zkp1vbr2805ql5d941g2b20pk4zr"; + type = "gem"; + }; + version = "1.9.23"; + }; + haml = { + dependencies = ["tilt"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0mrzjgkygvfii66bbylj2j93na8i89998yi01fin3whwqbvx0m1p"; + type = "gem"; + }; + version = "4.0.7"; + }; + htmlentities = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1nkklqsn8ir8wizzlakncfv42i32wc0w9hxp00hvdlgjr7376nhj"; + type = "gem"; + }; + version = "4.3.4"; + }; + multi_json = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1rl0qy4inf1mp8mybfk56dfga0mvx97zwpmq5xmiwl5r770171nv"; + type = "gem"; + }; + version = "1.13.1"; + }; + net-ssh = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "013p5jb4wy0cq7x7036piw2a3s1i9p752ki1srx2m289mpz4ml3q"; + type = "gem"; + }; + version = "4.1.0"; + }; + oxidized = { + dependencies = ["asetus" "net-ssh" "rugged" "slop"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0xqx0iawj2cm6083a61y43d6a76xaypiw0nkyirx02lhynq07yz0"; + type = "gem"; + }; + version = "0.21.0"; + }; + oxidized-script = { + dependencies = ["oxidized" "slop"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "12c15gksrrar9kradcv6mx2d4a8ixa4lykszb4pcapiw5mi35mxp"; + type = "gem"; + }; + version = "0.5.0"; + }; + oxidized-web = { + dependencies = ["emk-sinatra-url-for" "haml" "htmlentities" "oxidized" "puma" "sass" "sinatra" "sinatra-contrib"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "14s10pr8qaq6g19zi753igngp02li46k3nm5ap537r3743v1l4f9"; + type = "gem"; + }; + version = "0.9.3"; + }; + puma = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "03313mnx8n6g9qs9l5zafqq90grrhq2nqrmjs8lsffi28mgd3cfd"; + type = "gem"; + }; + version = "3.11.3"; + }; + rack = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "03w1ri5l91q800f1bdcdl5rbagy7s4kml136b42s2lmxmznxhr07"; + type = "gem"; + }; + version = "1.6.9"; + }; + rack-protection = { + dependencies = ["rack"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0my0wlw4a5l3hs79jkx2xzv7djhajgf8d28k8ai1ddlnxxb0v7ss"; + type = "gem"; + }; + version = "1.5.5"; + }; + rack-test = { + dependencies = ["rack"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1l799s5qr2qrshvrggq5ch3v235y491zfww07b39w4pj4vpa65l1"; + type = "gem"; + }; + version = "1.0.0"; + }; + rb-fsevent = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1lm1k7wpz69jx7jrc92w3ggczkjyjbfziq5mg62vjnxmzs383xx8"; + type = "gem"; + }; + version = "0.10.3"; + }; + rb-inotify = { + dependencies = ["ffi"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0yfsgw5n7pkpyky6a9wkf1g9jafxb0ja7gz0qw0y14fd2jnzfh71"; + type = "gem"; + }; + version = "0.9.10"; + }; + rugged = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0q1krxgd0ql03x8m9m05x5sxizw5sc7lms7rkp44qf45grpdk3v3"; + type = "gem"; + }; + version = "0.27.0"; + }; + sass = { + dependencies = ["sass-listen"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "19wyzp9qsg8hdkkxlsv713w0qmy66qrdp0shj42587ssx4qhrlag"; + type = "gem"; + }; + version = "3.5.6"; + }; + sass-listen = { + dependencies = ["rb-fsevent" "rb-inotify"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0xw3q46cmahkgyldid5hwyiwacp590zj2vmswlll68ryvmvcp7df"; + type = "gem"; + }; + version = "4.0.0"; + }; + sinatra = { + dependencies = ["rack" "rack-protection" "tilt"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0byxzl7rx3ki0xd7aiv1x8mbah7hzd8f81l65nq8857kmgzj1jqq"; + type = "gem"; + }; + version = "1.4.8"; + }; + sinatra-contrib = { + dependencies = ["backports" "multi_json" "rack-protection" "rack-test" "sinatra" "tilt"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0vi3i0icbi2figiayxpvxbqpbn1syma7w4p4zw5mav1ln4c7jnfr"; + type = "gem"; + }; + version = "1.4.7"; + }; + slop = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "00w8g3j7k7kl8ri2cf1m58ckxk8rn350gp4chfscmgv6pq1spk3n"; + type = "gem"; + }; + version = "3.6.0"; + }; + tilt = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0020mrgdf11q23hm1ddd6fv691l51vi10af00f137ilcdb2ycfra"; + type = "gem"; + }; + version = "2.0.8"; + }; +} diff --git a/pkgs/tools/admin/oxidized/temporary-x-series.patch b/pkgs/tools/admin/oxidized/temporary-x-series.patch new file mode 100644 index 000000000000..bf7ee992db18 --- /dev/null +++ b/pkgs/tools/admin/oxidized/temporary-x-series.patch @@ -0,0 +1,22 @@ +diff --git a/lib/oxidized/model/powerconnect.rb b/lib/oxidized/model/powerconnect.rb +index f602a36..3bac2d1 100644 +--- a/lib/oxidized/model/powerconnect.rb ++++ b/lib/oxidized/model/powerconnect.rb +@@ -4,7 +4,7 @@ class PowerConnect < Oxidized::Model + + comment '! ' + +- expect /^\s*--More--\s+.*$/ do |data, re| ++ expect /^([[:cntrl:]]...More:|\s*--More--\s+).*$/ do |data, re| + send ' ' + data.sub re, '' + end +@@ -60,7 +60,7 @@ class PowerConnect < Oxidized::Model + skip_blocks = 0 + cfg.each_line do |line| + # If this is a stackable switch we should skip this block of information +- if (line.match /Up\sTime|Temperature|Power Suppl(ies|y)|Fans/i and @stackable == true) ++ if (line.match /Up\sTime|Temperature|Power Suppl(ies|y)|Fans/i) + skip_blocks = 1 + # Some switches have another empty line. This is identified by this line having a colon + skip_blocks = 2 if line.match /:/ diff --git a/pkgs/tools/audio/abcm2ps/default.nix b/pkgs/tools/audio/abcm2ps/default.nix index 6d782fdba35c..e9eec597384c 100644 --- a/pkgs/tools/audio/abcm2ps/default.nix +++ b/pkgs/tools/audio/abcm2ps/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "abcm2ps-${version}"; - version = "8.13.21"; + version = "8.13.22"; src = fetchFromGitHub { owner = "leesavide"; repo = "abcm2ps"; rev = "v${version}"; - sha256 = "03r98xdw2vdwsi726i0zb7p0ljp3fpzjl1nhzfwz57m3zmqvz6r1"; + sha256 = "0csfg7aj9zg369q3c3bg18f24lk1j0356a90zlbrz7y5p668g3pv"; }; prePatch = '' diff --git a/pkgs/tools/filesystems/9pfs/default.nix b/pkgs/tools/filesystems/9pfs/default.nix index 5ad54adc08ad..37ec4105472b 100644 --- a/pkgs/tools/filesystems/9pfs/default.nix +++ b/pkgs/tools/filesystems/9pfs/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, fuse }: stdenv.mkDerivation rec { - name = "9pfs"; + name = "9pfs-20150918"; src = fetchFromGitHub { owner = "mischief"; diff --git a/pkgs/tools/filesystems/ntfs-3g/default.nix b/pkgs/tools/filesystems/ntfs-3g/default.nix index 4bcef5a83f04..7ee54a63fbb8 100644 --- a/pkgs/tools/filesystems/ntfs-3g/default.nix +++ b/pkgs/tools/filesystems/ntfs-3g/default.nix @@ -6,6 +6,8 @@ stdenv.mkDerivation rec { version = "2017.3.23"; name = "${pname}-${version}"; + outputs = [ "out" "dev" "man" "doc" ]; + buildInputs = [ libuuid ] ++ stdenv.lib.optionals crypto [ gnutls libgcrypt ]; nativeBuildInputs = stdenv.lib.optional crypto pkgconfig; diff --git a/pkgs/tools/misc/parted/default.nix b/pkgs/tools/misc/parted/default.nix index 3a05a1927dbc..0a0cece4fce6 100644 --- a/pkgs/tools/misc/parted/default.nix +++ b/pkgs/tools/misc/parted/default.nix @@ -9,6 +9,8 @@ stdenv.mkDerivation rec { sha256 = "1r3qpg3bhz37mgvp9chsaa3k0csby3vayfvz8ggsqz194af5i2w5"; }; + outputs = [ "out" "dev" "man" "info" ]; + patches = stdenv.lib.optional doCheck ./gpt-unicode-test-fix.patch ++ stdenv.lib.optional stdenv.hostPlatform.isMusl (fetchpatch { diff --git a/pkgs/tools/package-management/nix-du/default.nix b/pkgs/tools/package-management/nix-du/default.nix index 2e68666b7fa3..212b61f62f06 100644 --- a/pkgs/tools/package-management/nix-du/default.nix +++ b/pkgs/tools/package-management/nix-du/default.nix @@ -1,17 +1,17 @@ { stdenv, fetchFromGitHub, rustPlatform, nix, boost, graphviz }: rustPlatform.buildRustPackage rec { name = "nix-du-${version}"; - version = "0.1.1"; + version = "0.1.2"; src = fetchFromGitHub { owner = "symphorien"; repo = "nix-du"; rev = "v${version}"; - sha256 = "0kxacn5qw21pp4zl6wr9wyb2mm2nlnp6mla3m5p9dm7vrm1fd1x9"; + sha256 = "1y7ifr4c3v1494swh6akvna0d0rxjy9jw3mw2wdd6vj1xphvmimq"; }; - cargoSha256 = "04c48lzi7hny3nq4ffdpvsr4dxbi32faka163fp1yc9953zdw9az"; + cargoSha256 = "0qq7a6ncxnbjvnmly99awqrk9f3z9b55ifil7b0bn5yhk4h9sa6y"; - doCheck = !stdenv.isDarwin; + doCheck = true; checkInputs = [ graphviz ]; nativeBuildInputs = [] ++ stdenv.lib.optionals doCheck checkInputs; diff --git a/pkgs/tools/security/gopass/default.nix b/pkgs/tools/security/gopass/default.nix index 1bbd4169f2eb..fe7d50602628 100644 --- a/pkgs/tools/security/gopass/default.nix +++ b/pkgs/tools/security/gopass/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub, git, gnupg, xclip, makeWrapper }: buildGoPackage rec { - version = "1.6.11"; + version = "1.7.1"; name = "gopass-${version}"; goPackagePath = "github.com/justwatchcom/gopass"; @@ -12,7 +12,7 @@ buildGoPackage rec { owner = "justwatchcom"; repo = "gopass"; rev = "v${version}"; - sha256 = "12pih414232bsdj1qqc04vck2p9254wjy044n5kbbdqbmfgap7sj"; + sha256 = "01cif6a2xa3c8nki0pas9mywdxs8d9niv8z13mii5hcfqvm0s7aw"; }; wrapperPath = with stdenv.lib; makeBinPath ([ @@ -38,7 +38,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "The slightly more awesome Standard Unix Password Manager for Teams. Written in Go."; - homepage = https://github.com/justwatchcom/gopass; + homepage = https://www.justwatch.com/gopass/; license = licenses.mit; maintainers = with maintainers; [ andir ]; platforms = platforms.unix; diff --git a/pkgs/tools/system/efivar/default.nix b/pkgs/tools/system/efivar/default.nix index 458820440947..6c0bcb406218 100644 --- a/pkgs/tools/system/efivar/default.nix +++ b/pkgs/tools/system/efivar/default.nix @@ -4,6 +4,8 @@ stdenv.mkDerivation rec { name = "efivar-${version}"; version = "35"; + outputs = [ "bin" "out" "dev" "man" ]; + src = fetchFromGitHub { owner = "rhinstaller"; repo = "efivar"; @@ -17,6 +19,10 @@ stdenv.mkDerivation rec { makeFlags = [ "prefix=$(out)" "libdir=$(out)/lib" + "bindir=$(bin)/bin" + "mandir=$(man)/share/man" + "includedir=$(dev)/include" + "PCDIR=$(dev)/lib/pkgconfig" ]; meta = with stdenv.lib; { diff --git a/pkgs/tools/system/gohai/default.nix b/pkgs/tools/system/gohai/default.nix new file mode 100644 index 000000000000..77f65de9a8d0 --- /dev/null +++ b/pkgs/tools/system/gohai/default.nix @@ -0,0 +1,32 @@ +{ lib, stdenv, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: + +buildGoPackage rec { + name = "gohai-${version}"; + version = "2018-05-23"; + rev = "60e13eaed98afa238ad6dfc98224c04fbb7b19b1"; + + goPackagePath = "github.com/DataDog/gohai"; + + src = fetchgit { + inherit rev; + url = "https://github.com/DataDog/gohai"; + sha256 = "15hdw195f6ayrmj1nbyfpfswdai1r1z3qjw927mbma7rwql24dkr"; + }; + + goDeps = ./deps.nix; + + meta = with lib; { + description = "System information collector"; + homepage = "https://github.com/DataDog/gohai"; + license = licenses.mit; + maintainers = [ maintainers.tazjin ]; + platforms = platforms.unix; + repositories.git = git://github.com/DataDog/gohai.git; + + longDescription = '' + Gohai is a tool which collects an inventory of system + information. It is used by the Datadog agent to provide detailed + system metrics. + ''; + }; +} diff --git a/pkgs/tools/system/gohai/deps.nix b/pkgs/tools/system/gohai/deps.nix new file mode 100644 index 000000000000..f6d63e460246 --- /dev/null +++ b/pkgs/tools/system/gohai/deps.nix @@ -0,0 +1,30 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 +[ + { + goPackagePath = "github.com/cihub/seelog"; + fetch = { + type = "git"; + url = "https://github.com/cihub/seelog"; + rev = "f561c5e57575bb1e0a2167028b7339b3a8d16fb4"; + sha256 = "0r3228hvgljgpaggj6b9mvxfsizfw25q2c1761wsvcif8gz49cvl"; + }; + } + { + goPackagePath = "github.com/shirou/gopsutil"; + fetch = { + type = "git"; + url = "https://github.com/shirou/gopsutil"; + rev = "eeb1d38d69593f121e060d24d17f7b1f0936b203"; + sha256 = "01qsznk599225gf4pld7p2m30p61y77mvzhrs6raxpk6wf7icp4w"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "77b0e4315053a57ed2962443614bdb28db152054"; + sha256 = "1024gcv1b40i2rgvpgyw2hgy1k5g7473pn29yavwysj37m1rrplp"; + }; + } +] diff --git a/pkgs/tools/typesetting/pdfgrep/default.nix b/pkgs/tools/typesetting/pdfgrep/default.nix index 3509eb569b1c..59da3c1ccda2 100644 --- a/pkgs/tools/typesetting/pdfgrep/default.nix +++ b/pkgs/tools/typesetting/pdfgrep/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "pdfgrep-${version}"; - version = "2.1.0"; + version = "2.1.1"; src = fetchurl { url = "https://pdfgrep.org/download/${name}.tar.gz"; - sha256 = "13al23c2wlpsha6c1z1h6gh5lxzphsnzpd7b78qj16rq2r46phf9"; + sha256 = "02qcl5kmr5qzjfc99qpbpfb1890bxlrq3r208gnding51zrmb09c"; }; postPatch = '' |