diff options
Diffstat (limited to 'nixpkgs/pkgs/development/tools')
78 files changed, 682 insertions, 309 deletions
diff --git a/nixpkgs/pkgs/development/tools/ammonite/default.nix b/nixpkgs/pkgs/development/tools/ammonite/default.nix index eb827882b752..680217acfbb8 100644 --- a/nixpkgs/pkgs/development/tools/ammonite/default.nix +++ b/nixpkgs/pkgs/development/tools/ammonite/default.nix @@ -1,5 +1,5 @@ -{ lib, stdenv, fetchurl, jre, nixosTests, writeScript, common-updater-scripts, git -, nixfmt, nix, coreutils, gnused, disableRemoteLogging ? true }: +{ lib, stdenv, fetchurl, jre, nixosTests, writeScript, common-updater-scripts +, git, nixfmt, nix, coreutils, gnused, disableRemoteLogging ? true }: with lib; @@ -9,7 +9,7 @@ let common = { scalaVersion, sha256 }: stdenv.mkDerivation rec { pname = "ammonite"; - version = "2.3.8"; + version = "2.4.0"; src = fetchurl { url = @@ -75,10 +75,10 @@ let in { ammonite_2_12 = common { scalaVersion = "2.12"; - sha256 = "1kzk0437h2wd9jhwkvjkiaj6mscz4bh85iv266x9zz4zssb355hs"; + sha256 = "K8JII6SAmnBjMWQ9a3NqSLLuP1OLcbwobj3G+OCiLdA="; }; ammonite_2_13 = common { scalaVersion = "2.13"; - sha256 = "0js84m6yqjd7d77md38z6nk3qzlm1ms8brzczaw05zq2c90pdbz7"; + sha256 = "2F35qhWI6hNb+Eh9ZTDznqo116yN7MZIGVchaAIM36A="; }; } diff --git a/nixpkgs/pkgs/development/tools/analysis/brakeman/Gemfile b/nixpkgs/pkgs/development/tools/analysis/brakeman/Gemfile new file mode 100644 index 000000000000..1ff5490b0a77 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/analysis/brakeman/Gemfile @@ -0,0 +1,2 @@ +source "https://rubygems.org" +gem "brakeman" diff --git a/nixpkgs/pkgs/development/tools/analysis/brakeman/Gemfile.lock b/nixpkgs/pkgs/development/tools/analysis/brakeman/Gemfile.lock new file mode 100644 index 000000000000..13425cf9ee76 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/analysis/brakeman/Gemfile.lock @@ -0,0 +1,13 @@ +GEM + remote: https://rubygems.org/ + specs: + brakeman (5.0.4) + +PLATFORMS + ruby + +DEPENDENCIES + brakeman + +BUNDLED WITH + 2.1.4 diff --git a/nixpkgs/pkgs/development/tools/analysis/brakeman/default.nix b/nixpkgs/pkgs/development/tools/analysis/brakeman/default.nix index 3ac6b34f9488..72c4b1fbc3e3 100644 --- a/nixpkgs/pkgs/development/tools/analysis/brakeman/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/brakeman/default.nix @@ -1,11 +1,11 @@ -{ lib, ruby, buildRubyGem }: +{ lib, ruby, bundlerApp, bundlerUpdateScript }: -buildRubyGem rec { - inherit ruby; - name = "${gemName}-${version}"; - gemName = "brakeman"; - version = "5.0.0"; - source.sha256 = "0k1ynqsr9b0vnxqb7d5hbdk4q1i98zjzdnx4y1ylikz4rmkizf91"; +bundlerApp rec { + pname = "brakeman"; + exes = [ "brakeman" ]; + gemdir = ./.; + + passthru.updateScript = bundlerUpdateScript "brakeman"; meta = with lib; { description = "Static analysis security scanner for Ruby on Rails"; diff --git a/nixpkgs/pkgs/development/tools/analysis/brakeman/gemset.nix b/nixpkgs/pkgs/development/tools/analysis/brakeman/gemset.nix new file mode 100644 index 000000000000..f37158353e00 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/analysis/brakeman/gemset.nix @@ -0,0 +1,12 @@ +{ + brakeman = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1czqmrqbli2cnw4vv4pzz8bk78c7lpcnnyba74cj632swv1za6jd"; + type = "gem"; + }; + version = "5.0.4"; + }; +} diff --git a/nixpkgs/pkgs/development/tools/analysis/checkstyle/default.nix b/nixpkgs/pkgs/development/tools/analysis/checkstyle/default.nix index ae95157a8e5e..11c2178b6987 100644 --- a/nixpkgs/pkgs/development/tools/analysis/checkstyle/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/checkstyle/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, makeWrapper, jre }: stdenv.mkDerivation rec { - version = "8.42"; + version = "8.43"; pname = "checkstyle"; src = fetchurl { url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${version}/checkstyle-${version}-all.jar"; - sha256 = "sha256-SYLr6qQp/kHzviwzCaXEnYTHHuH3j5ZzRLi8gs8xAao="; + sha256 = "sha256-jb864Kr5Hx/e2OIRYPLJGkRIsxT/cebLnOGGy1YtJY8="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/development/tools/analysis/dotenv-linter/default.nix b/nixpkgs/pkgs/development/tools/analysis/dotenv-linter/default.nix index f477da365d75..51e43555d5ea 100644 --- a/nixpkgs/pkgs/development/tools/analysis/dotenv-linter/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/dotenv-linter/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "dotenv-linter"; - version = "3.0.0"; + version = "3.1.0"; src = fetchFromGitHub { owner = "dotenv-linter"; repo = "dotenv-linter"; rev = "v${version}"; - sha256 = "sha256-3Lj5GtWGyWDkZPhxYQu7UWzmh7TO5wk1UJ0lek1jTto="; + sha256 = "sha256-hhaMI2Z97aT/8FxxtWpn+o3BSo26iyBP+ucpO3x4AbQ="; }; - cargoSha256 = "sha256-FDkxJuZPzDrgLJgefkRUPS+0Ys3DaBOD3XAuS/Z6TtI="; + cargoSha256 = "sha256-F9Xyg8/qp0j0+jyd5EVe2idocubzu+Cj6yAwrHuabvM="; meta = with lib; { description = "Lightning-fast linter for .env files. Written in Rust"; diff --git a/nixpkgs/pkgs/development/tools/analysis/flow/default.nix b/nixpkgs/pkgs/development/tools/analysis/flow/default.nix index ea1aee669c54..df571a1ce433 100644 --- a/nixpkgs/pkgs/development/tools/analysis/flow/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/flow/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "flow"; - version = "0.152.0"; + version = "0.153.0"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "refs/tags/v${version}"; - sha256 = "1af9z6xah3rk99pv984nikkpq8jzl5r0fccb1gdhmi7y5a6y6g1m"; + sha256 = "sha256-KaDgrr1DY7DGxFvSOzbO04Y8Z3LkmvJcPwfFWa/UlMs="; }; installPhase = '' diff --git a/nixpkgs/pkgs/development/tools/analysis/nix-linter/default.nix b/nixpkgs/pkgs/development/tools/analysis/nix-linter/default.nix index 279a69327fa6..f01886c883bc 100644 --- a/nixpkgs/pkgs/development/tools/analysis/nix-linter/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/nix-linter/default.nix @@ -17,18 +17,17 @@ , containers , hnix , bytestring -, fetchpatch }: mkDerivation rec { pname = "nix-linter-unstable"; - version = "2020-09-25"; + version = "2021-06-16"; src = fetchFromGitHub { owner = "Synthetica9"; repo = "nix-linter"; - rev = "2516a8cda41f9bb553a1c3eca38e3dd94ebf53de"; - sha256 = "07mn2c9v67wsm57jlxv9pqac9hahw4618vngmj2sfbgihx8997kb"; + rev = "74707ed48dcc58dbfa27ae25ee0e044c072cc344"; + sha256 = "17scghkinpx3pzlw3hw023ybnd8cy7bqfy8b48vwaq8a7bnm2rs3"; }; isLibrary = false; @@ -37,14 +36,6 @@ mkDerivation rec { executableHaskellDepends = [ streamly mtl path pretty-terminal text base aeson cmdargs containers hnix bytestring path-io ]; testHaskellDepends = [ tasty tasty-hunit tasty-th ]; - patches = [ - # Fix compatibility with hnix≥0.13.0 https://github.com/Synthetica9/nix-linter/pull/51 - (fetchpatch { - url = "https://github.com/Synthetica9/nix-linter/commit/f73acacd8623dc25c9a35f8e04e4ff33cc596af8.patch"; - sha256 = "139fm21hdg3vcw8hv35kxj4awd52bjqbb76mpzx191hzi9plj8qc"; - }) - ]; - description = "Linter for Nix(pkgs), based on hnix"; homepage = "https://github.com/Synthetica9/nix-linter"; license = lib.licenses.bsd3; diff --git a/nixpkgs/pkgs/development/tools/analysis/qcachegrind/default.nix b/nixpkgs/pkgs/development/tools/analysis/qcachegrind/default.nix index 75729d1eea47..1f7c6641b1cc 100644 --- a/nixpkgs/pkgs/development/tools/analysis/qcachegrind/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/qcachegrind/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, qmake, qtbase, perl, python, php, kcachegrind }: +{ lib, stdenv, qmake, qtbase, perl, python, php, kcachegrind, wrapQtAppsHook }: let name = lib.replaceStrings ["kcachegrind"] ["qcachegrind"] kcachegrind.name; @@ -10,7 +10,7 @@ in stdenv.mkDerivation { buildInputs = [ qtbase perl python php ]; - nativeBuildInputs = [ qmake ]; + nativeBuildInputs = [ qmake wrapQtAppsHook ]; dontWrapQtApps = true; @@ -33,9 +33,13 @@ in stdenv.mkDerivation { install -Dm644 kcachegrind/48-apps-kcachegrind.png "$out/share/icons/hicolor/48x48/apps/kcachegrind.png" ''); + preFixup = '' + wrapQtApp "$out/bin/qcachegrind" + ''; + meta = with lib; { description = "A Qt GUI to visualize profiling data"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.unix; maintainers = with maintainers; [ periklis ]; }; diff --git a/nixpkgs/pkgs/development/tools/analysis/radare2/default.nix b/nixpkgs/pkgs/development/tools/analysis/radare2/default.nix index f51f0f9368d1..a8e7c10ce44f 100644 --- a/nixpkgs/pkgs/development/tools/analysis/radare2/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/radare2/default.nix @@ -28,13 +28,13 @@ stdenv.mkDerivation rec { pname = "radare2"; - version = "5.3.0"; + version = "5.3.1"; src = fetchFromGitHub { owner = "radare"; repo = "radare2"; rev = version; - sha256 = "sha256-xndnRVlqTB/NH1ROo7xkftLP7DufsJu4CCA9MCOEeng="; + sha256 = "sha256-VS8eG5RXwKtJSLmyaSifopJU7WYGMUcznn+burPqEYE="; }; postInstall = '' diff --git a/nixpkgs/pkgs/development/tools/analysis/tflint/default.nix b/nixpkgs/pkgs/development/tools/analysis/tflint/default.nix index 137b3c2c1a1a..9666bf006d72 100644 --- a/nixpkgs/pkgs/development/tools/analysis/tflint/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/tflint/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "tflint"; - version = "0.29.0"; + version = "0.29.1"; src = fetchFromGitHub { owner = "terraform-linters"; repo = pname; rev = "v${version}"; - sha256 = "1ciwr2bwbxnw8366wvgl5ga3y2qj46i0h3yp3av1x9n2r8rddrlh"; + sha256 = "1pkz8y3da7i4a3nm79a0640xjj4wfkx3dz6614c4hynqn5svji82"; }; vendorSha256 = "0k8v49sr0jmljfl4fa5pnvzd5k3pg865h201114l6cs257sdkczk"; diff --git a/nixpkgs/pkgs/development/tools/azcopy/default.nix b/nixpkgs/pkgs/development/tools/azcopy/default.nix index 0be3f5c0b7ef..06bff61fcdd1 100644 --- a/nixpkgs/pkgs/development/tools/azcopy/default.nix +++ b/nixpkgs/pkgs/development/tools/azcopy/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "azure-storage-azcopy"; - version = "10.10.0"; + version = "10.11.0"; src = fetchFromGitHub { owner = "Azure"; repo = "azure-storage-azcopy"; rev = "v${version}"; - sha256 = "sha256-gWU219QlV+24RxnTHqQzQeGZHzVwmBXNKU+3QI6WvHI="; + sha256 = "sha256-mti93UDFgHQKJt3z1sjCkT71TZtwh2YnhTyUCi5tS5c="; }; subPackages = [ "." ]; - vendorSha256 = "sha256-d965Rt8W74bsIZAZPZLe3twuUpp4wrnNc0qwjsKikOE="; + vendorSha256 = "sha256-NEW1qXOxFPmDFUTciJkqwutZd3+sVkHgoZgQO8Gsdwk="; doCheck = false; diff --git a/nixpkgs/pkgs/development/tools/buf/default.nix b/nixpkgs/pkgs/development/tools/buf/default.nix index 8d76b8925dc7..c1060744f449 100644 --- a/nixpkgs/pkgs/development/tools/buf/default.nix +++ b/nixpkgs/pkgs/development/tools/buf/default.nix @@ -2,30 +2,54 @@ , buildGoModule , fetchFromGitHub , protobuf +, git }: buildGoModule rec { pname = "buf"; - version = "0.41.0"; + version = "0.43.2"; src = fetchFromGitHub { owner = "bufbuild"; repo = pname; rev = "v${version}"; - sha256 = "sha256-f1UcvsXWW+fMAgTRtHkEXmUN/DTrJ/Xd+9HbR2FjFog="; + sha256 = "sha256-Go0wLcJrxMgB67WlAI7TwX2UU2sQ/yfmC0h2igOkjc4="; + leaveDotGit = true; # Required by TestWorkspaceGit }; + vendorSha256 = "sha256-HT0dsGniBoQW2Y7MhahDeFvE0nCASoPdzHETju0JuRY="; patches = [ ./skip_test_requiring_network.patch ]; + nativeBuildInputs = [ protobuf ]; + checkInputs = [ git ]; + + ldflags = [ "-s" "-w" ]; + preCheck = '' export PATH=$PATH:$GOPATH/bin + # To skip TestCloneBranchAndRefToBucket + export CI=true ''; - nativeBuildInputs = [ protobuf ]; + installPhase = '' + runHook preInstall + + mkdir -p "$out/bin" + dir="$GOPATH/bin" + # Only install required binaries, don't install testing binaries + for file in \ + "buf" \ + "protoc-gen-buf-breaking" \ + "protoc-gen-buf-lint" \ + "protoc-gen-buf-check-breaking" \ + "protoc-gen-buf-check-lint"; do + cp "$dir/$file" "$out/bin/" + done - vendorSha256 = "sha256-XMGXVsSLEzuzujX5Fg3LLkgzyJY+nIBJEO9iI2t9eGc="; + runHook postInstall + ''; meta = with lib; { description = "Create consistent Protobuf APIs that preserve compatibility and comply with design best-practices"; diff --git a/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix b/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix index 711b971c2d88..cbc2ceb21abc 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "bazel-remote"; - version = "2.0.1"; + version = "2.1.0"; src = fetchFromGitHub { owner = "buchgr"; repo = pname; rev = "v${version}"; - sha256 = "193amcx4nk7mr51jcawym46gizqmfkvksjxm64pf7s3wraf00v01"; + sha256 = "sha256-GpbweI/grJNIRg/7lFd4tMhr9E2SPX+YUrzPJs0Gsik="; }; - vendorSha256 = "1sxv9mya8plkn3hpjgfpzgwlh4m3cbhpywqv86brj2h9i4ad0gl5"; + vendorSha256 = "sha256-dXBGWTgUaVJCwf2LB1QdmSPP3BlKqZ28HUnq1oervNg="; doCheck = false; diff --git a/nixpkgs/pkgs/development/tools/build-managers/bear/default.nix b/nixpkgs/pkgs/development/tools/build-managers/bear/default.nix index e7b0c1d105b4..a94ca34d0364 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/bear/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/bear/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "bear"; - version = "3.0.9"; + version = "3.0.12"; src = fetchFromGitHub { owner = "rizsotto"; repo = pname; rev = version; - sha256 = "xac8PYo3qYjtQbDy8piOz5BQQpcVlAvMCv1qHrVZmPQ="; + sha256 = "0nalvmkl9iwbs4wbsacryrwr46vk3x6jzqj9v5wfyf6aim3s1szs"; }; nativeBuildInputs = [ cmake pkg-config ]; @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/rizsotto/Bear"; license = licenses.gpl3Plus; platforms = platforms.unix; - maintainers = [ maintainers.babariviere ]; + maintainers = with maintainers; [ babariviere qyliss ]; # ld: symbol(s) not found for architecture x86_64 broken = stdenv.isDarwin; }; diff --git a/nixpkgs/pkgs/development/tools/build-managers/bear/no-double-relative.patch b/nixpkgs/pkgs/development/tools/build-managers/bear/no-double-relative.patch index f4d247fa5760..257c7ffea38f 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/bear/no-double-relative.patch +++ b/nixpkgs/pkgs/development/tools/build-managers/bear/no-double-relative.patch @@ -1,14 +1,22 @@ -diff --git a/source/config.h.in b/source/config.h.in -index 728c234..a3e76c6 100644 ---- a/source/config.h.in -+++ b/source/config.h.in -@@ -65,6 +65,6 @@ constexpr char VERSION[] = "@CMAKE_PROJECT_VERSION@"; - - constexpr char CITNAMES_DEFAULT_PATH[] = "@ROOT_INSTALL_PREFIX@/@CMAKE_INSTALL_BINDIR@/citnames"; - constexpr char INTERCEPT_DEFAULT_PATH[] = "@ROOT_INSTALL_PREFIX@/@CMAKE_INSTALL_BINDIR@/intercept"; --constexpr char LIBRARY_DEFAULT_PATH[] = "@ROOT_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBEXECDIR@/@CMAKE_SHARED_LIBRARY_PREFIX@exec@CMAKE_SHARED_LIBRARY_SUFFIX@"; --constexpr char WRAPPER_DEFAULT_PATH[] = "@ROOT_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBEXECDIR@/wrapper"; --constexpr char WRAPPER_DIR_DEFAULT_PATH[] = "@ROOT_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBEXECDIR@/wrapper.d"; -+constexpr char LIBRARY_DEFAULT_PATH[] = "@CMAKE_INSTALL_LIBEXECDIR@/@CMAKE_SHARED_LIBRARY_PREFIX@exec@CMAKE_SHARED_LIBRARY_SUFFIX@"; -+constexpr char WRAPPER_DEFAULT_PATH[] = "@CMAKE_INSTALL_LIBEXECDIR@/wrapper"; -+constexpr char WRAPPER_DIR_DEFAULT_PATH[] = "@CMAKE_INSTALL_LIBEXECDIR@/wrapper.d"; +diff --git i/source/config.h.in w/source/config.h.in +index ffcce3a..0caba6d 100644 +--- i/source/config.h.in ++++ w/source/config.h.in +@@ -107,7 +107,7 @@ namespace cmd { + } + + namespace wrapper { +- constexpr char DEFAULT_PATH[] = "@ROOT_INSTALL_PREFIX@/@PRIVATE_INSTALLDIR@/wrapper"; ++ constexpr char DEFAULT_PATH[] = "@PRIVATE_INSTALLDIR@/wrapper"; + constexpr char DEFAULT_DIR_PATH[] = "@ROOT_INSTALL_PREFIX@/@PRIVATE_INSTALLDIR@/wrapper.d"; + + constexpr char FLAG_VERBOSE[] = "--verbose"; +@@ -120,7 +120,7 @@ namespace cmd { + } + + namespace library { +- constexpr char DEFAULT_PATH[] = "@ROOT_INSTALL_PREFIX@/@PRIVATE_INSTALLDIR@/@CMAKE_SHARED_LIBRARY_PREFIX@exec@CMAKE_SHARED_LIBRARY_SUFFIX@"; ++ constexpr char DEFAULT_PATH[] = "@PRIVATE_INSTALLDIR@/@CMAKE_SHARED_LIBRARY_PREFIX@exec@CMAKE_SHARED_LIBRARY_SUFFIX@"; + + constexpr char KEY_REPORTER[] = "INTERCEPT_REPORT_COMMAND"; + constexpr char KEY_DESTINATION[] = "INTERCEPT_REPORT_DESTINATION"; diff --git a/nixpkgs/pkgs/development/tools/build-managers/gup/default.nix b/nixpkgs/pkgs/development/tools/build-managers/gup/default.nix index dfa65736f99f..7fa8feb8e33f 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/gup/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/gup/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchFromGitHub, nix-update-source, lib, python3 , which, runtimeShell, pychecker ? null }: stdenv.mkDerivation rec { - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "timbertson"; repo = "gup"; - rev = "version-0.7.0"; - sha256 = "1pwnmlq2pgkkln9sgz4wlb9dqlqw83bkf105qljnlvggc21zm3pv"; + rev = "version-${version}"; + sha256 = "1zjd76jyb5zc9w3l368723bjmxjl05s096g8ipwncfks1p9hdgf3"; }; pname = "gup"; nativeBuildInputs = [ python3 which pychecker ]; @@ -18,20 +18,23 @@ stdenv.mkDerivation rec { mkdir $out cp -r python/bin $out/bin ''; - passthru.updateScript = '' - #!${runtimeShell} - set -e - echo - cd ${toString ./.} - ${nix-update-source}/bin/nix-update-source \ - --prompt version \ - --replace-attr version \ - --set owner timbertson \ - --set repo gup \ - --set type fetchFromGitHub \ - --set rev 'version-{version}' \ - --modify-nix default.nix - ''; + passthru.updateScript = [ + runtimeShell + "-c" + '' + set -e + echo + cd ${toString ./.} + ${nix-update-source}/bin/nix-update-source \ + --prompt version \ + --replace-attr version \ + --set owner timbertson \ + --set repo gup \ + --set type fetchFromGitHub \ + --set rev 'version-{version}' \ + --modify-nix default.nix + '' + ]; meta = { inherit (src.meta) homepage; description = "A better make, inspired by djb's redo"; diff --git a/nixpkgs/pkgs/development/tools/build-managers/sbt/default.nix b/nixpkgs/pkgs/development/tools/build-managers/sbt/default.nix index 89628b81fbc2..677b31063ac5 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/sbt/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/sbt/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "sbt"; - version = "1.5.3"; + version = "1.5.4"; src = fetchurl { url = "https://github.com/sbt/sbt/releases/download/v${version}/sbt-${version}.tgz"; - sha256 = "10kIQNy+3V1SD4uEZs/BJ4E6bTCRV3wjBN8gw9jr9VQ="; + sha256 = "035jl4czx9ixl12z874bksq5wxdnajxr06cl1yvfj2v92yx3l5wf"; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/tools/butane/default.nix b/nixpkgs/pkgs/development/tools/butane/default.nix index fc42f311af87..f417dc420350 100644 --- a/nixpkgs/pkgs/development/tools/butane/default.nix +++ b/nixpkgs/pkgs/development/tools/butane/default.nix @@ -4,13 +4,13 @@ with lib; buildGoModule rec { pname = "butane"; - version = "0.11.0"; + version = "0.12.1"; src = fetchFromGitHub { owner = "coreos"; repo = "butane"; rev = "v${version}"; - sha256 = "1s4rkq7mj1lyi8h47jyfy3qygfxhrmpihdy8rcnn55gcy04lm0qc"; + sha256 = "1bgh7h3hwrgjkw72233qzqpkshzbizhdapa0lalzj1xnclq3rqlp"; }; vendorSha256 = null; diff --git a/nixpkgs/pkgs/development/tools/clang-tools/wrapper b/nixpkgs/pkgs/development/tools/clang-tools/wrapper index eebc152d11b1..1008023fdc0d 100755 --- a/nixpkgs/pkgs/development/tools/clang-tools/wrapper +++ b/nixpkgs/pkgs/development/tools/clang-tools/wrapper @@ -19,9 +19,9 @@ buildcpath() { } export CPATH=${CPATH}${CPATH:+':'}$(buildcpath ${NIX_CFLAGS_COMPILE} \ - $(<@clang@/nix-support/libc-cflags)) + $(<@clang@/nix-support/libc-cflags)):@clang@/resource-root/include export CPLUS_INCLUDE_PATH=${CPLUS_INCLUDE_PATH}${CPLUS_INCLUDE_PATH:+':'}$(buildcpath ${NIX_CFLAGS_COMPILE} \ $(<@clang@/nix-support/libcxx-cxxflags) \ - $(<@clang@/nix-support/libc-cflags)) + $(<@clang@/nix-support/libc-cflags)):@clang@/resource-root/include exec -a "$0" @unwrapped@/bin/$(basename $0) "$@" diff --git a/nixpkgs/pkgs/development/tools/continuous-integration/drone/default.nix b/nixpkgs/pkgs/development/tools/continuous-integration/drone/default.nix index a2bc47b6408b..c6d1e47389a6 100644 --- a/nixpkgs/pkgs/development/tools/continuous-integration/drone/default.nix +++ b/nixpkgs/pkgs/development/tools/continuous-integration/drone/default.nix @@ -3,9 +3,9 @@ buildGoModule rec { pname = "drone.io${lib.optionalString (!enableUnfree) "-oss"}"; - version = "1.10.0"; + version = "2.0.0"; - vendorSha256 = "sha256-cKHX/GnvGELQBfoo0/1UmDQ4Z66GGnnHG7+1CzjinL0="; + vendorSha256 = "sha256-cnbZSnHU+ORm7/dV+U9NfM18Zrzi24vf7qITPJsusU8="; doCheck = false; @@ -13,7 +13,7 @@ buildGoModule rec { owner = "drone"; repo = "drone"; rev = "v${version}"; - sha256 = "sha256-12Jac+mXWdUX8gWvmpdO9ROv7Bi0YzvyqnNDVNJOr34="; + sha256 = "sha256-BxwCJf3uY34rqegZJ6H/zb63orELhq41trOgzGXQe80="; }; preBuild = '' diff --git a/nixpkgs/pkgs/development/tools/database/litecli/default.nix b/nixpkgs/pkgs/development/tools/database/litecli/default.nix index ee18a72216dc..75e600ccb513 100644 --- a/nixpkgs/pkgs/development/tools/database/litecli/default.nix +++ b/nixpkgs/pkgs/development/tools/database/litecli/default.nix @@ -1,16 +1,15 @@ -{ lib, python3Packages }: +{ lib +, python3Packages +}: python3Packages.buildPythonApplication rec { pname = "litecli"; - version = "1.5.0"; - - # Python 2 won't have prompt_toolkit 2.x.x - # See: https://github.com/NixOS/nixpkgs/blob/f49e2ad3657dede09dc998a4a98fd5033fb52243/pkgs/top-level/python-packages.nix#L3408 - disabled = python3Packages.isPy27; + version = "1.6.0"; + disabled = python3Packages.pythonOlder "3.4"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "b09f0804d26b018360b240778612390810e8e00ea0f79d5412fd0d4775c0e3cd"; + sha256 = "sha256-TSdOFHW007syOEg4gwvEqDiJkrfLgRmqjP/H/6oBZ/k="; }; propagatedBuildInputs = with python3Packages; [ @@ -27,6 +26,8 @@ python3Packages.buildPythonApplication rec { mock ]; + pythonImportsCheck = [ "litecli" ]; + meta = with lib; { description = "Command-line interface for SQLite"; longDescription = '' diff --git a/nixpkgs/pkgs/development/tools/database/litestream/default.nix b/nixpkgs/pkgs/development/tools/database/litestream/default.nix new file mode 100644 index 000000000000..3f70f39da951 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/database/litestream/default.nix @@ -0,0 +1,30 @@ +{ buildGoModule +, fetchFromGitHub +, lib +}: +buildGoModule rec { + pname = "litestream"; + version = "0.3.5"; + + src = fetchFromGitHub { + owner = "benbjohnson"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-OQ8j0FOUWU5TfCl4AZpmX5tuhtHAbrhvzT6ve6AJNn0="; + }; + + ldflags = [ + "-s" + "-w" + "-X main.Version=${version}" + ]; + + vendorSha256 = "sha256-ScG8cukUuChOvN9r0HvVJsYnu1X9DSO7aD32iu55jIM="; + + meta = with lib; { + description = "Streaming replication for SQLite"; + license = licenses.asl20; + homepage = "https://litestream.io/"; + maintainers = with maintainers; [ fbrs ]; + }; +} diff --git a/nixpkgs/pkgs/development/tools/database/sqlfluff/default.nix b/nixpkgs/pkgs/development/tools/database/sqlfluff/default.nix new file mode 100644 index 000000000000..01f4941c8e4f --- /dev/null +++ b/nixpkgs/pkgs/development/tools/database/sqlfluff/default.nix @@ -0,0 +1,65 @@ +{ lib +, fetchFromGitHub +, python3 +}: + +python3.pkgs.buildPythonApplication rec { + pname = "sqlfluff"; + version = "0.6.0a2"; + disabled = python3.pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = version; + sha256 = "13hzr0jialzi2nlvqwvff3w0h6jikqvcg0p2p4irwlisg4db8w7w"; + }; + + propagatedBuildInputs = with python3.pkgs; [ + appdirs + cached-property + click + colorama + configparser + diff_cover + jinja2 + oyaml + pathspec + pytest + tblib + toml + ] ++ lib.optionals (pythonOlder "3.7") [ + dataclasses + ] ++ lib.optionals (pythonOlder "3.9") [ + typing-extensions + ]; + + checkInputs = with python3.pkgs; [ + hypothesis + pytestCheckHook + ]; + + disabledTestPaths = [ + # dbt is not available yet + "test/core/templaters/dbt_test.py" + # Don't run the plugin related tests + "test/core/plugin_test.py" + "plugins/sqlfluff-plugin-example/test/rules/rule_test_cases_test.py" + ]; + + disabledTests = [ + # dbt is not available yet + "test__linter__skip_dbt_model_disabled" + "test_rules__test_helper_has_variable_introspection" + "test__rules__std_file_dbt" + ]; + + pythonImportsCheck = [ "sqlfluff" ]; + + meta = with lib; { + description = "SQL linter and auto-formatter"; + homepage = "https://www.sqlfluff.com/"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/tools/database/sqlitebrowser/default.nix b/nixpkgs/pkgs/development/tools/database/sqlitebrowser/default.nix index 40238d0effa4..45b5f185880d 100644 --- a/nixpkgs/pkgs/development/tools/database/sqlitebrowser/default.nix +++ b/nixpkgs/pkgs/development/tools/database/sqlitebrowser/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchFromGitHub, cmake, antlr +{ mkDerivation, lib, fetchFromGitHub, cmake , qtbase, qttools, sqlite }: mkDerivation rec { @@ -16,7 +16,7 @@ mkDerivation rec { # but qscintilla is currently in a bit of a mess as some consumers expect a # -qt4 or -qt5 prefix while others do not. # We *really* should get that cleaned up. - buildInputs = [ antlr qtbase sqlite ]; + buildInputs = [ qtbase sqlite ]; nativeBuildInputs = [ cmake qttools ]; diff --git a/nixpkgs/pkgs/development/tools/dockle/default.nix b/nixpkgs/pkgs/development/tools/dockle/default.nix index 55869b022952..437f7f2da581 100644 --- a/nixpkgs/pkgs/development/tools/dockle/default.nix +++ b/nixpkgs/pkgs/development/tools/dockle/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "dockle"; - version = "0.3.14"; + version = "0.3.15"; src = fetchFromGitHub { owner = "goodwithtech"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Xe5qgM0yPBVtH9S4OSiNnkKxcH0W89aABJF6PVRBEhQ="; + sha256 = "sha256-jxFlbGJ95cSv08HcqrVufpTE5KkvAC9zOTQ2+JZWe5A="; }; vendorSha256 = "sha256-h+2AcppNUJ7zjHeBzDy1iWoR3i7a2v0Pc7vOfoUqPOw="; diff --git a/nixpkgs/pkgs/development/tools/documentation/mkdocs/default.nix b/nixpkgs/pkgs/development/tools/documentation/mkdocs/default.nix index 64d834f1bb29..f7774cc7127e 100644 --- a/nixpkgs/pkgs/development/tools/documentation/mkdocs/default.nix +++ b/nixpkgs/pkgs/development/tools/documentation/mkdocs/default.nix @@ -1,40 +1,55 @@ -{ lib, python3, fetchFromGitHub }: +{ lib +, python3 +, fetchFromGitHub +}: with python3.pkgs; buildPythonApplication rec { pname = "mkdocs"; - version = "1.0.4"; + version = "1.2.1"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { - owner = "mkdocs"; - repo = "mkdocs"; + owner = pname; + repo = pname; rev = version; - sha256 = "1x35vgiskgz4wwrvi4m1mri5wlphf15p90fr3rxsy5bf19v3s9hs"; + sha256 = "sha256-JF3Zz1ObxeKsIF0pa8duJxqjLgMvmWsWMApHT43Z+EY="; }; - checkInputs = [ - nose nose-exclude mock + propagatedBuildInputs = [ + click + jinja2 + markdown + mergedeep + pyyaml + pyyaml-env-tag + ghp-import + importlib-metadata + watchdog + packaging ]; - NOSE_EXCLUDE_TESTS = lib.concatStringsSep ";" [ - "mkdocs.tests.gh_deploy_tests.TestGitHubDeploy" - "mkdocs.tests.config.config_tests.ConfigTests" - "mkdocs.tests.config.config_options_tests.DirTest" + checkInputs = [ + Babel + mock + pytestCheckHook ]; - checkPhase = "nosetests mkdocs"; + postPatch = '' + # Remove test due to missing requirement + rm mkdocs/tests/theme_tests.py + ''; - propagatedBuildInputs = [ - tornado - livereload - click - pyyaml - markdown - jinja2 - backports_tempfile + pytestFlagsArray = [ "mkdocs/tests/*.py" ]; + + disabledTests = [ + # Don't start a test server + "testing_server" ]; + pythonImportsCheck = [ "mkdocs" ]; + meta = with lib; { description = "Project documentation with Markdown / static website generator"; longDescription = '' @@ -42,11 +57,11 @@ buildPythonApplication rec { geared towards building project documentation. Documentation source files are written in Markdown, and configured with a single YAML configuration file. - MkDocs can also be used to generate general-purpose Websites. + MkDocs can also be used to generate general-purpose websites. ''; homepage = "http://mkdocs.org/"; - license = lib.licenses.bsd2; + license = licenses.bsd2; platforms = platforms.unix; - maintainers = [ maintainers.rkoe ]; + maintainers = with maintainers; [ rkoe ]; }; } diff --git a/nixpkgs/pkgs/development/tools/earthly/default.nix b/nixpkgs/pkgs/development/tools/earthly/default.nix index 82f59817b221..b46a97df20a3 100644 --- a/nixpkgs/pkgs/development/tools/earthly/default.nix +++ b/nixpkgs/pkgs/development/tools/earthly/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "earthly"; - version = "0.5.15"; + version = "0.5.17"; src = fetchFromGitHub { owner = "earthly"; repo = "earthly"; rev = "v${version}"; - sha256 = "sha256-3hiiCcCgbWxSfG8XCcoKdNJsQoP2L2G4g4zFQkFtzQI="; + sha256 = "sha256-SuHHeO2KFjB3HbLv1ODBGaXzNaDi/FNPOGg/lX8JLJE="; }; - vendorSha256 = "sha256-q3dDV0eop2NxXHFrlppWsZrO2Hz1q5xhs1DnB6PvG9g="; + vendorSha256 = "sha256-D62fG+T3G1W7xteSGlTtEkXbQfGAmBTYJeATH2CVtwY="; buildFlagsArray = '' -ldflags= diff --git a/nixpkgs/pkgs/development/tools/electron/default.nix b/nixpkgs/pkgs/development/tools/electron/default.nix index 0b2cdbe9c045..8377e7c4431c 100644 --- a/nixpkgs/pkgs/development/tools/electron/default.nix +++ b/nixpkgs/pkgs/development/tools/electron/default.nix @@ -95,33 +95,33 @@ rec { headers = "01x6a0r2jawjpl09ixgzap3g0z6znj34hsnnhzanavkbds0ri4k6"; }; - electron_11 = mkElectron "11.4.7" { - x86_64-linux = "05005d351a1b08a550a8186efba6f4fdd96842355a634934d9a9d7d31c2cd539"; - x86_64-darwin = "e6445ad3d7e851fc3227785788d0706d58c9c8ea3821afa7f871c6254c463043"; - i686-linux = "5473f36eb2a9772da7e4f1a162a724b4a5335e8f78fb51d585bac3bd50ff12fc"; - armv7l-linux = "0de0d74b1206f7ffd9e4c75754bbf6fdf27c83a0ce6b4cd8a6b5af81d7a20ba7"; - aarch64-linux = "f2261dde71197c358aff85d7a320cbd2315a5adf228218fd9a2f5c8561589323"; - aarch64-darwin = "a2abc83c21402e30f4f42f4615cccc4369884faa2f2fa576d71f423834988622"; - headers = "1dqkx861vfq6xbzdlbgza6h4j7bib8p3xahllrnfc0s65y8gf0ry"; + electron_11 = mkElectron "11.4.8" { + x86_64-linux = "742cfa025fa64cfa02c4eb8584e9f2f15321b795688a5c1a6597b1e1da1e98e7"; + x86_64-darwin = "b251b02f70a9a0e63866836c0638200cca05392cdec1b5271ebbe0c016276364"; + i686-linux = "a7813cfa785e8e9a440db4cfb0d98dcd5ba52041fb018856d9c544a43ae55357"; + armv7l-linux = "a72e346a569f582fc40e9ebbfd6f6faf5c32dd6e83fdcd5335c46e332dbe5ee6"; + aarch64-linux = "acd4e32851cc0fdfe1a62df90a6c8b02139e510b7c3212bd4ac57f767e85dfe4"; + aarch64-darwin = "ee28b1d525ae5be60253430200692f3fe6b4d588921aedd246bfc851014127ea"; + headers = "0l8pc4grabj641wf1q37bc19w0y9913v4c9s8pbniz7py1a6rpmn"; }; - electron_12 = mkElectron "12.0.10" { - x86_64-linux = "b5383b5818062de42536a7966df875ae781433a7ee991da34643bc6fda4ad038"; - x86_64-darwin = "3d4111280bf50dbfb141b46551974b0e4e39eb0d1f8ef789d71f7d3295a8e24f"; - i686-linux = "6fd10db8d896ef82ac8f2a1d796942dc56f5b41e504c86121d83eababa0cccb8"; - armv7l-linux = "5820ac7e70488507417122aaa0381439f929da1819c2c710ba74569a609cc972"; - aarch64-linux = "022ff009969d9f270704e918fe2dda6cd395c3e9d9e9515e99eca628d996a503"; - aarch64-darwin = "d2af4870a79866621469043e44a2a0e995abc5530d4aaf1add567b00eb286b01"; - headers = "1vl3cnhf2j5g4xhk17rag0vzbxwba5fq54mhvv0hp3hqbiqhdds6"; + electron_12 = mkElectron "12.0.11" { + x86_64-linux = "e3bac4b81f0d99447f8ff7edf88f2e9941699d30cf1f41a41af7a93b199e805b"; + x86_64-darwin = "eeee59eb751e0d95538a40c74aa1563ee4485903eb028c462872004cc8dfdabb"; + i686-linux = "97fe1b7f7414a9cf1416d4a2d61139cc71f50765f48df02b6ccb4c1af62f0d97"; + armv7l-linux = "c43b28d5d15b303a7643e7d2320f03577e27d90a13f4fa1dc3e14f81630ab62e"; + aarch64-linux = "b5f17959b8cb55f0557f4a0a37cd99c1c6d1d48fad839402383d9087175b4f44"; + aarch64-darwin = "e5f88751bfb1344ea2f1345b56e95093ebfa850761b53752fbcf8c6d8de0f824"; + headers = "11801qplb7s7zs0yjmk4436yp3xg2szn7hzag75v3g026k2ay1xz"; }; - electron_13 = mkElectron "13.1.0" { - x86_64-linux = "6681078971d2e99e9f8b3c598de65869d3596356af901bbbabcc4860c0496bb4"; - x86_64-darwin = "d62a561e80fcbcb0f249e74c487313192451046f288478add65be997793831de"; - i686-linux = "e4d8cc19689b1f9c00894bb776083f8543abeba9203d3297268c1644f1300355"; - armv7l-linux = "ac5a19e31fd83db5775a2af57f742c7b3e5fc4528958329ec3c81f82e7bd611a"; - aarch64-linux = "0ed0cc3afae5cc7e1e6c6204866a1cecdf97e0ab658789e8951842bd0d28e1bb"; - aarch64-darwin = "6da46d2861011263af2953a3e0186735e54708c01c50967ff5f8ed71b73f7fea"; - headers = "1h4saavsy97kmbfaw6xcya5l0iybr37vyw7bv539c7a064kam07b"; + electron_13 = mkElectron "13.1.2" { + x86_64-linux = "1391bae19ff6446fb56f00ba5597bb92a509b6e808534087c153b9fcebddbeef"; + x86_64-darwin = "b8c5eca90864ce4a91e1fdb8a932598fad31922407b502eeb868a508fd26347f"; + i686-linux = "40d6c373b5e77b80285715fb66acb6562ea1d685f6644d463fb427f846f09fdc"; + armv7l-linux = "ce31a8d455663f6e85ed75fa9ac1007b55d6fd0b9445d9e51e2a103706e49e94"; + aarch64-linux = "06965ade2aaf4dce78b5d5b075fc09c225d7d83817297338fc26eb4d33ebb289"; + aarch64-darwin = "dde2b3fd2ac52097481ff5bfd54c358432f7f2402b0b20ae32681ae6e5a4d451"; + headers = "1qrw1cpj63757c582zzz0gchaq0w0xq1mm5702q34xyv06mh5h93"; }; } diff --git a/nixpkgs/pkgs/development/tools/esbuild/default.nix b/nixpkgs/pkgs/development/tools/esbuild/default.nix index 894168145aee..22a6a59cc1bc 100644 --- a/nixpkgs/pkgs/development/tools/esbuild/default.nix +++ b/nixpkgs/pkgs/development/tools/esbuild/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "esbuild"; - version = "0.12.7"; + version = "0.12.9"; src = fetchFromGitHub { owner = "evanw"; repo = "esbuild"; rev = "v${version}"; - sha256 = "sha256-LHM3dlVfwgA1HJPg/77Er/RWEDVmmQuuhrS5KzTAtV0="; + sha256 = "sha256-MqwgdhgWIfYE0wO7fWQuC72tEwCVgL7qUbJlJ3APf4E="; }; vendorSha256 = "sha256-2ABWPqhK2Cf4ipQH7XvRrd+ZscJhYPc3SV2cGT0apdg="; diff --git a/nixpkgs/pkgs/development/tools/fission/default.nix b/nixpkgs/pkgs/development/tools/fission/default.nix index 133db2d9ff00..3045842d91f0 100644 --- a/nixpkgs/pkgs/development/tools/fission/default.nix +++ b/nixpkgs/pkgs/development/tools/fission/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "fission"; - version = "1.12.0"; + version = "1.13.0"; src = fetchFromGitHub { owner = "fission"; repo = "fission"; rev = version; - sha256 = "0izvkjd7ydcxhr6zmgrbfm3ybz2kf4p27099lr07gd4x7c6xxmqr"; + sha256 = "sha256-WCynU5+d789d584JH99jmTZSEbyco2ysuBXIC2pW1r4="; }; - vendorSha256 = "12clw0wy4lypf45imqnabj39yxqpi348csr4m5d0d1rksxgvwngq"; + vendorSha256 = "sha256-V3/IFCbW3wXfNiFzucLeyFDc6SA2nE+NwO0sNEBmIYg="; buildFlagsArray = "-ldflags=-s -w -X info.Version=${version}"; diff --git a/nixpkgs/pkgs/development/tools/flawfinder/default.nix b/nixpkgs/pkgs/development/tools/flawfinder/default.nix index 28805b4abe43..554ca92b8c0e 100644 --- a/nixpkgs/pkgs/development/tools/flawfinder/default.nix +++ b/nixpkgs/pkgs/development/tools/flawfinder/default.nix @@ -31,5 +31,6 @@ stdenv.mkDerivation rec { homepage = "https://dwheeler.com/flawfinder/"; license = with licenses; [ gpl2Only ]; maintainers = with maintainers; [ fab ]; + platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/development/tools/frugal/default.nix b/nixpkgs/pkgs/development/tools/frugal/default.nix index c8339fe6d851..0b1e8d16b65a 100644 --- a/nixpkgs/pkgs/development/tools/frugal/default.nix +++ b/nixpkgs/pkgs/development/tools/frugal/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "frugal"; - version = "3.14.4"; + version = "3.14.5"; src = fetchFromGitHub { owner = "Workiva"; repo = pname; rev = "v${version}"; - sha256 = "sha256-RFVn5aL5MqsB7heDPVUci3Eyq6F/qo3RmdEaZbsC+Ng="; + sha256 = "sha256-Er9V6mSe4Pt/RzFAPa3ci3J7FQh5GLbh9CjYHx/HnYM="; }; subPackages = [ "." ]; - vendorSha256 = "sha256-hyupBMRKuw77SJNIk3mEUixV0LV5mEmZx8M70qGmYJY="; + vendorSha256 = "sha256-9M6SSxMQ8JMJ7ZNl8cjQuid/B0xc28/BuPozxftthe0="; meta = with lib; { description = "Thrift improved"; diff --git a/nixpkgs/pkgs/development/tools/gamecube-tools/default.nix b/nixpkgs/pkgs/development/tools/gamecube-tools/default.nix index 2f7c088cd486..d7715d67acb4 100644 --- a/nixpkgs/pkgs/development/tools/gamecube-tools/default.nix +++ b/nixpkgs/pkgs/development/tools/gamecube-tools/default.nix @@ -2,7 +2,7 @@ , freeimage, libGL }: stdenv.mkDerivation rec { - version = "1.0.2"; + version = "1.0.4"; pname = "gamecube-tools"; nativeBuildInputs = [ autoreconfHook ]; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { owner = "devkitPro"; repo = "gamecube-tools"; rev = "v${version}"; - sha256 = "0zvpkzqvl8iv4ndzhkjkmrzpampyzgb91spv0h2x2arl8zy4z7ca"; + sha256 = "sha256-0iMY2LokfsYgHzIuFc8RlrVlJCURqVqprP54PG4oW0M="; }; meta = with lib; { diff --git a/nixpkgs/pkgs/development/tools/go-toml/default.nix b/nixpkgs/pkgs/development/tools/go-toml/default.nix index fee8d94f754b..8a41e0a4d133 100644 --- a/nixpkgs/pkgs/development/tools/go-toml/default.nix +++ b/nixpkgs/pkgs/development/tools/go-toml/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "go-toml"; - version = "1.9.2"; + version = "1.9.3"; src = fetchFromGitHub { owner = "pelletier"; repo = pname; rev = "v${version}"; - sha256 = "sha256-x740f6I+szhq4mEsed4bsXcC8PvzF6PKFJNJ9SKMGIE="; + sha256 = "sha256-Vu/PS01JeSeg1KHkpqL12rTjRJFoc9rla48H/ei2HDM="; }; goPackagePath = "github.com/pelletier/go-toml"; diff --git a/nixpkgs/pkgs/development/tools/golangci-lint/default.nix b/nixpkgs/pkgs/development/tools/golangci-lint/default.nix index 2019c7cb3e22..f4ff5dd2b946 100644 --- a/nixpkgs/pkgs/development/tools/golangci-lint/default.nix +++ b/nixpkgs/pkgs/development/tools/golangci-lint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "golangci-lint"; - version = "1.40.1"; + version = "1.41.0"; src = fetchFromGitHub { owner = "golangci"; repo = "golangci-lint"; rev = "v${version}"; - sha256 = "sha256-5OtXfDPpdwVMnI5Pttr+XQPgJXI7YexPtBhIDeS1CXk="; + sha256 = "sha256-ogH3L2EG0xdGpCaEfMUYnCWyFTGgx/C/O54mMxcJSBA="; }; - vendorSha256 = "sha256-8SPUOQ88RkU0dkyNccf+POKitXHlCRaxrIugV91gDZQ="; + vendorSha256 = "sha256-gYulktNetcgXk43Ydk4+WEMZMFCrmx6p5VnsFIJdQhk="; doCheck = false; diff --git a/nixpkgs/pkgs/development/tools/gosec/default.nix b/nixpkgs/pkgs/development/tools/gosec/default.nix index a24ec1050146..9264ac27fa2a 100644 --- a/nixpkgs/pkgs/development/tools/gosec/default.nix +++ b/nixpkgs/pkgs/development/tools/gosec/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "gosec"; - version = "2.8.0"; + version = "2.8.1"; subPackages = [ "cmd/gosec" ]; @@ -10,10 +10,10 @@ buildGoModule rec { owner = "securego"; repo = pname; rev = "v${version}"; - sha256 = "sha256-AC3NHW7LYbpZGA+iaM9eXFLothhqZuvRJM1ehBByhpk="; + sha256 = "sha256-AlADSEekcUH/pCGggKlkBDiIYMe1zsoe9hh6fVUwQVA="; }; - vendorSha256 = "sha256-QfbElEjkYdmzYhQ8TOFIb2jfG2xzbW1UL2eLxROsBfw="; + vendorSha256 = "sha256-HBwIZfvkL9HSwkD1sZzBM7IJFAjLbCxyc95vqR5TFAg="; doCheck = false; diff --git a/nixpkgs/pkgs/development/tools/irony-server/default.nix b/nixpkgs/pkgs/development/tools/irony-server/default.nix index 2a7a7b1a16a3..192a33ad7ca7 100644 --- a/nixpkgs/pkgs/development/tools/irony-server/default.nix +++ b/nixpkgs/pkgs/development/tools/irony-server/default.nix @@ -1,20 +1,16 @@ -{ lib, stdenv, cmake, llvmPackages, irony }: +{ lib, stdenv, cmake, llvmPackages, llvm, irony }: stdenv.mkDerivation { pname = "irony-server"; inherit (irony) src version; - nativeBuildInputs = [ cmake llvmPackages.llvm.dev ]; - buildInputs = [ llvmPackages.libclang llvmPackages.llvm ]; + nativeBuildInputs = [ cmake llvm ]; + buildInputs = [ llvmPackages.libclang ]; dontUseCmakeBuildDir = true; cmakeDir = "server"; - cmakeFlags = [ - "-DCMAKE_PREFIX_PATH=${llvmPackages.clang-unwrapped}" - ]; - meta = with lib; { description = "The server part of irony"; homepage = "https://melpa.org/#/irony"; diff --git a/nixpkgs/pkgs/development/tools/jbang/default.nix b/nixpkgs/pkgs/development/tools/jbang/default.nix index dfef3906602c..1220ec90d90f 100644 --- a/nixpkgs/pkgs/development/tools/jbang/default.nix +++ b/nixpkgs/pkgs/development/tools/jbang/default.nix @@ -1,12 +1,12 @@ { stdenv, lib, fetchzip, jdk, makeWrapper, coreutils, curl }: stdenv.mkDerivation rec { - version = "0.70.0"; + version = "0.71.1"; pname = "jbang"; src = fetchzip { url = "https://github.com/jbangdev/jbang/releases/download/v${version}/${pname}-${version}.tar"; - sha256 = "sha256-Fy7TvWJVRJI5fhfZzMuW+KBLaVLWKjk/I3Kx60Wazyo="; + sha256 = "sha256-+s2Wa+5Qznqpv84VEZCMmzy0bI1mN/BknPObYqJlaYs="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/development/tools/just/default.nix b/nixpkgs/pkgs/development/tools/just/default.nix index dbd10772a626..e1ae8a5a0e7c 100644 --- a/nixpkgs/pkgs/development/tools/just/default.nix +++ b/nixpkgs/pkgs/development/tools/just/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "just"; - version = "0.9.4"; + version = "0.9.5"; src = fetchFromGitHub { owner = "casey"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-C0W5oMnKlQ5hg/0YLKZKiQfLghJ7yAJYW6k0G6eOFQE="; + rev = version; + sha256 = "sha256-fDbnOfT2BTCLF2knUf3ccDnuA0mhM+gkbja7xgmWoaY="; }; - cargoSha256 = "sha256-TqvUunBFpKIog0pG85M/JLz8orncgbRqnQolseXYSo4="; + cargoSha256 = "sha256-mBrFw5d0LXTKj7Nm8XmT5hsq/d/x84U/Gp02+lay2OY="; nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; diff --git a/nixpkgs/pkgs/development/tools/kafkacat/default.nix b/nixpkgs/pkgs/development/tools/kafkacat/default.nix index e297de7a0db0..5493bf24428d 100644 --- a/nixpkgs/pkgs/development/tools/kafkacat/default.nix +++ b/nixpkgs/pkgs/development/tools/kafkacat/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, zlib, rdkafka, yajl }: +{ lib, stdenv, fetchFromGitHub, pkg-config, zlib, rdkafka, yajl, avro-c, libserdes }: stdenv.mkDerivation rec { pname = "kafkacat"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ zlib rdkafka yajl ]; + buildInputs = [ zlib rdkafka yajl avro-c libserdes ]; preConfigure = '' patchShebangs ./configure diff --git a/nixpkgs/pkgs/development/tools/ktlint/default.nix b/nixpkgs/pkgs/development/tools/ktlint/default.nix index 4abe6b6d17fa..61b4a570b815 100644 --- a/nixpkgs/pkgs/development/tools/ktlint/default.nix +++ b/nixpkgs/pkgs/development/tools/ktlint/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ktlint"; - version = "0.40.0"; + version = "0.41.0"; src = fetchurl { - url = "https://github.com/shyiko/ktlint/releases/download/${version}/ktlint"; - sha256 = "17n1xdalz38h9p4ylcpkbbqp22b1np5l8y5l3r58kaf9k8p6cfa7"; + url = "https://github.com/pinterest/ktlint/releases/download/${version}/ktlint"; + sha256 = "10z1010k25i40iv7v339csmbs83hmwjv1004jikckb78wncd12s3"; }; nativeBuildInputs = [ makeWrapper ]; @@ -26,6 +26,6 @@ stdenv.mkDerivation rec { homepage = "https://ktlint.github.io/"; license = licenses.mit; platforms = jre_headless.meta.platforms; - maintainers = with maintainers; [ tadfisher ]; + maintainers = with maintainers; [ tadfisher SubhrajyotiSen ]; }; } diff --git a/nixpkgs/pkgs/development/tools/kustomize/kustomize-sops.nix b/nixpkgs/pkgs/development/tools/kustomize/kustomize-sops.nix index 7753556a4ea5..9c71af562137 100644 --- a/nixpkgs/pkgs/development/tools/kustomize/kustomize-sops.nix +++ b/nixpkgs/pkgs/development/tools/kustomize/kustomize-sops.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kustomize-sops"; - version = "2.5.5"; + version = "2.5.6"; src = fetchFromGitHub { owner = "viaduct-ai"; repo = pname; rev = "v${version}"; - sha256 = "sha256-lNC8TwX462Lnt/uiKWt9hNa81g3tdenvvuNQJNkj7hM="; + sha256 = "sha256-UEtWEOuekFbMUJFWYdXfzbCWCz4I7vVdb9UBQbMXF/A="; }; - vendorSha256 = "sha256-uStmUhiZuUguxUx2L8ifSNnbMCs7Jk+6tq7qZdACjag="; + vendorSha256 = "sha256-kNJkSivSj8LMeXobKazLy9MCTtWzrBn99GmvaH+qIUU="; installPhase = '' mkdir -p $out/lib/viaduct.ai/v1/ksops-exec/ diff --git a/nixpkgs/pkgs/development/tools/misc/act/default.nix b/nixpkgs/pkgs/development/tools/misc/act/default.nix index 8c01aea284eb..38520b4b3e56 100644 --- a/nixpkgs/pkgs/development/tools/misc/act/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/act/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "act"; - version = "0.2.22"; + version = "0.2.23"; src = fetchFromGitHub { owner = "nektos"; repo = pname; rev = "v${version}"; - sha256 = "sha256-a+yw7QSLNX3hO2GnFCifYMbPWYwtleUZS1AqPsxw9t8="; + sha256 = "sha256-PBhlBWycAYuczfP0D+Gf1pDvrfI9gz3JyGe5FBq782Y="; }; - vendorSha256 = "sha256-6jD+gY/TmO/Ot507IlTLNdWv7G4BHYlk/E9rVoRD65A="; + vendorSha256 = "sha256-dLIsVWN/PjcH0CUYRmn4YaF8Pczf/gaWhD3lulqGiuA="; doCheck = false; @@ -22,6 +22,6 @@ buildGoModule rec { homepage = "https://github.com/nektos/act"; changelog = "https://github.com/nektos/act/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ Br1ght0ne ]; + maintainers = with maintainers; [ Br1ght0ne SuperSandro2000 ]; }; } diff --git a/nixpkgs/pkgs/development/tools/misc/c2ffi/default.nix b/nixpkgs/pkgs/development/tools/misc/c2ffi/default.nix new file mode 100644 index 000000000000..b7a5b1dc7eb8 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/misc/c2ffi/default.nix @@ -0,0 +1,56 @@ +{ lib +, fetchFromGitHub +, cmake +, llvmPackages_11 +, unstableGitUpdater +}: + +let + c2ffiBranch = "llvm-11.0.0"; + llvmPackages = llvmPackages_11; +in + +llvmPackages.stdenv.mkDerivation { + pname = "c2ffi-${c2ffiBranch}"; + version = "unstable-2021-04-15"; + + src = fetchFromGitHub { + owner = "rpav"; + repo = "c2ffi"; + rev = "0255131f80b21334e565231331c2b451b6bba8c4"; + sha256 = "0ihysgqjyg5xwi098hxf15lpdi6g4nwpzczp495is912c48fy6b6"; + }; + + passthru.updateScript = unstableGitUpdater { + url = "https://github.com/rpav/c2ffi.git"; + branch = c2ffiBranch; + }; + + nativeBuildInputs = [ + cmake + ]; + + buildInputs = [ + llvmPackages.llvm + llvmPackages.clang + llvmPackages.libclang + ]; + + # This isn't much, but... + doInstallCheck = true; + installCheckPhase = '' + $out/bin/c2ffi --help 2>&1 >/dev/null + ''; + + # LLVM may be compiled with -fno-rtti, so let's just turn it off. + # A mismatch between lib{clang,LLVM}* and us can lead to the link time error: + # undefined reference to `typeinfo for clang::ASTConsumer' + CXXFLAGS="-fno-rtti"; + + meta = with lib; { + homepage = "https://github.com/rpav/c2ffi"; + description = "An LLVM based tool for extracting definitions from C, C++, and Objective C header files for use with foreign function call interfaces"; + license = licenses.lgpl21Only; + maintainers = with maintainers; [ attila-lendvai ]; + }; +} diff --git a/nixpkgs/pkgs/development/tools/misc/ccache/default.nix b/nixpkgs/pkgs/development/tools/misc/ccache/default.nix index 94fca742b6d3..909a160c7eea 100644 --- a/nixpkgs/pkgs/development/tools/misc/ccache/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/ccache/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , substituteAll , binutils , asciidoc @@ -34,6 +35,11 @@ let ccache = stdenv.mkDerivation rec { src = ./force-objdump-on-darwin.patch; objdump = "${binutils.bintools}/bin/objdump"; }) + # Fix clang C++ modules test (remove in next release) + (fetchpatch { + url = "https://github.com/ccache/ccache/commit/8b0c783ffc77d29a3e3520345b776a5c496fd892.patch"; + sha256 = "13qllx0qhfrdila6bdij9lk74fhkm3vdj01zgq1ri6ffrv9lqrla"; + }) ]; nativeBuildInputs = [ asciidoc cmake perl ]; diff --git a/nixpkgs/pkgs/development/tools/misc/clojure-lsp/default.nix b/nixpkgs/pkgs/development/tools/misc/clojure-lsp/default.nix index dc342e501e4c..3f51136c65c2 100644 --- a/nixpkgs/pkgs/development/tools/misc/clojure-lsp/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/clojure-lsp/default.nix @@ -2,18 +2,18 @@ stdenv.mkDerivation rec { pname = "clojure-lsp"; - version = "2021.04.13-12.47.33"; + version = "2021.06.01-16.19.44"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "1la0d28pvp1fqnxp3scb2vawcblilwyx42djxn379vag403p1i2d"; + sha256 = "sha256-dACvjm+uEVWotoeYhA4gCenKeprpF2dI0PGNRAVALao="; }; jar = fetchurl { url = "https://github.com/clojure-lsp/clojure-lsp/releases/download/${version}/clojure-lsp.jar"; - sha256 = "059gz7y2rzwdxpyqy80w4lghzgxi5lb4rxmks1721yq6k7ljjyqy"; + sha256 = "sha256-V12rSYv/Yu12ZpLSROd+4pyGiEGRfJ7lmRqCeikcQ5Q="; }; GRAALVM_HOME = graalvm11-ce; @@ -41,6 +41,8 @@ stdenv.mkDerivation rec { checkPhase = '' runHook preCheck + export HOME="$(mktemp -d)" + ./clojure-lsp --version | fgrep -q '${version}' ${babashka}/bin/bb integration-test/run-all.clj ./clojure-lsp runHook postCheck diff --git a/nixpkgs/pkgs/development/tools/misc/polylith/default.nix b/nixpkgs/pkgs/development/tools/misc/polylith/default.nix new file mode 100644 index 000000000000..b29b2521d170 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/misc/polylith/default.nix @@ -0,0 +1,49 @@ +{ lib, stdenv, fetchurl, jre, runtimeShell }: + +stdenv.mkDerivation rec { + pname = "polylith"; + version = "0.1.0-alpha9"; + + src = fetchurl { + url = "https://github.com/polyfy/polylith/releases/download/v${version}/poly-${version}.jar"; + sha256 = "0mjn0fibj7z8wihk5frhyd5ai2bmzm909701sphjs7j9lgg0gc4k"; + }; + + dontUnpack = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + + cat > "$out/bin/poly" <<EOF + #!${runtimeShell} + ARGS="" + while [ "\$1" != "" ] ; do + ARGS="\$ARGS \$1" + shift + done + exec "${jre}/bin/java" "-jar" "${src}" \$ARGS + EOF + chmod a+x $out/bin/poly + + runHook postInstall + ''; + + doInstallCheck = true; + installCheckPhase = '' + runHook preInstallCheck + + $out/bin/poly help | fgrep -q '${version}' + + runHook postInstallCheck + ''; + + meta = with lib; { + description = "A tool used to develop Polylith based architectures in Clojure"; + homepage = "https://github.com/polyfy/polylith"; + license = licenses.epl10; + maintainers = [ maintainers.ericdallo ]; + platforms = jre.meta.platforms; + }; +} diff --git a/nixpkgs/pkgs/development/tools/misc/terraform-ls/default.nix b/nixpkgs/pkgs/development/tools/misc/terraform-ls/default.nix index 0c52a89229da..e189c563e86e 100644 --- a/nixpkgs/pkgs/development/tools/misc/terraform-ls/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/terraform-ls/default.nix @@ -1,26 +1,46 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, stdenv }: buildGoModule rec { pname = "terraform-ls"; - version = "0.16.2"; + version = "0.18.1"; src = fetchFromGitHub { owner = "hashicorp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-5+h1fyTCp1jUZeKRCeDhfqAA11SMyR5nw2Y2x6JyIwY="; + sha256 = "sha256-68Hs9kwv7GTGnYtoJh61ubaggPKbxFwz7qDwYaJ74c8="; }; - vendorSha256 = "sha256-m5ddUwuTX0mSihkoGIMQKidptwUL8Bao5HgHJBWX0os="; + vendorSha256 = "sha256-NgOpnCe0uGQVDVKYUIULqPTfvfkDtxIUQiCVwiE7nuc="; - # tests fail in sandbox mode because of trying to download stuff from releases.hashicorp.com - doCheck = false; + preBuild = '' + buildFlagsArray+=("-ldflags" "-s -w -X main.version=v${version} -X main.prerelease=") + ''; - buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; + preCheck = '' + # Remove tests that requires networking + rm internal/terraform/exec/exec_test.go + '' + lib.optionalString stdenv.isAarch64 '' + # Not all test failures have tracking issues as HashiCorp do not have + # aarch64 testing infra easily available, see issue 549 below. + + # Remove file that contains `TestLangServer_workspaceExecuteCommand_modules_multiple` + # which fails on aarch64: https://github.com/hashicorp/terraform-ls/issues/549 + rm internal/langserver/handlers/execute_command_modules_test.go + + # `TestModuleManager_ModuleCandidatesByPath` variants fail + rm internal/terraform/module/module_manager_test.go + + # internal/terraform/module/module_ops_queue_test.go:17:15: undefined: testLogger + # internal/terraform/module/watcher_test.go:39:11: undefined: testLogger + # internal/terraform/module/watcher_test.go:79:14: undefined: testLogger + rm internal/terraform/module/{watcher_test,module_ops_queue_test}.go + ''; meta = with lib; { description = "Terraform Language Server (official)"; homepage = "https://github.com/hashicorp/terraform-ls"; + changelog = "https://github.com/hashicorp/terraform-ls/blob/v${version}/CHANGELOG.md"; license = licenses.mpl20; - maintainers = with maintainers; [ mbaillie ]; + maintainers = with maintainers; [ mbaillie jk ]; }; } diff --git a/nixpkgs/pkgs/development/tools/misc/texlab/default.nix b/nixpkgs/pkgs/development/tools/misc/texlab/default.nix index 2fcda04cb434..42a30cce8eb9 100644 --- a/nixpkgs/pkgs/development/tools/misc/texlab/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/texlab/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "texlab"; - version = "3.1.0"; + version = "3.2.0"; src = fetchFromGitHub { owner = "latex-lsp"; repo = pname; rev = "v${version}"; - hash = "sha256-h08RRcuQG1IjuCA6Xk71+MXKprZ/w5+H2edbG3rtVSY="; + hash = "sha256-iXsV7zt190GH0kTMpdmf8xHk4cqtCVwq6LDICmhe5qU="; }; - cargoHash = "sha256-78S9Bmq6TIMiAV3HpMC8jK9fH+0Y+jXAW9V1Druyfg8="; + cargoHash = "sha256-Yqn6VpAKw93QvkxuwNcYvrQm0C4TfisRDcmFy95/yw8="; outputs = [ "out" "man" ]; diff --git a/nixpkgs/pkgs/development/tools/misc/unused/default.nix b/nixpkgs/pkgs/development/tools/misc/unused/default.nix index 58e4ba0bc98e..ee89df5d8391 100644 --- a/nixpkgs/pkgs/development/tools/misc/unused/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/unused/default.nix @@ -1,18 +1,18 @@ { lib, fetchFromGitHub, rustPlatform, cmake }: rustPlatform.buildRustPackage rec { pname = "unused"; - version = "0.2.1"; + version = "0.2.2"; src = fetchFromGitHub { owner = "unused-code"; repo = pname; rev = version; - sha256 = "06r6m7k570rdm9szghnp3g4r6ij0vp8apfanqzzxv2hd7gf8v62b"; + sha256 = "0igpf0y45rrdrwq8bznq0d5nnph0vijvn6fw96mqxhbffz0csbi9"; }; nativeBuildInputs = [ cmake ]; - cargoSha256 = "0y7vsba4r4v2lwf02i2dxwicnhknajbbzsdlnn5srvg6nvl3kspi"; + cargoSha256 = "1fngn9mmvx7jw8305w465z0nf9acc2cdl7314p77c2rz25z6rlin"; meta = with lib; { description = "A tool to identify potentially unused code"; diff --git a/nixpkgs/pkgs/development/tools/mpfshell/default.nix b/nixpkgs/pkgs/development/tools/mpfshell/default.nix index efe2b397f952..e8a2a9b89217 100644 --- a/nixpkgs/pkgs/development/tools/mpfshell/default.nix +++ b/nixpkgs/pkgs/development/tools/mpfshell/default.nix @@ -12,7 +12,7 @@ python3Packages.buildPythonPackage rec { }; propagatedBuildInputs = with python3Packages; [ - pyserial colorama websocket_client + pyserial colorama websocket-client ]; doCheck = false; diff --git a/nixpkgs/pkgs/development/tools/packer/default.nix b/nixpkgs/pkgs/development/tools/packer/default.nix index 6c59eaa73838..c4b0546ec368 100644 --- a/nixpkgs/pkgs/development/tools/packer/default.nix +++ b/nixpkgs/pkgs/development/tools/packer/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "packer"; - version = "1.7.2"; + version = "1.7.3"; src = fetchFromGitHub { owner = "hashicorp"; repo = "packer"; rev = "v${version}"; - sha256 = "sha256-Ey1gkld7WosJgoqnNp4Lz2x3PTI+w5p+A8Cwv4+uUZw="; + sha256 = "sha256-k5GCUFzjf0mipIQlnf7VCUS2j7cFwoGCeM7T6qgGnJA="; }; - vendorSha256 = null; + vendorSha256 = "sha256-5Wb7WAUGXJ7VMWiQyboH3PXJazsqitD9N0Acd+WItaY="; subPackages = [ "." ]; diff --git a/nixpkgs/pkgs/development/tools/parsing/byacc/default.nix b/nixpkgs/pkgs/development/tools/parsing/byacc/default.nix index 756d99c6e7f4..50e8101c17a5 100644 --- a/nixpkgs/pkgs/development/tools/parsing/byacc/default.nix +++ b/nixpkgs/pkgs/development/tools/parsing/byacc/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "byacc"; - version = "20210109"; + version = "20210520"; src = fetchurl { urls = [ "ftp://ftp.invisible-island.net/byacc/${pname}-${version}.tgz" "https://invisible-mirror.net/archives/byacc/${pname}-${version}.tgz" ]; - sha256 = "sha256-nn13aFhxQed4RJJhXf78cKjgBBAEO2OQHv7cG1DBm5c="; + sha256 = "sha256-19MdrnLLlzSC73+XVgmuQBzMEu4/sWi2emlSbGCv5D4="; }; configureFlags = [ diff --git a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c-sharp.json b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c-sharp.json index 148004de4657..5ebc9c9a0f3c 100644 --- a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c-sharp.json +++ b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c-sharp.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-c-sharp", - "rev": "5b6bfbdcdbdda7da4839d7163ce579ed98410282", - "date": "2021-05-21T15:22:56+02:00", - "path": "/nix/store/msyjbgxf3y3rj6m3w2apd65cvr9x523r-tree-sitter-c-sharp", - "sha256": "0ls2qic3jb20zv4m5pdrc3ikfb66afay3krvc6gsq1fi9hbxrmvv", + "rev": "aa429589525bb849189a0c5ddb52267ce578f988", + "date": "2021-06-07T18:47:38+02:00", + "path": "/nix/store/mclvpa5kfbl9g5ij3xjdhnqc6bqzqcj6-tree-sitter-c-sharp", + "sha256": "07alycp4bclr0ycn44dj2481xag0s10nwgyrdxar3j91hphd966s", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c.json b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c.json index 13fd96817095..9ed735f1e3fa 100644 --- a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c.json +++ b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-c", - "rev": "f05e279aedde06a25801c3f2b2cc8ac17fac52ae", - "date": "2021-03-28T09:12:10-07:00", - "path": "/nix/store/4bcxsfrgrcpjy3f6dsmqli2xawjpyz44-tree-sitter-c", - "sha256": "1rismmgaqii1sdnri66h75sgw3mky4aha9hff6fan1qzll4f3hif", + "rev": "008008e30a81849fca0c79291e2b480855e0e02c", + "date": "2021-05-26T09:13:01-07:00", + "path": "/nix/store/vkps4991ip8dhgjqwfw7mamnmnizw31m-tree-sitter-c", + "sha256": "1mw4vma7kl504qn91f6janiqk9i05849rizqkqhyagb3glfbkrx2", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json index 3dc04b3b08ad..b8ca41abcf29 100644 --- a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json +++ b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-haskell", - "rev": "2e33ffa3313830faa325fe25ebc3769896b3a68b", - "date": "2021-04-19T23:45:03+02:00", - "path": "/nix/store/75mc2mfs4sm21c871s5lm9djnjk90r7n-tree-sitter-haskell", - "sha256": "0np7mzi1na1qscdxsjpyw314iwcmpzzrx1v7fk3yxc70qwzjcpp1", + "rev": "237f4eb4417c28f643a29d795ed227246afb66f9", + "date": "2021-06-05T13:41:42+02:00", + "path": "/nix/store/wwi86c3ix0zq8czwljxxypw5w2mxnz5h-tree-sitter-haskell", + "sha256": "0gx6mr6yg053i5mif8i8qwkk9h57laf9riw5r24av1y7cal7sszd", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json index c0411d15fb69..65066c66d539 100644 --- a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json +++ b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-javascript", - "rev": "6c8cfae935f67dd9e3a33982e5e06be0ece6399a", - "date": "2021-05-11T09:51:32-07:00", - "path": "/nix/store/dhh1gz45l3h3p31jfg5fgy1kns1lbw6d-tree-sitter-javascript", - "sha256": "1mw6miw4yp6s1i0b08hflamfvrjdim4fnnj6fy461n05jp1s1i78", + "rev": "45b9ce2a2588c0e6d616b0ee2a710b1fcb99c5b5", + "date": "2021-06-09T14:12:41-07:00", + "path": "/nix/store/j6r7z3m4wk6baz70qg2xn2mq3jlnyq6f-tree-sitter-javascript", + "sha256": "0rzpyxbh1j9l12jxyryc06f8jhbd5ci18lfb7bw2msc685b2ckcx", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-lua.json b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-lua.json index 9996ac8d917e..ce1e4f1bb38d 100644 --- a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-lua.json +++ b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-lua.json @@ -1,9 +1,9 @@ { - "url": "https://github.com/Azganoth/tree-sitter-lua", - "rev": "a943944ec09c5e96f455bb166079de4ef3534457", - "date": "2020-12-27T00:15:24-03:00", - "path": "/nix/store/6glr8p3x58pva0nn586dk5jwb3bpgqrj-tree-sitter-lua", - "sha256": "0pm6wwb3kv73bfvvshdmvazcb1is5x1z6jwr31gz0niln18nqvpb", + "url": "https://github.com/nvim-treesitter/tree-sitter-lua", + "rev": "b6d4e9e10ccb7b3afb45018fbc391b4439306b23", + "date": "2021-03-05T14:55:53+01:00", + "path": "/nix/store/mlvnfmm5q67810qdim11qs4ivq54jrmr-tree-sitter-lua", + "sha256": "17kf1m2qpflqv7xng6ls4v1qxfgdlpgxs4qjwb6rcc8nbcdsj4ms", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json index 4ff38790b6f7..49b57f4d8a39 100644 --- a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json +++ b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-php", - "rev": "6a271f4075e11815e787df9055a950fb844ee63b", - "date": "2021-05-13T12:41:22+02:00", - "path": "/nix/store/n6hycd1scxa990xchk5h09ilxi7w18f5-tree-sitter-php", - "sha256": "1ijxc6brd0d35hr89ic8k5ispc6sj4mxln7bznd9n6zrgjvfdjqb", + "rev": "b065fc4ded84c30aff14c07ec6e7cf449e222b04", + "date": "2021-06-01T20:33:20+02:00", + "path": "/nix/store/czdqn2nz8pgrd64w74yskx6vl233phxn-tree-sitter-php", + "sha256": "1qr2byy344haqybd0zz2hazncay7zndkp4p3317ck50xrs05z086", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ql.json b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ql.json index 37b0d1532408..41c63a2ce8c0 100644 --- a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ql.json +++ b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ql.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-ql", - "rev": "965948cce9a94a710b1339851e0919471ad5ee2c", - "date": "2021-03-04T14:34:34-08:00", - "path": "/nix/store/4hi59c856ii2b79nv2wjib6qbp3hk24i-tree-sitter-ql", - "sha256": "01y1fzclwlaffx0rzg49h7kyvhhm25fba0w362n2y8hgjp3imgmg", + "rev": "8e7fd7e638d4a0ec7a792ee16b19dbc6407aa810", + "date": "2021-06-02T18:46:47+02:00", + "path": "/nix/store/yhyi9y09shv1fm87gka43vnv9clvyd92-tree-sitter-ql", + "sha256": "0x5f9989ymqvw3g8acckyk4j7zpmnc667qishbgly9icl9rkmv7w", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ruby.json b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ruby.json index c8142974fd43..a96363af7139 100644 --- a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ruby.json +++ b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ruby.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-ruby", - "rev": "fe6a2d634da0e16b11b5aa255cc3df568a4572fd", - "date": "2021-03-03T16:54:30-08:00", - "path": "/nix/store/ragrvqj7hm98r74v5b3fljvc47gd3nhj-tree-sitter-ruby", - "sha256": "0m3h4928rbs300wcb6776h9r88hi32rybbhcaf6rdympl5nzi83v", + "rev": "391269d74d20154bbd0ac9be20b35eced6920290", + "date": "2021-05-04T14:02:32-07:00", + "path": "/nix/store/hamsaml0yzi13qd61abypjwbv33rd824-tree-sitter-ruby", + "sha256": "0biyhydfzybz3g6hhdd0rk6yav7xsk61j8lnmpsi60vaxabdsaiv", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-svelte.json b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-svelte.json index 41c4fcfe734d..b224fa54dafe 100644 --- a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-svelte.json +++ b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-svelte.json @@ -1,9 +1,9 @@ { "url": "https://github.com/Himujjal/tree-sitter-svelte", - "rev": "c696a13a587b0595baf7998f1fb9e95c42750263", - "date": "2021-03-20T16:45:11+05:30", - "path": "/nix/store/8krdxqwpi95ljrb5jgalwgygz3aljqr8-tree-sitter-svelte", - "sha256": "0ckmss5gmvffm6danlsvgh6gwvrlznxsqf6i6ipkn7k5lxg1awg3", + "rev": "10c113001acf9852817150acb3031a5e68d2b4cf", + "date": "2021-05-02T10:05:14+05:30", + "path": "/nix/store/mpfr56mfiizhwr4hq7h422glmdc4hg48-tree-sitter-svelte", + "sha256": "1n7addsnin6czm5hrbhaaqqgf0c3nz3mpcdysm2z4icgn7fjq281", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/update.nix b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/update.nix index 168c9a0a403d..ad064c556ad7 100644 --- a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/update.nix +++ b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/update.nix @@ -75,7 +75,7 @@ let repo = "tree-sitter-nix"; }; "tree-sitter-lua" = { - orga = "Azganoth"; + orga = "nvim-treesitter"; repo = "tree-sitter-lua"; }; "tree-sitter-fennel" = { diff --git a/nixpkgs/pkgs/development/tools/protoc-gen-twirp/default.nix b/nixpkgs/pkgs/development/tools/protoc-gen-twirp/default.nix index 5db843e6f61f..363dfcaed612 100644 --- a/nixpkgs/pkgs/development/tools/protoc-gen-twirp/default.nix +++ b/nixpkgs/pkgs/development/tools/protoc-gen-twirp/default.nix @@ -2,20 +2,19 @@ buildGoPackage rec { pname = "protoc-gen-twirp"; - version = "8.0.0"; + version = "8.1.0"; src = fetchFromGitHub { owner = "twitchtv"; repo = "twirp"; rev = "v${version}"; - sha256 = "sha256-lwozRwH96nh4Zlf6ggOF+FuUEfxkN38wxygg5HXw/M0="; + sha256 = "sha256-ezSNrDfOE1nj4FlX7E7Z7/eGfQw1B7NP34aj8ml5pDk="; }; goPackagePath = "github.com/twitchtv/twirp"; subPackages = [ "protoc-gen-twirp" - "protoc-gen-twirp_python" ]; doCheck = true; diff --git a/nixpkgs/pkgs/development/tools/rnix-lsp/default.nix b/nixpkgs/pkgs/development/tools/rnix-lsp/default.nix index 98670e9e1845..27bad6b51d69 100644 --- a/nixpkgs/pkgs/development/tools/rnix-lsp/default.nix +++ b/nixpkgs/pkgs/development/tools/rnix-lsp/default.nix @@ -17,6 +17,6 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "A work-in-progress language server for Nix, with syntax checking and basic completion"; license = licenses.mit; - maintainers = with maintainers; [ jD91mZM2 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/tools/rust/bindgen/default.nix b/nixpkgs/pkgs/development/tools/rust/bindgen/default.nix index 598d01a8af5f..267cc4fcfbab 100644 --- a/nixpkgs/pkgs/development/tools/rust/bindgen/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/bindgen/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, rustPlatform, clang, llvmPackages, rustfmt, writeScriptBin +{ lib, fetchFromGitHub, rustPlatform, clang, llvmPackages_latest, rustfmt, writeScriptBin , runtimeShell , bash }: @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "0r60smhlx1992a1s1k5sxjpdqllb2xsqcimgx3ldp5fdkfphk3cw"; #for substituteAll - libclang = llvmPackages.libclang.lib; + libclang = llvmPackages_latest.libclang.lib; inherit bash; buildInputs = [ libclang ]; diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-c/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-c/default.nix index 9458cb030a7c..71394c098907 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-c/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cargo-c/default.nix @@ -5,7 +5,7 @@ rustPlatform.buildRustPackage rec { pname = "cargo-c"; - version = "0.8.0"; + version = "0.8.1"; src = stdenv.mkDerivation rec { name = "${pname}-source-${version}"; @@ -14,11 +14,11 @@ rustPlatform.buildRustPackage rec { owner = "lu-zero"; repo = pname; rev = "v${version}"; - sha256 = "1rvbikhbqsfa2sh79kapqg4yz19r1yhqfykl6cf4yjg6vawkwfw1"; + sha256 = "0fd0xql5cbqgmir2z3ah91iasaq9133wmi5bnhiy3dv7drcqv4rc"; }; cargoLock = fetchurl { url = "https://github.com/lu-zero/${pname}/releases/download/v${version}/Cargo.lock"; - sha256 = "17cdac8ym59jwjxs3k4isazknhrlr6lw0j0r76n5xf0dd7apfgcs"; + sha256 = "1xlh3h77rxhqyr1nkqyanb120lwdks6fklh202camqpmznd763g5"; }; installPhase = '' @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { ''; }; - cargoSha256 = "0pxakfiidxfczh3harnjhb1zv340r812jxzwam8z2kyw3mkyhh8z"; + cargoSha256 = "0b952xkg0l31laqlhsv3cqdag7v15k9na6xr6q9y8xwy1fjh9gzv"; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-cache/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-cache/default.nix index 092a0a10b1a0..12d9bd6bb036 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-cache/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cargo-cache/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-cache"; - version = "0.6.2"; + version = "0.6.3"; src = fetchFromGitHub { owner = "matthiaskrgr"; repo = pname; rev = version; - sha256 = "sha256-/xP6TQcLyY1XC8r5SCkwej/I6fMaV5PqNNuvK1WbmeM="; + sha256 = "sha256-y6rvdY9511XScxLWPrH9aUFgSmRYmGqKE56MPBTH9OM="; }; - cargoSha256 = "sha256-1ZNbqydRsXmMGLhqPrgNAE8bhpZCMAJO/YQbOvtiS/s="; + cargoSha256 = "sha256-H6MBAXrKu4hZwx3lGHN6YMuYzeb21Zq0tVlF/lsQmLI="; buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-make/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-make/default.nix index 2f20c66bbe25..d5fd7ee4a839 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-make/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cargo-make/default.nix @@ -13,11 +13,11 @@ rustPlatform.buildRustPackage rec { pname = "cargo-make"; - version = "0.33.0"; + version = "0.34.0"; src = fetchCrate { inherit pname version; - sha256 = "sha256-OnCSWAGcxQsLq5aQmd/15lAQmdsCGPqLeRYWXQG0oG0="; + sha256 = "sha256-/9v9nedLoXwuFuqw3W4RjTwvNIlisbiPCcVF/0oH4fw="; }; nativeBuildInputs = [ pkg-config ]; @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration libiconv ]; - cargoSha256 = "sha256-BsE5+0bL9ctsdZ/PM1d6TfrXuzNMYHejoqA3bgH8140="; + cargoSha256 = "sha256-clav4lGDuWvwzq78Kw+vtz+boNcZnNH+NHH7ZaZYSC4="; # Some tests fail because they need network access. # However, Travis ensures a proper build. diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-msrv/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-msrv/default.nix index 74c2d9e680f0..216e83622158 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-msrv/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cargo-msrv/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-msrv"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "foresterre"; repo = pname; rev = "v${version}"; - sha256 = "sha256-DpgZrKy2rEKnI0/t4l3sDtNUhAwwFFSzq4CdRFqAkzY="; + sha256 = "sha256-yTUYMLVjzbuHqQxW68snxQ0CzoOwEBGXWFR/4yfDZ34="; }; - cargoSha256 = "sha256-ny8EA3dkirxEiFYiSFRxHnjf3mVO2LCWVR8fPHX87Ek="; + cargoSha256 = "sha256-WXvl+Xbu/oGTEFhbn6GuLoiNX+DxwhtT6cuucCOQsC4="; passthru = { updateScript = nix-update-script { diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-udeps/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-udeps/default.nix index 968a6ce457f1..0a76ae0202c4 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-udeps/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cargo-udeps/default.nix @@ -1,22 +1,23 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub, pkg-config, openssl, CoreServices, Security, libiconv }: +{ lib, stdenv, rustPlatform, fetchFromGitHub, pkg-config, openssl, CoreServices, Security, libiconv, SystemConfiguration }: rustPlatform.buildRustPackage rec { pname = "cargo-udeps"; - version = "0.1.21"; + version = "0.1.22"; src = fetchFromGitHub { owner = "est31"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Voei7j3WRDu70NkcJvjqPJ4ikOUupOhvFNEHHRyF6/Q="; + sha256 = "sha256-z92q0uwL832Ph7sTpWpaa8e9Xrik9wnjQ7LBy/hY8KE="; }; - cargoSha256 = "sha256-zMya7bEehNKIfwQtJ252sflg06P4Ra8/lgBjn4UUqRg="; + cargoSha256 = "sha256-4HguNyPIjpFqa80dDVFgXDK7pHOuFJdpFNxLARXxT2g="; nativeBuildInputs = [ pkg-config ]; + # TODO figure out how to use provided curl instead of compiling curl from curl-sys buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ CoreServices Security libiconv ]; + ++ lib.optionals stdenv.isDarwin [ CoreServices Security libiconv SystemConfiguration ]; # Requires network access doCheck = false; diff --git a/nixpkgs/pkgs/development/tools/rust/probe-run/default.nix b/nixpkgs/pkgs/development/tools/rust/probe-run/default.nix index 262d8c4945eb..336cbef9bae0 100644 --- a/nixpkgs/pkgs/development/tools/rust/probe-run/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/probe-run/default.nix @@ -3,16 +3,16 @@ rustPlatform.buildRustPackage rec { pname = "probe-run"; - version = "0.2.2"; + version = "0.2.3"; src = fetchFromGitHub { owner = "knurling-rs"; repo = pname; rev = "v${version}"; - sha256 = "avaGBIKldr+1Zwq+7NOHt2wldmY/6Lb6bi9uVHZFI5Q="; + sha256 = "0jvyqynhg2fva29bzj4wrg3f22xpvl1hdf9kqws2c3wdiz9lc8l4"; }; - cargoSha256 = "HmDKfb8F6sGnaX64FR3No2GbBYm4bVopbjs8d35WiZQ="; + cargoSha256 = "1jijpm4k3py09k9w9a2zj1795r02wsa53r4sxa4ws96d4gkv4x5b"; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libusb1 ] diff --git a/nixpkgs/pkgs/development/tools/sentry-cli/default.nix b/nixpkgs/pkgs/development/tools/sentry-cli/default.nix new file mode 100644 index 000000000000..884c0edfb735 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/sentry-cli/default.nix @@ -0,0 +1,40 @@ +{ rustPlatform +, fetchFromGitHub +, lib +, openssl +, file +, rpm +, pkg-config +, stdenv +, curl +, Security +, runCommand +}: +rustPlatform.buildRustPackage rec { + pname = "sentry-cli"; + version = "1.66.0"; + + src = fetchFromGitHub { + owner = "getsentry"; + repo = "sentry-cli"; + rev = version; + sha256 = "sha256-ivQBn5GGb64Jq0gpywAg20309QQMpasg/Bu5sHKj02Y="; + }; + doCheck = false; + + # Needed to get openssl-sys to use pkgconfig. + OPENSSL_NO_VENDOR = 1; + + buildInputs = [ openssl file rpm ] ++ lib.optionals stdenv.isDarwin [ Security curl ]; + nativeBuildInputs = [ pkg-config ]; + + cargoSha256 = "sha256-xS88KZWYkg3v8TJZUVVgQhR++CrZGD0DQnLPktSUJQk="; + + meta = with lib; { + homepage = "https://docs.sentry.io/cli/"; + license = licenses.bsd3; + description = "A command line utility to work with Sentry."; + maintainers = with maintainers; [ rizary ]; + platforms = platforms.unix; + }; +} diff --git a/nixpkgs/pkgs/development/tools/stylua/default.nix b/nixpkgs/pkgs/development/tools/stylua/default.nix new file mode 100644 index 000000000000..48250297e496 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/stylua/default.nix @@ -0,0 +1,35 @@ +{ fetchFromGitHub +, lib +, rustPlatform +, stdenvNoCC +, lua52Support ? true +, luauSupport ? false +}: + +rustPlatform.buildRustPackage rec { + pname = "stylua"; + version = "0.9.2"; + + src = fetchFromGitHub { + owner = "johnnymorganz"; + repo = pname; + rev = "v${version}"; + sha256 = "0idx4664p9ggv8p2pwgpch42li9ksiilszpwva19y4fa5xrmcyr2"; + }; + + cargoSha256 = "1hc7zvrfiiijk4wr6i5jk6k32nz0lf64gqin3n8b8x5pp9d8fcfk"; + + cargoBuildFlags = lib.optionals lua52Support [ "--features" "lua52" ] + ++ lib.optionals luauSupport [ "--features" "luau" ]; + + # test_standard fails on darwin + doCheck = !stdenvNoCC.isDarwin; + + meta = with lib; { + description = "An opinionated Lua code formatter"; + homepage = "https://github.com/johnnymorganz/stylua"; + changelog = "https://github.com/johnnymorganz/stylua/blob/v${version}/CHANGELOG.md"; + license = licenses.mpl20; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/nixpkgs/pkgs/development/tools/symfony-cli/default.nix b/nixpkgs/pkgs/development/tools/symfony-cli/default.nix index eb12f9e1dcd7..6ff541b933c4 100644 --- a/nixpkgs/pkgs/development/tools/symfony-cli/default.nix +++ b/nixpkgs/pkgs/development/tools/symfony-cli/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "symfony-cli"; - version = "4.25.2"; + version = "4.25.4"; src = fetchurl { url = "https://github.com/symfony/cli/releases/download/v${version}/symfony_linux_amd64.gz"; - sha256 = "8bfa53c1479883e9b48d2e4e5d3f6f7a511df73d65fe5c7b07a4890ee2c75c7e"; + sha256 = "94ade97d79e6949022ac45e4f8f9c025a9e3efa54a1a891a086a24eb9a9765a7"; }; dontBuild = true; diff --git a/nixpkgs/pkgs/development/tools/wiggle/default.nix b/nixpkgs/pkgs/development/tools/wiggle/default.nix index d360500e1fb2..6d1622c5b864 100644 --- a/nixpkgs/pkgs/development/tools/wiggle/default.nix +++ b/nixpkgs/pkgs/development/tools/wiggle/default.nix @@ -1,12 +1,14 @@ -{ lib, stdenv, fetchurl, ncurses, groff }: +{ lib, stdenv, fetchFromGitHub, ncurses, groff }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { + name = "wiggle"; + version = "1.3"; - name = "wiggle-1.3"; - - src = fetchurl { - url = "https://github.com/neilbrown/wiggle/archive/v1.3.tar.gz"; - sha256 = "sha256-/5LPATPB9NzjNWPiY8sw59229KvfhtQnsewUkL7CWvo="; + src = fetchFromGitHub { + owner = "neilbrown"; + repo = "wiggle"; + rev = "v${version}"; + sha256 = "sha256-rlHhYzP81lfblZvtZ1lhiq4iQ6WRpBYukoGqpVP+NKI="; }; buildInputs = [ ncurses groff ]; @@ -21,24 +23,22 @@ stdenv.mkDerivation { patchShebangs . ''; - meta = { - homepage = "http://blog.neil.brown.name/category/wiggle/"; + meta = with lib; { + homepage = "https://blog.neil.brown.name/category/wiggle/"; description = "Tool for applying patches with conflicts"; - longDescription = '' - Wiggle applies patches to a file in a similar manner to the patch(1) - program. The distinctive difference is, however, that wiggle will - attempt to apply a patch even if the "before" part of the patch doesn't - match the target file perfectly. This is achieved by breaking the file - and patch into words and finding the best alignment of words in the file - with words in the patch. Once this alignment has been found, any - differences (word-wise) in the patch are applied to the file as best as - possible. Also, wiggle will (in some cases) detect changes that have - already been applied, and will ignore them. + Wiggle applies patches to a file in a similar manner to the patch(1) + program. The distinctive difference is, however, that wiggle will + attempt to apply a patch even if the "before" part of the patch doesn't + match the target file perfectly. This is achieved by breaking the file + and patch into words and finding the best alignment of words in the file + with words in the patch. Once this alignment has been found, any + differences (word-wise) in the patch are applied to the file as best as + possible. Also, wiggle will (in some cases) detect changes that have + already been applied, and will ignore them. ''; - - license = lib.licenses.gpl2Plus; - platforms = lib.platforms.all; + license = licenses.gpl2Plus; + platforms = platforms.all; + maintainers = [ ]; }; - } |