diff options
Diffstat (limited to 'pkgs/development/tools')
15 files changed, 91 insertions, 37 deletions
diff --git a/pkgs/development/tools/analysis/cppcheck/default.nix b/pkgs/development/tools/analysis/cppcheck/default.nix index 76a038ca819..bdd275a218b 100644 --- a/pkgs/development/tools/analysis/cppcheck/default.nix +++ b/pkgs/development/tools/analysis/cppcheck/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libxslt, docbook_xsl, docbook_xml_dtd_45, pcre }: +{ stdenv, fetchurl, libxslt, docbook_xsl, docbook_xml_dtd_45, pcre, withZ3 ? true, z3 }: stdenv.mkDerivation rec { pname = "cppcheck"; @@ -9,10 +9,11 @@ stdenv.mkDerivation rec { sha256 = "0gssnb50cndr77xva4nar4a82ii0vfqy96dlm27gb7pd6xmd6xsz"; }; - buildInputs = [ pcre ]; + buildInputs = [ pcre ] ++ stdenv.lib.optionals withZ3 [ z3 ]; nativeBuildInputs = [ libxslt docbook_xsl docbook_xml_dtd_45 ]; - makeFlags = [ "PREFIX=$(out)" "FILESDIR=$(out)/cfg" "HAVE_RULES=yes" ]; + makeFlags = [ "PREFIX=$(out)" "FILESDIR=$(out)/cfg" "HAVE_RULES=yes" ] + ++ stdenv.lib.optionals withZ3 [ "USE_Z3=yes" "CPPFLAGS=-DNEW_Z3=1" ]; outputs = [ "out" "man" ]; diff --git a/pkgs/development/tools/buildah/wrapper.nix b/pkgs/development/tools/buildah/wrapper.nix new file mode 100644 index 00000000000..bdc48bd6b1f --- /dev/null +++ b/pkgs/development/tools/buildah/wrapper.nix @@ -0,0 +1,52 @@ +{ buildah-unwrapped +, runCommand +, makeWrapper +, lib +, extraPackages ? [] +, buildah +, runc # Default container runtime +, crun # Container runtime (default with cgroups v2 for podman/buildah) +, conmon # Container runtime monitor +, slirp4netns # User-mode networking for unprivileged namespaces +, fuse-overlayfs # CoW for images, much faster than default vfs +, utillinux # nsenter +, cni-plugins # not added to path +, iptables +}: + +let + buildah = buildah-unwrapped; + + binPath = lib.makeBinPath ([ + runc + crun + conmon + slirp4netns + fuse-overlayfs + utillinux + iptables + ] ++ extraPackages); + +in runCommand buildah.name { + name = "${buildah.pname}-wrapper-${buildah.version}"; + inherit (buildah) pname version; + + meta = builtins.removeAttrs buildah.meta [ "outputsToInstall" ]; + + outputs = [ + "out" + "man" + ]; + + nativeBuildInputs = [ + makeWrapper + ]; + +} '' + ln -s ${buildah.man} $man + + mkdir -p $out/bin + ln -s ${buildah-unwrapped}/share $out/share + makeWrapper ${buildah-unwrapped}/bin/buildah $out/bin/buildah \ + --prefix PATH : ${binPath} +'' diff --git a/pkgs/development/tools/cloudflare-wrangler/default.nix b/pkgs/development/tools/cloudflare-wrangler/default.nix index a6db838870f..623afc3e743 100644 --- a/pkgs/development/tools/cloudflare-wrangler/default.nix +++ b/pkgs/development/tools/cloudflare-wrangler/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cloudflare-wrangler"; - version = "1.9.0"; + version = "1.9.1"; src = fetchFromGitHub { owner = "cloudflare"; repo = "wrangler"; rev = "v${version}"; - sha256 = "1iqy45isrf103yaf1xa1ksxp566fr9jh29aakv95rrx6ayz2cw9c"; + sha256 = "09rq6lnv9993ah49jxqaqqhv5xxj51gxlqdi99wkj217cxp9gqqn"; }; - cargoSha256 = "0a0zyx5f46x0qfwkji1wffvk69qamaiqa85ix7mfa96r7ksrs3z3"; + cargoSha256 = "0vlb1g4pki84n2zf6w3bisa7jpv0ws8nb3lgr0bkjrirf60a9xsk"; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index 4aadb981081..3cd716e11de 100644 --- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -1,16 +1,16 @@ { lib, buildGoPackage, fetchFromGitLab, fetchurl }: let - version = "12.10.2"; + version = "13.0.0"; # Gitlab runner embeds some docker images these are prebuilt for arm and x86_64 docker_x86_64 = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-x86_64.tar.xz"; - sha256 = "1lw0f3svzsvcw1rkc8z60nrl2jqjj8ciqlw5icazf6ikqbqmf660"; + sha256 = "0ii63xal5cx4mcy87wpdyvprpkk11i2hdl9cifaf3i1l3kgm3arv"; }; docker_arm = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-arm.tar.xz"; - sha256 = "1hawdihnwk9p06fa3ym5q6b4sv6pp9095nimdy5myi6y88yj1rv2"; + sha256 = "04h17117j5ib7h87jzsrs47i5igswnh6nbn2i2d0ansxdk4a8g31"; }; in buildGoPackage rec { @@ -29,7 +29,7 @@ buildGoPackage rec { owner = "gitlab-org"; repo = "gitlab-runner"; rev = "v${version}"; - sha256 = "1r82xj4krdd51540bhr2wjhp6sdr5c2favnnw8nl26vnmwiqpd3k"; + sha256 = "07ywv99df4krnsb4fb2hwxy84214isps331xdpqyf0j3fhgjqmz9"; }; patches = [ ./fix-shell-path.patch ]; diff --git a/pkgs/development/tools/flatpak-builder/default.nix b/pkgs/development/tools/flatpak-builder/default.nix index 32519594e4f..85b68cff20d 100644 --- a/pkgs/development/tools/flatpak-builder/default.nix +++ b/pkgs/development/tools/flatpak-builder/default.nix @@ -15,7 +15,7 @@ , xmlto , acl -, bazaar +, breezy , binutils , bzip2 , coreutils @@ -89,7 +89,7 @@ in stdenv.mkDerivation rec { ./respect-xml-catalog-files-var.patch (substituteAll { src = ./fix-paths.patch; - bzr = "${bazaar}/bin/bzr"; + bzr = "${breezy}/bin/bzr"; cp = "${coreutils}/bin/cp"; patch = "${patch}/bin/patch"; tar = "${gnutar}/bin/tar"; diff --git a/pkgs/development/tools/heroku/default.nix b/pkgs/development/tools/heroku/default.nix index a78a74a3d0c..23e0f568457 100644 --- a/pkgs/development/tools/heroku/default.nix +++ b/pkgs/development/tools/heroku/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "heroku"; - version = "7.39.2"; + version = "7.41.1"; src = fetchurl { url = "https://cli-assets.heroku.com/heroku-v${version}/heroku-v${version}.tar.xz"; - sha256 = "13bbqxklpwmh84a1dc6inphqg1nm2l0b7vqs3x9lrjm4bg7c8kjr"; + sha256 = "12ilk0rkpwx8n9b7dird2jfmwnkqndlwjf5wgdcbl014mkl1411b"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/just/default.nix b/pkgs/development/tools/just/default.nix index 8ba536e3b5f..5fa2b12e9c3 100644 --- a/pkgs/development/tools/just/default.nix +++ b/pkgs/development/tools/just/default.nix @@ -3,16 +3,16 @@ rustPlatform.buildRustPackage rec { pname = "just"; - version = "0.5.10"; + version = "0.5.11"; src = fetchFromGitHub { owner = "casey"; repo = pname; rev = "v${version}"; - sha256 = "0s8np28glzn3kmh59dwk86yc9fb2lm9fq2325kzmy7rkb5jsdcl1"; + sha256 = "0li5lspxfrim8gymqzzd5djjfbfi7jh1m234qlzy5vkx2q9qg0xv"; }; - cargoSha256 = "05mrzav3aydvwac9jjckdmlxvxnlcncmkfsdb9z7zvxia4k89w1l"; + cargoSha256 = "1sp8xrh3gmgmphh1bv050p1ybjybk9x8kswyxz2rd93q3zb5hpzz"; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/tools/misc/circleci-cli/default.nix b/pkgs/development/tools/misc/circleci-cli/default.nix index e924f1b8251..7144c2bd0ae 100644 --- a/pkgs/development/tools/misc/circleci-cli/default.nix +++ b/pkgs/development/tools/misc/circleci-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "circleci-cli"; - version = "0.1.7523"; + version = "0.1.7868"; src = fetchFromGitHub { owner = "CircleCI-Public"; repo = pname; rev = "v${version}"; - sha256 = "13rj9snz9z7hc2qzfyany7kmsssin1ixnni8yq43gz9kbxkqc49f"; + sha256 = "1a9gnqrkvifrwr8wpv5f6zv8xs8myzbzlhn5w72xxzh2gxdaflwg"; }; vendorSha256 = "0y35ps2pw9z7gi4z50byd1py87bf2jdvj7l7w2gxpppmhi83myc9"; diff --git a/pkgs/development/tools/misc/hydra/common.nix b/pkgs/development/tools/misc/hydra/common.nix index 75a9689267a..4e9daab9bf1 100644 --- a/pkgs/development/tools/misc/hydra/common.nix +++ b/pkgs/development/tools/misc/hydra/common.nix @@ -1,6 +1,6 @@ { stdenv, nix, perlPackages, buildEnv, fetchFromGitHub , makeWrapper, autoconf, automake, libtool, unzip, pkgconfig, sqlite, libpqxx -, gitAndTools, mercurial, darcs, subversion, bazaar, openssl, bzip2, libxslt +, gitAndTools, mercurial, darcs, subversion, breezy, openssl, bzip2, libxslt , guile, perl, postgresql, nukeReferences, git, boehmgc, nlohmann_json , docbook_xsl, openssh, gnused, coreutils, findutils, gzip, lzma, gnutar , rpm, dpkg, cdrkit, pixz, lib, boost, autoreconfHook, src ? null, version ? null @@ -79,7 +79,7 @@ in stdenv.mkDerivation rec { buildInputs = [ makeWrapper autoconf automake libtool unzip nukeReferences sqlite libpqxx - gitAndTools.top-git mercurial /*darcs*/ subversion bazaar openssl bzip2 libxslt + gitAndTools.top-git mercurial /*darcs*/ subversion breezy openssl bzip2 libxslt perlDeps perl nix postgresql # for running the tests nlohmann_json @@ -88,7 +88,7 @@ in stdenv.mkDerivation rec { hydraPath = lib.makeBinPath ( [ sqlite subversion openssh nix coreutils findutils pixz - gzip bzip2 lzma gnutar unzip git gitAndTools.top-git mercurial /*darcs*/ gnused bazaar + gzip bzip2 lzma gnutar unzip git gitAndTools.top-git mercurial /*darcs*/ gnused breezy ] ++ lib.optionals stdenv.isLinux [ rpm dpkg cdrkit ] ); nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/development/tools/misc/uncrustify/default.nix b/pkgs/development/tools/misc/uncrustify/default.nix index d13212085ef..587896fce68 100644 --- a/pkgs/development/tools/misc/uncrustify/default.nix +++ b/pkgs/development/tools/misc/uncrustify/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "${product}-${version}"; product = "uncrustify"; - version = "0.70.1"; + version = "0.71.0"; src = fetchFromGitHub { owner = product; repo = product; rev = name; - sha256 = "0zr3vxhd947zdvwccw3cj0vsriaawcpfjq3x94v9887hsi8fk87b"; + sha256 = "1wyhkhn000yad94fnjj61h7lyvan6hig8wh7jxlnyp5wxdwki0pj"; }; nativeBuildInputs = [ cmake python ]; diff --git a/pkgs/development/tools/omnisharp-roslyn/default.nix b/pkgs/development/tools/omnisharp-roslyn/default.nix index a81b7133e92..973f777d8cb 100644 --- a/pkgs/development/tools/omnisharp-roslyn/default.nix +++ b/pkgs/development/tools/omnisharp-roslyn/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "omnisharp-roslyn"; - version = "1.35.0"; - + version = "1.35.1"; + src = fetchurl { url = "https://github.com/OmniSharp/omnisharp-roslyn/releases/download/v${version}/omnisharp-mono.tar.gz"; - sha256 = "191jiyw6kx1rw241bg9nv5splfpz6ny90g9yf28cd0xwpx978p83"; + sha256 = "0gx87qc9r3lhqn6q95y74z67sjcxnazkkdi9zswmaqyvjn8x7vf4"; }; nativeBuildInputs = [ makeWrapper ]; @@ -33,6 +33,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "OmniSharp based on roslyn workspaces"; + homepage = "https://github.com/OmniSharp/omnisharp-roslyn"; platforms = platforms.linux; license = licenses.mit; maintainers = with maintainers; [ tesq0 ]; diff --git a/pkgs/development/tools/rust/cargo-make/Cargo.lock b/pkgs/development/tools/rust/cargo-make/Cargo.lock index 05868a4e1c2..4390a1cf799 100644 --- a/pkgs/development/tools/rust/cargo-make/Cargo.lock +++ b/pkgs/development/tools/rust/cargo-make/Cargo.lock @@ -104,7 +104,7 @@ checksum = "130aac562c0dd69c56b3b1cc8ffd2e17be31d0b6c25b61c96b76231aa23e39e1" [[package]] name = "cargo-make" -version = "0.30.7" +version = "0.30.8" dependencies = [ "ci_info", "clap", @@ -840,9 +840,9 @@ dependencies = [ [[package]] name = "semver" -version = "0.9.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" +checksum = "394cec28fa623e00903caf7ba4fa6fb9a0e260280bb8cdbbba029611108a0190" dependencies = [ "semver-parser", ] diff --git a/pkgs/development/tools/rust/cargo-make/default.nix b/pkgs/development/tools/rust/cargo-make/default.nix index 98f21b23d48..2950ed1b83b 100644 --- a/pkgs/development/tools/rust/cargo-make/default.nix +++ b/pkgs/development/tools/rust/cargo-make/default.nix @@ -2,7 +2,7 @@ rustPlatform.buildRustPackage rec { pname = "cargo-make"; - version = "0.30.7"; + version = "0.30.8"; src = let @@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec { owner = "sagiegurari"; repo = pname; rev = version; - sha256 = "0i8jf3161qqazp8cy3kzn2cw7zrcv1ijf2w3s8d8l0y2i2b25cv1"; + sha256 = "0sx1kvrk2df5v9f35cd6201b3m8d6ynppmikqm00g55db9r4vfl2"; }; in runCommand "source" {} '' @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ Security ]; - cargoSha256 = "08mn1ckvyffys9wqnvva7w1qzvarqvmnkpliv118vnnr072jnc6y"; + cargoSha256 = "1b0x12hcjy061dvbpy5cwgp6pwlzq2k1dapr9glw8dwprns57ar7"; # Some tests fail because they need network access. # However, Travis ensures a proper build. diff --git a/pkgs/development/tools/spring-boot-cli/default.nix b/pkgs/development/tools/spring-boot-cli/default.nix index 865c655e67f..b59ef341dff 100644 --- a/pkgs/development/tools/spring-boot-cli/default.nix +++ b/pkgs/development/tools/spring-boot-cli/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "spring-boot-cli"; - version = "2.2.6"; + version = "2.3.0"; src = fetchzip { url = "https://repo.spring.io/release/org/springframework/boot/${pname}/${version}.RELEASE/${pname}-${version}.RELEASE-bin.zip"; - sha256 = "1rb21a8nr4mcdsfv3c3xh45kcpdwllhjfb26w9xsdgfh1j4mhb81"; + sha256 = "1zjbgs1qx75jgxc46x9380iqh8pfgacih38ad3qxd0106a8lcp5h"; }; nativeBuildInputs = [ makeWrapper installShellFiles ]; diff --git a/pkgs/development/tools/vcstool/default.nix b/pkgs/development/tools/vcstool/default.nix index bab3ebd5757..c4a1cf73987 100644 --- a/pkgs/development/tools/vcstool/default.nix +++ b/pkgs/development/tools/vcstool/default.nix @@ -1,5 +1,5 @@ { stdenv, python3Packages -, git, bazaar, subversion }: +, git, breezy, subversion }: with python3Packages; @@ -14,7 +14,7 @@ buildPythonApplication rec { propagatedBuildInputs = [ pyyaml setuptools ]; - makeWrapperArgs = ["--prefix" "PATH" ":" (stdenv.lib.makeBinPath [ git bazaar subversion ])]; + makeWrapperArgs = ["--prefix" "PATH" ":" (stdenv.lib.makeBinPath [ git breezy subversion ])]; doCheck = false; # requires network |