diff options
Diffstat (limited to 'nixpkgs/pkgs/tools/misc')
237 files changed, 4146 insertions, 1187 deletions
diff --git a/nixpkgs/pkgs/tools/misc/0x0/default.nix b/nixpkgs/pkgs/tools/misc/0x0/default.nix index e0f84329b897..0b9c6f7c3bbb 100644 --- a/nixpkgs/pkgs/tools/misc/0x0/default.nix +++ b/nixpkgs/pkgs/tools/misc/0x0/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "1qpylyxrisy3p2lyirfarfj5yzrdjgsgxwf8gqwljpcjn207hr72"; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; installPhase = '' install -Dm755 0x0 $out/bin/0x0 @@ -26,5 +26,6 @@ stdenv.mkDerivation { homepage = "https://gitlab.com/somasis/scripts/"; maintainers = [ maintainers.ar1a ]; license = licenses.unlicense; + platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/tools/misc/3mux/default.nix b/nixpkgs/pkgs/tools/misc/3mux/default.nix index 3c51210edc7a..4b5db58c6401 100644 --- a/nixpkgs/pkgs/tools/misc/3mux/default.nix +++ b/nixpkgs/pkgs/tools/misc/3mux/default.nix @@ -1,24 +1,38 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, makeWrapper }: buildGoModule rec { pname = "3mux"; - version = "1.0.1"; + version = "1.1.0"; src = fetchFromGitHub { owner = "aaronjanse"; repo = pname; rev = "v${version}"; - sha256 = "sha256-auEMG3txO2JS/2dMFBtEujv9s5I0A80Vwts5kXjH600="; + sha256 = "sha256-QT4QXTlJf2NfTqXE4GF759EoW6Ri12lxDyodyEFc+ag="; }; - vendorSha256 = "sha256-rcbnyScD2GU1DLY6dTEPgFNXZfgkxXPn5lt6HRqa0d8="; + nativeBuildInputs = [ makeWrapper ]; + + vendorSha256 = "sha256-tbziQZIA1+b+ZtvA/865c8YQxn+r8HQy6Pqaac2kwcU="; + + # This is a package used for internally testing 3mux. It's meant for + # use by 3mux maintainers/contributors only. + excludedPackages = [ "fuzz" ]; + + # 3mux needs to have itself in the path so users can run `3mux detach`. + # This ensures that, while inside 3mux, the binary in the path is the + # same version as the 3mux hosting the session. This also allows users + # to use 3mux via `nix run nixpkgs#_3mux` (otherwise they'd get "command + # not found"). + postInstall = '' + wrapProgram $out/bin/3mux --prefix PATH : $out/bin + ''; meta = with lib; { description = "Terminal multiplexer inspired by i3"; longDescription = '' - 3mux is a terminal multiplexer with out-of-the-box support for search, - mouse-controlled scrollback, and i3-like keybindings. Imagine tmux with a - smaller learning curve and more sane defaults. + Terminal multiplexer with out-of-the-box support for search, + mouse-controlled scrollback, and i3-like keybindings ''; homepage = "https://github.com/aaronjanse/3mux"; license = licenses.mit; diff --git a/nixpkgs/pkgs/tools/misc/abduco/default.nix b/nixpkgs/pkgs/tools/misc/abduco/default.nix index dbba2193b14c..9493df1c66c4 100644 --- a/nixpkgs/pkgs/tools/misc/abduco/default.nix +++ b/nixpkgs/pkgs/tools/misc/abduco/default.nix @@ -1,23 +1,23 @@ { lib, stdenv, fetchFromGitHub, writeText, conf ? null }: -with lib; - stdenv.mkDerivation rec { - name = "abduco-2018-05-16"; + pname = "abduco"; + version = "2020-04-30"; src = fetchFromGitHub { owner = "martanne"; repo = "abduco"; - rev = "8f80aa8044d7ecf0e43a0294a09007d056b20e4c"; - sha256 = "0wqcif633nbgnznn46j0sng9l0wncppw1x1c42f75b4p9hrph203"; + rev = "8c32909a159aaa9484c82b71f05b7a73321eb491"; + sha256 = "0a3p8xljhpk7zh203s75248blfir15smgw5jmszwbmdpy4mqzd53"; }; - configFile = optionalString (conf!=null) (writeText "config.def.h" conf); - preBuild = optionalString (conf!=null) "cp ${configFile} config.def.h"; + preBuild = lib.optionalString (conf != null) + "cp ${writeText "config.def.h" conf} config.def.h"; + installFlags = [ "install-completion" ]; CFLAGS = lib.optionalString stdenv.isDarwin "-D_DARWIN_C_SOURCE"; - meta = { + meta = with lib; { homepage = "http://brain-dump.org/projects/abduco"; license = licenses.isc; description = "Allows programs to be run independently from its controlling terminal"; diff --git a/nixpkgs/pkgs/tools/misc/agedu/default.nix b/nixpkgs/pkgs/tools/misc/agedu/default.nix index 2146d0c24914..9c4b5c00a665 100644 --- a/nixpkgs/pkgs/tools/misc/agedu/default.nix +++ b/nixpkgs/pkgs/tools/misc/agedu/default.nix @@ -32,6 +32,6 @@ stdenv.mkDerivation { homepage = "https://www.chiark.greenend.org.uk/~sgtatham/agedu/"; license = licenses.mit; maintainers = with maintainers; [ symphorien ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/tools/misc/anystyle-cli/Gemfile b/nixpkgs/pkgs/tools/misc/anystyle-cli/Gemfile new file mode 100644 index 000000000000..be47216200d2 --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/anystyle-cli/Gemfile @@ -0,0 +1,37 @@ +source 'https://rubygems.org' +gemspec + + +group :development, :test do + #gem 'anystyle-data', github: 'inukshuk/anystyle-data' + #gem 'wapiti', github: 'inukshuk/wapiti-ruby' + gem 'bibtex-ruby' + gem 'rake' + gem 'rspec', '~>3.0' + gem 'language_detector', github: 'feedbackmine/language_detector' + gem 'unicode-scripts' + gem 'edtf' + gem 'citeproc' + gem 'unicode_utils' if RUBY_VERSION < '2.4' +end + +group :coverage do + gem 'simplecov', require: false + gem 'coveralls', require: false if ENV['CI'] +end + +group :debug do + gem 'byebug', require: false +end + +group :profile do + gem 'ruby-prof', require: false + gem 'gnuplot', require: false +end + +group :extra do + gem 'lmdb' + gem 'redis' + gem 'redis-namespace' + gem 'yard' +end diff --git a/nixpkgs/pkgs/tools/misc/anystyle-cli/Gemfile.lock b/nixpkgs/pkgs/tools/misc/anystyle-cli/Gemfile.lock new file mode 100644 index 000000000000..8d28ef808948 --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/anystyle-cli/Gemfile.lock @@ -0,0 +1,99 @@ +GIT + remote: https://github.com/feedbackmine/language_detector.git + revision: 89102790194150b3a8110ce691f9989b8ce70f8d + specs: + language_detector (0.1.2) + +PATH + remote: . + specs: + anystyle (1.3.10) + anystyle-data (~> 1.2) + bibtex-ruby (~> 5.0) + gli (~> 2.17) + namae (~> 1.0) + wapiti (~> 1.0, >= 1.0.2) + +GEM + remote: https://rubygems.org/ + specs: + activesupport (6.0.3.2) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) + minitest (~> 5.1) + tzinfo (~> 1.1) + zeitwerk (~> 2.2, >= 2.2.2) + anystyle-data (1.2.0) + bibtex-ruby (5.1.4) + latex-decode (~> 0.0) + builder (3.2.4) + byebug (11.1.3) + citeproc (1.0.10) + namae (~> 1.0) + concurrent-ruby (1.1.7) + diff-lcs (1.4.4) + docile (1.3.2) + edtf (3.0.5) + activesupport (>= 3.0, < 7.0) + gli (2.19.2) + gnuplot (2.6.2) + i18n (1.8.5) + concurrent-ruby (~> 1.0) + latex-decode (0.3.1) + lmdb (0.5.3) + minitest (5.14.1) + namae (1.0.1) + rake (13.0.1) + redis (4.2.1) + redis-namespace (1.8.0) + redis (>= 3.0.4) + rspec (3.9.0) + rspec-core (~> 3.9.0) + rspec-expectations (~> 3.9.0) + rspec-mocks (~> 3.9.0) + rspec-core (3.9.2) + rspec-support (~> 3.9.3) + rspec-expectations (3.9.2) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.9.0) + rspec-mocks (3.9.1) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.9.0) + rspec-support (3.9.3) + ruby-prof (1.4.1) + simplecov (0.19.0) + docile (~> 1.1) + simplecov-html (~> 0.11) + simplecov-html (0.12.2) + thread_safe (0.3.6) + tzinfo (1.2.7) + thread_safe (~> 0.1) + unicode-scripts (1.6.0) + wapiti (1.0.7) + builder (~> 3.2) + yard (0.9.25) + zeitwerk (2.4.0) + +PLATFORMS + ruby + +DEPENDENCIES + anystyle! + bibtex-ruby + byebug + citeproc + edtf + gnuplot + language_detector! + lmdb + rake + redis + redis-namespace + rspec (~> 3.0) + ruby-prof + simplecov + unicode-scripts + yard + +BUNDLED WITH + 2.1.4 diff --git a/nixpkgs/pkgs/tools/misc/anystyle-cli/anystyle.gemspec b/nixpkgs/pkgs/tools/misc/anystyle-cli/anystyle.gemspec new file mode 100644 index 000000000000..57db427fb024 --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/anystyle-cli/anystyle.gemspec @@ -0,0 +1,52 @@ +# -*- encoding: utf-8 -*- +lib = File.expand_path('../lib/', __FILE__) +$:.unshift lib unless $:.include?(lib) + +require 'anystyle/version' + +Gem::Specification.new do |s| + s.name = 'anystyle' + s.version = AnyStyle::VERSION.dup + s.platform = Gem::Platform::RUBY + s.authors = ['Sylvester Keil'] + s.email = ['http://sylvester.keil.or.at'] + s.homepage = 'http://anystyle.io' + s.summary = 'Smart and fast bibliography parser.' + s.description = 'A sophisticated parser for academic reference lists and bibliographies based on machine learning algorithms using conditional random fields.' + s.license = 'BSD-2-Clause' + s.executables = [] + s.require_path = 'lib' + + s.required_ruby_version = '>= 2.2' + + s.add_runtime_dependency('bibtex-ruby', '~>5.0') + s.add_runtime_dependency('anystyle-data', '~>1.2') + s.add_runtime_dependency('gli', '~>2.17') + s.add_runtime_dependency('wapiti', '~>1.0', '>=1.0.2') + s.add_runtime_dependency('namae', '~>1.0') + + s.files = + `git ls-files`.split("\n") - `git ls-files spec`.split("\n") - %w{ + .coveralls.yml + .gitignore + .rspec + .simplecov + .travis.yml + Gemfile + Rakefile + appveyor.yml + anystyle.gemspec + res/core.xml + } + + s.rdoc_options = %w{ + --line-numbers + --inline-source + --title "AnyStyle" + --main README.md + } + s.extra_rdoc_files = %w{README.md LICENSE} + +end + +# vim: syntax=ruby diff --git a/nixpkgs/pkgs/tools/misc/anystyle-cli/default.nix b/nixpkgs/pkgs/tools/misc/anystyle-cli/default.nix new file mode 100644 index 000000000000..7a437cafc281 --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/anystyle-cli/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildRubyGem +, bundlerEnv +, ruby +, poppler_utils +}: +let + deps = bundlerEnv rec { + name = "anystyle-cli-${version}"; + source.sha256 = lib.fakeSha256; + version = "1.3.1"; + inherit ruby; + gemdir = ./.; + gemset = lib.recursiveUpdate (import ./gemset.nix) { + anystyle.source = { + remotes = ["https://rubygems.org"]; + sha256 = "1w79zcia60nnnyrmyvpd10pmxrpk5c7lj9gmmblhwi8x5mfq9k0n"; + type = "gem"; + }; + }; + }; +in +buildRubyGem rec { + inherit ruby; + gemName = "anystyle-cli"; + pname = gemName; + version = "1.3.1"; + source.sha256 = "1a3ifwxwqkp5dnfk9r8qq8kgfb8k1pl7jjdghbb8ixbxz9ac7awy"; + + propagatedBuildInputs = [ deps ]; + + preFixup = '' + wrapProgram $out/bin/anystyle --prefix PATH ${poppler_utils}/bin + ''; + + meta = with lib; { + description = "Command line interface to the AnyStyle Parser and Finder"; + homepage = "https://anystyle.io/"; + license = licenses.bsd2; + maintainers = with maintainers; [ shamilton ]; + platforms = platforms.unix; + }; +} diff --git a/nixpkgs/pkgs/tools/misc/anystyle-cli/gemset.nix b/nixpkgs/pkgs/tools/misc/anystyle-cli/gemset.nix new file mode 100644 index 000000000000..46444760b7bd --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/anystyle-cli/gemset.nix @@ -0,0 +1,1570 @@ +{ + activesupport = { + dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo" "zeitwerk"]; + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "02sh4q8izyfdnh7z2nj5mn5sklfvqgx9rrag5j3l51y8aqkrg2yk"; + type = "gem"; + }; + version = "6.0.3.2"; + }; + anystyle = { + dependencies = ["anystyle-data" "bibtex-ruby" "gli" "namae" "wapiti"]; + groups = ["default"]; + platforms = [{ + engine = "maglev"; + } { + engine = "maglev"; + } { + engine = "maglev"; + version = "1.8"; + } { + engine = "maglev"; + version = "1.8"; + } { + engine = "maglev"; + version = "1.9"; + } { + engine = "maglev"; + version = "1.9"; + } { + engine = "maglev"; + version = "2.0"; + } { + engine = "maglev"; + version = "2.0"; + } { + engine = "maglev"; + version = "2.1"; + } { + engine = "maglev"; + version = "2.1"; + } { + engine = "maglev"; + version = "2.2"; + } { + engine = "maglev"; + version = "2.2"; + } { + engine = "maglev"; + version = "2.3"; + } { + engine = "maglev"; + version = "2.3"; + } { + engine = "maglev"; + version = "2.4"; + } { + engine = "maglev"; + version = "2.4"; + } { + engine = "maglev"; + version = "2.5"; + } { + engine = "maglev"; + version = "2.5"; + } { + engine = "maglev"; + version = "2.6"; + } { + engine = "maglev"; + version = "2.6"; + } { + engine = "rbx"; + } { + engine = "rbx"; + } { + engine = "rbx"; + version = "1.8"; + } { + engine = "rbx"; + version = "1.9"; + } { + engine = "rbx"; + version = "2.0"; + } { + engine = "rbx"; + version = "2.1"; + } { + engine = "rbx"; + version = "2.2"; + } { + engine = "rbx"; + version = "2.3"; + } { + engine = "rbx"; + version = "2.4"; + } { + engine = "rbx"; + version = "2.5"; + } { + engine = "rbx"; + version = "2.6"; + } { + engine = "ruby"; + } { + engine = "ruby"; + } { + engine = "ruby"; + } { + engine = "ruby"; + version = "1.8"; + } { + engine = "ruby"; + version = "1.8"; + } { + engine = "ruby"; + version = "1.9"; + } { + engine = "ruby"; + version = "1.9"; + } { + engine = "ruby"; + version = "2.0"; + } { + engine = "ruby"; + version = "2.0"; + } { + engine = "ruby"; + version = "2.1"; + } { + engine = "ruby"; + version = "2.1"; + } { + engine = "ruby"; + version = "2.2"; + } { + engine = "ruby"; + version = "2.2"; + } { + engine = "ruby"; + version = "2.3"; + } { + engine = "ruby"; + version = "2.3"; + } { + engine = "ruby"; + version = "2.4"; + } { + engine = "ruby"; + version = "2.4"; + } { + engine = "ruby"; + version = "2.5"; + } { + engine = "ruby"; + version = "2.5"; + } { + engine = "ruby"; + version = "2.6"; + } { + engine = "ruby"; + version = "2.6"; + }]; + source = { + path = ./.; + type = "path"; + }; + version = "1.3.10"; + }; + anystyle-data = { + groups = ["default"]; + platforms = [{ + engine = "maglev"; + } { + engine = "maglev"; + } { + engine = "maglev"; + version = "1.8"; + } { + engine = "maglev"; + version = "1.8"; + } { + engine = "maglev"; + version = "1.9"; + } { + engine = "maglev"; + version = "1.9"; + } { + engine = "maglev"; + version = "2.0"; + } { + engine = "maglev"; + version = "2.0"; + } { + engine = "maglev"; + version = "2.1"; + } { + engine = "maglev"; + version = "2.1"; + } { + engine = "maglev"; + version = "2.2"; + } { + engine = "maglev"; + version = "2.2"; + } { + engine = "maglev"; + version = "2.3"; + } { + engine = "maglev"; + version = "2.3"; + } { + engine = "maglev"; + version = "2.4"; + } { + engine = "maglev"; + version = "2.4"; + } { + engine = "maglev"; + version = "2.5"; + } { + engine = "maglev"; + version = "2.5"; + } { + engine = "maglev"; + version = "2.6"; + } { + engine = "maglev"; + version = "2.6"; + } { + engine = "rbx"; + } { + engine = "rbx"; + } { + engine = "rbx"; + version = "1.8"; + } { + engine = "rbx"; + version = "1.9"; + } { + engine = "rbx"; + version = "2.0"; + } { + engine = "rbx"; + version = "2.1"; + } { + engine = "rbx"; + version = "2.2"; + } { + engine = "rbx"; + version = "2.3"; + } { + engine = "rbx"; + version = "2.4"; + } { + engine = "rbx"; + version = "2.5"; + } { + engine = "rbx"; + version = "2.6"; + } { + engine = "ruby"; + } { + engine = "ruby"; + } { + engine = "ruby"; + } { + engine = "ruby"; + version = "1.8"; + } { + engine = "ruby"; + version = "1.8"; + } { + engine = "ruby"; + version = "1.9"; + } { + engine = "ruby"; + version = "1.9"; + } { + engine = "ruby"; + version = "2.0"; + } { + engine = "ruby"; + version = "2.0"; + } { + engine = "ruby"; + version = "2.1"; + } { + engine = "ruby"; + version = "2.1"; + } { + engine = "ruby"; + version = "2.2"; + } { + engine = "ruby"; + version = "2.2"; + } { + engine = "ruby"; + version = "2.3"; + } { + engine = "ruby"; + version = "2.3"; + } { + engine = "ruby"; + version = "2.4"; + } { + engine = "ruby"; + version = "2.4"; + } { + engine = "ruby"; + version = "2.5"; + } { + engine = "ruby"; + version = "2.5"; + } { + engine = "ruby"; + version = "2.6"; + } { + engine = "ruby"; + version = "2.6"; + }]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1ry6836mq48d85hjcfp7xiw0yk3ivpiwjvmdwv5jag30ijfyaccy"; + type = "gem"; + }; + version = "1.2.0"; + }; + bibtex-ruby = { + dependencies = ["latex-decode"]; + groups = ["default" "development" "test"]; + platforms = [{ + engine = "maglev"; + } { + engine = "maglev"; + } { + engine = "maglev"; + version = "1.8"; + } { + engine = "maglev"; + version = "1.8"; + } { + engine = "maglev"; + version = "1.9"; + } { + engine = "maglev"; + version = "1.9"; + } { + engine = "maglev"; + version = "2.0"; + } { + engine = "maglev"; + version = "2.0"; + } { + engine = "maglev"; + version = "2.1"; + } { + engine = "maglev"; + version = "2.1"; + } { + engine = "maglev"; + version = "2.2"; + } { + engine = "maglev"; + version = "2.2"; + } { + engine = "maglev"; + version = "2.3"; + } { + engine = "maglev"; + version = "2.3"; + } { + engine = "maglev"; + version = "2.4"; + } { + engine = "maglev"; + version = "2.4"; + } { + engine = "maglev"; + version = "2.5"; + } { + engine = "maglev"; + version = "2.5"; + } { + engine = "maglev"; + version = "2.6"; + } { + engine = "maglev"; + version = "2.6"; + } { + engine = "rbx"; + } { + engine = "rbx"; + } { + engine = "rbx"; + version = "1.8"; + } { + engine = "rbx"; + version = "1.9"; + } { + engine = "rbx"; + version = "2.0"; + } { + engine = "rbx"; + version = "2.1"; + } { + engine = "rbx"; + version = "2.2"; + } { + engine = "rbx"; + version = "2.3"; + } { + engine = "rbx"; + version = "2.4"; + } { + engine = "rbx"; + version = "2.5"; + } { + engine = "rbx"; + version = "2.6"; + } { + engine = "ruby"; + } { + engine = "ruby"; + } { + engine = "ruby"; + } { + engine = "ruby"; + version = "1.8"; + } { + engine = "ruby"; + version = "1.8"; + } { + engine = "ruby"; + version = "1.9"; + } { + engine = "ruby"; + version = "1.9"; + } { + engine = "ruby"; + version = "2.0"; + } { + engine = "ruby"; + version = "2.0"; + } { + engine = "ruby"; + version = "2.1"; + } { + engine = "ruby"; + version = "2.1"; + } { + engine = "ruby"; + version = "2.2"; + } { + engine = "ruby"; + version = "2.2"; + } { + engine = "ruby"; + version = "2.3"; + } { + engine = "ruby"; + version = "2.3"; + } { + engine = "ruby"; + version = "2.4"; + } { + engine = "ruby"; + version = "2.4"; + } { + engine = "ruby"; + version = "2.5"; + } { + engine = "ruby"; + version = "2.5"; + } { + engine = "ruby"; + version = "2.6"; + } { + engine = "ruby"; + version = "2.6"; + }]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "00zwmmmjrbrxhajdvn1d4rnv2qw00arcj021cwyx3hl6dsv22l2w"; + type = "gem"; + }; + version = "5.1.4"; + }; + builder = { + groups = ["default"]; + platforms = [{ + engine = "maglev"; + } { + engine = "maglev"; + } { + engine = "maglev"; + version = "1.8"; + } { + engine = "maglev"; + version = "1.8"; + } { + engine = "maglev"; + version = "1.9"; + } { + engine = "maglev"; + version = "1.9"; + } { + engine = "maglev"; + version = "2.0"; + } { + engine = "maglev"; + version = "2.0"; + } { + engine = "maglev"; + version = "2.1"; + } { + engine = "maglev"; + version = "2.1"; + } { + engine = "maglev"; + version = "2.2"; + } { + engine = "maglev"; + version = "2.2"; + } { + engine = "maglev"; + version = "2.3"; + } { + engine = "maglev"; + version = "2.3"; + } { + engine = "maglev"; + version = "2.4"; + } { + engine = "maglev"; + version = "2.4"; + } { + engine = "maglev"; + version = "2.5"; + } { + engine = "maglev"; + version = "2.5"; + } { + engine = "maglev"; + version = "2.6"; + } { + engine = "maglev"; + version = "2.6"; + } { + engine = "rbx"; + } { + engine = "rbx"; + } { + engine = "rbx"; + version = "1.8"; + } { + engine = "rbx"; + version = "1.9"; + } { + engine = "rbx"; + version = "2.0"; + } { + engine = "rbx"; + version = "2.1"; + } { + engine = "rbx"; + version = "2.2"; + } { + engine = "rbx"; + version = "2.3"; + } { + engine = "rbx"; + version = "2.4"; + } { + engine = "rbx"; + version = "2.5"; + } { + engine = "rbx"; + version = "2.6"; + } { + engine = "ruby"; + } { + engine = "ruby"; + } { + engine = "ruby"; + } { + engine = "ruby"; + version = "1.8"; + } { + engine = "ruby"; + version = "1.8"; + } { + engine = "ruby"; + version = "1.9"; + } { + engine = "ruby"; + version = "1.9"; + } { + engine = "ruby"; + version = "2.0"; + } { + engine = "ruby"; + version = "2.0"; + } { + engine = "ruby"; + version = "2.1"; + } { + engine = "ruby"; + version = "2.1"; + } { + engine = "ruby"; + version = "2.2"; + } { + engine = "ruby"; + version = "2.2"; + } { + engine = "ruby"; + version = "2.3"; + } { + engine = "ruby"; + version = "2.3"; + } { + engine = "ruby"; + version = "2.4"; + } { + engine = "ruby"; + version = "2.4"; + } { + engine = "ruby"; + version = "2.5"; + } { + engine = "ruby"; + version = "2.5"; + } { + engine = "ruby"; + version = "2.6"; + } { + engine = "ruby"; + version = "2.6"; + }]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "045wzckxpwcqzrjr353cxnyaxgf0qg22jh00dcx7z38cys5g1jlr"; + type = "gem"; + }; + version = "3.2.4"; + }; + byebug = { + groups = ["debug"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0nx3yjf4xzdgb8jkmk2344081gqr22pgjqnmjg2q64mj5d6r9194"; + type = "gem"; + }; + version = "11.1.3"; + }; + citeproc = { + dependencies = ["namae"]; + groups = ["development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "13vl5sjmksk5a8kjcqnjxh7kn9gn1n4f9p1rvqfgsfhs54p0m6l2"; + type = "gem"; + }; + version = "1.0.10"; + }; + concurrent-ruby = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1vnxrbhi7cq3p4y2v9iwd10v1c7l15is4var14hwnb2jip4fyjzz"; + type = "gem"; + }; + version = "1.1.7"; + }; + diff-lcs = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0m925b8xc6kbpnif9dldna24q1szg4mk0fvszrki837pfn46afmz"; + type = "gem"; + }; + version = "1.4.4"; + }; + docile = { + groups = ["coverage" "default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0qrwiyagxzl8zlx3dafb0ay8l14ib7imb2rsmx70i5cp420v8gif"; + type = "gem"; + }; + version = "1.3.2"; + }; + edtf = { + dependencies = ["activesupport"]; + groups = ["development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0xknzamagsx68iq7zdiswr077sxirig77yggbcsw51m8365ajzpc"; + type = "gem"; + }; + version = "3.0.5"; + }; + gli = { + groups = ["default"]; + platforms = [{ + engine = "maglev"; + } { + engine = "maglev"; + } { + engine = "maglev"; + version = "1.8"; + } { + engine = "maglev"; + version = "1.8"; + } { + engine = "maglev"; + version = "1.9"; + } { + engine = "maglev"; + version = "1.9"; + } { + engine = "maglev"; + version = "2.0"; + } { + engine = "maglev"; + version = "2.0"; + } { + engine = "maglev"; + version = "2.1"; + } { + engine = "maglev"; + version = "2.1"; + } { + engine = "maglev"; + version = "2.2"; + } { + engine = "maglev"; + version = "2.2"; + } { + engine = "maglev"; + version = "2.3"; + } { + engine = "maglev"; + version = "2.3"; + } { + engine = "maglev"; + version = "2.4"; + } { + engine = "maglev"; + version = "2.4"; + } { + engine = "maglev"; + version = "2.5"; + } { + engine = "maglev"; + version = "2.5"; + } { + engine = "maglev"; + version = "2.6"; + } { + engine = "maglev"; + version = "2.6"; + } { + engine = "rbx"; + } { + engine = "rbx"; + } { + engine = "rbx"; + version = "1.8"; + } { + engine = "rbx"; + version = "1.9"; + } { + engine = "rbx"; + version = "2.0"; + } { + engine = "rbx"; + version = "2.1"; + } { + engine = "rbx"; + version = "2.2"; + } { + engine = "rbx"; + version = "2.3"; + } { + engine = "rbx"; + version = "2.4"; + } { + engine = "rbx"; + version = "2.5"; + } { + engine = "rbx"; + version = "2.6"; + } { + engine = "ruby"; + } { + engine = "ruby"; + } { + engine = "ruby"; + } { + engine = "ruby"; + version = "1.8"; + } { + engine = "ruby"; + version = "1.8"; + } { + engine = "ruby"; + version = "1.9"; + } { + engine = "ruby"; + version = "1.9"; + } { + engine = "ruby"; + version = "2.0"; + } { + engine = "ruby"; + version = "2.0"; + } { + engine = "ruby"; + version = "2.1"; + } { + engine = "ruby"; + version = "2.1"; + } { + engine = "ruby"; + version = "2.2"; + } { + engine = "ruby"; + version = "2.2"; + } { + engine = "ruby"; + version = "2.3"; + } { + engine = "ruby"; + version = "2.3"; + } { + engine = "ruby"; + version = "2.4"; + } { + engine = "ruby"; + version = "2.4"; + } { + engine = "ruby"; + version = "2.5"; + } { + engine = "ruby"; + version = "2.5"; + } { + engine = "ruby"; + version = "2.6"; + } { + engine = "ruby"; + version = "2.6"; + }]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0q598mvl20isn3ja1ya0p72svmqwx3m6fjp5slnv0b2c5mh0ahvv"; + type = "gem"; + }; + version = "2.19.2"; + }; + gnuplot = { + groups = ["profile"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1cvb84lahhy6qxkkgg0pfk9b85qrb1by2p3jlpqgczl6am58vhnj"; + type = "gem"; + }; + version = "2.6.2"; + }; + i18n = { + dependencies = ["concurrent-ruby"]; + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "153sx77p16vawrs4qpkv7qlzf9v5fks4g7xqcj1dwk40i6g7rfzk"; + type = "gem"; + }; + version = "1.8.5"; + }; + language_detector = { + groups = ["development" "test"]; + platforms = []; + source = { + fetchSubmodules = false; + rev = "89102790194150b3a8110ce691f9989b8ce70f8d"; + sha256 = "0wxs9i0wqmwysrz1c1i85i4f670m217y12rj5slcmd1y4ylsmvyi"; + type = "git"; + url = "https://github.com/feedbackmine/language_detector.git"; + }; + version = "0.1.2"; + }; + latex-decode = { + groups = ["default" "development" "test"]; + platforms = [{ + engine = "maglev"; + } { + engine = "maglev"; + } { + engine = "maglev"; + version = "1.8"; + } { + engine = "maglev"; + version = "1.8"; + } { + engine = "maglev"; + version = "1.9"; + } { + engine = "maglev"; + version = "1.9"; + } { + engine = "maglev"; + version = "2.0"; + } { + engine = "maglev"; + version = "2.0"; + } { + engine = "maglev"; + version = "2.1"; + } { + engine = "maglev"; + version = "2.1"; + } { + engine = "maglev"; + version = "2.2"; + } { + engine = "maglev"; + version = "2.2"; + } { + engine = "maglev"; + version = "2.3"; + } { + engine = "maglev"; + version = "2.3"; + } { + engine = "maglev"; + version = "2.4"; + } { + engine = "maglev"; + version = "2.4"; + } { + engine = "maglev"; + version = "2.5"; + } { + engine = "maglev"; + version = "2.5"; + } { + engine = "maglev"; + version = "2.6"; + } { + engine = "maglev"; + version = "2.6"; + } { + engine = "rbx"; + } { + engine = "rbx"; + } { + engine = "rbx"; + version = "1.8"; + } { + engine = "rbx"; + version = "1.9"; + } { + engine = "rbx"; + version = "2.0"; + } { + engine = "rbx"; + version = "2.1"; + } { + engine = "rbx"; + version = "2.2"; + } { + engine = "rbx"; + version = "2.3"; + } { + engine = "rbx"; + version = "2.4"; + } { + engine = "rbx"; + version = "2.5"; + } { + engine = "rbx"; + version = "2.6"; + } { + engine = "ruby"; + } { + engine = "ruby"; + } { + engine = "ruby"; + } { + engine = "ruby"; + version = "1.8"; + } { + engine = "ruby"; + version = "1.8"; + } { + engine = "ruby"; + version = "1.9"; + } { + engine = "ruby"; + version = "1.9"; + } { + engine = "ruby"; + version = "2.0"; + } { + engine = "ruby"; + version = "2.0"; + } { + engine = "ruby"; + version = "2.1"; + } { + engine = "ruby"; + version = "2.1"; + } { + engine = "ruby"; + version = "2.2"; + } { + engine = "ruby"; + version = "2.2"; + } { + engine = "ruby"; + version = "2.3"; + } { + engine = "ruby"; + version = "2.3"; + } { + engine = "ruby"; + version = "2.4"; + } { + engine = "ruby"; + version = "2.4"; + } { + engine = "ruby"; + version = "2.5"; + } { + engine = "ruby"; + version = "2.5"; + } { + engine = "ruby"; + version = "2.6"; + } { + engine = "ruby"; + version = "2.6"; + }]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0dqanr69as05vdyp9gx9737w3g44rhyk7x96bh9x01fnf1yalyzd"; + type = "gem"; + }; + version = "0.3.1"; + }; + lmdb = { + groups = ["extra"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0qk2ycgyyk052dvbgik35mr4n9im4k1j6v7anbjqhx52y5f07sfg"; + type = "gem"; + }; + version = "0.5.3"; + }; + minitest = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "09bz9nsznxgaf06cx3b5z71glgl0hdw469gqx3w7bqijgrb55p5g"; + type = "gem"; + }; + version = "5.14.1"; + }; + namae = { + groups = ["default" "development" "test"]; + platforms = [{ + engine = "maglev"; + } { + engine = "maglev"; + } { + engine = "maglev"; + version = "1.8"; + } { + engine = "maglev"; + version = "1.8"; + } { + engine = "maglev"; + version = "1.9"; + } { + engine = "maglev"; + version = "1.9"; + } { + engine = "maglev"; + version = "2.0"; + } { + engine = "maglev"; + version = "2.0"; + } { + engine = "maglev"; + version = "2.1"; + } { + engine = "maglev"; + version = "2.1"; + } { + engine = "maglev"; + version = "2.2"; + } { + engine = "maglev"; + version = "2.2"; + } { + engine = "maglev"; + version = "2.3"; + } { + engine = "maglev"; + version = "2.3"; + } { + engine = "maglev"; + version = "2.4"; + } { + engine = "maglev"; + version = "2.4"; + } { + engine = "maglev"; + version = "2.5"; + } { + engine = "maglev"; + version = "2.5"; + } { + engine = "maglev"; + version = "2.6"; + } { + engine = "maglev"; + version = "2.6"; + } { + engine = "rbx"; + } { + engine = "rbx"; + } { + engine = "rbx"; + version = "1.8"; + } { + engine = "rbx"; + version = "1.9"; + } { + engine = "rbx"; + version = "2.0"; + } { + engine = "rbx"; + version = "2.1"; + } { + engine = "rbx"; + version = "2.2"; + } { + engine = "rbx"; + version = "2.3"; + } { + engine = "rbx"; + version = "2.4"; + } { + engine = "rbx"; + version = "2.5"; + } { + engine = "rbx"; + version = "2.6"; + } { + engine = "ruby"; + } { + engine = "ruby"; + } { + engine = "ruby"; + } { + engine = "ruby"; + version = "1.8"; + } { + engine = "ruby"; + version = "1.8"; + } { + engine = "ruby"; + version = "1.9"; + } { + engine = "ruby"; + version = "1.9"; + } { + engine = "ruby"; + version = "2.0"; + } { + engine = "ruby"; + version = "2.0"; + } { + engine = "ruby"; + version = "2.1"; + } { + engine = "ruby"; + version = "2.1"; + } { + engine = "ruby"; + version = "2.2"; + } { + engine = "ruby"; + version = "2.2"; + } { + engine = "ruby"; + version = "2.3"; + } { + engine = "ruby"; + version = "2.3"; + } { + engine = "ruby"; + version = "2.4"; + } { + engine = "ruby"; + version = "2.4"; + } { + engine = "ruby"; + version = "2.5"; + } { + engine = "ruby"; + version = "2.5"; + } { + engine = "ruby"; + version = "2.6"; + } { + engine = "ruby"; + version = "2.6"; + }]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "00w0dgvmdy8lw2b5q9zvhqd5k98a192vdmka96qngi9cvnsh5snw"; + type = "gem"; + }; + version = "1.0.1"; + }; + rake = { + groups = ["development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0w6qza25bq1s825faaglkx1k6d59aiyjjk3yw3ip5sb463mhhai9"; + type = "gem"; + }; + version = "13.0.1"; + }; + redis = { + groups = ["extra"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "19hm66kw5vx1lmlh8bj7rxlddyj0vfp11ajw9njhrmn8173d0vb5"; + type = "gem"; + }; + version = "4.2.1"; + }; + redis-namespace = { + dependencies = ["redis"]; + groups = ["extra"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "05i6s898z5w31z385cba1683pgg5nnmj4m686cbravg7j4pgbcgv"; + type = "gem"; + }; + version = "1.8.0"; + }; + rspec = { + dependencies = ["rspec-core" "rspec-expectations" "rspec-mocks"]; + groups = ["development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1hzsig4pi9ybr0xl5540m1swiyxa74c8h09225y5sdh2rjkkg84h"; + type = "gem"; + }; + version = "3.9.0"; + }; + rspec-core = { + dependencies = ["rspec-support"]; + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1xndkv5cz763wh30x7hdqw6k7zs8xfh0f86amra9agwn44pcqs0y"; + type = "gem"; + }; + version = "3.9.2"; + }; + rspec-expectations = { + dependencies = ["diff-lcs" "rspec-support"]; + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1bxkv25qmy39jqrdx35bfgw00g24qkssail9jlljm7hywbqvr9bb"; + type = "gem"; + }; + version = "3.9.2"; + }; + rspec-mocks = { + dependencies = ["diff-lcs" "rspec-support"]; + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "19vmdqym1v2g1zbdnq37zwmyj87y9yc9ijwc8js55igvbb9hx0mr"; + type = "gem"; + }; + version = "3.9.1"; + }; + rspec-support = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0dandh2fy1dfkjk8jf9v4azbbma6968bhh06hddv0yqqm8108jir"; + type = "gem"; + }; + version = "3.9.3"; + }; + ruby-prof = { + groups = ["profile"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "12cd91m08ih0imfpy4k87618hd4mhyz291a6bx2hcskza4nf6d27"; + type = "gem"; + }; + version = "1.4.1"; + }; + simplecov = { + dependencies = ["docile" "simplecov-html"]; + groups = ["coverage"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1b082xrklq6k755cc3rzpnfdjv5338rlky9him36jasw8s9q68mr"; + type = "gem"; + }; + version = "0.19.0"; + }; + simplecov-html = { + groups = ["coverage" "default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1v7b4mf7njw8kv4ghl4q7mwz3q0flbld7v8blp4m4m3n3aq11bn9"; + type = "gem"; + }; + version = "0.12.2"; + }; + thread_safe = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0nmhcgq6cgz44srylra07bmaw99f5271l0dpsvl5f75m44l0gmwy"; + type = "gem"; + }; + version = "0.3.6"; + }; + tzinfo = { + dependencies = ["thread_safe"]; + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1i3jh086w1kbdj3k5l60lc3nwbanmzdf8yjj3mlrx9b2gjjxhi9r"; + type = "gem"; + }; + version = "1.2.7"; + }; + unicode-scripts = { + groups = ["development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "04xfy4f61xf7qnbfa68aqscmyxk7wx3swn571cijsfqalhz8swjg"; + type = "gem"; + }; + version = "1.6.0"; + }; + wapiti = { + dependencies = ["builder"]; + groups = ["default"]; + platforms = [{ + engine = "maglev"; + } { + engine = "maglev"; + } { + engine = "maglev"; + version = "1.8"; + } { + engine = "maglev"; + version = "1.8"; + } { + engine = "maglev"; + version = "1.9"; + } { + engine = "maglev"; + version = "1.9"; + } { + engine = "maglev"; + version = "2.0"; + } { + engine = "maglev"; + version = "2.0"; + } { + engine = "maglev"; + version = "2.1"; + } { + engine = "maglev"; + version = "2.1"; + } { + engine = "maglev"; + version = "2.2"; + } { + engine = "maglev"; + version = "2.2"; + } { + engine = "maglev"; + version = "2.3"; + } { + engine = "maglev"; + version = "2.3"; + } { + engine = "maglev"; + version = "2.4"; + } { + engine = "maglev"; + version = "2.4"; + } { + engine = "maglev"; + version = "2.5"; + } { + engine = "maglev"; + version = "2.5"; + } { + engine = "maglev"; + version = "2.6"; + } { + engine = "maglev"; + version = "2.6"; + } { + engine = "rbx"; + } { + engine = "rbx"; + } { + engine = "rbx"; + version = "1.8"; + } { + engine = "rbx"; + version = "1.9"; + } { + engine = "rbx"; + version = "2.0"; + } { + engine = "rbx"; + version = "2.1"; + } { + engine = "rbx"; + version = "2.2"; + } { + engine = "rbx"; + version = "2.3"; + } { + engine = "rbx"; + version = "2.4"; + } { + engine = "rbx"; + version = "2.5"; + } { + engine = "rbx"; + version = "2.6"; + } { + engine = "ruby"; + } { + engine = "ruby"; + } { + engine = "ruby"; + } { + engine = "ruby"; + version = "1.8"; + } { + engine = "ruby"; + version = "1.8"; + } { + engine = "ruby"; + version = "1.9"; + } { + engine = "ruby"; + version = "1.9"; + } { + engine = "ruby"; + version = "2.0"; + } { + engine = "ruby"; + version = "2.0"; + } { + engine = "ruby"; + version = "2.1"; + } { + engine = "ruby"; + version = "2.1"; + } { + engine = "ruby"; + version = "2.2"; + } { + engine = "ruby"; + version = "2.2"; + } { + engine = "ruby"; + version = "2.3"; + } { + engine = "ruby"; + version = "2.3"; + } { + engine = "ruby"; + version = "2.4"; + } { + engine = "ruby"; + version = "2.4"; + } { + engine = "ruby"; + version = "2.5"; + } { + engine = "ruby"; + version = "2.5"; + } { + engine = "ruby"; + version = "2.6"; + } { + engine = "ruby"; + version = "2.6"; + }]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1aw2l759cfmii9a67pn8pswip11v08nabkzm825mrmxa6r91izqs"; + type = "gem"; + }; + version = "1.0.7"; + }; + yard = { + groups = ["extra"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "126m49mvh4lbvlvrprq7xj2vjixbq3xqr8dwr089vadvs0rkn4rd"; + type = "gem"; + }; + version = "0.9.25"; + }; + zeitwerk = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0jvn50k76kl14fpymk4hdsf9sk00jl84yxzl783xhnw4dicp0m0k"; + type = "gem"; + }; + version = "2.4.0"; + }; +} + diff --git a/nixpkgs/pkgs/tools/misc/apparix/default.nix b/nixpkgs/pkgs/tools/misc/apparix/default.nix index 7d8de2c14367..d446a2cf0af6 100644 --- a/nixpkgs/pkgs/tools/misc/apparix/default.nix +++ b/nixpkgs/pkgs/tools/misc/apparix/default.nix @@ -15,6 +15,6 @@ stdenv.mkDerivation rec { description = "Add directory bookmarks, distant listing, and distant editing to the command line"; maintainers = with maintainers; [ lethalman ]; license = licenses.gpl2; - platforms = platforms.linux; + platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/tools/misc/arp-scan/default.nix b/nixpkgs/pkgs/tools/misc/arp-scan/default.nix index e25543b5145a..720b0a875a80 100644 --- a/nixpkgs/pkgs/tools/misc/arp-scan/default.nix +++ b/nixpkgs/pkgs/tools/misc/arp-scan/default.nix @@ -18,8 +18,8 @@ stdenv.mkDerivation rec { URI ]; - nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ perlPackages.perl libpcap makeWrapper ]; + nativeBuildInputs = [ autoreconfHook makeWrapper ]; + buildInputs = [ perlPackages.perl libpcap ]; postInstall = '' for name in get-{oui,iab}; do diff --git a/nixpkgs/pkgs/tools/misc/aspcud/default.nix b/nixpkgs/pkgs/tools/misc/aspcud/default.nix index 4c5622fab09c..a50bc311f247 100644 --- a/nixpkgs/pkgs/tools/misc/aspcud/default.nix +++ b/nixpkgs/pkgs/tools/misc/aspcud/default.nix @@ -3,12 +3,12 @@ }: stdenv.mkDerivation rec { - version = "1.9.4"; + version = "1.9.5"; pname = "aspcud"; src = fetchzip { url = "https://github.com/potassco/aspcud/archive/v${version}.tar.gz"; - sha256 = "0vrf7h7g99vw1mybqfrpxamsnf89p18czlzgjmxl1zkiwc7vjpzw"; + sha256 = "sha256-d04GPMoz6PMGq6iiul0zT1C9Mljdl9uJJ2C8MIwcmaw="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/tools/misc/bash_unit/default.nix b/nixpkgs/pkgs/tools/misc/bash_unit/default.nix index 2fd93cb33b97..7541281eeb67 100644 --- a/nixpkgs/pkgs/tools/misc/bash_unit/default.nix +++ b/nixpkgs/pkgs/tools/misc/bash_unit/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Bash unit testing enterprise edition framework for professionals"; maintainers = with maintainers; [ pamplemousse ]; - platforms = platforms.linux; + platforms = platforms.all; license = licenses.gpl3Plus; }; } diff --git a/nixpkgs/pkgs/tools/misc/bat-extras/default.nix b/nixpkgs/pkgs/tools/misc/bat-extras/default.nix index 7d3f1dc0a36c..323099f02c67 100644 --- a/nixpkgs/pkgs/tools/misc/bat-extras/default.nix +++ b/nixpkgs/pkgs/tools/misc/bat-extras/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, callPackage, fetchFromGitHub, bash, makeWrapper, bat +{ lib, stdenv, fetchFromGitHub, bash, makeWrapper, bat # batdiff, batgrep, and batwatch , coreutils , less diff --git a/nixpkgs/pkgs/tools/misc/bat/default.nix b/nixpkgs/pkgs/tools/misc/bat/default.nix index d6e1e9e5d774..d72b0fdef1fa 100644 --- a/nixpkgs/pkgs/tools/misc/bat/default.nix +++ b/nixpkgs/pkgs/tools/misc/bat/default.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "bat"; - version = "0.17.1"; + version = "0.18.0"; src = fetchFromGitHub { owner = "sharkdp"; repo = pname; rev = "v${version}"; - sha256 = "1kbziqm00skj65gpjq6m83hmfk9g3xyx88gai1r80pzsx8g239w1"; + sha256 = "113i11sgna82i4c4zk66qmbypmnmzh0lzp4kkgqnxxcdvyj00rb8"; }; - cargoSha256 = "1pdja5jhk036hpgv77xc3fcvra1sw0z5jc1ry53i0r7362lnwapz"; + cargoSha256 = "12z7y303fmga91daf2w356qiqdqa7b8dz6nrrpnjdf0slyz0w3x4"; nativeBuildInputs = [ pkg-config installShellFiles makeWrapper ]; @@ -39,11 +39,14 @@ rustPlatform.buildRustPackage rec { --prefix PATH : "${lib.makeBinPath [ less ]}" ''; + checkFlags = [ "--skip=pager_more" "--skip=pager_most" ]; + passthru.tests = { inherit (nixosTests) bat; }; meta = with lib; { description = "A cat(1) clone with syntax highlighting and Git integration"; homepage = "https://github.com/sharkdp/bat"; + changelog = "https://github.com/sharkdp/bat/raw/v${version}/CHANGELOG.md"; license = with licenses; [ asl20 /* or */ mit ]; maintainers = with maintainers; [ dywedir lilyball zowoq ]; }; diff --git a/nixpkgs/pkgs/tools/misc/bbe/default.nix b/nixpkgs/pkgs/tools/misc/bbe/default.nix index fb62b8be8947..5cd7326d7b17 100644 --- a/nixpkgs/pkgs/tools/misc/bbe/default.nix +++ b/nixpkgs/pkgs/tools/misc/bbe/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { description = "A sed-like editor for binary files"; homepage = "http://bbe-.sourceforge.net/"; license = licenses.gpl2Plus; - platforms = platforms.linux; + platforms = platforms.all; maintainers = [ maintainers.hhm ]; }; } diff --git a/nixpkgs/pkgs/tools/misc/bc/default.nix b/nixpkgs/pkgs/tools/misc/bc/default.nix index 96c2d00ffa82..bb5ed84e7d72 100644 --- a/nixpkgs/pkgs/tools/misc/bc/default.nix +++ b/nixpkgs/pkgs/tools/misc/bc/default.nix @@ -3,9 +3,10 @@ }: stdenv.mkDerivation rec { - name = "bc-1.07.1"; + pname = "bc"; + version = "1.07.1"; src = fetchurl { - url = "mirror://gnu/bc/${name}.tar.gz"; + url = "mirror://gnu/bc/${pname}-${version}.tar.gz"; sha256 = "62adfca89b0a1c0164c2cdca59ca210c1d44c3ffc46daf9931cf4942664cb02a"; }; @@ -30,10 +31,10 @@ stdenv.mkDerivation rec { # masss-rebuild. strictDeps = true; - meta = { + meta = with lib; { description = "GNU software calculator"; homepage = "https://www.gnu.org/software/bc/"; - license = lib.licenses.gpl3; - platforms = lib.platforms.all; + license = licenses.gpl3Plus; + platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/tools/misc/bcunit/default.nix b/nixpkgs/pkgs/tools/misc/bcunit/default.nix index bc3bbc8276dd..099ae294bec9 100644 --- a/nixpkgs/pkgs/tools/misc/bcunit/default.nix +++ b/nixpkgs/pkgs/tools/misc/bcunit/default.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { homepage = "https://gitlab.linphone.org/BC/public/bcunit"; license = licenses.lgpl2Plus; maintainers = with maintainers; [ raskin jluttine ]; - platforms = platforms.linux; + platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/tools/misc/bdf2psf/default.nix b/nixpkgs/pkgs/tools/misc/bdf2psf/default.nix index ff14f2d1a4e2..1297b61e7f8c 100644 --- a/nixpkgs/pkgs/tools/misc/bdf2psf/default.nix +++ b/nixpkgs/pkgs/tools/misc/bdf2psf/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "bdf2psf"; - version = "1.200"; + version = "1.202"; src = fetchurl { url = "mirror://debian/pool/main/c/console-setup/bdf2psf_${version}_all.deb"; - sha256 = "07z686h2fv9b3446fcym0sfzxwgkm9cc4bd3zhpv6j8bdfadnjxw"; + sha256 = "sha256-QXjORfwPxNF9iWF29YcVyT2EAwcR4UQjF4Zv7dPMC9c="; }; nativeBuildInputs = [ dpkg ]; @@ -14,10 +14,16 @@ stdenv.mkDerivation rec { dontConfigure = true; dontBuild = true; - unpackPhase = "dpkg-deb -x $src ."; + unpackPhase = '' + runHook preUnpack + dpkg-deb -x $src . + runHook postUnpack + ''; installPhase = " + runHook preInstall substituteInPlace usr/bin/bdf2psf --replace /usr/bin/perl ${perl}/bin/perl mv usr $out + runHook postInstall "; meta = with lib; { @@ -26,7 +32,7 @@ stdenv.mkDerivation rec { longDescription = '' Font converter to generate console fonts from BDF source fonts ''; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ rnhmjoj vrthra ]; platforms = platforms.unix; }; diff --git a/nixpkgs/pkgs/tools/misc/bdf2sfd/default.nix b/nixpkgs/pkgs/tools/misc/bdf2sfd/default.nix index 1d8bd38c1e18..735508fed216 100644 --- a/nixpkgs/pkgs/tools/misc/bdf2sfd/default.nix +++ b/nixpkgs/pkgs/tools/misc/bdf2sfd/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "bdf2sfd"; - version = "1.1.5"; + version = "1.1.6"; src = fetchFromGitHub { owner = "fcambus"; repo = pname; rev = version; - sha256 = "1bpadw25barzmmsz9bkrsj3iwbgf945zqfakbgq1yscfb85bfgsp"; + sha256 = "sha256-f3IdTk1GEo1GlbiJMCpqwheNJrndm7aCojA+GuKMTao="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/tools/misc/betterdiscord-installer/default.nix b/nixpkgs/pkgs/tools/misc/betterdiscord-installer/default.nix new file mode 100644 index 000000000000..d74a914ba65c --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/betterdiscord-installer/default.nix @@ -0,0 +1,32 @@ +{ appimageTools, lib, fetchurl }: +let + pname = "betterdiscord-installer"; + version = "1.0.0-beta"; + name = "${pname}-${version}"; + + src = fetchurl { + url = "https://github.com/BetterDiscord/Installer/releases/download/v${version}/Betterdiscord-Linux.AppImage"; + sha256 = "103acb11qmvjmf6g9lgsfm5jyahfwfdqw0x9w6lmv1hzwbs26dsr"; + }; + + appimageContents = appimageTools.extract { inherit name src; }; +in appimageTools.wrapType2 { + inherit name src; + + extraInstallCommands = '' + mv $out/bin/${name} $out/bin/${pname} + + install -m 444 -D ${appimageContents}/betterdiscord.desktop -t $out/share/applications + substituteInPlace $out/share/applications/betterdiscord.desktop \ + --replace "Exec=AppRun" "Exec=$out/bin/${pname}" + cp -r ${appimageContents}/usr/share/icons $out/share + ''; + + meta = with lib; { + description = "Installer for BetterDiscord"; + homepage = "https://betterdiscord.net"; + license = licenses.mit; + maintainers = [ maintainers.ivar ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/nixpkgs/pkgs/tools/misc/betterdiscordctl/default.nix b/nixpkgs/pkgs/tools/misc/betterdiscordctl/default.nix index c0822b9e1016..e839d9ef09ce 100644 --- a/nixpkgs/pkgs/tools/misc/betterdiscordctl/default.nix +++ b/nixpkgs/pkgs/tools/misc/betterdiscordctl/default.nix @@ -1,23 +1,16 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "betterdiscordctl"; - version = "1.7.0"; + version = "1.7.1"; src = fetchFromGitHub { owner = "bb010g"; repo = "betterdiscordctl"; rev = "v${version}"; - sha256 = "0qpmm5l8jhm7k0kqblc0bnr9fl4b6z8iddhjar03bb4kqgr962fa"; + sha256 = "12c3phcfwl4p2jfh22ihm57vxw4nq5kwqirb7y4gzc91swfh5yj1"; }; - patches = [ - (fetchpatch { # Required till https://github.com/bb010g/betterdiscordctl/pull/67 is merged upstream. - url = "https://github.com/bb010g/betterdiscordctl/pull/67/commits/f1c7170fc2626d9aec4d244977b5a73c401aa1d4.patch"; - sha256 = "003zqd9ljb9h674sjwjvvdfs7q4cw0p1ydg3lax132vb4vz9k0zi"; - }) - ]; - preBuild = "sed -i 's/^nix=$/&yes/g;s/^DISABLE_UPGRADE=$/&yes/g' ./betterdiscordctl"; installPhase = '' diff --git a/nixpkgs/pkgs/tools/misc/blflash/default.nix b/nixpkgs/pkgs/tools/misc/blflash/default.nix new file mode 100644 index 000000000000..bf09fc8d0a7c --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/blflash/default.nix @@ -0,0 +1,22 @@ +{ lib, fetchFromGitHub, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "blflash"; + version = "0.3.2"; + + src = fetchFromGitHub { + owner = "spacemeowx2"; + repo = "blflash"; + rev = "v${version}"; + sha256 = "sha256-+2ncK1ibtQwlBREw4Yiqj4vFvAcZqjkoTBtBdAAUoRg="; + }; + + cargoSha256 = "sha256-tt9jfcoEw/HQ0/qU4lhbqKtIw/lthDTcyf/3HYQNPEY="; + + meta = with lib; { + description = "An bl602 serial flasher written in Rust"; + homepage = "https://github.com/spacemeowx2/blflash"; + license = with licenses; [ mit asl20 ]; + maintainers = with maintainers; [ _0x4A6F ]; + }; +} diff --git a/nixpkgs/pkgs/tools/misc/bmap-tools/default.nix b/nixpkgs/pkgs/tools/misc/bmap-tools/default.nix index 79094dc9540a..c78c0121ed0c 100644 --- a/nixpkgs/pkgs/tools/misc/bmap-tools/default.nix +++ b/nixpkgs/pkgs/tools/misc/bmap-tools/default.nix @@ -1,16 +1,18 @@ -{ lib, fetchFromGitHub, python2Packages }: +{ lib, fetchFromGitHub, python3Packages }: -python2Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "bmap-tools"; - version = "3.4"; + version = "3.6"; src = fetchFromGitHub { owner = "intel"; repo = "bmap-tools"; rev = "v${version}"; - sha256 = "0p0pdwvyf9b4czi1pnhclm1ih8kw78nk2sj4if5hwi7s5423wk5q"; + sha256 = "01xzrv5nvd2nvj91lz4x9s91y9825j9pj96z0ap6yvy3w2dgvkkl"; }; + propagatedBuildInputs = with python3Packages; [ six ]; + # tests fail only on hydra. doCheck = false; diff --git a/nixpkgs/pkgs/tools/misc/boltbrowser/default.nix b/nixpkgs/pkgs/tools/misc/boltbrowser/default.nix new file mode 100644 index 000000000000..29635394954d --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/boltbrowser/default.nix @@ -0,0 +1,25 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "boltbrowser"; + version = "2.0"; + + src = fetchFromGitHub { + owner = "br0xen"; + repo = pname; + rev = version; + sha256 = "17v3pv80dxs285d0b6x772h5cb4f0xg9n5p9jwlir5hjbfn1635i"; + }; + + vendorSha256 = "1x28m72626cchnsasyxips8jaqs0l2p9jhjrdcgws144zm6fz3hv"; + + meta = with lib; { + description = "CLI Browser for BoltDB files"; + homepage = "https://github.com/br0xen/boltbrowser"; + license = with licenses; [ gpl3Only ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/tools/misc/broadlink-cli/default.nix b/nixpkgs/pkgs/tools/misc/broadlink-cli/default.nix index cb5f582d2dec..2acc8dabbef9 100644 --- a/nixpkgs/pkgs/tools/misc/broadlink-cli/default.nix +++ b/nixpkgs/pkgs/tools/misc/broadlink-cli/default.nix @@ -1,17 +1,16 @@ { lib, python3Packages, fetchFromGitHub }: -python3Packages.buildPythonApplication { +python3Packages.buildPythonApplication rec { pname = "broadlink-cli"; - inherit (python3Packages.broadlink) version; + version = "0.17.0"; # the tools are available as part of the source distribution from GH but # not pypi, so we have to fetch them here. src = fetchFromGitHub { owner = "mjg59"; repo = "python-broadlink"; - # this rev is version 0.15.0 - rev = "99add9e6feea6e47be4f3a58783556d7838b759c"; - sha256 = "1q1q62brvfjcb18i0j4ca5cxqzjwv1iywdrdby0yjqa4wm6ywq6b"; + rev = version; + sha256 = "sha256-b3A36BdIvyl1RxNO5SyxLIpQmu1UHHekyh6vrFjwpp4="; }; format = "other"; @@ -23,8 +22,8 @@ python3Packages.buildPythonApplication { installPhase = '' runHook preInstall - install -Dm755 -t $out/bin cli/broadlink_{cli,discovery} - install -Dm644 -t $out/share/doc/broadlink cli/README.md + install -Dm555 -t $out/bin cli/broadlink_{cli,discovery} + install -Dm444 -t $out/share/doc/broadlink cli/README.md runHook postInstall ''; diff --git a/nixpkgs/pkgs/tools/misc/byobu/default.nix b/nixpkgs/pkgs/tools/misc/byobu/default.nix index c647d3b39028..ffe3fd0fe162 100644 --- a/nixpkgs/pkgs/tools/misc/byobu/default.nix +++ b/nixpkgs/pkgs/tools/misc/byobu/default.nix @@ -16,7 +16,8 @@ stdenv.mkDerivation rec { doCheck = true; - buildInputs = [ perl makeWrapper gettext ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ perl gettext ]; propagatedBuildInputs = [ textual-window-manager screen ]; postPatch = '' diff --git a/nixpkgs/pkgs/tools/misc/calamares/default.nix b/nixpkgs/pkgs/tools/misc/calamares/default.nix index e79774da9177..90abc7659203 100644 --- a/nixpkgs/pkgs/tools/misc/calamares/default.nix +++ b/nixpkgs/pkgs/tools/misc/calamares/default.nix @@ -1,6 +1,6 @@ { lib, fetchurl, boost, cmake, extra-cmake-modules, kparts, kpmcore , kservice, libatasmart, libxcb, libyamlcpp, parted, polkit-qt, python, qtbase -, qtquickcontrols, qtsvg, qttools, qtwebengine, util-linux, glibc, tzdata +, qtquickcontrols, qtsvg, qttools, qtwebengine, util-linux, tzdata , ckbcomp, xkeyboard_config, mkDerivation }: @@ -21,8 +21,6 @@ mkDerivation rec { qtquickcontrols qtsvg qttools qtwebengine.dev util-linux ]; - enableParallelBuilding = false; - cmakeFlags = [ "-DPYTHON_LIBRARY=${python}/lib/lib${python.libPrefix}.so" "-DPYTHON_INCLUDE_DIR=${python}/include/${python.libPrefix}" diff --git a/nixpkgs/pkgs/tools/misc/capture/default.nix b/nixpkgs/pkgs/tools/misc/capture/default.nix index d0e6c1673497..d858e0fbc461 100644 --- a/nixpkgs/pkgs/tools/misc/capture/default.nix +++ b/nixpkgs/pkgs/tools/misc/capture/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "0zyyg4mvrny7cc2xgvfip97b6yc75ka5ni39rwls93971jbk83d6"; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; installPhase = '' install -Dm755 src/capture.sh $out/bin/capture diff --git a/nixpkgs/pkgs/tools/misc/chafa/default.nix b/nixpkgs/pkgs/tools/misc/chafa/default.nix index f196bb5af03f..51fbba8d706c 100644 --- a/nixpkgs/pkgs/tools/misc/chafa/default.nix +++ b/nixpkgs/pkgs/tools/misc/chafa/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { - version = "1.4.1"; + version = "1.6.0"; pname = "chafa"; src = fetchFromGitHub { owner = "hpjansson"; repo = "chafa"; rev = version; - sha256 = "13vv2xmfh0dr949bh75448lidvzwxks6f1mjawdg1q8qwzxhzry4"; + sha256 = "sha256-GaXVMM23U3M+qNJrWYR+DLiCmILcuX5EIkQqzwN/l1Y="; }; nativeBuildInputs = [ autoconf diff --git a/nixpkgs/pkgs/tools/misc/chezmoi/default.nix b/nixpkgs/pkgs/tools/misc/chezmoi/default.nix index dc1a49a40bf2..78a2dcb456c1 100644 --- a/nixpkgs/pkgs/tools/misc/chezmoi/default.nix +++ b/nixpkgs/pkgs/tools/misc/chezmoi/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "chezmoi"; - version = "1.8.11"; + version = "2.0.8"; src = fetchFromGitHub { owner = "twpayne"; repo = "chezmoi"; rev = "v${version}"; - sha256 = "sha256-aWq36wQFxAyORifi5/9MOnqmR5FRyDAQj1tVFqoiFvA="; + sha256 = "sha256-bGrGekZLystw3AvQP9bdFGlxteGCzwrhamaO8WLKf7U="; }; - vendorSha256 = "sha256-ASTPb8Va3Gl/VtmPJIdlnlU3OspAxzZ5iSHVcZOh8CY="; + vendorSha256 = "sha256-YU+t8GVsLYWONezUIB4NUrVxtYOmf/2b5v4v3VSYtBU="; doCheck = false; diff --git a/nixpkgs/pkgs/tools/misc/cicero-tui/default.nix b/nixpkgs/pkgs/tools/misc/cicero-tui/default.nix new file mode 100644 index 000000000000..dfc79e208ac1 --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/cicero-tui/default.nix @@ -0,0 +1,41 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, cmake +, pkg-config +, expat +, fontconfig +, freetype +}: + +rustPlatform.buildRustPackage rec { + pname = "cicero-tui"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "eyeplum"; + repo = "cicero-tui"; + rev = "v${version}"; + sha256 = "sha256-TNNPTKLO5qjSeCxWb7bB4yV1J4Seu+tBKNs0Oav/pPE="; + }; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + buildInputs = [ + expat + fontconfig + freetype + ]; + + cargoSha256 = "sha256-kzU+i5DLmZULdJPURz10URE5sMUG6eQg0pCoEiyfgco="; + + meta = with lib; { + description = "Unicode tool with a terminal user interface"; + homepage = "https://github.com/eyeplum/cicero-tui"; + license = with licenses; [ gpl3Plus ]; + maintainers = with maintainers; [ shamilton ]; + platforms = platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/tools/misc/clickclack/default.nix b/nixpkgs/pkgs/tools/misc/clickclack/default.nix new file mode 100644 index 000000000000..75518e554ca8 --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/clickclack/default.nix @@ -0,0 +1,33 @@ +{ lib +, stdenv +, fetchFromSourcehut +, SDL2 +}: + +stdenv.mkDerivation rec { + pname = "clickclack"; + version = "0.1.1"; + + src = fetchFromSourcehut { + owner = "~proycon"; + repo = "clickclack"; + rev = version; + sha256 = "1q8r0ng1bld5n82gh7my7ck90f4plf8vf019hm2wz475dl38izd5"; + }; + + buildInputs = [ + SDL2 + ]; + + makeFlags = [ + "PREFIX=${placeholder "out"}" + ]; + + meta = with lib; { + description = "A vibration/audio feedback tool to be used with virtual keyboards"; + homepage = "https://git.sr.ht/~proycon/clickclack"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/nixpkgs/pkgs/tools/misc/clipman/default.nix b/nixpkgs/pkgs/tools/misc/clipman/default.nix deleted file mode 100644 index 80a0afe68d36..000000000000 --- a/nixpkgs/pkgs/tools/misc/clipman/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ buildGoModule, fetchFromGitHub, lib, wl-clipboard, makeWrapper }: - -buildGoModule rec { - pname = "clipman"; - version = "1.5.2"; - - src = fetchFromGitHub { - owner = "yory8"; - repo = pname; - rev = "v${version}"; - sha256 = "1lf5fbzplyc1mpdqgfwbrn8m5568vhjf48580fvvfgbhz6zcil8n"; - }; - - vendorSha256 = "18jw4z0lcrh00yjr3qdkgvlrpfwqbsm0ncz7fp1h72pzkh41byv7"; - - doCheck = false; - - nativeBuildInputs = [ makeWrapper ]; - - postInstall = '' - wrapProgram $out/bin/clipman \ - --prefix PATH : ${lib.makeBinPath [ wl-clipboard ]} - ''; - - meta = with lib; { - homepage = "https://github.com/yory8/clipman"; - license = licenses.gpl3; - maintainers = with maintainers; [ ma27 ]; - description = "A simple clipboard manager for Wayland"; - platforms = platforms.linux; - }; -} diff --git a/nixpkgs/pkgs/tools/misc/cloc/default.nix b/nixpkgs/pkgs/tools/misc/cloc/default.nix index f518c1b8e3f2..3e18d3f4b54e 100644 --- a/nixpkgs/pkgs/tools/misc/cloc/default.nix +++ b/nixpkgs/pkgs/tools/misc/cloc/default.nix @@ -15,9 +15,8 @@ stdenv.mkDerivation rec { sourceRoot=$(echo */Unix) ''; - buildInputs = [ makeWrapper ] ++ (with perlPackages; [ - perl AlgorithmDiff ParallelForkManager RegexpCommon - ]); + nativeBuildInputs = [ makeWrapper ]; + buildInputs = (with perlPackages; [ perl AlgorithmDiff ParallelForkManager RegexpCommon ]); makeFlags = [ "prefix=" "DESTDIR=$(out)" "INSTALL=install" ]; diff --git a/nixpkgs/pkgs/tools/misc/cloud-utils/default.nix b/nixpkgs/pkgs/tools/misc/cloud-utils/default.nix index b10259f24fc2..32ef248ca854 100644 --- a/nixpkgs/pkgs/tools/misc/cloud-utils/default.nix +++ b/nixpkgs/pkgs/tools/misc/cloud-utils/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, makeWrapper , gawk, gnused, util-linux, file -, wget, python3, qemu-utils, euca2ools +, wget, python3, qemu-utils , e2fsprogs, cdrkit , gptfdisk }: diff --git a/nixpkgs/pkgs/tools/misc/code-minimap/default.nix b/nixpkgs/pkgs/tools/misc/code-minimap/default.nix index 462fc51b2890..6a253a493fc4 100644 --- a/nixpkgs/pkgs/tools/misc/code-minimap/default.nix +++ b/nixpkgs/pkgs/tools/misc/code-minimap/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "code-minimap"; - version = "0.5.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "wfxr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-t+zHAneINLd8JHkhaR+aF55gAWJmphYEqbx74CqAmM8="; + sha256 = "sha256-5YNY0MRlKKX6u32Id6J7bIPSHRi44TISoKqpAS9T8ow="; }; - cargoSha256 = "sha256-eVh+6gTzKTelZ3MypkqYMXHr9QwaNG8H0xS82kilR/s="; + cargoSha256 = "sha256-87aRZC4OE3UTVToHi5XDBxVqEH4oFeFR4REf69OBkIw="; meta = with lib; { description = "A high performance code minimap render"; diff --git a/nixpkgs/pkgs/tools/misc/convbin/default.nix b/nixpkgs/pkgs/tools/misc/convbin/default.nix index 92890c056b15..7f57cab585bc 100644 --- a/nixpkgs/pkgs/tools/misc/convbin/default.nix +++ b/nixpkgs/pkgs/tools/misc/convbin/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "0n502zj8igm583kbfvyv7zhd97vb71jac41ncb9jr2yz2v5ir8j9"; }; - makeFlags = [ "CC=cc" ]; + makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; checkPhase = '' pushd test diff --git a/nixpkgs/pkgs/tools/misc/convfont/default.nix b/nixpkgs/pkgs/tools/misc/convfont/default.nix index aeecb0532127..501c4e29a416 100644 --- a/nixpkgs/pkgs/tools/misc/convfont/default.nix +++ b/nixpkgs/pkgs/tools/misc/convfont/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "1lj24yq5gj9hxhy1srk73521q95zyqzkws0q4v271hf5wmqaxa2f"; }; - makeFlags = [ "CC=cc" ]; + makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; installPhase = '' install -Dm755 convfont $out/bin/convfont diff --git a/nixpkgs/pkgs/tools/misc/convimg/default.nix b/nixpkgs/pkgs/tools/misc/convimg/default.nix index 8caf4cb706f9..0c5ffb4a6dea 100644 --- a/nixpkgs/pkgs/tools/misc/convimg/default.nix +++ b/nixpkgs/pkgs/tools/misc/convimg/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; - makeFlags = [ "CC=cc" ]; + makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; checkPhase = '' pushd test diff --git a/nixpkgs/pkgs/tools/misc/coreboot-utils/default.nix b/nixpkgs/pkgs/tools/misc/coreboot-utils/default.nix index c05d50cdbc1b..39e6e6f211a3 100644 --- a/nixpkgs/pkgs/tools/misc/coreboot-utils/default.nix +++ b/nixpkgs/pkgs/tools/misc/coreboot-utils/default.nix @@ -7,7 +7,7 @@ let description = "Various coreboot-related tools"; homepage = "https://www.coreboot.org"; license = licenses.gpl2; - maintainers = [ maintainers.petabyteboy ]; + maintainers = with maintainers; [ petabyteboy felixsinger ]; platforms = platforms.linux; }; diff --git a/nixpkgs/pkgs/tools/misc/coreutils/default.nix b/nixpkgs/pkgs/tools/misc/coreutils/default.nix index 131ce2774d1a..bfe5c5c5045f 100644 --- a/nixpkgs/pkgs/tools/misc/coreutils/default.nix +++ b/nixpkgs/pkgs/tools/misc/coreutils/default.nix @@ -43,6 +43,9 @@ stdenv.mkDerivation (rec { sed '2i echo Skipping rm deep-2 test && exit 77' -i ./tests/rm/deep-2.sh sed '2i echo Skipping du long-from-unreadable test && exit 77' -i ./tests/du/long-from-unreadable.sh + # Depends on the mountpoints + sed '2i echo Skipping df df-symlink test && exit 77' -i ./tests/df/df-symlink.sh + # Some target platforms, especially when building inside a container have # issues with the inotify test. sed '2i echo Skipping tail inotify dir recreate test && exit 77' -i ./tests/tail-2/inotify-dir-recreate.sh @@ -103,8 +106,7 @@ stdenv.mkDerivation (rec { # and {Open,Free}BSD. # With non-standard storeDir: https://github.com/NixOS/nix/issues/512 doCheck = stdenv.hostPlatform == stdenv.buildPlatform - && (stdenv.hostPlatform.libc == "glibc" || stdenv.hostPlatform.isMusl) - && builtins.storeDir == "/nix/store"; + && (stdenv.hostPlatform.libc == "glibc" || stdenv.hostPlatform.isMusl); # Prevents attempts of running 'help2man' on cross-built binaries. PERL = if stdenv.hostPlatform == stdenv.buildPlatform then null else "missing"; diff --git a/nixpkgs/pkgs/tools/misc/cpuminer-multi/default.nix b/nixpkgs/pkgs/tools/misc/cpuminer-multi/default.nix index a23675fe911f..fac8fbcfee97 100644 --- a/nixpkgs/pkgs/tools/misc/cpuminer-multi/default.nix +++ b/nixpkgs/pkgs/tools/misc/cpuminer-multi/default.nix @@ -27,7 +27,6 @@ stdenv.mkDerivation { description = "Multi-algo CPUMiner"; homepage = "https://github.com/wolf9466/cpuminer-multi"; license = licenses.gpl2; - maintainers = [ maintainers.ehmry ]; # does not build on i686 https://github.com/lucasjones/cpuminer-multi/issues/27 platforms = [ "x86_64-linux" ]; }; diff --git a/nixpkgs/pkgs/tools/misc/cutecom/default.nix b/nixpkgs/pkgs/tools/misc/cutecom/default.nix index e109b12f2879..b3d412b8fda0 100644 --- a/nixpkgs/pkgs/tools/misc/cutecom/default.nix +++ b/nixpkgs/pkgs/tools/misc/cutecom/default.nix @@ -11,14 +11,17 @@ mkDerivation rec { sha256 = "X8jeESt+x5PxK3rTNC1h1Tpvue2WH09QRnG2g1eMoEE="; }; - preConfigure = '' - substituteInPlace CMakeLists.txt \ - --replace "#find_package(Serialport REQUIRED)" "find_package(Qt5SerialPort REQUIRED)" - ''; - buildInputs = [ qtbase qtserialport ]; nativeBuildInputs = [ cmake ]; + postInstall = '' + cd .. + mkdir -p "$out"/share/{applications,icons/hicolor/scalable/apps,man/man1} + cp cutecom.desktop "$out/share/applications" + cp images/cutecom.svg "$out/share/icons/hicolor/scalable/apps" + cp cutecom.1 "$out/share/man/man1" + ''; + meta = with lib; { description = "A graphical serial terminal"; homepage = "https://gitlab.com/cutecom/cutecom/"; diff --git a/nixpkgs/pkgs/tools/misc/czkawka/default.nix b/nixpkgs/pkgs/tools/misc/czkawka/default.nix new file mode 100644 index 000000000000..29748f781be3 --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/czkawka/default.nix @@ -0,0 +1,45 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, pkg-config +, glib +, cairo +, pango +, gdk-pixbuf +, atk +, gtk3 +}: + +rustPlatform.buildRustPackage rec { + pname = "czkawka"; + version = "3.0.0"; + + src = fetchFromGitHub { + owner = "qarmin"; + repo = pname; + rev = version; + sha256 = "1g5a9ns5lkiyk6hjsh08hgs41538dzj0a4lgn2c5cbad5psl0xa6"; + }; + + cargoSha256 = "11ym2d7crp12w91111s3rv0gklkg2bzlq9g24cws4h7ipi0zfx5h"; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + glib + cairo + pango + gdk-pixbuf + atk + gtk3 + ]; + + meta = with lib; { + description = "A simple, fast and easy to use app to remove unnecessary files from your computer"; + homepage = "https://github.com/qarmin/czkawka"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ yanganto ]; + }; +} diff --git a/nixpkgs/pkgs/tools/misc/ddcutil/default.nix b/nixpkgs/pkgs/tools/misc/ddcutil/default.nix index 1e2efc7f9cd3..1717b88f194a 100644 --- a/nixpkgs/pkgs/tools/misc/ddcutil/default.nix +++ b/nixpkgs/pkgs/tools/misc/ddcutil/default.nix @@ -12,6 +12,11 @@ stdenv.mkDerivation rec { sha256 = "sha256-F/tKW81bAyYtwpxhl5XC8YyMB+6S0XmqqigwJY2WFDU="; }; + patches = [ + # Look for kernel modules in /run/booted-system/kernel-modules/lib/modules/* + ./nixos-paths.diff + ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ i2c-tools udev libgudev diff --git a/nixpkgs/pkgs/tools/misc/ddcutil/nixos-paths.diff b/nixpkgs/pkgs/tools/misc/ddcutil/nixos-paths.diff new file mode 100644 index 000000000000..e45eb88b5190 --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/ddcutil/nixos-paths.diff @@ -0,0 +1,32 @@ +diff --git a/src/app_sysenv/query_sysenv_modules.c b/src/app_sysenv/query_sysenv_modules.c +index 59df64f1..fb244dd0 100644 +--- a/src/app_sysenv/query_sysenv_modules.c ++++ b/src/app_sysenv/query_sysenv_modules.c +@@ -50,7 +50,9 @@ bool is_module_loadable(char * module_name, int depth) { + g_snprintf(module_name_ko, 100, "%s.ko", module_name); + + char dirname[PATH_MAX]; +- g_snprintf(dirname, PATH_MAX, "/lib/modules/%s/kernel/drivers/i2c", utsbuf.release); ++ g_snprintf(dirname, PATH_MAX, ++ "/run/booted-system/kernel-modules/lib/modules/%s/kernel/drivers/i2c", ++ utsbuf.release); + + struct dirent *dent; + DIR *d; +diff --git a/src/util/linux_util.c b/src/util/linux_util.c +index 5eb8491c..3a129ccf 100644 +--- a/src/util/linux_util.c ++++ b/src/util/linux_util.c +@@ -29,8 +29,10 @@ bool is_module_builtin(char * module_name) + int rc = uname(&utsbuf); + assert(rc == 0); + +- char modules_builtin_fn[100]; +- snprintf(modules_builtin_fn, 100, "/lib/modules/%s/modules.builtin", utsbuf.release); ++ char modules_builtin_fn[PATH_MAX]; ++ snprintf(modules_builtin_fn, PATH_MAX, ++ "/run/booted-system/kernel-modules/lib/modules/%s/modules.builtin", ++ utsbuf.release); + + char ko_name[40]; + snprintf(ko_name, 40, "%s.ko", module_name); diff --git a/nixpkgs/pkgs/tools/misc/debian-devscripts/default.nix b/nixpkgs/pkgs/tools/misc/debian-devscripts/default.nix index 8de7cc99336d..b2e753342d98 100644 --- a/nixpkgs/pkgs/tools/misc/debian-devscripts/default.nix +++ b/nixpkgs/pkgs/tools/misc/debian-devscripts/default.nix @@ -16,7 +16,8 @@ in stdenv.mkDerivation rec { sha256 = "0xy1nvqrnifx46g8ch69pk31by0va6hn10wpi1fkrsrgncanjjh1"; }; - buildInputs = [ unzip xz dpkg libxslt python setuptools makeWrapper curl gnupg diffutils ] ++ + nativeBuildInputs = [ makeWrapper unzip ]; + buildInputs = [ xz dpkg libxslt python setuptools curl gnupg diffutils ] ++ (with perlPackages; [ perl CryptSSLeay LWP TimeDate DBFile FileDesktopEntry ParseDebControl LWPProtocolHttps ]); preConfigure = '' diff --git a/nixpkgs/pkgs/tools/misc/diffoscope/default.nix b/nixpkgs/pkgs/tools/misc/diffoscope/default.nix index 9437ef12f4b4..086c1a2b5404 100644 --- a/nixpkgs/pkgs/tools/misc/diffoscope/default.nix +++ b/nixpkgs/pkgs/tools/misc/diffoscope/default.nix @@ -16,11 +16,11 @@ let in python3Packages.buildPythonApplication rec { pname = "diffoscope"; - version = "166"; + version = "171"; src = fetchurl { url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2"; - sha256 = "sha256-6VhHG3MxmIczolOYqU4D1m00h8w2n0ku4dy/dFEYqk0="; + sha256 = "sha256-8PUFKwSWf84ics4w9yrCWMYgzzNF5z1kNn7LnksfCtA="; }; outputs = [ "out" "man" ]; @@ -70,6 +70,8 @@ python3Packages.buildPythonApplication rec { disabledTests = [ "test_android_manifest" "test_sbin_added_to_path" + "test_diff_meta" + "test_diff_meta2" ]; meta = with lib; { diff --git a/nixpkgs/pkgs/tools/misc/digitemp/default.nix b/nixpkgs/pkgs/tools/misc/digitemp/default.nix new file mode 100644 index 000000000000..adf23e4bdf5e --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/digitemp/default.nix @@ -0,0 +1,53 @@ +{ fetchFromGitHub, lib, stdenv }: + +stdenv.mkDerivation rec { + pname = "digitemp"; + version = "3.7.2"; + + src = fetchFromGitHub { + owner = "bcl"; + repo = "digitemp"; + rev = "v${version}"; + sha256 = "19zka5fcdxhhginaspak76l984iqq9v2j6qrwvi5mvca7bcj8f72"; + }; + + enableParallelBuilding = true; + + makeFlags = [ + "LOCK=no" + "ds9097" + "ds9097u" + ]; + + installPhase = '' + runHook preInstall + install -D -m555 -t $out/bin digitemp_* + install -D -m444 -t $out/share/doc/${pname} FAQ README + runHook postInstall + ''; + + meta = with lib; { + description = "Temperature logging and reporting using Maxim's iButtons and 1-Wire protocol"; + longDescription = '' + DigiTemp is a command line application used for reading 1-wire sensors like + the DS18S20 temperature sensor, or DS2438 battery monitor. DigiTemp supports + the following devices: + + DS18S20 (and older DS1820) Temperature Sensor + DS18B20 Temperature Sensor + DS1822 Temperature Sensor + DS2438 Battery monitor + DS2409 1-wire coupler (used in 1-wire hubs) + DS2422 Counter + DS2423 Counter + + The output format can be customized and all settings are stored in a + configuration file (.digitemprc) in the current directory. DigiTemp can + repeatedly read the sensors and output to stdout and/or to a logfile. + ''; + homepage = "https://www.digitemp.com"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ zseri ]; + platforms = platforms.unix; + }; +} diff --git a/nixpkgs/pkgs/tools/misc/dijo/default.nix b/nixpkgs/pkgs/tools/misc/dijo/default.nix index b8dc950773ba..737057059938 100644 --- a/nixpkgs/pkgs/tools/misc/dijo/default.nix +++ b/nixpkgs/pkgs/tools/misc/dijo/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, rustPlatform, fetchFromGitHub, ncurses, CoreServices }: -let version = "0.2.5"; in +let version = "0.2.7"; in rustPlatform.buildRustPackage { pname = "dijo"; inherit version; @@ -8,9 +8,9 @@ rustPlatform.buildRustPackage { owner = "NerdyPepper"; repo = "dijo"; rev = "v${version}"; - sha256 = "sha256-DdK9qdF+rFtAhemPwMpiZrtUdgD0iFqjgiZ3Yp/vLAI="; + sha256 = "sha256-g+A8BJxqoAvm9LTLrLnClVGtFJCQ2gT0mDGAov/6vXE="; }; - cargoSha256 = "sha256-bdSXyxiHwGtdyce2YyPKq+3RfZIL425RvwRfKi59RVI="; + cargoSha256 = "sha256-3V94bOixYMznkCQu90+E/68Sfl9GvHp9LNxwWwk4xZQ="; meta = with lib; { description = "Scriptable, curses-based, digital habit tracker"; diff --git a/nixpkgs/pkgs/tools/misc/direnv/default.nix b/nixpkgs/pkgs/tools/misc/direnv/default.nix index ee068450344e..5fa6b8db60e7 100644 --- a/nixpkgs/pkgs/tools/misc/direnv/default.nix +++ b/nixpkgs/pkgs/tools/misc/direnv/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "direnv"; - version = "2.27.0"; + version = "2.28.0"; src = fetchFromGitHub { owner = "direnv"; repo = "direnv"; rev = "v${version}"; - sha256 = "05vvn59xd2q4yjizh5fprjib5xqq58by80d5avsm8nb1qxf383b1"; + sha256 = "sha256-iZ3Lf7Yg+N9BWyLLF+MrT2gpPT9BTcp6pNMpfqwcZXo="; }; - vendorSha256 = "084x7d7sshcsyim76d6pl6127nlqacgwwnm965srl9y5w5nqzba6"; + vendorSha256 = "sha256-P8NLY1iGh86ntmYsTVlnNh5akdaM8nzcxDn6Nfmgr84="; # we have no bash at the moment for windows BASH_PATH = diff --git a/nixpkgs/pkgs/tools/misc/disfetch/default.nix b/nixpkgs/pkgs/tools/misc/disfetch/default.nix index afce1429e69b..58f7da84fc00 100644 --- a/nixpkgs/pkgs/tools/misc/disfetch/default.nix +++ b/nixpkgs/pkgs/tools/misc/disfetch/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "disfetch"; - version = "1.14"; + version = "1.21"; src = fetchFromGitHub { owner = "llathasa-veleth"; repo = "disfetch"; rev = version; - sha256 = "0p5pj8d761gz95ar35s8q6lrybrg9jik33kwnsxvb14n990kya0p"; + sha256 = "sha256-AAfpv1paEnHu1S2B8yC0hyYOj5deKTkCyLGvp6Roz64="; }; dontBuild = true; diff --git a/nixpkgs/pkgs/tools/misc/disper/default.nix b/nixpkgs/pkgs/tools/misc/disper/default.nix index ecbf298132f6..3e78bc977324 100644 --- a/nixpkgs/pkgs/tools/misc/disper/default.nix +++ b/nixpkgs/pkgs/tools/misc/disper/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python, xorg, makeWrapper }: +{ lib, stdenv, fetchFromGitHub, python2, xorg, makeWrapper }: stdenv.mkDerivation rec { pname = "disper"; @@ -13,7 +13,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ python ]; + strictDeps = true; + + buildInputs = [ python2 ]; preConfigure = '' export makeFlags="PREFIX=$out" diff --git a/nixpkgs/pkgs/tools/misc/dpt-rp1-py/default.nix b/nixpkgs/pkgs/tools/misc/dpt-rp1-py/default.nix index 69b689fb8244..d4ad2dffd82e 100644 --- a/nixpkgs/pkgs/tools/misc/dpt-rp1-py/default.nix +++ b/nixpkgs/pkgs/tools/misc/dpt-rp1-py/default.nix @@ -1,24 +1,32 @@ { lib, python3Packages, fetchFromGitHub }: python3Packages.buildPythonApplication rec { pname = "dpt-rp1-py"; - version = "unstable-2018-10-16"; + version = "0.1.12"; src = fetchFromGitHub { owner = "janten"; repo = pname; - rev = "4551b4432f8470de5f2ad9171105f731a6259395"; - sha256 = "176y5j31aci1vpi8v6r5ki55432fbdsazh9bsyzr90im9zimkffl"; + rev = "v${version}"; + sha256 = "0xw853s5bx2lr57w6ldfjzi1ppc6px66zd7hzk8y2kg82q6bnasq"; }; doCheck = false; propagatedBuildInputs = with python3Packages; [ + anytree + fusepy httpsig - requests pbkdf2 + pyyaml + requests + setuptools + tqdm urllib3 + zeroconf ]; + pythonImportsCheck = [ "dptrp1" ]; + meta = with lib; { homepage = "https://github.com/janten/dpt-rp1-py"; description = "Python script to manage Sony DPT-RP1 without Digital Paper App"; diff --git a/nixpkgs/pkgs/tools/misc/dua/default.nix b/nixpkgs/pkgs/tools/misc/dua/default.nix index 063442b75f2f..f0bb6905b43c 100644 --- a/nixpkgs/pkgs/tools/misc/dua/default.nix +++ b/nixpkgs/pkgs/tools/misc/dua/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "dua"; - version = "2.10.10"; + version = "2.11.1"; src = fetchFromGitHub { owner = "Byron"; repo = "dua-cli"; rev = "v${version}"; - sha256 = "sha256-Rt+60j1+uwL6g4HGc+xdUzGK6nanGfRYbekO54iKsPE="; + sha256 = "sha256-pjFApZQJqw0fJmJteO7VZWRLogV3rO5XDagZd1MliZg="; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. extraPostFetch = '' @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { ''; }; - cargoSha256 = "sha256-6L1J5RHI657Z03rMmhwEzgpQ0//dykqGi8bI2Enc3N8="; + cargoSha256 = "sha256-xsTScRAu0SF1xtjUwBtNJUNIItoR0jjEd2CuSmmeh9c="; doCheck = false; diff --git a/nixpkgs/pkgs/tools/misc/duf/default.nix b/nixpkgs/pkgs/tools/misc/duf/default.nix index ee3573f9f458..076eb33fbb19 100644 --- a/nixpkgs/pkgs/tools/misc/duf/default.nix +++ b/nixpkgs/pkgs/tools/misc/duf/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "duf"; - version = "0.6.0"; + version = "0.6.2"; src = fetchFromGitHub { owner = "muesli"; repo = "duf"; rev = "v${version}"; - sha256 = "sha256-Wm3gfir6blQFLLi+2bT5Y/5tf7qUxEddJQ7tCYfBGgM="; + sha256 = "sha256-aRXm31sGHvHPpqPck5+jplbWT52OzaiQIgU/C7llJs8="; }; - vendorSha256 = "0icxy6wbqjqawr6i5skwp1z37fq303p8f95crd8lwn6pjjiqzk4i"; + vendorSha256 = "153z0ccd556c0wpnxgyjq7m0c4y2z6fxsqq2p77kly9nr8cpzdb9"; buildFlagsArray = [ "-ldflags=-s -w -X=main.Version=${version}" ]; diff --git a/nixpkgs/pkgs/tools/misc/empty/0.6-Makefile.patch b/nixpkgs/pkgs/tools/misc/empty/0.6-Makefile.patch new file mode 100644 index 000000000000..6fb494cdf54c --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/empty/0.6-Makefile.patch @@ -0,0 +1,13 @@ +diff --git a/Makefile b/Makefile +index 1fe4c41..2c69558 100644 +--- a/Makefile ++++ b/Makefile +@@ -16,7 +16,7 @@ LIBS = -lutil + PREFIX = /usr/local + + all: +- ${CC} ${CFLAGS} -Wall ${LIBS} -o empty empty.c ++ ${CC} ${CFLAGS} -Wall -o empty empty.c ${LIBS} + + FreeBSD: all + NetBSD: all diff --git a/nixpkgs/pkgs/tools/misc/empty/default.nix b/nixpkgs/pkgs/tools/misc/empty/default.nix new file mode 100644 index 000000000000..d8fa41ef02a3 --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/empty/default.nix @@ -0,0 +1,46 @@ +{ fetchzip, lib, stdenv, which }: + +stdenv.mkDerivation rec { + pname = "empty"; + version = "0.6.21b"; + + src = fetchzip { + url = "mirror://sourceforge/${pname}/${pname}/${pname}-${version}.tgz"; + sha256 = "1rkixh2byr70pdxrwr4lj1ckh191rjny1m5xbjsa7nqw1fw6c2xs"; + stripRoot = false; + }; + + patches = [ + ./0.6-Makefile.patch + ]; + + nativeBuildInputs = [ which ]; + + makeFlags = [ "PREFIX=$(out)" ]; + + postPatch = '' + rm empty + ''; + + meta = with lib; { + homepage = "http://empty.sourceforge.net"; + description = "A simple tool to automate interactive terminal applications"; + license = licenses.bsd3; + platforms = platforms.all; + longDescription = '' + The empty utility provides an interface to execute and/or interact with + processes under pseudo-terminal sessions (PTYs). This tool is definitely + useful in programming of shell scripts designed to communicate with + interactive programs like telnet, ssh, ftp, etc. In some cases empty can + be the simplest replacement for TCL/expect or other similar programming + tools because empty: + + - can be easily invoked directly from shell prompt or script + - does not use TCL, Perl, PHP, Python or anything else as an underlying language + - is written entirely in C + - has small and simple source code + - can easily be ported to almost all UNIX-like systems + ''; + maintainers = [ maintainers.djwf ]; + }; +} diff --git a/nixpkgs/pkgs/tools/misc/ent/default.nix b/nixpkgs/pkgs/tools/misc/ent/default.nix index 05dcd36c40ce..b0dc4f1e3df9 100644 --- a/nixpkgs/pkgs/tools/misc/ent/default.nix +++ b/nixpkgs/pkgs/tools/misc/ent/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { # case that happens when the archive doesn't have a subdirectory. setSourceRoot = "sourceRoot=`pwd`"; - buildInputs = [ unzip ]; + nativeBuildInputs = [ unzip ]; buildFlags = lib.optional stdenv.cc.isClang "CC=clang"; diff --git a/nixpkgs/pkgs/tools/misc/entr/default.nix b/nixpkgs/pkgs/tools/misc/entr/default.nix index 581b39f3c4ce..5d8d0d942010 100644 --- a/nixpkgs/pkgs/tools/misc/entr/default.nix +++ b/nixpkgs/pkgs/tools/misc/entr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "entr"; - version = "4.7"; + version = "4.8"; src = fetchurl { - url = "http://entrproject.org/code/${pname}-${version}.tar.gz"; - sha256 = "sha256-tsGrdkTYO7Kiadx0Fghno74PXfEWx+tFPCUFMXNTRCk="; + url = "https://eradman.com/entrproject/code/${pname}-${version}.tar.gz"; + sha256 = "1bi5fhr93n72pkap4mqsjd1pwnqjf6czg359c5xwczavfk6mamgh"; }; postPatch = '' @@ -22,8 +22,9 @@ stdenv.mkDerivation rec { installFlags = [ "PREFIX=$(out)" ]; meta = with lib; { - homepage = "http://entrproject.org/"; + homepage = "https://eradman.com/entrproject/"; description = "Run arbitrary commands when files change"; + changelog = "https://github.com/eradman/entr/raw/${version}/NEWS"; license = licenses.isc; platforms = platforms.all; maintainers = with maintainers; [ pSub synthetica ]; diff --git a/nixpkgs/pkgs/tools/misc/exa/default.nix b/nixpkgs/pkgs/tools/misc/exa/default.nix index f275d254677c..51873d479f3c 100644 --- a/nixpkgs/pkgs/tools/misc/exa/default.nix +++ b/nixpkgs/pkgs/tools/misc/exa/default.nix @@ -1,43 +1,34 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, rustPlatform, cmake, perl, pkg-config, zlib +{ lib, stdenv, fetchFromGitHub, rustPlatform, cmake, pandoc, pkg-config, zlib , Security, libiconv, installShellFiles }: -with rustPlatform; - -buildRustPackage rec { +rustPlatform.buildRustPackage rec { pname = "exa"; - version = "0.9.0"; + version = "0.10.0"; - cargoSha256 = "0nl106jlbr8gnnlbi20mrc6zyww7vxgmw6w34ibndxqh9ggxwfvr"; + cargoSha256 = "sha256-hslQZkmZ023gKxBbfgwqazBPUk0qWyy51uRJtr3QvWE="; src = fetchFromGitHub { owner = "ogham"; - repo = "exa"; + repo = pname; rev = "v${version}"; - sha256 = "14qlm9zb9v22hxbbi833xaq2b7qsxnmh15s317200vz5f1305hhw"; + sha256 = "sha256-xolanu4zhAwsbSPdGKgY2/uHtP30DSpr/7Vv1z4jEnQ="; }; - patches = [ - (fetchpatch { - # https://github.com/ogham/exa/pull/584 - name = "fix-panic-on-broken-symlink-in-git-repository.patch"; - url = "https://github.com/ogham/exa/pull/584/commits/a7a8e99cf3a15992afb2383435da0231917ffb54.patch"; - sha256 = "0n5q483sz300jkp0sbb350hdinmkw7s6bmigdyr6ypz3fvygd9hx"; - }) - ]; - - nativeBuildInputs = [ cmake pkg-config perl installShellFiles ]; + nativeBuildInputs = [ cmake pkg-config installShellFiles pandoc ]; buildInputs = [ zlib ] ++ lib.optionals stdenv.isDarwin [ libiconv Security ]; outputs = [ "out" "man" ]; postInstall = '' - installManPage contrib/man/exa.1 + pandoc --standalone -f markdown -t man man/exa.1.md > man/exa.1 + pandoc --standalone -f markdown -t man man/exa_colors.5.md > man/exa_colors.5 + installManPage man/exa.1 man/exa_colors.5 installShellCompletion \ - --name exa contrib/completions.bash \ - --name exa.fish contrib/completions.fish \ - --name _exa contrib/completions.zsh + --name exa completions/completions.bash \ + --name exa.fish completions/completions.fish \ + --name _exa completions/completions.zsh ''; # Some tests fail, but Travis ensures a proper build @@ -55,6 +46,6 @@ buildRustPackage rec { ''; homepage = "https://the.exa.website"; license = licenses.mit; - maintainers = with maintainers; [ ehegnes lilyball globin ]; + maintainers = with maintainers; [ ehegnes lilyball globin fortuneteller2k ]; }; } diff --git a/nixpkgs/pkgs/tools/misc/execline/default.nix b/nixpkgs/pkgs/tools/misc/execline/default.nix index 887671b48994..705a8a554c18 100644 --- a/nixpkgs/pkgs/tools/misc/execline/default.nix +++ b/nixpkgs/pkgs/tools/misc/execline/default.nix @@ -4,8 +4,8 @@ with skawarePackages; buildPackage { pname = "execline"; - version = "2.7.0.0"; - sha256 = "0kl74yix60msgw8k3shhp9ymm80n91yxxqckixj5qbbhmylpnpqd"; + version = "2.8.0.0"; + sha256 = "0vbn4pdazy6x6213vn42k0khcij5bvkbrcfg7nw6inhf8154nx77"; description = "A small scripting language, to be used in place of a shell in non-interactive scripts"; diff --git a/nixpkgs/pkgs/tools/misc/expect/default.nix b/nixpkgs/pkgs/tools/misc/expect/default.nix index 12e63686d51f..1315ac8540cb 100644 --- a/nixpkgs/pkgs/tools/misc/expect/default.nix +++ b/nixpkgs/pkgs/tools/misc/expect/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, tcl, makeWrapper, autoreconfHook }: +{ lib, stdenv, buildPackages, fetchurl, tcl, makeWrapper, autoreconfHook, fetchpatch }: stdenv.mkDerivation rec { pname = "expect"; @@ -9,19 +9,27 @@ stdenv.mkDerivation rec { sha256 = "0d1cp5hggjl93xwc8h1y6adbnrvpkk0ywkd00inz9ndxn21xm9s9"; }; - buildInputs = [ tcl ]; - nativeBuildInputs = [ makeWrapper autoreconfHook ]; - - hardeningDisable = [ "format" ]; + patches = [ + (fetchpatch { + url = "https://raw.githubusercontent.com/buildroot/buildroot/c05e6aa361a4049eabd8b21eb64a34899ef83fc7/package/expect/0001-enable-cross-compilation.patch"; + sha256 = "1jwx2l1slidvcpahxbyqs942l81jd62rzbxliyd9lwysk38c8b6b"; + }) + ]; postPatch = '' sed -i "s,/bin/stty,$(type -p stty),g" configure.in ''; + nativeBuildInputs = [ autoreconfHook makeWrapper tcl ]; + buildInputs = [ tcl ]; + + strictDeps = true; + hardeningDisable = [ "format" ]; + configureFlags = [ - "--with-tcl=${tcl}/lib" + "--with-tcl=${buildPackages.tcl}/lib" "--with-tclinclude=${tcl}/include" - "--exec-prefix=\${out}" + "--exec-prefix=${placeholder "out"}" ]; postInstall = '' @@ -33,6 +41,8 @@ stdenv.mkDerivation rec { done ''; + outputs = [ "out" "dev" ]; + meta = with lib; { description = "A tool for automating interactive applications"; homepage = "http://expect.sourceforge.net/"; diff --git a/nixpkgs/pkgs/tools/misc/fdtools/default.nix b/nixpkgs/pkgs/tools/misc/fdtools/default.nix index d096f903bd1a..e9efd66b2f1f 100644 --- a/nixpkgs/pkgs/tools/misc/fdtools/default.nix +++ b/nixpkgs/pkgs/tools/misc/fdtools/default.nix @@ -23,6 +23,9 @@ in stdenv.mkDerivation { sed -e 's|gcc|$CC|' \ conf-compile/defaults/host_link.sh \ > conf-compile/host_link.sh + sed -e 's|gcc|$CC|' \ + conf-compile/defaults/host_compile.sh \ + > conf-compile/host_compile.sh echo "${skawarePackages.skalibs.lib}/lib/skalibs/sysdeps" \ > conf-compile/depend_skalibs_sysdeps @@ -73,7 +76,7 @@ in stdenv.mkDerivation { homepage = "https://code.dogmap.org./fdtools/"; description = "A set of utilities for working with file descriptors"; license = lib.licenses.gpl2; - platforms = lib.platforms.all; + platforms = lib.platforms.linux; maintainers = [ lib.maintainers.Profpatsch ]; }; } diff --git a/nixpkgs/pkgs/tools/misc/fend/default.nix b/nixpkgs/pkgs/tools/misc/fend/default.nix index 0ca5f42f74dd..6028140234e4 100644 --- a/nixpkgs/pkgs/tools/misc/fend/default.nix +++ b/nixpkgs/pkgs/tools/misc/fend/default.nix @@ -2,16 +2,22 @@ rustPlatform.buildRustPackage rec { pname = "fend"; - version = "0.1.13"; + version = "0.1.14"; src = fetchFromGitHub { owner = "printfn"; repo = pname; rev = "v${version}"; - sha256 = "sha256-dz6vGRsWc7ubc/drj2Qw/of8AciPgVzc4++Eozg0Luo="; + sha256 = "sha256-zKjYUkkm15YRF0YFJKi2A6twvmHuEyxdWcNs37r2dJg="; }; - cargoSha256 = "sha256-/HBTmLZLhv89mvIVLocw9XbfOgxh9KsjA6KT60IuJeA="; + cargoSha256 = "sha256-e95DRhD22zvizUJOM2It45Bx05iK3KtaMgFPkMbR7iI="; + + doInstallCheck = true; + + installCheckPhase = '' + [[ "$($out/bin/fend "1 km to m")" = "1000 m" ]] + ''; meta = with lib; { description = "Arbitrary-precision unit-aware calculator"; diff --git a/nixpkgs/pkgs/tools/misc/fet-sh/default.nix b/nixpkgs/pkgs/tools/misc/fet-sh/default.nix index e53c51c33e94..e9286e6a11e9 100644 --- a/nixpkgs/pkgs/tools/misc/fet-sh/default.nix +++ b/nixpkgs/pkgs/tools/misc/fet-sh/default.nix @@ -2,26 +2,28 @@ stdenvNoCC.mkDerivation rec { pname = "fet-sh"; - version = "1.8"; + version = "1.9"; src = fetchFromGitHub { owner = "6gk"; repo = "fet.sh"; rev = "v${version}"; - sha256 = "1czjsyagwzbf8l023l1saz9ssb1hc245a64nfwc8wl0cn4h9byky"; + sha256 = "sha256-xhX2nVteC3T3IjQh++mYlm0btDJQbyQa6b8sGualV0E="; }; - dontBuild = true; + postPatch = '' + patchShebangs fet.sh + ''; installPhase = '' - install -m755 -D ./fet.sh $out/bin/fet.sh + install -m755 -D fet.sh $out/bin/fet.sh ''; meta = with lib; { - description = "A fetch written in posix shell without any external commands (linux only)"; + description = "A fetch written in posix shell without any external commands"; homepage = "https://github.com/6gk/fet.sh"; license = licenses.isc; - platforms = platforms.linux; + platforms = platforms.all; maintainers = with maintainers; [ elkowar ]; }; diff --git a/nixpkgs/pkgs/tools/misc/flameshot/default.nix b/nixpkgs/pkgs/tools/misc/flameshot/default.nix index a923dbf651f4..f0ed87bcc22b 100644 --- a/nixpkgs/pkgs/tools/misc/flameshot/default.nix +++ b/nixpkgs/pkgs/tools/misc/flameshot/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "flameshot"; - version = "0.8.5"; + version = "0.9.0"; src = fetchFromGitHub { owner = "flameshot-org"; repo = "flameshot"; rev = "v${version}"; - sha256 = "1z77igs60lz106vsf6wsayxjafxm3llf2lm4dpvsqyyrxybfq191"; + sha256 = "sha256-E5J61k1tVpbwlzYHbCY1rf9+GODcJRRAQwb0jR4s7BU="; }; nativeBuildInputs = [ cmake qttools qtsvg ]; diff --git a/nixpkgs/pkgs/tools/misc/fluent-bit/default.nix b/nixpkgs/pkgs/tools/misc/fluent-bit/default.nix index aa9f175e9004..762d93ea1e9b 100644 --- a/nixpkgs/pkgs/tools/misc/fluent-bit/default.nix +++ b/nixpkgs/pkgs/tools/misc/fluent-bit/default.nix @@ -2,18 +2,21 @@ stdenv.mkDerivation rec { pname = "fluent-bit"; - version = "1.6.8"; + version = "1.7.2"; src = fetchFromGitHub { owner = "fluent"; repo = "fluent-bit"; rev = "v${version}"; - sha256 = "1k8ghz8xwy7v4y4r4xc690ig7qmn0mkvynplwn66j44fgdpg0v1s"; + sha256 = "sha256-5R26NvhSYesMk/8i9+5H3pZTgbdbnuQ1rLlCa/gWJGc="; }; nativeBuildInputs = [ cmake flex bison ]; - patches = [ ./fix-luajit-darwin.patch ]; + patches = lib.optionals stdenv.isDarwin [ ./fix-luajit-darwin.patch ]; + + # _FORTIFY_SOURCE requires compiling with optimization (-O) + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isGNU "-O"; postPatch = '' substituteInPlace src/CMakeLists.txt \ diff --git a/nixpkgs/pkgs/tools/misc/fontfor/default.nix b/nixpkgs/pkgs/tools/misc/fontfor/default.nix new file mode 100644 index 000000000000..c77809ece1ed --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/fontfor/default.nix @@ -0,0 +1,41 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, cmake +, pkg-config +, expat +, fontconfig +, freetype +}: + +rustPlatform.buildRustPackage rec { + pname = "fontfor"; + version = "0.3.1"; + + src = fetchFromGitHub { + owner = "7sDream"; + repo = "fontfor"; + rev = "v${version}"; + sha256 = "1b07hd41blwsnb91vh2ax9zigm4lh8n0i5man0cjmxhavvbfy12b"; + }; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + buildInputs = [ + expat + fontconfig + freetype + ]; + + cargoSha256 = "194c4knjfb3pnpvw3zl1srwx3q1jp6z78vzln0q2mk5nf0a35yy0"; + + meta = with lib; { + description = "Find fonts which can show a specified character and preview them in browser"; + homepage = "https://github.com/7sDream/fontfor"; + license = with licenses; [ gpl3Plus ]; + maintainers = with maintainers; [ shamilton ]; + platforms = platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/tools/misc/fontforge/default.nix b/nixpkgs/pkgs/tools/misc/fontforge/default.nix index 2140e405ff4a..ffee232172c0 100644 --- a/nixpkgs/pkgs/tools/misc/fontforge/default.nix +++ b/nixpkgs/pkgs/tools/misc/fontforge/default.nix @@ -1,5 +1,4 @@ -{ stdenv, fetchurl, lib -, fetchpatch +{ stdenv, fetchFromGitHub, lib , cmake, perl, uthash, pkg-config, gettext , python, freetype, zlib, glib, libungif, libpng, libjpeg, libtiff, libxml2, cairo, pango , readline, woff2, zeromq, libuninameslist @@ -15,25 +14,15 @@ assert withGTK -> withGUI; stdenv.mkDerivation rec { pname = "fontforge"; - version = "20200314"; + version = "20201107"; - src = fetchurl { - url = "https://github.com/${pname}/${pname}/releases/download/${version}/${pname}-${version}.tar.xz"; - sha256 = "0qf88wd6riycq56d24brybyc93ns74s0nyyavm43zp2kfcihn6fd"; + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = version; + sha256 = "sha256-Rl/5lbXaPgIndANaD0IakaDus6T53FjiBb45FIuGrvc="; }; - patches = [ - # Unreleased fix for https://github.com/fontforge/fontforge/issues/4229 - # which is required to fix an uninterposated `${CMAKE_INSTALL_PREFIX}/lib`, see - # see https://github.com/nh2/static-haskell-nix/pull/98#issuecomment-665395399 - # TODO: Remove https://github.com/fontforge/fontforge/pull/4232 is in a release. - (fetchpatch { - name = "fontforge-cmake-set-rpath-to-the-configure-time-CMAKE_INSTALL_PREFIX"; - url = "https://github.com/fontforge/fontforge/commit/297ee9b5d6db5970ca17ebe5305189e79a1520a1.patch"; - sha256 = "14qfp8pwh0vzzib4hq2nc6xhn8lc1cal1sb0lqwb2q5dijqx5kqk"; - }) - ]; - # use $SOURCE_DATE_EPOCH instead of non-deterministic timestamps postPatch = '' find . -type f -name '*.c' -exec sed -r -i 's#\btime\(&(.+)\)#if (getenv("SOURCE_DATE_EPOCH")) \1=atol(getenv("SOURCE_DATE_EPOCH")); else &#g' {} \; diff --git a/nixpkgs/pkgs/tools/misc/fselect/default.nix b/nixpkgs/pkgs/tools/misc/fselect/default.nix index 7416961e84e8..71ed340d14cf 100644 --- a/nixpkgs/pkgs/tools/misc/fselect/default.nix +++ b/nixpkgs/pkgs/tools/misc/fselect/default.nix @@ -1,19 +1,20 @@ -{ lib, fetchFromGitHub, rustPlatform, installShellFiles }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, installShellFiles, libiconv }: rustPlatform.buildRustPackage rec { pname = "fselect"; - version = "0.7.2"; + version = "0.7.4"; src = fetchFromGitHub { owner = "jhspetersson"; repo = "fselect"; rev = version; - sha256 = "1cqa52n5y6g087w4yzc273jpxhzpinwkqd32azg03dkczbgx5b2v"; + sha256 = "sha256-gwFX5c5y4bL+KhPDnvCbDco1ORYyqZYFsetMrmOATZU="; }; - cargoSha256 = "00yhp2b74plrbi944apbxpkw2y6nbgf81sinfchw44ww1i58mfhj"; + cargoSha256 = "sha256-2cs+5UL3tNfUzjlFIdsG05moiOktXSJOZJlgo/rZINw="; nativeBuildInputs = [ installShellFiles ]; + buildInputs = lib.optional stdenv.isDarwin libiconv; postInstall = '' installManPage docs/fselect.1 diff --git a/nixpkgs/pkgs/tools/misc/fwup/default.nix b/nixpkgs/pkgs/tools/misc/fwup/default.nix index 4d072e6d2bfa..de2b809eea52 100644 --- a/nixpkgs/pkgs/tools/misc/fwup/default.nix +++ b/nixpkgs/pkgs/tools/misc/fwup/default.nix @@ -1,27 +1,68 @@ -{ stdenv, lib, fetchFromGitHub, autoreconfHook, makeWrapper, pkg-config -, zlib, lzma, bzip2, mtools, dosfstools, zip, unzip, libconfuse, libsodium -, libarchive, darwin, coreutils }: +{ stdenv +, lib +, fetchFromGitHub +, autoreconfHook +, DiskArbitration +, pkg-config +, bzip2 +, libarchive +, libconfuse +, libsodium +, xz +, zlib +, coreutils +, dosfstools +, mtools +, unzip +, zip +, which +, xdelta +}: stdenv.mkDerivation rec { pname = "fwup"; - version = "1.5.2"; + version = "1.8.3"; src = fetchFromGitHub { owner = "fhunleth"; repo = "fwup"; rev = "v${version}"; - sha256 = "05sjdlh450hk474a44yr6kz9dzx72jfxpi1krxbd0pdizlmfypsg"; + sha256 = "sha256-ayfcnIZ7MuBsCy1giwmY2D2C6AukwS+fevmXqGa4c1w="; }; - doCheck = true; - patches = lib.optional stdenv.isDarwin [ ./fix-testrunner-darwin.patch ]; + patches = [ ./fix-testrunner-darwin.patch ]; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; - nativeBuildInputs = [ pkg-config autoreconfHook makeWrapper ]; - buildInputs = [ zlib lzma bzip2 libconfuse libsodium libarchive ] + buildInputs = [ + bzip2 + libarchive + libconfuse + libsodium + xz + zlib + ] ++ lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.DiskArbitration - ]; - propagatedBuildInputs = [ zip unzip mtools dosfstools coreutils ]; + DiskArbitration + ]; + + propagatedBuildInputs = [ + coreutils + dosfstools + mtools + unzip + zip + ]; + + checkInputs = [ + which + xdelta + ]; + + doCheck = true; meta = with lib; { description = "Configurable embedded Linux firmware update creator and runner"; diff --git a/nixpkgs/pkgs/tools/misc/fzf/default.nix b/nixpkgs/pkgs/tools/misc/fzf/default.nix index 837277a5c858..0688f1d6487e 100644 --- a/nixpkgs/pkgs/tools/misc/fzf/default.nix +++ b/nixpkgs/pkgs/tools/misc/fzf/default.nix @@ -1,28 +1,20 @@ -{ lib, buildGoModule, fetchFromGitHub, writeText, runtimeShell, ncurses, perl, fetchpatch }: +{ lib, buildGoModule, fetchFromGitHub, writeText, runtimeShell, ncurses, perl }: buildGoModule rec { pname = "fzf"; - version = "0.25.0"; + version = "0.27.0"; src = fetchFromGitHub { owner = "junegunn"; repo = pname; rev = version; - sha256 = "1j5bfxl4w8w3n89p051y8dhxg0py9l98v7r2gkr63bg4lj32faz8"; + sha256 = "sha256-q0rAAD6du0WLcd46LUpkG3gBIvmtOE/foEMW5QCoIak="; }; - vendorSha256 = "0dd0qm1fxp3jnlrhfaas8fw87cj7rygaac35a9nk3xh2xsk7q35p"; + vendorSha256 = "sha256-FKDCIotyra/TZ48wbpzudJZ2aI2pn+ZR4EoZ+9+19Mw="; outputs = [ "out" "man" ]; - patches = [ - # Fix test failure on go 1.15 - (fetchpatch { - url = "https://github.com/junegunn/fzf/commit/82791f7efccde5b30da0b4d44f10d214ae5c0c0d.patch"; - sha256 = "1nybsz09h8cnvxjnkmx9c52g8z0x6pvrn230hw1va5a3pvmg01z1"; - }) - ]; - fishHook = writeText "load-fzf-keybindings.fish" "fzf_key_bindings"; buildInputs = [ ncurses ]; @@ -79,5 +71,6 @@ buildGoModule rec { license = licenses.mit; maintainers = with maintainers; [ Br1ght0ne ma27 zowoq ]; platforms = platforms.unix; + changelog = "https://github.com/junegunn/fzf/blob/${version}/CHANGELOG.md"; }; } diff --git a/nixpkgs/pkgs/tools/misc/gammy/default.nix b/nixpkgs/pkgs/tools/misc/gammy/default.nix index 9f9a73a989e1..e06d20eb2ff7 100644 --- a/nixpkgs/pkgs/tools/misc/gammy/default.nix +++ b/nixpkgs/pkgs/tools/misc/gammy/default.nix @@ -2,7 +2,7 @@ let pname = "gammy"; - version = "0.9.62"; + version = "0.9.64"; in stdenv.mkDerivation { @@ -12,7 +12,7 @@ stdenv.mkDerivation { owner = "Fushko"; repo = pname; rev = "v${version}"; - sha256 = "sha256-fyr+khLgaX5xbKCW3pqt6fFvZBHGEVs1BsMireZDxP0="; + sha256 = "sha256-NPvkT7jSbDjcZDHpMIOik9fNsz7OJXQ3g9OFxkpA3pk="; }; nativeBuildInputs = [ qmake wrapQtAppsHook ]; diff --git a/nixpkgs/pkgs/tools/misc/gams/default.nix b/nixpkgs/pkgs/tools/misc/gams/default.nix index f91acbf264a5..c6bd2c53844c 100644 --- a/nixpkgs/pkgs/tools/misc/gams/default.nix +++ b/nixpkgs/pkgs/tools/misc/gams/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "4f95389579f33ff7c2586838a2c19021aa0746279555cbb51aa6e0efd09bd297"; }; unpackCmd = "unzip $src"; - buildInputs = [ unzip file ]; + nativeBuildInputs = [ unzip ]; + buildInputs = [ file ]; dontBuild = true; installPhase = '' diff --git a/nixpkgs/pkgs/tools/misc/git-fire/default.nix b/nixpkgs/pkgs/tools/misc/git-fire/default.nix index bba1bd65a54d..15dc34cd5267 100644 --- a/nixpkgs/pkgs/tools/misc/git-fire/default.nix +++ b/nixpkgs/pkgs/tools/misc/git-fire/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { ''; homepage = "https://github.com/qw3rtman/git-fire"; license = licenses.mit; - platforms = platforms.linux; + platforms = platforms.all; maintainers = [ maintainers.swflint ]; }; } diff --git a/nixpkgs/pkgs/tools/misc/git-town/default.nix b/nixpkgs/pkgs/tools/misc/git-town/default.nix index 56f9452db7b7..88d62b896df7 100644 --- a/nixpkgs/pkgs/tools/misc/git-town/default.nix +++ b/nixpkgs/pkgs/tools/misc/git-town/default.nix @@ -2,14 +2,14 @@ buildGoPackage rec { pname = "git-town"; - version = "7.4.0"; + version = "7.5.0"; goPackagePath = "github.com/git-town/git-town"; src = fetchFromGitHub { owner = "git-town"; repo = "git-town"; rev = "v${version}"; - sha256 = "05s2hp4xn0bs3y6rgqkpgz0k8q8yfpwkw5m8vwim95hk6n41ps18"; + sha256 = "sha256-RmLDlTK+JO2KRLuLvO927W3WYdDlteBIpgTgDXh8lC8="; }; buildFlagsArray = [ "-ldflags=-X github.com/git-town/git-town/src/cmd.version=v${version} -X github.com/git-town/git-town/src/cmd.buildDate=nix" ]; diff --git a/nixpkgs/pkgs/tools/misc/github-backup/default.nix b/nixpkgs/pkgs/tools/misc/github-backup/default.nix new file mode 100644 index 000000000000..1fcaf3a47119 --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/github-backup/default.nix @@ -0,0 +1,30 @@ +{ lib +, python3 +, git +, git-lfs +}: + +python3.pkgs.buildPythonApplication rec { + pname = "github-backup"; + version = "0.39.0"; + + src = python3.pkgs.fetchPypi { + inherit pname version; + sha256 = "71829df4bdbe5bd55c324a97008405a6b4c6113edb1a2a6a8b73a7059fe64a47"; + }; + + makeWrapperArgs = [ + "--prefix" "PATH" ":" (lib.makeBinPath [ git git-lfs ]) + ]; + + # has no unit tests + doCheck = false; + + meta = with lib; { + description = "Backup a github user or organization"; + homepage = "https://github.com/josegonzalez/python-github-backup"; + changelog = "https://github.com/josegonzalez/python-github-backup/blob/${version}/CHANGES.rst"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/nixpkgs/pkgs/tools/misc/goreleaser/default.nix b/nixpkgs/pkgs/tools/misc/goreleaser/default.nix index febaa4415a25..8732ee66ef68 100644 --- a/nixpkgs/pkgs/tools/misc/goreleaser/default.nix +++ b/nixpkgs/pkgs/tools/misc/goreleaser/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "goreleaser"; - version = "0.155.1"; + version = "0.162.0"; src = fetchFromGitHub { owner = "goreleaser"; repo = pname; rev = "v${version}"; - sha256 = "sha256-eVRsDyPlUvVhEnN8aJW8vPw4UqvK2/6pblgnwH2RhkY="; + sha256 = "sha256-nhl6GATzFsfEQjKVxz65REn9QTvOH49omU00ZCfO6CY="; }; - vendorSha256 = "sha256-VFFwp+n13NL3YpzdWPVzgrH8d4BQHffwpRXvYn9MSaQ="; + vendorSha256 = "sha256-zq/RIOK/Hs1GJ2yLE7pe0UoDuR6LGUrPQAuQzrTvuKs="; buildFlagsArray = [ "-ldflags=" diff --git a/nixpkgs/pkgs/tools/misc/graylog/default.nix b/nixpkgs/pkgs/tools/misc/graylog/default.nix index 5be309be582f..b41cc9cb0699 100644 --- a/nixpkgs/pkgs/tools/misc/graylog/default.nix +++ b/nixpkgs/pkgs/tools/misc/graylog/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, makeWrapper, jre_headless, nixosTests }: +{ lib, stdenv, fetchurl, makeWrapper, openjdk11_headless, nixosTests }: stdenv.mkDerivation rec { pname = "graylog"; @@ -12,8 +12,8 @@ stdenv.mkDerivation rec { dontBuild = true; dontStrip = true; - buildInputs = [ makeWrapper ]; - makeWrapperArgs = [ "--prefix" "PATH" ":" "${jre_headless}/bin" ]; + nativeBuildInputs = [ makeWrapper ]; + makeWrapperArgs = [ "--set-default" "JAVA_HOME" "${openjdk11_headless}" ]; passthru.tests = { inherit (nixosTests) graylog; }; diff --git a/nixpkgs/pkgs/tools/misc/graylog/plugins.nix b/nixpkgs/pkgs/tools/misc/graylog/plugins.nix index 0355fe58f485..8df7f34bb234 100644 --- a/nixpkgs/pkgs/tools/misc/graylog/plugins.nix +++ b/nixpkgs/pkgs/tools/misc/graylog/plugins.nix @@ -15,7 +15,7 @@ let stdenv.mkDerivation (a // { inherit installPhase; dontUnpack = true; - buildInputs = [ unzip ]; + nativeBuildInputs = [ unzip ]; meta = a.meta // { platforms = graylog.meta.platforms; maintainers = (a.meta.maintainers or []) ++ [ maintainers.fadenb ]; diff --git a/nixpkgs/pkgs/tools/misc/grc/default.nix b/nixpkgs/pkgs/tools/misc/grc/default.nix index 8fe35012090d..e47ea74bbe98 100644 --- a/nixpkgs/pkgs/tools/misc/grc/default.nix +++ b/nixpkgs/pkgs/tools/misc/grc/default.nix @@ -1,15 +1,15 @@ -{ lib, fetchFromGitHub, python3Packages }: +{ lib, fetchFromGitHub, buildPythonApplication }: -python3Packages.buildPythonApplication rec { +buildPythonApplication rec { pname = "grc"; - version = "1.11.3"; + version = "1.12"; format = "other"; src = fetchFromGitHub { - owner = "garabik"; - repo = "grc"; - rev = "v${version}"; - sha256 = "0b3wx9zr7l642hizk93ysbdss7rfymn22b2ykj4kpkf1agjkbv35"; + owner = "garabik"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-XJj1j6sDt0iL3U6uMbB1j0OfpXRdP+x66gc6sKxrQIA="; }; postPatch = '' @@ -21,23 +21,20 @@ python3Packages.buildPythonApplication rec { installPhase = '' runHook preInstall - ./install.sh "$out" "$out" install -Dm444 -t $out/share/zsh/vendor-completions _grc - runHook postInstall ''; meta = with lib; { - description = "Yet another colouriser for beautifying your logfiles or output of commands"; - homepage = "http://korpus.juls.savba.sk/~garabik/software/grc.html"; - license = licenses.gpl2; - maintainers = with maintainers; [ lovek323 AndersonTorres peterhoeg ]; - platforms = platforms.unix; - + homepage = "http://korpus.juls.savba.sk/~garabik/software/grc.html"; + description = "A generic text colouriser"; longDescription = '' Generic Colouriser is yet another colouriser (written in Python) for beautifying your logfiles or output of commands. ''; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ lovek323 AndersonTorres peterhoeg ]; + platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/tools/misc/grex/default.nix b/nixpkgs/pkgs/tools/misc/grex/default.nix index d58661babc60..bef1e59e65d8 100644 --- a/nixpkgs/pkgs/tools/misc/grex/default.nix +++ b/nixpkgs/pkgs/tools/misc/grex/default.nix @@ -8,15 +8,15 @@ rustPlatform.buildRustPackage rec { pname = "grex"; - version = "1.1.0"; + version = "1.2.0"; - cargoSha256 = "0kf2n2j7kfrfzid1h2gd0qf53fah0hpyrrlh2k5vrhd0panv3bwc"; + cargoSha256 = "sha256-EZnuGoysTZMpk2pndOzfXyRnN696RpKze27utQWNFTY="; src = fetchFromGitHub { owner = "pemistahl"; repo = pname; rev = "v${version}"; - sha256 = "1viph7ki6f2akc5mpbgycacndmxnv088ybfji2bfdbi5jnpyavvs"; + sha256 = "sha256-3M6wQB7+1MKPcxSvjDTNs33TrFjCEeFlbh1akwJHLLU="; }; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; diff --git a/nixpkgs/pkgs/tools/misc/grit/default.nix b/nixpkgs/pkgs/tools/misc/grit/default.nix new file mode 100644 index 000000000000..f1b4b43280bc --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/grit/default.nix @@ -0,0 +1,23 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "grit"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "climech"; + repo = "grit"; + rev = "v${version}"; + sha256 = "0v4i8xdf1pgkmwad5jb6n6s4rx48zk57wij0ppzg6zb725wy7r8a"; + }; + + vendorSha256 = "0a1lqfn710fgvrvbimd92102fhjs1wa7r8i0l7s5m7jxks629hw8"; + + meta = with lib; { + description = "A multitree-based personal task manager"; + homepage = "https://github.com/climech/grit"; + license = licenses.mit; + platforms = platforms.unix; + maintainers = [ maintainers.ivar ]; + }; +} diff --git a/nixpkgs/pkgs/tools/misc/grub/2.0x.nix b/nixpkgs/pkgs/tools/misc/grub/2.0x.nix index bc933312afc5..ad7a74e8137f 100644 --- a/nixpkgs/pkgs/tools/misc/grub/2.0x.nix +++ b/nixpkgs/pkgs/tools/misc/grub/2.0x.nix @@ -1,10 +1,14 @@ { lib, stdenv, fetchgit, flex, bison, python3, autoconf, automake, gnulib, libtool , gettext, ncurses, libusb-compat-0_1, freetype, qemu, lvm2, unifont, pkg-config +, pkgsBuildBuild +, nixosTests , fuse # only needed for grub-mount +, runtimeShell , zfs ? null , efiSupport ? false , zfsSupport ? false , xenSupport ? false +, kbdcompSupport ? false, ckbcomp }: with lib; @@ -31,7 +35,7 @@ let canEfi = any (system: stdenv.hostPlatform.system == system) (mapAttrsToList (name: _: name) efiSystemsBuild); inPCSystems = any (system: stdenv.hostPlatform.system == system) (mapAttrsToList (name: _: name) pcSystems); - version = "2.04"; + version = "2.06-rc1"; in ( @@ -46,18 +50,27 @@ stdenv.mkDerivation rec { src = fetchgit { url = "git://git.savannah.gnu.org/grub.git"; rev = "${pname}-${version}"; - sha256 = "02gly3xw88pj4zzqjniv1fxa1ilknbq1mdk30bj6qy8n44g90i8w"; + sha256 = "1ngc960g4w91rg13l724v6nlj6fq1adxp6is2mrq4bnp7sm9mysa"; }; patches = [ ./fix-bash-completion.patch ]; - nativeBuildInputs = [ bison flex python3 pkg-config autoconf automake ]; - buildInputs = [ ncurses libusb-compat-0_1 freetype gettext lvm2 fuse libtool ] + postPatch = if kbdcompSupport then '' + sed -i util/grub-kbdcomp.in -e 's@\bckbcomp\b@${ckbcomp}/bin/ckbcomp@' + '' else '' + echo '#! ${runtimeShell}' > util/grub-kbdcomp.in + echo 'echo "Compile grub2 with { kbdcompSupport = true; } to enable support for this command."' >> util/grub-kbdcomp.in + ''; + + nativeBuildInputs = [ bison flex python3 pkg-config autoconf automake gettext ]; + buildInputs = [ ncurses libusb-compat-0_1 freetype lvm2 fuse libtool ] ++ optional doCheck qemu ++ optional zfsSupport zfs; + strictDeps = true; + hardeningDisable = [ "all" ]; # Work around a bug in the generated flex lexer (upstream flex bug?) @@ -90,7 +103,10 @@ stdenv.mkDerivation rec { substituteInPlace ./configure --replace '/usr/share/fonts/unifont' '${unifont}/share/fonts' ''; - configureFlags = [ "--enable-grub-mount" ] # dep of os-prober + configureFlags = [ + "--enable-grub-mount" # dep of os-prober + "BUILD_CC=${pkgsBuildBuild.stdenv.cc}/bin/cc" + ] ++ optional zfsSupport "--enable-libzfs" ++ optionals efiSupport [ "--with-platform=efi" "--target=${efiSystemsBuild.${stdenv.hostPlatform.system}.target}" "--program-prefix=" ] ++ optionals xenSupport [ "--with-platform=xen" "--target=${efiSystemsBuild.${stdenv.hostPlatform.system}.target}"]; @@ -110,6 +126,14 @@ stdenv.mkDerivation rec { sed -i $out/lib/grub/*/modinfo.sh -e "/grub_target_cppflags=/ s|'.*'|' '|" ''; + passthru.tests = { + nixos-grub = nixosTests.grub; + nixos-install-simple = nixosTests.installer.simple; + nixos-install-grub1 = nixosTests.installer.grub1; + nixos-install-grub-uefi = nixosTests.installer.simpleUefiGrub; + nixos-install-grub-uefi-spec = nixosTests.installer.simpleUefiGrubSpecialisation; + }; + meta = with lib; { description = "GNU GRUB, the Grand Unified Boot Loader (2.x beta)"; diff --git a/nixpkgs/pkgs/tools/misc/gti/default.nix b/nixpkgs/pkgs/tools/misc/gti/default.nix index 83452394f154..e950d58fc76e 100644 --- a/nixpkgs/pkgs/tools/misc/gti/default.nix +++ b/nixpkgs/pkgs/tools/misc/gti/default.nix @@ -11,6 +11,10 @@ stdenv.mkDerivation rec { sha256 = "1jivnjswlhwjfg5v9nwfg3vfssvqbdxxf9znwmfb5dgfblg9wxw9"; }; + postPatch = '' + substituteInPlace Makefile --replace 'CC=cc' 'CC=${stdenv.cc.targetPrefix}cc' + ''; + installPhase = '' mkdir -p $out/bin $out/share/man/man6 cp gti $out/bin @@ -18,7 +22,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "http://r-wos.org/hacks/gti"; + homepage = "https://r-wos.org/hacks/gti"; license = licenses.mit; description = "Humorous typo-based git runner; drives a car over the terminal"; maintainers = with maintainers; [ fadenb ]; diff --git a/nixpkgs/pkgs/tools/misc/gtklp/default.nix b/nixpkgs/pkgs/tools/misc/gtklp/default.nix new file mode 100644 index 000000000000..43f67b6b7956 --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/gtklp/default.nix @@ -0,0 +1,52 @@ +{ stdenv, lib, fetchurl +, autoreconfHook, libtool, pkg-config +, gtk2, glib, cups, gettext, openssl +}: + +stdenv.mkDerivation rec { + pname = "gtklp"; + version = "1.3.4"; + + src = fetchurl { + url = "mirror://sourceforge/${pname}/${pname}-${version}.src.tar.gz"; + sha256 = "1arvnnvar22ipgnzqqq8xh0kkwyf71q2sfsf0crajpsr8a8601xy"; + }; + + nativeBuildInputs = [ + pkg-config + autoreconfHook + ]; + + buildInputs = [ + cups + gettext + glib + gtk2 + libtool + openssl + ]; + + patches = [ + ./patches/mdv-fix-str-fmt.patch + ./patches/autoconf.patch + ]; + + preConfigure = '' + substituteInPlace include/defaults.h --replace "netscape" "firefox" + substituteInPlace include/defaults.h --replace "http://localhost:631/sum.html#STANDARD_OPTIONS" \ + "http://localhost:631/help/" + ''; + + preInstall = '' + install -D -m0644 -t $out/share/doc AUTHORS BUGS ChangeLog README USAGE + ''; + + meta = with lib; { + description = "A graphical frontend for CUPS"; + homepage = "https://gtklp.sirtobi.com"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ caadar ]; + platforms = platforms.unix; + }; + +} diff --git a/nixpkgs/pkgs/tools/misc/gtklp/patches/autoconf.patch b/nixpkgs/pkgs/tools/misc/gtklp/patches/autoconf.patch new file mode 100644 index 000000000000..c1698bee1fdc --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/gtklp/patches/autoconf.patch @@ -0,0 +1,23 @@ +Patch origin: http://sophie.zarb.org/rpms/68e90a72e0052022f558148d97c9ea2a/files/3 + +diff --git a/configure.ac b/configure.ac +index b7a30e9..3768ae9 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -8,6 +8,7 @@ AC_CONFIG_HEADERS([config.h]) + + AC_CONFIG_MACRO_DIR([m4]) + AM_GNU_GETTEXT([external]) ++AM_GNU_GETTEXT_REQUIRE_VERSION([0.21]) + + dnl Extra params + CUPSCONFIGPATH="" +@@ -30,8 +31,6 @@ AC_SUBST(XLIBS) + + dnl Checks for header files + +-dnl internationalization macros +-AM_GNU_GETTEXT + + + # Forte Compiler ############################################################ diff --git a/nixpkgs/pkgs/tools/misc/gtklp/patches/mdv-fix-str-fmt.patch b/nixpkgs/pkgs/tools/misc/gtklp/patches/mdv-fix-str-fmt.patch new file mode 100644 index 000000000000..6cfc90beb02a --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/gtklp/patches/mdv-fix-str-fmt.patch @@ -0,0 +1,22 @@ +Patch source: http://sophie.zarb.org/rpms/68e90a72e0052022f558148d97c9ea2a/files/1 + +--- a/libgtklp/libgtklp.c 2020-08-25 17:31:52.427298559 +0100 ++++ b/libgtklp/libgtklp.c 2020-08-25 17:36:37.728154682 +0100 +@@ -939,7 +939,7 @@ + gtk_widget_show(pixmapwid); + + if (strlen(gerror2) == 0) +- snprintf(tmplabel, (size_t) MAXLINE, gerror1); ++ snprintf(tmplabel, (size_t) MAXLINE, "%s", gerror1); + else + snprintf(tmplabel, (size_t) MAXLINE, gerror1, gerror2); + label = gtk_label_new(tmplabel); +@@ -973,7 +973,7 @@ + #endif + } else { + if (strlen(gerror2) == 0) +- g_warning(gerror1); ++ g_warning("%s", gerror1); + else + g_warning(gerror1, gerror2); + } diff --git a/nixpkgs/pkgs/tools/misc/handlr/default.nix b/nixpkgs/pkgs/tools/misc/handlr/default.nix new file mode 100644 index 000000000000..1d825c866c47 --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/handlr/default.nix @@ -0,0 +1,25 @@ +{ lib, rustPlatform, fetchFromGitHub }: + +rustPlatform.buildRustPackage rec { + pname = "handlr"; + version = "0.5.0"; + + src = fetchFromGitHub { + owner = "chmln"; + repo = pname; + rev = "v${version}"; + sha256 = "1f4gmlqzgw1r8n0w9dr9lpsn94f2hlnak9bbq5xgf6jwgc9mwqzg"; + }; + + cargoSha256 = "16d4dywwkgvvxw6ninrx87rqhx0whdq3yy01m27qjy4gz6z6ad8p"; + + # Most tests fail (at least some due to directory permissions) + doCheck = false; + + meta = with lib; { + description = "Alternative to xdg-open to manage default applications with ease"; + homepage = "https://github.com/chmln/handlr"; + license = licenses.mit; + maintainers = with maintainers; [ mredaelli ]; + }; +} diff --git a/nixpkgs/pkgs/tools/misc/hdf4/default.nix b/nixpkgs/pkgs/tools/misc/hdf4/default.nix index d127bc25c3c6..5373c64d647c 100644 --- a/nixpkgs/pkgs/tools/misc/hdf4/default.nix +++ b/nixpkgs/pkgs/tools/misc/hdf4/default.nix @@ -4,11 +4,15 @@ , fixDarwinDylibNames , cmake , libjpeg +, uselibtirpc ? stdenv.isLinux , libtirpc , zlib , szip ? null +, javaSupport ? false +, jdk }: -let uselibtirpc = stdenv.isLinux; +let + javabase = "${jdk}/jre/lib/${jdk.architecture}"; in stdenv.mkDerivation rec { pname = "hdf"; @@ -52,9 +56,9 @@ stdenv.mkDerivation rec { libjpeg szip zlib - ] ++ lib.optionals uselibtirpc [ - libtirpc - ]; + ] + ++ lib.optional javaSupport jdk + ++ lib.optional uselibtirpc libtirpc; preConfigure = lib.optionalString uselibtirpc '' # Make tirpc discovery work with CMAKE_PREFIX_PATH @@ -75,6 +79,11 @@ stdenv.mkDerivation rec { "-DHDF4_ENABLE_Z_LIB_SUPPORT=ON" "-DHDF4_BUILD_FORTRAN=OFF" "-DJPEG_DIR=${libjpeg}" + ] ++ lib.optionals javaSupport [ + "-DHDF4_BUILD_JAVA=ON" + "-DJAVA_HOME=${jdk}" + "-DJAVA_AWT_LIBRARY=${javabase}/libawt.so" + "-DJAVA_JVM_LIBRARY=${javabase}/server/libjvm.so" ] ++ lib.optionals (szip != null) [ "-DHDF4_ENABLE_SZIP_ENCODING=ON" "-DHDF4_ENABLE_SZIP_SUPPORT=ON" diff --git a/nixpkgs/pkgs/tools/misc/hdf5/default.nix b/nixpkgs/pkgs/tools/misc/hdf5/default.nix index fc7bb635040a..e97a6dbdd189 100644 --- a/nixpkgs/pkgs/tools/misc/hdf5/default.nix +++ b/nixpkgs/pkgs/tools/misc/hdf5/default.nix @@ -8,6 +8,8 @@ , mpiSupport ? false , mpi , enableShared ? !stdenv.hostPlatform.isStatic +, javaSupport ? false +, jdk }: # cpp and mpi options are mutually exclusive @@ -17,11 +19,11 @@ assert !cpp || !mpiSupport; let inherit (lib) optional optionals; in stdenv.mkDerivation rec { - version = "1.10.6"; + version = "1.10.7"; pname = "hdf5"; src = fetchurl { url = "https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.10/${pname}-${version}/src/${pname}-${version}.tar.bz2"; - sha256 = "1gf38x51128hn00744358w27xgzjk0ff4wra4yxh2lk804ck1mh9"; + sha256 = "0pm5xxry55i0h7wmvc7svzdaa90rnk7h78rrjmnlkz2ygsn8y082"; }; passthru = { @@ -35,7 +37,8 @@ stdenv.mkDerivation rec { buildInputs = [] ++ optional (gfortran != null) gfortran - ++ optional (szip != null) szip; + ++ optional (szip != null) szip + ++ optional javaSupport jdk; propagatedBuildInputs = [] ++ optional (zlib != null) zlib @@ -46,7 +49,8 @@ stdenv.mkDerivation rec { ++ optional (gfortran != null) "--enable-fortran" ++ optional (szip != null) "--with-szlib=${szip}" ++ optionals mpiSupport ["--enable-parallel" "CC=${mpi}/bin/mpicc"] - ++ optional enableShared "--enable-shared"; + ++ optional enableShared "--enable-shared" + ++ optional javaSupport "--enable-java"; patches = [ ./bin-mv.patch diff --git a/nixpkgs/pkgs/tools/misc/hdfjava/default.nix b/nixpkgs/pkgs/tools/misc/hdfjava/default.nix deleted file mode 100644 index 70a2f091116b..000000000000 --- a/nixpkgs/pkgs/tools/misc/hdfjava/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, stdenv, fetchurl, cmake, javac }: - -stdenv.mkDerivation rec { - pname = "hdf-java"; - version = "3.3.2"; - - src = fetchurl { - url = "http://www.hdfgroup.org/ftp/HDF5/releases/HDF-JAVA/hdfjni-${version}/src/CMake-hdfjava-${version}.tar.gz"; - sha256 = "0m1gp2aspcblqzmpqbdpfp6giskws85ds6p5gz8sx7asyp7wznpr"; - }; - - nativeBuildInputs = [ cmake javac ]; - - dontConfigure = true; - buildPhase = "./build-hdfjava-unix.sh"; - installPhase = '' - mkdir -p $out - cp -r build/_CPack_Packages/Linux/TGZ/HDFJava-3.3.2-Linux/HDF_Group/HDFJava/${version}/* $out/ - ''; - - meta = { - description = "A Java package that implements HDF4 and HDF5 data objects in an object-oriented form"; - license = lib.licenses.free; # BSD-like - homepage = "https://support.hdfgroup.org/products/java/index.html"; - platforms = lib.platforms.linux; - }; -} diff --git a/nixpkgs/pkgs/tools/misc/hdfview/default.nix b/nixpkgs/pkgs/tools/misc/hdfview/default.nix index dc13bb52791f..8537e5748c30 100644 --- a/nixpkgs/pkgs/tools/misc/hdfview/default.nix +++ b/nixpkgs/pkgs/tools/misc/hdfview/default.nix @@ -1,39 +1,58 @@ -{ lib, stdenv, fetchurl, ant, javac, hdf_java }: +{ lib, stdenv, fetchurl, ant, jdk, nettools, hdf4, hdf5, makeDesktopItem, copyDesktopItems }: stdenv.mkDerivation rec { pname = "hdfview"; - version = "2.14"; + version = "3.1.2"; src = fetchurl { - url = "https://support.hdfgroup.org/ftp/HDF5/hdf-java/current/src/${pname}-${version}.tar.gz"; - sha256 = "0lv9djfm7hnp14mcyzbiax3xjb8vkbzhh7bdl6cvgy53pc08784p"; + url = "https://support.hdfgroup.org/ftp/HDF5/releases/HDF-JAVA/${pname}-${version}/src/${pname}-${version}.tar.gz"; + sha256 = "0kyw9i3f817z71l0ak7shl0wqxasz9h5fl05mklyapa7cj27637c"; }; - nativeBuildInputs = [ ant javac ]; + nativeBuildInputs = [ + ant jdk + nettools # "hostname" required + copyDesktopItems + ]; - HDFLIBS = hdf_java; + HDFLIBS = (hdf4.override { javaSupport = true; }).out; + HDF5LIBS = (hdf5.override { javaSupport = true; }).out; buildPhase = '' - ant run - ant package + runHook preBuild + + ant createJPackage + + runHook postBuild ''; + desktopItem = makeDesktopItem rec { + name = "HDFView"; + desktopName = name; + exec = name; + icon = name; + comment = meta.description; + categories = "Science;DataVisualization;"; + }; + installPhase = '' - mkdir $out - # exclude jre - cp -r build/HDF_Group/HDFView/*/{lib,share} $out/ - mkdir $out/bin - cp -r build/HDF_Group/HDFView/*/hdfview.sh $out/bin/hdfview - chmod +x $out/bin/hdfview - substituteInPlace $out/bin/hdfview \ - --replace "@JAVABIN@" "${javac}/bin/" \ - --replace "@INSTALLDIR@" "$out" + runHook preInstall + + mkdir -p $out/bin $out/lib + cp -a build/dist/HDFView/bin/HDFView $out/bin/ + cp -a build/dist/HDFView/lib/app $out/lib/ + ln -s ${jdk}/lib/openjdk $out/lib/runtime + + mkdir -p $out/share/applications $out/share/icons/hicolor/32x32/apps + cp src/HDFView.png $out/share/icons/hicolor/32x32/apps/ + + runHook postInstall ''; meta = { description = "A visual tool for browsing and editing HDF4 and HDF5 files"; license = lib.licenses.free; # BSD-like - homepage = "https://support.hdfgroup.org/products/java/index.html"; + homepage = "https://portal.hdfgroup.org/display/HDFVIEW/HDFView"; platforms = lib.platforms.linux; }; } diff --git a/nixpkgs/pkgs/tools/misc/hidrd/default.nix b/nixpkgs/pkgs/tools/misc/hidrd/default.nix new file mode 100644 index 000000000000..74bb771c1d48 --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/hidrd/default.nix @@ -0,0 +1,23 @@ +{ lib, stdenv, fetchFromGitHub, autoreconfHook }: + +stdenv.mkDerivation { + pname = "hidrd"; + version = "unstable-2019-06-03"; + + src = fetchFromGitHub { + owner = "DIGImend"; + repo = "hidrd"; + rev = "6c0ed39708a5777ac620f902f39c8a0e03eefe4e"; + sha256 = "1rnhq6b0nrmphdig1qrpzpbpqlg3943gzpw0v7p5rwcdynb6bb94"; + }; + + nativeBuildInputs = [ autoreconfHook ]; + + meta = with lib; { + description = "HID report descriptor I/O library and conversion tool"; + homepage = "https://github.com/DIGImend/hidrd"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ pacien ]; + platforms = platforms.all; + }; +} diff --git a/nixpkgs/pkgs/tools/misc/html-proofer/Gemfile.lock b/nixpkgs/pkgs/tools/misc/html-proofer/Gemfile.lock index 3bd45730313a..5cb5b3872a1b 100644 --- a/nixpkgs/pkgs/tools/misc/html-proofer/Gemfile.lock +++ b/nixpkgs/pkgs/tools/misc/html-proofer/Gemfile.lock @@ -6,7 +6,7 @@ GEM ethon (0.12.0) ffi (>= 1.3.0) ffi (1.14.2) - html-proofer (3.18.5) + html-proofer (3.18.8) addressable (~> 2.3) mercenary (~> 0.3) nokogumbo (~> 2.0) @@ -15,13 +15,15 @@ GEM typhoeus (~> 1.3) yell (~> 2.0) mercenary (0.4.0) - mini_portile2 (2.4.0) - nokogiri (1.10.10) - mini_portile2 (~> 2.4.0) + mini_portile2 (2.5.0) + nokogiri (1.11.1) + mini_portile2 (~> 2.5.0) + racc (~> 1.4) nokogumbo (2.0.4) nokogiri (~> 1.8, >= 1.8.4) parallel (1.20.1) public_suffix (4.0.6) + racc (1.5.2) rainbow (3.0.0) typhoeus (1.4.0) ethon (>= 0.9.0) diff --git a/nixpkgs/pkgs/tools/misc/html-proofer/default.nix b/nixpkgs/pkgs/tools/misc/html-proofer/default.nix index ba136b06b8a5..73025a212b2a 100644 --- a/nixpkgs/pkgs/tools/misc/html-proofer/default.nix +++ b/nixpkgs/pkgs/tools/misc/html-proofer/default.nix @@ -1,4 +1,4 @@ -{ bundlerEnv, ruby, lib }: +{ bundlerEnv, ruby, lib, bundlerUpdateScript }: bundlerEnv rec { name = "${pname}-${version}"; @@ -8,11 +8,13 @@ bundlerEnv rec { inherit ruby; gemdir = ./.; + passthru.updateScript = bundlerUpdateScript pname; + meta = with lib; { description = "A tool to validate HTML files"; homepage = "https://github.com/gjtorikian/html-proofer"; license = licenses.mit; - maintainers = with maintainers; [ primeos ]; + maintainers = with maintainers; [ ]; platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/tools/misc/html-proofer/gemset.nix b/nixpkgs/pkgs/tools/misc/html-proofer/gemset.nix index 92ce4b8bf82c..d05e096f78d8 100644 --- a/nixpkgs/pkgs/tools/misc/html-proofer/gemset.nix +++ b/nixpkgs/pkgs/tools/misc/html-proofer/gemset.nix @@ -37,10 +37,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bz0041fizdmggc5k9an4s3qk6diyybn2agcia2wr96vymfb2qjh"; + sha256 = "0i5anzj9lp2m6bvghcbz16dlv5ww2mcwgkfj878mamgvb2pfk2m9"; type = "gem"; }; - version = "3.18.5"; + version = "3.18.8"; }; mercenary = { groups = ["default"]; @@ -57,21 +57,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15zplpfw3knqifj9bpf604rb3wc1vhq6363pd6lvhayng8wql5vy"; + sha256 = "1hdbpmamx8js53yk3h8cqy12kgv6ca06k0c9n3pxh6b6cjfs19x7"; type = "gem"; }; - version = "2.4.0"; + version = "2.5.0"; }; nokogiri = { - dependencies = ["mini_portile2"]; + dependencies = ["mini_portile2" "racc"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xmf60nj5kg9vaj5bysy308687sgmkasgx06vbbnf94p52ih7si2"; + sha256 = "1ajwkqr28hwqbyl1l3czx4a34c88acxywyqp8cjyy0zgsd6sbhj2"; type = "gem"; }; - version = "1.10.10"; + version = "1.11.1"; }; nokogumbo = { dependencies = ["nokogiri"]; @@ -104,6 +104,16 @@ }; version = "4.0.6"; }; + racc = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "178k7r0xn689spviqzhvazzvxfq6fyjldxb3ywjbgipbfi4s8j1g"; + type = "gem"; + }; + version = "1.5.2"; + }; rainbow = { groups = ["default"]; platforms = []; diff --git a/nixpkgs/pkgs/tools/misc/i3minator/default.nix b/nixpkgs/pkgs/tools/misc/i3minator/default.nix index 6e207ce69166..4db029ef8fa2 100644 --- a/nixpkgs/pkgs/tools/misc/i3minator/default.nix +++ b/nixpkgs/pkgs/tools/misc/i3minator/default.nix @@ -1,6 +1,6 @@ -{ lib, fetchFromGitHub, pythonPackages, glibcLocales }: +{ lib, fetchFromGitHub, python3Packages, glibcLocales }: -pythonPackages.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "i3minator"; version = "0.0.4"; @@ -13,7 +13,7 @@ pythonPackages.buildPythonApplication rec { LC_ALL = "en_US.UTF-8"; buildInputs = [ glibcLocales ]; - propagatedBuildInputs = [ pythonPackages.pyyaml pythonPackages.i3-py ]; + propagatedBuildInputs = [ python3Packages.pyyaml python3Packages.i3-py ]; # No tests doCheck = false; diff --git a/nixpkgs/pkgs/tools/misc/ix/default.nix b/nixpkgs/pkgs/tools/misc/ix/default.nix index ed47e477854c..83d8a7704192 100644 --- a/nixpkgs/pkgs/tools/misc/ix/default.nix +++ b/nixpkgs/pkgs/tools/misc/ix/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { sha256 = "0xc2s4s1aq143zz8lgkq5k25dpf049dw253qxiav5k7d7qvzzy57"; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; phases = [ "installPhase" "fixupPhase" ]; diff --git a/nixpkgs/pkgs/tools/misc/jdiskreport/default.nix b/nixpkgs/pkgs/tools/misc/jdiskreport/default.nix index 117199617e14..abd8398601cd 100644 --- a/nixpkgs/pkgs/tools/misc/jdiskreport/default.nix +++ b/nixpkgs/pkgs/tools/misc/jdiskreport/default.nix @@ -18,8 +18,7 @@ stdenv.mkDerivation { sha256 = "0d5mzkwsbh9s9b1vyvpaawqc09b0q41l2a7pmwf7386b1fsx6d58"; }; - nativeBuildInputs = [ copyDesktopItems ]; - buildInputs = [ unzip ]; + nativeBuildInputs = [ copyDesktopItems unzip ]; inherit jre; installPhase = '' diff --git a/nixpkgs/pkgs/tools/misc/jdupes/default.nix b/nixpkgs/pkgs/tools/misc/jdupes/default.nix index c42abee5e23f..d06fc7aef69a 100644 --- a/nixpkgs/pkgs/tools/misc/jdupes/default.nix +++ b/nixpkgs/pkgs/tools/misc/jdupes/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "jdupes"; - version = "1.19.1"; + version = "1.19.2"; src = fetchFromGitHub { owner = "jbruchon"; repo = "jdupes"; rev = "v${version}"; - sha256 = "sha256-1gx3rStqIxLt/iRgpdp5z7tX1/wA0miZ1y5WTeGQ1Vs="; + sha256 = "sha256-3lWrSybYp3RrUnydosgsNkGQjrk7JvxuxjMslN4cGfk="; # Unicode file names lead to different checksums on HFS+ vs. other # filesystems because of unicode normalisation. The testdir # directories have such files and will be removed. diff --git a/nixpkgs/pkgs/tools/misc/kak-lsp/default.nix b/nixpkgs/pkgs/tools/misc/kak-lsp/default.nix index 1c2d7ab6717b..51134e48c041 100644 --- a/nixpkgs/pkgs/tools/misc/kak-lsp/default.nix +++ b/nixpkgs/pkgs/tools/misc/kak-lsp/default.nix @@ -1,19 +1,19 @@ -{ stdenv, lib, darwin, fetchFromGitHub, rustPlatform }: +{ stdenv, lib, fetchFromGitHub, rustPlatform, Security }: rustPlatform.buildRustPackage rec { pname = "kak-lsp"; - version = "8.0.0"; + version = "9.0.0"; src = fetchFromGitHub { - owner = "ul"; + owner = pname; repo = pname; rev = "v${version}"; - sha256 = "0nka51szivwhlfkimjiyzj67nxh75m784c28ass6ihlfax631w9m"; + sha256 = "1wfv2fy5ga6kc51zka3pak0hq97csm2l11bz74w3n1hrf5q9nnf8"; }; - cargoSha256 = "174qy50m9487vv151vm8q6sby79dq3gbqjbz6h4326jwsc9wwi8c"; + cargoSha256 = "0g67s6n45rxvv1q5s7x5ajh5n16p68bhlsrsjp46qamrraz63d68"; - buildInputs = lib.optional stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; + buildInputs = lib.optional stdenv.isDarwin [ Security ]; meta = with lib; { description = "Kakoune Language Server Protocol Client"; diff --git a/nixpkgs/pkgs/tools/misc/kanshi/default.nix b/nixpkgs/pkgs/tools/misc/kanshi/default.nix deleted file mode 100644 index 90ee2a3446b5..000000000000 --- a/nixpkgs/pkgs/tools/misc/kanshi/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, scdoc, wayland }: - -stdenv.mkDerivation rec { - pname = "kanshi"; - version = "1.1.0"; - - src = fetchFromGitHub { - owner = "emersion"; - repo = "kanshi"; - rev = "v${version}"; - sha256 = "0nbpgm8qnn7ljsg9vgs35kl8l4rrk542vdcbx8wrn9r909ld3x92"; - }; - - nativeBuildInputs = [ meson ninja pkg-config scdoc ]; - buildInputs = [ wayland ]; - - meta = with lib; { - description = "Dynamic display configuration tool"; - longDescription = '' - kanshi allows you to define output profiles that are automatically enabled - and disabled on hotplug. For instance, this can be used to turn a laptop's - internal screen off when docked. - - kanshi can be used on Wayland compositors supporting the - wlr-output-management protocol. - ''; - homepage = "https://github.com/emersion/kanshi"; - downloadPage = "https://github.com/emersion/kanshi"; - license = licenses.mit; - maintainers = with maintainers; [ balsoft ]; - platforms = platforms.linux; - }; -} diff --git a/nixpkgs/pkgs/tools/misc/kargo/default.nix b/nixpkgs/pkgs/tools/misc/kargo/default.nix index 8c24848f4b59..34b93403487c 100644 --- a/nixpkgs/pkgs/tools/misc/kargo/default.nix +++ b/nixpkgs/pkgs/tools/misc/kargo/default.nix @@ -31,7 +31,7 @@ buildPythonApplication rec { meta = with lib; { homepage = "https://github.com/kubespray/kargo-cli"; description = "A tool helps to deploy a kubernetes cluster with Ansible"; - platforms = platforms.linux; + platforms = platforms.all; license = licenses.gpl3; maintainers = with maintainers; [ ]; }; diff --git a/nixpkgs/pkgs/tools/misc/keychain/default.nix b/nixpkgs/pkgs/tools/misc/keychain/default.nix index 49b3ffbb7dde..61abb3eee105 100644 --- a/nixpkgs/pkgs/tools/misc/keychain/default.nix +++ b/nixpkgs/pkgs/tools/misc/keychain/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { sha256 = "1bkjlg0a2bbdjhwp37ci1rwikvrl4s3xlbf2jq2z4azc96dr83mj"; }; - buildInputs = [ makeWrapper perl ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ perl ]; installPhase = '' mkdir -p $out/{bin,share/man/man1} diff --git a/nixpkgs/pkgs/tools/misc/krapslog/default.nix b/nixpkgs/pkgs/tools/misc/krapslog/default.nix new file mode 100644 index 000000000000..4574d6c3534a --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/krapslog/default.nix @@ -0,0 +1,22 @@ +{ lib, rustPlatform, fetchFromGitHub }: + +rustPlatform.buildRustPackage rec { + pname = "krapslog"; + version = "0.1.2"; + + src = fetchFromGitHub { + owner = "acj"; + repo = "krapslog-rs"; + rev = version; + sha256 = "1yllvy3z3115aqxhnjn9rq2z67rgf2w53naygnl6ixpjhpafcr3k"; + }; + + cargoSha256 = "05gvl6yiyibcdscdf9a6k28xizdr5kfqbhynfbjny2hpqqjmnxzl"; + + meta = with lib; { + description = "Visualize a log file with sparklines"; + homepage = "https://github.com/acj/krapslog-rs"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ yanganto ]; + }; +} diff --git a/nixpkgs/pkgs/tools/misc/lazydocker/default.nix b/nixpkgs/pkgs/tools/misc/lazydocker/default.nix index ed186772ab78..2a63074c8d71 100644 --- a/nixpkgs/pkgs/tools/misc/lazydocker/default.nix +++ b/nixpkgs/pkgs/tools/misc/lazydocker/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "lazydocker"; - version = "0.10"; + version = "0.12"; src = fetchFromGitHub { owner = "jesseduffield"; repo = "lazydocker"; rev = "v${version}"; - sha256 = "04j5bcsxm2yf74zkphnjrg8j3w0v6bsny8sg2k4gbisgshl1i3p8"; + sha256 = "sha256-bpc83DFAyrAQ3VI9saYe+10ZQqOHgscerRKRyjfYD4g="; }; goPackagePath = "github.com/jesseduffield/lazydocker"; diff --git a/nixpkgs/pkgs/tools/misc/lbdb/default.nix b/nixpkgs/pkgs/tools/misc/lbdb/default.nix index d33cdbacb15e..fd8b805743ac 100644 --- a/nixpkgs/pkgs/tools/misc/lbdb/default.nix +++ b/nixpkgs/pkgs/tools/misc/lbdb/default.nix @@ -19,7 +19,8 @@ stdenv.mkDerivation { sha256 = "1gr5l2fr9qbdccga8bhsrpvz6jxigvfkdxrln9wyf2xpps5cdjxh"; }; - buildInputs = [ goobook makeWrapper perl ConvertASN1 perlldap AuthenSASL ] + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ goobook perl ConvertASN1 perlldap AuthenSASL ] ++ optional (!stdenv.isDarwin) finger_bsd ++ optional (abook != null) abook ++ optional (gnupg != null) gnupg diff --git a/nixpkgs/pkgs/tools/misc/ldapvi/default.nix b/nixpkgs/pkgs/tools/misc/ldapvi/default.nix index 9b57a295de0f..759e86080903 100644 --- a/nixpkgs/pkgs/tools/misc/ldapvi/default.nix +++ b/nixpkgs/pkgs/tools/misc/ldapvi/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { ''; homepage = "http://www.lichteblau.com/ldapvi/"; license = licenses.gpl2; - maintainers = with maintainers; [ domenkozar ]; + maintainers = with maintainers; [ ]; platforms = lib.platforms.linux; }; } diff --git a/nixpkgs/pkgs/tools/misc/lf/default.nix b/nixpkgs/pkgs/tools/misc/lf/default.nix index ec002ae4232b..7ec9d0d407a4 100644 --- a/nixpkgs/pkgs/tools/misc/lf/default.nix +++ b/nixpkgs/pkgs/tools/misc/lf/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "lf"; - version = "20"; + version = "21"; src = fetchFromGitHub { owner = "gokcehan"; repo = "lf"; rev = "r${version}"; - sha256 = "056g2g503ppbqqbq5nk90sl8ki1q4fixdc25a6wv15gm1inxrb4b"; + sha256 = "0j7c21lsgcc39ng9ni94y3zfcqwyf9jc52fi8mcpkp0lpcx5ava9"; }; - vendorSha256 = "12njqs39ympi2mqal1cdn0smp80yzcs8xmca1iih8pbmxv51r2gg"; + vendorSha256 = "15fl9v69wkzwzpq6x4xhcd5g6xyck3mlpbz1bbb61l75jjzg913m"; nativeBuildInputs = [ installShellFiles ]; diff --git a/nixpkgs/pkgs/tools/misc/libcpuid/default.nix b/nixpkgs/pkgs/tools/misc/libcpuid/default.nix index cb02d87e22ad..8c4cb5c1a759 100644 --- a/nixpkgs/pkgs/tools/misc/libcpuid/default.nix +++ b/nixpkgs/pkgs/tools/misc/libcpuid/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libcpuid"; - version = "0.5.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "anrieff"; repo = "libcpuid"; rev = "v${version}"; - sha256 = "13v5x8gyka2v4kx52khwalb6ai328z7kk9jlipbbbys63p6nyddr"; + sha256 = "sha256-m10LdtwBk1Lx31AJ4HixEYaCkT7EHpF9+tOV1rSA6VU="; }; patches = [ diff --git a/nixpkgs/pkgs/tools/misc/librespeed-cli/default.nix b/nixpkgs/pkgs/tools/misc/librespeed-cli/default.nix new file mode 100644 index 000000000000..d2396f0086c4 --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/librespeed-cli/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "librespeed-cli"; + version = "1.0.7"; + + src = fetchFromGitHub { + owner = "librespeed"; + repo = "speedtest-cli"; + rev = "v${version}"; + sha256 = "03bhxx33fy1cgp83anm51fm8v079v0az0d0p785dz98jg14vzibl"; + }; + + vendorSha256 = "1kccxmmzbkzbrxypcrz0j1zz51c0q1d5hh25lcpfbkm3498mj02c"; + + # Tests have additonal requirements + doCheck = false; + + meta = with lib; { + description = "Command line client for LibreSpeed"; + homepage = "https://github.com/librespeed/speedtest-cli"; + license = with licenses; [ lgpl3Only ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/tools/misc/lice/default.nix b/nixpkgs/pkgs/tools/misc/lice/default.nix index 3322196d6ed5..4cb3f794fd48 100644 --- a/nixpkgs/pkgs/tools/misc/lice/default.nix +++ b/nixpkgs/pkgs/tools/misc/lice/default.nix @@ -1,18 +1,17 @@ -{ lib, fetchFromGitHub, python3Packages }: +{ lib, buildPythonPackage, fetchPypi , setuptools, pytestCheckHook }: -python3Packages.buildPythonPackage rec { +buildPythonPackage rec { + pname = "lice"; + version = "0.6"; - version = "0.4"; - name = "lice-${version}"; - - src = fetchFromGitHub { - owner = "licenses"; - repo = "lice"; - rev = version; - sha256 = "0yxf70fi8ds3hmwjply2815k466r99k8n22r0ppfhwjvp3rn60qx"; - fetchSubmodules = true; + src = fetchPypi { + inherit pname version; + sha256 = "0skyyirbidknfdzdvsjga8zb4ar6xpd5ilvz11dfm2a9yxh3d59d"; }; + propagatedBuildInputs = [ setuptools ]; + + checkInputs = [ pytestCheckHook ]; meta = with lib; { description = "Print license based on selection and user options"; homepage = "https://github.com/licenses/lice"; diff --git a/nixpkgs/pkgs/tools/misc/lifecycled/default.nix b/nixpkgs/pkgs/tools/misc/lifecycled/default.nix new file mode 100644 index 000000000000..1c30b760a9c8 --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/lifecycled/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: +buildGoModule rec { + pname = "lifecycled"; + version = "3.1.0"; + + src = fetchFromGitHub { + owner = "buildkite"; + repo = "lifecycled"; + rev = "v${version}"; + sha256 = "F9eovZpwbigP0AMdjAIxULPLDC3zO6GxQmPdt5Xvpkk="; + }; + + vendorSha256 = "q5wYKSLHRzL+UGn29kr8+mUupOPR1zohTscbzjMRCS0="; + + postInstall = '' + mkdir -p $out/lib/systemd/system + substitute init/systemd/lifecycled.unit $out/lib/systemd/system/lifecycled.service \ + --replace /usr/bin/lifecycled $out/bin/lifecycled + ''; + + meta = with lib; { + description = "A daemon for responding to AWS AutoScaling Lifecycle Hooks"; + homepage = "https://github.com/buildkite/lifecycled/"; + license = licenses.mit; + maintainers = with maintainers; [ cole-h grahamc ]; + }; +} + diff --git a/nixpkgs/pkgs/tools/misc/logstash/6.x.nix b/nixpkgs/pkgs/tools/misc/logstash/6.x.nix index 97ee5b2ed3f3..1c7ab29cbc86 100644 --- a/nixpkgs/pkgs/tools/misc/logstash/6.x.nix +++ b/nixpkgs/pkgs/tools/misc/logstash/6.x.nix @@ -3,12 +3,13 @@ , lib, stdenv , fetchurl , makeWrapper +, nixosTests , jre }: with lib; -stdenv.mkDerivation rec { +let this = stdenv.mkDerivation rec { version = elk6Version; name = "logstash-${optionalString (!enableUnfree) "oss-"}${version}"; @@ -52,4 +53,12 @@ stdenv.mkDerivation rec { platforms = platforms.unix; maintainers = with maintainers; [ wjlroe offline basvandijk ]; }; -} + passthru.tests = + optionalAttrs (!enableUnfree) ( + assert this.drvPath == nixosTests.elk.ELK-6.elkPackages.logstash.drvPath; + { + elk = nixosTests.elk.ELK-6; + } + ); +}; +in this diff --git a/nixpkgs/pkgs/tools/misc/logstash/7.x.nix b/nixpkgs/pkgs/tools/misc/logstash/7.x.nix index 0817a7ab087e..1abc0ff9bf82 100644 --- a/nixpkgs/pkgs/tools/misc/logstash/7.x.nix +++ b/nixpkgs/pkgs/tools/misc/logstash/7.x.nix @@ -3,12 +3,13 @@ , lib, stdenv , fetchurl , makeWrapper +, nixosTests , jre }: with lib; -stdenv.mkDerivation rec { +let this = stdenv.mkDerivation rec { version = elk7Version; name = "logstash-${optionalString (!enableUnfree) "oss-"}${version}"; @@ -52,4 +53,12 @@ stdenv.mkDerivation rec { platforms = platforms.unix; maintainers = with maintainers; [ wjlroe offline basvandijk ]; }; -} + passthru.tests = + optionalAttrs (!enableUnfree) ( + assert this.drvPath == nixosTests.elk.ELK-7.elkPackages.logstash.drvPath; + { + elk = nixosTests.elk.ELK-7; + } + ); +}; +in this diff --git a/nixpkgs/pkgs/tools/misc/lokalise2-cli/default.nix b/nixpkgs/pkgs/tools/misc/lokalise2-cli/default.nix index ad1210e95404..6c1f1759084e 100644 --- a/nixpkgs/pkgs/tools/misc/lokalise2-cli/default.nix +++ b/nixpkgs/pkgs/tools/misc/lokalise2-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "lokalise2-cli"; - version = "2.6.3"; + version = "2.6.4"; src = fetchFromGitHub { owner = "lokalise"; repo = "lokalise-cli-2-go"; rev = "v${version}"; - sha256 = "sha256-3kDaaPDRbhJyp/CblTKhB0dUeOjroCs3WkjEXL87Od4="; + sha256 = "sha256-D/I1I7r3IuDz1MZZrzKVMhdLIZxbN2bYeGmqJVlUU6g="; }; vendorSha256 = "sha256-iWYlbGeLp/SiF8/OyWGIHJQB1RJjma9/EDc3zOsjNG8="; diff --git a/nixpkgs/pkgs/tools/misc/lorri/default.nix b/nixpkgs/pkgs/tools/misc/lorri/default.nix index 951cb8b5caa9..9635b6b42385 100644 --- a/nixpkgs/pkgs/tools/misc/lorri/default.nix +++ b/nixpkgs/pkgs/tools/misc/lorri/default.nix @@ -1,37 +1,28 @@ -{ lib, stdenv +{ lib +, stdenv , pkgs +, rustPackages , fetchFromGitHub , rustPlatform - # Updater script -, runtimeShell , writers - # Tests , nixosTests - # Apple dependencies , CoreServices , Security }: let # Run `eval $(nix-build -A lorri.updater)` after updating the revision! - version = "1.2"; - gitRev = "43a260c221d5dac4a44fd82271736c8444474eec"; - sha256 = "0g6zq27dpr8bdan5xrqchybpbqwnhhc7x8sxbfygigbqd3xv9i6n"; - cargoSha256 = "1zmlp14v7av0znmjyy2aq83lc74503p6r0l11l9iw7s3xad8rda4"; + version = "1.3.1"; + gitRev = "df83b9b175fecc8ec8b02096c5cfe2db3d00b92e"; + sha256 = "1df6p0b482vhymw3z7gimc441jr7aix9lhdbcm5wjvw9f276016f"; + cargoSha256 = "1f9b2h3zakw7qmlnc4rqhxnw80sl5h4mj8cghr82iacxwqz499ql"; in (rustPlatform.buildRustPackage rec { pname = "lorri"; inherit version; - meta = with lib; { - description = "Your project's nix-env"; - homepage = "https://github.com/target/lorri"; - license = licenses.asl20; - maintainers = with maintainers; [ grahamc Profpatsch ]; - }; - src = fetchFromGitHub { - owner = "target"; + owner = "nix-community"; repo = pname; rev = gitRev; inherit sha256; @@ -43,11 +34,10 @@ in (rustPlatform.buildRustPackage rec { doCheck = false; BUILD_REV_COUNT = src.revCount or 1; - RUN_TIME_CLOSURE = pkgs.callPackage ./runtime.nix {}; + RUN_TIME_CLOSURE = pkgs.callPackage ./runtime.nix { }; - nativeBuildInputs = with pkgs; [ rustPackages.rustfmt ]; - buildInputs = - lib.optionals stdenv.isDarwin [ CoreServices Security ]; + nativeBuildInputs = [ rustPackages.rustfmt ]; + buildInputs = lib.optionals stdenv.isDarwin [ CoreServices Security ]; # copy the docs to the $man and $doc outputs postInstall = '' @@ -70,4 +60,11 @@ in (rustPlatform.buildRustPackage rec { nixos = nixosTests.lorri; }; }; + + meta = with lib; { + description = "Your project's nix-env"; + homepage = "https://github.com/target/lorri"; + license = licenses.asl20; + maintainers = with maintainers; [ grahamc Profpatsch ]; + }; }) diff --git a/nixpkgs/pkgs/tools/misc/lsd/default.nix b/nixpkgs/pkgs/tools/misc/lsd/default.nix index c3c9fab8c1ed..212cc997e768 100644 --- a/nixpkgs/pkgs/tools/misc/lsd/default.nix +++ b/nixpkgs/pkgs/tools/misc/lsd/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "lsd"; - version = "0.19.0"; + version = "0.20.1"; src = fetchFromGitHub { owner = "Peltoche"; repo = pname; rev = version; - sha256 = "1iiczdsqw0i6cz492177z6lr8s7fikn151j8p76fmr77zk0bm6q2"; + sha256 = "sha256-r/Rllu+tgKqz+vkxA8BSN+3V0lUUd6dEATfickQp4+s="; }; - cargoSha256 = "1r2mkpicsyihlrim3bnmscgg5rnaijpvgq8c846zqj7ly8v8qqvg"; + cargoSha256 = "sha256-ZK4kKdW+TqT0NXzB1wtQwJA78cVRxvEoqImOIqLldvM="; nativeBuildInputs = [ installShellFiles ]; postInstall = '' @@ -32,6 +32,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/Peltoche/lsd"; description = "The next gen ls command"; license = licenses.asl20; - maintainers = with maintainers; [ Br1ght0ne marsam zowoq ]; + maintainers = with maintainers; [ Br1ght0ne marsam zowoq SuperSandro2000 ]; }; } diff --git a/nixpkgs/pkgs/tools/misc/man-db/default.nix b/nixpkgs/pkgs/tools/misc/man-db/default.nix index 44cb6962b8e6..4ac11aa62c1b 100644 --- a/nixpkgs/pkgs/tools/misc/man-db/default.nix +++ b/nixpkgs/pkgs/tools/misc/man-db/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, libpipeline, db, groff, libiconv, makeWrapper, buildPackages }: stdenv.mkDerivation rec { - name = "man-db-2.9.3"; + name = "man-db-2.9.4"; src = fetchurl { url = "mirror://savannah/man-db/${name}.tar.xz"; - sha256 = "1f4palf5bdyf3f8sa0981cqxn9cjcr2pz53ngrrsybb9n0da2nps"; + sha256 = "sha256-tmyZ7frRatkoyIn4fPdjgCY8FgkyPCgLOp5pY/2xZ1Y="; }; outputs = [ "out" "doc" ]; diff --git a/nixpkgs/pkgs/tools/misc/mbuffer/default.nix b/nixpkgs/pkgs/tools/misc/mbuffer/default.nix index 6fdd4a69ebc4..2ab76e8dfd42 100644 --- a/nixpkgs/pkgs/tools/misc/mbuffer/default.nix +++ b/nixpkgs/pkgs/tools/misc/mbuffer/default.nix @@ -3,12 +3,12 @@ } : stdenv.mkDerivation rec { - version = "20200929"; + version = "20210209"; pname = "mbuffer"; src = fetchurl { url = "http://www.maier-komor.de/software/mbuffer/mbuffer-${version}.tgz"; - sha256 = "1s6lxbqba2hwnvrdrwk0fpnff62gv0ynah4ql0c9y14s9v0y79jk"; + sha256 = "sha256-6B8niOJiHyD4SBge8ssZrG0SMoaRQ38wFXSyU/2Jmgw="; }; buildInputs = [ openssl ]; diff --git a/nixpkgs/pkgs/tools/misc/mc/default.nix b/nixpkgs/pkgs/tools/misc/mc/default.nix index d2456a08cbd7..12aa477219b6 100644 --- a/nixpkgs/pkgs/tools/misc/mc/default.nix +++ b/nixpkgs/pkgs/tools/misc/mc/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-xt6txQWV8tmiLcbCmanyizk+NYNG6/bKREqEadwWbCc="; }; - nativeBuildInputs = [ pkg-config autoreconfHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook unzip ]; buildInputs = [ file @@ -39,7 +39,6 @@ stdenv.mkDerivation rec { openssl perl slang - unzip zip ] ++ lib.optionals (!stdenv.isDarwin) [ e2fsprogs gpm ]; diff --git a/nixpkgs/pkgs/tools/misc/mcfly/default.nix b/nixpkgs/pkgs/tools/misc/mcfly/default.nix index 616ee822eba2..55e2b75684ee 100644 --- a/nixpkgs/pkgs/tools/misc/mcfly/default.nix +++ b/nixpkgs/pkgs/tools/misc/mcfly/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "mcfly"; - version = "0.5.3"; + version = "0.5.6"; src = fetchFromGitHub { owner = "cantino"; repo = "mcfly"; rev = "v${version}"; - sha256 = "1p51wdv47cyg6dmb81fm0d92x1kp7bwwpgax6vlh669nkddiwvmm"; + sha256 = "sha256-x2cED+WEc50RB8BxiDEm/XnauT1RqqGjSIdL5MMaFBY="; }; postInstall = '' @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { install -Dm644 -t $out/share/mcfly mcfly.fish ''; - cargoSha256 = "0gcdgca8w8i978b067rwm5zrc81rxb704006k9pbcwizkq2281yy"; + cargoSha256 = "sha256-JCV1cj+RncY/myVJTJ5fNkVqTITqGusA71tv7zGG9Uw="; meta = with lib; { homepage = "https://github.com/cantino/mcfly"; diff --git a/nixpkgs/pkgs/tools/misc/mcrypt/malloc_to_stdlib.patch b/nixpkgs/pkgs/tools/misc/mcrypt/malloc_to_stdlib.patch index e92f5a46ae7e..6bead60dc56b 100755 --- a/nixpkgs/pkgs/tools/misc/mcrypt/malloc_to_stdlib.patch +++ b/nixpkgs/pkgs/tools/misc/mcrypt/malloc_to_stdlib.patch @@ -1,5 +1,5 @@ From e295844e8ef5c13487996ab700e5f12a7fadb1a6 Mon Sep 17 00:00:00 2001 -From: Nima Vasseghi <nmv@fb.com> +From: Private <private@private.priv> Date: Wed, 30 Dec 2020 16:06:46 -0800 Subject: [PATCH] malloc.h to stdlib.h in rfc2440.c diff --git a/nixpkgs/pkgs/tools/misc/megacli/default.nix b/nixpkgs/pkgs/tools/misc/megacli/default.nix index 7cf1e14dc18e..3f86a073c096 100644 --- a/nixpkgs/pkgs/tools/misc/megacli/default.nix +++ b/nixpkgs/pkgs/tools/misc/megacli/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "1sdn58fbmd3fj4nzbajq3gcyw71ilgdh45r5p4sa6xmb7np55cfr"; }; - buildInputs = [rpmextract ncurses5 unzip]; + nativeBuildInputs = [ unzip ]; + buildInputs = [rpmextract ncurses5]; libPath = lib.makeLibraryPath [ stdenv.cc.cc stdenv.cc.libc ncurses5 ]; diff --git a/nixpkgs/pkgs/tools/misc/memtest86-efi/default.nix b/nixpkgs/pkgs/tools/misc/memtest86-efi/default.nix index dc29aad2a549..125f8f35acca 100644 --- a/nixpkgs/pkgs/tools/misc/memtest86-efi/default.nix +++ b/nixpkgs/pkgs/tools/misc/memtest86-efi/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { pname = "memtest86-efi"; - version = "8.3"; + version = "8.4"; src = fetchzip { # TODO: We're using the previous version of memtest86 because the @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { # binaries that we make sure to version, then we could probably keep up # with the latest versions released by the company. url = "https://www.memtest86.com/downloads/memtest86-${version}-usb.zip"; - sha256 = "0aldz7rvnfnzb4h447q10k9c9p5ghwzdyn7f6g5lrxiv5vxf3x96"; + sha256 = "sha256-jh4FKCYZbOQhRv6B7N8Hmw6RQCQvbBGaGFTMLwM1nk8="; stripRoot = false; }; @@ -35,6 +35,8 @@ stdenv.mkDerivation rec { ]; installPhase = '' + runHook preInstall + # memtest86 is distributed as a bootable USB image. It contains the actual # memtest86 EFI app. # @@ -50,6 +52,8 @@ stdenv.mkDerivation rec { ') mkdir $out mcopy -vsi $IMG@@$ESP_OFFSET ::'/EFI/BOOT/*' $out/ + + runHook postInstall ''; meta = with lib; { diff --git a/nixpkgs/pkgs/tools/misc/microplane/default.nix b/nixpkgs/pkgs/tools/misc/microplane/default.nix index e6945f051298..66717912599f 100644 --- a/nixpkgs/pkgs/tools/misc/microplane/default.nix +++ b/nixpkgs/pkgs/tools/misc/microplane/default.nix @@ -1,27 +1,17 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "microplane"; - version = "0.0.26"; + version = "0.0.28"; src = fetchFromGitHub { owner = "Clever"; repo = "microplane"; rev = "v${version}"; - sha256 = "0dba8cz13ljcsfibcwycd9vb759fzlllh2bv31vgbs2pjgcinzvm"; + sha256 = "00ayci0a4lv67sg2bb4fw5wpdlps4pjqiiam595dar82lsjwj63j"; }; - goPackagePath = "github.com/Clever/microplane"; - - subPackages = ["."]; - - # Regenerate deps.nix with the following steps: - # git clone git@github.com:Clever/microplane.git - # cd microplane - # git checkout v<version> - # dep2nix - - goDeps = ./deps.nix; + vendorSha256 = "0hn2gsm9bgmrm620fn2cx28l2gj1yfgvjix9ds50m7kwkx6q0dga"; buildFlagsArray = '' -ldflags="-s -w -X main.version=v${version}" diff --git a/nixpkgs/pkgs/tools/misc/microplane/deps.nix b/nixpkgs/pkgs/tools/misc/microplane/deps.nix deleted file mode 100644 index 2c8266c2dc6e..000000000000 --- a/nixpkgs/pkgs/tools/misc/microplane/deps.nix +++ /dev/null @@ -1,228 +0,0 @@ -# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix) -[ - { - goPackagePath = "github.com/cpuguy83/go-md2man"; - fetch = { - type = "git"; - url = "https://github.com/cpuguy83/go-md2man"; - rev = "1d903dcb749992f3741d744c0f8376b4bd7eb3e1"; - sha256 = "1p1ncq4vv244w9v144vplsb2vbl3369wdxn4gc7xbfafkjwn8bxc"; - }; - } - { - goPackagePath = "github.com/davecgh/go-spew"; - fetch = { - type = "git"; - url = "https://github.com/davecgh/go-spew"; - rev = "346938d642f2ec3594ed81d874461961cd0faa76"; - sha256 = "0d4jfmak5p6lb7n2r6yvf5p1zcw0l8j74kn55ghvr7zr7b7axm6c"; - }; - } - { - goPackagePath = "github.com/facebookgo/errgroup"; - fetch = { - type = "git"; - url = "https://github.com/facebookgo/errgroup"; - rev = "779c8d7ef069c522bc72ee5f31a98d89a37f3fb6"; - sha256 = "1kyqrnvr158f5lgb1pbianjd8xnmxxvpgz7qilmp7zvr69gykbas"; - }; - } - { - goPackagePath = "github.com/fatih/color"; - fetch = { - type = "git"; - url = "https://github.com/fatih/color"; - rev = "570b54cabe6b8eb0bc2dfce68d964677d63b5260"; - sha256 = "1hw9hgkfzbzqjhy29pqpk20xggxaqjv45wx8yn69488mw5ph7khh"; - }; - } - { - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "130e6b02ab059e7b717a096f397c5b60111cae74"; - sha256 = "0zk4d7gcykig9ld8f5h86fdxshm2gs93a2xkpf52jd5m4z59q26s"; - }; - } - { - goPackagePath = "github.com/google/go-github"; - fetch = { - type = "git"; - url = "https://github.com/google/go-github"; - rev = "e881974953e6ab6d1a6a1610e98ed6401a3aa1ba"; - sha256 = "0qaxcm2p655r1jd59rv1hd58driadw5hxlfy7h53c7pzcsmf2546"; - }; - } - { - goPackagePath = "github.com/google/go-querystring"; - fetch = { - type = "git"; - url = "https://github.com/google/go-querystring"; - rev = "53e6ce116135b80d037921a7fdd5138cf32d7a8a"; - sha256 = "0lkbm067nhmxk66pyjx59d77dbjjzwyi43gdvzyx2f8m1942rq7f"; - }; - } - { - goPackagePath = "github.com/inconshreveable/mousetrap"; - fetch = { - type = "git"; - url = "https://github.com/inconshreveable/mousetrap"; - rev = "76626ae9c91c4f2a10f34cad8ce83ea42c93bb75"; - sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152"; - }; - } - { - goPackagePath = "github.com/juju/errors"; - fetch = { - type = "git"; - url = "https://github.com/juju/errors"; - rev = "c7d06af17c68cd34c835053720b21f6549d9b0ee"; - sha256 = "1dmj8wkpmkw4z4c7wmnscs4ykrcv7p8lgwb75g5akahwqjaf9zcp"; - }; - } - { - goPackagePath = "github.com/mattn/go-colorable"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-colorable"; - rev = "167de6bfdfba052fa6b2d3664c8f5272e23c9072"; - sha256 = "1nwjmsppsjicr7anq8na6md7b1z84l9ppnlr045hhxjvbkqwalvx"; - }; - } - { - goPackagePath = "github.com/mattn/go-isatty"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-isatty"; - rev = "0360b2af4f38e8d38c7fce2a9f4e702702d73a39"; - sha256 = "06w45aqz2a6yrk25axbly2k5wmsccv8cspb94bfmz4izvw8h927n"; - }; - } - { - goPackagePath = "github.com/nathanleiby/diffparser"; - fetch = { - type = "git"; - url = "https://github.com/nathanleiby/diffparser"; - rev = "936553ce5db1b73e63cbcd7546416d13538e8d85"; - sha256 = "0qlxkbda4l1glwxdy52fhk3bqkyyc55si4xplf54jpi2x9khi2v4"; - }; - } - { - goPackagePath = "github.com/pmezard/go-difflib"; - fetch = { - type = "git"; - url = "https://github.com/pmezard/go-difflib"; - rev = "792786c7400a136282c1664665ae0a8db921c6c2"; - sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; - }; - } - { - goPackagePath = "github.com/russross/blackfriday"; - fetch = { - type = "git"; - url = "https://github.com/russross/blackfriday"; - rev = "4048872b16cc0fc2c5fd9eacf0ed2c2fedaa0c8c"; - sha256 = "17zg26ia43c8axrxp5q2bxh1asiqfhin4ah7h5d8ibil6pv7xbx4"; - }; - } - { - goPackagePath = "github.com/spf13/cobra"; - fetch = { - type = "git"; - url = "https://github.com/spf13/cobra"; - rev = "7b2c5ac9fc04fc5efafb60700713d4fa609b777b"; - sha256 = "0k4xswdfd2ridj7m48ijb4klq9mxpw03g8h2rvq99yddi8vmlbvn"; - }; - } - { - goPackagePath = "github.com/spf13/pflag"; - fetch = { - type = "git"; - url = "https://github.com/spf13/pflag"; - rev = "e57e3eeb33f795204c1ca35f56c44f83227c6e66"; - sha256 = "13mhx4i913jil32j295m3a36jzvq1y64xig0naadiz7q9ja011r2"; - }; - } - { - goPackagePath = "github.com/stretchr/testify"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/testify"; - rev = "69483b4bd14f5845b5a1e55bca19e954e827f1d0"; - sha256 = "11lzrwkdzdd8yyag92akncc008h2f9d1bpc489mxiwp0jrmz4ivb"; - }; - } - { - goPackagePath = "github.com/xanzy/go-gitlab"; - fetch = { - type = "git"; - url = "https://github.com/xanzy/go-gitlab"; - rev = "ee3313ca5478c4786248d63dd75e4cd8e1fad2db"; - sha256 = "0xbn94rb9ihpw1g698xbz9vdl7393z9zbb0lck52nxs838gkr4mb"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "5c72a883971a4325f8c62bf07b6d38c20ea47a6a"; - sha256 = "1cimmqpajys001x6yq8ycklc4w34y7iwrksv7ayv7m7fgzhcjn3d"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "aabf50738bcdd9b207582cbe796b59ed65d56680"; - sha256 = "0gq60lfzbyc6ggp5v3vbl6li818nmv0n32l9qf80ckpqpqkknkh5"; - }; - } - { - goPackagePath = "golang.org/x/oauth2"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/oauth2"; - rev = "bb50c06baba3d0c76f9d125c0719093e315b5b44"; - sha256 = "19fkbykwjhwa0833cqcphv7sfwc1538ad5wlsdkgdwr59qb9d32i"; - }; - } - { - goPackagePath = "golang.org/x/sync"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sync"; - rev = "09787c993a3ab68e3d1f5c9b2394ab9433f391be"; - sha256 = "1nv4mwi9njkkyc7lwmxrjr8ggfh2cf1c67a9bq85dnss81vpj61y"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "28a7276518d399b9634904daad79e18b44d481bc"; - sha256 = "0qsj394qyy27iaf8srl7bkbsx7sp4aifrv3z2xllkydya8y18rv8"; - }; - } - { - goPackagePath = "google.golang.org/appengine"; - fetch = { - type = "git"; - url = "https://github.com/golang/appengine"; - rev = "150dc57a1b433e64154302bdc40b6bb8aefa313a"; - sha256 = "0w3knznv39k8bm85ri62f83czcrxknql7dv6p9hk1a5jx3xljgxq"; - }; - } - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://github.com/go-yaml/yaml"; - rev = "eb3733d160e74a9c7e442f435eb3bea458e1d19f"; - sha256 = "1srhvcaa9db3a6xj29mkjr5kg33y71pclrlx4vcwz5m1lgb5c7q6"; - }; - } -] diff --git a/nixpkgs/pkgs/tools/misc/miniserve/default.nix b/nixpkgs/pkgs/tools/misc/miniserve/default.nix index 7fb66e22e98d..1223432ad7da 100644 --- a/nixpkgs/pkgs/tools/misc/miniserve/default.nix +++ b/nixpkgs/pkgs/tools/misc/miniserve/default.nix @@ -1,26 +1,38 @@ -{ lib, stdenv +{ lib +, stdenv , rustPlatform , fetchFromGitHub +, installShellFiles , pkg-config , zlib +, libiconv , Security }: rustPlatform.buildRustPackage rec { pname = "miniserve"; - version = "0.10.4"; + version = "0.13.0"; src = fetchFromGitHub { owner = "svenstaro"; repo = "miniserve"; rev = "v${version}"; - sha256 = "0hskb72gnp66vkyxsqnxhjcqgvjj7wbd2nm5wxp94abc5l1fiigv"; + sha256 = "sha256-1nXhAYvvvUQb0RcWidsRMQOhU8eXt7ngzodsMkYvqvg="; }; - cargoSha256 = "0s1gdngpf6gxz2lyapblxxmc6aydg2i9kmrfvngkbmqh4as1a2vl"; + cargoSha256 = "sha256-P5ukE7eXBRJMrc7+T9/TMq2uGs0AuZliHTtoqiZXNZw="; - nativeBuildInputs = [ pkg-config zlib ]; - buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + nativeBuildInputs = [ installShellFiles pkg-config zlib ]; + buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; + + checkFlags = [ "--skip=cant_navigate_up_the_root" ]; + + postInstall = '' + installShellCompletion --cmd miniserve \ + --bash <($out/bin/miniserve --print-completions bash) \ + --fish <($out/bin/miniserve --print-completions fish) \ + --zsh <($out/bin/miniserve --print-completions zsh) + ''; meta = with lib; { description = "For when you really just want to serve some files over HTTP right now!"; diff --git a/nixpkgs/pkgs/tools/misc/ministat/default.nix b/nixpkgs/pkgs/tools/misc/ministat/default.nix index 68670599c1ee..0cd3ff3a5c1f 100644 --- a/nixpkgs/pkgs/tools/misc/ministat/default.nix +++ b/nixpkgs/pkgs/tools/misc/ministat/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation rec { homepage = "https://git.decadent.org.uk/gitweb/?p=ministat.git"; license = licenses.beerware; maintainers = [ maintainers.dezgeg ]; - platforms = platforms.linux; + platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/tools/misc/mongodb-compass/default.nix b/nixpkgs/pkgs/tools/misc/mongodb-compass/default.nix index 26056364b774..8ede05104874 100644 --- a/nixpkgs/pkgs/tools/misc/mongodb-compass/default.nix +++ b/nixpkgs/pkgs/tools/misc/mongodb-compass/default.nix @@ -3,7 +3,7 @@ , gnome2, gdk-pixbuf, gtk3, pango, libnotify, libsecret, libuuid, libxcb, nspr, nss, systemd, xorg, wrapGAppsHook }: let - version = "1.23.0"; + version = "1.25.0"; rpath = lib.makeLibraryPath [ alsaLib @@ -49,7 +49,7 @@ let if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { url = "https://downloads.mongodb.com/compass/mongodb-compass_${version}_amd64.deb"; - sha256 = "1kmhki4kq28z8h249p4imcpb0nz2dx5bmpv8ldhhqh3rcq5vzxsv"; + sha256 = "sha256-998/voQ04fLj3KZCy6BueUoI1v++4BoGRTGJT7Nsv40="; } else throw "MongoDB compass is not supported on ${stdenv.hostPlatform.system}"; diff --git a/nixpkgs/pkgs/tools/misc/mons/default.nix b/nixpkgs/pkgs/tools/misc/mons/default.nix index 71a12c887968..920cab1763b8 100644 --- a/nixpkgs/pkgs/tools/misc/mons/default.nix +++ b/nixpkgs/pkgs/tools/misc/mons/default.nix @@ -12,6 +12,16 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; + patches = [ + # Substitute xrandr path with @xrandr@ so we can replace it with + # real path in substituteInPlace + ./xrandr.patch + ]; + + postPatch = '' + substituteInPlace mons.sh --replace '@xrandr@' '${xrandr}/bin/xrandr' + ''; + nativeBuildInputs = [ help2man ]; makeFlags = [ "DESTDIR=$(out)" @@ -22,6 +32,6 @@ stdenv.mkDerivation rec { description = "POSIX Shell script to quickly manage 2-monitors display"; homepage = "https://github.com/Ventto/mons.git"; license = licenses.mit; - maintainers = [ maintainers.mschneider ]; + maintainers = with maintainers; [ mschneider thiagokokada ]; }; } diff --git a/nixpkgs/pkgs/tools/misc/mons/xrandr.patch b/nixpkgs/pkgs/tools/misc/mons/xrandr.patch new file mode 100644 index 000000000000..6cbcdf9d514e --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/mons/xrandr.patch @@ -0,0 +1,14 @@ +diff --git a/mons.sh b/mons.sh +index b86ce5c..feb0f33 100755 +--- a/mons.sh ++++ b/mons.sh +@@ -151,8 +151,7 @@ main() { + # ============================= + + [ -z "$DISPLAY" ] && { echo 'DISPLAY: no variable set.'; exit 1; } +- command -vp xrandr >/dev/null 2>&1 || { echo 'xrandr: command not found.'; exit 1; } +- XRANDR="$(command -pv xrandr)" ++ XRANDR="@xrandr@" + + # ============================= + # Argument Checking diff --git a/nixpkgs/pkgs/tools/misc/moreutils/default.nix b/nixpkgs/pkgs/tools/misc/moreutils/default.nix index ad2d0127ab05..5a1452007af2 100644 --- a/nixpkgs/pkgs/tools/misc/moreutils/default.nix +++ b/nixpkgs/pkgs/tools/misc/moreutils/default.nix @@ -15,12 +15,13 @@ stdenv.mkDerivation rec { substituteInPlace Makefile --replace /usr/share/xml/docbook/stylesheet/docbook-xsl ${docbook-xsl}/xml/xsl/docbook ''; - buildInputs = [ libxml2 libxslt docbook-xsl docbook_xml_dtd_44 makeWrapper ] + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ libxml2 libxslt docbook-xsl docbook_xml_dtd_44 ] ++ optional stdenv.isDarwin darwin.cctools; propagatedBuildInputs = with perlPackages; [ perl IPCRun TimeDate TimeDuration ]; - buildFlags = [ "CC=cc" ]; + buildFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; installFlags = [ "PREFIX=$(out)" ]; postInstall = '' diff --git a/nixpkgs/pkgs/tools/misc/mslink/default.nix b/nixpkgs/pkgs/tools/misc/mslink/default.nix new file mode 100644 index 000000000000..56354ff25275 --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/mslink/default.nix @@ -0,0 +1,30 @@ +{ stdenv +, lib +, fetchurl +}: + +stdenv.mkDerivation rec { + pname = "mslink"; + version = "1.3"; + + src = fetchurl { + url = "http://www.mamachine.org/mslink/mslink_v${version}.tar.gz"; + sha256 = "1qiwqa6w2in6gk4sxiy37c2wwpakin6l2ad2cf5s7ij96z2ijgqg"; + }; + + preBuild = '' + rm mslink # clean up shipped executable + ''; + + installPhase = '' + install -D mslink $out/bin/mslink + ''; + + meta = with lib; { + description = "Create Windows Shortcut Files (.LNK) without using Windows"; + homepage = "http://www.mamachine.org/mslink/index.en.html"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ mkg20001 ]; + platforms = platforms.unix; + }; +} diff --git a/nixpkgs/pkgs/tools/misc/mysqltuner/default.nix b/nixpkgs/pkgs/tools/misc/mysqltuner/default.nix index 783f93daab45..2acbfd41adfe 100644 --- a/nixpkgs/pkgs/tools/misc/mysqltuner/default.nix +++ b/nixpkgs/pkgs/tools/misc/mysqltuner/default.nix @@ -5,23 +5,32 @@ stdenv.mkDerivation rec { version = "1.7.21"; src = fetchFromGitHub { - owner = "major"; - repo = "MySQLTuner-perl"; - rev = version; + owner = "major"; + repo = "MySQLTuner-perl"; + rev = version; sha256 = "sha256-Yv1XjD8sZcmGr2SVD6TEElUH7vspJ61WwQwfXLOrao0="; }; + postPatch = '' + substituteInPlace mysqltuner.pl \ + --replace '/usr/share' "$out/share" + ''; + buildInputs = [ perl ]; installPhase = '' - mkdir -p $out/bin - install -m0755 mysqltuner.pl $out/bin/mysqltuner + runHook preInstall + + install -Dm0555 mysqltuner.pl $out/bin/mysqltuner + install -Dm0444 -t $out/share/mysqltuner basic_passwords.txt vulnerabilities.csv + + runHook postInstall ''; meta = with lib; { description = "Make recommendations for increased performance and stability of MariaDB/MySQL"; homepage = "http://mysqltuner.com"; - license = licenses.gpl3; - maintainers = with maintainers; [ peterhoeg ]; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ peterhoeg shamilton ]; }; } diff --git a/nixpkgs/pkgs/tools/misc/neofetch/default.nix b/nixpkgs/pkgs/tools/misc/neofetch/default.nix index 1ed201802d53..1826d6846d42 100644 --- a/nixpkgs/pkgs/tools/misc/neofetch/default.nix +++ b/nixpkgs/pkgs/tools/misc/neofetch/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub, bash }: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { pname = "neofetch"; version = "7.1.0"; @@ -11,7 +11,11 @@ stdenv.mkDerivation rec { sha256 = "0i7wpisipwzk0j62pzaigbiq42y1mn4sbraz4my2jlz6ahwf00kv"; }; - dontBuild = true; + strictDeps = true; + buildInputs = [ bash ]; + postPatch = '' + patchShebangs --host neofetch + ''; makeFlags = [ "PREFIX=${placeholder "out"}" diff --git a/nixpkgs/pkgs/tools/misc/nix-direnv/default.nix b/nixpkgs/pkgs/tools/misc/nix-direnv/default.nix index efacd87d9a44..39fd7d3e5f0d 100644 --- a/nixpkgs/pkgs/tools/misc/nix-direnv/default.nix +++ b/nixpkgs/pkgs/tools/misc/nix-direnv/default.nix @@ -1,23 +1,21 @@ -{ lib, stdenv, fetchFromGitHub, gnugrep, nix }: +{ lib, stdenv, fetchFromGitHub, gnugrep, nix, nixFlakes }: stdenv.mkDerivation rec { pname = "nix-direnv"; - version = "1.2.1"; + version = "1.2.4"; src = fetchFromGitHub { owner = "nix-community"; repo = "nix-direnv"; rev = version; - sha256 = "sha256-D31ORVdS8P1OkPShsfjEFLVCcv8Bff9OyexUKKHdguQ="; + sha256 = "sha256-87x+MRQ1SjtN+wNCy42VJwlRwgQzHjNEK3J1bkvo7eQ="; }; # Substitute instead of wrapping because the resulting file is # getting sourced, not executed: postPatch = '' - substituteInPlace direnvrc \ - --replace "grep" "${gnugrep}/bin/grep" \ - --replace "nix-shell" "${nix}/bin/nix-shell" \ - --replace "nix-instantiate" "${nix}/bin/nix-instantiate" + sed -i "1a NIX_BIN_PREFIX=${nixFlakes}/bin/" direnvrc + substituteInPlace direnvrc --replace "grep" "${gnugrep}/bin/grep" ''; installPhase = '' diff --git a/nixpkgs/pkgs/tools/misc/nncp/default.nix b/nixpkgs/pkgs/tools/misc/nncp/default.nix index 4469f130b589..4c03172d9aff 100644 --- a/nixpkgs/pkgs/tools/misc/nncp/default.nix +++ b/nixpkgs/pkgs/tools/misc/nncp/default.nix @@ -1,6 +1,7 @@ { lib, stdenv , go , fetchurl +, redo-apenwarr , curl , perl , genericUpdater @@ -9,24 +10,33 @@ stdenv.mkDerivation rec { pname = "nncp"; - version = "5.3.3"; + version = "6.2.0"; src = fetchurl { url = "http://www.nncpgo.org/download/${pname}-${version}.tar.xz"; - sha256 = "1l35ndzrvpfim29jn1p0bwmc8w892z44nsrdnay28k229r9dhz3h"; + sha256 = "1zj0v82zqigcxhpc50mvafvi1ihs92ck35vjfrwb7wzzd7nysb17"; }; - nativeBuildInputs = [ go ]; + nativeBuildInputs = [ go redo-apenwarr ]; - preConfigure = '' + buildPhase = '' + runHook preBuild export GOCACHE=$PWD/.cache + export CFGPATH=/etc/nncp.hjson + export SENDMAIL=sendmail # default value for generated config file + redo ''${enableParallelBuilding:+-j''${NIX_BUILD_CORES}} + runHook postBuild ''; - makeFlags = [ - "PREFIX=${placeholder "out"}" - "CFGPATH=/etc/nncp.hjson" - "SENDMAIL=/run/wrappers/bin/sendmail" - ]; + installPhase = '' + runHook preInstall + export PREFIX=$out + rm -f INSTALL # work around case insensitivity + redo install + runHook postInstall + ''; + + enableParallelBuilding = true; passthru.updateScript = genericUpdater { inherit pname version; @@ -54,7 +64,7 @@ stdenv.mkDerivation rec { transmission exists. ''; homepage = "http://www.nncpgo.org/"; - license = licenses.gpl3; + license = licenses.gpl3Only; platforms = platforms.all; maintainers = [ maintainers.woffs ]; }; diff --git a/nixpkgs/pkgs/tools/misc/ocz-ssd-guru/default.nix b/nixpkgs/pkgs/tools/misc/ocz-ssd-guru/default.nix index c5ac32af3be4..0c021591e5e5 100644 --- a/nixpkgs/pkgs/tools/misc/ocz-ssd-guru/default.nix +++ b/nixpkgs/pkgs/tools/misc/ocz-ssd-guru/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0ri7qmpc1xpy12lpzl6k298c641wcibcwrzz8jn75wdg4rr176r5"; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; libPath = lib.makeLibraryPath [ xorg.libX11 diff --git a/nixpkgs/pkgs/tools/misc/opentsdb/default.nix b/nixpkgs/pkgs/tools/misc/opentsdb/default.nix index 168eda1cf3d5..678c2607b614 100644 --- a/nixpkgs/pkgs/tools/misc/opentsdb/default.nix +++ b/nixpkgs/pkgs/tools/misc/opentsdb/default.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { sha256 = "0b0hilqmgz6n1q7irp17h48v8fjpxhjapgw1py8kyav1d51s7mm2"; }; - buildInputs = [ autoconf automake curl jdk makeWrapper nettools python git ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ autoconf automake curl jdk nettools python git ]; preConfigure = '' patchShebangs ./build-aux/ diff --git a/nixpkgs/pkgs/tools/misc/oppai-ng/default.nix b/nixpkgs/pkgs/tools/misc/oppai-ng/default.nix index ef464e7b755a..f36dacdd3a2a 100644 --- a/nixpkgs/pkgs/tools/misc/oppai-ng/default.nix +++ b/nixpkgs/pkgs/tools/misc/oppai-ng/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "oppai-ng"; - version = "4.0.0"; + version = "4.1.0"; src = fetchFromGitHub { owner = "Francesco149"; repo = pname; rev = version; - sha256 = "sha256-fUtyQaHcNBmDs1BPbFGieKY/CFyETqBxYzzIXSERFJY="; + sha256 = "sha256-L9eraLOWm1tMImS8bLB9T4Md4VdTSxqI9Bt4r8eqxqs="; }; buildPhase = '' diff --git a/nixpkgs/pkgs/tools/misc/os-prober/default.nix b/nixpkgs/pkgs/tools/misc/os-prober/default.nix index 07279400fc4d..bc5dbe4672e8 100644 --- a/nixpkgs/pkgs/tools/misc/os-prober/default.nix +++ b/nixpkgs/pkgs/tools/misc/os-prober/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-mfv1b40n/opXdyj6IXWVf/32sWlS+/DbXIRwE1zX4KM="; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; installPhase = '' # executables install -Dt $out/bin os-prober linux-boot-prober diff --git a/nixpkgs/pkgs/tools/misc/osinfo-db-tools/default.nix b/nixpkgs/pkgs/tools/misc/osinfo-db-tools/default.nix index cb3e8bd057ad..4ee1749c6d38 100644 --- a/nixpkgs/pkgs/tools/misc/osinfo-db-tools/default.nix +++ b/nixpkgs/pkgs/tools/misc/osinfo-db-tools/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkg-config, meson, ninja, gettext, glib, libxml2, perl, python3 -, libxslt, libarchive, bzip2, lzma, json-glib, libsoup +, libxslt, libarchive, bzip2, xz, json-glib, libsoup }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ meson ninja pkg-config gettext perl python3 ]; - buildInputs = [ glib json-glib libxml2 libxslt libarchive bzip2 lzma libsoup ]; + buildInputs = [ glib json-glib libxml2 libxslt libarchive bzip2 xz libsoup ]; meta = with lib; { description = "Tools for managing the osinfo database"; diff --git a/nixpkgs/pkgs/tools/misc/ostree/default.nix b/nixpkgs/pkgs/tools/misc/ostree/default.nix index dc013cfe1978..53966705c2d7 100644 --- a/nixpkgs/pkgs/tools/misc/ostree/default.nix +++ b/nixpkgs/pkgs/tools/misc/ostree/default.nix @@ -25,7 +25,7 @@ , libarchive , libcap , bzip2 -, yacc +, bison , libxslt , docbook-xsl-nons , docbook_xml_dtd_42 @@ -74,7 +74,7 @@ in stdenv.mkDerivation rec { gobject-introspection which makeWrapper - yacc + bison libxslt docbook-xsl-nons docbook_xml_dtd_42 diff --git a/nixpkgs/pkgs/tools/misc/ovh-ttyrec/default.nix b/nixpkgs/pkgs/tools/misc/ovh-ttyrec/default.nix index fc2c2c3d67a3..98d9ef201007 100644 --- a/nixpkgs/pkgs/tools/misc/ovh-ttyrec/default.nix +++ b/nixpkgs/pkgs/tools/misc/ovh-ttyrec/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "ovh-ttyrec"; - version = "1.1.6.6"; + version = "1.1.6.7"; src = fetchFromGitHub { owner = "ovh"; repo = "ovh-ttyrec"; rev = "v${version}"; - sha256 = "176g3k2pzw6zpvmcc2f8idn6vhlygf7lfzxvrhysav2izc5dd130"; + sha256 = "sha256-OkSs0Cu79u53+fN57px48f6kJKuOJLjGUar+lLTdUJU="; }; nativeBuildInputs = [ zstd ]; diff --git a/nixpkgs/pkgs/tools/misc/paperlike-go/default.nix b/nixpkgs/pkgs/tools/misc/paperlike-go/default.nix new file mode 100644 index 000000000000..0278fb1f791d --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/paperlike-go/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule { + pname = "paperlike-go"; + version = "unstable-2021-03-26"; + + src = fetchFromGitHub { + owner = "leoluk"; + repo = "paperlike-go"; + rev = "bd658d88ea9a3b21e1b301b96253abab7cf56d79"; + sha256 = "1h0n2n5w5pn3r08qf6hbmiib5m71br27y66ki9ajnaa890377qaj"; + }; + + subPackages = [ "cmd/paperlike-cli" ]; + + vendorSha256 = "00mn0zfivxp2h77s7gmyyjp8p5a1vysn73wwaalgajymvljxxx1r"; + + meta = { + description = "paperlike-go is a Linux Go library and CLI utility to control a Dasung Paperlike display via I2C DDC."; + homepage = "https://github.com/leoluk/paperlike-go"; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.adisbladis ]; + platforms = lib.platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/tools/misc/parallel/default.nix b/nixpkgs/pkgs/tools/misc/parallel/default.nix index 720b73f3fe21..0667327d062b 100644 --- a/nixpkgs/pkgs/tools/misc/parallel/default.nix +++ b/nixpkgs/pkgs/tools/misc/parallel/default.nix @@ -1,29 +1,22 @@ { fetchurl, lib, stdenv, perl, makeWrapper, procps, coreutils }: stdenv.mkDerivation rec { - name = "parallel-20200922"; + pname = "parallel"; + version = "20210322"; src = fetchurl { - url = "mirror://gnu/parallel/${name}.tar.bz2"; - sha256 = "0wj19kwjk0hwm8bk9yfcf3rpr0314lmjy5xxlvvdqnbbc4ml2418"; + url = "mirror://gnu/parallel/${pname}-${version}.tar.bz2"; + sha256 = "sha256-mPcbRFojoYu06bzk83S5PmptnezfiSvo0iRZ8iS4VpQ="; }; - patches = [ - ./fix-max-line-length-allowed.diff - ]; - - postPatch = '' - substituteInPlace src/parallel --subst-var-by coreutils ${coreutils} - ''; - - outputs = [ "out" "man" ]; + outputs = [ "out" "man" "doc" ]; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ perl procps ]; postInstall = '' wrapProgram $out/bin/parallel \ - --prefix PATH : "${lib.makeBinPath [ procps perl ]}" + --prefix PATH : "${lib.makeBinPath [ procps perl coreutils ]}" ''; doCheck = true; diff --git a/nixpkgs/pkgs/tools/misc/parallel/fix-max-line-length-allowed.diff b/nixpkgs/pkgs/tools/misc/parallel/fix-max-line-length-allowed.diff deleted file mode 100644 index c6d501ecb22a..000000000000 --- a/nixpkgs/pkgs/tools/misc/parallel/fix-max-line-length-allowed.diff +++ /dev/null @@ -1,17 +0,0 @@ -Correct path to coreutils echo to fix parallel --max-line-length-allowed. - -Author: Bjørn Forsman - -diff --git a/src/parallel b/src/parallel -index a047fd94..9fc5f671 100755 ---- a/src/parallel -+++ b/src/parallel -@@ -11580,7 +11580,7 @@ sub is_acceptable_command_line_length($$) { - $len += length $Global::parallel_env; - } - # Force using non-built-in command -- ::qqx("/bin/echo ".${string}x(($len-length "/bin/echo ")/length $string)); -+ ::qqx("@coreutils@/bin/echo ".${string}x(($len-length "@coreutils@/bin/echo ")/length $string)); - ::debug("init", "$len=$? "); - return not $?; - } diff --git a/nixpkgs/pkgs/tools/misc/parted/default.nix b/nixpkgs/pkgs/tools/misc/parted/default.nix index 7c7a611b97c5..e954bfbe5e4d 100644 --- a/nixpkgs/pkgs/tools/misc/parted/default.nix +++ b/nixpkgs/pkgs/tools/misc/parted/default.nix @@ -15,11 +15,11 @@ }: stdenv.mkDerivation rec { - name = "parted-3.3"; + name = "parted-3.4"; src = fetchurl { url = "mirror://gnu/parted/${name}.tar.xz"; - sha256 = "0i1xp367wpqw75b20c3jnism3dg3yqj4a7a22p2jb1h1hyyv9qjp"; + sha256 = "sha256-4SmAIkctpVibfyvh1e48G2bsPZbfutA9xkKv0AnaU0I="; }; outputs = [ "out" "dev" "man" "info" ]; diff --git a/nixpkgs/pkgs/tools/misc/partition-manager/default.nix b/nixpkgs/pkgs/tools/misc/partition-manager/default.nix index 845c0fec9211..064590ef979b 100644 --- a/nixpkgs/pkgs/tools/misc/partition-manager/default.nix +++ b/nixpkgs/pkgs/tools/misc/partition-manager/default.nix @@ -1,30 +1,66 @@ -{ mkDerivation, fetchurl, lib +{ mkDerivation, fetchurl, lib, makeWrapper , extra-cmake-modules, kdoctools, wrapGAppsHook, wrapQtAppsHook , kconfig, kcrash, kinit, kpmcore -, eject, libatasmart , util-linux, qtbase +, cryptsetup, lvm2, mdadm, smartmontools, systemdMinimal, util-linux +, btrfs-progs, dosfstools, e2fsprogs, exfat, f2fs-tools, fatresize, hfsprogs +, jfsutils, nilfs-utils, ntfs3g, reiser4progs, reiserfsprogs, udftools, xfsprogs, zfs }: let - pname = "partitionmanager"; + # External programs are resolved by `partition-manager` and then + # invoked by `kpmcore_externalcommand` from `kpmcore` as root. + # So these packages should be in PATH of `partition-manager`. + # https://github.com/KDE/kpmcore/blob/06f15334ecfbe871730a90dbe2b694ba060ee998/src/util/externalcommand_whitelist.h + runtimeDeps = lib.makeBinPath [ + cryptsetup + lvm2 + mdadm + smartmontools + systemdMinimal + util-linux + + btrfs-progs + dosfstools + e2fsprogs + exfat + f2fs-tools + fatresize + hfsprogs + jfsutils + nilfs-utils + ntfs3g + reiser4progs + reiserfsprogs + udftools + xfsprogs + zfs + + # FIXME: Missing command: tune.exfat hfsck hformat fsck.nilfs2 {fsck,mkfs,debugfs,tunefs}.ocfs2 + ]; + in mkDerivation rec { - name = "${pname}-${version}"; - version = "3.3.1"; + pname = "partitionmanager"; + # NOTE: When changing this version, also change the version of `kpmcore`. + version = "4.2.0"; src = fetchurl { - url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz"; - sha256 = "0jhggb4xksb0k0mj752n6pz0xmccnbzlp984xydqbz3hkigra1si"; + url = "mirror://kde/stable/${pname}/${version}/src/${pname}-${version}.tar.xz"; + hash = "sha256-6Qlt1c47Eek6TkWWBzTyBZYJ1jfhtwsC9X5q5h6IhPg="; }; - nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook wrapQtAppsHook ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook wrapQtAppsHook makeWrapper ]; - # refer to kpmcore for the use of eject - buildInputs = [ eject libatasmart util-linux ]; propagatedBuildInputs = [ kconfig kcrash kinit kpmcore ]; + postFixup = '' + wrapProgram $out/bin/partitionmanager \ + --prefix PATH : "${runtimeDeps}" + ''; + meta = with lib; { description = "KDE Partition Manager"; - license = licenses.gpl2; + license = with licenses; [ cc-by-40 cc0 gpl3Plus lgpl3Plus mit ]; homepage = "https://www.kde.org/applications/system/kdepartitionmanager/"; - maintainers = with maintainers; [ peterhoeg ]; + maintainers = with maintainers; [ peterhoeg oxalica ]; }; } diff --git a/nixpkgs/pkgs/tools/misc/past-time/default.nix b/nixpkgs/pkgs/tools/misc/past-time/default.nix new file mode 100644 index 000000000000..3604e4ddcb4a --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/past-time/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonApplication +, click +, fetchFromGitHub +, freezegun +, pytestCheckHook +, tqdm +}: + +buildPythonApplication rec { + pname = "past-time"; + version = "0.2.1"; + + src = fetchFromGitHub { + owner = "fabaff"; + repo = pname; + rev = version; + sha256 = "0yhc0630rmcx4ia9y6klpx002mavfmqf1s3jb2gz54jlccwqbfgl"; + }; + + propagatedBuildInputs = [ + click + tqdm + ]; + + checkInputs = [ + freezegun + pytestCheckHook + ]; + + pythonImportsCheck = [ "past_time" ]; + + meta = with lib; { + description = "Tool to visualize the progress of the year based on the past days"; + homepage = "https://github.com/fabaff/past-time"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/tools/misc/pb_cli/default.nix b/nixpkgs/pkgs/tools/misc/pb_cli/default.nix index eacbc0d6bd2d..48b819d5bfdd 100644 --- a/nixpkgs/pkgs/tools/misc/pb_cli/default.nix +++ b/nixpkgs/pkgs/tools/misc/pb_cli/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { sha256 = "0w6a789zffvz4ixsb92q45n5s4xyx7s2l2f07972i3dajaaai8z7"; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; liveDeps = [ jq curl ] ++ lib.optional screenshots maim ++ lib.optional video capture diff --git a/nixpkgs/pkgs/tools/misc/pcb2gcode/default.nix b/nixpkgs/pkgs/tools/misc/pcb2gcode/default.nix index 0b300b079db2..6d3851699752 100644 --- a/nixpkgs/pkgs/tools/misc/pcb2gcode/default.nix +++ b/nixpkgs/pkgs/tools/misc/pcb2gcode/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "pcb2gcode"; - version = "2.2.2"; + version = "2.3.0"; src = fetchFromGitHub { owner = "pcb2gcode"; repo = "pcb2gcode"; rev = "v${version}"; - sha256 = "sha256-GSLWpLp/InAxVolKmBIjljpe3ZzmS/87TWKwzax5SkY="; + sha256 = "sha256-BELugmnnedqXTnSwiQN3XbqkWKTKF27ElQAwrEWNSao="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/nixpkgs/pkgs/tools/misc/pdf-parser/default.nix b/nixpkgs/pkgs/tools/misc/pdf-parser/default.nix index f4572d0e5bcc..90c128f8ac35 100644 --- a/nixpkgs/pkgs/tools/misc/pdf-parser/default.nix +++ b/nixpkgs/pkgs/tools/misc/pdf-parser/default.nix @@ -29,6 +29,6 @@ python3Packages.buildPythonApplication { homepage = "https://blog.didierstevens.com/programs/pdf-tools/"; license = licenses.publicDomain; maintainers = [ maintainers.lightdiscord ]; - platforms = platforms.linux; + platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/tools/misc/pgcenter/default.nix b/nixpkgs/pkgs/tools/misc/pgcenter/default.nix index 8afaa61e35b5..27e228f0f205 100644 --- a/nixpkgs/pkgs/tools/misc/pgcenter/default.nix +++ b/nixpkgs/pkgs/tools/misc/pgcenter/default.nix @@ -2,16 +2,24 @@ buildGoModule rec { pname = "pgcenter"; - version = "0.6.6"; + version = "0.8.0"; src = fetchFromGitHub { owner = "lesovsky"; repo = "pgcenter"; rev = "v${version}"; - sha256 = "1axwsclssxsg38ppdmd4v1lbs87ksrwj5z76ckjk8jjfni1xp9sr"; + sha256 = "sha256-ow26wuM7nw/WbeaPVcNm5iYUYLydeujhw+7BcTirPcA="; }; - vendorSha256 = "1mzvpr12qh9668iz97p62zl4zhlrcyfgwr4a9zg9irj585pkb5x2"; + vendorSha256 = "sha256-9hYiyZ34atmSL7JvuXyiGU7HR4E6qN7bGZlyU+hP+FU="; + + subPackages = [ "cmd" ]; + + buildFlagsArray = [ "-ldflags=-w -s -X main.gitTag=${src.rev} -X main.gitCommit=${src.rev} -X main.gitBranch=master" ]; + + postInstall = '' + mv $out/bin/cmd $out/bin/pgcenter + ''; doCheck = false; diff --git a/nixpkgs/pkgs/tools/misc/phoronix-test-suite/default.nix b/nixpkgs/pkgs/tools/misc/phoronix-test-suite/default.nix index 348670c3bb1b..971f924faaac 100644 --- a/nixpkgs/pkgs/tools/misc/phoronix-test-suite/default.nix +++ b/nixpkgs/pkgs/tools/misc/phoronix-test-suite/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "phoronix-test-suite"; - version = "10.2.1"; + version = "10.2.2"; src = fetchurl { url = "https://phoronix-test-suite.com/releases/${pname}-${version}.tar.gz"; - sha256 = "sha256-2HB4TPbyG+cTY6O1k0tRPrnKyg41SYnVM919Hii3gpg="; + sha256 = "sha256-g5hUmsn01Msopxzmi/G4LcZISXMD2wFqreaHMkFzF1Y="; }; buildInputs = [ php ]; diff --git a/nixpkgs/pkgs/tools/misc/pistol/default.nix b/nixpkgs/pkgs/tools/misc/pistol/default.nix index 6eec45db0119..f31de57fdfe7 100644 --- a/nixpkgs/pkgs/tools/misc/pistol/default.nix +++ b/nixpkgs/pkgs/tools/misc/pistol/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "pistol"; - version = "0.1.8"; + version = "0.1.9"; src = fetchFromGitHub { owner = "doronbehar"; repo = pname; rev = "v${version}"; - sha256 = "00vpl43m0zw6vqw8yjkaa7dnis9g169jfb48g2mr0hgyhsjr7jbj"; + sha256 = "sha256-Q/W+1NvbuSu+QfezJpyeI5r4VlzdAAbOlSfFIT8knJs="; }; - vendorSha256 = "1rkyvcyrjnrgd3b05gjd4sv95j1b99q641f3n36kgf3sc3hp31ws"; + vendorSha256 = "sha256-oXt2nZ9lcAiI9ZQtKuQrXOXDfqx3Ucvh/K6g7SScd2Q="; doCheck = false; diff --git a/nixpkgs/pkgs/tools/misc/piston-cli/default.nix b/nixpkgs/pkgs/tools/misc/piston-cli/default.nix index bf9c7c9096cd..73e3ca8d6893 100644 --- a/nixpkgs/pkgs/tools/misc/piston-cli/default.nix +++ b/nixpkgs/pkgs/tools/misc/piston-cli/default.nix @@ -1,12 +1,12 @@ { lib, python3Packages }: -python3Packages.buildPythonPackage rec { +python3Packages.buildPythonApplication rec { pname = "piston-cli"; - version = "1.2.1"; + version = "1.2.2"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "bf0hhKb+6+07HhrkFrsWCnUQfsQWOdK/dPTlt9iZTno="; + sha256 = "hhOistr5lHF6rIuMpudKwSuBQhaQDzTdelAOCjyVQZk="; }; propagatedBuildInputs = with python3Packages; [ rich prompt_toolkit requests pygments ]; diff --git a/nixpkgs/pkgs/tools/misc/pk2cmd/default.nix b/nixpkgs/pkgs/tools/misc/pk2cmd/default.nix index 7ffbd8ded1ca..009d841bf557 100644 --- a/nixpkgs/pkgs/tools/misc/pk2cmd/default.nix +++ b/nixpkgs/pkgs/tools/misc/pk2cmd/default.nix @@ -16,7 +16,8 @@ stdenv.mkDerivation { wrapProgram $out/bin/pk2cmd --prefix PATH : $out/share/pk2 ''; - buildInputs = [ libusb-compat-0_1 makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ libusb-compat-0_1 ]; meta = { homepage = "https://www.microchip.com/pickit2"; diff --git a/nixpkgs/pkgs/tools/misc/plantuml/default.nix b/nixpkgs/pkgs/tools/misc/plantuml/default.nix index eb267e6007a4..25f96d325325 100644 --- a/nixpkgs/pkgs/tools/misc/plantuml/default.nix +++ b/nixpkgs/pkgs/tools/misc/plantuml/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, makeWrapper, jre, graphviz }: stdenv.mkDerivation rec { - version = "1.2021.1"; + version = "1.2021.3"; pname = "plantuml"; src = fetchurl { url = "mirror://sourceforge/project/plantuml/${version}/plantuml.${version}.jar"; - sha256 = "sha256-FOM+hao1lx6EJMccbhLzvVVmCR3F/igHTGN1vhhdmdQ="; + sha256 = "sha256-Kx2fTx71oVkAgsytl1OFBcENMnJ1ZHmg8qvYDFTSS2M="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/tools/misc/plowshare/default.nix b/nixpkgs/pkgs/tools/misc/plowshare/default.nix index d9c208510fc6..2cfbf5ae91ac 100644 --- a/nixpkgs/pkgs/tools/misc/plowshare/default.nix +++ b/nixpkgs/pkgs/tools/misc/plowshare/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, makeWrapper, curl, recode, spidermonkey_38 }: +{ lib, stdenv, fetchFromGitHub, makeWrapper, curl, recode, spidermonkey_78 }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1p8s60dlzaldp006yj710s371aan915asyjhd99188vrj4jj1x79"; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { make PREFIX="$out" install for fn in plow{del,down,list,mod,probe,up}; do - wrapProgram "$out/bin/$fn" --prefix PATH : "${lib.makeBinPath [ curl recode spidermonkey_38 ]}" + wrapProgram "$out/bin/$fn" --prefix PATH : "${lib.makeBinPath [ curl recode spidermonkey_78 ]}" done ''; diff --git a/nixpkgs/pkgs/tools/misc/polar/Gemfile b/nixpkgs/pkgs/tools/misc/polar/Gemfile new file mode 100644 index 000000000000..65e27d167030 --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/polar/Gemfile @@ -0,0 +1,7 @@ +source 'https://rubygems.org' + +gem 'google-protobuf' +gem 'libusb' +gem 'rubyserial' +gem 'nokogiri' + diff --git a/nixpkgs/pkgs/tools/misc/polar/Gemfile.lock b/nixpkgs/pkgs/tools/misc/polar/Gemfile.lock new file mode 100644 index 000000000000..bd3b0226510a --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/polar/Gemfile.lock @@ -0,0 +1,27 @@ +GEM + remote: https://rubygems.org/ + specs: + ffi (1.15.0) + google-protobuf (3.15.6) + libusb (0.6.4) + ffi (~> 1.0) + mini_portile2 (~> 2.1) + mini_portile2 (2.5.0) + nokogiri (1.11.2) + mini_portile2 (~> 2.5.0) + racc (~> 1.4) + racc (1.5.2) + rubyserial (0.6.0) + ffi (~> 1.9, >= 1.9.3) + +PLATFORMS + ruby + +DEPENDENCIES + google-protobuf + libusb + nokogiri + rubyserial + +BUNDLED WITH + 2.1.4 diff --git a/nixpkgs/pkgs/tools/misc/polar/default.nix b/nixpkgs/pkgs/tools/misc/polar/default.nix new file mode 100644 index 000000000000..022752bbc75d --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/polar/default.nix @@ -0,0 +1,73 @@ +{ lib, stdenv, fetchFromGitHub, ruby, bundlerEnv }: +let + + # To create Gemfile.lock and gemset.nix + # > nix-shell -p bundix bundler zlib + # > bundle install + # > bundix + gems = bundlerEnv { + name = "polar-env"; + inherit ruby; + gemdir = ./.; + }; + +in +stdenv.mkDerivation rec { + + pname = "polar"; + # The package has no releases so let's use the latest commit + version = "unstable-2021-01-12"; + + src = fetchFromGitHub { + owner = "cmaion"; + repo = pname; + rev = "be15f5f897f8a919dd639009873147dca2a9cea0"; + sha256 = "0gqkqfrqnrsy6avg372xwqj22yz8g6r2hnzbw6197b1rf7zr1il7"; + }; + + prePatch = '' + for script in polar_* + do + substituteInPlace $script --replace "#{File.dirname(__FILE__)}/lib" "$out/lib/polar" + done + ''; + buildInputs = [ gems ruby ]; + + # See: https://nixos.wiki/wiki/Packaging/Ruby + # + # Put library content under lib/polar and the raw scripts under share/polar. + # Then, wrap the scripts so that they use the correct ruby environment and put + # these wrapped executables under bin. + installPhase = '' + install -Dm644 -t $out/etc/udev/rules.d ./pkg/99-polar.rules + mkdir -p $out/{bin,lib/polar,share/polar} + cp -r lib/* $out/lib/polar/ + for script in ./polar_* + do + raw="$out/share/polar/$script" + bin="$out/bin/$script" + cp "$script" "$raw" + cat > $bin <<EOF +#!/bin/sh -e +exec ${gems}/bin/bundle exec ${ruby}/bin/ruby "$raw" "\$@" +EOF + chmod +x $bin + done + ''; + + meta = with lib; { + description = "Command-line tools to interact with Polar watches"; + longDescription = '' + A set of command line tools written in Ruby to interact with Polar watches + and decode raw data files. + + Udev rules can be added as: + + services.udev.packages = [ pkgs.polar ] + ''; + homepage = "https://github.com/cmaion/polar"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ jluttine ]; + platforms = platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/tools/misc/polar/gemset.nix b/nixpkgs/pkgs/tools/misc/polar/gemset.nix new file mode 100644 index 000000000000..4e360d9b21cf --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/polar/gemset.nix @@ -0,0 +1,75 @@ +{ + ffi = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0nq1fb3vbfylccwba64zblxy96qznxbys5900wd7gm9bpplmf432"; + type = "gem"; + }; + version = "1.15.0"; + }; + google-protobuf = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1ak5yqqhr04b4x0axzvpw1xzwmxmfcw0gf4r1ijixv15kidhsj3z"; + type = "gem"; + }; + version = "3.15.6"; + }; + libusb = { + dependencies = ["ffi" "mini_portile2"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "005q4f3bi68yapza1vxamgwz2gpix2akci52s4yvr03hsxi137a6"; + type = "gem"; + }; + version = "0.6.4"; + }; + mini_portile2 = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1hdbpmamx8js53yk3h8cqy12kgv6ca06k0c9n3pxh6b6cjfs19x7"; + type = "gem"; + }; + version = "2.5.0"; + }; + nokogiri = { + dependencies = ["mini_portile2" "racc"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0b51df8fwadak075cvi17w0nch6qz1r66564qp29qwfj67j9qp0p"; + type = "gem"; + }; + version = "1.11.2"; + }; + racc = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "178k7r0xn689spviqzhvazzvxfq6fyjldxb3ywjbgipbfi4s8j1g"; + type = "gem"; + }; + version = "1.5.2"; + }; + rubyserial = { + dependencies = ["ffi"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1vj5yan6srbvkf5vfp9d9b9z8wyygd0zxcy54c35yhkjl6kwd22q"; + type = "gem"; + }; + version = "0.6.0"; + }; +} diff --git a/nixpkgs/pkgs/tools/misc/ponysay/default.nix b/nixpkgs/pkgs/tools/misc/ponysay/default.nix index b94ca6cfea34..113c2b05ff59 100644 --- a/nixpkgs/pkgs/tools/misc/ponysay/default.nix +++ b/nixpkgs/pkgs/tools/misc/ponysay/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation { sha256 = "12mjabf5cpp5dgg63s19rlyq3dhhpzzy2sa439yncqzsk7rdg0n3"; }; - buildInputs = [ python3 texinfo makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ python3 texinfo ]; inherit python3; diff --git a/nixpkgs/pkgs/tools/misc/poweralertd/default.nix b/nixpkgs/pkgs/tools/misc/poweralertd/default.nix new file mode 100644 index 000000000000..a00a5b9a4026 --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/poweralertd/default.nix @@ -0,0 +1,42 @@ +{ lib, stdenv, fetchFromSourcehut, meson, ninja, pkg-config, scdoc, systemd }: + +stdenv.mkDerivation rec { + pname = "poweralertd"; + version = "0.1.0"; + + outputs = [ "out" "man" ]; + + src = fetchFromSourcehut { + owner = "~kennylevinsen"; + repo = "poweralertd"; + rev = version; + sha256 = "136xcrp7prilh905a6v933vryqy20l7nw24ahc4ycax8f0s906x9"; + }; + + patchPhase = '' + substituteInPlace meson.build --replace "systemd.get_pkgconfig_variable('systemduserunitdir')" "'${placeholder "out"}/lib/systemd/user'" + ''; + + buildInputs = [ + systemd + ]; + + nativeBuildInputs = [ + meson + ninja + pkg-config + ]; + + depsBuildBuild = [ + scdoc + pkg-config + ]; + + meta = with lib; { + description = "UPower-powered power alerter"; + homepage = "https://git.sr.ht/~kennylevinsen/poweralertd"; + license = licenses.gpl3Only; + platforms = platforms.linux; + maintainers = with maintainers; [ thibautmarty ]; + }; +} diff --git a/nixpkgs/pkgs/tools/misc/powerline-go/default.nix b/nixpkgs/pkgs/tools/misc/powerline-go/default.nix index a4ee216288f9..2f6ff216dc87 100644 --- a/nixpkgs/pkgs/tools/misc/powerline-go/default.nix +++ b/nixpkgs/pkgs/tools/misc/powerline-go/default.nix @@ -1,14 +1,17 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib +, buildGoModule +, fetchFromGitHub +}: buildGoModule rec { pname = "powerline-go"; - version = "1.20.0"; + version = "1.21.0"; src = fetchFromGitHub { owner = "justjanne"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Pge57OXNE0MY2rlspVsqxdoe1r/XWjrq/q9ygdns2c8="; + sha256 = "sha256-IO3I5lvPdN73EF+S5Xo+TMEYaBtd1pOGMs+aQtRnHjE="; }; vendorSha256 = "sha256-HYF6aKz+P241EKmupEoretadlrh9FBRx6nIER66jofg="; @@ -17,7 +20,9 @@ buildGoModule rec { meta = with lib; { description = "A Powerline like prompt for Bash, ZSH and Fish"; - license = licenses.gpl3; + homepage = "https://github.com/justjanne/powerline-go"; + changelog = "https://github.com/justjanne/powerline-go/releases/tag/v${version}"; + license = licenses.gpl3Plus; platforms = platforms.unix; maintainers = with maintainers; [ sifmelcara ]; }; diff --git a/nixpkgs/pkgs/tools/misc/profile-cleaner/default.nix b/nixpkgs/pkgs/tools/misc/profile-cleaner/default.nix index c8a2b338817d..59bbe2c2ab1f 100644 --- a/nixpkgs/pkgs/tools/misc/profile-cleaner/default.nix +++ b/nixpkgs/pkgs/tools/misc/profile-cleaner/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "11sjf4j9dr6ih9jkg6vqq6gkfg6wly4182bi1008bsm1zdmm5iz7"; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; installPhase = '' PREFIX=\"\" DESTDIR=$out make install @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://github.com/graysky2/profile-cleaner"; license = lib.licenses.mit; - platforms = lib.platforms.linux; + platforms = lib.platforms.all; maintainers = [ lib.maintainers.devhell ]; }; } diff --git a/nixpkgs/pkgs/tools/misc/progress/default.nix b/nixpkgs/pkgs/tools/misc/progress/default.nix index 4f27cd239d17..9feee484170e 100644 --- a/nixpkgs/pkgs/tools/misc/progress/default.nix +++ b/nixpkgs/pkgs/tools/misc/progress/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "progress"; - version = "0.15"; + version = "0.16"; src = fetchFromGitHub { owner = "Xfennec"; repo = "progress"; rev = "v${version}"; - sha256 = "1cnb4ixlhshn139mj5sr42k5m6gjjbyqvkn1324c47niwrgp7dqm"; + sha256 = "sha256-kkEyflyBaQ5hUVo646NUuC1u54uzLJJsVFej9pMEwT0="; }; nativeBuildInputs = [ pkg-config which ]; diff --git a/nixpkgs/pkgs/tools/misc/pspg/default.nix b/nixpkgs/pkgs/tools/misc/pspg/default.nix index 9159de9fd8c2..354075df549c 100644 --- a/nixpkgs/pkgs/tools/misc/pspg/default.nix +++ b/nixpkgs/pkgs/tools/misc/pspg/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pspg"; - version = "3.1.5"; + version = "4.4.0"; src = fetchFromGitHub { owner = "okbob"; repo = pname; rev = version; - sha256 = "000h4yiaym7i5bcm268rvsjbs2brz2is9lhm6vm3dx0q7k1pcx45"; + sha256 = "sha256-kRKU6ynZffV17GqEArkXxz6M9xoa3kn2yNqjyLRY0rc="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/nixpkgs/pkgs/tools/misc/pubs/default.nix b/nixpkgs/pkgs/tools/misc/pubs/default.nix index be5fd6d499c3..3b6df828fda0 100644 --- a/nixpkgs/pkgs/tools/misc/pubs/default.nix +++ b/nixpkgs/pkgs/tools/misc/pubs/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, fetchpatch, python3Packages }: +{ lib, fetchFromGitHub, python3Packages }: python3Packages.buildPythonApplication rec { pname = "pubs"; diff --git a/nixpkgs/pkgs/tools/misc/pws/default.nix b/nixpkgs/pkgs/tools/misc/pws/default.nix index 0edec63c8c92..e98323b75eea 100644 --- a/nixpkgs/pkgs/tools/misc/pws/default.nix +++ b/nixpkgs/pkgs/tools/misc/pws/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { name = "pws-${(import ./gemset.nix).pws.version}"; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; phases = ["installPhase"]; diff --git a/nixpkgs/pkgs/tools/misc/qmk/default.nix b/nixpkgs/pkgs/tools/misc/qmk/default.nix new file mode 100644 index 000000000000..40e5d4d23aea --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/qmk/default.nix @@ -0,0 +1,41 @@ +{ lib +, python3 +, fetchpatch +}: + +python3.pkgs.buildPythonApplication rec { + pname = "qmk"; + version = "0.0.45"; + + src = python3.pkgs.fetchPypi { + inherit pname version; + sha256 = "43f297f36b21d68c34c5efa0ce1449dddb2e28753f80939cadf761ee7a2a0901"; + }; + + patches = [ + # https://github.com/qmk/qmk_cli/pull/48 + (fetchpatch { + name = "remove-unused-install-requires.patch"; + url = "https://github.com/qmk/qmk_cli/commit/75b6ada1feccfa5a9bc2bb07a4cc749ef40d02dd.patch"; + sha256 = "0lwi1dz35p07vha5gwq2jxm5q49vm99ix4jyhd6g6ypqbq1qiwc8"; + }) + ]; + + nativeBuildInputs = with python3.pkgs; [ + setuptools-scm + ]; + + propagatedBuildInputs = with python3.pkgs; [ + milc + ]; + + # no tests implemented + doCheck = false; + + meta = with lib; { + description = "A program to help users work with QMK Firmware"; + homepage = "https://github.com/qmk/qmk_cli"; + license = licenses.mit; + maintainers = with maintainers; [ bhipple ]; + }; +} diff --git a/nixpkgs/pkgs/tools/misc/quich/default.nix b/nixpkgs/pkgs/tools/misc/quich/default.nix new file mode 100644 index 000000000000..ea4fbc7eead4 --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/quich/default.nix @@ -0,0 +1,30 @@ +{ lib, stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "quich"; + version = "3.1.0"; + + src = fetchFromGitHub { + owner = "Usbac"; + repo = pname; + rev = "v${version}"; + sha256 = "1n9c01q2v6g9wnmxp248yclhp8cxclnj0yyn1qrvjsn6srcpr22c"; + }; + + doCheck = true; + + makeFlags = [ "DESTDIR=" "PREFIX=$(out)" "CC=${stdenv.cc.targetPrefix}cc" ]; + + meta = with lib; { + description = "The advanced terminal calculator"; + longDescription = '' + Quich is a compact, fast, powerful and useful calculator for your terminal + with numerous features, supporting Windows and Linux Systems, + written in ANSI C. + ''; + homepage = "https://github.com/Usbac/quich"; + license = licenses.mit; + maintainers = [ maintainers.xdhampus ]; + platforms = platforms.all; + }; +} diff --git a/nixpkgs/pkgs/tools/misc/remind/default.nix b/nixpkgs/pkgs/tools/misc/remind/default.nix index ef684aebe3cb..bbe96bf6c290 100644 --- a/nixpkgs/pkgs/tools/misc/remind/default.nix +++ b/nixpkgs/pkgs/tools/misc/remind/default.nix @@ -16,11 +16,11 @@ let ''; in stdenv.mkDerivation rec { pname = "remind"; - version = "03.03.01"; + version = "03.03.05"; src = fetchurl { url = "https://dianne.skoll.ca/projects/remind/download/remind-${version}.tar.gz"; - sha256 = "0y4l960529sl3sn4r4g36qpy3jk5h1x4algjy7an7sfiqb8n98fi"; + sha256 = "sha256-Ye0X2Gvek/pyaNVxGKL773OWJvC4I6F5nEsRQgzWbsE="; }; nativeBuildInputs = optional tkremind makeWrapper; diff --git a/nixpkgs/pkgs/tools/misc/rlwrap/default.nix b/nixpkgs/pkgs/tools/misc/rlwrap/default.nix index ac1431d3a1be..a78d6f143a12 100644 --- a/nixpkgs/pkgs/tools/misc/rlwrap/default.nix +++ b/nixpkgs/pkgs/tools/misc/rlwrap/default.nix @@ -1,26 +1,30 @@ -{ lib, stdenv, fetchurl, readline }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, perl, readline }: stdenv.mkDerivation rec { pname = "rlwrap"; - version = "0.43"; + version = "0.45"; - src = fetchurl { - url = "https://github.com/hanslub42/rlwrap/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "0bzb7ylk2770iv59v2d0gypb21y2xn87m299s9rqm6rdi2vx11lf"; + src = fetchFromGitHub { + owner = "hanslub42"; + repo = "rlwrap"; + rev = "v${version}"; + sha256 = "1ppkjdnxrxh99g4xaiaglm5bmp24006rfahci0cn1g7zwilkjy8s"; }; - buildInputs = [ readline ]; - - # Be high-bit-friendly - preBuild = '' - sed -i src/readline.c -e "s@[*]p [<] ' '@(*p >= 0) \\&\\& (*p < ' ')@" + postPatch = '' + substituteInPlace src/readline.c \ + --replace "if(*p >= 0 && *p < ' ')" "if(*p >= 0 && (*p >= 0) && (*p < ' '))" ''; - meta = { + nativeBuildInputs = [ autoreconfHook perl ]; + + buildInputs = [ readline ]; + + meta = with lib; { description = "Readline wrapper for console programs"; homepage = "https://github.com/hanslub42/rlwrap"; - license = lib.licenses.gpl2Plus; - platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ ]; + license = licenses.gpl2Plus; + platforms = platforms.unix; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } diff --git a/nixpkgs/pkgs/tools/misc/rmtrash/default.nix b/nixpkgs/pkgs/tools/misc/rmtrash/default.nix index d50079f82c26..61b8ead738cf 100644 --- a/nixpkgs/pkgs/tools/misc/rmtrash/default.nix +++ b/nixpkgs/pkgs/tools/misc/rmtrash/default.nix @@ -1,7 +1,7 @@ -{ lib, stdenv, fetchFromGitHub, makeWrapper +{ lib, stdenvNoCC, fetchFromGitHub, makeWrapper , trash-cli, coreutils, which, getopt }: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { pname = "rmtrash"; version = "1.14"; @@ -12,9 +12,6 @@ stdenv.mkDerivation rec { sha256 = "0wfb2ykzlsxyqn9krfsis9jxhaxy3pxl71a4f15an1ngfndai694"; }; - dontConfigure = true; - dontBuild = true; - nativeBuildInputs = [ makeWrapper ]; installPhase = '' @@ -35,5 +32,6 @@ stdenv.mkDerivation rec { ''; license = licenses.gpl3Plus; maintainers = with maintainers; [ peelz ]; + platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/tools/misc/rpi-imager/default.nix b/nixpkgs/pkgs/tools/misc/rpi-imager/default.nix index a18a8d6d38d0..963a0832ef9f 100644 --- a/nixpkgs/pkgs/tools/misc/rpi-imager/default.nix +++ b/nixpkgs/pkgs/tools/misc/rpi-imager/default.nix @@ -16,13 +16,13 @@ mkDerivation rec { pname = "rpi-imager"; - version = "1.5"; + version = "1.6"; src = fetchFromGitHub { owner = "raspberrypi"; repo = pname; rev = "v${version}"; - sha256 = "0596c7rpkykmjr3gsz9yczqsj7fzq04kc97s0rqkygjnwiqh2rwz"; + sha256 = "sha256-wX9EO5hgEM2ftOov0AERloH6GxrwptWltBYWLFXkPUw="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/tools/misc/rpm-ostree/default.nix b/nixpkgs/pkgs/tools/misc/rpm-ostree/default.nix index 0e094a4b2add..38a43c7ac3dd 100644 --- a/nixpkgs/pkgs/tools/misc/rpm-ostree/default.nix +++ b/nixpkgs/pkgs/tools/misc/rpm-ostree/default.nix @@ -40,13 +40,13 @@ stdenv.mkDerivation rec { pname = "rpm-ostree"; - version = "2021.1"; + version = "2021.2"; outputs = [ "out" "dev" "man" "devdoc" ]; src = fetchurl { url = "https://github.com/coreos/${pname}/releases/download/v${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-1GpM7IW27MgbXG6iVo5qnWaotwN1GgcXf7dFGRF8s0w="; + sha256 = "sha256-msu5LReTYupgoS6Rm2nrMz9jauciAD99hh+w8BhSYn4="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/tools/misc/sacad/default.nix b/nixpkgs/pkgs/tools/misc/sacad/default.nix new file mode 100644 index 000000000000..c5c48c271db7 --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/sacad/default.nix @@ -0,0 +1,39 @@ +{ lib, python3Packages, jpegoptim, optipng }: + +python3Packages.buildPythonApplication rec { + pname = "sacad"; + version = "2.3.4"; + + src = python3Packages.fetchPypi { + inherit pname version; + sha256 = "1qv2mrz6vy2sl7zhrj9vw016pjd7hmjr2ls0w8bbv1hgrddicn9r"; + }; + + propagatedBuildInputs = with python3Packages; [ + aiohttp + appdirs + bitarray + cssselect + fake-useragent + lxml + mutagen + pillow + tqdm + unidecode + web-cache + jpegoptim + optipng + ]; + + # tests require internet connection + doCheck = false; + + pythonImportsCheck = [ "sacad" ]; + + meta = with lib; { + description = "Smart Automatic Cover Art Downloader"; + homepage = "https://github.com/desbma/sacad"; + license = licenses.mpl20; + maintainers = with maintainers; [ fortuneteller2k ]; + }; +} diff --git a/nixpkgs/pkgs/tools/misc/savepagenow/default.nix b/nixpkgs/pkgs/tools/misc/savepagenow/default.nix new file mode 100644 index 000000000000..d9166d07b74c --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/savepagenow/default.nix @@ -0,0 +1,25 @@ +{ lib, python3Packages, fetchFromGitHub }: + +python3Packages.buildPythonApplication rec { + pname = "savepagenow"; + version = "1.1.1"; + + src = fetchFromGitHub { + owner = "pastpages"; + repo = pname; + rev = "v${version}"; + sha256 = "1lz6rc47cds9rb35jdf8n13gr61wdkh5jqzx4skikm1yrqkwjyhm"; + }; + + propagatedBuildInputs = with python3Packages; [ click requests ]; + + # requires network access + doCheck = false; + + meta = with lib; { + description = "A simple Python wrapper for archive.org's \"Save Page Now\" capturing service"; + homepage = "https://github.com/pastpages/savepagenow"; + license = licenses.mit; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/nixpkgs/pkgs/tools/misc/screen/default.nix b/nixpkgs/pkgs/tools/misc/screen/default.nix index 0443deae0775..70a959578555 100644 --- a/nixpkgs/pkgs/tools/misc/screen/default.nix +++ b/nixpkgs/pkgs/tools/misc/screen/default.nix @@ -16,7 +16,14 @@ stdenv.mkDerivation rec { "--enable-colors256" ]; - patches = lib.optional stdenv.hostPlatform.isMusl + patches = [ + (fetchpatch { + # Fixes denial of services in encoding.c, remove > 4.8.0 + name = "CVE-2021-26937.patch"; + url = "https://salsa.debian.org/debian/screen/-/raw/master/debian/patches/99_CVE-2021-26937.patch"; + sha256 = "05f3p1c7s83nccwkhmavjzgaysxnvq41c7jffs31ra65kcpabqy0"; + }) + ] ++ lib.optional stdenv.hostPlatform.isMusl (fetchpatch { url = "https://gist.githubusercontent.com/yujinakayama/4608863/raw/76b9f89af5e5a2e97d9a0f36aac989fb56cf1447/gistfile1.diff"; sha256 = "0f9bf83p8zdxaa1pr75jyf5g8xr3r8kv7cyzzbpraa1q4j15ss1p"; diff --git a/nixpkgs/pkgs/tools/misc/sfeed/default.nix b/nixpkgs/pkgs/tools/misc/sfeed/default.nix index 57e49c887454..93ef69ea2ea5 100644 --- a/nixpkgs/pkgs/tools/misc/sfeed/default.nix +++ b/nixpkgs/pkgs/tools/misc/sfeed/default.nix @@ -27,6 +27,6 @@ stdenv.mkDerivation rec { ''; license = licenses.isc; maintainers = [ maintainers.matthiasbeyer ]; - platforms = platforms.linux; + platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/tools/misc/shelldap/default.nix b/nixpkgs/pkgs/tools/misc/shelldap/default.nix index 18c5aea3dfd8..c782b1292008 100644 --- a/nixpkgs/pkgs/tools/misc/shelldap/default.nix +++ b/nixpkgs/pkgs/tools/misc/shelldap/default.nix @@ -6,7 +6,7 @@ perlPackages.buildPerlPackage rec { url = "https://bitbucket.org/mahlon/shelldap/downloads/shelldap-${version}.tar.gz"; sha256 = "07gkvvxcgw3pgkfy8p9mmidakciaq1rsq5zhmdqd8zcwgqkrr24i"; }; - buildInputs = with perlPackages; [ perl YAMLSyck NetLDAP AlgorithmDiff IOSocketSSL AuthenSASL TermReadLineGnu TermShell ]; + buildInputs = with perlPackages; [ perl YAMLSyck perlldap AlgorithmDiff IOSocketSSL AuthenSASL TermReadLineGnu TermShell ]; prePatch = '' touch Makefile.PL ''; diff --git a/nixpkgs/pkgs/tools/misc/silicon/default.nix b/nixpkgs/pkgs/tools/misc/silicon/default.nix index 1ff73492401f..0c338fd91bce 100644 --- a/nixpkgs/pkgs/tools/misc/silicon/default.nix +++ b/nixpkgs/pkgs/tools/misc/silicon/default.nix @@ -16,16 +16,16 @@ rustPlatform.buildRustPackage rec { pname = "silicon"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "Aloxaf"; repo = "silicon"; rev = "v${version}"; - sha256 = "0cvzkfyljgxhmn456f2rn0vq2bhm1ishr4jg4dnwjjfgmjg3w908"; + sha256 = "sha256-ci0gq4rOQHBmFPvhXZseIlwnqAWd06/qg/i/luhV79s="; }; - cargoSha256 = "1aymhbfzcncrbc5n8rf62bdgi95b4bjhw6p716vhca5p6c7wfxcb"; + cargoSha256 = "sha256-1sekLS+jhMeFJcW7pH/X8t28//xA+L54u81uKOo1kHE="; buildInputs = [ llvmPackages.libclang expat freetype ] ++ lib.optionals stdenv.isLinux [ libxcb ] diff --git a/nixpkgs/pkgs/tools/misc/skim/default.nix b/nixpkgs/pkgs/tools/misc/skim/default.nix index 3a49876a8600..7909aaa1a720 100644 --- a/nixpkgs/pkgs/tools/misc/skim/default.nix +++ b/nixpkgs/pkgs/tools/misc/skim/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "skim"; - version = "0.9.3"; + version = "0.9.4"; src = fetchCrate { inherit pname version; - sha256 = "026mgqcp9sg6wwikghrc3rgh5p6wdbnvav5pb3xvs79lj85d5ga7"; + sha256 = "0yvjzmz2vqc63l8911jflqf5aww7wxsav2yal5wg9ci9hzq6dl7j"; }; outputs = [ "out" "vim" ]; - cargoSha256 = "07bs23x2vxzlrca5swwq8khmd9fbdhlhm0avwp9y231df6xdi2ys"; + cargoSha256 = "0xh4f8c62kzj2fx7hyhdy13zhay13a6d2d7i9yz0n40dfgf70qx0"; postPatch = '' sed -i -e "s|expand('<sfile>:h:h')|'$out'|" plugin/skim.vim diff --git a/nixpkgs/pkgs/tools/misc/slurp/default.nix b/nixpkgs/pkgs/tools/misc/slurp/default.nix deleted file mode 100644 index ed4bb0037fbe..000000000000 --- a/nixpkgs/pkgs/tools/misc/slurp/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config -, cairo, libxkbcommon, wayland, wayland-protocols -, buildDocs ? true, scdoc -}: - -stdenv.mkDerivation rec { - pname = "slurp"; - version = "1.3.1"; - - src = fetchFromGitHub { - owner = "emersion"; - repo = "slurp"; - rev = "v${version}"; - sha256 = "1fby2v2ylcadgclds05wpkl9xi2r9dfz49dqyqpn20rjv1wnz3jv"; - }; - - nativeBuildInputs = [ - meson - ninja - pkg-config - ] ++ lib.optional buildDocs scdoc; - - buildInputs = [ - cairo - libxkbcommon - wayland - wayland-protocols - ]; - - mesonFlags = lib.optional buildDocs "-Dman-pages=enabled"; - - meta = with lib; { - description = "Select a region in a Wayland compositor"; - homepage = "https://github.com/emersion/slurp"; - license = licenses.mit; - platforms = platforms.linux; - maintainers = with maintainers; [ buffet ]; - }; -} diff --git a/nixpkgs/pkgs/tools/misc/starship/default.nix b/nixpkgs/pkgs/tools/misc/starship/default.nix index a3543c433ae9..c589590abcfe 100644 --- a/nixpkgs/pkgs/tools/misc/starship/default.nix +++ b/nixpkgs/pkgs/tools/misc/starship/default.nix @@ -11,13 +11,13 @@ rustPlatform.buildRustPackage rec { pname = "starship"; - version = "0.50.0"; + version = "0.51.0"; src = fetchFromGitHub { owner = "starship"; repo = pname; rev = "v${version}"; - sha256 = "1bnnqrxsmp3z2qksd8h4lfbq4kxxy1cg4yynadz66lxyzabv2v21"; + sha256 = "1bmnwvjhw2ba7yqn9if83d57b8qbrbqgy2br8q2drz4ylk0gjirg"; }; nativeBuildInputs = [ installShellFiles ] ++ lib.optionals stdenv.isLinux [ pkg-config ]; @@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec { done ''; - cargoSha256 = "0plk47i2xrn3x5yr3gw3pq74maqf4krb8d6i4sf8gil4mnpcgxir"; + cargoSha256 = "1d4ca8yzx437x53i7z2kddv9db89zy6ywbgl6y1cwwd6wscbrxcq"; preCheck = '' HOME=$TMPDIR diff --git a/nixpkgs/pkgs/tools/misc/svtplay-dl/default.nix b/nixpkgs/pkgs/tools/misc/svtplay-dl/default.nix index 423135d53fd1..58c488f7b800 100644 --- a/nixpkgs/pkgs/tools/misc/svtplay-dl/default.nix +++ b/nixpkgs/pkgs/tools/misc/svtplay-dl/default.nix @@ -4,22 +4,22 @@ let inherit (python3Packages) - python nose pycrypto pyyaml requests mock python-dateutil setuptools; + python nose cryptography pyyaml requests mock python-dateutil setuptools; in stdenv.mkDerivation rec { pname = "svtplay-dl"; - version = "2.8"; + version = "3.3"; src = fetchFromGitHub { owner = "spaam"; repo = "svtplay-dl"; rev = version; - sha256 = "1977xyxi9jfj7qra1sz7c9lk885cadpci66jvbzvnwm6d60m05lb"; + sha256 = "00pz5vv39qjsw67fdlj6942371lyvv368lc82z17nnh723ck54yy"; }; - pythonPaths = [ pycrypto pyyaml requests ]; - buildInputs = [ python perl nose mock makeWrapper python-dateutil setuptools ] ++ pythonPaths; - nativeBuildInputs = [ gitMinimal zip ]; + pythonPaths = [ cryptography pyyaml requests ]; + buildInputs = [ python perl nose mock python-dateutil setuptools ] ++ pythonPaths; + nativeBuildInputs = [ gitMinimal zip makeWrapper ]; postPatch = '' substituteInPlace scripts/run-tests.sh \ diff --git a/nixpkgs/pkgs/tools/misc/swaglyrics/default.nix b/nixpkgs/pkgs/tools/misc/swaglyrics/default.nix index 4bc5c28b5599..b3f58c4cdb18 100644 --- a/nixpkgs/pkgs/tools/misc/swaglyrics/default.nix +++ b/nixpkgs/pkgs/tools/misc/swaglyrics/default.nix @@ -42,6 +42,6 @@ python3.pkgs.buildPythonApplication rec { homepage = "https://github.com/SwagLyrics/SwagLyrics-For-Spotify"; license = licenses.mit; maintainers = with maintainers; [ siraben ]; - platforms = lib.platforms.linux; + platforms = platforms.linux; }; } diff --git a/nixpkgs/pkgs/tools/misc/tab-rs/default.nix b/nixpkgs/pkgs/tools/misc/tab-rs/default.nix index b6c9b35ac870..affea98ea555 100644 --- a/nixpkgs/pkgs/tools/misc/tab-rs/default.nix +++ b/nixpkgs/pkgs/tools/misc/tab-rs/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "tab-rs"; - version = "0.5.6"; + version = "0.5.7"; src = fetchFromGitHub { owner = "austinjones"; repo = pname; rev = "v${version}"; - sha256 = "1gyl2dxyhh4d2lpxg9s5cx734sfs1kys5z5hjqfgbiny28hp9sw6"; + sha256 = "1crj0caimin667f9kz34c0sm77892dmqaf1kxryqakqm75az5wfr"; }; - cargoSha256 = "1apjzn164kakb2snrq1wfl7grm72hkddi3am6d01h5kkngkp68qm"; + cargoSha256 = "0c2478c5gblvci0s68pv8386kxhs88dxzcpd2rq6l82bjn7yzymd"; buildInputs = lib.optionals stdenv.isDarwin [ IOKit ]; diff --git a/nixpkgs/pkgs/tools/misc/tea/default.nix b/nixpkgs/pkgs/tools/misc/tea/default.nix new file mode 100644 index 000000000000..06e54559db9a --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/tea/default.nix @@ -0,0 +1,21 @@ +{ lib, buildGoModule, fetchgit }: + +buildGoModule rec { + pname = "tea"; + version = "0.7.0"; + + src = fetchgit { + url = "https://gitea.com/gitea/tea"; + rev = "v${version}"; + sha256 = "sha256-Kq+A6YELfBJ04t7pPnX8Ulh4NSMFn3AHggplLD9J8MY="; + }; + + vendorSha256 = null; + + meta = with lib; { + description = "Gitea official CLI client"; + homepage = "https://gitea.com/gitea/tea"; + license = licenses.mit; + maintainers = [ maintainers.j4m3s ]; + }; +} diff --git a/nixpkgs/pkgs/tools/misc/tfk8s/default.nix b/nixpkgs/pkgs/tools/misc/tfk8s/default.nix new file mode 100644 index 000000000000..ebe1f056f4e2 --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/tfk8s/default.nix @@ -0,0 +1,38 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "tfk8s"; + version = "0.1.3"; + + src = fetchFromGitHub { + owner = "jrhouston"; + repo = "tfk8s"; + rev = "v${version}"; + sha256 = "sha256-3iI5gYfpkxfVylBgniaMeQ73uR8dAjVrdg/eBLRxUR4"; + }; + + vendorSha256 = "sha256-wS5diDQFkt8IAp13d8Yeh8ihLvKWdR0Mbw0fMZpqqKE="; + runVend = true; + + buildFlagsArray = [ + "-ldflags=" + "-s" + "-w" + "-X main.toolVersion=${version}" + "-X main.builtBy=nixpkgs" + ]; + + meta = with lib; { + description = "An utility to convert Kubernetes YAML manifests to Terraform's HCL format."; + license = licenses.mit; + longDescription = '' + tfk8s is a tool that makes it easier to work with the Terraform Kubernetes Provider. + If you want to copy examples from the Kubernetes documentation or migrate existing YAML manifests and use them with Terraform without having to convert YAML to HCL by hand, this tool is for you. + Features: + * Convert a YAML file containing multiple manifests. + * Strip out server side fields when piping kubectl get $R -o yaml | tfk8s --strip + ''; + homepage = "https://github.com/jrhouston/tfk8s/"; + maintainers = with maintainers; [ superherointj ]; + }; +} diff --git a/nixpkgs/pkgs/tools/misc/thin-provisioning-tools/default.nix b/nixpkgs/pkgs/tools/misc/thin-provisioning-tools/default.nix index 794e0d4e2578..bff6c9c96887 100644 --- a/nixpkgs/pkgs/tools/misc/thin-provisioning-tools/default.nix +++ b/nixpkgs/pkgs/tools/misc/thin-provisioning-tools/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, expat, libaio, boost, binutils }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, expat, libaio, boost }: stdenv.mkDerivation rec { pname = "thin-provisioning-tools"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ expat libaio boost binutils ]; + buildInputs = [ expat libaio boost ]; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/tools/misc/tldr/default.nix b/nixpkgs/pkgs/tools/misc/tldr/default.nix index 25eee1c7b83b..dfde5a9113be 100644 --- a/nixpkgs/pkgs/tools/misc/tldr/default.nix +++ b/nixpkgs/pkgs/tools/misc/tldr/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ curl libzip ]; nativeBuildInputs = [ pkg-config ]; - makeFlags = ["CC=cc" "LD=cc" "CFLAGS="]; + makeFlags = ["CC=${stdenv.cc.targetPrefix}cc" "LD=${stdenv.cc.targetPrefix}cc" "CFLAGS="]; installFlags = [ "PREFIX=$(out)" ]; diff --git a/nixpkgs/pkgs/tools/misc/tmux-cssh/default.nix b/nixpkgs/pkgs/tools/misc/tmux-cssh/default.nix index f3f536279566..830c365fa403 100644 --- a/nixpkgs/pkgs/tools/misc/tmux-cssh/default.nix +++ b/nixpkgs/pkgs/tools/misc/tmux-cssh/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { sha256 = "473e27f3b69864b905d1340d97917cd202705c761611eb3aec4c24521f69b52c"; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; installPhase = '' mkdir -p $out/bin diff --git a/nixpkgs/pkgs/tools/misc/tmux-xpanes/default.nix b/nixpkgs/pkgs/tools/misc/tmux-xpanes/default.nix index 37a60e714df0..a410eaa9238c 100644 --- a/nixpkgs/pkgs/tools/misc/tmux-xpanes/default.nix +++ b/nixpkgs/pkgs/tools/misc/tmux-xpanes/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "tmux-xpanes"; - version = "4.1.2"; + version = "4.1.3"; src = fetchFromGitHub { owner = "greymd"; repo = pname; rev = "v${version}"; - sha256 = "0vm5mi6dqdbg0b5qh4r8sr1plpc00jryd8a2qxpp3a72cigjvvf0"; + sha256 = "sha256-e0dEkkEkColBQ0PgOQpoVbIkR3aVsrMZoSGbg4O11SU="; }; buildInputs = [ openssl perl ]; diff --git a/nixpkgs/pkgs/tools/misc/tmux/default.nix b/nixpkgs/pkgs/tools/misc/tmux/default.nix index 4e5ca70b9554..2043cfe10118 100644 --- a/nixpkgs/pkgs/tools/misc/tmux/default.nix +++ b/nixpkgs/pkgs/tools/misc/tmux/default.nix @@ -49,6 +49,8 @@ stdenv.mkDerivation rec { "--localstatedir=/var" ]; + enableParallelBuilding = true; + postInstall = '' mkdir -p $out/share/bash-completion/completions cp -v ${bashCompletion}/completions/tmux $out/share/bash-completion/completions/tmux diff --git a/nixpkgs/pkgs/tools/misc/tmuxp/default.nix b/nixpkgs/pkgs/tools/misc/tmuxp/default.nix index 57d320fd7906..9e97f0d892bf 100644 --- a/nixpkgs/pkgs/tools/misc/tmuxp/default.nix +++ b/nixpkgs/pkgs/tools/misc/tmuxp/default.nix @@ -4,11 +4,11 @@ with python.pkgs; buildPythonApplication rec { pname = "tmuxp"; - version = "1.7.0"; + version = "1.7.2"; src = fetchPypi { inherit pname version; - sha256 = "e5135d07a8944170e39ea8b96b09123c54648cca94537b4953d8f15e5a537da2"; + sha256 = "14296b62db260420d4600dcd805408ea908b3a78d4ea0a6a403d092fdbf6d075"; }; postPatch = '' diff --git a/nixpkgs/pkgs/tools/misc/topgrade/default.nix b/nixpkgs/pkgs/tools/misc/topgrade/default.nix index 2fb41edaa7cb..ff0661de46ad 100644 --- a/nixpkgs/pkgs/tools/misc/topgrade/default.nix +++ b/nixpkgs/pkgs/tools/misc/topgrade/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "topgrade"; - version = "6.4.0"; + version = "6.8.0"; src = fetchFromGitHub { owner = "r-darwish"; repo = pname; rev = "v${version}"; - sha256 = "sha256-xrp2oGqJRhjYYZ0dDvYiUfgKM2mazOAlkJQyawDk2y4="; + sha256 = "sha256-PPOsb9bne0q/WGAL3W2RGo/0yxyz/XXU3xYXKcCIqX0="; }; - cargoSha256 = "sha256-EK48mrTYgh0AgC53rvVRFfdZP/FS9LOZWr8TF13qEl0="; + cargoSha256 = "sha256-IirU/4hE+jo5A9pB7RnePhqcbCZXBCe0Ki6i7eEWIbk="; buildInputs = lib.optional stdenv.isDarwin Foundation; diff --git a/nixpkgs/pkgs/tools/misc/tremor-rs/default.nix b/nixpkgs/pkgs/tools/misc/tremor-rs/default.nix new file mode 100644 index 000000000000..fb1268acc6fa --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/tremor-rs/default.nix @@ -0,0 +1,42 @@ +{ lib, rustPlatform, pkg-config, cmake, llvmPackages, openssl, fetchFromGitHub +, installShellFiles }: + +rustPlatform.buildRustPackage rec { + pname = "tremor"; + version = "0.10.1"; + + src = fetchFromGitHub { + owner = "tremor-rs"; + repo = "tremor-runtime"; + rev = "v${version}"; + sha256 = "1z1khxfdj2j0xf7dp0x2cd9kl6r4qicp7kc4p4sdky2yib66512y"; + }; + + cargoSha256 = "sha256-rN/d6BL2d0D0ichQR6v0543Bh/Y2ktz8ExMH50M8B8c="; + + nativeBuildInputs = [ cmake pkg-config installShellFiles ]; + + buildInputs = [ openssl ]; + + postInstall = '' + installShellCompletion --cmd tremor \ + --bash <($out/bin/tremor completions bash) \ + --fish <($out/bin/tremor completions fish) \ + --zsh <($out/bin/tremor completions zsh) + ''; + + LIBCLANG_PATH = "${llvmPackages.libclang}/lib"; + + # OPENSSL_NO_VENDOR - If set, always find OpenSSL in the system, even if the vendored feature is enabled. + OPENSSL_NO_VENDOR = 1; + + cargoBuildFlags = [ "--all" ]; + + meta = with lib; { + description = "Early stage event processing system for unstructured data with rich support for structural pattern matching, filtering and transformation"; + homepage = "https://www.tremor.rs/"; + license = licenses.asl20; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ humancalico ]; + }; +} diff --git a/nixpkgs/pkgs/tools/misc/ttfautohint/default.nix b/nixpkgs/pkgs/tools/misc/ttfautohint/default.nix index 9e88e5da4f87..fe121c2d51ce 100644 --- a/nixpkgs/pkgs/tools/misc/ttfautohint/default.nix +++ b/nixpkgs/pkgs/tools/misc/ttfautohint/default.nix @@ -25,6 +25,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + dontWrapQtApps = true; + meta = with lib; { description = "An automatic hinter for TrueType fonts"; longDescription = '' diff --git a/nixpkgs/pkgs/tools/misc/tz/default.nix b/nixpkgs/pkgs/tools/misc/tz/default.nix new file mode 100644 index 000000000000..c46137bd9e5a --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/tz/default.nix @@ -0,0 +1,22 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "tz"; + version = "0.5"; + + src = fetchFromGitHub { + owner = "oz"; + repo = "tz"; + rev = "v${version}"; + sha256 = "sha256-OwjhV3n1B1yQTNYm4VOW500t0524g85YYiOAAu9yPeo="; + }; + + vendorSha256 = "sha256-Soa87I7oMa34LjYKxNAz9Limi0kQ6JUtb/zI4G7yZnw="; + + meta = with lib; { + description = "A time zone helper"; + homepage = "https://github.com/oz/tz"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ siraben ]; + }; +} diff --git a/nixpkgs/pkgs/tools/misc/uhubctl/default.nix b/nixpkgs/pkgs/tools/misc/uhubctl/default.nix index c1dfae680503..f5bbe2de73f5 100644 --- a/nixpkgs/pkgs/tools/misc/uhubctl/default.nix +++ b/nixpkgs/pkgs/tools/misc/uhubctl/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "uhubctl"; - version = "2.3.0"; + version = "2.4.0"; src = fetchFromGitHub { owner = "mvp"; repo = "uhubctl"; rev = "v${version}"; - sha256 = "1wxsiygw6gwv1h90yassnxylkyi2dfz7y59qkmb7rs8a8javj7nv"; + sha256 = "sha256-F3fOoZYnfIWMrESyVJ/9z6Vou1279avhs600rQayUVA="; }; buildInputs = [ libusb1 ]; diff --git a/nixpkgs/pkgs/tools/misc/umlet/default.nix b/nixpkgs/pkgs/tools/misc/umlet/default.nix index a073417be7d2..d88e0bdea15e 100644 --- a/nixpkgs/pkgs/tools/misc/umlet/default.nix +++ b/nixpkgs/pkgs/tools/misc/umlet/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0jfyxjxsjx29xhs3fl0f574nyncmk9j5jp8zlgd401mcaznn9c7l"; }; - buildInputs = [ unzip ]; + nativeBuildInputs = [ unzip ]; installPhase = '' mkdir -p "$out/bin" diff --git a/nixpkgs/pkgs/tools/misc/unclutter/default.nix b/nixpkgs/pkgs/tools/misc/unclutter/default.nix index 1b7602981919..66344c9fdeef 100644 --- a/nixpkgs/pkgs/tools/misc/unclutter/default.nix +++ b/nixpkgs/pkgs/tools/misc/unclutter/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { buildInputs = [xlibsWrapper]; - buildFlags = [ "CC=cc" ]; + buildFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; installPhase = '' mkdir -pv "$out/bin" diff --git a/nixpkgs/pkgs/tools/misc/units/default.nix b/nixpkgs/pkgs/tools/misc/units/default.nix index 2b40e289cadd..04e955a78b18 100644 --- a/nixpkgs/pkgs/tools/misc/units/default.nix +++ b/nixpkgs/pkgs/tools/misc/units/default.nix @@ -11,11 +11,11 @@ assert enableCurrenciesUpdater -> pythonPackages != null; stdenv.mkDerivation rec { pname = "units"; - version = "2.19"; + version = "2.21"; src = fetchurl { url = "mirror://gnu/units/${pname}-${version}.tar.gz"; - sha256 = "0mk562g7dnidjgfgvkxxpvlba66fh1ykmfd9ylzvcln1vxmi6qj2"; + sha256 = "sha256-bD6AqfmAWJ/ZYqWFKiZ0ZCJX2xxf1bJ8TZ5mTzSGy68="; }; pythonEnv = pythonPackages.python.withPackages(ps: [ diff --git a/nixpkgs/pkgs/tools/misc/upterm/default.nix b/nixpkgs/pkgs/tools/misc/upterm/default.nix index 533ef192e8d7..2f504a0cef8c 100644 --- a/nixpkgs/pkgs/tools/misc/upterm/default.nix +++ b/nixpkgs/pkgs/tools/misc/upterm/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "upterm"; - version = "0.5.2"; + version = "0.6.5"; src = fetchFromGitHub { owner = "owenthereal"; repo = "upterm"; rev = "v${version}"; - sha256 = "007hgkkn1cq1i0rkn45i3bz5q9irzm67cz0j5glr6f6d4s0nkjiq"; + sha256 = "sha256-wzDK7iQN/z/M1mTKPCH3c+OjFsavplV/0oMiOe5thuI="; }; vendorSha256 = null; diff --git a/nixpkgs/pkgs/tools/misc/urjtag/default.nix b/nixpkgs/pkgs/tools/misc/urjtag/default.nix index d75d462fc8ee..4630ec31ebba 100644 --- a/nixpkgs/pkgs/tools/misc/urjtag/default.nix +++ b/nixpkgs/pkgs/tools/misc/urjtag/default.nix @@ -1,38 +1,57 @@ -{ lib, stdenv, autoconf, automake, pkg-config, gettext, libtool, bison -, flex, which, subversion, fetchurl, makeWrapper, libftdi1, libusb-compat-0_1, readline -, python3 -, svfSupport ? true +{ lib +, stdenv +, fetchurl +, autoconf +, automake +, autoreconfHook +, gettext +, libftdi1 +, libtool +, libusb-compat-0_1 +, makeWrapper +, pkg-config +, readline +, which , bsdlSupport ? true -, staplSupport ? true , jedecSupport ? true +, staplSupport ? true +, svfSupport ? true }: stdenv.mkDerivation rec { - version = "2019.12"; pname = "urjtag"; + version = "2021.03"; src = fetchurl { - url = "https://downloads.sourceforge.net/project/urjtag/urjtag/${version}/urjtag-${version}.tar.xz"; - sha256 = "1k2vmvvarik0q3llbfbk8ad35mcns7w1ln9gla1mn7z9c6x6x90r"; + url = "mirror://sourceforge/project/${pname}/${pname}/${version}/${pname}-${version}.tar.xz"; + hash = "sha256-sKLqokVROvCW3E13AQmDIzXGlMbBKqXpL++uhoVBbxw="; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ gettext autoconf automake libtool bison flex which - subversion makeWrapper readline libftdi1 libusb-compat-0_1 python3 ]; + nativeBuildInputs = [ + autoreconfHook + pkg-config + which + gettext + ]; + buildInputs = [ + libftdi1 + libtool + libusb-compat-0_1 + readline + ]; configureFlags = [ - (lib.enableFeature svfSupport "svf") (lib.enableFeature bsdlSupport "bsdl") - (lib.enableFeature staplSupport "stapl") (lib.enableFeature jedecSupport "jedec-exp") + (lib.enableFeature staplSupport "stapl") + (lib.enableFeature svfSupport "svf") ]; - meta = { - description = "Enhanced, modern tool for communicating over JTAG with flash chips, CPUs,and many more"; + meta = with lib; { homepage = "http://urjtag.org/"; - license = with lib.licenses; [ gpl2Plus lgpl21Plus ]; - platforms = lib.platforms.gnu ++ lib.platforms.linux; # arbitrary choice - maintainers = with lib.maintainers; [ lowfatcomputing ]; + description = "Universal JTAG library, server and tools"; + license = with licenses; [ gpl2Plus lgpl21Plus ]; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = platforms.linux; }; } - diff --git a/nixpkgs/pkgs/tools/misc/usbview/default.nix b/nixpkgs/pkgs/tools/misc/usbview/default.nix new file mode 100644 index 000000000000..2f417ea86de5 --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/usbview/default.nix @@ -0,0 +1,36 @@ +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, pkg-config +, gtk3 +}: + +stdenv.mkDerivation rec { + pname = "usbview"; + version = "2.0"; + + src = fetchFromGitHub { + owner = "gregkh"; + repo = "usbview"; + rev = "v${version}"; + sha256 = "1cw5jjpidjn34rxdjslpdlj99k4dqaq1kz6mplv5hgjdddijvn5p"; + }; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; + + buildInputs = [ + gtk3 + ]; + + meta = with lib; { + description = "USB viewer for Linux"; + license = licenses.gpl2Only; + homepage = "http://www.kroah.com/linux-usb/"; + maintainers = with maintainers; [ shamilton ]; + platforms = platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/tools/misc/uutils-coreutils/default.nix b/nixpkgs/pkgs/tools/misc/uutils-coreutils/default.nix index 44871b07a8ea..b2d3883176c6 100644 --- a/nixpkgs/pkgs/tools/misc/uutils-coreutils/default.nix +++ b/nixpkgs/pkgs/tools/misc/uutils-coreutils/default.nix @@ -1,32 +1,51 @@ -{ stdenv, fetchFromGitHub, rustPlatform, cargo, cmake, sphinx, lib, prefix ? "uutils-" +{ lib +, stdenv +, fetchFromGitHub +, rustPlatform +, cargo +, sphinx , Security +, prefix ? "uutils-" +, buildMulticallBinary ? true }: -rustPlatform.buildRustPackage rec { + +stdenv.mkDerivation rec { pname = "uutils-coreutils"; - version = "0.0.3"; + version = "0.0.6"; src = fetchFromGitHub { owner = "uutils"; repo = "coreutils"; rev = version; - sha256 = "QWiEHk8aciiwQeyNgrr0M0c1EeAgE3gSqw0ly/YTwTQ="; + sha256 = "sha256-dnswE/DU2jCfxWW10Ctjw8woktwWZqyd3E9IuKkle1M="; }; - # too many impure/platform-dependent tests - doCheck = false; + postPatch = '' + # can be removed after https://github.com/uutils/coreutils/pull/1815 is included + substituteInPlace GNUmakefile \ + --replace uutils coreutils + ''; - cargoSha256 = "m2a7WNkF5TxjJlytjdoQ/JZIF9gp9qBkH+UU/NVRJzA="; + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + name = "${pname}-${version}"; + hash = "sha256-92BHPSVIPZLn399AcaJJjRq2WkxzDm8knKN3FIdAxAA="; + }; - makeFlags = - [ "CARGO=${cargo}/bin/cargo" "PREFIX=$(out)" "PROFILE=release" "INSTALLDIR_MAN=$(out)/share/man/man1" ] - ++ lib.optional (prefix != null) [ "PROG_PREFIX=${prefix}" ]; + nativeBuildInputs = [ rustPlatform.cargoSetupHook sphinx ]; - nativeBuildInputs = [ cmake cargo sphinx ]; buildInputs = lib.optional stdenv.isDarwin Security; - # empty {build,install}Phase to use defaults of `stdenv.mkDerivation` rather than rust defaults - buildPhase = ""; - installPhase = ""; + makeFlags = [ + "CARGO=${cargo}/bin/cargo" + "PREFIX=${placeholder "out"}" + "PROFILE=release" + "INSTALLDIR_MAN=${placeholder "out"}/share/man/man1" + ] ++ lib.optionals (prefix != null) [ "PROG_PREFIX=${prefix}" ] + ++ lib.optionals buildMulticallBinary [ "MULTICALL=y" ]; + + # too many impure/platform-dependent tests + doCheck = false; meta = with lib; { description = "Cross-platform Rust rewrite of the GNU coreutils"; @@ -35,7 +54,7 @@ rustPlatform.buildRustPackage rec { CLI utils in Rust. This repo is to aggregate the GNU coreutils rewrites. ''; homepage = "https://github.com/uutils/coreutils"; - maintainers = with maintainers; [ siraben ]; + maintainers = with maintainers; [ siraben SuperSandro2000 ]; license = licenses.mit; platforms = platforms.unix; }; diff --git a/nixpkgs/pkgs/tools/misc/uwuify/default.nix b/nixpkgs/pkgs/tools/misc/uwuify/default.nix new file mode 100644 index 000000000000..849703ffd763 --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/uwuify/default.nix @@ -0,0 +1,23 @@ +{ lib, stdenv, fetchFromGitHub, rustPlatform, libiconv }: + +rustPlatform.buildRustPackage rec { + pname = "uwuify"; + version = "0.2.2"; + + src = fetchFromGitHub { + owner = "Daniel-Liu-c0deb0t"; + repo = "uwu"; + rev = "v${version}"; + sha256 = "sha256-MzXObbxccwEG7egmQMCdhUukGqZS+NgbYwZjTaqME7I="; + }; + + cargoSha256 = "sha256-iyoGLFIfHToOwqEb5lQ1nXR0W1gLOVMfvw39LX6ib+U="; + buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; + + meta = with lib; { + description = "Fast text uwuifier"; + homepage = "https://github.com/Daniel-Liu-c0deb0t/uwu"; + license = licenses.mit; + maintainers = with maintainers; [ siraben ]; + }; +} diff --git a/nixpkgs/pkgs/tools/misc/vector/default.nix b/nixpkgs/pkgs/tools/misc/vector/default.nix index f207eda0de89..04eb29ca1e11 100644 --- a/nixpkgs/pkgs/tools/misc/vector/default.nix +++ b/nixpkgs/pkgs/tools/misc/vector/default.nix @@ -1,41 +1,42 @@ -{ stdenv, lib, fetchFromGitHub, rustPlatform -, openssl, pkg-config, protobuf -, Security, libiconv, rdkafka +{ stdenv +, lib +, fetchFromGitHub +, rustPlatform +, openssl +, pkg-config +, protobuf +, Security +, libiconv +, rdkafka , tzdata - -, features ? - ((if stdenv.isAarch64 - then [ "jemallocator" "rdkafka" "rdkafka/dynamic_linking" ] - else [ "leveldb" "leveldb/leveldb-sys-2" "jemallocator" "rdkafka" "rdkafka/dynamic_linking" ]) - ++ - (lib.optional stdenv.targetPlatform.isUnix "unix") - ++ - [ "sinks" "sources" "transforms" ]) , coreutils , CoreServices +, features ? ([ "jemallocator" "rdkafka" "rdkafka/dynamic_linking" ] + ++ (lib.optional stdenv.targetPlatform.isUnix "unix") + ++ [ "sinks" "sources" "transforms" ]) }: rustPlatform.buildRustPackage rec { pname = "vector"; - version = "0.10.0"; + version = "0.12.2"; src = fetchFromGitHub { - owner = "timberio"; - repo = pname; - rev = "v${version}"; - sha256 = "0q6x3fvwwh18iyznqlr09n3zppzgw9jaz973s8haz54hnxj16wx0"; + owner = "timberio"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-LutCzpJo47wvEze7bAObRVraNhVuQFc9NQ79NzKA9CM="; }; - cargoSha256 = "Y/vDYXWQ65zZ86vTwP4aCZYCMZuqbz6tpfv4uRkFAzc="; + cargoSha256 = "sha256-GU5p9DB5Bk8eQc1B/WA87grbVJVcT1ELJ0WzmRYgDzc="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl protobuf rdkafka ] - ++ lib.optional stdenv.isDarwin [ Security libiconv coreutils CoreServices ]; + ++ lib.optional stdenv.isDarwin [ Security libiconv coreutils CoreServices ]; # needed for internal protobuf c wrapper library - PROTOC="${protobuf}/bin/protoc"; - PROTOC_INCLUDE="${protobuf}/include"; + PROTOC = "${protobuf}/bin/protoc"; + PROTOC_INCLUDE = "${protobuf}/include"; - cargoBuildFlags = [ "--no-default-features" "--features" "${lib.concatStringsSep "," features}" ]; + cargoBuildFlags = [ "--no-default-features" "--features" (lib.concatStringsSep "," features) ]; checkPhase = "TZDIR=${tzdata}/share/zoneinfo cargo test --no-default-features --features ${lib.concatStringsSep "," features} -- --test-threads 1"; # recent overhauls of DNS support in 0.9 mean that we try to resolve @@ -49,19 +50,21 @@ rustPlatform.buildRustPackage rec { # nor do I know why it depends on rustc. # However, in order for the closure size to stay at a reasonable level, # transforms-geoip is patched out of Cargo.toml for now - unless explicitly asked for. - patchPhase = '' + postPatch = '' substituteInPlace ./src/dns.rs \ - --replace "#[test]" "" + --replace "#[tokio::test]" "" ${lib.optionalString (!builtins.elem "transforms-geoip" features) '' substituteInPlace ./Cargo.toml --replace '"transforms-geoip",' "" ''} ''; + passthru = { inherit features; }; + meta = with lib; { description = "A high-performance logs, metrics, and events router"; - homepage = "https://github.com/timberio/vector"; - license = with licenses; [ asl20 ]; + homepage = "https://github.com/timberio/vector"; + license = with licenses; [ asl20 ]; maintainers = with maintainers; [ thoughtpolice happysalada ]; }; } diff --git a/nixpkgs/pkgs/tools/misc/vimer/default.nix b/nixpkgs/pkgs/tools/misc/vimer/default.nix index 1fbb85f07516..bbab2d64bb00 100644 --- a/nixpkgs/pkgs/tools/misc/vimer/default.nix +++ b/nixpkgs/pkgs/tools/misc/vimer/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ''; license = licenses.mit; maintainers = [ maintainers.matthiasbeyer ]; - platforms = platforms.linux; + platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/tools/misc/vimv/default.nix b/nixpkgs/pkgs/tools/misc/vimv/default.nix index 2b056cd079a7..a36c9548462d 100644 --- a/nixpkgs/pkgs/tools/misc/vimv/default.nix +++ b/nixpkgs/pkgs/tools/misc/vimv/default.nix @@ -1,24 +1,27 @@ -{ lib, stdenv, bash, fetchFromGitHub }: -stdenv.mkDerivation { +{ lib, stdenvNoCC, fetchFromGitHub }: + +stdenvNoCC.mkDerivation { pname = "vimv"; version = "unstable-2019-10-31"; + src = fetchFromGitHub { owner = "thameera"; repo = "vimv"; rev = "4152496c1946f68a13c648fb7e583ef23dac4eb8"; sha256 = "1fsrfx2gs6bqx7wk7pgcji2i2x4alqpsi66aif4kqvnpqfhcfzjd"; }; - phases = [ "installPhase" ]; + installPhase = '' install -d $out/bin install $src/vimv $out/bin/vimv patchShebangs $out/bin/vimv ''; + meta = with lib; { homepage = "https://github.com/thameera/vimv"; description = "Batch-rename files using Vim"; license = licenses.mit; - platforms = platforms.linux; + platforms = platforms.all; maintainers = [ maintainers.kmein ]; }; } diff --git a/nixpkgs/pkgs/tools/misc/vorbisgain/default.nix b/nixpkgs/pkgs/tools/misc/vorbisgain/default.nix index fe405b0eaa40..6cc13e6f87e6 100644 --- a/nixpkgs/pkgs/tools/misc/vorbisgain/default.nix +++ b/nixpkgs/pkgs/tools/misc/vorbisgain/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - buildInputs = [ unzip libogg libvorbis ]; + nativeBuildInputs = [ unzip ]; + buildInputs = [ libogg libvorbis ]; patchPhase = '' chmod -v +x configure diff --git a/nixpkgs/pkgs/tools/misc/vsh/default.nix b/nixpkgs/pkgs/tools/misc/vsh/default.nix index f3eb1f9ad8e5..a94c58368a4f 100644 --- a/nixpkgs/pkgs/tools/misc/vsh/default.nix +++ b/nixpkgs/pkgs/tools/misc/vsh/default.nix @@ -2,21 +2,17 @@ buildGoModule rec { pname = "vsh"; - version = "0.9.0"; + version = "0.11.0"; src = fetchFromGitHub { owner = "fishi0x01"; repo = "vsh"; rev = "v${version}"; - sha256 = "1f6szcdakfx3zap1zpkrcs134plv7vnyilzcxs5jbhrrbr6q1807"; + sha256 = "0dhn2aqd52fgasy4j3ar67fzwzcxfi1vl09kni8jwcna8rjgg3fj"; }; - vendorSha256 = "0a2kjql4ibglxkq5dgzr2sxxxm38nf83s4rsk2gd1cf7v0flr02j"; - - # vendor dir in vsh repo is incomplete - deleteVendor = true; - - runVend = true; + # vendor directory is part of repository + vendorSha256 = null; # make sure version gets set at compile time buildFlagsArray = [ "-ldflags=-s -w -X main.vshVersion=v${version}" ]; diff --git a/nixpkgs/pkgs/tools/misc/vttest/default.nix b/nixpkgs/pkgs/tools/misc/vttest/default.nix index 64a76e97baef..a78b68569647 100644 --- a/nixpkgs/pkgs/tools/misc/vttest/default.nix +++ b/nixpkgs/pkgs/tools/misc/vttest/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "vttest"; - version = "20200610"; + version = "20210210"; src = fetchurl { urls = [ "https://invisible-mirror.net/archives/${pname}/${pname}-${version}.tgz" "ftp://ftp.invisible-island.net/${pname}/${pname}-${version}.tgz" ]; - sha256 = "0181lk999gfqk8pkd4yx0qrz9r3k9a0z0i50wcayp7z1n1ivqllb"; + sha256 = "sha256-D5ii4wWYKRXxUgmEw+hpjjrNUI7iEHEVKMifWn6n8EY="; }; meta = with lib; { diff --git a/nixpkgs/pkgs/tools/misc/wev/default.nix b/nixpkgs/pkgs/tools/misc/wev/default.nix deleted file mode 100644 index c1debfd924da..000000000000 --- a/nixpkgs/pkgs/tools/misc/wev/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib, stdenv, fetchurl -, pkg-config, scdoc, wayland -, wayland-protocols, libxkbcommon -}: - -stdenv.mkDerivation rec { - pname = "wev"; - version = "1.0.0"; - - src = fetchurl { - url = "https://git.sr.ht/~sircmpwn/wev/archive/${version}.tar.gz"; - sha256 = "0vlxdkb59v6nb10j28gh1a56sx8jk7ak7liwzv911kpmygnls03g"; - }; - - nativeBuildInputs = [ pkg-config scdoc wayland ]; - buildInputs = [ wayland-protocols libxkbcommon ]; - - installFlags = [ "PREFIX=$(out)" ]; - - meta = with lib; { - description = "Wayland event viewer"; - longDescription = '' - This is a tool for debugging events on a Wayland window, analagous to the - X11 tool xev. - ''; - homepage = "https://git.sr.ht/~sircmpwn/wev"; - license = licenses.mit; - platforms = platforms.unix; - maintainers = with maintainers; [ primeos ]; - }; -} diff --git a/nixpkgs/pkgs/tools/misc/wl-clipboard/default.nix b/nixpkgs/pkgs/tools/misc/wl-clipboard/default.nix deleted file mode 100644 index 676ff03ad9b4..000000000000 --- a/nixpkgs/pkgs/tools/misc/wl-clipboard/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config -, wayland, wayland-protocols }: - -stdenv.mkDerivation rec { - pname = "wl-clipboard"; - version = "2.0.0"; - - src = fetchFromGitHub { - owner = "bugaevc"; - repo = "wl-clipboard"; - rev = "v${version}"; - sha256 = "0c4w87ipsw09aii34szj9p0xfy0m00wyjpll0gb0aqmwa60p0c5d"; - }; - - nativeBuildInputs = [ meson ninja pkg-config wayland-protocols ]; - buildInputs = [ wayland ]; - - meta = with lib; { - description = "Command-line copy/paste utilities for Wayland"; - homepage = "https://github.com/bugaevc/wl-clipboard"; - license = licenses.gpl3; - maintainers = with maintainers; [ dywedir ]; - platforms = platforms.linux; - }; -} diff --git a/nixpkgs/pkgs/tools/misc/wlr-randr/default.nix b/nixpkgs/pkgs/tools/misc/wlr-randr/default.nix deleted file mode 100644 index b635316bf777..000000000000 --- a/nixpkgs/pkgs/tools/misc/wlr-randr/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, cmake, pkg-config, wayland }: - -stdenv.mkDerivation rec { - pname = "wlr-randr"; - version = "0.2.0"; - - src = fetchFromGitHub { - owner = "emersion"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-JeSxFXSFxcTwJz9EaLb18wtD4ZIT+ATeYM5OyDTJhDQ="; - }; - - nativeBuildInputs = [ meson ninja cmake pkg-config ]; - buildInputs = [ wayland ]; - - meta = with lib; { - license = licenses.mit; - description = "An xrandr clone for wlroots compositors"; - homepage = "https://github.com/emersion/wlr-randr"; - maintainers = with maintainers; [ ma27 ]; - }; -} diff --git a/nixpkgs/pkgs/tools/misc/wob/default.nix b/nixpkgs/pkgs/tools/misc/wob/default.nix deleted file mode 100644 index e0622e5416aa..000000000000 --- a/nixpkgs/pkgs/tools/misc/wob/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib, stdenv, fetchFromGitHub -, meson, ninja, pkg-config, scdoc, wayland # wayland-scanner -, wayland-protocols, libseccomp -}: - -stdenv.mkDerivation rec { - pname = "wob"; - version = "0.11"; - - src = fetchFromGitHub { - owner = "francma"; - repo = pname; - rev = version; - sha256 = "13mx6nzab6msp57s9mv9ambz53a4zkafms9v97xv5zvd6xarnrya"; - }; - - nativeBuildInputs = [ meson ninja pkg-config scdoc wayland ]; - buildInputs = [ wayland-protocols ] - ++ lib.optional stdenv.isLinux libseccomp; - - mesonFlags = lib.optional stdenv.isLinux "-Dseccomp=enabled"; - - meta = with lib; { - description = "A lightweight overlay bar for Wayland"; - longDescription = '' - A lightweight overlay volume/backlight/progress/anything bar for Wayland, - inspired by xob. - ''; - inherit (src.meta) homepage; - changelog = "https://github.com/francma/wob/releases/tag/${version}"; - license = licenses.isc; - platforms = platforms.unix; - maintainers = with maintainers; [ primeos ]; - }; -} diff --git a/nixpkgs/pkgs/tools/misc/xvfb-run/default.nix b/nixpkgs/pkgs/tools/misc/xvfb-run/default.nix index a0392bf4754c..05750b962f00 100644 --- a/nixpkgs/pkgs/tools/misc/xvfb-run/default.nix +++ b/nixpkgs/pkgs/tools/misc/xvfb-run/default.nix @@ -10,7 +10,7 @@ let in stdenv.mkDerivation { name = "xvfb-run"; - buildInputs = [makeWrapper]; + nativeBuildInputs = [ makeWrapper ]; buildCommand = '' mkdir -p $out/bin cp ${xvfb_run} $out/bin/xvfb-run diff --git a/nixpkgs/pkgs/tools/misc/yad/default.nix b/nixpkgs/pkgs/tools/misc/yad/default.nix index 84d4833d63e4..2069ba6b1593 100644 --- a/nixpkgs/pkgs/tools/misc/yad/default.nix +++ b/nixpkgs/pkgs/tools/misc/yad/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "yad"; - version = "7.2"; + version = "8.0"; src = fetchFromGitHub { owner = "v1cont"; repo = "yad"; rev = "v${version}"; - sha256 = "0ih97hrcra2bg8q19b8819hip1p424z1vj61cl1ym5p477rp37yx"; + sha256 = "sha256-KntJtli1PtqH/9XOTq4FkVJYklp0L7bChwQQGCBTLDA="; }; configureFlags = [ diff --git a/nixpkgs/pkgs/tools/misc/yle-dl/default.nix b/nixpkgs/pkgs/tools/misc/yle-dl/default.nix index 9ee81cd1b158..818ad5ec645e 100644 --- a/nixpkgs/pkgs/tools/misc/yle-dl/default.nix +++ b/nixpkgs/pkgs/tools/misc/yle-dl/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "yle-dl"; - version = "20201022"; + version = "20210212"; src = fetchFromGitHub { owner = "aajanki"; repo = "yle-dl"; rev = version; - sha256 = "0p56pb3wxdzqgs4fsh4hn06xs0mgzgznqqr0bn2vkkkibnkr1asp"; + sha256 = "sha256-0JnigYmslQ/7KsQAFg3AaWPAU/tD1lS7lF6OCcv/ze4="; }; propagatedBuildInputs = with python3Packages; [ diff --git a/nixpkgs/pkgs/tools/misc/youtube-dl/default.nix b/nixpkgs/pkgs/tools/misc/youtube-dl/default.nix index 8afd9786564c..fa17bea85852 100644 --- a/nixpkgs/pkgs/tools/misc/youtube-dl/default.nix +++ b/nixpkgs/pkgs/tools/misc/youtube-dl/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { # The websites youtube-dl deals with are a very moving target. That means that # downloads break constantly. Because of that, updates should always be backported # to the latest stable release. - version = "2021.04.01"; + version = "2021.04.07"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz"; - sha256 = "1vw9l32bv115129v1lfar626y3vivvxkp36bc1phjcrsjfayz67h"; + sha256 = "02d51l6gdjr3zhhi7ydf5kzv8dv4jzq0ygja7zb2h9k7hnl0l27m"; }; nativeBuildInputs = [ installShellFiles makeWrapper ]; diff --git a/nixpkgs/pkgs/tools/misc/ytfzf/default.nix b/nixpkgs/pkgs/tools/misc/ytfzf/default.nix new file mode 100644 index 000000000000..6129fd4b9dad --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/ytfzf/default.nix @@ -0,0 +1,51 @@ +{ lib +, stdenv +, fetchFromGitHub +, makeWrapper +, coreutils +, curl +, dmenu +, fzf +, gnused +, jq +, mpv +, ncurses +, ueberzug +, youtube-dl +}: + +stdenv.mkDerivation rec { + pname = "ytfzf"; + version = "1.1.2"; + + src = fetchFromGitHub { + owner = "pystardust"; + repo = "ytfzf"; + rev = "v${version}"; + sha256 = "09az557479d3s1my46d2w86ndkvs2xi127kaw0csag0wlq2qq10p"; + }; + + patches = [ + # Updates have to be installed through Nix. + ./no-update.patch + ]; + + nativeBuildInputs = [ makeWrapper ]; + + makeFlags = [ "PREFIX=${placeholder "out"}/bin" ]; + + dontBuild = true; + + postInstall = '' + wrapProgram "$out/bin/ytfzf" --prefix PATH : ${lib.makeBinPath [ + coreutils curl dmenu fzf gnused jq mpv ncurses ueberzug youtube-dl + ]} + ''; + + meta = with lib; { + description = "A posix script to find and watch youtube videos from the terminal"; + homepage = "https://github.com/pystardust/ytfzf"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/nixpkgs/pkgs/tools/misc/ytfzf/no-update.patch b/nixpkgs/pkgs/tools/misc/ytfzf/no-update.patch new file mode 100644 index 000000000000..db7d4b40fccb --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/ytfzf/no-update.patch @@ -0,0 +1,30 @@ +diff --git a/ytfzf b/ytfzf +index 42f41c0..f75f5cb 100755 +--- a/ytfzf ++++ b/ytfzf +@@ -892,23 +892,8 @@ send_notify () { + } + + update_ytfzf () { +- branch="$1" +- updatefile="/tmp/ytfzf-update" +- curl -L "https://raw.githubusercontent.com/pystardust/ytfzf/$branch/ytfzf" -o "$updatefile" +- +- if sed -n '1p' < "$updatefile" | grep -q '#!/bin/sh' ; then +- chmod 755 "$updatefile" +- if [ "$(uname)" = "Darwin" ]; then +- sudo cp "$updatefile" "/usr/local/bin/ytfzf" +- else +- sudo cp "$updatefile" "/usr/bin/ytfzf" +- fi +- else +- printf "%bFailed to update ytfzf. Try again later.%b" "$c_red" "$c_reset" +- fi +- +- rm "$updatefile" +- exit ++ printf "%bUpdates have to be installed through Nix.%b\n" "$c_red" "$c_reset" ++ exit 1 + } + + scrape_subscriptions () { diff --git a/nixpkgs/pkgs/tools/misc/yubikey-manager-qt/default.nix b/nixpkgs/pkgs/tools/misc/yubikey-manager-qt/default.nix index 0f81f132abdf..02982f9cc4a3 100644 --- a/nixpkgs/pkgs/tools/misc/yubikey-manager-qt/default.nix +++ b/nixpkgs/pkgs/tools/misc/yubikey-manager-qt/default.nix @@ -11,8 +11,6 @@ , qtgraphicaleffects , qtquickcontrols , qtquickcontrols2 -, qtdeclarative -, qtsvg , yubikey-manager , yubikey-personalization }: @@ -34,8 +32,6 @@ stdenv.mkDerivation rec { buildInputs = [ pythonPackages.python qtbase qtgraphicaleffects qtquickcontrols qtquickcontrols2 pyotherside ]; - enableParallelBuilding = true; - pythonPath = [ yubikey-manager ]; dontWrapQtApps = true; diff --git a/nixpkgs/pkgs/tools/misc/yubikey-manager/default.nix b/nixpkgs/pkgs/tools/misc/yubikey-manager/default.nix index 07218d054df7..12b3aa0f05f6 100644 --- a/nixpkgs/pkgs/tools/misc/yubikey-manager/default.nix +++ b/nixpkgs/pkgs/tools/misc/yubikey-manager/default.nix @@ -3,11 +3,11 @@ python3Packages.buildPythonPackage rec { pname = "yubikey-manager"; - version = "3.1.2"; + version = "4.0.1"; srcs = fetchurl { url = "https://developers.yubico.com/${pname}/Releases/${pname}-${version}.tar.gz"; - hash = "sha256-dwnIOuu0QyWRl6RSdyQw7dGsAZ4xpXpx6jOpCkp4efE="; + hash = "sha256-OxbKo5vwOBabU6/2hO4RMWiifo4IVIxz+DlcwP9xO/E="; }; propagatedBuildInputs = @@ -42,8 +42,7 @@ python3Packages.buildPythonPackage rec { --replace 'compdef _ykman_completion ykman;' '_ykman_completion "$@"' ''; - # See https://github.com/NixOS/nixpkgs/issues/29169 - doCheck = false; + checkInputs = with python3Packages; [ pytestCheckHook makefun ]; meta = with lib; { homepage = "https://developers.yubico.com/yubikey-manager"; diff --git a/nixpkgs/pkgs/tools/misc/yubikey-neo-manager/default.nix b/nixpkgs/pkgs/tools/misc/yubikey-neo-manager/default.nix deleted file mode 100644 index 3991b99fcdcf..000000000000 --- a/nixpkgs/pkgs/tools/misc/yubikey-neo-manager/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, fetchurl, python27Packages -, libykneomgr, yubikey-personalization, libu2f-host }: - -python27Packages.buildPythonPackage rec { - namePrefix = ""; - name = "yubikey-neo-manager-${version}"; - version = "1.4.0"; - src = fetchurl { - url = "https://developers.yubico.com/yubikey-neo-manager/Releases/${name}.tar.gz"; - sha256 = "1isxvx27hk0avxwgwcwys2z8ickfs816ii1aklvmi09ak1rgrf1g"; - }; - - propagatedBuildInputs = with python27Packages; [ pyside pycrypto ]; - patches = [ ./fix-pyside-requirement.diff ]; - - # aid ctypes load_libary() - makeWrapperArgs = [ - "--set LD_PRELOAD '${libykneomgr}/lib/libykneomgr.so ${yubikey-personalization}/lib/libykpers-1.so ${libu2f-host}/lib/libu2f-host.so'" - ]; - - meta = with lib; { - homepage = "https://developers.yubico.com/yubikey-neo-manager"; - description = "Cross platform personalization tool for the YubiKey NEO"; - license = licenses.bsd2; - platforms = platforms.unix; - maintainers = with maintainers; [ mbakke ]; - }; -} diff --git a/nixpkgs/pkgs/tools/misc/yubikey-neo-manager/fix-pyside-requirement.diff b/nixpkgs/pkgs/tools/misc/yubikey-neo-manager/fix-pyside-requirement.diff deleted file mode 100644 index d11a3a1cc6d9..000000000000 --- a/nixpkgs/pkgs/tools/misc/yubikey-neo-manager/fix-pyside-requirement.diff +++ /dev/null @@ -1,17 +0,0 @@ -Description: Remove PySide requirement, since python-pyside does not register itself correctly -Author: Dain Nilsson <dain@yubico.com> -Forwarded: no ---- a/setup.py -+++ b/setup.py -@@ -44,8 +44,9 @@ - entry_points={ - 'gui_scripts': ['neoman=neoman.__main__:main'] - }, -- install_requires=['PySide', 'pycrypto'], -- yc_requires=['ctypes', 'qt'], -+ install_requires=['pycrypto'], -+ yc_requires=['ctypes'], -+ packages=['neoman', 'neoman.model', 'neoman.view', 'neoman.yubicommon', 'neoman.yubicommon.setup', 'neoman.yubicommon.ctypes', 'neoman.yubicommon.qt'], - cmdclass={'executable': executable, 'qt_resources': qt_resources('neoman')}, - classifiers=[ - 'License :: OSI Approved :: BSD License', diff --git a/nixpkgs/pkgs/tools/misc/z-lua/default.nix b/nixpkgs/pkgs/tools/misc/z-lua/default.nix index 64ae387e1a6d..79be68c8d566 100644 --- a/nixpkgs/pkgs/tools/misc/z-lua/default.nix +++ b/nixpkgs/pkgs/tools/misc/z-lua/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "z-lua"; - version = "1.8.11"; + version = "1.8.12"; src = fetchFromGitHub { owner = "skywind3000"; repo = "z.lua"; rev = version; - sha256 = "sha256-k3Q4Fc2T7ElZb98+DVodC7zMHv5yfdwOIkSk0k04WCo="; + sha256 = "sha256-q4hJ6QAR8cXjXM2e5Et1/DzyEw9L0120sgpTtqGG5wQ="; }; dontBuild = true; |