diff options
22 files changed, 123 insertions, 72 deletions
diff --git a/nixos/modules/services/networking/stubby.nix b/nixos/modules/services/networking/stubby.nix index 849d266576d5..c5e0f929a126 100644 --- a/nixos/modules/services/networking/stubby.nix +++ b/nixos/modules/services/networking/stubby.nix @@ -205,6 +205,7 @@ in wantedBy = [ "multi-user.target" ]; serviceConfig = { + Type = "notify"; AmbientCapabilities = "CAP_NET_BIND_SERVICE"; CapabilityBoundingSet = "CAP_NET_BIND_SERVICE"; ExecStart = "${pkgs.stubby}/bin/stubby -C ${confFile} ${optionalString cfg.debugLogging "-l"}"; diff --git a/pkgs/applications/networking/cluster/hetzner-kube/default.nix b/pkgs/applications/networking/cluster/hetzner-kube/default.nix index 4de0c3fbd7b6..1d9940c8f318 100644 --- a/pkgs/applications/networking/cluster/hetzner-kube/default.nix +++ b/pkgs/applications/networking/cluster/hetzner-kube/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "hetzner-kube"; - version = "0.4.1"; + version = "0.5.1"; src = fetchFromGitHub { owner = "xetys"; repo = "hetzner-kube"; rev = version; - sha256 = "11202i3340vaz8xh59gwj5x0djcgbzq9jfy2214lcpml71qc85f0"; + sha256 = "1iqgpmljqx6rhmvsir2675waj78amcfiw08knwvlmavjgpxx2ysw"; }; - modSha256 = "1j04xyjkz7jcqrs5p5z94jqagrzcxjr9m3lyp8i91c0ymxf5m2g3"; + modSha256 = "0jjrk93wdi13wrb5gchhqk7rgwm74kcizrbqsibgkgs2dszwfazh"; buildFlagsArray = '' -ldflags= @@ -20,7 +20,7 @@ buildGoModule rec { meta = { description = "A CLI tool for provisioning Kubernetes clusters on Hetzner Cloud"; - homepage = https://github.com/xetys/hetzner-kube; + homepage = "https://github.com/xetys/hetzner-kube"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ eliasp ]; platforms = lib.platforms.unix; diff --git a/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix b/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix index 79c4023152f5..e8fa7c7b4e39 100644 --- a/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix @@ -13,6 +13,7 @@ , libxml2 , systemd , upower +, gnome-online-accounts , cinnamon-settings-daemon , colord , polkit @@ -67,7 +68,7 @@ stdenv.mkDerivation rec { colord cinnamon-settings-daemon libwacom - gnome3.gnome-online-accounts + gnome-online-accounts tzdata networkmanager networkmanagerapplet diff --git a/pkgs/development/go-packages/generic/default.nix b/pkgs/development/go-packages/generic/default.nix index 03d777d5c880..2de234c9a1eb 100644 --- a/pkgs/development/go-packages/generic/default.nix +++ b/pkgs/development/go-packages/generic/default.nix @@ -243,7 +243,7 @@ let } // meta // { # add an extra maintainer to every package maintainers = (meta.maintainers or []) ++ - [ lib.maintainers.ehmry lib.maintainers.lethalman ]; + [ lib.maintainers.lethalman ]; }; }); in if disabled then diff --git a/pkgs/development/mobile/cocoapods/Gemfile-beta.lock b/pkgs/development/mobile/cocoapods/Gemfile-beta.lock index 4b632458c6a6..355608ca02e5 100644 --- a/pkgs/development/mobile/cocoapods/Gemfile-beta.lock +++ b/pkgs/development/mobile/cocoapods/Gemfile-beta.lock @@ -12,10 +12,10 @@ GEM json (>= 1.5.1) atomos (0.1.3) claide (1.0.3) - cocoapods (1.9.0) + cocoapods (1.9.1) activesupport (>= 4.0.2, < 5) claide (>= 1.0.2, < 2.0) - cocoapods-core (= 1.9.0) + cocoapods-core (= 1.9.1) cocoapods-deintegrate (>= 1.0.3, < 2.0) cocoapods-downloader (>= 1.2.2, < 2.0) cocoapods-plugins (>= 1.0.0, < 2.0) @@ -31,7 +31,7 @@ GEM nap (~> 1.0) ruby-macho (~> 1.4) xcodeproj (>= 1.14.0, < 2.0) - cocoapods-core (1.9.0) + cocoapods-core (1.9.1) activesupport (>= 4.0.2, < 6) algoliasearch (~> 1.0) concurrent-ruby (~> 1.1) diff --git a/pkgs/development/mobile/cocoapods/Gemfile.lock b/pkgs/development/mobile/cocoapods/Gemfile.lock index 93478fa1fdac..9aa7dfbf2301 100644 --- a/pkgs/development/mobile/cocoapods/Gemfile.lock +++ b/pkgs/development/mobile/cocoapods/Gemfile.lock @@ -12,10 +12,10 @@ GEM json (>= 1.5.1) atomos (0.1.3) claide (1.0.3) - cocoapods (1.9.0) + cocoapods (1.9.1) activesupport (>= 4.0.2, < 5) claide (>= 1.0.2, < 2.0) - cocoapods-core (= 1.9.0) + cocoapods-core (= 1.9.1) cocoapods-deintegrate (>= 1.0.3, < 2.0) cocoapods-downloader (>= 1.2.2, < 2.0) cocoapods-plugins (>= 1.0.0, < 2.0) @@ -31,7 +31,7 @@ GEM nap (~> 1.0) ruby-macho (~> 1.4) xcodeproj (>= 1.14.0, < 2.0) - cocoapods-core (1.9.0) + cocoapods-core (1.9.1) activesupport (>= 4.0.2, < 6) algoliasearch (~> 1.0) concurrent-ruby (~> 1.1) diff --git a/pkgs/development/mobile/cocoapods/gemset-beta.nix b/pkgs/development/mobile/cocoapods/gemset-beta.nix index fb70f8aa6c9d..1a5912b89e8e 100644 --- a/pkgs/development/mobile/cocoapods/gemset-beta.nix +++ b/pkgs/development/mobile/cocoapods/gemset-beta.nix @@ -57,10 +57,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qywwpwdzspybi0772yscyiffq6bgqvzcppi2gjl6w4chxbmnphx"; + sha256 = "0wxr81qy4jsbxl066nlfp8zlqk31i6fsmd7f01xmi9bv04990hrs"; type = "gem"; }; - version = "1.9.0"; + version = "1.9.1"; }; cocoapods-core = { dependencies = ["activesupport" "algoliasearch" "concurrent-ruby" "fuzzy_match" "nap" "netrc" "typhoeus"]; @@ -68,10 +68,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0wpjkps6q7lmd3cxhrcl9v3p5bk7y7bcjgnjw4ylbwirsl60bq95"; + sha256 = "0c1679fkyp06dwsh93r0ldzly9vc74g0br4jdngwvdl4g0j4fyzc"; type = "gem"; }; - version = "1.9.0"; + version = "1.9.1"; }; cocoapods-deintegrate = { groups = ["default"]; diff --git a/pkgs/development/mobile/cocoapods/gemset.nix b/pkgs/development/mobile/cocoapods/gemset.nix index 26c198300207..4d4979d56206 100644 --- a/pkgs/development/mobile/cocoapods/gemset.nix +++ b/pkgs/development/mobile/cocoapods/gemset.nix @@ -55,10 +55,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qywwpwdzspybi0772yscyiffq6bgqvzcppi2gjl6w4chxbmnphx"; + sha256 = "0wxr81qy4jsbxl066nlfp8zlqk31i6fsmd7f01xmi9bv04990hrs"; type = "gem"; }; - version = "1.9.0"; + version = "1.9.1"; }; cocoapods-core = { dependencies = ["activesupport" "algoliasearch" "concurrent-ruby" "fuzzy_match" "nap" "netrc" "typhoeus"]; @@ -66,10 +66,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0wpjkps6q7lmd3cxhrcl9v3p5bk7y7bcjgnjw4ylbwirsl60bq95"; + sha256 = "0c1679fkyp06dwsh93r0ldzly9vc74g0br4jdngwvdl4g0j4fyzc"; type = "gem"; }; - version = "1.9.0"; + version = "1.9.1"; }; cocoapods-deintegrate = { groups = ["default"]; diff --git a/pkgs/development/tools/database/webdis/default.nix b/pkgs/development/tools/database/webdis/default.nix new file mode 100644 index 000000000000..fd705c4fc1b0 --- /dev/null +++ b/pkgs/development/tools/database/webdis/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchFromGitHub, hiredis, http-parser, jansson, libevent, fetchpatch }: + +stdenv.mkDerivation rec { + pname = "webdis"; + version = "0.1.9"; + + src = fetchFromGitHub { + owner = "nicolasff"; + repo = pname; + rev = version; + sha256 = "1kglzbs1sw3w05i678qr3lv4pxia20k2a8s3pjhfcxdlnlcy23sk"; + }; + + patches = [ + # Do not use DESTDIR. See: https://github.com/nicolasff/webdis/pull/172 + (fetchpatch { + url = "https://github.com/nicolasff/webdis/commit/a44a2964a59f2e583f4945eeb65cd19235059270.patch"; + sha256 = "0i41p98gc201vpp5ppjc9gxdyb1bpimr0qrvibaf3iq3sy4jr1gb"; + }) + ]; + + buildInputs = [ hiredis http-parser jansson libevent ]; + + makeFlags = [ + "PREFIX=${placeholder "out"}" + "CONFDIR=${placeholder "out"}/share/webdis" + ]; + + meta = with stdenv.lib; { + description = "A Redis HTTP interface with JSON output"; + homepage = "https://webd.is/"; + license = licenses.bsd2; + platforms = platforms.unix; + maintainers = with maintainers; [ wucke13 ]; + }; +} diff --git a/pkgs/development/tools/misc/circleci-cli/default.nix b/pkgs/development/tools/misc/circleci-cli/default.nix index f4bdd0c09af3..fde1c68d34d0 100644 --- a/pkgs/development/tools/misc/circleci-cli/default.nix +++ b/pkgs/development/tools/misc/circleci-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "circleci-cli"; - version = "0.1.6072"; + version = "0.1.6949"; src = fetchFromGitHub { owner = "CircleCI-Public"; repo = pname; rev = "v${version}"; - sha256 = "1sbzl6y7974sib14qr2qa6d20cs54h6a3mc1whbxifg87cw02qjn"; + sha256 = "0r64m4lcm9w0rzi61rsi3sm719ydwiv5axxnikwhzmvkdz0rd7dq"; }; - modSha256 = "1pxqc2a1hb6bk67sd2c37zwg6n7h0jay3yqsjcs4jc0bqv48gzip"; + modSha256 = "199ai38knp50mjjhddjd70qfwx63c69rf7ddw4hpzgx5cm5a04q2"; buildFlagsArray = [ "-ldflags=-s -w -X github.com/CircleCI-Public/circleci-cli/version.Version=${version}" ]; @@ -32,6 +32,6 @@ buildGoModule rec { ''; maintainers = with maintainers; [ synthetica ]; license = licenses.mit; - homepage = https://circleci.com/; + homepage = "https://circleci.com/"; }; } diff --git a/pkgs/development/tools/mod/default.nix b/pkgs/development/tools/mod/default.nix index 60e948d593fa..67b829877b04 100644 --- a/pkgs/development/tools/mod/default.nix +++ b/pkgs/development/tools/mod/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "mod"; - version = "0.2.0"; + version = "0.2.2"; src = fetchFromGitHub { owner = "marwan-at-work"; repo = "mod"; rev = "v${version}"; - sha256 = "1v7qy0q6fb9amcggwzdygl290zhr3w3zgmig2rm5zx91kw973sqc"; + sha256 = "0aw6r90xf29wdhgnq580f837ga8yypzfhlzx1f2zj0kdhc58wbr5"; }; - modSha256 = "1s33i4kp1vzfp97909pyzdlvi69siw1i2lbi2kbp9yrn163w6928"; + modSha256 = "0x7bdhvam9l23cbdqpna8kwg0v6yhgmw0hlbm48bbhjl27lg7svc"; subPackages = [ "cmd/mod" ]; @@ -21,7 +21,7 @@ buildGoModule rec { Command line tool to upgrade/downgrade Semantic Import Versioning in Go Modules. ''; - homepage = https://github.com/marwan-at-work/mod; + homepage = "https://github.com/marwan-at-work/mod"; license = licenses.mit; maintainers = with maintainers; [ kalbasit ]; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/development/web/minify/default.nix b/pkgs/development/web/minify/default.nix index 76434809cb52..3752519d0609 100644 --- a/pkgs/development/web/minify/default.nix +++ b/pkgs/development/web/minify/default.nix @@ -2,23 +2,22 @@ buildGoModule rec { pname = "minify"; - version = "2.5.0"; - - goPackagePath = "github.com/tdewolff/minify"; + version = "2.7.3"; src = fetchFromGitHub { owner = "tdewolff"; repo = pname; rev = "v${version}"; - sha256 = "1ja26fs7klzggmfqvz5nzj9icaa8r8h4a91qg8rj4gx5cnvwx38d"; + sha256 = "12jns7m9liyjg9wy8ynvji2d2g4k2z1ymp6k3610mivmvg159sy4"; }; - modSha256 = "0kff2nj66bifbfi8srcvcsipbddw43mvjdwlq0lz04qak524pbvr"; + modSha256 = "09jk3mxf7n9wf1cgyiw9mhsr55fb12k399dmzhnib3vhd9xav15i"; + + buildFlagsArray = [ "-ldflags=-s -w -X main.Version=${version}" ]; meta = with lib; { description = "Minifiers for web formats"; license = licenses.mit; - homepage = https://go.tacodewolff.nl/minify; - platforms = platforms.all; + homepage = "https://go.tacodewolff.nl/minify"; }; } diff --git a/pkgs/servers/mail/postfix/default.nix b/pkgs/servers/mail/postfix/default.nix index f0153382b548..0386bcf2394b 100644 --- a/pkgs/servers/mail/postfix/default.nix +++ b/pkgs/servers/mail/postfix/default.nix @@ -26,11 +26,11 @@ in stdenv.mkDerivation rec { pname = "postfix"; - version = "3.4.9"; + version = "3.4.10"; src = fetchurl { url = "ftp://ftp.cs.uu.nl/mirror/postfix/postfix-release/official/${pname}-${version}.tar.gz"; - sha256 = "19rdb92q77japw6gy7niiyj1h3nqfdakkcsq2avn9l160vxrqw54"; + sha256 = "0m36wn5grm4cf8nnvlgsgwsm6v09xz01n7jnx13h0yjk73y6d2lh"; }; nativeBuildInputs = [ makeWrapper m4 ]; @@ -98,7 +98,7 @@ in stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = http://www.postfix.org/; + homepage = "http://www.postfix.org/"; description = "A fast, easy to administer, and secure mail server"; license = with licenses; [ ipl10 epl20 ]; platforms = platforms.linux; diff --git a/pkgs/servers/matterbridge/default.nix b/pkgs/servers/matterbridge/default.nix index 2226d960581f..556625016f25 100644 --- a/pkgs/servers/matterbridge/default.nix +++ b/pkgs/servers/matterbridge/default.nix @@ -2,19 +2,19 @@ buildGoModule rec { pname = "matterbridge"; - version = "1.16.3"; + version = "1.16.5"; goPackagePath = "github.com/42wim/matterbridge"; - modSha256 = "sha256-Q6R6AhAELirFijw5ntyjly46HCzFMpLGSJYfv864gt0="; + modSha256 = "0nnp9jxdsr2bs1pg00vd7wpv452iyxws8g3ljzypkb7hzlphcxqh"; src = fetchurl { url = "https://github.com/42wim/matterbridge/archive/v${version}.tar.gz"; - sha256 = "sha256-VAbZSXilmmd2z2bK4/UZzOrjohDVcJHah9t3DE1mtOE="; + sha256 = "15wgjzy9l3xlgih2zb56l4jmval4nhcs42wn9axvz2h7kqfbmw3d"; }; meta = with stdenv.lib; { description = "Simple bridge between Mattermost, IRC, XMPP, Gitter, Slack, Discord, Telegram, Rocket.Chat, Hipchat(via xmpp), Matrix and Steam"; - homepage = https://github.com/42wim/matterbridge; + homepage = "https://github.com/42wim/matterbridge"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ ryantm ]; platforms = platforms.unix; diff --git a/pkgs/servers/monitoring/thanos/default.nix b/pkgs/servers/monitoring/thanos/default.nix index 01068a909b9d..f307032f4141 100644 --- a/pkgs/servers/monitoring/thanos/default.nix +++ b/pkgs/servers/monitoring/thanos/default.nix @@ -1,16 +1,16 @@ { stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "thanos"; - version = "0.7.0"; + version = "0.11.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "thanos-io"; repo = "thanos"; - sha256 = "0yxa1wipab1n9bh95n237c9l1sx1nx7r8snsk4nzpmwr3y1b4nn8"; + sha256 = "152ic9pga0wjg4r7b66hdnbsj9wrzfzbbps7wjas3rcbcv1f2i90"; }; - modSha256 = "0iz16yj41gahsyb6mxbmjs8mjhp5c96dmw75rg9bh5xdh8qh767m"; + modSha256 = "1pdypyyy352l6wy5lr94fv8j890lh863h8zg2hxchiymrs5pgq1c"; subPackages = "cmd/thanos"; diff --git a/pkgs/servers/sql/dolt/default.nix b/pkgs/servers/sql/dolt/default.nix index b9876fbc5eaa..dbface601f54 100644 --- a/pkgs/servers/sql/dolt/default.nix +++ b/pkgs/servers/sql/dolt/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "dolt"; - version = "0.12.0"; + version = "0.15.0"; src = fetchFromGitHub { owner = "liquidata-inc"; repo = "dolt"; rev = "v${version}"; - sha256 = "1sy8ia9j5aymjpf3k86fc8yw6384iy9ryd8cl72fr9cp70l7sx1q"; + sha256 = "1zn5ws6x42niwq9rscn63ddpp0558k0lgncmf01p243jlkdnfsg3"; }; modRoot = "./go"; subPackages = [ "cmd/dolt" "cmd/git-dolt" "cmd/git-dolt-smudge" ]; - modSha256 = "0fagi529m1gf5jrqdlg9vxxq4yz9k9q8h92ch0gahp43kxfbgr4q"; + modSha256 = "04bsj8mfamnbq3y2aqbx1605azi8v15nbdh1zk5grni0ihlal75a"; meta = with lib; { description = "Relational database with version control and CLI a-la Git."; diff --git a/pkgs/tools/misc/ostree/default.nix b/pkgs/tools/misc/ostree/default.nix index 9a41f5e857ad..24a104dc9743 100644 --- a/pkgs/tools/misc/ostree/default.nix +++ b/pkgs/tools/misc/ostree/default.nix @@ -37,13 +37,13 @@ let ])); in stdenv.mkDerivation rec { pname = "ostree"; - version = "2020.2"; + version = "2020.3"; outputs = [ "out" "dev" "man" "installedTests" ]; src = fetchurl { url = "https://github.com/ostreedev/ostree/releases/download/v${version}/libostree-${version}.tar.xz"; - sha256 = "0bbk0sg4m38g7j00hy358p2azxas87minpgz3avwma6jsylj1qjg"; + sha256 = "01cch4as23xspq6pck59al7x5jj60wl21g8p3iqbdxcjl1p3jxsq"; }; patches = [ diff --git a/pkgs/tools/networking/stubby/default.nix b/pkgs/tools/networking/stubby/default.nix index b560f2768ad7..2a10eb13e320 100644 --- a/pkgs/tools/networking/stubby/default.nix +++ b/pkgs/tools/networking/stubby/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, getdns, doxygen, libyaml, darwin, cmake }: +{ stdenv, fetchFromGitHub, getdns, doxygen, libyaml, darwin, cmake, systemd }: stdenv.mkDerivation rec { pname = "stubby"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake libyaml ]; - buildInputs = [ doxygen getdns ] + buildInputs = [ doxygen getdns systemd ] ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.Security ]; meta = with stdenv.lib; { diff --git a/pkgs/tools/package-management/dpkg/default.nix b/pkgs/tools/package-management/dpkg/default.nix index 11672e6d456d..8d012c90f928 100644 --- a/pkgs/tools/package-management/dpkg/default.nix +++ b/pkgs/tools/package-management/dpkg/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "dpkg"; - version = "1.19.7"; + version = "1.20.0"; src = fetchurl { url = "mirror://debian/pool/main/d/dpkg/dpkg_${version}.tar.xz"; - sha256 = "1s4nlaqz4c3p5r85f4il8m21825sfy2s9wgz4ajhl332vzggw9sc"; + sha256 = "0009dp4p3d2j5vd956achqczf8qizfixha8hw5hzn3h31qmwqcxn"; }; configureFlags = [ @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "The Debian package manager"; - homepage = https://wiki.debian.org/Teams/Dpkg; + homepage = "https://wiki.debian.org/Teams/Dpkg"; license = licenses.gpl2Plus; platforms = platforms.unix; maintainers = with maintainers; [ ]; diff --git a/pkgs/tools/security/aespipe/default.nix b/pkgs/tools/security/aespipe/default.nix index 69bef27258e8..e25416e55b88 100644 --- a/pkgs/tools/security/aespipe/default.nix +++ b/pkgs/tools/security/aespipe/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, sharutils, makeWrapper }: stdenv.mkDerivation rec { pname = "aespipe"; @@ -9,11 +9,19 @@ stdenv.mkDerivation rec { sha256 = "15pg9j27mjzl78mpzkdqd84kdafj0g6j72f8wgjrpp2qkxjy2ddi"; }; + nativeBuildInputs = [ makeWrapper ]; + configureFlags = [ "--enable-padlock" "--enable-intelaes" ]; + postInstall = '' + cp bz2aespipe $out/bin + wrapProgram $out/bin/bz2aespipe \ + --prefix PATH : $out/bin:${stdenv.lib.makeBinPath [ sharutils ]} + ''; + meta = with stdenv.lib; { description = "AES encrypting or decrypting pipe"; - homepage = http://loop-aes.sourceforge.net/aespipe.README; + homepage = "http://loop-aes.sourceforge.net/aespipe.README"; license = licenses.gpl2; maintainers = [ maintainers.goibhniu ]; platforms = platforms.linux; diff --git a/pkgs/tools/text/ripgrep/default.nix b/pkgs/tools/text/ripgrep/default.nix index 4a409b8dd84d..d90537bd5533 100644 --- a/pkgs/tools/text/ripgrep/default.nix +++ b/pkgs/tools/text/ripgrep/default.nix @@ -1,40 +1,44 @@ -{ stdenv, fetchFromGitHub, rustPlatform, asciidoc, docbook_xsl, libxslt +{ stdenv +, fetchFromGitHub +, rustPlatform +, asciidoc +, docbook_xsl +, libxslt +, installShellFiles , Security -, withPCRE2 ? true, pcre2 ? null +, withPCRE2 ? true +, pcre2 ? null }: rustPlatform.buildRustPackage rec { pname = "ripgrep"; - version = "11.0.2"; + version = "12.0.0"; src = fetchFromGitHub { owner = "BurntSushi"; repo = pname; rev = version; - sha256 = "1iga3320mgi7m853la55xip514a3chqsdi1a1rwv25lr9b1p7vd3"; + sha256 = "0n4169l662fvg6r4rcfs8n8f92rxndlaqb7k4x63680mra470dbi"; }; - cargoSha256 = "0lwz661rbm7kwkd6mallxym1pz8ynda5f03ynjfd16vrazy2dj21"; + cargoSha256 = "01zi9zqdjsgc3im9na511n6w2bmqvm46wryh10fhzc9fnkziqmq3"; cargoBuildFlags = stdenv.lib.optional withPCRE2 "--features pcre2"; - nativeBuildInputs = [ asciidoc docbook_xsl libxslt ]; + nativeBuildInputs = [ asciidoc docbook_xsl libxslt installShellFiles ]; buildInputs = (stdenv.lib.optional withPCRE2 pcre2) - ++ (stdenv.lib.optional stdenv.isDarwin Security); + ++ (stdenv.lib.optional stdenv.isDarwin Security); preFixup = '' - mkdir -p "$out/man/man1" - cp target/release/build/ripgrep-*/out/rg.1 "$out/man/man1/" - - mkdir -p "$out/share/"{bash-completion/completions,fish/vendor_completions.d,zsh/site-functions} - cp target/release/build/ripgrep-*/out/rg.bash "$out/share/bash-completion/completions/" - cp target/release/build/ripgrep-*/out/rg.fish "$out/share/fish/vendor_completions.d/" - cp "$src/complete/_rg" "$out/share/zsh/site-functions/" + (cd target/release/build/ripgrep-*/out + installManPage rg.1 + installShellCompletion rg.{bash,fish}) + installShellCompletion --zsh "$src/complete/_rg" ''; meta = with stdenv.lib; { description = "A utility that combines the usability of The Silver Searcher with the raw speed of grep"; - homepage = https://github.com/BurntSushi/ripgrep; + homepage = "https://github.com/BurntSushi/ripgrep"; license = with licenses; [ unlicense /* or */ mit ]; maintainers = with maintainers; [ tailhook globin ma27 ]; platforms = platforms.all; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2e1244f84bac..906578031c87 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10856,6 +10856,8 @@ in watson-ruby = callPackage ../development/tools/misc/watson-ruby {}; + webdis = callPackage ../development/tools/database/webdis { }; + xc3sprog = callPackage ../development/tools/misc/xc3sprog { }; xcodebuild = callPackage ../development/tools/xcbuild/wrapper.nix { |