diff options
Diffstat (limited to 'nixpkgs/pkgs/development/tools')
311 files changed, 2997 insertions, 3472 deletions
diff --git a/nixpkgs/pkgs/development/tools/alloy/default.nix b/nixpkgs/pkgs/development/tools/alloy/default.nix index ed91df066c3..44a6d7329ba 100644 --- a/nixpkgs/pkgs/development/tools/alloy/default.nix +++ b/nixpkgs/pkgs/development/tools/alloy/default.nix @@ -44,7 +44,7 @@ let generic = { major, version, src }: homepage = "http://alloytools.org/"; downloadPage = "http://alloytools.org/download.html"; license = licenses.mit; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ notbandali ]; }; }; diff --git a/nixpkgs/pkgs/development/tools/ameba/default.nix b/nixpkgs/pkgs/development/tools/ameba/default.nix index 0ac36c4c200..9b7cf3f1de8 100644 --- a/nixpkgs/pkgs/development/tools/ameba/default.nix +++ b/nixpkgs/pkgs/development/tools/ameba/default.nix @@ -2,13 +2,13 @@ crystal.buildCrystalPackage rec { pname = "ameba"; - version = "0.13.1"; + version = "0.13.2"; src = fetchFromGitHub { owner = "crystal-ameba"; repo = "ameba"; rev = "v${version}"; - sha256 = "0myy11g62pa1yh9szj03v2lhc5s9xwzr76v4x6hznidpq1b67jn8"; + sha256 = "0wyfx9nwda0s3arpdalz5zgh83v6wfz1a3l2k5v0jglpczq3m04m"; }; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/development/tools/ammonite/default.nix b/nixpkgs/pkgs/development/tools/ammonite/default.nix index 271869bd7c4..8e420f5f462 100644 --- a/nixpkgs/pkgs/development/tools/ammonite/default.nix +++ b/nixpkgs/pkgs/development/tools/ammonite/default.nix @@ -8,7 +8,7 @@ let common = { scalaVersion, sha256 }: stdenv.mkDerivation rec { pname = "ammonite"; - version = "2.0.4"; + version = "2.2.0"; src = fetchurl { url = "https://github.com/lihaoyi/Ammonite/releases/download/${version}/${scalaVersion}-${version}"; @@ -40,6 +40,6 @@ stdenv.mkDerivation rec { }; }; in { - ammonite_2_12 = common { scalaVersion = "2.12"; sha256 = "068lcdi1y3zcspr0qmppflad7a4kls9gi321rp8dc5qc6f9nnk04"; }; - ammonite_2_13 = common { scalaVersion = "2.13"; sha256 = "0fa0q9nk00crr2ws2mmw6pp4vf0xy53bqqhnws524ywwg6zwrl9s"; }; + ammonite_2_12 = common { scalaVersion = "2.12"; sha256 = "0nclfqwy3jfn1680z1hd0zzmc0b79wpvx6gn1jnm19aq7qcvh5zp"; }; + ammonite_2_13 = common { scalaVersion = "2.13"; sha256 = "104bnahn382sb6vwjvchsg0jrnkkwjn08rfh0g5ra7lwhgcj2719"; }; } diff --git a/nixpkgs/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix b/nixpkgs/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix index b8797c3dfe2..48805d16808 100644 --- a/nixpkgs/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "cargo-tarpaulin"; - version = "0.14.2"; + version = "0.14.3"; src = fetchFromGitHub { owner = "xd009642"; repo = "tarpaulin"; rev = "${version}"; - sha256 = "1skiaiz3xyi6cf62fkg7i7ahncm7vcg3aq4s4a5lrls30gr0n288"; + sha256 = "03d8h5b174699yivaamlvaqzck9zs119jk29yf70dvxw7cs0nngv"; }; nativeBuildInputs = [ @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { ]; buildInputs = [ openssl ]; - cargoSha256 = "1klmdwpqk995pdyms40x7gk4l2mf4ncj7cgknl91kmyvpn4j1y4g"; + cargoSha256 = "0zzp2wyq48j6n64fm37qfl65cg4yzf9ysichhkmkc6viq8x0f66d"; #checkFlags = [ "--test-threads" "1" ]; doCheck = false; diff --git a/nixpkgs/pkgs/development/tools/analysis/codeql/default.nix b/nixpkgs/pkgs/development/tools/analysis/codeql/default.nix index cc73e146909..e450bbefe24 100644 --- a/nixpkgs/pkgs/development/tools/analysis/codeql/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/codeql/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { pname = "codeql"; - version = "2.2.4"; + version = "2.2.5"; dontConfigure = true; dontBuild = true; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { src = fetchzip { url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip"; - sha256 = "0vrl9q7rm8bjxbb5076qx2cbva1wp1gp6z0pjwpg70z90gp49n2p"; + sha256 = "1x9crby4idkvfy6i5l0r00ixnx3ij68zjh1l5n92hyzlf0snv28d"; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/tools/analysis/flow/default.nix b/nixpkgs/pkgs/development/tools/analysis/flow/default.nix index 81618be7cf9..cc3ef8ed0f7 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.130.0"; + version = "0.133.0"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "refs/tags/v${version}"; - sha256 = "1wgf6dib6f1iwkndr2glq8zi2ssg7xvppkm9awic114i4pr88bfa"; + sha256 = "1r4s4gw50pvp4r4mq2w45s9i7fbkf7zycgp8rrj1dqzmkl9v6kii"; }; installPhase = '' @@ -25,6 +25,7 @@ stdenv.mkDerivation rec { changelog = "https://github.com/facebook/flow/releases/tag/v${version}"; license = licenses.mit; platforms = ocamlPackages.ocaml.meta.platforms; + broken = stdenv.isAarch64; # https://github.com/facebook/flow/issues/7556 maintainers = with maintainers; [ marsam puffnfresh ]; }; } diff --git a/nixpkgs/pkgs/development/tools/analysis/hotspot/default.nix b/nixpkgs/pkgs/development/tools/analysis/hotspot/default.nix index 23ca35b3717..f04d060290f 100644 --- a/nixpkgs/pkgs/development/tools/analysis/hotspot/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/hotspot/default.nix @@ -17,13 +17,13 @@ mkDerivation rec { pname = "hotspot"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "KDAB"; repo = "hotspot"; rev = "v${version}"; - sha256 = "05rkzrvak93z8mzcpm4mcjxb933l8pjsxr9a595wfn1gn2ihmada"; + sha256 = "1f68bssh3p387hkavfjkqcf7qf7w5caznmjfjldicxphap4riqr5"; fetchSubmodules = true; }; diff --git a/nixpkgs/pkgs/development/tools/analysis/panopticon/default.nix b/nixpkgs/pkgs/development/tools/analysis/panopticon/default.nix index e2c174783d4..cbc736e1a26 100644 --- a/nixpkgs/pkgs/development/tools/analysis/panopticon/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/panopticon/default.nix @@ -45,6 +45,5 @@ rustPlatform.buildRustPackage rec { ''; license = with licenses; [ gpl3 ]; maintainers = with maintainers; [ leenaars ]; - platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/development/tools/analysis/pmd/default.nix b/nixpkgs/pkgs/development/tools/analysis/pmd/default.nix index f80483e0e12..f91cdbead82 100644 --- a/nixpkgs/pkgs/development/tools/analysis/pmd/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/pmd/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "pmd"; - version = "6.25.0"; + version = "6.26.0"; src = fetchurl { url = "mirror://sourceforge/pmd/pmd-bin-${version}.zip"; - sha256 = "0ykg0wylyfiwjlhkbfjqfam34174paihrw7x1dwfq9anyn5bjf0k"; + sha256 = "1vlqwrbqk2cbp8kgxkm61c4blai81ib35yjf6wms16w0hvbqf2b4"; }; nativeBuildInputs = [ unzip makeWrapper ]; diff --git a/nixpkgs/pkgs/development/tools/analysis/radare2/cutter.nix b/nixpkgs/pkgs/development/tools/analysis/radare2/cutter.nix index 3f90e5f7343..5fde4e1f433 100644 --- a/nixpkgs/pkgs/development/tools/analysis/radare2/cutter.nix +++ b/nixpkgs/pkgs/development/tools/analysis/radare2/cutter.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "radare2-cutter"; - version = "1.10.3"; + version = "1.11.1"; src = fetchFromGitHub { owner = "radareorg"; repo = "cutter"; rev = "v${version}"; - sha256 = "0qj8jyij02nif4jpirl09ygwnv8a9zi3vkb5sf5s8mg7qwlpnvyk"; + sha256 = "0kscl0yf5qxacqnz3pp47r94yiwnc4rwirnr2x580z10fwhsivki"; }; postUnpack = "export sourceRoot=$sourceRoot/src"; diff --git a/nixpkgs/pkgs/development/tools/analysis/radare2/default.nix b/nixpkgs/pkgs/development/tools/analysis/radare2/default.nix index f77ea1602f4..e86ef253249 100644 --- a/nixpkgs/pkgs/development/tools/analysis/radare2/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/radare2/default.nix @@ -110,24 +110,24 @@ in { #<generated> # DO NOT EDIT! Automatically generated by ./update.py radare2 = generic { - version_commit = "24545"; - gittap = "4.4.0"; - gittip = "9ea0b7ce566cfdcfb3513f407c4056915204294a"; - rev = "4.4.0"; - version = "4.4.0"; - sha256 = "0gwdnrnk7wdgkajp2qwg4fyplh7nsbmf01bzx07px6xmiscd9z2s"; - cs_ver = "4.0.1"; - cs_sha256 = "0ijwxxk71nr9z91yxw20zfj4bbsbrgvixps5c7cpj163xlzlwba6"; + version_commit = "24959"; + gittap = "4.5.1"; + gittip = "293cf5ae65ba4e28828095dcae212955593ba255"; + rev = "4.5.1"; + version = "4.5.1"; + sha256 = "0qigy1px0jy74c5ig73dc2fqjcy6vcy76i25dx9r3as6zfpkkaxj"; + cs_ver = "4.0.2"; + cs_sha256 = "0y5g74yjyliciawpn16zhdwya7bd3d7b1cccpcccc2wg8vni1k2w"; }; r2-for-cutter = generic { - version_commit = "24605"; - gittap = "4.4.0"; - gittip = "9ea0b7ce566cfdcfb3513f407c4056915204294a"; - rev = "9ea0b7ce566cfdcfb3513f407c4056915204294a"; - version = "2020-04-14"; - sha256 = "0gwdnrnk7wdgkajp2qwg4fyplh7nsbmf01bzx07px6xmiscd9z2s"; - cs_ver = "4.0.1"; - cs_sha256 = "0ijwxxk71nr9z91yxw20zfj4bbsbrgvixps5c7cpj163xlzlwba6"; + version_commit = "24959"; + gittap = "4.5.1"; + gittip = "293cf5ae65ba4e28828095dcae212955593ba255"; + rev = "4.5.1"; + version = "4.5.1"; + sha256 = "0qigy1px0jy74c5ig73dc2fqjcy6vcy76i25dx9r3as6zfpkkaxj"; + cs_ver = "4.0.2"; + cs_sha256 = "0y5g74yjyliciawpn16zhdwya7bd3d7b1cccpcccc2wg8vni1k2w"; }; #</generated> } diff --git a/nixpkgs/pkgs/development/tools/analysis/radare2/update.py b/nixpkgs/pkgs/development/tools/analysis/radare2/update.py index b9e72e62366..ebd6e073fe5 100755 --- a/nixpkgs/pkgs/development/tools/analysis/radare2/update.py +++ b/nixpkgs/pkgs/development/tools/analysis/radare2/update.py @@ -5,6 +5,8 @@ # and is formatted with black. import fileinput import json +import xml.etree.ElementTree as ET +from urllib.parse import urlparse import re import subprocess import tempfile @@ -30,10 +32,20 @@ def prefetch_github(owner: str, repo: str, ref: str) -> str: def get_radare2_rev() -> str: - url = "https://api.github.com/repos/radare/radare2/releases/latest" - with urllib.request.urlopen(url) as response: - release = json.load(response) # type: ignore - return release["tag_name"] + feed_url = "http://github.com/radareorg/radare2/releases.atom" + with urllib.request.urlopen(feed_url) as resp: + tree = ET.fromstring(resp.read()) + releases = tree.findall(".//{http://www.w3.org/2005/Atom}entry") + for release in releases: + link = release.find("{http://www.w3.org/2005/Atom}link") + assert link is not None + url = urlparse(link.attrib["href"]) + tag = url.path.split("/")[-1] + if re.match(r"[0-9.]+", tag): + return tag + else: + print(f"ignore {tag}") + raise RuntimeError(f"No release found at {feed_url}") def get_cutter_version() -> str: diff --git a/nixpkgs/pkgs/development/tools/analysis/svlint/default.nix b/nixpkgs/pkgs/development/tools/analysis/svlint/default.nix new file mode 100644 index 00000000000..adf17dabece --- /dev/null +++ b/nixpkgs/pkgs/development/tools/analysis/svlint/default.nix @@ -0,0 +1,25 @@ +{ lib +, rustPlatform +, fetchFromGitHub +}: + +rustPlatform.buildRustPackage rec { + pname = "svlint"; + version = "0.4.7"; + + src = fetchFromGitHub { + owner = "dalance"; + repo = "svlint"; + rev = "v${version}"; + sha256 = "0gn68achvhyxljvhw5rwraxjcgdwrl1bwbsn596ka15nrk4lwb34"; + }; + + cargoSha256 = "0v94zsh4jhzjnqbkgwn8rjbs72i5cw2nmkwn7xhdbbwxh17a88x4"; + + meta = with lib; { + description = "SystemVerilog linter"; + homepage = "https://github.com/dalance/svlint"; + license = licenses.mit; + maintainers = with maintainers; [ trepetti ]; + }; +} diff --git a/nixpkgs/pkgs/development/tools/analysis/tflint/default.nix b/nixpkgs/pkgs/development/tools/analysis/tflint/default.nix index 5badb361ac6..abaff0a8067 100644 --- a/nixpkgs/pkgs/development/tools/analysis/tflint/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/tflint/default.nix @@ -2,16 +2,18 @@ buildGoModule rec { pname = "tflint"; - version = "0.18.0"; + version = "0.20.1"; src = fetchFromGitHub { owner = "terraform-linters"; repo = pname; rev = "v${version}"; - sha256 = "0644hzb7cpcqksl7j6v11dcq26la7g5l1svkmgm9c674gbv7argv"; + sha256 = "06y4p65zzd7nmpvpnfcig58wbrav9ifbpqw1lhs2vdav17035xif"; }; - vendorSha256 = "1khb8rdy5agj904nig6dfhagckvfcx79f028wcvwr625la3pcjfc"; + vendorSha256 = "0c1b06np4yhixndig11kxxvj24rk50l1sdqah8kzhi2cqjwvmpw0"; + + doCheck = false; subPackages = [ "." ]; diff --git a/nixpkgs/pkgs/development/tools/analysis/tfsec/default.nix b/nixpkgs/pkgs/development/tools/analysis/tfsec/default.nix index 72815750f21..61ed0e07af5 100644 --- a/nixpkgs/pkgs/development/tools/analysis/tfsec/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/tfsec/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "tfsec"; - version = "0.24.1"; + version = "0.25.0"; src = fetchFromGitHub { owner = "liamg"; repo = pname; rev = "v${version}"; - sha256 = "10sl3gpjvgjigkb0v35w96xm414widh0ygb6pnzgyz1ph8ilm86p"; + sha256 = "06sr20zrbhyj35cyw64bk6sjj9q9lh52kc8wg1ryaimr3dc6lrn1"; }; goPackagePath = "github.com/liamg/tfsec"; diff --git a/nixpkgs/pkgs/development/tools/analysis/valgrind/default.nix b/nixpkgs/pkgs/development/tools/analysis/valgrind/default.nix index 7db60354305..2e485b3ed67 100644 --- a/nixpkgs/pkgs/development/tools/analysis/valgrind/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/valgrind/default.nix @@ -38,10 +38,6 @@ stdenv.mkDerivation rec { sed -i coregrind/link_tool_exe_darwin.in \ -e 's/^my \$archstr = .*/my $archstr = "x86_64";/g' - echo "substitute hardcoded /usr/include/mach with ${xnu}/include/mach" - substituteInPlace coregrind/Makefile.in \ - --replace /usr/include/mach ${xnu}/include/mach - substituteInPlace coregrind/m_debuginfo/readmacho.c \ --replace /usr/bin/dsymutil ${stdenv.cc.bintools.bintools}/bin/dsymutil @@ -54,7 +50,8 @@ stdenv.mkDerivation rec { postPatch = ""; configureFlags = - stdenv.lib.optional (stdenv.hostPlatform.system == "x86_64-linux" || stdenv.hostPlatform.system == "x86_64-darwin") "--enable-only64bit"; + stdenv.lib.optional (stdenv.hostPlatform.system == "x86_64-linux" || stdenv.hostPlatform.system == "x86_64-darwin") "--enable-only64bit" + ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin "--with-xcodedir=${xnu}/include"; doCheck = false; # fails diff --git a/nixpkgs/pkgs/development/tools/async/default.nix b/nixpkgs/pkgs/development/tools/async/default.nix index dad1e2f6574..e63f9a18a63 100644 --- a/nixpkgs/pkgs/development/tools/async/default.nix +++ b/nixpkgs/pkgs/development/tools/async/default.nix @@ -24,6 +24,5 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/ctbur/async"; license = licenses.gpl3Plus; maintainers = with maintainers; [ minijackson ]; - platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/development/tools/avro-tools/default.nix b/nixpkgs/pkgs/development/tools/avro-tools/default.nix index c337afa5a6d..e78f3444997 100644 --- a/nixpkgs/pkgs/development/tools/avro-tools/default.nix +++ b/nixpkgs/pkgs/development/tools/avro-tools/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "avro-tools"; - version = "1.9.1"; + version = "1.9.2"; src = fetchurl { url = "https://repo1.maven.org/maven2/org/apache/avro/avro-tools/${version}/${pname}-${version}.jar"; - sha256 = "0d73qbfx59pa4mgsjwgl5dvc4895rm90pdwr4sbd77biscjad94s"; + sha256 = "169cv4fjsj69fa2s87gh1i7wk0xzh3l7sx5yyz3cgyjalg4a12n1"; }; dontUnpack = true; @@ -29,6 +29,6 @@ stdenv.mkDerivation rec { homepage = "https://avro.apache.org/"; description = "Avro command-line tools and utilities"; license = lib.licenses.asl20; - maintainers = [ lib.maintainers.nequissimus ]; + maintainers = with lib.maintainers; [ nequissimus ]; }; } diff --git a/nixpkgs/pkgs/development/tools/aws-sam-cli/default.nix b/nixpkgs/pkgs/development/tools/aws-sam-cli/default.nix index c2ebf223508..a486d318608 100644 --- a/nixpkgs/pkgs/development/tools/aws-sam-cli/default.nix +++ b/nixpkgs/pkgs/development/tools/aws-sam-cli/default.nix @@ -79,8 +79,8 @@ buildPythonApplication rec { --replace "serverlessrepo==0.1.9" "serverlessrepo~=0.1.9" \ --replace "python-dateutil~=2.6, <2.8.1" "python-dateutil~=2.6" \ --replace "jmespath~=0.9.5" "jmespath~=0.10.0" \ - --replace "tomlkit==0.5.8" "tomlkit~=0.6.0" \ - --replace "requests==2.22.0" "requests~=2.22" + --replace "tomlkit==0.5.8" "tomlkit~=0.7.0" \ + --replace "requests==2.23.0" "requests~=2.24" ''; meta = with lib; { diff --git a/nixpkgs/pkgs/development/tools/azcopy/default.nix b/nixpkgs/pkgs/development/tools/azcopy/default.nix index d89c7f1e001..3d0fe8513c8 100644 --- a/nixpkgs/pkgs/development/tools/azcopy/default.nix +++ b/nixpkgs/pkgs/development/tools/azcopy/default.nix @@ -2,18 +2,20 @@ buildGoModule rec { pname = "azure-storage-azcopy"; - version = "10.5.1"; + version = "10.6.0"; src = fetchFromGitHub { owner = "Azure"; repo = "azure-storage-azcopy"; rev = "v${version}"; - sha256 = "0bygbg1k6926ri3988wbz0b1vv6wamk799mn5nkjf0xa6gjfqqsr"; + sha256 = "0izjnbldgf0597j4rh2ir9jsc2nzp9vwxcgllvkm5lh1xqf6i0nf"; }; subPackages = [ "." ]; - vendorSha256 = "10bpzf8f7ibx1wzd0nzh5q1ynwfjr4n1gjygq4zqqxg51ganqj82"; + vendorSha256 = "10sxkb2dh1il4ps15dlvq0xsry8hax27imb5qg3khdmjhb4yaj7k"; + + doCheck = false; postInstall = '' ln -rs "$out/bin/azure-storage-azcopy" "$out/bin/azcopy" diff --git a/nixpkgs/pkgs/development/tools/bazel-gazelle/default.nix b/nixpkgs/pkgs/development/tools/bazel-gazelle/default.nix index d8bc24f88a2..a3838283c5e 100644 --- a/nixpkgs/pkgs/development/tools/bazel-gazelle/default.nix +++ b/nixpkgs/pkgs/development/tools/bazel-gazelle/default.nix @@ -16,6 +16,8 @@ buildGoModule rec { vendorSha256 = null; + doCheck = false; + subPackages = [ "cmd/gazelle" ]; meta = with lib; { diff --git a/nixpkgs/pkgs/development/tools/bazel-kazel/default.nix b/nixpkgs/pkgs/development/tools/bazel-kazel/default.nix index a91c642029b..55f79a993ac 100644 --- a/nixpkgs/pkgs/development/tools/bazel-kazel/default.nix +++ b/nixpkgs/pkgs/development/tools/bazel-kazel/default.nix @@ -2,17 +2,19 @@ buildGoModule rec { pname = "bazel-kazel"; - version = "0.0.10"; + version = "0.1.0"; src = fetchFromGitHub { owner = "kubernetes"; repo = "repo-infra"; rev = "v${version}"; - sha256 = "1l3dz77h58v1sr7k8cabq5bbdif5w96zdcapax69cv1frr9jbrcb"; + sha256 = "121asn0h2vfgqnjk72wqjcfq0w15k15abjdm39i8hv455kzrc2hs"; }; vendorSha256 = "1pzkjh4n9ai8yqi98bkdhicjdr2l8j3fckl5n90c2gdcwqyxvgkf"; + doCheck = false; + subPackages = [ "cmd/kazel" ]; meta = with lib; { diff --git a/nixpkgs/pkgs/development/tools/bazelisk/default.nix b/nixpkgs/pkgs/development/tools/bazelisk/default.nix index 05776712b32..e639c7ab314 100644 --- a/nixpkgs/pkgs/development/tools/bazelisk/default.nix +++ b/nixpkgs/pkgs/development/tools/bazelisk/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "bazelisk"; - version = "1.5.0"; + version = "1.6.1"; patches = [ ./gomod.patch ]; @@ -10,10 +10,12 @@ buildGoModule rec { owner = "bazelbuild"; repo = pname; rev = "v${version}"; - sha256 = "06vimiklcprsxq7l6rmxshv8l0kjr7aanpm206qgx3wvw4shibmw"; + sha256 = "0g5zwdk7p1snqcbm4w3hsi3fm7sbsijrfj4ajxg7mifywqpmzm2l"; }; - vendorSha256 = "11iwgrnid0f8sq9f23m1a3s55sc7lpl60phykmd9ss4xs39bapl5"; + vendorSha256 = "1jgm6j04glvk7ib5yd0h04p9qxzl1ca100cv909kngx52jp61yxp"; + + doCheck = false; buildFlagsArray = [ "-ldflags=-s -w -X main.BazeliskVersion=${version}" ]; diff --git a/nixpkgs/pkgs/development/tools/bazelisk/gomod.patch b/nixpkgs/pkgs/development/tools/bazelisk/gomod.patch index d41d81e7ede..0c35004b294 100644 --- a/nixpkgs/pkgs/development/tools/bazelisk/gomod.patch +++ b/nixpkgs/pkgs/development/tools/bazelisk/gomod.patch @@ -6,7 +6,7 @@ index 8eef134..54382cb 100644 go 1.14 require ( -+ github.com/bazelbuild/rules_go v0.23.3 ++ github.com/bazelbuild/rules_go v0.23.7 github.com/hashicorp/go-version v1.2.0 github.com/mitchellh/go-homedir v1.1.0 ) diff --git a/nixpkgs/pkgs/development/tools/build-managers/apache-ant/1.9.nix b/nixpkgs/pkgs/development/tools/build-managers/apache-ant/1.9.nix index 3f43cad17c4..49f8435b377 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/apache-ant/1.9.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/apache-ant/1.9.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv, coreutils, makeWrapper }: -let version = "1.9.6"; in +let version = "1.9.15"; in stdenv.mkDerivation { pname = "ant"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://apache/ant/binaries/apache-ant-${version}-bin.tar.bz2"; - sha256 = "1cwd5vq175gyicw0hkm8idwa33zxwhf7xlxywaqxcqqdjql0jfx4"; + sha256 = "0yfx5qsvrg12lar4908ndbnlpppy7g7qk8ay41y4sz9g873v07mr"; }; contrib = fetchurl { diff --git a/nixpkgs/pkgs/development/tools/build-managers/apache-ant/default.nix b/nixpkgs/pkgs/development/tools/build-managers/apache-ant/default.nix index f06467867ce..b0411090fbe 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/apache-ant/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/apache-ant/default.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv, coreutils, makeWrapper }: -let version = "1.10.2"; in +let version = "1.10.8"; in stdenv.mkDerivation { pname = "ant"; @@ -10,12 +10,12 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://apache/ant/binaries/apache-ant-${version}-bin.tar.bz2"; - sha256 = "0662qammjvibh9kgkxzadkayfn2r7iwnagbwaw28crqqclrb2rp1"; + sha256 = "0zh94csb2hl6ir2ccn18ps506mjgh3mffnrb8wpsmp1x5fcykha5"; }; contrib = fetchurl { url = "mirror://sourceforge/ant-contrib/ant-contrib-1.0b3-bin.tar.bz2"; - sha256 = "96effcca2581c1ab42a4828c770b48d54852edf9e71cefc9ed2ffd6590571ad1"; + sha256 = "1l8say86bz9gxp4yy777z7nm4j6m905pg342li1aphc14p5grvwn"; }; installPhase = diff --git a/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_0_26/default.nix b/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_0_26/default.nix index 6d4ba50a9fb..c507169cf37 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_0_26/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_0_26/default.nix @@ -236,6 +236,8 @@ stdenv.mkDerivation rec { fetch --experimental_distdir=${distDir} build --copt="$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --copt="/g')" build --host_copt="$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --host_copt="/g')" + build --linkopt="$(echo $(< ${stdenv.cc}/nix-support/libcxx-ldflags) | sed -e 's/ /" --linkopt="/g')" + build --host_linkopt="$(echo $(< ${stdenv.cc}/nix-support/libcxx-ldflags) | sed -e 's/ /" --host_linkopt="/g')" build --linkopt="-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt="-Wl,/g')" build --host_linkopt="-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --host_linkopt="-Wl,/g')" build --host_javabase='@local_jdk//:jdk' @@ -245,6 +247,8 @@ stdenv.mkDerivation rec { # add the same environment vars to compile.sh sed -e "/\$command \\\\$/a --copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --copt=\"/g')\" \\\\" \ -e "/\$command \\\\$/a --host_copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --host_copt=\"/g')\" \\\\" \ + -e "/\$command \\\\$/a --linkopt=\"$(echo $(< ${stdenv.cc}/nix-support/libcxx-ldflags) | sed -e 's/ /" --linkopt=\"/g')\" \\\\" \ + -e "/\$command \\\\$/a --host_linkopt=\"$(echo $(< ${stdenv.cc}/nix-support/libcxx-ldflags) | sed -e 's/ /" --host_linkopt=\"/g')\" \\\\" \ -e "/\$command \\\\$/a --linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt=\"-Wl,/g')\" \\\\" \ -e "/\$command \\\\$/a --host_linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --host_linkopt=\"-Wl,/g')\" \\\\" \ -e "/\$command \\\\$/a --host_javabase='@local_jdk//:jdk' \\\\" \ diff --git a/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_0_29/default.nix b/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_0_29/default.nix index 19d33235a34..ad6e9ee4456 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_0_29/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_0_29/default.nix @@ -417,6 +417,8 @@ stdenv.mkDerivation rec { fetch --distdir=${distDir} build --copt="$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --copt="/g')" build --host_copt="$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --host_copt="/g')" + build --linkopt="$(echo $(< ${stdenv.cc}/nix-support/libcxx-ldflags) | sed -e 's/ /" --linkopt="/g')" + build --host_linkopt="$(echo $(< ${stdenv.cc}/nix-support/libcxx-ldflags) | sed -e 's/ /" --host_linkopt="/g')" build --linkopt="-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt="-Wl,/g')" build --host_linkopt="-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --host_linkopt="-Wl,/g')" build --host_javabase='@local_jdk//:jdk' @@ -426,6 +428,8 @@ stdenv.mkDerivation rec { # add the same environment vars to compile.sh sed -e "/\$command \\\\$/a --copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --copt=\"/g')\" \\\\" \ -e "/\$command \\\\$/a --host_copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --host_copt=\"/g')\" \\\\" \ + -e "/\$command \\\\$/a --linkopt=\"$(echo $(< ${stdenv.cc}/nix-support/libcxx-ldflags) | sed -e 's/ /" --linkopt=\"/g')\" \\\\" \ + -e "/\$command \\\\$/a --host_linkopt=\"$(echo $(< ${stdenv.cc}/nix-support/libcxx-ldflags) | sed -e 's/ /" --host_linkopt=\"/g')\" \\\\" \ -e "/\$command \\\\$/a --linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt=\"-Wl,/g')\" \\\\" \ -e "/\$command \\\\$/a --host_linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --host_linkopt=\"-Wl,/g')\" \\\\" \ -e "/\$command \\\\$/a --host_javabase='@local_jdk//:jdk' \\\\" \ diff --git a/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_1/default.nix b/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_1/default.nix index eff8aede6c1..8dcdc71415f 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_1/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_1/default.nix @@ -417,6 +417,8 @@ stdenv.mkDerivation rec { fetch --distdir=${distDir} build --copt="$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --copt="/g')" build --host_copt="$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --host_copt="/g')" + build --linkopt="$(echo $(< ${stdenv.cc}/nix-support/libcxx-ldflags) | sed -e 's/ /" --linkopt="/g')" + build --host_linkopt="$(echo $(< ${stdenv.cc}/nix-support/libcxx-ldflags) | sed -e 's/ /" --host_linkopt="/g')" build --linkopt="-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt="-Wl,/g')" build --host_linkopt="-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --host_linkopt="-Wl,/g')" build --host_javabase='@local_jdk//:jdk' @@ -426,6 +428,8 @@ stdenv.mkDerivation rec { # add the same environment vars to compile.sh sed -e "/\$command \\\\$/a --copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --copt=\"/g')\" \\\\" \ -e "/\$command \\\\$/a --host_copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --host_copt=\"/g')\" \\\\" \ + -e "/\$command \\\\$/a --linkopt=\"$(echo $(< ${stdenv.cc}/nix-support/libcxx-ldflags) | sed -e 's/ /" --linkopt=\"/g')\" \\\\" \ + -e "/\$command \\\\$/a --host_linkopt=\"$(echo $(< ${stdenv.cc}/nix-support/libcxx-ldflags) | sed -e 's/ /" --host_linkopt=\"/g')\" \\\\" \ -e "/\$command \\\\$/a --linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt=\"-Wl,/g')\" \\\\" \ -e "/\$command \\\\$/a --host_linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --host_linkopt=\"-Wl,/g')\" \\\\" \ -e "/\$command \\\\$/a --host_javabase='@local_jdk//:jdk' \\\\" \ diff --git a/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_3/default.nix b/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_3/default.nix index 60c1662f9ff..0bfc9071d7e 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_3/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_3/default.nix @@ -419,10 +419,18 @@ stdenv.mkDerivation rec { # add nix environment vars to .bazelrc cat >> .bazelrc <<EOF + # Limit the resources Bazel is allowed to use during the build to 1/2 the + # available RAM and 3/4 the available CPU cores. This should help avoid + # overwhelming the build machine. + build --local_ram_resources=HOST_RAM*.5 + build --local_cpu_resources=HOST_CPUS*.75 + build --distdir=${distDir} fetch --distdir=${distDir} build --copt="$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --copt="/g')" build --host_copt="$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --host_copt="/g')" + build --linkopt="$(echo $(< ${stdenv.cc}/nix-support/libcxx-ldflags) | sed -e 's/ /" --linkopt="/g')" + build --host_linkopt="$(echo $(< ${stdenv.cc}/nix-support/libcxx-ldflags) | sed -e 's/ /" --host_linkopt="/g')" build --linkopt="-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt="-Wl,/g')" build --host_linkopt="-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --host_linkopt="-Wl,/g')" build --host_javabase='@local_jdk//:jdk' @@ -432,6 +440,8 @@ stdenv.mkDerivation rec { # add the same environment vars to compile.sh sed -e "/\$command \\\\$/a --copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --copt=\"/g')\" \\\\" \ -e "/\$command \\\\$/a --host_copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --host_copt=\"/g')\" \\\\" \ + -e "/\$command \\\\$/a --linkopt=\"$(echo $(< ${stdenv.cc}/nix-support/libcxx-ldflags) | sed -e 's/ /" --linkopt=\"/g')\" \\\\" \ + -e "/\$command \\\\$/a --host_linkopt=\"$(echo $(< ${stdenv.cc}/nix-support/libcxx-ldflags) | sed -e 's/ /" --host_linkopt=\"/g')\" \\\\" \ -e "/\$command \\\\$/a --linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt=\"-Wl,/g')\" \\\\" \ -e "/\$command \\\\$/a --host_linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --host_linkopt=\"-Wl,/g')\" \\\\" \ -e "/\$command \\\\$/a --host_javabase='@local_jdk//:jdk' \\\\" \ diff --git a/nixpkgs/pkgs/development/tools/build-managers/bazel/buildtools/default.nix b/nixpkgs/pkgs/development/tools/build-managers/bazel/buildtools/default.nix index 83182983455..dd9bc4016f5 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/bazel/buildtools/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/bazel/buildtools/default.nix @@ -24,6 +24,5 @@ buildGoPackage rec { homepage = "https://github.com/bazelbuild/buildtools"; license = licenses.asl20; maintainers = with maintainers; [ elasticdog uri-canva marsam ]; - platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/development/tools/build-managers/bloop/default.nix b/nixpkgs/pkgs/development/tools/build-managers/bloop/default.nix index dd1342a37de..c3049edee64 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/bloop/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/bloop/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "bloop"; - version = "1.4.3"; + version = "1.4.4"; bloop-coursier-channel = fetchurl { url = "https://github.com/scalacenter/bloop/releases/download/v${version}/bloop-coursier.json"; - sha256 = "0abl91l2sb08pwr98mw910zibzwk6lss9r62h2s3g7qnnxp3z59r"; + sha256 = "1pyf559bpnsmvca4kw36nb9lwkwa9q0ghrpa117s96dhvrp3i2bv"; }; bloop-bash = fetchurl { @@ -54,8 +54,8 @@ stdenv.mkDerivation rec { outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = if stdenv.isLinux && stdenv.isx86_64 then "1ncl34f39mvk0zb5jl1l77cwjdg3xfnhjxbzz11pdfqw0d7wqywj" - else if stdenv.isDarwin && stdenv.isx86_64 then "06c885w088yvh8l1r1jbrz0549gx2xvc8xr6rlxy6y27jk5655p2" + outputHash = if stdenv.isLinux && stdenv.isx86_64 then "0hf0priy93zqba78a9nvbgl3mzwlc4jz43gz7cv2cdkj6x0lp0y1" + else if stdenv.isDarwin && stdenv.isx86_64 then "0g2rnmlfnqymji4f4rn0kaz7hipgv3bakdpn08600gg1f3s8gabw" else throw "unsupported platform"; }; diff --git a/nixpkgs/pkgs/development/tools/build-managers/cmake/default.nix b/nixpkgs/pkgs/development/tools/build-managers/cmake/default.nix index 0b296f023ad..559a4c191b6 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/cmake/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/cmake/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, pkgconfig +{ stdenv, lib, fetchurl, pkgconfig, fetchpatch , bzip2, curl, expat, libarchive, xz, zlib, libuv, rhash , buildPackages # darwin attributes @@ -19,12 +19,12 @@ stdenv.mkDerivation rec { + lib.optionalString useNcurses "-cursesUI" + lib.optionalString withQt5 "-qt5UI" + lib.optionalString useQt4 "-qt4UI"; - version = "3.18.0"; + version = "3.18.2"; src = fetchurl { url = "${meta.homepage}files/v${lib.versions.majorMinor version}/cmake-${version}.tar.gz"; # compare with https://cmake.org/files/v${lib.versions.majorMinor version}/cmake-${version}-SHA-256.txt - sha256 = "0aby67jn3i0rqhj6cvpm0f7idw3dl7jayaqxa9hkk9w2jk5zzd43"; + sha256 = "0zhxsnxm5d8wdarz2gs3r41r1dfrnh35ki75fa684gaxfzy40kjx"; }; patches = [ @@ -110,8 +110,17 @@ stdenv.mkDerivation rec { doCheck = false; # fails meta = with lib; { - homepage = "http://www.cmake.org/"; + homepage = "https://cmake.org/"; + changelog = "https://cmake.org/cmake/help/v${lib.versions.majorMinor version}/" + + "release/${lib.versions.majorMinor version}.html"; description = "Cross-Platform Makefile Generator"; + longDescription = '' + CMake is an open-source, cross-platform family of tools designed to + build, test and package software. CMake is used to control the software + compilation process using simple platform and compiler independent + configuration files, and generate native makefiles and workspaces that + can be used in the compiler environment of your choice. + ''; platforms = if useQt4 then qt4.meta.platforms else platforms.all; maintainers = with maintainers; [ ttuegel lnl7 ]; license = licenses.bsd3; diff --git a/nixpkgs/pkgs/development/tools/build-managers/cmake/setup-hook.sh b/nixpkgs/pkgs/development/tools/build-managers/cmake/setup-hook.sh index 73f24a9a205..0bb695615fc 100755 --- a/nixpkgs/pkgs/development/tools/build-managers/cmake/setup-hook.sh +++ b/nixpkgs/pkgs/development/tools/build-managers/cmake/setup-hook.sh @@ -48,7 +48,7 @@ cmakeConfigurePhase() { # on macOS we want to prefer Unix-style headers to Frameworks # because we usually do not package the framework - cmakeFlags="-DCMAKE_FIND_FRAMEWORK=last $cmakeFlags" + cmakeFlags="-DCMAKE_FIND_FRAMEWORK=LAST $cmakeFlags" # on macOS i686 was only relevant for 10.5 or earlier. cmakeFlags="-DCMAKE_OSX_ARCHITECTURES=x86_64 $cmakeFlags" @@ -77,7 +77,7 @@ cmakeConfigurePhase() { fi # The argument sometimes contains garbage or variable interpolation. # When that is the case, let’s fall back to the derivation name. - if [[ -z "$shareDocName" ]] || echo "$shareDocName" | grep -q '[^a-zA-Z0-9_-+]'; then + if [[ -z "$shareDocName" ]] || echo "$shareDocName" | grep -q '[^a-zA-Z0-9_+-]'; then if [[ -n "${pname-}" ]]; then shareDocName="$pname" else diff --git a/nixpkgs/pkgs/development/tools/build-managers/gradle/default.nix b/nixpkgs/pkgs/development/tools/build-managers/gradle/default.nix index 1d5ef75fb22..73e9bc7b560 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/gradle/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/gradle/default.nix @@ -51,15 +51,15 @@ rec { }; }; - gradle_latest = gradle_6_5; + gradle_latest = gradle_6_6; - gradle_6_5 = gradleGen rec { - name = "gradle-6.5.1"; - nativeVersion = "0.22-milestone-3"; + gradle_6_6 = gradleGen rec { + name = "gradle-6.6"; + nativeVersion = "0.22-milestone-4"; src = fetchurl { url = "https://services.gradle.org/distributions/${name}-bin.zip"; - sha256 = "0jmmipjh4fbsn92zpifa5cqg5ws2a4ha0s4jzqhrg4zs542x79sh"; + sha256 = "09a0fnz6fn8yaxm3q3iwyjm3nnaz7k8i1xlpc7sm414py043by76"; }; }; diff --git a/nixpkgs/pkgs/development/tools/build-managers/mage/default.nix b/nixpkgs/pkgs/development/tools/build-managers/mage/default.nix index e21410fb6f3..6c9d8bfc838 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/mage/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/mage/default.nix @@ -13,6 +13,8 @@ buildGoModule rec { vendorSha256 = "0sjjj9z1dhilhpc8pq4154czrb79z9cm044jvn75kxcjv6v5l2m5"; + doCheck = false; + buildFlagsArray = [ "-ldflags=" "-X github.com/magefile/mage/mage.commitHash=v${version}" @@ -25,6 +27,5 @@ buildGoModule rec { homepage = "https://magefile.org/"; license = licenses.asl20; maintainers = with maintainers; [ swdunlop ]; - platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/development/tools/build-managers/meson/allow-dirs-outside-of-prefix.patch b/nixpkgs/pkgs/development/tools/build-managers/meson/allow-dirs-outside-of-prefix.patch index bd81efd5208..e5ac95d0b9d 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/meson/allow-dirs-outside-of-prefix.patch +++ b/nixpkgs/pkgs/development/tools/build-managers/meson/allow-dirs-outside-of-prefix.patch @@ -1,6 +1,6 @@ --- a/mesonbuild/coredata.py +++ b/mesonbuild/coredata.py -@@ -483,7 +483,6 @@ class CoreData: +@@ -491,7 +491,6 @@ class CoreData: return value if option.endswith('dir') and value.is_absolute() and \ option not in builtin_dir_noprefix_options: @@ -8,7 +8,7 @@ # commonpath will always return a path in the native format, so we # must use pathlib.PurePath to do the same conversion before # comparing. -@@ -495,7 +494,7 @@ class CoreData: +@@ -503,7 +502,7 @@ class CoreData: try: value = value.relative_to(prefix) except ValueError: diff --git a/nixpkgs/pkgs/development/tools/build-managers/meson/clear-old-rpath.patch b/nixpkgs/pkgs/development/tools/build-managers/meson/clear-old-rpath.patch new file mode 100644 index 00000000000..f1e3c76e8b5 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/build-managers/meson/clear-old-rpath.patch @@ -0,0 +1,20 @@ +diff --git a/mesonbuild/scripts/depfixer.py b/mesonbuild/scripts/depfixer.py +index 4176b9a03..faaabf616 100644 +--- a/mesonbuild/scripts/depfixer.py ++++ b/mesonbuild/scripts/depfixer.py +@@ -336,6 +336,15 @@ class Elf(DataSizes): + if not new_rpath: + self.remove_rpath_entry(entrynum) + else: ++ # Clear old rpath to avoid stale references, ++ # not heeding the warning above about de-duplication ++ # since it does not seem to cause issues for us ++ # and not doing so trips up Nix’s reference checker. ++ # See https://github.com/NixOS/nixpkgs/pull/46020 ++ # and https://github.com/NixOS/nixpkgs/issues/95163 ++ self.bf.seek(rp_off) ++ self.bf.write(b'\0'*len(old_rpath)) ++ + self.bf.seek(rp_off) + self.bf.write(new_rpath) + self.bf.write(b'\0') diff --git a/nixpkgs/pkgs/development/tools/build-managers/meson/default.nix b/nixpkgs/pkgs/development/tools/build-managers/meson/default.nix index 5b1266da382..aa11ba7638b 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/meson/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/meson/default.nix @@ -1,33 +1,29 @@ { lib -, python3Packages +, python3 , stdenv , writeTextDir , substituteAll , pkgsHostHost +, fetchpatch }: -python3Packages.buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "meson"; - version = "0.54.2"; + version = "0.55.1"; - src = python3Packages.fetchPypi { + src = python3.pkgs.fetchPypi { inherit pname version; - sha256 = "0m84zb0q67vnxmd6ldz477w6yjdnk9c44xhlwh1g1pzqx3m6wwd7"; + sha256 = "O1dB+ITgSSi9+hlHRn/wavpsmOYjwlzvda33HKOc4IA="; }; - postFixup = '' - pushd $out/bin - # undo shell wrapper as meson tools are called with python - for i in *; do - mv ".$i-wrapped" "$i" - done - popd - - # Do not propagate Python - rm $out/nix-support/propagated-build-inputs - ''; - patches = [ + # Meson 0.55.0 incorrectly considers skipped tests as failures, + # which makes some packages like gjs fail to build. + (fetchpatch { + url = "https://github.com/mesonbuild/meson/commit/7db49db67d4aa7582cf46feb7157235e66aa95b1.diff"; + sha256 = "1chq52sgk24afdlswssr8n8p6fa2wz8rjlxvkjhpqg1kg3qnqc9p"; + }) + # Upstream insists on not allowing bindir and other dir options # outside of prefix for some reason: # https://github.com/mesonbuild/meson/issues/2561 @@ -55,6 +51,14 @@ python3Packages.buildPythonApplication rec { src = ./fix-rpath.patch; inherit (builtins) storeDir; }) + + # When Meson removes build_rpath from DT_RUNPATH entry, it just writes + # the shorter NUL-terminated new rpath over the old one to reduce + # the risk of potentially breaking the ELF files. + # But this can cause much bigger problem for Nix as it can produce + # cut-in-half-by-\0 store path references. + # Let’s just clear the whole rpath and hope for the best. + ./clear-old-rpath.patch ]; setupHook = ./setup-hook.sh; @@ -68,6 +72,18 @@ python3Packages.buildPythonApplication rec { # checkInputs = [ ninja pkgconfig ]; # checkPhase = "python ./run_project_tests.py"; + postFixup = '' + pushd $out/bin + # undo shell wrapper as meson tools are called with python + for i in *; do + mv ".$i-wrapped" "$i" + done + popd + + # Do not propagate Python + rm $out/nix-support/propagated-build-inputs + ''; + meta = with lib; { homepage = "https://mesonbuild.com"; description = "SCons-like build system that use python as a front-end language and Ninja as a building backend"; diff --git a/nixpkgs/pkgs/development/tools/build-managers/meson/fix-rpath.patch b/nixpkgs/pkgs/development/tools/build-managers/meson/fix-rpath.patch index 6cf7afc2bdf..d34b6c4c434 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/meson/fix-rpath.patch +++ b/nixpkgs/pkgs/development/tools/build-managers/meson/fix-rpath.patch @@ -1,56 +1,24 @@ ---- a/mesonbuild/linkers.py -+++ b/mesonbuild/linkers.py -@@ -527,8 +527,10 @@ class GnuLikeDynamicLinkerMixin: - # In order to avoid relinking for RPATH removal, the binary needs to contain just - # enough space in the ELF header to hold the final installation RPATH. - paths = ':'.join(all_paths) -- if len(paths) < len(install_rpath): -- padding = 'X' * (len(install_rpath) - len(paths)) -+ store_paths = ':'.join(filter(lambda path: path.startswith('@storeDir@'), all_paths)) -+ extra_space_needed = len(install_rpath + (':' if install_rpath and store_paths else '') + store_paths) - len(paths) -+ if extra_space_needed > 0: -+ padding = 'X' * extra_space_needed - if not paths: - paths = padding - else: -@@ -902,8 +904,10 @@ class SolarisDynamicLinker(PosixDynamicLinkerMixin, DynamicLinker): - # In order to avoid relinking for RPATH removal, the binary needs to contain just - # enough space in the ELF header to hold the final installation RPATH. - paths = ':'.join(all_paths) -- if len(paths) < len(install_rpath): -- padding = 'X' * (len(install_rpath) - len(paths)) -+ store_paths = ':'.join(filter(lambda path: path.startswith('@storeDir@'), all_paths)) -+ extra_space_needed = len(install_rpath + (':' if install_rpath and store_paths else '') + store_paths) - len(paths) -+ if extra_space_needed > 0: -+ padding = 'X' * extra_space_needed - if not paths: - paths = padding - else: ---- a/mesonbuild/scripts/depfixer.py -+++ b/mesonbuild/scripts/depfixer.py -@@ -303,6 +303,14 @@ class Elf(DataSizes): - return - self.bf.seek(rp_off) - old_rpath = self.read_str() +--- a/mesonbuild/backend/backends.py ++++ b/mesonbuild/backend/backends.py +@@ -456,6 +456,21 @@ class Backend: + args.extend(self.environment.coredata.get_external_link_args(target.for_machine, lang)) + except Exception: + pass + -+ if new_rpath: -+ new_rpath += b':' -+ else: -+ new_rpath = b'' ++ nix_ldflags = os.environ.get('NIX_LDFLAGS', '').split() ++ next_is_path = False ++ # Try to add rpaths set by user or ld-wrapper so that they are not removed. ++ # Based on https://github.com/NixOS/nixpkgs/blob/69711a2f5ffe8cda208163be5258266172ff527f/pkgs/build-support/bintools-wrapper/ld-wrapper.sh#L148-L177 ++ for flag in nix_ldflags: ++ if flag == '-rpath' or flag == '-L': ++ next_is_path = True ++ elif next_is_path or flag.startswith('-L/'): ++ if flag.startswith('-L/'): ++ flag = flag[2:] ++ if flag.startswith('@storeDir@'): ++ dirs.add(flag) ++ next_is_path = False + -+ new_rpath += b':'.join(filter(lambda path: path.startswith(b'@storeDir@'), old_rpath.split(b':'))) -+ - if len(old_rpath) < len(new_rpath): - sys.exit("New rpath must not be longer than the old one.") - # The linker does read-only string deduplication. If there is a -@@ -316,6 +324,10 @@ class Elf(DataSizes): - if not new_rpath: - self.remove_rpath_entry(entrynum) - else: -+ # clean old rpath to avoid stale references -+ # (see https://github.com/NixOS/nixpkgs/pull/46020) -+ self.bf.seek(rp_off) -+ self.bf.write(b'\0'*len(old_rpath)) - self.bf.seek(rp_off) - self.bf.write(new_rpath) - self.bf.write(b'\0') + # Match rpath formats: + # -Wl,-rpath= + # -Wl,-rpath, diff --git a/nixpkgs/pkgs/development/tools/build-managers/meson/gir-fallback-path.patch b/nixpkgs/pkgs/development/tools/build-managers/meson/gir-fallback-path.patch index e59795486aa..0c924bacf73 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/meson/gir-fallback-path.patch +++ b/nixpkgs/pkgs/development/tools/build-managers/meson/gir-fallback-path.patch @@ -1,8 +1,8 @@ --- a/mesonbuild/modules/gnome.py +++ b/mesonbuild/modules/gnome.py -@@ -801,6 +801,13 @@ class GnomeModule(ExtensionModule): - scan_command += ['--sources-top-dirs', os.path.join(state.environment.get_source_dir(), self.interpreter.subproject_dir, state.subproject)] - scan_command += ['--sources-top-dirs', os.path.join(state.environment.get_build_dir(), self.interpreter.subproject_dir, state.subproject)] +@@ -807,6 +807,13 @@ class GnomeModule(ExtensionModule): + if fatal_warnings: + scan_command.append('--warn-error') + if len(set([girtarget.get_custom_install_dir()[0] for girtarget in girtargets])) > 1: + raise MesonException('generate_gir tries to build multiple libraries with different install_dir at once: {}'.format(','.join([str(girtarget) for girtarget in girtargets]))) diff --git a/nixpkgs/pkgs/development/tools/build-managers/meson/more-env-vars.patch b/nixpkgs/pkgs/development/tools/build-managers/meson/more-env-vars.patch index 6326f5ec3cf..ada58fff6d4 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/meson/more-env-vars.patch +++ b/nixpkgs/pkgs/development/tools/build-managers/meson/more-env-vars.patch @@ -1,8 +1,8 @@ diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py -index 17058df6b..7a68b7f15 100644 +index 219b62ec8..e3ceaddbd 100644 --- a/mesonbuild/envconfig.py +++ b/mesonbuild/envconfig.py -@@ -120,7 +120,7 @@ def get_env_var_pair(for_machine: MachineChoice, +@@ -94,7 +94,7 @@ def get_env_var_pair(for_machine: MachineChoice, # compiling we fall back on the unprefixed host version. This # allows native builds to never need to worry about the 'BUILD_*' # ones. diff --git a/nixpkgs/pkgs/development/tools/build-managers/ninja/default.nix b/nixpkgs/pkgs/development/tools/build-managers/ninja/default.nix index efe9a495494..bc5ad7744d6 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/ninja/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/ninja/default.nix @@ -4,13 +4,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "ninja"; - version = "1.10.0"; + version = "1.10.1"; src = fetchFromGitHub { owner = "ninja-build"; repo = "ninja"; rev = "v${version}"; - sha256 = "1fbzl7mrcrwp527sgkc1npfl3k6bbpydpiq98xcf1a1hkrx0z5x4"; + sha256 = "1bmv7zfqwp48ga6vnqvy0gzkclv40xgq19q4ihl58r6cn4swccn3"; }; nativeBuildInputs = [ python3 re2c ] ++ optionals buildDocs [ asciidoc docbook_xml_dtd_45 docbook_xsl libxslt.bin ]; diff --git a/nixpkgs/pkgs/development/tools/build-managers/rocm-cmake/default.nix b/nixpkgs/pkgs/development/tools/build-managers/rocm-cmake/default.nix index 41149522e72..f146929019f 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/rocm-cmake/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/rocm-cmake/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "rocm-cmake"; - version = "3.5.0"; + version = "3.7.0"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; diff --git a/nixpkgs/pkgs/development/tools/buildah/default.nix b/nixpkgs/pkgs/development/tools/buildah/default.nix index 3def4a05bd7..d93ec54b3e3 100644 --- a/nixpkgs/pkgs/development/tools/buildah/default.nix +++ b/nixpkgs/pkgs/development/tools/buildah/default.nix @@ -1,6 +1,7 @@ { stdenv , buildGoModule , fetchFromGitHub +, go-md2man , installShellFiles , pkg-config , gpgme @@ -13,20 +14,22 @@ buildGoModule rec { pname = "buildah"; - version = "1.15.1"; + version = "1.16.1"; src = fetchFromGitHub { owner = "containers"; repo = "buildah"; rev = "v${version}"; - sha256 = "15pnyi6gay287vkcrgsirsyyps3ya2lsih1ljkcsqdxzr596mcv3"; + sha256 = "0nndm936g0i18ly6395y5s4h1f6cfbg602cvlg7c6w007f2j15hq"; }; outputs = [ "out" "man" ]; vendorSha256 = null; - nativeBuildInputs = [ installShellFiles pkg-config ]; + doCheck = false; + + nativeBuildInputs = [ go-md2man installShellFiles pkg-config ]; buildInputs = [ btrfs-progs @@ -39,12 +42,12 @@ buildGoModule rec { buildPhase = '' patchShebangs . - make GIT_COMMIT="unknown" - make -C docs + make bin/buildah GIT_COMMIT="unknown" + make -C docs GOMD2MAN="${go-md2man}/bin/go-md2man" ''; installPhase = '' - install -Dm755 buildah $out/bin/buildah + install -Dm755 bin/buildah $out/bin/buildah installShellCompletion --bash contrib/completions/bash/buildah make -C docs install PREFIX="$man" ''; diff --git a/nixpkgs/pkgs/development/tools/buildpack/default.nix b/nixpkgs/pkgs/development/tools/buildpack/default.nix index c3eace89174..1d8e53ba525 100644 --- a/nixpkgs/pkgs/development/tools/buildpack/default.nix +++ b/nixpkgs/pkgs/development/tools/buildpack/default.nix @@ -1,26 +1,33 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: -buildGoPackage rec { +buildGoModule rec { pname = "pack"; - version = "0.7.0"; + version = "0.13.0"; src = fetchFromGitHub { owner = "buildpacks"; repo = pname; rev = "v${version}"; - sha256 = "0glfxrw3x35m4nmhr9xwlc14y5g9zni85rcrcn3dvkvgh4m6ipaj"; + sha256 = "0h7lgsg5d74pfa15kx0y3ngnvmz64znqk2k73iyjya9pi9h8hh88"; }; - goPackagePath = "github.com/buildpacks/pack"; + vendorSha256 = "1c38g169kq9kv6x0x1rlg39ywbc1q66fndby0v85b3ri3xb52869"; + + nativeBuildInputs = [ installShellFiles ]; subPackages = [ "cmd/pack" ]; - buildFlagsArray = [ "-ldflags=-s -w -X github.com/buildpacks/pack/cmd.Version=${version}" ]; + buildFlagsArray = [ "-ldflags=-s -w -X github.com/buildpacks/pack.Version=${version}" ]; + + postInstall = '' + installShellCompletion --bash --name pack.bash $(PACK_HOME=$PWD $out/bin/pack completion --shell bash) + installShellCompletion --zsh --name _pack $(PACK_HOME=$PWD $out/bin/pack completion --shell zsh) + ''; meta = with lib; { homepage = "https://buildpacks.io/"; changelog = "https://github.com/buildpacks/pack/releases/tag/v${version}"; - description = "Local CLI for building apps using Cloud Native Buildpacks"; + description = "CLI for building apps using Cloud Native Buildpacks"; license = licenses.asl20; maintainers = [ maintainers.marsam ]; }; diff --git a/nixpkgs/pkgs/development/tools/cargo-flamegraph/default.nix b/nixpkgs/pkgs/development/tools/cargo-flamegraph/default.nix index 08b248dd0f6..feaa3c312f4 100644 --- a/nixpkgs/pkgs/development/tools/cargo-flamegraph/default.nix +++ b/nixpkgs/pkgs/development/tools/cargo-flamegraph/default.nix @@ -32,6 +32,5 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/ferrous-systems/flamegraph"; license = with licenses; [ asl20 /* or */ mit ]; maintainers = with maintainers; [ killercup ]; - platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/development/tools/cargo-web/default.nix b/nixpkgs/pkgs/development/tools/cargo-web/default.nix index 4e6f8fbc71a..3008c15d848 100644 --- a/nixpkgs/pkgs/development/tools/cargo-web/default.nix +++ b/nixpkgs/pkgs/development/tools/cargo-web/default.nix @@ -23,6 +23,5 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/koute/cargo-web"; license = with licenses; [ asl20 /* or */ mit ]; maintainers = with maintainers; [ kevincox ]; - platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/development/tools/castxml/default.nix b/nixpkgs/pkgs/development/tools/castxml/default.nix index 1011f95cce7..0a455b4d7cd 100644 --- a/nixpkgs/pkgs/development/tools/castxml/default.nix +++ b/nixpkgs/pkgs/development/tools/castxml/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "CastXML"; - version = "0.2.0"; + version = "0.3.4"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "1qpgr5hyb692h7l5igmq53m6a6vi4d9qp8ks893cflfx9955h3ip"; + sha256 = "0ypj67xrgj228myp7l1gsjw1ja97q68nmj98dsd33srmiayqraj4"; }; nativeBuildInputs = [ cmake ] ++ stdenv.lib.optionals withMan [ pythonPackages.sphinx ]; diff --git a/nixpkgs/pkgs/development/tools/chit/default.nix b/nixpkgs/pkgs/development/tools/chit/default.nix index c7a8483719f..564c5dcbcb5 100644 --- a/nixpkgs/pkgs/development/tools/chit/default.nix +++ b/nixpkgs/pkgs/development/tools/chit/default.nix @@ -39,6 +39,5 @@ buildRustPackage rec { homepage = "https://github.com/peterheesterman/chit"; license = licenses.mit; maintainers = [ maintainers.lilyball ]; - platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/development/tools/cloudfoundry-cli/default.nix b/nixpkgs/pkgs/development/tools/cloudfoundry-cli/default.nix index 9d0c1ab92ff..642c42108aa 100644 --- a/nixpkgs/pkgs/development/tools/cloudfoundry-cli/default.nix +++ b/nixpkgs/pkgs/development/tools/cloudfoundry-cli/default.nix @@ -1,8 +1,8 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, installShellFiles }: +{ stdenv, buildGoPackage, fetchFromGitHub, fetchurl, installShellFiles }: buildGoPackage rec { pname = "cloudfoundry-cli"; - version = "6.51.0"; + version = "7.0.1"; goPackagePath = "code.cloudfoundry.org/cli"; @@ -12,7 +12,14 @@ buildGoPackage rec { owner = "cloudfoundry"; repo = "cli"; rev = "v${version}"; - sha256 = "189cqng7y12knqm4n1bfajbc2lx027rwb44wddmj5iya27i7fv8f"; + sha256 = "0jh4x7xlijp1naak5qyc256zkzlrczl6g4iz94s8wx2zj7np0q5l"; + }; + + # upstream have helpfully moved the bash completion script to a separate + # repo which receives no releases or even tags + bashCompletionScript = fetchurl { + url = "https://raw.githubusercontent.com/cloudfoundry/cli-ci/6087781a0e195465a35c79c8e968ae708c6f6351/ci/installers/completion/cf7"; + sha256 = "1vhg9jcgaxcvvb4pqnhkf27b3qivs4d3w232j0gbh9393m3qxrvy"; }; nativeBuildInputs = [ installShellFiles ]; @@ -35,7 +42,7 @@ buildGoPackage rec { installPhase = '' install -Dm555 out/cf "$out/bin/cf" - installShellCompletion --bash "$src/ci/installers/completion/cf" + installShellCompletion --bash $bashCompletionScript ''; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/development/tools/cmake-format/default.nix b/nixpkgs/pkgs/development/tools/cmake-format/default.nix index b0e97de5500..0d9edebe19b 100644 --- a/nixpkgs/pkgs/development/tools/cmake-format/default.nix +++ b/nixpkgs/pkgs/development/tools/cmake-format/default.nix @@ -10,12 +10,15 @@ buildPythonApplication rec { pname = "cmake-format"; - version = "0.6.11"; + version = "0.6.13"; + # The source distribution does not build because of missing files. + format = "wheel"; src = fetchPypi { - inherit version; - pname = "cmake_format"; - sha256 = "1wvmv8242xjkxgr266dkn4vrn5wm94fwn333pn7sxm5warhhwgda"; + inherit version format; + python = "py3"; + pname = "cmakelang"; + sha256 = "0kmggnfbv6bba75l3zfzqwk0swi90brjka307m2kcz2w35kr8jvn"; }; propagatedBuildInputs = [ autopep8 flake8 jinja2 pylint pyyaml ]; diff --git a/nixpkgs/pkgs/development/tools/conftest/default.nix b/nixpkgs/pkgs/development/tools/conftest/default.nix index d7ee1c2a51f..2f661dd44ae 100644 --- a/nixpkgs/pkgs/development/tools/conftest/default.nix +++ b/nixpkgs/pkgs/development/tools/conftest/default.nix @@ -2,16 +2,18 @@ buildGoModule rec { pname = "conftest"; - version = "0.19.0"; + version = "0.20.0"; src = fetchFromGitHub { owner = "open-policy-agent"; repo = "conftest"; rev = "v${version}"; - sha256 = "0d6n51p4b8jwkfqympwxkqxssgy462m5pgv5qvm6jy5pm566qa08"; + sha256 = "0v9cya3x0v1fqpqswayskmm0xzbvfn4hbhz2k6b3j6fzcq2dnzj3"; }; - vendorSha256 = "150fj2c9qll39wiqk41w0qms0sdqiacb2z015j38kg60r8f6i4lm"; + vendorSha256 = "1nxl00f8dbdiykwa54qm9r0cv16zcab880ay8mlmxba7srysvb1y"; + + doCheck = false; buildFlagsArray = '' -ldflags= @@ -23,6 +25,5 @@ buildGoModule rec { inherit (src.meta) homepage; license = licenses.asl20; maintainers = with maintainers; [ yurrriq ]; - platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/development/tools/continuous-integration/buildkite-cli/default.nix b/nixpkgs/pkgs/development/tools/continuous-integration/buildkite-cli/default.nix index 06d69c152ba..aee2a4e2341 100644 --- a/nixpkgs/pkgs/development/tools/continuous-integration/buildkite-cli/default.nix +++ b/nixpkgs/pkgs/development/tools/continuous-integration/buildkite-cli/default.nix @@ -13,6 +13,8 @@ buildGoModule rec { vendorSha256 = "0jxh3yhh0sdvaykhinxngpipk369hw8z1y3g2z4c1115m5rjp2bb"; + doCheck = false; + subPackages = [ "cmd/bk" ]; buildFlagsArray = [ "-ldflags=-s -w -X main.VERSION=${version}" ]; diff --git a/nixpkgs/pkgs/development/tools/continuous-integration/drone-cli/default.nix b/nixpkgs/pkgs/development/tools/continuous-integration/drone-cli/default.nix index 126e2005046..3df406eb560 100644 --- a/nixpkgs/pkgs/development/tools/continuous-integration/drone-cli/default.nix +++ b/nixpkgs/pkgs/development/tools/continuous-integration/drone-cli/default.nix @@ -1,13 +1,14 @@ { stdenv, fetchFromGitHub, buildGoModule }: -let version = "1.2.1"; +let version = "1.2.2"; in buildGoModule rec { inherit version; pname = "drone-cli"; revision = "v${version}"; - goPackagePath = "github.com/drone/drone-cli"; - vendorSha256 = "1zzx5yy0pp0c8pias4sfxfvdzhhrff9f8j51qf6dkif99xwdq3hb"; + vendorSha256 = "1ryh94cj37j8x6qwxr5ydyw6cnjppakg1w84sipm11d0vvv98bhi"; + + doCheck = false; preBuild = '' buildFlagsArray+=("-ldflags" "-X main.version=${version}") @@ -17,7 +18,7 @@ in buildGoModule rec { owner = "drone"; repo = "drone-cli"; rev = revision; - sha256 = "19icihi5nxcafxlh4w61nl4cd0dhvik9zl8g4gqmazikjqsjms2j"; + sha256 = "082yqm72y8s3v06gkcg947p62sd63y3r2bmdsrfgdrzb5w5a75bl"; }; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/development/tools/continuous-integration/drone/default.nix b/nixpkgs/pkgs/development/tools/continuous-integration/drone/default.nix index b9598f4c6d0..307dda4f993 100644 --- a/nixpkgs/pkgs/development/tools/continuous-integration/drone/default.nix +++ b/nixpkgs/pkgs/development/tools/continuous-integration/drone/default.nix @@ -3,10 +3,11 @@ buildGoModule rec { name = "drone.io-${version}"; version = "1.9.0"; - goPackagePath = "github.com/drone/drone"; vendorSha256 = "0idf11sr417lxcjryplgb87affr6lgzxazzlyvk0y40hp8zbhwsx"; + doCheck = false; + src = fetchFromGitHub { owner = "drone"; repo = "drone"; diff --git a/nixpkgs/pkgs/development/tools/continuous-integration/fly/default.nix b/nixpkgs/pkgs/development/tools/continuous-integration/fly/default.nix index 8497cea01b6..c85f5473de8 100644 --- a/nixpkgs/pkgs/development/tools/continuous-integration/fly/default.nix +++ b/nixpkgs/pkgs/development/tools/continuous-integration/fly/default.nix @@ -2,16 +2,18 @@ buildGoModule rec { pname = "fly"; - version = "6.4.0"; + version = "6.5.1"; src = fetchFromGitHub { owner = "concourse"; repo = "concourse"; rev = "v${version}"; - sha256 = "08lw345kzkic5b2dqj3d0d9x1mas9rpi4rdmbhww9r60swj169i7"; + sha256 = "0ldw40xn9nb5picly32nq558x0klvkyrr9af0jfngbvm4l5209bc"; }; - vendorSha256 = "0a78cjfj909ic8wci8id2h5f6r34h90myk6z7m918n08vxv60jvw"; + vendorSha256 = "1fxbxkg7disndlmb065abnfn7sn79qclkcbizmrq49f064w1ijr4"; + + doCheck = false; subPackages = [ "fly" ]; diff --git a/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index 298e5e6f9ca..ae746f9c54c 100644 --- a/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -1,16 +1,16 @@ { lib, buildGoPackage, fetchFromGitLab, fetchurl }: let - version = "13.2.0"; + version = "13.3.1"; # 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 = "0cvcil96gww68abdj5ni7w69ss5ncz3ixh00k1a9nlqggf0ifaav"; + sha256 = "0bm6vgdy0lhy1cw6rjsifihxrin33h8c5xwca0mgwd4f7ad64dgs"; }; docker_arm = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-arm.tar.xz"; - sha256 = "1j2z1wk4qs089mvx7y14al28pzhhnzs17n1ijpahsln2jn7b2s5m"; + sha256 = "1pjpqmi45c0d41cwrb8vb4lkcqarq430mni37h1bsijgqiap8rqk"; }; in buildGoPackage rec { @@ -30,7 +30,7 @@ buildGoPackage rec { owner = "gitlab-org"; repo = "gitlab-runner"; rev = "v${version}"; - sha256 = "0bgrh1yckc879qq155dvdqsr7673g1r1hbwf489ngabj8f8l3l23"; + sha256 = "15v5m420vv3vxmmga65j0agaa7b9mn1iywkq2ggpnrnznk5m613f"; }; patches = [ ./fix-shell-path.patch ]; diff --git a/nixpkgs/pkgs/development/tools/continuous-integration/jenkins/default.nix b/nixpkgs/pkgs/development/tools/continuous-integration/jenkins/default.nix index 5f0807cad87..310755fb532 100644 --- a/nixpkgs/pkgs/development/tools/continuous-integration/jenkins/default.nix +++ b/nixpkgs/pkgs/development/tools/continuous-integration/jenkins/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "jenkins"; - version = "2.235.3"; + version = "2.249.1"; src = fetchurl { url = "http://mirrors.jenkins.io/war-stable/${version}/jenkins.war"; - sha256 = "109rycgy8bg3na173vz5f3bq7w33a6kap8158kx6zhignni451p8"; + sha256 = "1mjvxl48v0rdrs6hzwh4mx5xvx3lnqs6njx3d7nfdfp2nf2s9353"; }; buildCommand = '' diff --git a/nixpkgs/pkgs/development/tools/continuous-integration/laminar/default.nix b/nixpkgs/pkgs/development/tools/continuous-integration/laminar/default.nix new file mode 100644 index 00000000000..5a326e94a54 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/continuous-integration/laminar/default.nix @@ -0,0 +1,80 @@ +{ stdenv +, lib +, fetchurl +, cmake +, capnproto +, sqlite +, boost +, zlib +, rapidjson +, pandoc +, enableSystemd ? false +, customConfig ? null +}: +let + js.vue = fetchurl { + url = "https://cdnjs.cloudflare.com/ajax/libs/vue/2.3.4/vue.min.js"; + sha256 = "01zklp5cyik65dfn64m8h2y2dxzgbyzgmbf99y7fwgnf0155r7pq"; + }; + js.vue-router = fetchurl { + url = + "https://cdnjs.cloudflare.com/ajax/libs/vue-router/2.7.0/vue-router.min.js"; + sha256 = "07gx7znb30rk1z7w6ca7dlfjp44q12bbq6jghwfm27mf6psa80as"; + }; + js.ansi_up = fetchurl { + url = "https://raw.githubusercontent.com/drudru/ansi_up/v1.3.0/ansi_up.js"; + sha256 = "1993dywxqi2ylnxybwk7m0s0bg2bq7kfllpyr0s8ck6chd0p8i6r"; + }; + js.Chart = fetchurl { + url = "https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.7.2/Chart.min.js"; + sha256 = "1jh4h12qchsba03dx03mrvs4r8g9qfjn56xm56jqzgqf7r209xq9"; + }; + css.bootstrap = fetchurl { + url = + "https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css"; + sha256 = "11vx860prsx7wsy8b0yrrk04ih8kvrxkk8l16snsc4n286bdkyri"; + }; +in stdenv.mkDerivation rec { + name = "laminar"; + version = "0.8"; + src = fetchurl { + url = "https://github.com/ohwgiles/laminar/archive/${version}.tar.gz"; + sha256 = "05g73j3vpib47kr7mackcazf7s6bc3xwz4h6k7sp7yb5ng7gj20g"; + }; + patches = [ ./patches/no-network.patch ]; + nativeBuildInputs = [ cmake pandoc ]; + buildInputs = [ capnproto sqlite boost zlib rapidjson ]; + preBuild = '' + mkdir -p js css + cp ${js.vue} js/vue.min.js + cp ${js.vue-router} js/vue-router.min.js + cp ${js.ansi_up} js/ansi_up.js + cp ${js.Chart} js/Chart.min.js + cp ${css.bootstrap} css/bootstrap.min.css + ''; + postInstall = '' + mv $out/usr/share $out + mkdir $out/bin + mv $out/usr/{bin,sbin}/* $out/bin + rmdir $out/usr/{bin,sbin} + rmdir $out/usr + + mkdir -p $out/share/doc/laminar + pandoc -s ../UserManual.md -o $out/share/doc/laminar/UserManual.html + '' + lib.optionalString (customConfig != null) '' + cp ${customConfig} /etc/etc/laminar.conf + '' + (if enableSystemd then '' + sed -i "s,/etc/,$out/etc/," $out/lib/systemd/system/laminar.service + sed -i "s,/usr/sbin/,$out/bin/," $out/lib/systemd/system/laminar.service + '' else '' + rm -r $out/lib # it contains only systemd unit file + ''); + + meta = with stdenv.lib; { + description = "Lightweight and modular continuous integration service"; + homepage = "https://laminar.ohwg.net"; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ kaction ]; + }; +} diff --git a/nixpkgs/pkgs/development/tools/continuous-integration/laminar/patches/no-network.patch b/nixpkgs/pkgs/development/tools/continuous-integration/laminar/patches/no-network.patch new file mode 100644 index 00000000000..80e74de95aa --- /dev/null +++ b/nixpkgs/pkgs/development/tools/continuous-integration/laminar/patches/no-network.patch @@ -0,0 +1,26 @@ +Build system that downloads stuff from network is bad. Build system that +does so unconditionally is twice as bad. + +Required files are downloaded as separate fixed-output derivations and +put into correct location before build phase starts. + +--- laminar-0.8/CMakeLists.txt ++++ laminar-0.8-new/CMakeLists.txt +@@ -69,17 +69,6 @@ + COMMAND sh -c '( echo -n "\\#define INDEX_HTML_UNCOMPRESSED_SIZE " && wc -c < "${CMAKE_SOURCE_DIR}/src/resources/index.html" ) > index_html_size.h' + DEPENDS src/resources/index.html) + +-# Download 3rd-party frontend JS libs... +-file(DOWNLOAD https://cdnjs.cloudflare.com/ajax/libs/vue/2.3.4/vue.min.js +- js/vue.min.js EXPECTED_MD5 ae2fca1cfa0e31377819b1b0ffef704c) +-file(DOWNLOAD https://cdnjs.cloudflare.com/ajax/libs/vue-router/2.7.0/vue-router.min.js +- js/vue-router.min.js EXPECTED_MD5 5d3e35710dbe02de78c39e3e439b8d4e) +-file(DOWNLOAD https://raw.githubusercontent.com/drudru/ansi_up/v1.3.0/ansi_up.js +- js/ansi_up.js EXPECTED_MD5 158566dc1ff8f2804de972f7e841e2f6) +-file(DOWNLOAD https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.7.2/Chart.min.js +- js/Chart.min.js EXPECTED_MD5 f6c8efa65711e0cbbc99ba72997ecd0e) +-file(DOWNLOAD https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css +- css/bootstrap.min.css EXPECTED_MD5 5d5357cb3704e1f43a1f5bfed2aebf42) + # ...and compile them + generate_compressed_bins(${CMAKE_BINARY_DIR} js/vue-router.min.js js/vue.min.js + js/ansi_up.js js/Chart.min.js css/bootstrap.min.css) diff --git a/nixpkgs/pkgs/development/tools/corgi/default.nix b/nixpkgs/pkgs/development/tools/corgi/default.nix index 2dcc68a09f2..a1549de1843 100644 --- a/nixpkgs/pkgs/development/tools/corgi/default.nix +++ b/nixpkgs/pkgs/development/tools/corgi/default.nix @@ -23,7 +23,6 @@ buildGoPackage rec { ''; homepage = "https://github.com/DrakeW/corgi"; license = licenses.mit; - platforms = platforms.all; maintainers = with maintainers; [ kalbasit ]; }; } diff --git a/nixpkgs/pkgs/development/tools/coursier/default.nix b/nixpkgs/pkgs/development/tools/coursier/default.nix index b54a831e955..f30acee3667 100644 --- a/nixpkgs/pkgs/development/tools/coursier/default.nix +++ b/nixpkgs/pkgs/development/tools/coursier/default.nix @@ -8,11 +8,11 @@ let in stdenv.mkDerivation rec { pname = "coursier"; - version = "2.0.0-RC6-18"; + version = "2.0.0-RC6-25"; src = fetchurl { url = "https://github.com/coursier/coursier/releases/download/v${version}/coursier"; - sha256 = "0vym99fyn0g8l5y2zvhf73ww17wywrh503wg5aw4nilj8w1ncvn2"; + sha256 = "0hkkfm18v2hvkf344ln9ka8gi3jdl6bvqpafc6h06f06vmp8prch"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/development/tools/cue/default.nix b/nixpkgs/pkgs/development/tools/cue/default.nix index f2fc9cf2602..cdd0f2ae105 100644 --- a/nixpkgs/pkgs/development/tools/cue/default.nix +++ b/nixpkgs/pkgs/development/tools/cue/default.nix @@ -12,6 +12,8 @@ buildGoModule rec { vendorSha256 = "0l6slaji9nh16jqp1nvib95h2db1xyjh6knk5hj2zaa1rks4b092"; + doCheck = false; + subPackages = [ "cmd/cue" ]; buildFlagsArray = [ diff --git a/nixpkgs/pkgs/development/tools/dapper/default.nix b/nixpkgs/pkgs/development/tools/dapper/default.nix index c2dadeb6a93..664dd61246d 100644 --- a/nixpkgs/pkgs/development/tools/dapper/default.nix +++ b/nixpkgs/pkgs/development/tools/dapper/default.nix @@ -5,7 +5,7 @@ buildGoPackage rec { pname = "dapper"; - version = "0.5.1"; + version = "0.5.3"; goPackagePath = "github.com/rancher/dapper"; @@ -13,7 +13,7 @@ buildGoPackage rec { owner = "rancher"; repo = "dapper"; rev = "v${version}"; - sha256 = "0sf56ii4sn2wdq5kiyl02sgvq0lvynzgiq8v5wrkkabj5107fiqw"; + sha256 = "1h62jahrxpmqx6r3mlakzap8gisrymgkp5syyarpab05qm1inngd"; }; patchPhase = '' substituteInPlace main.go --replace 0.0.0 ${version} diff --git a/nixpkgs/pkgs/development/tools/dapr/cli/default.nix b/nixpkgs/pkgs/development/tools/dapr/cli/default.nix new file mode 100644 index 00000000000..ef61edcbb8d --- /dev/null +++ b/nixpkgs/pkgs/development/tools/dapr/cli/default.nix @@ -0,0 +1,31 @@ +{ buildGoModule, fetchFromGitHub, stdenv }: + +let + pname = "dapr"; + version = "0.9.0"; + sha256 = "1vdbh5pg3j7kqqqhhf4d9xfzbpqmjc4x373sk43pb05prg4w71s7"; + vendorSha256 = "19qcpd5i60xmsr8m8mx16imm5falkqcgqpwpx3clfvqxjyflglpp"; +in buildGoModule { + inherit pname version vendorSha256; + + src = fetchFromGitHub { + inherit sha256; + + owner = "dapr"; + repo = "cli"; + rev = "v${version}"; + }; + + doCheck = false; + + postInstall = '' + mv $out/bin/cli $out/bin/dapr + ''; + + meta = with stdenv.lib; { + homepage = "https://dapr.io"; + description = "A CLI for managing Dapr, the distributed application runtime"; + license = licenses.mit; + maintainers = with maintainers; [ lucperkins ]; + }; +} diff --git a/nixpkgs/pkgs/development/tools/database/dbmate/default.nix b/nixpkgs/pkgs/development/tools/database/dbmate/default.nix index 329d92a9fa5..4858b84abfa 100644 --- a/nixpkgs/pkgs/development/tools/database/dbmate/default.nix +++ b/nixpkgs/pkgs/development/tools/database/dbmate/default.nix @@ -2,16 +2,18 @@ buildGoModule rec { pname = "dbmate"; - version = "1.9.0"; + version = "1.10.0"; src = fetchFromGitHub { owner = "amacneil"; repo = "dbmate"; rev = "v${version}"; - sha256 = "0v00k658b4ca9bpn2yiiy3gq5gr6hms8mlk31wf8svwsjyzjibzr"; + sha256 = "09zb7r8f6m1w9ax9ayaxjzwmqcgx5f6x4lclfi1wdn6f6qaans4w"; }; - vendorSha256 = "00vp925vf9clk5bkw5fvj34id4v548rlssizh52z9psvdizj8q5p"; + vendorSha256 = "012kgdvw7hj3m40v3nnpg916n02nxv19zid07h8g4qwprzg49iq2"; + + doCheck = false; meta = with stdenv.lib; { description = "Database migration tool"; diff --git a/nixpkgs/pkgs/development/tools/database/timescaledb-parallel-copy/default.nix b/nixpkgs/pkgs/development/tools/database/timescaledb-parallel-copy/default.nix index 166cda52a3d..a0e05bf4ae5 100644 --- a/nixpkgs/pkgs/development/tools/database/timescaledb-parallel-copy/default.nix +++ b/nixpkgs/pkgs/development/tools/database/timescaledb-parallel-copy/default.nix @@ -1,26 +1,22 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { - name = "timescaledb-parallel-copy"; - version = "0.2.0"; - - owner = "timescale"; - repo = "timescaledb-parallel-copy"; - - goPackagePath = with src; "github.com/${owner}/${repo}"; - goDeps = ./deps.nix; +buildGoModule rec { + pname = "timescaledb-parallel-copy"; + version = "0.3.0"; src = fetchFromGitHub { - inherit owner repo; - rev = version; - sha256 = "1z9vf29vrxqs8imbisv681d02p4cfk3hlsrin6hhibxf1h0br9gd"; + owner = "timescale"; + repo = pname; + rev = "v${version}"; + sha256 = "0r8c78l8vg7l24c3vzs2qr2prfjpagvdkp95fh9gyz76nvik29ba"; }; + vendorSha256 = "03siay3hv1sgmmp7w4f9b0xb8c6bnbx0v4wy5grjl5k04zhnj76b"; + meta = with stdenv.lib; { description = "Bulk, parallel insert of CSV records into PostgreSQL"; - homepage = "https://github.com/timescale/timescaledb-parallel-copy"; - license = licenses.asl20; - platforms = platforms.unix; + homepage = "https://github.com/timescale/timescaledb-parallel-copy"; + license = licenses.asl20; maintainers = with maintainers; [ thoughtpolice ]; }; } diff --git a/nixpkgs/pkgs/development/tools/database/timescaledb-parallel-copy/deps.nix b/nixpkgs/pkgs/development/tools/database/timescaledb-parallel-copy/deps.nix deleted file mode 100644 index ac145fcd34e..00000000000 --- a/nixpkgs/pkgs/development/tools/database/timescaledb-parallel-copy/deps.nix +++ /dev/null @@ -1,21 +0,0 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.3.0 -[ - { - goPackagePath = "github.com/jmoiron/sqlx"; - fetch = { - type = "git"; - url = "https://github.com/jmoiron/sqlx"; - rev = "82935fac6c1a317907c8f43ed3f7f85ea844a78b"; - sha256 = "0cbscnss2ifc3qgmy97i0zbirrp4hix4jlcz853f4bg5n2zzgwh2"; - }; - } - { - goPackagePath = "github.com/lib/pq"; - fetch = { - type = "git"; - url = "https://github.com/lib/pq"; - rev = "7aad666537ab32b76f0966145530335f1fed51fd"; - sha256 = "12qczn5afbf6203wnbpay1kazzh20jg5qyakrph3j1r13n91nc1r"; - }; - } -] diff --git a/nixpkgs/pkgs/development/tools/database/timescaledb-tune/default.nix b/nixpkgs/pkgs/development/tools/database/timescaledb-tune/default.nix index da5ba3fea64..2079925049d 100644 --- a/nixpkgs/pkgs/development/tools/database/timescaledb-tune/default.nix +++ b/nixpkgs/pkgs/development/tools/database/timescaledb-tune/default.nix @@ -1,20 +1,18 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { - name = "timescaledb-tune"; - version = "0.6.0"; - - goPackagePath = "github.com/timescale/timescaledb-tune"; - - goDeps = ./deps.nix; +buildGoModule rec { + pname = "timescaledb-tune"; + version = "0.9.0"; src = fetchFromGitHub { owner = "timescale"; - repo = name; - rev = version; - sha256 = "0hjxmjgkqm9sbjbyhs3pzkk1d9vvlcbzwl7ghsigh4h7rw3a0mpk"; + repo = pname; + rev = "v${version}"; + sha256 = "0vncwwvw7y6g3crd4n5vvd6jwdsa8vsvsmfwy5mad4j6lix09ajx"; }; + vendorSha256 = "0hbpprbxs19fcar7xcy42kn9yfzhal2zsv5pml9ghiv2s61yns4z"; + meta = with stdenv.lib; { description = "A tool for tuning your TimescaleDB for better performance"; homepage = "https://github.com/timescale/timescaledb-tune"; diff --git a/nixpkgs/pkgs/development/tools/database/timescaledb-tune/deps.nix b/nixpkgs/pkgs/development/tools/database/timescaledb-tune/deps.nix deleted file mode 100644 index d898770fd4e..00000000000 --- a/nixpkgs/pkgs/development/tools/database/timescaledb-tune/deps.nix +++ /dev/null @@ -1,21 +0,0 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.3.0 -[ - { - goPackagePath = "github.com/fatih/color"; - fetch = { - type = "git"; - url = "https://github.com/fatih/color"; - rev = "3f9d52f7176a6927daacff70a3e8d1dc2025c53e"; - sha256 = "165ww24x6ba47ji4j14mp3f006ksnmi53ws9280pgd2zcw91nbn8"; - }; - } - { - goPackagePath = "github.com/pbnjay/memory"; - fetch = { - type = "git"; - url = "https://github.com/pbnjay/memory"; - rev = "974d429e7ae40c89e7dcd41cfcc22a0bfbe42510"; - sha256 = "0kazg5psdn90pqadrzma5chdwh0l2by9z31sspr47gx93fhjmkkq"; - }; - } -] diff --git a/nixpkgs/pkgs/development/tools/dep/default.nix b/nixpkgs/pkgs/development/tools/dep/default.nix index 8d7f3b213ca..8b7c54832e2 100644 --- a/nixpkgs/pkgs/development/tools/dep/default.nix +++ b/nixpkgs/pkgs/development/tools/dep/default.nix @@ -21,7 +21,6 @@ buildGoPackage rec { homepage = "https://github.com/golang/dep"; description = "Go dependency management tool"; license = licenses.bsd3; - platforms = platforms.all; maintainers = with maintainers; [ carlsverre rvolosatovs ]; }; } diff --git a/nixpkgs/pkgs/development/tools/dep2nix/deps.nix b/nixpkgs/pkgs/development/tools/dep2nix/deps.nix index fc9280e9df5..ceedc50fc88 100644 --- a/nixpkgs/pkgs/development/tools/dep2nix/deps.nix +++ b/nixpkgs/pkgs/development/tools/dep2nix/deps.nix @@ -1,145 +1,129 @@ - - # file automatically generated from Gopkg.lock with https://github.com/nixcloud/dep2nix (golang dep) - [ - - { - goPackagePath = "github.com/Masterminds/semver"; - fetch = { - type = "git"; - url = "https://github.com/Masterminds/semver"; - rev = "a93e51b5a57ef416dac8bb02d11407b6f55d8929"; - sha256 = "1rd3p135r7iw0lvaa6vk7afxna87chq61a7a0wqnxd3xgpnpa9ik"; - }; - } - - { - goPackagePath = "github.com/Masterminds/vcs"; - fetch = { - type = "git"; - url = "https://github.com/Masterminds/vcs"; - rev = "6f1c6d150500e452704e9863f68c2559f58616bf"; - sha256 = "02bpyzccazw9lwqchcz349al4vlxnz4m5gzwigk02zg2qpa1j53j"; - }; - } - - { - goPackagePath = "github.com/armon/go-radix"; - fetch = { - type = "git"; - url = "https://github.com/armon/go-radix"; - rev = "1fca145dffbcaa8fe914309b1ec0cfc67500fe61"; - sha256 = "19jws9ngncpbhghzcy7biyb4r8jh14mzknyk67cvq6ln7kh1qyic"; - }; - } - - { - goPackagePath = "github.com/boltdb/bolt"; - fetch = { - type = "git"; - url = "https://github.com/boltdb/bolt"; - rev = "2f1ce7a837dcb8da3ec595b1dac9d0632f0f99e8"; - sha256 = "0z7j06lijfi4y30ggf2znak2zf2srv2m6c68ar712wd2ys44qb3r"; - }; - } - - { - goPackagePath = "github.com/golang/dep"; - fetch = { - type = "git"; - url = "https://github.com/CrushedPixel/dep"; - rev = "fa9f32339c8855ebe7e7bc66e549036a7e06d37a"; - sha256 = "1knaxs1ji1b0b68393f24r8qzvahxz9x7rqwc8jsjlshvpz0hlm6"; - }; - } - - { - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "bbd03ef6da3a115852eaf24c8a1c46aeb39aa175"; - sha256 = "1pyli3dcagi7jzpiazph4fhkz7a3z4bhd25nwbb7g0iy69b8z1g4"; - }; - } - - { - goPackagePath = "github.com/jmank88/nuts"; - fetch = { - type = "git"; - url = "https://github.com/jmank88/nuts"; - rev = "8b28145dffc87104e66d074f62ea8080edfad7c8"; - sha256 = "1d0xj1dj1lfalq3pg15h0c645n84lf122xx3zkm7hawq9zri6n5k"; - }; - } - - { - goPackagePath = "github.com/nightlyone/lockfile"; - fetch = { - type = "git"; - url = "https://github.com/nightlyone/lockfile"; - rev = "6a197d5ea61168f2ac821de2b7f011b250904900"; - sha256 = "03znnf6rzyyi4h4qj81py1xpfs3pnfm39j4bfc9qzakz5j9y1gdl"; - }; - } - - { - goPackagePath = "github.com/pelletier/go-toml"; - fetch = { - type = "git"; - url = "https://github.com/pelletier/go-toml"; - rev = "acdc4509485b587f5e675510c4f2c63e90ff68a8"; - sha256 = "1y5m9pngxhsfzcnxh8ma5nsllx74wn0jr47p2n6i3inrjqxr12xh"; - }; - } - - { - goPackagePath = "github.com/pkg/errors"; - fetch = { - type = "git"; - url = "https://github.com/pkg/errors"; - rev = "645ef00459ed84a119197bfb8d8205042c6df63d"; - sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5"; - }; - } - - { - goPackagePath = "github.com/sdboyer/constext"; - fetch = { - type = "git"; - url = "https://github.com/sdboyer/constext"; - rev = "836a144573533ea4da4e6929c235fd348aed1c80"; - sha256 = "0055yw73di4spa1wwpa2pyb708wmh9r3xd8dcv8pn81dba94if1w"; - }; - } - - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "dc948dff8834a7fe1ca525f8d04e261c2b56e70d"; - sha256 = "0gkw1am63agb1rgpxr2qhns9npr99mzwrxg7px88qq8h93zzd4kg"; - }; - } - - { - goPackagePath = "golang.org/x/sync"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sync"; - rev = "fd80eb99c8f653c847d294a001bdf2a3a6f768f5"; - sha256 = "12lzldlj1cqc1babp1hkkn76fglzn5abkqvmbpr4f2j95mf9x836"; - }; - } - - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "37707fdb30a5b38865cfb95e5aab41707daec7fd"; - sha256 = "1abrr2507a737hdqv4q7pw7hv6ls9pdiq9crhdi52r3gcz6hvizg"; - }; - } - +# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix) +[ + { + goPackagePath = "github.com/Masterminds/semver"; + fetch = { + type = "git"; + url = "https://github.com/carolynvs/semver.git"; + rev = "a93e51b5a57ef416dac8bb02d11407b6f55d8929"; + sha256 = "1rd3p135r7iw0lvaa6vk7afxna87chq61a7a0wqnxd3xgpnpa9ik"; + }; + } + { + goPackagePath = "github.com/Masterminds/vcs"; + fetch = { + type = "git"; + url = "https://github.com/Masterminds/vcs"; + rev = "6f1c6d150500e452704e9863f68c2559f58616bf"; + sha256 = "02bpyzccazw9lwqchcz349al4vlxnz4m5gzwigk02zg2qpa1j53j"; + }; + } + { + goPackagePath = "github.com/armon/go-radix"; + fetch = { + type = "git"; + url = "https://github.com/armon/go-radix"; + rev = "1fca145dffbcaa8fe914309b1ec0cfc67500fe61"; + sha256 = "19jws9ngncpbhghzcy7biyb4r8jh14mzknyk67cvq6ln7kh1qyic"; + }; + } + { + goPackagePath = "github.com/boltdb/bolt"; + fetch = { + type = "git"; + url = "https://github.com/boltdb/bolt"; + rev = "2f1ce7a837dcb8da3ec595b1dac9d0632f0f99e8"; + sha256 = "0z7j06lijfi4y30ggf2znak2zf2srv2m6c68ar712wd2ys44qb3r"; + }; + } + { + goPackagePath = "github.com/golang/dep"; + fetch = { + type = "git"; + url = "https://github.com/CrushedPixel/dep"; + rev = "fa9f32339c8855ebe7e7bc66e549036a7e06d37a"; + sha256 = "1knaxs1ji1b0b68393f24r8qzvahxz9x7rqwc8jsjlshvpz0hlm6"; + }; + } + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "bbd03ef6da3a115852eaf24c8a1c46aeb39aa175"; + sha256 = "1pyli3dcagi7jzpiazph4fhkz7a3z4bhd25nwbb7g0iy69b8z1g4"; + }; + } + { + goPackagePath = "github.com/jmank88/nuts"; + fetch = { + type = "git"; + url = "https://github.com/jmank88/nuts"; + rev = "8b28145dffc87104e66d074f62ea8080edfad7c8"; + sha256 = "1d0xj1dj1lfalq3pg15h0c645n84lf122xx3zkm7hawq9zri6n5k"; + }; + } + { + goPackagePath = "github.com/nightlyone/lockfile"; + fetch = { + type = "git"; + url = "https://github.com/nightlyone/lockfile"; + rev = "6a197d5ea61168f2ac821de2b7f011b250904900"; + sha256 = "03znnf6rzyyi4h4qj81py1xpfs3pnfm39j4bfc9qzakz5j9y1gdl"; + }; + } + { + goPackagePath = "github.com/pelletier/go-toml"; + fetch = { + type = "git"; + url = "https://github.com/pelletier/go-toml"; + rev = "acdc4509485b587f5e675510c4f2c63e90ff68a8"; + sha256 = "1y5m9pngxhsfzcnxh8ma5nsllx74wn0jr47p2n6i3inrjqxr12xh"; + }; + } + { + goPackagePath = "github.com/pkg/errors"; + fetch = { + type = "git"; + url = "https://github.com/pkg/errors"; + rev = "645ef00459ed84a119197bfb8d8205042c6df63d"; + sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5"; + }; + } + { + goPackagePath = "github.com/sdboyer/constext"; + fetch = { + type = "git"; + url = "https://github.com/sdboyer/constext"; + rev = "836a144573533ea4da4e6929c235fd348aed1c80"; + sha256 = "0055yw73di4spa1wwpa2pyb708wmh9r3xd8dcv8pn81dba94if1w"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "dc948dff8834a7fe1ca525f8d04e261c2b56e70d"; + sha256 = "0gkw1am63agb1rgpxr2qhns9npr99mzwrxg7px88qq8h93zzd4kg"; + }; + } + { + goPackagePath = "golang.org/x/sync"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sync"; + rev = "fd80eb99c8f653c847d294a001bdf2a3a6f768f5"; + sha256 = "12lzldlj1cqc1babp1hkkn76fglzn5abkqvmbpr4f2j95mf9x836"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "37707fdb30a5b38865cfb95e5aab41707daec7fd"; + sha256 = "1abrr2507a737hdqv4q7pw7hv6ls9pdiq9crhdi52r3gcz6hvizg"; + }; + } ] diff --git a/nixpkgs/pkgs/development/tools/devd/default.nix b/nixpkgs/pkgs/development/tools/devd/default.nix index 1e48ecde763..2d5a38458d3 100644 --- a/nixpkgs/pkgs/development/tools/devd/default.nix +++ b/nixpkgs/pkgs/development/tools/devd/default.nix @@ -11,12 +11,10 @@ buildGoPackage rec { }; goPackagePath = "github.com/cortesi/devd"; subPackages = [ "cmd/devd" ]; - goDeps = ./deps.nix; meta = with stdenv.lib; { description = "A local webserver for developers"; homepage = "https://github.com/cortesi/devd"; license = licenses.mit; maintainers = with maintainers; [ brianhicks ]; - platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/development/tools/devd/deps.nix b/nixpkgs/pkgs/development/tools/devd/deps.nix deleted file mode 100644 index 2cf6dd7eb23..00000000000 --- a/nixpkgs/pkgs/development/tools/devd/deps.nix +++ /dev/null @@ -1,201 +0,0 @@ -# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix) -[ - { - goPackagePath = "github.com/GeertJohan/go.rice"; - fetch = { - type = "git"; - url = "https://github.com/GeertJohan/go.rice"; - rev = "c02ca9a983da5807ddf7d796784928f5be4afd09"; - sha256 = "1wzi3fprizg29dd4b4bmwz49x154k8cry9d7c08441y1i8w895yw"; - }; - } - { - goPackagePath = "github.com/alecthomas/template"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/template"; - rev = "a0175ee3bccc567396460bf5acd36800cb10c49c"; - sha256 = "0qjgvvh26vk1cyfq9fadyhfgdj36f1iapbmr5xp6zqipldz8ffxj"; - }; - } - { - goPackagePath = "github.com/alecthomas/units"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/units"; - rev = "2efee857e7cfd4f3d0138cc3cbb1b4966962b93a"; - sha256 = "1j65b91qb9sbrml9cpabfrcf07wmgzzghrl7809hjjhrmbzri5bl"; - }; - } - { - goPackagePath = "github.com/bmatcuk/doublestar"; - fetch = { - type = "git"; - url = "https://github.com/bmatcuk/doublestar"; - rev = "85a78806aa1b4707d1dbace9be592cf1ece91ab3"; - sha256 = "01fd5j142pgsj5gfba43646aa6vd09fzvjhhik2r30nj4lsyy3z8"; - }; - } - { - goPackagePath = "github.com/cortesi/moddwatch"; - fetch = { - type = "git"; - url = "https://github.com/cortesi/moddwatch"; - rev = "0a1e0881aa8823d4dbec04c5b65a32a33f467e46"; - sha256 = "0f9gi2vvrhsbbvfqzlx2dcgn389qj1h77rvh2iffqhnsn3cxf5fr"; - }; - } - { - goPackagePath = "github.com/cortesi/termlog"; - fetch = { - type = "git"; - url = "https://github.com/cortesi/termlog"; - rev = "87cefd5ac843f65364f70a1fd2477bb6437690e8"; - sha256 = "1mygv1bv6dkm5p1wsvzrsyq771k6apdcxlyfqdp5ay8vl75jxvmb"; - }; - } - { - goPackagePath = "github.com/daaku/go.zipexe"; - fetch = { - type = "git"; - url = "https://github.com/daaku/go.zipexe"; - rev = "a5fe2436ffcb3236e175e5149162b41cd28bd27d"; - sha256 = "0vi5pskhifb6zw78w2j97qbhs09zmrlk4b48mybgk5b3sswp6510"; - }; - } - { - goPackagePath = "github.com/dustin/go-humanize"; - fetch = { - type = "git"; - url = "https://github.com/dustin/go-humanize"; - rev = "9f541cc9db5d55bce703bd99987c9d5cb8eea45e"; - sha256 = "1kqf1kavdyvjk7f8kx62pnm7fbypn9z1vbf8v2qdh3y7z7a0cbl3"; - }; - } - { - goPackagePath = "github.com/fatih/color"; - fetch = { - type = "git"; - url = "https://github.com/fatih/color"; - rev = "3f9d52f7176a6927daacff70a3e8d1dc2025c53e"; - sha256 = "165ww24x6ba47ji4j14mp3f006ksnmi53ws9280pgd2zcw91nbn8"; - }; - } - { - goPackagePath = "github.com/goji/httpauth"; - fetch = { - type = "git"; - url = "https://github.com/goji/httpauth"; - rev = "2da839ab0f4df05a6db5eb277995589dadbd4fb9"; - sha256 = "0rcz1qxdbc2gw0gaj81kag94k98izs9vmhcp5mzs7979s7q4kym1"; - }; - } - { - goPackagePath = "github.com/gorilla/websocket"; - fetch = { - type = "git"; - url = "https://github.com/gorilla/websocket"; - rev = "66b9c49e59c6c48f0ffce28c2d8b8a5678502c6d"; - sha256 = "00i4vb31nsfkzzk7swvx3i75r2d960js3dri1875vypk3v2s0pzk"; - }; - } - { - goPackagePath = "github.com/juju/ratelimit"; - fetch = { - type = "git"; - url = "https://github.com/juju/ratelimit"; - rev = "59fac5042749a5afb9af70e813da1dd5474f0167"; - sha256 = "0ppwvwbh9jdpdk4f9924vw373cpfz5g5ad10c707p22a984vanrz"; - }; - } - { - goPackagePath = "github.com/kardianos/osext"; - fetch = { - type = "git"; - url = "https://github.com/kardianos/osext"; - rev = "ae77be60afb1dcacde03767a8c37337fad28ac14"; - sha256 = "056dkgxrqjj5r18bnc3knlpgdz5p3yvp12y4y978hnsfhwaqvbjz"; - }; - } - { - goPackagePath = "github.com/mattn/go-colorable"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-colorable"; - rev = "167de6bfdfba052fa6b2d3664c8f5272e23c9072"; - sha256 = "1nwjmsppsjicr7anq8na6md7b1z84l9ppnlr045hhxjvbkqwalvx"; - }; - } - { - goPackagePath = "github.com/mattn/go-isatty"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-isatty"; - rev = "6ca4dbf54d38eea1a992b3c722a76a5d1c4cb25c"; - sha256 = "0zs92j2cqaw9j8qx1sdxpv3ap0rgbs0vrvi72m40mg8aa36gd39w"; - }; - } - { - goPackagePath = "github.com/mitchellh/go-homedir"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/go-homedir"; - rev = "ae18d6b8b3205b561c79e8e5f69bff09736185f4"; - sha256 = "0f0z0aa4wivk4z1y503dmnw0k0g0g403dly8i4q263gfshs82sbq"; - }; - } - { - goPackagePath = "github.com/rjeczalik/notify"; - fetch = { - type = "git"; - url = "https://github.com/rjeczalik/notify"; - rev = "629144ba06a1c6af28c1e42c228e3d42594ce081"; - sha256 = "0745w0mdr9xfr4rxw4pfr1sl8apc7wr7mvfykdl4wslq3mdj8a91"; - }; - } - { - goPackagePath = "github.com/toqueteos/webbrowser"; - fetch = { - type = "git"; - url = "https://github.com/toqueteos/webbrowser"; - rev = "43eedf9c266f511c55ef7eace9ee549e269b54b4"; - sha256 = "0wa8xv0gh9iq3dlwb48dx8w2awrsarqa900hszan8gaxgag7x7ih"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "505ab145d0a99da450461ae2c1a9f6cd10d1f447"; - sha256 = "1vbsvcvmjz6c00p5vf8ls533p52fx2y3gy6v4k5qrdlzl4wf0i5s"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "927f97764cc334a6575f4b7a1584a147864d5723"; - sha256 = "0np7b766gb92vbm514yhdl7cjmqvn0dxdxskd84aas2ri1fkpgw5"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "b4a75ba826a64a70990f11a225237acd6ef35c9f"; - sha256 = "0kzrd2wywkcq35iakbzplqyma4bvf2ng3mzi7917kxcbdq3fflrj"; - }; - } - { - goPackagePath = "gopkg.in/alecthomas/kingpin.v2"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/kingpin"; - rev = "947dcec5ba9c011838740e680966fd7087a71d0d"; - sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r"; - }; - } -] diff --git a/nixpkgs/pkgs/development/tools/diesel-cli/default.nix b/nixpkgs/pkgs/development/tools/diesel-cli/default.nix index 6eac1af512b..6a447dd57c9 100644 --- a/nixpkgs/pkgs/development/tools/diesel-cli/default.nix +++ b/nixpkgs/pkgs/development/tools/diesel-cli/default.nix @@ -71,7 +71,6 @@ rustPlatform.buildRustPackage rec { description = "Database tool for working with Rust projects that use Diesel"; homepage = "https://github.com/diesel-rs/diesel/tree/master/diesel_cli"; license = with licenses; [ mit asl20 ]; - platforms = platforms.all; maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/tools/dive/default.nix b/nixpkgs/pkgs/development/tools/dive/default.nix index d2d01004923..3cb050df036 100644 --- a/nixpkgs/pkgs/development/tools/dive/default.nix +++ b/nixpkgs/pkgs/development/tools/dive/default.nix @@ -13,6 +13,8 @@ buildGoModule rec { vendorSha256 = "0219q9zjc0i6fbdngqh0wjpmq8wj5bjiz5dls0c1aam0lh4vwkhc"; + doCheck = false; + nativeBuildInputs = [ pkg-config ]; buildInputs = stdenv.lib.optionals stdenv.isLinux [ btrfs-progs gpgme lvm2 ]; diff --git a/nixpkgs/pkgs/development/tools/doctl/default.nix b/nixpkgs/pkgs/development/tools/doctl/default.nix index cfb3395f9ec..45795b67ea4 100644 --- a/nixpkgs/pkgs/development/tools/doctl/default.nix +++ b/nixpkgs/pkgs/development/tools/doctl/default.nix @@ -6,6 +6,8 @@ buildGoModule rec { vendorSha256 = null; + doCheck = false; + subPackages = [ "cmd/doctl" ]; buildFlagsArray = let t = "github.com/digitalocean/doctl"; in '' @@ -37,7 +39,6 @@ buildGoModule rec { description = "A command line tool for DigitalOcean services"; homepage = "https://github.com/digitalocean/doctl"; license = licenses.asl20; - platforms = platforms.all; maintainers = [ maintainers.siddharthist ]; }; } diff --git a/nixpkgs/pkgs/development/tools/documentation/doxygen/default.nix b/nixpkgs/pkgs/development/tools/documentation/doxygen/default.nix index a8e5f179916..772b654df93 100644 --- a/nixpkgs/pkgs/development/tools/documentation/doxygen/default.nix +++ b/nixpkgs/pkgs/development/tools/documentation/doxygen/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { - name = "doxygen-1.8.18"; + name = "doxygen-1.8.19"; src = fetchurl { urls = [ "mirror://sourceforge/doxygen/${name}.src.tar.gz" # faster, with https, etc. "http://doxygen.nl/files/${name}.src.tar.gz" ]; - sha256 = "0mh6s1ri1fs5yb27m0avnjsbcxpchgb9aaprq4bd3lj6vjg3s5qq"; + sha256 = "1lvqfw2yzba588c5ggl8yhw7aw4xkk44mrghsd9yqlajc48x25dc"; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/tools/documentation/mdsh/default.nix b/nixpkgs/pkgs/development/tools/documentation/mdsh/default.nix index 3a33925a86f..5ab74a4b95f 100644 --- a/nixpkgs/pkgs/development/tools/documentation/mdsh/default.nix +++ b/nixpkgs/pkgs/development/tools/documentation/mdsh/default.nix @@ -18,6 +18,5 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/zimbatm/mdsh"; license = with licenses; [ mit ]; maintainers = with maintainers; [ zimbatm ]; - platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/development/tools/dot-http/default.nix b/nixpkgs/pkgs/development/tools/dot-http/default.nix new file mode 100644 index 00000000000..1c81a4145d2 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/dot-http/default.nix @@ -0,0 +1,28 @@ +{ stdenv, rustPlatform, fetchFromGitHub, pkg-config, openssl, libiconv, Security }: + +rustPlatform.buildRustPackage rec { + pname = "dot-http"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "bayne"; + repo = pname; + rev = "v${version}"; + sha256 = "1s2q4kdldhb5gd14g2h6vzrbjgbbbs9zp2dgmna0rhk1h4qv0mml"; + }; + + cargoSha256 = "0an3hskq1k2j4gdn8wvhfb9pqsc34ibs5bv7sjznkp5jma6fdr9w"; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ + libiconv Security + ]; + + meta = with stdenv.lib; { + description = "Text-based scriptable HTTP client"; + homepage = "https://github.com/bayne/dot-http"; + license = licenses.asl20; + maintainers = with maintainers; [ mredaelli ]; + }; +} diff --git a/nixpkgs/pkgs/development/tools/dt-schema/default.nix b/nixpkgs/pkgs/development/tools/dt-schema/default.nix new file mode 100644 index 00000000000..5cba13b6689 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/dt-schema/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchPypi +, git +, ruamel_yaml +, jsonschema +, rfc3987 +, setuptools +, setuptools_scm +}: + +buildPythonPackage rec { + pname = "dtschema"; + version = "2020.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "1zdm0zbn1dfk02yqghfvd0nb26hmzivb6mln6bvxjfdcv6n7pdqf"; + }; + + nativeBuildInputs = [ setuptools_scm git ]; + propagatedBuildInputs = [ + setuptools + ruamel_yaml + jsonschema + rfc3987 + ]; + + meta = with lib; { + description = "Tooling for devicetree validation using YAML and jsonschema"; + homepage = "https://github.com/devicetree-org/dt-schema/"; + # all files have SPDX tags + license = with licenses; [ bsd2 gpl2 ]; + maintainers = with maintainers; [ sorki ]; + }; +} + diff --git a/nixpkgs/pkgs/development/tools/easyjson/default.nix b/nixpkgs/pkgs/development/tools/easyjson/default.nix index 4f3d89c0788..ef99bbd01c3 100644 --- a/nixpkgs/pkgs/development/tools/easyjson/default.nix +++ b/nixpkgs/pkgs/development/tools/easyjson/default.nix @@ -4,7 +4,6 @@ buildGoPackage { pname = "easyjson"; version = "unstable-2019-06-26"; goPackagePath = "github.com/mailru/easyjson"; - goDeps = ./deps.nix; src = fetchFromGitHub { owner = "mailru"; @@ -13,13 +12,10 @@ buildGoPackage { sha256 = "0q85h383mhbkcjm2vqm72bi8n2252fv3c56q3lclzb8n2crnjcdk"; }; - enableParallelBuilding = true; - meta = with stdenv.lib; { homepage = "https://github.com/mailru/easyjson"; description = "Fast JSON serializer for golang"; license = licenses.mit; maintainers = with maintainers; [ chiiruno ]; - platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/development/tools/easyjson/deps.nix b/nixpkgs/pkgs/development/tools/easyjson/deps.nix deleted file mode 100644 index 0429d8876b2..00000000000 --- a/nixpkgs/pkgs/development/tools/easyjson/deps.nix +++ /dev/null @@ -1,3 +0,0 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.3.0 -[ -] diff --git a/nixpkgs/pkgs/development/tools/ejson/default.nix b/nixpkgs/pkgs/development/tools/ejson/default.nix index a9481cbb306..17e3f5f7be1 100644 --- a/nixpkgs/pkgs/development/tools/ejson/default.nix +++ b/nixpkgs/pkgs/development/tools/ejson/default.nix @@ -16,8 +16,6 @@ in buildGoPackage rec { goPackagePath = "github.com/Shopify/ejson"; subPackages = [ "cmd/ejson" ]; - goDeps = ./deps.nix; - src = fetchFromGitHub { owner = "Shopify"; repo = "ejson"; diff --git a/nixpkgs/pkgs/development/tools/ejson/deps.nix b/nixpkgs/pkgs/development/tools/ejson/deps.nix deleted file mode 100644 index b0c7defc5d7..00000000000 --- a/nixpkgs/pkgs/development/tools/ejson/deps.nix +++ /dev/null @@ -1,48 +0,0 @@ -# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix) -[ - { - goPackagePath = "github.com/codegangsta/cli"; - fetch = { - type = "git"; - url = "https://github.com/codegangsta/cli"; - rev = "9908e96513e5a94de37004098a3974a567f18111"; - sha256 = "0g6sihdb53nlf770dp3jc0qqxnlir5n2yjbp5p5vf7kcj3p54p34"; - }; - } - { - goPackagePath = "github.com/dustin/gojson"; - fetch = { - type = "git"; - url = "https://github.com/dustin/gojson"; - rev = "057ac0edc14e44d03df3bb03449e666ff50884c1"; - sha256 = "1kzzbi5yshcg1v99gab5ymd3psild3p0rbq9jf7mssjvh11yza6f"; - }; - } - { - goPackagePath = "github.com/smartystreets/goconvey"; - fetch = { - type = "git"; - url = "https://github.com/smartystreets/goconvey"; - rev = "90f2eae17a8bdcbe3f6f654fc76af7f39e97d7b9"; - sha256 = "0s984ksmc8npf642nwwd1a81c2sfi613v7yia9jff710i5472fah"; - }; - } - { - goPackagePath = "github.com/urfave/cli"; - fetch = { - type = "git"; - url = "https://github.com/urfave/cli"; - rev = "cfb38830724cc34fedffe9a2a29fb54fa9169cd1"; - sha256 = "0y6f4sbzkiiwrxbl15biivj8c7qwxnvm3zl2dd3mw4wzg4x10ygj"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "ca7e7f10cb9fd9c1a6ff7f60436c086d73714180"; - sha256 = "02wmfdq40fjszrd9l2w4c1g34zxnxyydwr4sqvp2blmw2s6ww4bx"; - }; - } -]
\ No newline at end of file diff --git a/nixpkgs/pkgs/development/tools/electron/default.nix b/nixpkgs/pkgs/development/tools/electron/default.nix index 14f9c209537..c9df28e5cde 100644 --- a/nixpkgs/pkgs/development/tools/electron/default.nix +++ b/nixpkgs/pkgs/development/tools/electron/default.nix @@ -3,7 +3,10 @@ let mkElectron = import ./generic.nix args; in -{ +rec { + + electron = electron_10; + electron_3 = mkElectron "3.1.13" { x86_64-linux = "1psmbplz6jhnnf6hmfhxbmmhn4n1dpnhzbc12pxn645xhfpk9ark"; x86_64-darwin = "1vvjm4jifzjqvbs2kjlwg1h9p2czr2b5imjr9hld1j8nyfrzb0dx"; @@ -36,27 +39,35 @@ in aarch64-linux = "4ae23b75be821044f7e5878fe8e56ab3109cbd403ecd88221effa6abf850260b"; }; - electron_7 = mkElectron "7.3.1" { - x86_64-linux = "66f37aadf65c0274cc6e46b09e52c38b2c8c5b2d6bbf1cd8196cd69b9f9ab737"; - x86_64-darwin = "351b30cab32539752ce5f9b53d2345352df922d57a152643c4eeb636a8941d23"; - i686-linux = "f80b8a684da13736d7614ca4ad5704812d12537111cb45010e5f42e7e4403554"; - armv7l-linux = "ef054696f4138e261b1310522d57bbdc5336e34488b3e273a8a794f8c26509c7"; - aarch64-linux = "f32376ca85c9017b7ab399e58fa176d882baacb048dd69d816831f8dde9054bb"; + electron_7 = mkElectron "7.3.3" { + x86_64-linux = "a947228a859149bec5bd937f9f3c03eb0aa4d78cfe4dfa9aead60d3646a357f9"; + x86_64-darwin = "e081436abef52212065f560ea6add1c0cd13d287a1b3cc76b28d2762f7651a4e"; + i686-linux = "5fb756900af43a9daa6c63ccd0ac4752f5a479b8c6ae576323fd925dbe5ecbf5"; + armv7l-linux = "830678f6db27fa4852cf456d8b2828a3e4e3c63fe2bced6b358eae88d1063793"; + aarch64-linux = "03d06120464c353068e2ac6c40f89eedffd6b5b3c4c96efdb406c96a6136a066"; + }; + + electron_8 = mkElectron "8.5.1" { + x86_64-linux = "e58bf26ba52e43de77115b6e6844eba8a8cec2ac8aae500cf48fe862014202d9"; + x86_64-darwin = "cf0d42ecde7ca374ddf1b440aaaf441e16a02890112fcbffc03f37f8ec3b1958"; + i686-linux = "4c7ff6225b1ac4b710c454072d9fb8c04a66bb0353e7d6cffb89bcf6d4458d81"; + armv7l-linux = "13afd8b2e36eb8d1582687e16fac5394d6d3b9734d73f94d0d6ef843ba14cec2"; + aarch64-linux = "ff39e5e0e644cbf4ff1d29fc25e94b9eced7ea45d787d1b86fa4e50513336b7b"; }; - electron_8 = mkElectron "8.3.1" { - x86_64-linux = "d5ad2bd32f7bf88f869a401017b35be0ea71e6fc7798fe2397b21602573e2639"; - x86_64-darwin = "abe864d9e6327d499120f328e699f4819110d4245bce2f92b84e19d8cdc1c771"; - i686-linux = "e75692c062b15c7f664cf3ff30832a526f3f66080469f7f93befaa4e0860c011"; - armv7l-linux = "cfa0a14225b617492a311c21ad973f24708bc4013a992271368006cdb12ed488"; - aarch64-linux = "1b9cd3ed7eb53ed914ac04c82d736c2677af807e553c87f0698890c2a3dcfd57"; + electron_9 = mkElectron "9.3.0" { + x86_64-linux = "0c34fa1dbf7708bd4a3f08fde50eafb9903b1c467104dca3e3ced5e7f764b302"; + x86_64-darwin = "25057470c2f3a1c40fa1c25086256041fa70419378fa3d41eeb805ebd3919b20"; + i686-linux = "ea09d10e496450d2d7bb7a37cab7124cc5484117dd7d7d6c4106586ff675d1d5"; + armv7l-linux = "a8b46d6c98546d605a02850c906408dc11104e8ee4366c3d8a956896fafdfcd3"; + aarch64-linux = "791d898d02e45975657ed15f2d83af31d5688e7db0075a6e20021db3420eb320"; }; - electron_9 = mkElectron "9.0.2" { - x86_64-linux = "08326f505692010d6c92f444a25f450cf19323cd98c5d94cab1057e80601caa1"; - x86_64-darwin = "8ab5b48f873582a9231bc85b0f73d9735fabca51364b8c505da8f8238d658da5"; - i686-linux = "2e950e4ab91453f7611fcfedbe90eff844677dbcc7df87a6fe0889bd3d82daaa"; - armv7l-linux = "cc098caebbed5022f26d12f9b5dc316a35dbae0bcf62b9fc72c3b385f93a32d5"; - aarch64-linux = "ee39854d8e9ee06e9b94c457a52b0556f570316bbd755d7022e3eade4b5974d5"; + electron_10 = mkElectron "10.1.1" { + x86_64-linux = "4147e88bdbec6893bf9927f0d4f3dd090d26705f5b7f688223bc65253a8b0220"; + x86_64-darwin = "5b6814ae1064cc337efcdb2ad01ab9daa003a6a1d6e05d79288ede0a3665b991"; + i686-linux = "d29682b7ea44dcdca5e7265bd1e28046275295a9ac23982af3d216a7f47a7a57"; + armv7l-linux = "341a2eacb0381c1f409b8e28cf2c0fe6f75a61410614baf80309f51dd4201a34"; + aarch64-linux = "d5e5b069f3173ed89f4cca7e9723f28a5f7a720637b7addac02972c5db042b6c"; }; } diff --git a/nixpkgs/pkgs/development/tools/electron/generic.nix b/nixpkgs/pkgs/development/tools/electron/generic.nix index 92dd72533ae..f24358676dd 100644 --- a/nixpkgs/pkgs/development/tools/electron/generic.nix +++ b/nixpkgs/pkgs/development/tools/electron/generic.nix @@ -10,7 +10,7 @@ let license = licenses.mit; maintainers = with maintainers; [ travisbhartwell manveru prusnak ]; platforms = [ "x86_64-darwin" "x86_64-linux" "i686-linux" "armv7l-linux" "aarch64-linux" ]; - knownVulnerabilities = optional (version < "6") "Electron version ${version} is EOL"; + knownVulnerabilities = optional (versionOlder version "6.0.0") "Electron version ${version} is EOL"; }; fetcher = vers: tag: hash: fetchurl { @@ -34,7 +34,7 @@ let src = fetcher version (get tags platform) (get hashes platform); }; - electronLibPath = stdenv.lib.makeLibraryPath ([ libuuid at-spi2-atk at-spi2-core ] ++ stdenv.lib.optionals (version > "9") [ libdrm mesa ]); + electronLibPath = with stdenv.lib; makeLibraryPath ([ libuuid at-spi2-atk at-spi2-core ] ++ optionals (! versionOlder version "9.0.0") [ libdrm mesa ]); linux = { buildInputs = [ glib gtk3 ]; diff --git a/nixpkgs/pkgs/development/tools/eliot-tree/default.nix b/nixpkgs/pkgs/development/tools/eliot-tree/default.nix new file mode 100644 index 00000000000..95108c21bb9 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/eliot-tree/default.nix @@ -0,0 +1,38 @@ +{ stdenv, python3Packages }: + +python3Packages.buildPythonApplication rec { + pname = "eliot-tree"; + version = "19.0.1"; + + src = python3Packages.fetchPypi { + inherit pname version; + sha256 = "18gvijsm0vh3x83mv8dd80c3mpm80r7i111qsg4y7rj4i590phma"; + }; + + checkInputs = with python3Packages; [ + testtools + pytest + ]; + + propagatedBuildInputs = with python3Packages; [ + colored + eliot + iso8601 + jmespath + setuptools + toolz + ]; + + # Tests run eliot-tree in out/bin. + checkPhase = '' + export PATH=$out/bin:$PATH + pytest + ''; + + meta = with stdenv.lib; { + homepage = "https://github.com/jonathanj/eliottree"; + description = "Render Eliot logs as an ASCII tree"; + license = licenses.mit; + maintainers = [ maintainers.dpausp ]; + }; +} diff --git a/nixpkgs/pkgs/development/tools/fedora-coreos-config-transpiler/default.nix b/nixpkgs/pkgs/development/tools/fedora-coreos-config-transpiler/default.nix index effa0b2364d..7ff7af7d18e 100644 --- a/nixpkgs/pkgs/development/tools/fedora-coreos-config-transpiler/default.nix +++ b/nixpkgs/pkgs/development/tools/fedora-coreos-config-transpiler/default.nix @@ -15,6 +15,8 @@ buildGoModule rec { vendorSha256 = null; + doCheck = false; + subPackages = [ "internal" ]; buildFlagsArray = '' diff --git a/nixpkgs/pkgs/development/tools/flyway/default.nix b/nixpkgs/pkgs/development/tools/flyway/default.nix index be38e1fdf44..78db979299c 100644 --- a/nixpkgs/pkgs/development/tools/flyway/default.nix +++ b/nixpkgs/pkgs/development/tools/flyway/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, jre_headless, makeWrapper }: let - version = "6.5.3"; + version = "6.5.4"; in stdenv.mkDerivation { pname = "flyway"; inherit version; src = fetchurl { url = "https://repo1.maven.org/maven2/org/flywaydb/flyway-commandline/${version}/flyway-commandline-${version}.tar.gz"; - sha256 = "1gxa9gg7di79kl6aayryhrkm3nzn3sc7hg2x1ldy1q72x6wz41sc"; + sha256 = "1ga4qhydswalz02hz32p764zipn1lw63nhqlwqq96vjj9cwj1wii"; }; nativeBuildInputs = [ makeWrapper ]; dontBuild = true; diff --git a/nixpkgs/pkgs/development/tools/gauge/default.nix b/nixpkgs/pkgs/development/tools/gauge/default.nix index c9a462f1832..8755466ec8c 100644 --- a/nixpkgs/pkgs/development/tools/gauge/default.nix +++ b/nixpkgs/pkgs/development/tools/gauge/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "gauge"; - version = "1.1.1"; + version = "1.1.3"; goPackagePath = "github.com/getgauge/gauge"; excludedPackages = ''\(build\|man\)''; @@ -11,7 +11,7 @@ buildGoPackage rec { owner = "getgauge"; repo = "gauge"; rev = "v${version}"; - sha256 = "01x4838jljhhhcwfh6zbhy3g7l7nqvypv3g0ch9n2amsf2s16s3l"; + sha256 = "11qllg1alv9khkgjarpzlsqg5ygisjprg79n2jqhv1w6izx88cqc"; }; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/development/tools/gdm/default.nix b/nixpkgs/pkgs/development/tools/gdm/default.nix index 284579fd362..2217ea591ff 100644 --- a/nixpkgs/pkgs/development/tools/gdm/default.nix +++ b/nixpkgs/pkgs/development/tools/gdm/default.nix @@ -19,7 +19,6 @@ buildGoPackage rec { description = "Minimalist dependency manager for Go written in Go."; homepage = "https://github.com/sparrc/gdm"; license = licenses.unlicense; - platforms = platforms.all; maintainers = [ maintainers.mic92 ]; }; } diff --git a/nixpkgs/pkgs/development/tools/ginkgo/default.nix b/nixpkgs/pkgs/development/tools/ginkgo/default.nix new file mode 100644 index 00000000000..cf2e649962c --- /dev/null +++ b/nixpkgs/pkgs/development/tools/ginkgo/default.nix @@ -0,0 +1,22 @@ +{ stdenv, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "ginkgo"; + version = "1.14.1"; + + src = fetchFromGitHub { + owner = "onsi"; + repo = "ginkgo"; + rev = "v${version}"; + sha256 = "01nn33r1rg210zv0qmck0b16545gzr057w1kz8ca86l64qrwbcxx"; + }; + vendorSha256 = "072amyw1ir18v9vk268j2y7dhw3lfwvxzvzsdqhnp50rxsa911bx"; + doCheck = false; + + meta = with stdenv.lib; { + description = "BDD Testing Framework for Go"; + homepage = "https://github.com/onsi/ginkgo"; + license = licenses.mit; + maintainers = with maintainers; [ saschagrunert ]; + }; +} diff --git a/nixpkgs/pkgs/development/tools/gir/default.nix b/nixpkgs/pkgs/development/tools/gir/default.nix index 49e1e6bbe8b..02a3c13afb3 100644 --- a/nixpkgs/pkgs/development/tools/gir/default.nix +++ b/nixpkgs/pkgs/development/tools/gir/default.nix @@ -18,6 +18,5 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/gtk-rs/gir/"; license = with licenses; [ mit ]; maintainers = with maintainers; [ ekleog ]; - platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/development/tools/git-quick-stats/default.nix b/nixpkgs/pkgs/development/tools/git-quick-stats/default.nix index bd5e699b4a9..0ceb6f566a3 100644 --- a/nixpkgs/pkgs/development/tools/git-quick-stats/default.nix +++ b/nixpkgs/pkgs/development/tools/git-quick-stats/default.nix @@ -1,14 +1,46 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv +, fetchFromGitHub +, makeWrapper +, coreutils +, gawk +, git +, gnugrep +, ncurses +, utillinux +}: + stdenv.mkDerivation rec { pname = "git-quick-stats"; - version = "2.1.3"; + version = "2.1.4"; + src = fetchFromGitHub { repo = "git-quick-stats"; owner = "arzzen"; rev = version; - sha256 = "0j7yd5fcqdbsad6xzi2k0j4p06w9187hhpal1gqcrh3kj13sjyi3"; + sha256 = "0fg0fijghcz7hvbc9y8dfksz0qmsz700kc2mfb03y90kja99v68y"; }; - PREFIX = builtins.placeholder "out"; + + nativeBuildInputs = [ makeWrapper ]; + + installFlags = [ + "PREFIX=${builtins.placeholder "out"}" + ]; + + postInstall = + let + path = stdenv.lib.makeBinPath [ + coreutils + gawk + git + gnugrep + ncurses + utillinux + ]; + in + '' + wrapProgram $out/bin/git-quick-stats --suffix PATH : ${path} + ''; + meta = with stdenv.lib; { homepage = "https://github.com/arzzen/git-quick-stats"; description = "A simple and efficient way to access various statistics in git repository"; diff --git a/nixpkgs/pkgs/development/tools/gllvm/default.nix b/nixpkgs/pkgs/development/tools/gllvm/default.nix index 6b64a088353..7c4213b4cc0 100644 --- a/nixpkgs/pkgs/development/tools/gllvm/default.nix +++ b/nixpkgs/pkgs/development/tools/gllvm/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "gllvm"; - version = "1.2.6"; + version = "1.2.7"; goPackagePath = "github.com/SRI-CSL/gllvm"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "SRI-CSL"; repo = "gllvm"; rev = "v${version}"; - sha256 = "0qzmrprc7npc0ln6mhkjrm8fgh2n94rdylixk11p6imxyx5fj3gg"; + sha256 = "13cmmgbcdfgyxnxqfrn4m6vf0bhpday8lmrr3sm6rk48g77cq203"; }; meta = with stdenv.lib; { @@ -18,6 +18,5 @@ buildGoPackage rec { description = "Whole Program LLVM: wllvm ported to go"; license = licenses.bsd3; maintainers = with maintainers; [ dtzWill ]; - platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/development/tools/go-bindata-assetfs/default.nix b/nixpkgs/pkgs/development/tools/go-bindata-assetfs/default.nix index ffdb2a092a0..30344a52e06 100644 --- a/nixpkgs/pkgs/development/tools/go-bindata-assetfs/default.nix +++ b/nixpkgs/pkgs/development/tools/go-bindata-assetfs/default.nix @@ -16,7 +16,6 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Serve embedded files from jteeuwen/go-bindata"; license = licenses.bsd2; - platforms = platforms.all; maintainers = with maintainers; [ avnik ]; }; } diff --git a/nixpkgs/pkgs/development/tools/go-bindata/default.nix b/nixpkgs/pkgs/development/tools/go-bindata/default.nix index 9db1501f940..9256fab43bf 100644 --- a/nixpkgs/pkgs/development/tools/go-bindata/default.nix +++ b/nixpkgs/pkgs/development/tools/go-bindata/default.nix @@ -20,6 +20,5 @@ buildGoPackage { description = "A small utility which generates Go code from any file, useful for embedding binary data in a Go program"; maintainers = with maintainers; [ cstrahan ]; license = licenses.cc0; - platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/development/tools/go-junit-report/default.nix b/nixpkgs/pkgs/development/tools/go-junit-report/default.nix index 3c6cf7e3d83..96ebce0eaca 100644 --- a/nixpkgs/pkgs/development/tools/go-junit-report/default.nix +++ b/nixpkgs/pkgs/development/tools/go-junit-report/default.nix @@ -19,6 +19,5 @@ buildGoPackage rec { homepage = "https://${goPackagePath}"; maintainers = with maintainers; [ cryptix ]; license = licenses.mit; - platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/development/tools/go-migrate/default.nix b/nixpkgs/pkgs/development/tools/go-migrate/default.nix new file mode 100644 index 00000000000..ee942beb92c --- /dev/null +++ b/nixpkgs/pkgs/development/tools/go-migrate/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "go-migrate"; + version = "4.12.2"; + + src = fetchFromGitHub { + owner = "golang-migrate"; + repo = "migrate"; + rev = "v${version}"; + sha256 = "0vrc9y90aamj618sfipq2sgzllhdr4hmicj4yvl147klwb1rxlz6"; + }; + + vendorSha256 = "0jpz5xvwsw4l7nmi7s1grvbfy4xjp50hrjycwicgv2ll719gz5v0"; + + subPackages = [ "cmd/migrate" ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/golang-migrate/migrate"; + description = "Database migrations. CLI and Golang library."; + maintainers = with maintainers; [ offline ]; + license = licenses.mit; + }; +} diff --git a/nixpkgs/pkgs/development/tools/go-protobuf/default.nix b/nixpkgs/pkgs/development/tools/go-protobuf/default.nix index e1bd62e7dec..28d429c6432 100644 --- a/nixpkgs/pkgs/development/tools/go-protobuf/default.nix +++ b/nixpkgs/pkgs/development/tools/go-protobuf/default.nix @@ -13,6 +13,8 @@ buildGoModule rec { vendorSha256 = "04w9vhkrwb2zfqk73xmhignjyvjqmz1j93slkqp7v8jj2dhyla54"; + doCheck = false; + meta = with stdenv.lib; { homepage = "https://github.com/golang/protobuf"; description = " Go bindings for protocol buffer"; diff --git a/nixpkgs/pkgs/development/tools/go-swagger/default.nix b/nixpkgs/pkgs/development/tools/go-swagger/default.nix index 0c41775ae01..7f0a1a50b6d 100644 --- a/nixpkgs/pkgs/development/tools/go-swagger/default.nix +++ b/nixpkgs/pkgs/development/tools/go-swagger/default.nix @@ -13,6 +13,8 @@ buildGoModule rec { vendorSha256 = "0vvr167spwk7whqzdp5vd8sm0qwc5g3namm4iqw3vff2pifjgs40"; + doCheck = false; + subPackages = [ "cmd/swagger" ]; buildFlagsArray = [ "-ldflags=-s -w -X github.com/go-swagger/go-swagger/cmd/swagger/commands.Version=${version} -X github.com/go-swagger/go-swagger/cmd/swagger/commands.Commit=${src.rev}" ]; diff --git a/nixpkgs/pkgs/development/tools/go-task/default.nix b/nixpkgs/pkgs/development/tools/go-task/default.nix index eb20ec726e3..c196f167ce0 100644 --- a/nixpkgs/pkgs/development/tools/go-task/default.nix +++ b/nixpkgs/pkgs/development/tools/go-task/default.nix @@ -13,6 +13,8 @@ buildGoModule rec { vendorSha256 = null; + doCheck = false; + subPackages = [ "cmd/task" ]; buildFlagsArray = [ @@ -27,7 +29,6 @@ buildGoModule rec { homepage = "https://taskfile.dev/"; description = "A task runner / simpler Make alternative written in Go"; license = licenses.mit; - platforms = platforms.all; maintainers = with maintainers; [ parasrah ]; }; } diff --git a/nixpkgs/pkgs/development/tools/go-tools/default.nix b/nixpkgs/pkgs/development/tools/go-tools/default.nix index 58643c893f0..ec4b1ee66b3 100644 --- a/nixpkgs/pkgs/development/tools/go-tools/default.nix +++ b/nixpkgs/pkgs/development/tools/go-tools/default.nix @@ -16,6 +16,8 @@ buildGoModule rec { vendorSha256 = "0nbbngsphklzhcmqafrw1im2l1vnfcma9sb4vskdpdrsadv5ss5r"; + doCheck = false; + meta = with lib; { description = "A collection of tools and libraries for working with Go code, including linters and static analysis"; homepage = "https://staticcheck.io"; diff --git a/nixpkgs/pkgs/development/tools/gocode-gomod/default.nix b/nixpkgs/pkgs/development/tools/gocode-gomod/default.nix index 603568236e6..01ee2931c99 100644 --- a/nixpkgs/pkgs/development/tools/gocode-gomod/default.nix +++ b/nixpkgs/pkgs/development/tools/gocode-gomod/default.nix @@ -1,11 +1,8 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { - pname = "gocode-gomod-unstable"; - version = "2019-03-27"; - rev = "81059208699789f992bb4a4a3fedd734e335468d"; - - goPackagePath = "github.com/stamblerre/gocode"; +buildGoModule rec { + pname = "gocode-gomod"; + version = "1.0.0"; # we must allow references to the original `go` package, # because `gocode` needs to dig into $GOROOT to provide completions for the @@ -15,14 +12,13 @@ buildGoPackage rec { excludedPackages = ''internal/suggest/testdata''; src = fetchFromGitHub { - inherit rev; - owner = "stamblerre"; repo = "gocode"; - sha256 = "0y5lc7sq3913mvvczwx8mq5l3l9yg34jzaw742q8jpd1jzqyza94"; + rev = "v${version}"; + sha256 = "YAOYrPPKgnjCErq8+iW0Le51clGBv0MJy2Nnn7UVo/s="; }; - goDeps = ./deps.nix; + vendorSha256 = null; postInstall = '' mv $out/bin/gocode $out/bin/gocode-gomod @@ -44,7 +40,6 @@ buildGoPackage rec { ''; homepage = "https://github.com/stamblerre/gocode"; license = licenses.mit; - platforms = platforms.all; maintainers = with maintainers; [ kalbasit rvolosatovs ]; }; } diff --git a/nixpkgs/pkgs/development/tools/gocode-gomod/deps.nix b/nixpkgs/pkgs/development/tools/gocode-gomod/deps.nix deleted file mode 100644 index ac966269706..00000000000 --- a/nixpkgs/pkgs/development/tools/gocode-gomod/deps.nix +++ /dev/null @@ -1,11 +0,0 @@ -[ - { - goPackagePath = "golang.org/x/tools"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/tools"; - rev = "78dc5bac0cacea7969e98b79c3b86597e0aa4e25"; - sha256 = "16jg2x1sfm39kz4rchn0gxyq99fnkxw6v51wxriqbs76a2wrznp9"; - }; - } -] diff --git a/nixpkgs/pkgs/development/tools/gocode/default.nix b/nixpkgs/pkgs/development/tools/gocode/default.nix index b4e9a8d43cb..f38d06b34c6 100644 --- a/nixpkgs/pkgs/development/tools/gocode/default.nix +++ b/nixpkgs/pkgs/development/tools/gocode/default.nix @@ -39,7 +39,6 @@ buildGoPackage rec { ''; homepage = "https://github.com/mdempsky/gocode"; license = licenses.mit; - platforms = platforms.all; maintainers = with maintainers; [ kalbasit ]; }; } diff --git a/nixpkgs/pkgs/development/tools/godef/default.nix b/nixpkgs/pkgs/development/tools/godef/default.nix index 3fb4fcaa84b..c8149ecc82d 100644 --- a/nixpkgs/pkgs/development/tools/godef/default.nix +++ b/nixpkgs/pkgs/development/tools/godef/default.nix @@ -5,11 +5,12 @@ buildGoModule rec { version = "1.1.2"; rev = "v${version}"; - goPackagePath = "github.com/rogpeppe/godef"; subPackages = [ "." ]; vendorSha256 = null; + doCheck = false; + src = fetchFromGitHub { inherit rev; owner = "rogpeppe"; diff --git a/nixpkgs/pkgs/development/tools/godot/default.nix b/nixpkgs/pkgs/development/tools/godot/default.nix index 832d30ee8e8..0d35ce253b1 100644 --- a/nixpkgs/pkgs/development/tools/godot/default.nix +++ b/nixpkgs/pkgs/development/tools/godot/default.nix @@ -10,13 +10,13 @@ let }; in stdenv.mkDerivation rec { pname = "godot"; - version = "3.2.1"; + version = "3.2.2"; src = fetchFromGitHub { owner = "godotengine"; repo = "godot"; rev = "${version}-stable"; - sha256 = "1kndls0rklha7kz9l4i2ivjxab4jpk3b2j7dcgcg2qc3s81yd0r6"; + sha256 = "1libz83mbyrkbbsmmi8z2rydv3ls0w9r4vb5v6diqqwn7ka8z804"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/nixpkgs/pkgs/development/tools/godot/dont_clobber_environment.patch b/nixpkgs/pkgs/development/tools/godot/dont_clobber_environment.patch index 3782aced1a4..b7c1d3d6233 100644 --- a/nixpkgs/pkgs/development/tools/godot/dont_clobber_environment.patch +++ b/nixpkgs/pkgs/development/tools/godot/dont_clobber_environment.patch @@ -1,16 +1,18 @@ -+++ build/SConstruct -@@ -63,10 +63,10 @@ elif platform_arg == 'javascript': - custom_tools = ['cc', 'c++', 'ar', 'link', 'textfile', 'zip'] - +diff --git a/SConstruct b/SConstruct +index b3d033dc90..04b8dcc832 100644 +--- a/SConstruct ++++ b/SConstruct +@@ -62,10 +62,9 @@ elif platform_arg == "javascript": + custom_tools = ["cc", "c++", "ar", "link", "textfile", "zip"] + env_base = Environment(tools=custom_tools) --if 'TERM' in os.environ: -- env_base['ENV']['TERM'] = os.environ['TERM'] --env_base.AppendENVPath('PATH', os.getenv('PATH')) --env_base.AppendENVPath('PKG_CONFIG_PATH', os.getenv('PKG_CONFIG_PATH')) +-if "TERM" in os.environ: +- env_base["ENV"]["TERM"] = os.environ["TERM"] +-env_base.AppendENVPath("PATH", os.getenv("PATH")) +-env_base.AppendENVPath("PKG_CONFIG_PATH", os.getenv("PKG_CONFIG_PATH")) +for k in ("TERM", "PATH", "PKG_CONFIG_PATH"): + if (k in os.environ): + env_base["ENV"][k] = os.environ[k] -+ env_base.disabled_modules = [] env_base.use_ptrcall = False env_base.module_version_string = "" diff --git a/nixpkgs/pkgs/development/tools/godot/headless.nix b/nixpkgs/pkgs/development/tools/godot/headless.nix new file mode 100644 index 00000000000..0ae28b774fb --- /dev/null +++ b/nixpkgs/pkgs/development/tools/godot/headless.nix @@ -0,0 +1,18 @@ +{ godot, stdenv }: +godot.overrideAttrs (oldAttrs: rec { + pname = "godot-headless"; + sconsFlags = "target=release_debug platform=server tools=yes"; + installPhase = '' + mkdir -p "$out/bin" + cp bin/godot_server.* $out/bin/godot-headless + + mkdir "$dev" + cp -r modules/gdnative/include $dev + + mkdir -p "$man/share/man/man6" + cp misc/dist/linux/godot.6 "$man/share/man/man6/" + ''; + meta.description = + "Free and Open Source 2D and 3D game engine (headless build)"; + meta.maintainers = with stdenv.lib.maintainers; [ twey yusdacra ]; +}) diff --git a/nixpkgs/pkgs/development/tools/godot/pkg_config_additions.patch b/nixpkgs/pkgs/development/tools/godot/pkg_config_additions.patch index 409baaa6f26..9e2e5c3536d 100644 --- a/nixpkgs/pkgs/development/tools/godot/pkg_config_additions.patch +++ b/nixpkgs/pkgs/development/tools/godot/pkg_config_additions.patch @@ -1,22 +1,25 @@ +diff --git a/platform/x11/detect.py b/platform/x11/detect.py +index 5674e78350..7051d8e73c 100644 +--- a/platform/x11/detect.py +++ b/platform/x11/detect.py -@@ -175,6 +175,11 @@ def configure(env): - env.ParseConfig('pkg-config xrender --cflags --libs') - env.ParseConfig('pkg-config xi --cflags --libs') +@@ -201,6 +201,11 @@ def configure(env): + env.ParseConfig("pkg-config xrender --cflags --libs") + env.ParseConfig("pkg-config xi --cflags --libs") -+ env.ParseConfig('pkg-config xext --cflags --libs') -+ env.ParseConfig('pkg-config xfixes --cflags --libs') -+ env.ParseConfig('pkg-config glu --cflags --libs') -+ env.ParseConfig('pkg-config zlib --cflags --libs') ++ env.ParseConfig("pkg-config xext --cflags --libs") ++ env.ParseConfig("pkg-config xfixes --cflags --libs") ++ env.ParseConfig("pkg-config glu --cflags --libs") ++ env.ParseConfig("pkg-config zlib --cflags --libs") + - if (env['touch']): - env.Append(CPPFLAGS=['-DTOUCH_ENABLED']) + if env["touch"]: + env.Append(CPPDEFINES=["TOUCH_ENABLED"]) -@@ -264,7 +269,7 @@ def configure(env): +@@ -299,7 +304,7 @@ def configure(env): print("Enabling ALSA") - env.Append(CPPFLAGS=["-DALSA_ENABLED", "-DALSAMIDI_ENABLED"]) - # Don't parse --cflags, we don't need to add /usr/include/alsa to include path -- env.ParseConfig('pkg-config alsa --libs') -+ env.ParseConfig('pkg-config alsa --cflags --libs') + env.Append(CPPDEFINES=["ALSA_ENABLED", "ALSAMIDI_ENABLED"]) + # Don't parse --cflags, we don't need to add /usr/include/alsa to include path +- env.ParseConfig("pkg-config alsa --libs") ++ env.ParseConfig("pkg-config alsa --cflags --libs") else: print("ALSA libraries not found, disabling driver") diff --git a/nixpkgs/pkgs/development/tools/godot/server.nix b/nixpkgs/pkgs/development/tools/godot/server.nix new file mode 100644 index 00000000000..48f21b796c3 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/godot/server.nix @@ -0,0 +1,18 @@ +{ godot, stdenv }: +godot.overrideAttrs (oldAttrs: rec { + pname = "godot-server"; + sconsFlags = "target=release platform=server tools=no"; + installPhase = '' + mkdir -p "$out/bin" + cp bin/godot_server.* $out/bin/godot-server + + mkdir "$dev" + cp -r modules/gdnative/include $dev + + mkdir -p "$man/share/man/man6" + cp misc/dist/linux/godot.6 "$man/share/man/man6/" + ''; + meta.description = + "Free and Open Source 2D and 3D game engine (server build)"; + meta.maintainers = with stdenv.lib.maintainers; [ twey yusdacra ]; +}) diff --git a/nixpkgs/pkgs/development/tools/gofumpt/default.nix b/nixpkgs/pkgs/development/tools/gofumpt/default.nix index 67b7e1e9230..080f4bd3305 100644 --- a/nixpkgs/pkgs/development/tools/gofumpt/default.nix +++ b/nixpkgs/pkgs/development/tools/gofumpt/default.nix @@ -13,6 +13,8 @@ buildGoModule rec { vendorSha256 = "14a3p163xy861xb6x160wy15hzjc75n36jdyzaxl877i17shba8z"; + doCheck = false; + meta = with lib; { description = "A stricter gofmt"; homepage = "https://github.com/mvdan/gofumpt"; diff --git a/nixpkgs/pkgs/development/tools/gogetdoc/default.nix b/nixpkgs/pkgs/development/tools/gogetdoc/default.nix index 6898c998ef6..2a111a8d1ab 100644 --- a/nixpkgs/pkgs/development/tools/gogetdoc/default.nix +++ b/nixpkgs/pkgs/development/tools/gogetdoc/default.nix @@ -10,6 +10,8 @@ buildGoModule rec { vendorSha256 = null; + doCheck = false; + excludedPackages = "\\(testdata\\)"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/tools/golangci-lint/default.nix b/nixpkgs/pkgs/development/tools/golangci-lint/default.nix index fe7f24faf39..1eaa00e8086 100644 --- a/nixpkgs/pkgs/development/tools/golangci-lint/default.nix +++ b/nixpkgs/pkgs/development/tools/golangci-lint/default.nix @@ -2,16 +2,19 @@ buildGoModule rec { pname = "golangci-lint"; - version = "1.28.3"; + version = "1.31.0"; src = fetchFromGitHub { owner = "golangci"; repo = "golangci-lint"; rev = "v${version}"; - sha256 = "0bjjdr8nxbn2h23x62sywbiv5y4rpk3xg7lk6lkbvmn7625brfvx"; + sha256 = "10divgsc095jiw7n3gwzikbgvsd0hdwjyv469vq939zm7rqq3acy"; }; - vendorSha256 = "15wl6xblwyqs7pbbi2yy3y0ysj0k34qf05jfh69k9i9xf9k8hp6a"; + vendorSha256 = "1pa99jfz6i696x6v06aq56r0kmxmz4khb1hw7pvxds0bn16a4swr"; + + doCheck = false; + subPackages = [ "cmd/golangci-lint" ]; nativeBuildInputs = [ installShellFiles ]; diff --git a/nixpkgs/pkgs/development/tools/golint/default.nix b/nixpkgs/pkgs/development/tools/golint/default.nix index da8d5fb286b..284bb32f89e 100644 --- a/nixpkgs/pkgs/development/tools/golint/default.nix +++ b/nixpkgs/pkgs/development/tools/golint/default.nix @@ -25,6 +25,5 @@ buildGoPackage rec { description = "Linter for Go source code"; license = licenses.bsd3; maintainers = with maintainers; [ jhillyerd ]; - platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/development/tools/gomodifytags/default.nix b/nixpkgs/pkgs/development/tools/gomodifytags/default.nix index bf8c67979dc..cf2c5a5b9a6 100644 --- a/nixpkgs/pkgs/development/tools/gomodifytags/default.nix +++ b/nixpkgs/pkgs/development/tools/gomodifytags/default.nix @@ -6,7 +6,7 @@ buildGoModule rec { vendorSha256 = null; - goPackagePath = "github.com/fatih/gomodifytags"; + doCheck = false; src = fetchFromGitHub { owner = "fatih"; diff --git a/nixpkgs/pkgs/development/tools/gopkgs/default.nix b/nixpkgs/pkgs/development/tools/gopkgs/default.nix index d90f688ae35..d112654ab43 100644 --- a/nixpkgs/pkgs/development/tools/gopkgs/default.nix +++ b/nixpkgs/pkgs/development/tools/gopkgs/default.nix @@ -4,8 +4,6 @@ buildGoModule rec { pname = "gopkgs"; version = "2.1.2"; - goPackagePath = "github.com/uudashr/gopkgs"; - subPackages = [ "cmd/gopkgs" ]; src = fetchFromGitHub { @@ -17,6 +15,8 @@ buildGoModule rec { vendorSha256 = "1pwsc488ldw039by8nqpni801zry7dnf0rx4hhd73xpv2w7s8n2r"; + doCheck = false; + meta = { description = "Tool to get list available Go packages."; homepage = "https://github.com/uudashr/gopkgs"; diff --git a/nixpkgs/pkgs/development/tools/gopls/default.nix b/nixpkgs/pkgs/development/tools/gopls/default.nix index cfa4defe04b..4ce65518a85 100644 --- a/nixpkgs/pkgs/development/tools/gopls/default.nix +++ b/nixpkgs/pkgs/development/tools/gopls/default.nix @@ -1,17 +1,19 @@ -{ stdenv, go, buildGoModule, fetchgit }: +{ stdenv, buildGoModule, fetchgit }: buildGoModule rec { pname = "gopls"; - version = "0.4.3"; + version = "0.4.4"; src = fetchgit { rev = "gopls/v${version}"; url = "https://go.googlesource.com/tools"; - sha256 = "1r670c7p63l0fhx671r3mb1jgvvfv1382079fv59z07j5j5hizbc"; + sha256 = "1h4ica6rwrdp5wg4ybpzvyvszj4m5l6w9hpvd9r2qcd9qdnqlykf"; }; modRoot = "gopls"; - vendorSha256 = "1xdvkdkvk7a32jspzjcgxkfdn78d2zm53wxmc9c4sqysxsgy6lbw"; + vendorSha256 = "175051d858lsdir2hj5qcimp6hakbi9grpws1ssvk3r2jna27x1z"; + + doCheck = false; meta = with stdenv.lib; { description = "Official language server for the Go language"; diff --git a/nixpkgs/pkgs/development/tools/gore/default.nix b/nixpkgs/pkgs/development/tools/gore/default.nix index 92eeaeaeddb..fbc3152cef1 100644 --- a/nixpkgs/pkgs/development/tools/gore/default.nix +++ b/nixpkgs/pkgs/development/tools/gore/default.nix @@ -13,6 +13,8 @@ buildGoModule rec { vendorSha256 = "3bq6sRKS5dq7WCPpKGm2q5gFajthR3zhrTFGve9zXhY="; + doCheck = false; + meta = with stdenv.lib; { description = "Yet another Go REPL that works nicely."; homepage = "https://github.com/motemen/gore"; diff --git a/nixpkgs/pkgs/development/tools/gosec/default.nix b/nixpkgs/pkgs/development/tools/gosec/default.nix index 0915f3e966a..ffbd98a4577 100644 --- a/nixpkgs/pkgs/development/tools/gosec/default.nix +++ b/nixpkgs/pkgs/development/tools/gosec/default.nix @@ -4,8 +4,6 @@ buildGoModule rec { pname = "gosec"; version = "2.4.0"; - goPackagePath = "github.com/securego/gosec"; - subPackages = [ "cmd/gosec" ]; src = fetchFromGitHub { @@ -17,6 +15,8 @@ buildGoModule rec { vendorSha256 = "063dpq1k5lykp18gshlgg098yvppicv3cz8gjn1mvfhac2rl9yqr"; + doCheck = false; + buildFlagsArray = [ "-ldflags=-s -w -X main.Version=${version} -X main.GitTag=${src.rev} -X main.BuildDate=unknown" ]; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/development/tools/gotestsum/default.nix b/nixpkgs/pkgs/development/tools/gotestsum/default.nix index 178a949a63a..71bccc74ce6 100644 --- a/nixpkgs/pkgs/development/tools/gotestsum/default.nix +++ b/nixpkgs/pkgs/development/tools/gotestsum/default.nix @@ -2,19 +2,23 @@ buildGoModule rec { pname = "gotestsum"; - version = "0.5.2"; + version = "0.5.3"; src = fetchFromGitHub { owner = "gotestyourself"; repo = "gotestsum"; rev = "v${version}"; - sha256 = "08bb865gl1ykqr7wm7a1jikjdlc2dqv1f3hllnwwr630c8y4k806"; + sha256 = "1jq529m788yp3b6j4dhxgcw7qm1lyxx1ir2vwr41vp7gh17fmwar"; }; vendorSha256 = "1injixhllv41glb3yz276gjrkiwwkfimrhb367d2pvjpzqmhplan"; + doCheck = false; + buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; + subPackages = [ "." ]; + meta = with stdenv.lib; { homepage = "https://github.com/gotestyourself/gotestsum"; description = "A human friendly `go test` runner"; diff --git a/nixpkgs/pkgs/development/tools/gotools/default.nix b/nixpkgs/pkgs/development/tools/gotools/default.nix index 922bb369d2d..11926b3b0c6 100644 --- a/nixpkgs/pkgs/development/tools/gotools/default.nix +++ b/nixpkgs/pkgs/development/tools/gotools/default.nix @@ -11,18 +11,24 @@ buildGoModule rec { sha256 = "0a8c7j4w784w441j3j3bh640vy1g6g214641qv485wyi0xj49anf"; }; - # Build of golang.org/x/tools/gopls fails with: - # can't load package: package golang.org/x/tools/gopls: unknown import path "golang.org/x/tools/gopls": cannot find module providing package golang.org/x/tools/gopls - # That is most probably caused by golang.org/x/tools/gopls containing a separate Go module. - # In order to fix this, we simply remove the module. - # Note that build of golang.org/x/tools/cmd/gopls provides identical binary as golang.org/x/tools/gopls. - # See https://github.com/NixOS/nixpkgs/pull/64335. + # The gopls folder contains a Go submodule which causes a build failure. + # Given that, we can't have the gopls binary be part of the gotools + # derivation. + # + # The attribute "gopls" provides the gopls binary. + # + # Related + # + # * https://github.com/NixOS/nixpkgs/pull/85868 + # * https://github.com/NixOS/nixpkgs/issues/88716 postPatch = '' rm -rf gopls ''; vendorSha256 = "0pplmqxrnc8qnr5708igx4dm7rb0hicvhg6lh5hj8zkx38nb19s0"; + doCheck = false; + postConfigure = '' # Make the builtin tools available here mkdir -p $out/bin diff --git a/nixpkgs/pkgs/development/tools/gox/default.nix b/nixpkgs/pkgs/development/tools/gox/default.nix index 7c800df0a6b..34e7d338318 100644 --- a/nixpkgs/pkgs/development/tools/gox/default.nix +++ b/nixpkgs/pkgs/development/tools/gox/default.nix @@ -16,7 +16,6 @@ buildGoPackage rec { meta = with stdenv.lib; { homepage = "https://github.com/mitchellh/gox"; description = "A dead simple, no frills Go cross compile tool"; - platforms = platforms.all; license = licenses.mpl20; }; } diff --git a/nixpkgs/pkgs/development/tools/haskell/dconf2nix/dconf2nix.nix b/nixpkgs/pkgs/development/tools/haskell/dconf2nix/dconf2nix.nix new file mode 100644 index 00000000000..275aa7eb304 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/haskell/dconf2nix/dconf2nix.nix @@ -0,0 +1,21 @@ +{ mkDerivation, base, containers, fetchgit, optparse-applicative +, parsec, stdenv, text +}: +mkDerivation { + pname = "dconf2nix"; + version = "0.0.5"; + src = fetchgit { + url = "https://github.com/gvolpe/dconf2nix.git"; + sha256 = "0immbx4bgfq3xmbbrpw441nx0sdpm4cp64s7qbvcbvllp4gbivpg"; + rev = "848ff9966db21c66e61a19c04ab6dfc9270eb78e"; + fetchSubmodules = true; + }; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers optparse-applicative parsec text + ]; + executableHaskellDepends = [ base ]; + description = "Convert dconf files to Nix, as expected by Home Manager"; + license = stdenv.lib.licenses.asl20; +} diff --git a/nixpkgs/pkgs/development/tools/haskell/dconf2nix/default.nix b/nixpkgs/pkgs/development/tools/haskell/dconf2nix/default.nix new file mode 100644 index 00000000000..cfd391866ee --- /dev/null +++ b/nixpkgs/pkgs/development/tools/haskell/dconf2nix/default.nix @@ -0,0 +1,32 @@ +{ haskell, haskellPackages, lib, runCommand }: + +let + dconf2nix = + haskell.lib.justStaticExecutables + (haskell.lib.overrideCabal haskellPackages.dconf2nix (oldAttrs: { + maintainers = (oldAttrs.maintainers or []) ++ [ + lib.maintainers.gvolpe + ]; + })); +in + +dconf2nix.overrideAttrs (oldAttrs: { + passthru = (oldAttrs.passthru or {}) // { + updateScript = ./update.sh; + + # These tests can be run with the following command. + # + # $ nix-build -A dconf2nix.passthru.tests + tests = + runCommand + "dconf2nix-tests" + { + nativeBuildInputs = [ + dconf2nix + ]; + } + '' + dconf2nix > $out + ''; + }; +}) diff --git a/nixpkgs/pkgs/development/tools/haskell/dconf2nix/update.sh b/nixpkgs/pkgs/development/tools/haskell/dconf2nix/update.sh new file mode 100755 index 00000000000..8129824e256 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/haskell/dconf2nix/update.sh @@ -0,0 +1,26 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p cabal2nix curl jq +# +# This script will update the dconf2nix derivation to the latest version using +# cabal2nix. + +set -eo pipefail + +# This is the directory of this update.sh script. +script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" + +# dconf2nix derivation created with cabal2nix. +dconf2nix_derivation_file="${script_dir}/dconf2nix.nix" + +# This is the current revision of dconf2nix in Nixpkgs. +old_version="$(sed -En 's/.*\bversion = "(.*?)".*/\1/p' "$dconf2nix_derivation_file")" + +# This is the latest release version of dconf2nix on GitHub. +new_version=$(curl --silent "https://api.github.com/repos/gvolpe/dconf2nix/releases" | jq '.[0].tag_name' --raw-output) + +echo "Updating dconf2nix from old version $old_version to new version $new_version." +echo "Running cabal2nix and outputting to ${dconf2nix_derivation_file}..." + +cabal2nix --revision "$new_version" "https://github.com/gvolpe/dconf2nix.git" > "$dconf2nix_derivation_file" + +echo "Finished." diff --git a/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/default.nix b/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/default.nix index 15f944e7133..10cfa57f914 100644 --- a/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/default.nix +++ b/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/default.nix @@ -1,30 +1,31 @@ { mkDerivation, aeson, base, binary, blaze-markup, brittany , bytestring, containers, data-default, deepseq, Diff, directory -, extra, fetchgit, filepath, floskell, ghc, ghc-paths, ghcide -, gitrev, hashable, haskell-lsp, haskell-lsp-types, hie-bios -, hslogger, hspec, hspec-core, hspec-expectations, lens, lsp-test -, optparse-applicative, optparse-simple, ormolu, process -, regex-tdfa, safe-exceptions, shake, stdenv, stm, stylish-haskell -, tasty, tasty-ant-xml, tasty-expected-failure, tasty-golden -, tasty-hunit, tasty-rerun, temporary, text, time, transformers -, unix, unordered-containers, yaml +, extra, fetchgit, filepath, floskell, fourmolu, ghc, ghc-boot-th +, ghc-paths, ghcide, gitrev, hashable, haskell-lsp +, haskell-lsp-types, hie-bios, hslogger, hspec, hspec-core, lens +, lsp-test, optparse-applicative, optparse-simple, ormolu, process +, regex-tdfa, retrie, safe-exceptions, shake, stdenv, stm +, stylish-haskell, tasty, tasty-ant-xml, tasty-expected-failure +, tasty-golden, tasty-hunit, tasty-rerun, temporary, text, time +, transformers, unix, unordered-containers, yaml }: mkDerivation { pname = "haskell-language-server"; - version = "0.2.2.0"; + version = "0.4.0.0"; src = fetchgit { url = "https://github.com/haskell/haskell-language-server.git"; - sha256 = "0g9g2gyb0fidx16l741ky12djxh4cid9akvxa48105iq1gdihd8l"; - rev = "12c0e4423263140e3d16e76681927ec69fe4929f"; + sha256 = "1fh9k9b3880m6ql4i10yn2yanskk9xhrakrrddqvainhcf2ik8hl"; + rev = "c4576992f443a9abe48ffcfa0e2d2b9bce15d7ae"; fetchSubmodules = true; }; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base binary brittany bytestring containers data-default - deepseq Diff directory extra filepath floskell ghc ghcide gitrev - hashable haskell-lsp hie-bios hslogger lens optparse-simple ormolu - process regex-tdfa shake stylish-haskell temporary text time + deepseq Diff directory extra filepath floskell fourmolu ghc + ghc-boot-th ghcide gitrev hashable haskell-lsp hie-bios hslogger + lens optparse-simple ormolu process regex-tdfa retrie + safe-exceptions shake stylish-haskell temporary text time transformers unix unordered-containers ]; executableHaskellDepends = [ @@ -36,9 +37,9 @@ mkDerivation { testHaskellDepends = [ aeson base blaze-markup bytestring containers data-default directory filepath haskell-lsp haskell-lsp-types hie-bios hslogger - hspec hspec-core hspec-expectations lens lsp-test process stm tasty - tasty-ant-xml tasty-expected-failure tasty-golden tasty-hunit - tasty-rerun temporary text transformers unordered-containers yaml + hspec hspec-core lens lsp-test process stm tasty tasty-ant-xml + tasty-expected-failure tasty-golden tasty-hunit tasty-rerun + temporary text transformers unordered-containers yaml ]; testToolDepends = [ ghcide ]; homepage = "https://github.com/haskell/haskell-language-server#readme"; diff --git a/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-brittany.nix b/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-brittany.nix new file mode 100644 index 00000000000..0519cf42dd8 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-brittany.nix @@ -0,0 +1,36 @@ +{ mkDerivation, aeson, base, butcher, bytestring, cmdargs +, containers, czipwith, data-tree-print, deepseq, directory, extra +, fetchgit, filepath, ghc, ghc-boot-th, ghc-exactprint, ghc-paths +, hspec, monad-memo, mtl, multistate, parsec, pretty, random, safe +, semigroups, stdenv, strict, syb, text, transformers, uniplate +, unsafe, yaml +}: +mkDerivation { + pname = "brittany"; + version = "0.12.1.1"; + src = fetchgit { + url = "https://github.com/bubba/brittany"; + sha256 = "1rkk09f8750qykrmkqfqbh44dbx1p8aq1caznxxlw8zqfvx39cxl"; + rev = "c59655f10d5ad295c2481537fc8abf0a297d9d1c"; + fetchSubmodules = true; + }; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base butcher bytestring cmdargs containers czipwith + data-tree-print deepseq directory extra filepath ghc ghc-boot-th + ghc-exactprint ghc-paths monad-memo mtl multistate pretty random + safe semigroups strict syb text transformers uniplate unsafe yaml + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + aeson base butcher bytestring cmdargs containers czipwith + data-tree-print deepseq directory extra filepath ghc ghc-boot-th + ghc-exactprint ghc-paths hspec monad-memo mtl multistate parsec + pretty safe semigroups strict syb text transformers uniplate unsafe + yaml + ]; + homepage = "https://github.com/lspitzner/brittany/"; + description = "Haskell source code formatter"; + license = stdenv.lib.licenses.agpl3; +} diff --git a/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-ghcide.nix b/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-ghcide.nix index cafe01946a6..af38312a361 100644 --- a/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-ghcide.nix +++ b/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-ghcide.nix @@ -5,21 +5,20 @@ , ghc-boot-th, ghc-check, ghc-paths, ghc-typelits-knownnat, gitrev , haddock-library, hashable, haskell-lsp, haskell-lsp-types , hie-bios, hslogger, lens, lsp-test, mtl, network-uri -, opentelemetry, optparse-applicative, prettyprinter -, prettyprinter-ansi-terminal, process, QuickCheck -, quickcheck-instances, regex-tdfa, rope-utf16-splay -, safe-exceptions, shake, sorted-list, stdenv, stm, syb, tasty -, tasty-expected-failure, tasty-hunit, tasty-quickcheck -, tasty-rerun, text, time, transformers, unix, unordered-containers -, utf8-string, yaml +, optparse-applicative, prettyprinter, prettyprinter-ansi-terminal +, process, QuickCheck, quickcheck-instances, regex-tdfa +, rope-utf16-splay, safe, safe-exceptions, shake, sorted-list +, stdenv, stm, syb, tasty, tasty-expected-failure, tasty-hunit +, tasty-quickcheck, tasty-rerun, text, time, transformers, unix +, unordered-containers, utf8-string, yaml }: mkDerivation { pname = "ghcide"; - version = "0.2.0"; + version = "0.3.0"; src = fetchgit { - url = "https://github.com/bubba/ghcide"; - sha256 = "1kj2i86mkaxgxlrbmv2d24mch7hywgcy2n61z8paj21chncs1j5w"; - rev = "7e895cfa53260b41996df707baec496a8f2c75dc"; + url = "https://github.com/haskell/ghcide"; + sha256 = "15v3g3i5v0xbq50lfvl4bv3rx01nixiqx02sddqi5lj2idgmg24g"; + rev = "96cf8c53d0bdc16d3d2cd0559b74962593ce6dc5"; fetchSubmodules = true; }; isLibrary = true; @@ -29,30 +28,30 @@ mkDerivation { containers cryptohash-sha1 data-default deepseq directory extra filepath fuzzy ghc ghc-boot ghc-boot-th ghc-check ghc-paths haddock-library hashable haskell-lsp haskell-lsp-types hie-bios - hslogger mtl network-uri opentelemetry prettyprinter - prettyprinter-ansi-terminal regex-tdfa rope-utf16-splay - safe-exceptions shake sorted-list stm syb text time transformers - unix unordered-containers utf8-string + hslogger mtl network-uri prettyprinter prettyprinter-ansi-terminal + regex-tdfa rope-utf16-splay safe safe-exceptions shake sorted-list + stm syb text time transformers unix unordered-containers + utf8-string ]; executableHaskellDepends = [ aeson base bytestring containers data-default directory extra filepath gitrev hashable haskell-lsp haskell-lsp-types hie-bios - lsp-test optparse-applicative process safe-exceptions text + lens lsp-test optparse-applicative process safe-exceptions text unordered-containers ]; testHaskellDepends = [ - aeson base bytestring containers directory extra filepath ghc - ghc-typelits-knownnat haddock-library haskell-lsp haskell-lsp-types - lens lsp-test network-uri optparse-applicative process QuickCheck - quickcheck-instances rope-utf16-splay safe-exceptions shake tasty - tasty-expected-failure tasty-hunit tasty-quickcheck tasty-rerun - text + aeson base binary bytestring containers directory extra filepath + ghc ghc-typelits-knownnat haddock-library haskell-lsp + haskell-lsp-types lens lsp-test network-uri optparse-applicative + process QuickCheck quickcheck-instances rope-utf16-splay safe + safe-exceptions shake tasty tasty-expected-failure tasty-hunit + tasty-quickcheck tasty-rerun text ]; benchmarkHaskellDepends = [ aeson base Chart Chart-diagrams diagrams diagrams-svg directory extra filepath shake text yaml ]; - homepage = "https://github.com/digital-asset/ghcide#readme"; + homepage = "https://github.com/haskell/ghcide#readme"; description = "The core of an IDE"; license = stdenv.lib.licenses.asl20; } diff --git a/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/update.sh b/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/update.sh index 6cf29968338..fd22a80126d 100755 --- a/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/update.sh +++ b/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/update.sh @@ -7,6 +7,8 @@ # Note that you should always try building haskell-language-server after updating it here, since # some of the overrides in pkgs/development/haskell/configuration-nix.nix may # need to be updated/changed. +# +# Remember to split out different updates into multiple commits set -eo pipefail @@ -26,11 +28,27 @@ ghcide_old_version="$(sed -En 's/.*\bversion = "(.*?)".*/\1/p' "$ghcide_derivati # This is the revision of ghcide used by hls on GitHub. ghcide_new_version=$(curl --silent "https://api.github.com/repos/haskell/haskell-language-server/contents/ghcide" | jq '.sha' --raw-output) -echo "Updating haskell-language-server from old version $ghcide_old_version to new version $ghcide_new_version." +echo "Updating haskell-language-server's ghcide from old version $ghcide_old_version to new version $ghcide_new_version." echo "Running cabal2nix and outputting to ${ghcide_derivation_file}..." -cabal2nix --revision "$ghcide_new_version" "https://github.com/bubba/ghcide" > "$ghcide_derivation_file" +cabal2nix --revision "$ghcide_new_version" "https://github.com/haskell/ghcide" > "$ghcide_derivation_file" + +# =========================== +# HLS maintainer's Brittany fork +# =========================== + +# brittany derivation created with cabal2nix. +brittany_derivation_file="${script_dir}/hls-brittany.nix" + +# This is the current revision of the brittany fork in Nixpkgs. +brittany_old_version="$(sed -En 's/.*\bversion = "(.*?)".*/\1/p' "$brittany_derivation_file")" + +brittany_new_version=$(curl --silent "https://api.github.com/repos/bubba/brittany/commits/ghc-8.10.1" | jq '.sha' --raw-output) + +echo "Updating haskell-language-server's brittany from old version $brittany_old_version to new version $brittany_new_version." +echo "Running cabal2nix and outputting to ${brittany_derivation_file}..." +cabal2nix --revision "$brittany_new_version" "https://github.com/bubba/brittany" > "$brittany_derivation_file" # =========================== # HLS diff --git a/nixpkgs/pkgs/development/tools/hcloud/default.nix b/nixpkgs/pkgs/development/tools/hcloud/default.nix index 48be7c568d7..704477421ce 100644 --- a/nixpkgs/pkgs/development/tools/hcloud/default.nix +++ b/nixpkgs/pkgs/development/tools/hcloud/default.nix @@ -2,20 +2,20 @@ buildGoModule rec { pname = "hcloud"; - version = "1.17.0"; - - goPackagePath = "github.com/hetznercloud/cli"; + version = "1.19.1"; src = fetchFromGitHub { owner = "hetznercloud"; repo = "cli"; rev = "v${version}"; - sha256 = "1brqqcyyljkdd24ljx2qbr648ihhhmr8mq6gs90n63r59ci6ksch"; + sha256 = "0iq04jfqvmwlm6947kzz4c3a33lvwxvj42z179rc3126b5v7bq54"; }; nativeBuildInputs = [ installShellFiles ]; - vendorSha256 = "1m96j9cwqz2b67byf53qhgl3s0vfwaklj2pm8364qih0ilvifppj"; + vendorSha256 = "1svwrb5wyz5d8fgx36bpypnfq4hmpfxyd197cla9wnqpbkia7n5r"; + + doCheck = false; buildFlagsArray = [ "-ldflags=-s -w -X github.com/hetznercloud/cli/cli.Version=${version}" ]; @@ -30,7 +30,6 @@ buildGoModule rec { description = "A command-line interface for Hetzner Cloud, a provider for cloud virtual private servers"; homepage = "https://github.com/hetznercloud/cli"; license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.all; maintainers = [ stdenv.lib.maintainers.zauberpony ]; }; } diff --git a/nixpkgs/pkgs/development/tools/icestorm/default.nix b/nixpkgs/pkgs/development/tools/icestorm/default.nix index 091a4638433..15ca059a880 100644 --- a/nixpkgs/pkgs/development/tools/icestorm/default.nix +++ b/nixpkgs/pkgs/development/tools/icestorm/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { pname = "icestorm"; - version = "2020.07.08"; + version = "2020.08.19"; passthru = rec { pythonPkg = if usePyPy then pypy3 else python3; @@ -19,10 +19,10 @@ stdenv.mkDerivation rec { }; src = fetchFromGitHub { - owner = "cliffordwolf"; + owner = "YosysHQ"; repo = "icestorm"; - rev = "d12308775684cf43ab923227235b4ad43060015e"; - sha256 = "18ykv6np8sp7rb7c1cm3ha3qnj280gpkyn476faahb15jh0nbjmw"; + rev = "da52117ccd5b4147f64dc7345357ec5439cd7543"; + sha256 = "072bl3vmvb06ry0ci3b1sfjpm3iigb874khzja4azcai969ybp4k"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/nixpkgs/pkgs/development/tools/java/visualvm/default.nix b/nixpkgs/pkgs/development/tools/java/visualvm/default.nix index ab90cbea83d..6cf97277bb5 100644 --- a/nixpkgs/pkgs/development/tools/java/visualvm/default.nix +++ b/nixpkgs/pkgs/development/tools/java/visualvm/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchzip, lib, makeWrapper, makeDesktopItem, jdk, gawk }: stdenv.mkDerivation rec { - version = "2.0.3"; + version = "2.0.4"; pname = "visualvm"; src = fetchzip { url = "https://github.com/visualvm/visualvm.src/releases/download/${version}/visualvm_${builtins.replaceStrings ["."] [""] version}.zip"; - sha256 = "1pwgsasja30xbm1ma0kp4nami2nwyy6aizam8nfl6jd7jkz4d7mk"; + sha256 = "1ic6gjsw90j7pr1yyplmk1zc319ld49i6d4zlgs7mlz1m4bn5jv3"; }; desktopItem = makeDesktopItem { diff --git a/nixpkgs/pkgs/development/tools/jid/default.nix b/nixpkgs/pkgs/development/tools/jid/default.nix index e031159d37c..e6eef68ec6c 100644 --- a/nixpkgs/pkgs/development/tools/jid/default.nix +++ b/nixpkgs/pkgs/development/tools/jid/default.nix @@ -19,7 +19,6 @@ buildGoPackage rec { description = "A command-line tool to incrementally drill down JSON"; homepage = "https://github.com/simeji/jid"; license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.all; maintainers = with stdenv.lib.maintainers; [ stesie ]; }; } diff --git a/nixpkgs/pkgs/development/tools/just/default.nix b/nixpkgs/pkgs/development/tools/just/default.nix index ce621f147d1..ebf44d9d699 100644 --- a/nixpkgs/pkgs/development/tools/just/default.nix +++ b/nixpkgs/pkgs/development/tools/just/default.nix @@ -47,6 +47,5 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/casey/just"; license = licenses.cc0; maintainers = with maintainers; [ xrelkd ]; - platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/development/tools/kcli/default.nix b/nixpkgs/pkgs/development/tools/kcli/default.nix index 61b4fa4888a..3a0fff71dc7 100644 --- a/nixpkgs/pkgs/development/tools/kcli/default.nix +++ b/nixpkgs/pkgs/development/tools/kcli/default.nix @@ -13,6 +13,8 @@ buildGoModule rec { vendorSha256 = "0whqrms5mc7v14p2h1jfvkawm30xaylivijlsghrsaq468qcgg15"; + doCheck = false; + subPackages = [ "." ]; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/development/tools/kexpand/default.nix b/nixpkgs/pkgs/development/tools/kexpand/default.nix index e6c562721c2..8e45eb2654b 100644 --- a/nixpkgs/pkgs/development/tools/kexpand/default.nix +++ b/nixpkgs/pkgs/development/tools/kexpand/default.nix @@ -13,6 +13,4 @@ buildGoPackage { rev = "c508a43a4e84410dfd30827603e902148c5c1f3c"; sha256 = "0946h74lsqnr1106j7i2w2a5jg2bbk831d7prlws4bb2kigfm38p"; }; - - goDeps = ./deps.nix; } diff --git a/nixpkgs/pkgs/development/tools/kexpand/deps.nix b/nixpkgs/pkgs/development/tools/kexpand/deps.nix deleted file mode 100644 index c049d9683cc..00000000000 --- a/nixpkgs/pkgs/development/tools/kexpand/deps.nix +++ /dev/null @@ -1,63 +0,0 @@ -# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) -[ - - { - goPackagePath = "github.com/ghodss/yaml"; - fetch = { - type = "git"; - url = "https://github.com/ghodss/yaml"; - rev = "v1.0.0"; - sha256 = "0skwmimpy7hlh7pva2slpcplnm912rp3igs98xnqmn859kwa5v8g"; - }; - } - - { - goPackagePath = "github.com/golang/glog"; - fetch = { - type = "git"; - url = "https://github.com/golang/glog"; - rev = "23def4e6c14b"; - sha256 = "0jb2834rw5sykfr937fxi8hxi2zy80sj2bdn9b3jb4b26ksqng30"; - }; - } - - { - goPackagePath = "github.com/spf13/cobra"; - fetch = { - type = "git"; - url = "https://github.com/spf13/cobra"; - rev = "v0.0.3"; - sha256 = "1q1nsx05svyv9fv3fy6xv6gs9ffimkyzsfm49flvl3wnvf1ncrkd"; - }; - } - - { - goPackagePath = "github.com/spf13/pflag"; - fetch = { - type = "git"; - url = "https://github.com/spf13/pflag"; - rev = "v1.0.3"; - sha256 = "1cj3cjm7d3zk0mf1xdybh0jywkbbw7a6yr3y22x9sis31scprswd"; - }; - } - - { - goPackagePath = "gopkg.in/check.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/check.v1"; - rev = "20d25e280405"; - sha256 = "0k1m83ji9l1a7ng8a7v40psbymxasmssbrrhpdv2wl4rhs0nc3np"; - }; - } - - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/yaml.v2"; - rev = "v2.2.1"; - sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1"; - }; - } -] diff --git a/nixpkgs/pkgs/development/tools/kind/default.nix b/nixpkgs/pkgs/development/tools/kind/default.nix index f58303cae6f..6ea2c87f888 100644 --- a/nixpkgs/pkgs/development/tools/kind/default.nix +++ b/nixpkgs/pkgs/development/tools/kind/default.nix @@ -14,7 +14,9 @@ buildGoModule rec { }; vendorSha256 = "1qvbm8v8yah6r6cw1cvdw79yiwxb2amzdkkzvzbwigy0j4bvn9mi"; - goPackagePath = "sigs.k8s.io/kind"; + + doCheck = false; + subPackages = [ "." ]; nativeBuildInputs = [ installShellFiles ]; diff --git a/nixpkgs/pkgs/development/tools/knightos/kcc/default.nix b/nixpkgs/pkgs/development/tools/knightos/kcc/default.nix new file mode 100644 index 00000000000..49851dd0c07 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/knightos/kcc/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitHub, cmake, bison, flex, boost }: + +stdenv.mkDerivation rec { + pname = "kcc"; + + version = "4.0.0"; + + src = fetchFromGitHub { + owner = "KnightOS"; + repo = "kcc"; + rev = version; + sha256 = "1cd226nqbxq32mppkljavq1kb74jqfqns9r7fskszr42hbygynk4"; + }; + + nativeBuildInputs = [ cmake bison flex ]; + + buildInputs = [ boost ]; + + meta = with stdenv.lib; { + homepage = "https://knightos.org/"; + description = "KnightOS C compiler"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ siraben ]; + }; +} diff --git a/nixpkgs/pkgs/development/tools/knightos/kimg/default.nix b/nixpkgs/pkgs/development/tools/knightos/kimg/default.nix new file mode 100644 index 00000000000..b6f490e1d9d --- /dev/null +++ b/nixpkgs/pkgs/development/tools/knightos/kimg/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub, cmake, asciidoc, pkg-config, imagemagick }: + +stdenv.mkDerivation rec { + pname = "kimg"; + version = "0.3.0"; + + src = fetchFromGitHub { + owner = "KnightOS"; + repo = "kimg"; + rev = version; + sha256 = "00gj420m0jvhgm8kkslw8r69nl7r73bxrh6gqs2mx16ymcpkanpk"; + }; + + nativeBuildInputs = [ cmake asciidoc pkg-config ]; + + buildInputs = [ imagemagick ]; + + hardeningDisable = [ "format" ]; + + meta = with stdenv.lib; { + homepage = "https://knightos.org/"; + description = "Converts image formats supported by ImageMagick to the KnightOS image format"; + license = licenses.mit; + maintainers = with maintainers; [ siraben ]; + }; +} diff --git a/nixpkgs/pkgs/development/tools/knightos/kpack/default.nix b/nixpkgs/pkgs/development/tools/knightos/kpack/default.nix new file mode 100644 index 00000000000..96af43e6160 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/knightos/kpack/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub, cmake, asciidoc, libxslt, docbook_xsl }: + +stdenv.mkDerivation rec { + pname = "kpack"; + + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "KnightOS"; + repo = "kpack"; + rev = version; + sha256 = "0kakfbzdvq5ldv1gdzl473j73c9nfdyx4xzfkriglkrqmksqc329"; + }; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ asciidoc libxslt.bin docbook_xsl ]; + + hardeningDisable = [ "fortify" ]; + + meta = with stdenv.lib; { + homepage = "https://knightos.org/"; + description = "A tool to create or extract KnightOS packages"; + license = licenses.lgpl2Only; + maintainers = with maintainers; [ siraben ]; + }; +} diff --git a/nixpkgs/pkgs/development/tools/knightos/mkrom/default.nix b/nixpkgs/pkgs/development/tools/knightos/mkrom/default.nix new file mode 100644 index 00000000000..380bdc58d49 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/knightos/mkrom/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub, cmake, asciidoc }: + +stdenv.mkDerivation rec { + pname = "mkrom"; + version = "1.0.2"; + + src = fetchFromGitHub { + owner = "KnightOS"; + repo = "mkrom"; + rev = version; + sha256 = "1nx3787gvs04xdvvamzkjkn9nmy2w70ja8dnh4szk420mvpc85na"; + }; + + nativeBuildInputs = [ + asciidoc + cmake + ]; + + hardeningDisable = [ "format" ]; + + meta = with stdenv.lib; { + homepage = "https://knightos.org/"; + description = "Packages KnightOS distribution files into a ROM"; + license = licenses.mit; + maintainers = with maintainers; [ siraben ]; + }; +} diff --git a/nixpkgs/pkgs/development/tools/knightos/scas/default.nix b/nixpkgs/pkgs/development/tools/knightos/scas/default.nix new file mode 100644 index 00000000000..ad21e68eed8 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/knightos/scas/default.nix @@ -0,0 +1,26 @@ +{ fetchFromGitHub, stdenv, cmake }: + + +stdenv.mkDerivation rec { + pname = "scas"; + + version = "0.4.6"; + + src = fetchFromGitHub { + owner = "KnightOS"; + repo = "scas"; + rev = version; + sha256 = "1c6s9nivbwgv0f8n7j73h54ydgqw5dcpq8l752dfrnqg3kv3nn0h"; + }; + + nativeBuildInputs = [ cmake ]; + + hardeningDisable = [ "format" ]; + + meta = with stdenv.lib; { + homepage = "https://knightos.org/"; + description = "Assembler and linker for the Z80."; + license = licenses.mit; + maintainers = with maintainers; [ siraben ]; + }; +} diff --git a/nixpkgs/pkgs/development/tools/kubectx/default.nix b/nixpkgs/pkgs/development/tools/kubectx/default.nix index c11c7fcbc97..59a7c8300e2 100644 --- a/nixpkgs/pkgs/development/tools/kubectx/default.nix +++ b/nixpkgs/pkgs/development/tools/kubectx/default.nix @@ -13,6 +13,8 @@ buildGoModule rec { vendorSha256 = "168hfdc2rfwpz2ls607bz5vsm1aw4brhwm8hmbiq1n1l2dn2dj0y"; + doCheck = false; + nativeBuildInputs = [ installShellFiles ]; postInstall = '' diff --git a/nixpkgs/pkgs/development/tools/kubeprompt/default.nix b/nixpkgs/pkgs/development/tools/kubeprompt/default.nix index b0fb0261404..51369bc1f91 100644 --- a/nixpkgs/pkgs/development/tools/kubeprompt/default.nix +++ b/nixpkgs/pkgs/development/tools/kubeprompt/default.nix @@ -15,17 +15,17 @@ buildGoModule rec { export buildFlagsArray+=( "-ldflags= -w -s - -X ${goPackagePath}/pkg/version.Version=${version}") + -X github.com/jlesquembre/kubeprompt/pkg/version.Version=${version}") ''; - goPackagePath = "github.com/jlesquembre/kubeprompt"; vendorSha256 = "089lfkvyf00f05kkmr935jbrddf2c0v7m2356whqnz7ad6a2whsi"; + doCheck = false; + meta = with stdenv.lib; { description = "Kubernetes prompt"; homepage = "https://github.com/jlesquembre/kubeprompt"; license = licenses.epl20; maintainers = with maintainers; [ jlesquembre ]; - platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/development/tools/kustomize/default.nix b/nixpkgs/pkgs/development/tools/kustomize/default.nix index c7a1ba35fec..63a3c774668 100644 --- a/nixpkgs/pkgs/development/tools/kustomize/default.nix +++ b/nixpkgs/pkgs/development/tools/kustomize/default.nix @@ -2,8 +2,8 @@ buildGoModule rec { pname = "kustomize"; - version = "3.8.0"; - # rev is the 3.8.0 commit, mainly for kustomize version command output + version = "3.8.1"; + # rev is the 3.8.1 commit, mainly for kustomize version command output rev = "6a50372dd5686df22750b0c729adaf369fbf193c"; buildFlagsArray = let t = "sigs.k8s.io/kustomize/api/provenance"; in @@ -17,14 +17,13 @@ buildGoModule rec { owner = "kubernetes-sigs"; repo = pname; rev = "kustomize/v${version}"; - sha256 = "1v86gqn16xh28gi2fa6jgbbk0clrcng3sbr1az42iy4mm4nmsriy"; + sha256 = "07zdp6xv8viwnaz1qacwhg82dlzcrgb8dls6yz9qk4qcnsk6badx"; }; # avoid finding test and development commands sourceRoot = "source/kustomize"; - deleteVendor = true; - vendorSha256 = "03z40gi9nrj120cd57pa3fmi8grldyxa65a1lkvlc2r3z9g29vdw"; + vendorSha256 = "01ff3w4hwp4ynqhg8cplv0i2ixs811d2x2j6xbh1lslyyh3z3wc5"; meta = with lib; { description = "Customization of kubernetes YAML configurations"; diff --git a/nixpkgs/pkgs/development/tools/lattice-diamond/default.nix b/nixpkgs/pkgs/development/tools/lattice-diamond/default.nix index 1dea1440113..6720603b2e5 100644 --- a/nixpkgs/pkgs/development/tools/lattice-diamond/default.nix +++ b/nixpkgs/pkgs/development/tools/lattice-diamond/default.nix @@ -1,5 +1,5 @@ { stdenv, rpmextract, patchelf, makeWrapper, file, requireFile, glib, zlib, - freetype, fontconfig, xorg }: + freetype, fontconfig, xorg, libusb-compat-0_1 }: stdenv.mkDerivation { name = "diamond-3.10"; @@ -98,6 +98,7 @@ stdenv.mkDerivation { libPath = stdenv.lib.makeLibraryPath [ glib zlib freetype fontconfig xorg.libSM xorg.libICE xorg.libXrender xorg.libXext xorg.libX11 xorg.libXt + libusb-compat-0_1 ]; meta = { diff --git a/nixpkgs/pkgs/development/tools/lazygit/default.nix b/nixpkgs/pkgs/development/tools/lazygit/default.nix index 7425357536c..a0bdfdb083d 100644 --- a/nixpkgs/pkgs/development/tools/lazygit/default.nix +++ b/nixpkgs/pkgs/development/tools/lazygit/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "lazygit"; - version = "0.20.9"; + version = "0.22.1"; goPackagePath = "github.com/jesseduffield/lazygit"; @@ -12,7 +12,7 @@ buildGoPackage rec { owner = "jesseduffield"; repo = pname; rev = "v${version}"; - sha256 = "1jmg2z8yza8cy6xcyam4pvk0sp6zvw6b8vbn3b3h0pklfa7wz9pg"; + sha256 = "1jq093nsfh7xqvsjvaad9wvqd3rjrpyp5fl8qxwbhaj3sxx19v7g"; }; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/development/tools/leaps/deps.nix b/nixpkgs/pkgs/development/tools/leaps/deps.nix index afaf42779b3..ee06659c72e 100644 --- a/nixpkgs/pkgs/development/tools/leaps/deps.nix +++ b/nixpkgs/pkgs/development/tools/leaps/deps.nix @@ -1,185 +1,165 @@ - - # file automatically generated from Gopkg.lock with https://github.com/nixcloud/dep2nix (golang dep) - [ - - { - goPackagePath = "github.com/Azure/go-autorest"; - fetch = { - type = "git"; - url = "https://github.com/Azure/go-autorest"; - rev = "fc3b03a2d2d1f43fad3007038bd16f044f870722"; - sha256 = "1j6aqbizlpiqcywdsj4dy4i76g8fbqc7d61c22ppc9knw0968h4r"; - }; - } - - { - goPackagePath = "github.com/Jeffail/gabs"; - fetch = { - type = "git"; - url = "https://github.com/Jeffail/gabs"; - rev = "2a3aa15961d5fee6047b8151b67ac2f08ba2c48c"; - sha256 = "1fx6fyl5x037viwlj319f3gsq749an17q5l6n2zvf3ny5wq0iqxr"; - }; - } - - { - goPackagePath = "github.com/amir/raidman"; - fetch = { - type = "git"; - url = "https://github.com/amir/raidman"; - rev = "1ccc43bfb9c93cb401a4025e49c64ba71e5e668b"; - sha256 = "074ckbyslrwn23q4x01hn3j7c3xngagn36lbli2g51n9j3x14jxr"; - }; - } - - { - goPackagePath = "github.com/azure/azure-sdk-for-go"; - fetch = { - type = "git"; - url = "https://github.com/azure/azure-sdk-for-go"; - rev = "21b68149ccf7c16b3f028bb4c7fd0ab458fe308f"; - sha256 = "0zlhrh3n9mc5w7r0sdaqmpqfm2d290b50an0k1bvrr892m4cnxaq"; - }; - } - - { - goPackagePath = "github.com/cenkalti/backoff"; - fetch = { - type = "git"; - url = "https://github.com/cenkalti/backoff"; - rev = "61153c768f31ee5f130071d08fc82b85208528de"; - sha256 = "08x77mgb9zsj047n74rx6c16jjx985lmy4s6fl58mdgxgxjv54y5"; - }; - } - - { - goPackagePath = "github.com/dgrijalva/jwt-go"; - fetch = { - type = "git"; - url = "https://github.com/dgrijalva/jwt-go"; - rev = "dbeaa9332f19a944acb5736b4456cfcc02140e29"; - sha256 = "0zk6l6kzsjdijfn7c4h0aywdjx5j2hjwi67vy1k6wr46hc8ks2hs"; - }; - } - - { - goPackagePath = "github.com/elazarl/go-bindata-assetfs"; - fetch = { - type = "git"; - url = "https://github.com/elazarl/go-bindata-assetfs"; - rev = "30f82fa23fd844bd5bb1e5f216db87fd77b5eb43"; - sha256 = "1swfb37g6sga3awvcmxf49ngbpvjv7ih5an9f8ixjqcfcwnb7nzp"; - }; - } - - { - goPackagePath = "github.com/garyburd/redigo"; - fetch = { - type = "git"; - url = "https://github.com/garyburd/redigo"; - rev = "d1ed5c67e5794de818ea85e6b522fda02623a484"; - sha256 = "0gw18k9kg93hvdks93hckrdqppg1bav82sp2c98q6z36dkvaih24"; - }; - } - - { - goPackagePath = "github.com/go-sql-driver/mysql"; - fetch = { - type = "git"; - url = "https://github.com/go-sql-driver/mysql"; - rev = "a0583e0143b1624142adab07e0e97fe106d99561"; - sha256 = "1rw1m91dpm23s6nn6jc4zi6rq2mgl7zx07gyadrdn0sh7cj8c89d"; - }; - } - - { - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "925541529c1fa6821df4e44ce2723319eb2be768"; - sha256 = "1d3zjvhl115l23xakj0014qpjchivlg098h10v5nfirkk1i9f9sa"; - }; - } - - { - goPackagePath = "github.com/gorilla/websocket"; - fetch = { - type = "git"; - url = "https://github.com/gorilla/websocket"; - rev = "ea4d1f681babbce9545c9c5f3d5194a789c89f5b"; - sha256 = "1bhgs2542qs49p1dafybqxfs2qc072xv41w5nswyrknwyjxxs2a1"; - }; - } - - { - goPackagePath = "github.com/kardianos/osext"; - fetch = { - type = "git"; - url = "https://github.com/kardianos/osext"; - rev = "ae77be60afb1dcacde03767a8c37337fad28ac14"; - sha256 = "056dkgxrqjj5r18bnc3knlpgdz5p3yvp12y4y978hnsfhwaqvbjz"; - }; - } - - { - goPackagePath = "github.com/lib/pq"; - fetch = { - type = "git"; - url = "https://github.com/lib/pq"; - rev = "88edab0803230a3898347e77b474f8c1820a1f20"; - sha256 = "02y7c8xy33x5q4167x2drzrys41nfi7wxxp9hy4vpazfws88al9p"; - }; - } - - { - goPackagePath = "github.com/marstr/guid"; - fetch = { - type = "git"; - url = "https://github.com/marstr/guid"; - rev = "8bdf7d1a087ccc975cf37dd6507da50698fd19ca"; - sha256 = "1mxcigzfc1bbh5b616hm89bp06allhwcsas9v9lks235h0acgn4x"; - }; - } - - { - goPackagePath = "github.com/satori/go.uuid"; - fetch = { - type = "git"; - url = "https://github.com/satori/go.uuid"; - rev = "f58768cc1a7a7e77a3bd49e98cdd21419399b6a3"; - sha256 = "1j4s5pfg2ldm35y8ls8jah4dya2grfnx2drb4jcbjsyrp4cm5yfb"; - }; - } - - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "cbe0f9307d0156177f9dd5dc85da1a31abc5f2fb"; - sha256 = "1hmpqkxh97ayyy0xcdvf1bwirwja4wyin3sh0fzjlh93aqmqgylf"; - }; - } - - { - goPackagePath = "gopkg.in/alexcesaro/statsd.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/alexcesaro/statsd.v2"; - rev = "7fea3f0d2fab1ad973e641e51dba45443a311a90"; - sha256 = "02jdx68vicwsgabrnwgg1rvc45rinyh8ikinqgbqc56c5hkx3brj"; - }; - } - - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/yaml.v2"; - rev = "d670f9405373e636a5a2765eea47fac0c9bc91a4"; - sha256 = "1w1xid51n8v1mydn2m3vgggw8qgpd5a5sr62snsc77d99fpjsrs0"; - }; - } - -]
\ No newline at end of file +# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix) +[ + { + goPackagePath = "github.com/Azure/go-autorest"; + fetch = { + type = "git"; + url = "https://github.com/Azure/go-autorest"; + rev = "fc3b03a2d2d1f43fad3007038bd16f044f870722"; + sha256 = "1j6aqbizlpiqcywdsj4dy4i76g8fbqc7d61c22ppc9knw0968h4r"; + }; + } + { + goPackagePath = "github.com/Jeffail/gabs"; + fetch = { + type = "git"; + url = "https://github.com/Jeffail/gabs"; + rev = "2a3aa15961d5fee6047b8151b67ac2f08ba2c48c"; + sha256 = "1fx6fyl5x037viwlj319f3gsq749an17q5l6n2zvf3ny5wq0iqxr"; + }; + } + { + goPackagePath = "github.com/amir/raidman"; + fetch = { + type = "git"; + url = "https://github.com/amir/raidman"; + rev = "1ccc43bfb9c93cb401a4025e49c64ba71e5e668b"; + sha256 = "074ckbyslrwn23q4x01hn3j7c3xngagn36lbli2g51n9j3x14jxr"; + }; + } + { + goPackagePath = "github.com/azure/azure-sdk-for-go"; + fetch = { + type = "git"; + url = "https://github.com/azure/azure-sdk-for-go"; + rev = "21b68149ccf7c16b3f028bb4c7fd0ab458fe308f"; + sha256 = "0zlhrh3n9mc5w7r0sdaqmpqfm2d290b50an0k1bvrr892m4cnxaq"; + }; + } + { + goPackagePath = "github.com/cenkalti/backoff"; + fetch = { + type = "git"; + url = "https://github.com/cenkalti/backoff"; + rev = "61153c768f31ee5f130071d08fc82b85208528de"; + sha256 = "08x77mgb9zsj047n74rx6c16jjx985lmy4s6fl58mdgxgxjv54y5"; + }; + } + { + goPackagePath = "github.com/dgrijalva/jwt-go"; + fetch = { + type = "git"; + url = "https://github.com/dgrijalva/jwt-go"; + rev = "dbeaa9332f19a944acb5736b4456cfcc02140e29"; + sha256 = "0zk6l6kzsjdijfn7c4h0aywdjx5j2hjwi67vy1k6wr46hc8ks2hs"; + }; + } + { + goPackagePath = "github.com/elazarl/go-bindata-assetfs"; + fetch = { + type = "git"; + url = "https://github.com/elazarl/go-bindata-assetfs"; + rev = "30f82fa23fd844bd5bb1e5f216db87fd77b5eb43"; + sha256 = "1swfb37g6sga3awvcmxf49ngbpvjv7ih5an9f8ixjqcfcwnb7nzp"; + }; + } + { + goPackagePath = "github.com/garyburd/redigo"; + fetch = { + type = "git"; + url = "https://github.com/garyburd/redigo"; + rev = "d1ed5c67e5794de818ea85e6b522fda02623a484"; + sha256 = "0gw18k9kg93hvdks93hckrdqppg1bav82sp2c98q6z36dkvaih24"; + }; + } + { + goPackagePath = "github.com/go-sql-driver/mysql"; + fetch = { + type = "git"; + url = "https://github.com/go-sql-driver/mysql"; + rev = "a0583e0143b1624142adab07e0e97fe106d99561"; + sha256 = "1rw1m91dpm23s6nn6jc4zi6rq2mgl7zx07gyadrdn0sh7cj8c89d"; + }; + } + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "925541529c1fa6821df4e44ce2723319eb2be768"; + sha256 = "1d3zjvhl115l23xakj0014qpjchivlg098h10v5nfirkk1i9f9sa"; + }; + } + { + goPackagePath = "github.com/gorilla/websocket"; + fetch = { + type = "git"; + url = "https://github.com/gorilla/websocket"; + rev = "ea4d1f681babbce9545c9c5f3d5194a789c89f5b"; + sha256 = "1bhgs2542qs49p1dafybqxfs2qc072xv41w5nswyrknwyjxxs2a1"; + }; + } + { + goPackagePath = "github.com/kardianos/osext"; + fetch = { + type = "git"; + url = "https://github.com/kardianos/osext"; + rev = "ae77be60afb1dcacde03767a8c37337fad28ac14"; + sha256 = "056dkgxrqjj5r18bnc3knlpgdz5p3yvp12y4y978hnsfhwaqvbjz"; + }; + } + { + goPackagePath = "github.com/lib/pq"; + fetch = { + type = "git"; + url = "https://github.com/lib/pq"; + rev = "88edab0803230a3898347e77b474f8c1820a1f20"; + sha256 = "02y7c8xy33x5q4167x2drzrys41nfi7wxxp9hy4vpazfws88al9p"; + }; + } + { + goPackagePath = "github.com/marstr/guid"; + fetch = { + type = "git"; + url = "https://github.com/marstr/guid"; + rev = "8bdf7d1a087ccc975cf37dd6507da50698fd19ca"; + sha256 = "1mxcigzfc1bbh5b616hm89bp06allhwcsas9v9lks235h0acgn4x"; + }; + } + { + goPackagePath = "github.com/satori/go.uuid"; + fetch = { + type = "git"; + url = "https://github.com/satori/go.uuid"; + rev = "f58768cc1a7a7e77a3bd49e98cdd21419399b6a3"; + sha256 = "1j4s5pfg2ldm35y8ls8jah4dya2grfnx2drb4jcbjsyrp4cm5yfb"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "cbe0f9307d0156177f9dd5dc85da1a31abc5f2fb"; + sha256 = "1hmpqkxh97ayyy0xcdvf1bwirwja4wyin3sh0fzjlh93aqmqgylf"; + }; + } + { + goPackagePath = "gopkg.in/alexcesaro/statsd.v2"; + fetch = { + type = "git"; + url = "https://github.com/alexcesaro/statsd"; + rev = "7fea3f0d2fab1ad973e641e51dba45443a311a90"; + sha256 = "02jdx68vicwsgabrnwgg1rvc45rinyh8ikinqgbqc56c5hkx3brj"; + }; + } + { + goPackagePath = "gopkg.in/yaml.v2"; + fetch = { + type = "git"; + url = "https://github.com/go-yaml/yaml"; + rev = "d670f9405373e636a5a2765eea47fac0c9bc91a4"; + sha256 = "1w1xid51n8v1mydn2m3vgggw8qgpd5a5sr62snsc77d99fpjsrs0"; + }; + } +] diff --git a/nixpkgs/pkgs/development/tools/manul/default.nix b/nixpkgs/pkgs/development/tools/manul/default.nix index b789a99578d..71010149a92 100644 --- a/nixpkgs/pkgs/development/tools/manul/default.nix +++ b/nixpkgs/pkgs/development/tools/manul/default.nix @@ -13,6 +13,7 @@ buildGoPackage { sha256 = "06kglxdgj1dfpc9bdnvhsh8z0c1pdbmwmfx4km01wpppzk06dnvm"; }; + deleteVendor = true; goDeps = ./deps.nix; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/development/tools/metals/default.nix b/nixpkgs/pkgs/development/tools/metals/default.nix index e5046d1d1d9..caee8058f0f 100644 --- a/nixpkgs/pkgs/development/tools/metals/default.nix +++ b/nixpkgs/pkgs/development/tools/metals/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "metals"; - version = "0.9.2"; + version = "0.9.3"; deps = stdenv.mkDerivation { name = "${pname}-deps-${version}"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ''; outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "1gnf2p578nk1ygx3cc4mb7fa690c51nbdwvc2qz2805m4xg3x7zv"; + outputHash = "0mr0pxicka4qd0cn002g5r80dyg59164czyb0r7012l0q1xighz2"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/development/tools/micronaut/default.nix b/nixpkgs/pkgs/development/tools/micronaut/default.nix index 6d9149d4107..5d032d42108 100644 --- a/nixpkgs/pkgs/development/tools/micronaut/default.nix +++ b/nixpkgs/pkgs/development/tools/micronaut/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "micronaut"; - version = "1.3.6"; + version = "1.3.7"; src = fetchzip { url = "https://github.com/micronaut-projects/micronaut-core/releases/download/v${version}/${pname}-${version}.zip"; - sha256 = "0jmj5xpj4invvpp289gh81vq7b4mmfhqb2h50yjn7wgdicyn295a"; + sha256 = "1f9fhp10fdm18g33kxl70l6l3x1k8p81h2c3zahjmhlg0sam78zw"; }; nativeBuildInputs = [ makeWrapper installShellFiles ]; diff --git a/nixpkgs/pkgs/development/tools/minizinc/default.nix b/nixpkgs/pkgs/development/tools/minizinc/default.nix index 6dfe0f570f9..308343c1ec6 100644 --- a/nixpkgs/pkgs/development/tools/minizinc/default.nix +++ b/nixpkgs/pkgs/development/tools/minizinc/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, cmake, flex, bison }: +{ stdenv, fetchFromGitHub, fetchpatch, cmake, flex, bison }: let - version = "2.2.3"; + version = "2.4.3"; in stdenv.mkDerivation { pname = "minizinc"; @@ -11,10 +11,19 @@ stdenv.mkDerivation { src = fetchFromGitHub { owner = "MiniZinc"; repo = "libminizinc"; - rev = "3d66971a0cad6edbe796f4dd940229d38e5bfe3d"; # tags on the repo are disappearing: See https://github.com/MiniZinc/libminizinc/issues/257 - sha256 = "1q31y9131aj2lsm34srm8i1s0271qcaaknzvym3r8awynm14saq5"; + rev = version; + sha256 = "0mahf621zwwywimly5nd6j39j7qr48k5p7zwpfqnjq4wn010mbf8"; }; + patches = [ + # Fix build with newer Bison versions: + # https://github.com/MiniZinc/libminizinc/issues/389 + (fetchpatch { + url = "https://github.com/MiniZinc/libminizinc/commit/d3136f6f198d3081943c17ac6890dbe14a81d112.diff"; + sha256 = "1f4wxn9422ndgq6dd0vqdxm2313srm7gn9nh82aas2xijdxlmz2c"; + }) + ]; + meta = with stdenv.lib; { homepage = "https://www.minizinc.org/"; description = "MiniZinc is a medium-level constraint modelling language."; diff --git a/nixpkgs/pkgs/development/tools/misc/act/default.nix b/nixpkgs/pkgs/development/tools/misc/act/default.nix index e10ad15fff7..3864337badf 100644 --- a/nixpkgs/pkgs/development/tools/misc/act/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/act/default.nix @@ -2,16 +2,18 @@ buildGoModule rec { pname = "act"; - version = "0.2.10"; + version = "0.2.13"; src = fetchFromGitHub { owner = "nektos"; repo = pname; rev = "v${version}"; - sha256 = "0xmrb8wbxkb52l2c7fxxy5wa9lsl591fl65zicv0nrbil36q4wfd"; + sha256 = "112vmq9wg31alw9lw1jmsdvkd7kz1d9ak4p9dli7vgr9rhdf0hnb"; }; - vendorSha256 = "0qf26g0a2j1mbzlc7xjackww22w9bl1x0iw3q1x6kq7fp8xiwhdn"; + vendorSha256 = "0bcrw3hf92m7n58lrlm0vj1wiwwy82q2rl1a725q3d6xwvi5kh9h"; + + doCheck = false; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; diff --git a/nixpkgs/pkgs/development/tools/misc/arcanist/default.nix b/nixpkgs/pkgs/development/tools/misc/arcanist/default.nix index a6265ba89d0..fcddf1d0cac 100644 --- a/nixpkgs/pkgs/development/tools/misc/arcanist/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/arcanist/default.nix @@ -1,53 +1,54 @@ -{ stdenv, fetchFromGitHub, php, flex, makeWrapper }: +{ stdenv, fetchFromGitHub, php, flex }: + +# Make a custom wrapper. If `wrapProgram` is used, arcanist thinks .arc-wrapped is being +# invoked and complains about it being an unknown toolset. We could use `makeWrapper`, but +# then we’d need to still craft a script that does the `php libexec/arcanist/bin/...` dance +# anyway... So just do everything at once. +let makeArcWrapper = toolset: '' + cat << WRAPPER > $out/bin/${toolset} + #!$shell -e + export PATH='${php}/bin/'\''${PATH:+':'}\$PATH + exec ${php}/bin/php $out/libexec/arcanist/bin/${toolset} "\$@" + WRAPPER + chmod +x $out/bin/${toolset} +''; -let - libphutil = fetchFromGitHub { - owner = "phacility"; - repo = "libphutil"; - rev = "cc2a3dbf590389400da55563cb6993f321ec6d73"; - sha256 = "1k7sr3racwz845i7r5kdwvgqrz8gldz07pxj3yw77s58rqbix3ad"; - }; - arcanist = fetchFromGitHub { - owner = "phacility"; - repo = "arcanist"; - rev = "21a1828ea06cf031e93082db8664d73efc88290a"; - sha256 = "05rq9l9z7446ks270viay57r5ibx702b5bnlf4ck529zc4abympx"; - }; in + stdenv.mkDerivation { pname = "arcanist"; - version = "20200127"; - - src = [ arcanist libphutil ]; - buildInputs = [ php makeWrapper flex ]; + version = "20200711"; - unpackPhase = '' - cp -aR ${libphutil} libphutil - cp -aR ${arcanist} arcanist - chmod +w -R libphutil arcanist - ''; + src = fetchFromGitHub { + owner = "phacility"; + repo = "arcanist"; + rev = "2565cc7b4d1dbce6bc7a5b3c4e72ae94be4712fe"; + sha256 = "0jiv4aj4m5750dqw9r8hizjkwiyxk4cg4grkr63sllsa2dpiibxw"; + }; + buildInputs = [ php flex ]; postPatch = stdenv.lib.optionalString stdenv.isAarch64 '' - substituteInPlace libphutil/support/xhpast/Makefile \ + substituteInPlace support/xhpast/Makefile \ --replace "-minline-all-stringops" "" ''; buildPhase = '' - ( - cd libphutil/support/xhpast - make clean all install - ) + make xhpast -C support/xhpast ''; + installPhase = '' mkdir -p $out/bin $out/libexec - cp -R libphutil $out/libexec/libphutil - cp -R arcanist $out/libexec/arcanist - ${if stdenv.isDarwin then '' - echo "#! $shell -e" > $out/bin/arc - echo "exec ${php}/bin/php $out/libexec/arcanist/scripts/arcanist.php "'"$@"' >> $out/bin/arc - chmod +x $out/bin/arc'' - else '' - ln -s $out/libexec/arcanist/scripts/arcanist.php $out/bin/arc''} + make install -C support/xhpast + cp -R $src $out/libexec/arcanist + + ${makeArcWrapper "arc"} + ${makeArcWrapper "phage"} + ''; + + doInstallCheck = true; + installCheckPhase = '' + $out/bin/arc help diff -- > /dev/null + $out/bin/phage help alias -- > /dev/null ''; meta = { diff --git a/nixpkgs/pkgs/development/tools/misc/argbash/default.nix b/nixpkgs/pkgs/development/tools/misc/argbash/default.nix index 0cc25ddf20b..fc1d3550e82 100644 --- a/nixpkgs/pkgs/development/tools/misc/argbash/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/argbash/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "argbash"; - version = "2.8.1"; + version = "2.9.0"; src = fetchFromGitHub { owner = "matejak"; repo = "argbash"; rev = "${version}"; - sha256 = "0zara7v3pnwiwkpb0x0g37pxhmim4425q4gba712f6djj115r1mr"; + sha256 = "1h6kw510r43b6d6rjhkhw4d67nc7grak4mgqs9ngjjv07qj3qfqc"; }; sourceRoot = "source/resources"; diff --git a/nixpkgs/pkgs/development/tools/misc/asls/default.nix b/nixpkgs/pkgs/development/tools/misc/asls/default.nix index 8a457593d52..5b53456deac 100644 --- a/nixpkgs/pkgs/development/tools/misc/asls/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/asls/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "asls"; - version = "0.4.0"; + version = "0.5.0"; src = fetchurl { url = "https://github.com/saulecabrera/asls/releases/download/v${version}/bin.tar.gz"; - sha256 = "0zy89fvdhk2bj41fzx349gi8237ww96s21hlg6blqmfhvfxsnszg"; + sha256 = "1h6r2lbf54aylzmbiy74ys42fhjv9q824bdrcp40gxx1v2yjc5h5"; }; buildInputs = [ erlangR22 ]; diff --git a/nixpkgs/pkgs/development/tools/misc/blackmagic/default.nix b/nixpkgs/pkgs/development/tools/misc/blackmagic/default.nix index 6e733cfe28a..48ae364a26e 100644 --- a/nixpkgs/pkgs/development/tools/misc/blackmagic/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/blackmagic/default.nix @@ -7,15 +7,15 @@ with lib; stdenv.mkDerivation rec { pname = "blackmagic"; - version = "unstable-2020-02-20"; + version = "unstable-2020-08-05"; # `git describe --always` - firmwareVersion = "v1.6.1-409-g7a595ea"; + firmwareVersion = "v1.6.1-539-gdd74ec8"; src = fetchFromGitHub { owner = "blacksphere"; repo = "blackmagic"; - rev = "7a595ead255f2a052fe4561c24a0577112c9de84"; - sha256 = "01kdm1rkj7ll0px882crf9w27d2ka8f3hcdmvhb9jwd60bf5dlap"; + rev = "dd74ec8e6f734302daa1ee361af88dfb5043f166"; + sha256 = "18w8y64fs7wfdypa4vm3migk5w095z8nbd8qp795f322mf2bz281"; fetchSubmodules = true; }; diff --git a/nixpkgs/pkgs/development/tools/misc/blackmagic/helper.sh b/nixpkgs/pkgs/development/tools/misc/blackmagic/helper.sh index 278a758c186..bae57f633cf 100755 --- a/nixpkgs/pkgs/development/tools/misc/blackmagic/helper.sh +++ b/nixpkgs/pkgs/development/tools/misc/blackmagic/helper.sh @@ -23,18 +23,10 @@ make_platform() { make clean make PROBE_HOST="$1" - if [ "$1" = "libftdi" ]; then + if [ "$1" = "hosted" ]; then install -m 0555 blackmagic "$out/bin" fi - if [ "$1" = "pc-hosted" ]; then - install -m 0555 blackmagic_hosted "$out/bin" - fi - - if [ "$1" = "pc-stlinkv2" ]; then - install -m 0555 blackmagic_stlinkv2 "$out/bin" - fi - for f in $PRODUCTS; do if [ -r "$f" ]; then mkdir -p "$out/firmware/$1" diff --git a/nixpkgs/pkgs/development/tools/misc/circleci-cli/default.nix b/nixpkgs/pkgs/development/tools/misc/circleci-cli/default.nix index 6dcf7ed46cf..b434358e1d2 100644 --- a/nixpkgs/pkgs/development/tools/misc/circleci-cli/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/circleci-cli/default.nix @@ -2,18 +2,20 @@ buildGoModule rec { pname = "circleci-cli"; - version = "0.1.8599"; + version = "0.1.9454"; src = fetchFromGitHub { owner = "CircleCI-Public"; repo = pname; rev = "v${version}"; - sha256 = "1brv38mzc2i6mg4rk9ichjsv5w0gr6xrf6qmhnal12cll2krn9k3"; + sha256 = "0ld7lb69wmhyrpqjaj1pddx93x529qk2fzyrwlipglwn3mbala5a"; }; - vendorSha256 = "0y35ps2pw9z7gi4z50byd1py87bf2jdvj7l7w2gxpppmhi83myc9"; + vendorSha256 = "1zd95n9k2fags0qh3wvjinxv1ahygr958mmiax2kz117yipaz4rb"; - buildFlagsArray = [ "-ldflags=-s -w -X github.com/CircleCI-Public/circleci-cli/version.Version=${version}" ]; + doCheck = false; + + buildFlagsArray = [ "-ldflags=-s -w -X github.com/CircleCI-Public/circleci-cli/version.Version=${version} -X github.com/CircleCI-Public/circleci-cli/version.Commit=${src.rev} -X github.com/CircleCI-Public/circleci-cli/version.packageManager=nix" ]; preBuild = '' substituteInPlace data/data.go \ diff --git a/nixpkgs/pkgs/development/tools/misc/clojure-lsp/default.nix b/nixpkgs/pkgs/development/tools/misc/clojure-lsp/default.nix index e7dc7c6f73f..65f12bfbb09 100644 --- a/nixpkgs/pkgs/development/tools/misc/clojure-lsp/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/clojure-lsp/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "clojure-lsp"; - version = "20200706T152722"; + version = "20200828T065654"; src = fetchurl { url = "https://github.com/snoe/clojure-lsp/releases/download/release-${version}/${pname}"; - sha256 = "1gjlsmahmmjklribdwbqybh1zj5qcv4aaxw7ffqg7rayf967w4pj"; + sha256 = "1399xjcnnb7vazy1jv3h7lnh1dyn81yk2bwi6ai991a9fsinjnf2"; }; dontUnpack = true; diff --git a/nixpkgs/pkgs/development/tools/misc/cproto/cproto_patch b/nixpkgs/pkgs/development/tools/misc/cproto/cproto.patch index 3743fef977b..3743fef977b 100644 --- a/nixpkgs/pkgs/development/tools/misc/cproto/cproto_patch +++ b/nixpkgs/pkgs/development/tools/misc/cproto/cproto.patch diff --git a/nixpkgs/pkgs/development/tools/misc/cproto/default.nix b/nixpkgs/pkgs/development/tools/misc/cproto/default.nix index 0b9321bc029..ef0e2cab777 100644 --- a/nixpkgs/pkgs/development/tools/misc/cproto/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/cproto/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; # patch made by Joe Khoobyar copied from gentoo bugs - patches = ./cproto_patch; + patches = [ ./cproto.patch ]; nativeBuildInputs = [ flex bison ]; diff --git a/nixpkgs/pkgs/development/tools/misc/editorconfig-checker/default.nix b/nixpkgs/pkgs/development/tools/misc/editorconfig-checker/default.nix index 6b45dc3c2a0..3975ad3511f 100644 --- a/nixpkgs/pkgs/development/tools/misc/editorconfig-checker/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/editorconfig-checker/default.nix @@ -13,6 +13,8 @@ buildGoModule rec { vendorSha256 = "132blcdw3lywxhqslkcpwwvkzl4cpbbkhb7ba8mrvfgl5kvfm1q0"; + doCheck = false; + nativeBuildInputs = [ installShellFiles ]; buildFlagsArray = [ "-ldflags=-X main.version=${version}" ]; diff --git a/nixpkgs/pkgs/development/tools/misc/fujprog/default.nix b/nixpkgs/pkgs/development/tools/misc/fujprog/default.nix new file mode 100644 index 00000000000..61aeea9967d --- /dev/null +++ b/nixpkgs/pkgs/development/tools/misc/fujprog/default.nix @@ -0,0 +1,37 @@ +{ stdenv +, fetchFromGitHub +, cmake +, pkgconfig +, libftdi1 +, libusb-compat-0_1 +}: + +stdenv.mkDerivation rec { + pname = "fujprog"; + version = "4.6"; + + src = fetchFromGitHub { + owner = "kost"; + repo = "${pname}"; + rev = "v${version}"; + sha256 = "04l5rrfrp3pflwz5ncwvb4ibbsqib2259m23bzfi8m80aj216shd"; + }; + + nativeBuildInputs = [ + cmake + pkgconfig + ]; + + buildInputs = [ + libftdi1 + libusb-compat-0_1 + ]; + + meta = with stdenv.lib; { + description = "JTAG programmer for the ULX3S and ULX2S open hardware FPGA development boards."; + homepage = "https://github.com/kost/fujprog"; + license = licenses.bsd2; + maintainers = with maintainers; [ trepetti ]; + platforms = platforms.linux ++ platforms.darwin; + }; +} diff --git a/nixpkgs/pkgs/development/tools/misc/gdb/default.nix b/nixpkgs/pkgs/development/tools/misc/gdb/default.nix index 7702df423bb..a4806634432 100644 --- a/nixpkgs/pkgs/development/tools/misc/gdb/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/gdb/default.nix @@ -17,20 +17,19 @@ }: let - basename = "gdb-${version}"; - version = "9.2"; + basename = "gdb"; + targetPrefix = stdenv.lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) + "${stdenv.targetPlatform.config}-"; in assert pythonSupport -> python3 != null; stdenv.mkDerivation rec { - name = - stdenv.lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) - (stdenv.targetPlatform.config + "-") - + basename; + pname = targetPrefix + basename; + version = "9.2"; src = fetchurl { - url = "mirror://gnu/gdb/${basename}.tar.xz"; + url = "mirror://gnu/gdb/${basename}-${version}.tar.xz"; sha256 = "0mf5fn8v937qwnal4ykn3ji1y2sxk0fa1yfqi679hxmpg6pdf31n"; }; diff --git a/nixpkgs/pkgs/development/tools/misc/go-license-detector/default.nix b/nixpkgs/pkgs/development/tools/misc/go-license-detector/default.nix index 8eba3f612a1..91c6518bc26 100644 --- a/nixpkgs/pkgs/development/tools/misc/go-license-detector/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/go-license-detector/default.nix @@ -13,6 +13,8 @@ buildGoModule rec { vendorSha256 = "0gan5l7vsq0hixxcymhhs8p07v92w60r0lhgvrr9a99nic12vmia"; + doCheck = false; + meta = with lib; { description = "Reliable project licenses detector"; homepage = "https://github.com/src-d/go-license-detector"; diff --git a/nixpkgs/pkgs/development/tools/misc/hound/default.nix b/nixpkgs/pkgs/development/tools/misc/hound/default.nix index 2d7431f9e8b..4e817251bff 100644 --- a/nixpkgs/pkgs/development/tools/misc/hound/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/hound/default.nix @@ -22,8 +22,6 @@ buildGoPackage rec { sha256 = "0g6nvgqjabprcl9z5ci5frhbam1dzq978h1d6aanf8vvzslfgdpq"; }; - goDeps = ./deps.nix; - postInstall = with stdenv; let binPath = lib.makeBinPath [ mercurial git ]; in '' diff --git a/nixpkgs/pkgs/development/tools/misc/hound/deps.nix b/nixpkgs/pkgs/development/tools/misc/hound/deps.nix deleted file mode 100644 index fe51488c706..00000000000 --- a/nixpkgs/pkgs/development/tools/misc/hound/deps.nix +++ /dev/null @@ -1 +0,0 @@ -[] diff --git a/nixpkgs/pkgs/development/tools/misc/hydra-cli/default.nix b/nixpkgs/pkgs/development/tools/misc/hydra-cli/default.nix index b585d27b710..6cd439a898b 100644 --- a/nixpkgs/pkgs/development/tools/misc/hydra-cli/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/hydra-cli/default.nix @@ -25,7 +25,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/nlewo/hydra-cli"; license = with licenses; [ mit ]; maintainers = with maintainers; [ gilligan lewo ]; - platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/development/tools/misc/hydra/default.nix b/nixpkgs/pkgs/development/tools/misc/hydra/default.nix index 716a3058785..a6b0383d54f 100644 --- a/nixpkgs/pkgs/development/tools/misc/hydra/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/hydra/default.nix @@ -24,12 +24,12 @@ # so when having an older version, `pkgs.hydra-migration` should be deployed first. hydra-unstable = callPackage ./common.nix { - version = "2020-08-04"; + version = "2020-09-02"; src = fetchFromGitHub { owner = "NixOS"; repo = "hydra"; - rev = "77c33c1d71a8c303f53ccad577eb0a3799e87bda"; - sha256 = "10pwiww96dbbszzvnj7abn851h89n30ziahjj2zm3liyzyvbylyf"; + rev = "e707990e2d6afab203c7ef1d769d49c564eff151"; + sha256 = "0iilf953f6s58szzyd1hzc9b2b2yw8lhbsb8xrb08szpfz7ifwqa"; }; nix = nixFlakes; diff --git a/nixpkgs/pkgs/development/tools/misc/intltool/default.nix b/nixpkgs/pkgs/development/tools/misc/intltool/default.nix index 0a04e5786f5..20f880938c6 100644 --- a/nixpkgs/pkgs/development/tools/misc/intltool/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/intltool/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, gettext, perlPackages }: +{ stdenv, fetchurl, fetchpatch, gettext, perlPackages, buildPackages }: stdenv.mkDerivation rec { pname = "intltool"; @@ -19,8 +19,14 @@ stdenv.mkDerivation rec { sha256 = "12q2140867r5d0dysly72khi7b0mm2gd7nlm1k81iyg7fxgnyz45"; })]; + nativeBuildInputs = with perlPackages; [ perl XMLParser ]; propagatedBuildInputs = [ gettext ] ++ (with perlPackages; [ perl XMLParser ]); + postInstall = stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' + for f in $out/bin/*; do + substituteInPlace $f --replace "${buildPackages.perl}" "${perlPackages.perl}" + done + ''; meta = with stdenv.lib; { description = "Translation helper tool"; homepage = "https://launchpad.net/intltool/"; diff --git a/nixpkgs/pkgs/development/tools/misc/itm-tools/cargo-lock.patch b/nixpkgs/pkgs/development/tools/misc/itm-tools/cargo-lock.patch new file mode 100644 index 00000000000..1559510cd9f --- /dev/null +++ b/nixpkgs/pkgs/development/tools/misc/itm-tools/cargo-lock.patch @@ -0,0 +1,321 @@ +diff --git a/Cargo.lock b/Cargo.lock +new file mode 100644 +index 0000000..d9d39e5 +--- /dev/null ++++ b/Cargo.lock +@@ -0,0 +1,315 @@ ++# This file is automatically @generated by Cargo. ++# It is not intended for manual editing. ++[[package]] ++name = "addr2line" ++version = "0.12.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "602d785912f476e480434627e8732e6766b760c045bbf897d9dfaa9f4fbd399c" ++dependencies = [ ++ "gimli", ++] ++ ++[[package]] ++name = "adler32" ++version = "1.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "567b077b825e468cc974f0020d4082ee6e03132512f207ef1a02fd5d00d1f32d" ++ ++[[package]] ++name = "ansi_term" ++version = "0.11.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" ++dependencies = [ ++ "winapi", ++] ++ ++[[package]] ++name = "atty" ++version = "0.2.14" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" ++dependencies = [ ++ "hermit-abi", ++ "libc", ++ "winapi", ++] ++ ++[[package]] ++name = "backtrace" ++version = "0.3.49" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "05100821de9e028f12ae3d189176b41ee198341eb8f369956407fea2f5cc666c" ++dependencies = [ ++ "addr2line", ++ "cfg-if", ++ "libc", ++ "miniz_oxide", ++ "object", ++ "rustc-demangle", ++] ++ ++[[package]] ++name = "bitflags" ++version = "1.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" ++ ++[[package]] ++name = "byteorder" ++version = "1.3.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de" ++ ++[[package]] ++name = "cfg-if" ++version = "0.1.10" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" ++ ++[[package]] ++name = "clap" ++version = "2.33.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bdfa80d47f954d53a35a64987ca1422f495b8d6483c0fe9f7117b36c2a792129" ++dependencies = [ ++ "ansi_term", ++ "atty", ++ "bitflags", ++ "strsim", ++ "textwrap", ++ "unicode-width", ++ "vec_map", ++] ++ ++[[package]] ++name = "either" ++version = "1.5.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bb1f6b1ce1c140482ea30ddd3335fc0024ac7ee112895426e0a629a6c20adfe3" ++ ++[[package]] ++name = "exitfailure" ++version = "0.5.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2ff5bd832af37f366c6c194d813a11cd90ac484f124f079294f28e357ae40515" ++dependencies = [ ++ "failure", ++] ++ ++[[package]] ++name = "failure" ++version = "0.1.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d32e9bd16cc02eae7db7ef620b392808b89f6a5e16bb3497d159c6b92a0f4f86" ++dependencies = [ ++ "backtrace", ++ "failure_derive", ++] ++ ++[[package]] ++name = "failure_derive" ++version = "0.1.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", ++ "synstructure", ++] ++ ++[[package]] ++name = "gimli" ++version = "0.21.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bcc8e0c9bce37868955864dbecd2b1ab2bdf967e6f28066d65aaac620444b65c" ++ ++[[package]] ++name = "hermit-abi" ++version = "0.1.15" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3deed196b6e7f9e44a2ae8d94225d80302d81208b1bb673fd21fe634645c85a9" ++dependencies = [ ++ "libc", ++] ++ ++[[package]] ++name = "itm" ++version = "0.4.0" ++source = "git+https://github.com/rust-embedded/itm#5dd476d03de0738062a876fd3845900ab04833a4" ++dependencies = [ ++ "byteorder", ++ "either", ++ "thiserror", ++] ++ ++[[package]] ++name = "itm-tools" ++version = "0.1.0" ++dependencies = [ ++ "clap", ++ "exitfailure", ++ "failure", ++ "itm", ++ "rustc-demangle", ++ "xmas-elf", ++] ++ ++[[package]] ++name = "libc" ++version = "0.2.71" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9457b06509d27052635f90d6466700c65095fdf75409b3fbdd903e988b886f49" ++ ++[[package]] ++name = "miniz_oxide" ++version = "0.3.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "791daaae1ed6889560f8c4359194f56648355540573244a5448a83ba1ecc7435" ++dependencies = [ ++ "adler32", ++] ++ ++[[package]] ++name = "object" ++version = "0.20.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1ab52be62400ca80aa00285d25253d7f7c437b7375c4de678f5405d3afe82ca5" ++ ++[[package]] ++name = "proc-macro2" ++version = "1.0.18" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "beae6331a816b1f65d04c45b078fd8e6c93e8071771f41b8163255bbd8d7c8fa" ++dependencies = [ ++ "unicode-xid", ++] ++ ++[[package]] ++name = "quote" ++version = "1.0.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "aa563d17ecb180e500da1cfd2b028310ac758de548efdd203e18f283af693f37" ++dependencies = [ ++ "proc-macro2", ++] ++ ++[[package]] ++name = "rustc-demangle" ++version = "0.1.16" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4c691c0e608126e00913e33f0ccf3727d5fc84573623b8d65b2df340b5201783" ++ ++[[package]] ++name = "strsim" ++version = "0.8.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" ++ ++[[package]] ++name = "syn" ++version = "1.0.33" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e8d5d96e8cbb005d6959f119f773bfaebb5684296108fb32600c00cde305b2cd" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "unicode-xid", ++] ++ ++[[package]] ++name = "synstructure" ++version = "0.12.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b834f2d66f734cb897113e34aaff2f1ab4719ca946f9a7358dba8f8064148701" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", ++ "unicode-xid", ++] ++ ++[[package]] ++name = "textwrap" ++version = "0.11.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" ++dependencies = [ ++ "unicode-width", ++] ++ ++[[package]] ++name = "thiserror" ++version = "1.0.20" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7dfdd070ccd8ccb78f4ad66bf1982dc37f620ef696c6b5028fe2ed83dd3d0d08" ++dependencies = [ ++ "thiserror-impl", ++] ++ ++[[package]] ++name = "thiserror-impl" ++version = "1.0.20" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bd80fc12f73063ac132ac92aceea36734f04a1d93c1240c6944e23a3b8841793" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "unicode-width" ++version = "0.1.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3" ++ ++[[package]] ++name = "unicode-xid" ++version = "0.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564" ++ ++[[package]] ++name = "vec_map" ++version = "0.8.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" ++ ++[[package]] ++name = "winapi" ++version = "0.3.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" ++dependencies = [ ++ "winapi-i686-pc-windows-gnu", ++ "winapi-x86_64-pc-windows-gnu", ++] ++ ++[[package]] ++name = "winapi-i686-pc-windows-gnu" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" ++ ++[[package]] ++name = "winapi-x86_64-pc-windows-gnu" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" ++ ++[[package]] ++name = "xmas-elf" ++version = "0.6.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "22678df5df766e8d1e5d609da69f0c3132d794edf6ab5e75e7abcd2270d4cf58" ++dependencies = [ ++ "zero", ++] ++ ++[[package]] ++name = "zero" ++version = "0.1.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5f1bc8a6b2005884962297587045002d8cfb8dcec9db332f4ca216ddc5de82c5" diff --git a/nixpkgs/pkgs/development/tools/misc/itm-tools/default.nix b/nixpkgs/pkgs/development/tools/misc/itm-tools/default.nix new file mode 100644 index 00000000000..6fb25695111 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/misc/itm-tools/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub, rustPlatform, pkg-config }: + +rustPlatform.buildRustPackage rec { + pname = "itm-tools"; + version = "unstable-2019-11-15"; + + src = fetchFromGitHub { + owner = "japaric"; + repo = pname; + rev = "e94155e44019d893ac8e6dab51cc282d344ab700"; + sha256 = "19xkjym0i7y52cfhvis49c59nzvgw4906cd8bkz8ka38mbgfqgiy"; + }; + + cargoPatches = [ ./cargo-lock.patch ]; + + cargoSha256 = "0rl2ph5igwjl7rwpwcf6afnxly5av7cd6va6wn82lxm606giyq75"; + + nativeBuildInputs = [ pkg-config ]; + + doCheck = false; + + meta = with stdenv.lib; { + description = "Tools for analyzing ITM traces"; + homepage = "https://github.com/japaric/itm-tools"; + license = with licenses; [ asl20 mit ]; + maintainers = with maintainers; [ hh sb0 ]; + }; +}
\ No newline at end of file diff --git a/nixpkgs/pkgs/development/tools/misc/mkcert/default.nix b/nixpkgs/pkgs/development/tools/misc/mkcert/default.nix index 6a8e76815cb..ec4042a2a27 100644 --- a/nixpkgs/pkgs/development/tools/misc/mkcert/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/mkcert/default.nix @@ -13,10 +13,10 @@ buildGoModule rec { vendorSha256 = "0b8ggdpbyxx5n2myhchhlwmm5nndwpykp1ylnzdyw12mdskfvn9h"; - goPackagePath = "github.com/FiloSottile/mkcert"; + doCheck = false; + buildFlagsArray = '' - -ldflags= - -X ${goPackagePath}/main.Version=${version} + -ldflags=-X main.Version=v${version} ''; meta = with lib; { diff --git a/nixpkgs/pkgs/development/tools/misc/nix-build-uncached/default.nix b/nixpkgs/pkgs/development/tools/misc/nix-build-uncached/default.nix index 317b8dc60ef..eca2dc96662 100644 --- a/nixpkgs/pkgs/development/tools/misc/nix-build-uncached/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/nix-build-uncached/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub, nix, makeWrapper }: +{ lib, buildGoModule, fetchFromGitHub, makeWrapper }: buildGoModule rec { pname = "nix-build-uncached"; @@ -11,15 +11,11 @@ buildGoModule rec { sha256 = "106k4234gpi8mr0n0rfsgwk4z7v0b2gim0r5bhjvg2v566j67g02"; }; - goPackagePath = "github.com/Mic92/nix-build-uncached"; vendorSha256 = null; - nativeBuildInputs = [ makeWrapper ]; + doCheck = false; - postInstall = '' - wrapProgram $out/bin/nix-build-uncached \ - --prefix PATH ":" ${lib.makeBinPath [ nix ]} - ''; + nativeBuildInputs = [ makeWrapper ]; meta = with lib; { description = "A CI friendly wrapper around nix-build"; diff --git a/nixpkgs/pkgs/development/tools/misc/objconv/default.nix b/nixpkgs/pkgs/development/tools/misc/objconv/default.nix index 9fdaca52ca8..52cc1b2d5c5 100644 --- a/nixpkgs/pkgs/development/tools/misc/objconv/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/objconv/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "objconv"; - version = "2.51"; + version = "2.52"; src = fetchurl { # Versioned archive of objconv sources maintained by orivej. url = "https://archive.org/download/objconv/${pname}-${version}.zip"; - sha256 = "0wp6ld9vk11f4nnkn56627zmlv9k5vafi99qa3yyn1pgcd61zcfs"; + sha256 = "0r117r7yvqvvdgwgwxpkyzi6p5nm0xb6p67wvkmvggm9fdyl3z8v"; }; nativeBuildInputs = [ unzip ]; diff --git a/nixpkgs/pkgs/development/tools/misc/pahole/default.nix b/nixpkgs/pkgs/development/tools/misc/pahole/default.nix index 8541c7a307a..bb88862a8e8 100644 --- a/nixpkgs/pkgs/development/tools/misc/pahole/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/pahole/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "pahole"; - version = "1.16"; + version = "1.17"; src = fetchgit { url = "https://git.kernel.org/pub/scm/devel/pahole/pahole.git"; rev = "v${version}"; - sha256 = "1gfc9v4dgs811v1zjk0d9hsgmizllw2hibc83ykmakzysimaxsy3"; + sha256 = "13dxsmhpf9n2wqggf4gd6f12rm0vhv0q96jd50gkvaxzzvgpzzbc"; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/tools/misc/patchelf/default.nix b/nixpkgs/pkgs/development/tools/misc/patchelf/default.nix index 5d2309333a6..1d31709ccf0 100644 --- a/nixpkgs/pkgs/development/tools/misc/patchelf/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/patchelf/default.nix @@ -6,11 +6,12 @@ # files. stdenv.mkDerivation rec { - name = "patchelf-0.11"; + pname = "patchelf"; + version = "0.12"; src = fetchurl { - url = "https://nixos.org/releases/patchelf/${name}/${name}.tar.bz2"; - sha256 = "16ms3ijcihb88j3x6cl8cbvhia72afmfcphczb9cfwr0gbc22chx"; + url = "https://github.com/NixOS/${pname}/releases/download/${version}/${pname}-${version}.tar.bz2"; + sha256 = "14npmdxppmh0ci140w8i8cy7zg1pnqg81a1mdsnza711ab7k36k9"; }; setupHook = [ ./setup-hook.sh ]; diff --git a/nixpkgs/pkgs/development/tools/misc/patchelf/unstable.nix b/nixpkgs/pkgs/development/tools/misc/patchelf/unstable.nix index 858e8e5a9b8..0d9eeb84bfb 100644 --- a/nixpkgs/pkgs/development/tools/misc/patchelf/unstable.nix +++ b/nixpkgs/pkgs/development/tools/misc/patchelf/unstable.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "patchelf-${version}"; - version = "2020-06-03"; + version = "2020-07-11"; src = fetchFromGitHub { owner = "NixOS"; repo = "patchelf"; - rev = "4aff679d9eaa1a3ec0228901a4e79b57361b4094"; - sha256 = "1i47z2dl6pgv5krl58lwy3xs327jmhy9cni3b8yampab1kh9ad1l"; + rev = "126372b636733b160e693c9913e871f6755c02e"; + sha256 = "07cn40ypys5pyc3jfgxvqj7qk5v6m2rr5brnpmxdsl1557ryx226"; }; # Drop test that fails on musl (?) diff --git a/nixpkgs/pkgs/development/tools/misc/replacement/default.nix b/nixpkgs/pkgs/development/tools/misc/replacement/default.nix new file mode 100644 index 00000000000..3d0218ffab2 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/misc/replacement/default.nix @@ -0,0 +1,46 @@ +{ lib +, fetchFromGitHub +, python3Packages +}: + +python3Packages.buildPythonApplication rec { + pname = "replacement"; + version = "0.4.4"; + + disabled = python3Packages.isPy27; + + src = fetchFromGitHub { + owner = "siriobalmelli"; + repo = "replacement"; + rev = "v${version}"; + sha256 = "0j4lvn3rx1kqvxcsd8nhc2lgk48jyyl7qffhlkvakhy60f9lymj3"; + }; + + propagatedBuildInputs = with python3Packages; [ + ruamel_yaml + ]; + + checkInputs = with python3Packages; [ + pytestCheckHook + sh + ]; + + meta = with lib; { + homepage = "https://github.com/siriobalmelli/replacement"; + description = "A tool to execute yaml templates and output text"; + longDescription = '' + Replacement is a python utility + that parses a yaml template and outputs text. + + A 'template' is a YAML file containing a 'replacement' object. + + A 'replacement' object contains a list of blocks, + each of which is executed in sequence. + + This tool is useful in generating configuration files, + static websites and the like. + ''; + license = licenses.asl20; + maintainers = with maintainers; [ siriobalmelli ]; + }; +} diff --git a/nixpkgs/pkgs/development/tools/misc/reviewdog/default.nix b/nixpkgs/pkgs/development/tools/misc/reviewdog/default.nix index 0662a280084..de8a113d101 100644 --- a/nixpkgs/pkgs/development/tools/misc/reviewdog/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/reviewdog/default.nix @@ -13,6 +13,8 @@ buildGoModule rec { vendorSha256 = "0cxi01jxg89lsk91dv782746i8g9ksanx8igmgafq9vq25lld7yg"; + doCheck = false; + subPackages = [ "cmd/reviewdog" ]; buildFlagsArray = [ "-ldflags=-s -w -X github.com/reviewdog/reviewdog/commands.Version=${version}" ]; diff --git a/nixpkgs/pkgs/development/tools/misc/scc/default.nix b/nixpkgs/pkgs/development/tools/misc/scc/default.nix index 47596789de7..8a6a1471d0a 100644 --- a/nixpkgs/pkgs/development/tools/misc/scc/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/scc/default.nix @@ -1,20 +1,20 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "scc"; - version = "2.12.0"; + version = "2.13.0"; src = fetchFromGitHub { owner = "boyter"; repo = "scc"; rev = "v${version}"; - sha256 = "0hbcq5qn97kr9d4q9m2p1mj3ijn8zmwycrs5bgf1kfiwr09wg2yh"; + sha256 = "16p5g20n5jsbisbgikk9xny94xx6c0dxf19saa686ghh31jr2hh3"; }; - goPackagePath = "github.com/boyter/scc"; + vendorSha256 = null; # scc has a scripts/ sub-package that's for testing. - subPackages = [ "./" ]; + excludedPackages = [ "scripts" ]; meta = with stdenv.lib; { homepage = "https://github.com/boyter/scc"; diff --git a/nixpkgs/pkgs/development/tools/misc/strace/default.nix b/nixpkgs/pkgs/development/tools/misc/strace/default.nix index cbae92dd6d1..ccbed6d430a 100644 --- a/nixpkgs/pkgs/development/tools/misc/strace/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/strace/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "strace"; - version = "5.7"; + version = "5.8"; src = fetchurl { url = "https://strace.io/files/${version}/${pname}-${version}.tar.xz"; - sha256 = "1n6cfz3i2krkyvxpdp3kmxhf7sy5xp0danzaiirbk5fdkfgvb15j"; + sha256 = "1abs3svkg9985f4jrxx34sj1dcpsf95vv1a0g01c777zgygncjnz"; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; diff --git a/nixpkgs/pkgs/development/tools/misc/svls/default.nix b/nixpkgs/pkgs/development/tools/misc/svls/default.nix new file mode 100644 index 00000000000..f04c93e7a17 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/misc/svls/default.nix @@ -0,0 +1,25 @@ +{ lib +, rustPlatform +, fetchFromGitHub +}: + +rustPlatform.buildRustPackage rec { + pname = "svls"; + version = "0.1.17"; + + src = fetchFromGitHub { + owner = "dalance"; + repo = "svls"; + rev = "v${version}"; + sha256 = "0qcd9pkshk94c6skzld8cyzppl05hk4vcmmaya8r9l6kdi1f4b5m"; + }; + + cargoSha256 = "0dqa7iw0sffzh07qysznh7ma3d3vl5fhd0i2qmz7a3dvw8mvyvsm"; + + meta = with lib; { + description = "SystemVerilog language server"; + homepage = "https://github.com/dalance/svls"; + license = licenses.mit; + maintainers = with maintainers; [ trepetti ]; + }; +} diff --git a/nixpkgs/pkgs/development/tools/misc/swig/4.nix b/nixpkgs/pkgs/development/tools/misc/swig/4.nix index a35a9a35281..4096b7353fa 100644 --- a/nixpkgs/pkgs/development/tools/misc/swig/4.nix +++ b/nixpkgs/pkgs/development/tools/misc/swig/4.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "swig"; - version = "4.0.1"; + version = "4.0.2"; src = fetchFromGitHub { owner = "swig"; repo = "swig"; rev = "rel-${version}"; - sha256 = "1i1gl5gd6b5i1hiazq7m4nvlq86zd0fhk052xhwlnb596pjhgyhf"; + sha256 = "12vlps766xvwck8q0i280s8yx21qm2dxl34710ybpmz3c1cfdjsc"; }; PCRE_CONFIG = "${pcre.dev}/bin/pcre-config"; diff --git a/nixpkgs/pkgs/development/tools/misc/terracognita/default.nix b/nixpkgs/pkgs/development/tools/misc/terracognita/default.nix index c07cb8ad3a8..a4fb72666ca 100644 --- a/nixpkgs/pkgs/development/tools/misc/terracognita/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/terracognita/default.nix @@ -13,6 +13,8 @@ buildGoModule rec { vendorSha256 = "1dmv16v1c9sydbl1g69pgwvrhznd0a133giwrcbqi4cyg1fdb3sr"; + doCheck = false; + subPackages = [ "." ]; buildFlagsArray = [ "-ldflags=-s -w -X github.com/cycloidio/terracognita/cmd.Version=${version}" ]; diff --git a/nixpkgs/pkgs/development/tools/misc/terraform-ls/default.nix b/nixpkgs/pkgs/development/tools/misc/terraform-ls/default.nix index 2a8f9ef40bd..4d999f32446 100644 --- a/nixpkgs/pkgs/development/tools/misc/terraform-ls/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/terraform-ls/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "terraform-ls"; - version = "0.5.4"; + version = "0.7.0"; src = fetchFromGitHub { owner = "hashicorp"; repo = pname; rev = "v${version}"; - sha256 = "05cij0qh1czxnms4zjyycidx84brsmlqw1c6fpk5yv58g3v8d3v7"; + sha256 = "1afdd1zs242nh1cync5ip1fbah34wc3gbsx3hwwiisc8yziwiq18"; }; goPackagePath = "github.com/hashicorp/terraform-ls"; diff --git a/nixpkgs/pkgs/development/tools/misc/terraformer/default.nix b/nixpkgs/pkgs/development/tools/misc/terraformer/default.nix new file mode 100644 index 00000000000..6ff0dd77aae --- /dev/null +++ b/nixpkgs/pkgs/development/tools/misc/terraformer/default.nix @@ -0,0 +1,24 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "terraformer"; + version = "0.8.8"; + + src = fetchFromGitHub { + owner = "GoogleCloudPlatform"; + repo = pname; + rev = version; + sha256 = "1lzf30vpa0blbkz4ngnhrn3hpbqflqd4sni4bly9yqh4fnc44nvi"; + }; + + vendorSha256 = "087448wkaw6jxv9d26hck4w3vdh06vcgywna6ydkqvxr0hp011b6"; + + subPackages = [ "." ]; + + meta = with lib; { + description = "CLI tool to generate terraform files from existing infrastructure (reverse Terraform). Infrastructure to Code"; + homepage = "https://github.com/GoogleCloudPlatform/terraformer"; + license = licenses.asl20; + maintainers = [ maintainers.marsam ]; + }; +} diff --git a/nixpkgs/pkgs/development/tools/misc/texinfo/6.7.nix b/nixpkgs/pkgs/development/tools/misc/texinfo/6.7.nix new file mode 100644 index 00000000000..7915d6e3c6b --- /dev/null +++ b/nixpkgs/pkgs/development/tools/misc/texinfo/6.7.nix @@ -0,0 +1,4 @@ +import ./common.nix { + version = "6.7"; + sha256 = "1aicn1v3czqii08wc91jw089n1x3gfchkf808q2as59dak0h714q"; +} diff --git a/nixpkgs/pkgs/development/tools/misc/texinfo/common.nix b/nixpkgs/pkgs/development/tools/misc/texinfo/common.nix index ec51dc2259d..f0f4c269fae 100644 --- a/nixpkgs/pkgs/development/tools/misc/texinfo/common.nix +++ b/nixpkgs/pkgs/development/tools/misc/texinfo/common.nix @@ -12,7 +12,7 @@ # files. let - crossBuildTools = interactive && stdenv.hostPlatform != stdenv.buildPlatform; + crossBuildTools = stdenv.hostPlatform != stdenv.buildPlatform; in with stdenv.lib; @@ -26,8 +26,7 @@ stdenv.mkDerivation { inherit sha256; }; - patches = optional (version == "6.5") ./perl.patch - ++ optional crossBuildTools ./cross-tools-flags.patch; + patches = optional crossBuildTools ./cross-tools-flags.patch; # ncurses is required to build `makedoc' # this feature is introduced by the ./cross-tools-flags.patch diff --git a/nixpkgs/pkgs/development/tools/misc/texinfo/perl.patch b/nixpkgs/pkgs/development/tools/misc/texinfo/perl.patch deleted file mode 100644 index e651b37371c..00000000000 --- a/nixpkgs/pkgs/development/tools/misc/texinfo/perl.patch +++ /dev/null @@ -1,43 +0,0 @@ -Adapted from http://svn.savannah.gnu.org/viewvc/texinfo/ -Author: gavin ---- trunk/tp/Texinfo/Parser.pm 2018-06-04 19:51:36 UTC (rev 8006) -+++ trunk/tp/Texinfo/Parser.pm 2018-07-13 15:31:28 UTC (rev 8007) -@@ -5531,11 +5531,11 @@ - } - } elsif ($command eq 'clickstyle') { - # REMACRO -- if ($line =~ /^\s+@([[:alnum:]][[:alnum:]\-]*)({})?\s*/) { -+ if ($line =~ /^\s+@([[:alnum:]][[:alnum:]\-]*)(\{\})?\s*/) { - $args = ['@'.$1]; - $self->{'clickstyle'} = $1; - $remaining = $line; -- $remaining =~ s/^\s+@([[:alnum:]][[:alnum:]\-]*)({})?\s*(\@(c|comment)((\@|\s+).*)?)?//; -+ $remaining =~ s/^\s+@([[:alnum:]][[:alnum:]\-]*)(\{\})?\s*(\@(c|comment)((\@|\s+).*)?)?//; - $has_comment = 1 if (defined($4)); - } else { - $self->line_error (sprintf($self->__( ---- trunk/tp/Texinfo/Convert/XSParagraph/xspara.c 2018-07-13 15:31:28 UTC (rev 8007) -+++ trunk/tp/Texinfo/Convert/XSParagraph/xspara.c 2018-07-13 15:39:29 UTC (rev 8008) -@@ -248,6 +248,11 @@ - - dTHX; - -+#if PERL_VERSION > 27 || (PERL_VERSION == 27 && PERL_SUBVERSION > 8) -+ /* needed due to thread-safe locale handling in newer perls */ -+ switch_to_global_locale(); -+#endif -+ - if (setlocale (LC_CTYPE, "en_US.UTF-8") - || setlocale (LC_CTYPE, "en_US.utf8")) - goto success; -@@ -320,6 +325,10 @@ - { - success: ; - free (utf8_locale); -+#if PERL_VERSION > 27 || (PERL_VERSION == 27 && PERL_SUBVERSION > 8) -+ /* needed due to thread-safe locale handling in newer perls */ -+ sync_locale(); -+#endif - /* - fprintf (stderr, "tried to set LC_CTYPE to UTF-8.\n"); - fprintf (stderr, "character encoding is: %s\n", diff --git a/nixpkgs/pkgs/development/tools/misc/texlab/default.nix b/nixpkgs/pkgs/development/tools/misc/texlab/default.nix index 8185b14cd73..8b734bdd1c1 100644 --- a/nixpkgs/pkgs/development/tools/misc/texlab/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/texlab/default.nix @@ -31,6 +31,5 @@ rustPlatform.buildRustPackage rec { homepage = "https://texlab.netlify.com/"; license = licenses.mit; maintainers = with maintainers; [ doronbehar metadark ]; - platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/development/tools/misc/tokei/default.nix b/nixpkgs/pkgs/development/tools/misc/tokei/default.nix index fe54aff87c5..baf14b933dc 100644 --- a/nixpkgs/pkgs/development/tools/misc/tokei/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/tokei/default.nix @@ -28,6 +28,5 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/XAMPPRocky/tokei"; license = with licenses; [ asl20 /* or */ mit ]; maintainers = with maintainers; [ gebner lilyball ]; - platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/development/tools/mockgen/default.nix b/nixpkgs/pkgs/development/tools/mockgen/default.nix index 13a66422a46..def5e892e2f 100644 --- a/nixpkgs/pkgs/development/tools/mockgen/default.nix +++ b/nixpkgs/pkgs/development/tools/mockgen/default.nix @@ -1,14 +1,17 @@ { buildGoModule, lib, fetchFromGitHub }: buildGoModule rec { pname = "mockgen"; - version = "1.4.3"; + version = "1.4.4"; src = fetchFromGitHub { owner = "golang"; repo = "mock"; rev = "v${version}"; - sha256 = "1p37xnja1dgq5ykx24n7wincwz2gahjh71b95p8vpw7ss2g8j8wx"; + sha256 = "1lj0dvd6div4jaq1s0afpwqaq9ah8cxhkq93wii2ably1xmp2l0a"; }; - vendorSha256 = "1kpiij3pimwv3gn28rbrdvlw9q5c76lzw6zpa12q6pgck76acdw4"; + vendorSha256 = "1md4cg1zzhc276sc7i2v0xvg5pf6gzy0n9ga2g1lx3d572igq1wy"; + + doCheck = false; + subPackages = [ "mockgen" ]; meta = with lib; { diff --git a/nixpkgs/pkgs/development/tools/mod/default.nix b/nixpkgs/pkgs/development/tools/mod/default.nix index 6593430ff4b..32fd2258daa 100644 --- a/nixpkgs/pkgs/development/tools/mod/default.nix +++ b/nixpkgs/pkgs/development/tools/mod/default.nix @@ -13,6 +13,8 @@ buildGoModule rec { vendorSha256 = "032s62rjjq7bqiz5fg17yfkq4j4dsbl6vhvs1wf2sg8jvbqmvdwn"; + doCheck = false; + subPackages = [ "cmd/mod" ]; meta = with lib; { diff --git a/nixpkgs/pkgs/development/tools/modd/default.nix b/nixpkgs/pkgs/development/tools/modd/default.nix index 106f23ac3f1..5c63447fdc5 100644 --- a/nixpkgs/pkgs/development/tools/modd/default.nix +++ b/nixpkgs/pkgs/development/tools/modd/default.nix @@ -11,12 +11,10 @@ buildGoPackage rec { }; goPackagePath = "github.com/cortesi/modd"; subPackages = [ "cmd/modd" ]; - goDeps = ./deps.nix; meta = with stdenv.lib; { description = "A flexible developer tool that runs processes and responds to filesystem changes"; homepage = "https://github.com/cortesi/modd"; license = licenses.mit; maintainers = with maintainers; [ kierdavis ]; - platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/development/tools/modd/deps.nix b/nixpkgs/pkgs/development/tools/modd/deps.nix deleted file mode 100644 index 42190e65577..00000000000 --- a/nixpkgs/pkgs/development/tools/modd/deps.nix +++ /dev/null @@ -1,138 +0,0 @@ -# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix) -[ - { - goPackagePath = "github.com/alecthomas/template"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/template"; - rev = "a0175ee3bccc567396460bf5acd36800cb10c49c"; - sha256 = "0qjgvvh26vk1cyfq9fadyhfgdj36f1iapbmr5xp6zqipldz8ffxj"; - }; - } - { - goPackagePath = "github.com/alecthomas/units"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/units"; - rev = "2efee857e7cfd4f3d0138cc3cbb1b4966962b93a"; - sha256 = "1j65b91qb9sbrml9cpabfrcf07wmgzzghrl7809hjjhrmbzri5bl"; - }; - } - { - goPackagePath = "github.com/bmatcuk/doublestar"; - fetch = { - type = "git"; - url = "https://github.com/bmatcuk/doublestar"; - rev = "85a78806aa1b4707d1dbace9be592cf1ece91ab3"; - sha256 = "01fd5j142pgsj5gfba43646aa6vd09fzvjhhik2r30nj4lsyy3z8"; - }; - } - { - goPackagePath = "github.com/cortesi/moddwatch"; - fetch = { - type = "git"; - url = "https://github.com/cortesi/moddwatch"; - rev = "d27f53de245eb09b9e475d498cc01c91ba8e89c8"; - sha256 = "1ivxk6zxrc5rhd0p5kqi8jg58ql2mwdvrxvfzz8fkj1lxz975p9p"; - }; - } - { - goPackagePath = "github.com/cortesi/termlog"; - fetch = { - type = "git"; - url = "https://github.com/cortesi/termlog"; - rev = "87cefd5ac843f65364f70a1fd2477bb6437690e8"; - sha256 = "1mygv1bv6dkm5p1wsvzrsyq771k6apdcxlyfqdp5ay8vl75jxvmb"; - }; - } - { - goPackagePath = "github.com/fatih/color"; - fetch = { - type = "git"; - url = "https://github.com/fatih/color"; - rev = "3f9d52f7176a6927daacff70a3e8d1dc2025c53e"; - sha256 = "165ww24x6ba47ji4j14mp3f006ksnmi53ws9280pgd2zcw91nbn8"; - }; - } - { - goPackagePath = "github.com/mattn/go-colorable"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-colorable"; - rev = "167de6bfdfba052fa6b2d3664c8f5272e23c9072"; - sha256 = "1nwjmsppsjicr7anq8na6md7b1z84l9ppnlr045hhxjvbkqwalvx"; - }; - } - { - goPackagePath = "github.com/mattn/go-isatty"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-isatty"; - rev = "6ca4dbf54d38eea1a992b3c722a76a5d1c4cb25c"; - sha256 = "0zs92j2cqaw9j8qx1sdxpv3ap0rgbs0vrvi72m40mg8aa36gd39w"; - }; - } - { - goPackagePath = "github.com/rjeczalik/notify"; - fetch = { - type = "git"; - url = "https://github.com/rjeczalik/notify"; - rev = "629144ba06a1c6af28c1e42c228e3d42594ce081"; - sha256 = "0745w0mdr9xfr4rxw4pfr1sl8apc7wr7mvfykdl4wslq3mdj8a91"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "505ab145d0a99da450461ae2c1a9f6cd10d1f447"; - sha256 = "1vbsvcvmjz6c00p5vf8ls533p52fx2y3gy6v4k5qrdlzl4wf0i5s"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "927f97764cc334a6575f4b7a1584a147864d5723"; - sha256 = "0np7b766gb92vbm514yhdl7cjmqvn0dxdxskd84aas2ri1fkpgw5"; - }; - } - { - goPackagePath = "golang.org/x/sync"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sync"; - rev = "37e7f081c4d4c64e13b10787722085407fe5d15f"; - sha256 = "1bb0mw6ckb1k7z8v3iil2qlqwfj408fvvp8m1cik2b46p7snyjhm"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "b4a75ba826a64a70990f11a225237acd6ef35c9f"; - sha256 = "0kzrd2wywkcq35iakbzplqyma4bvf2ng3mzi7917kxcbdq3fflrj"; - }; - } - { - goPackagePath = "gopkg.in/alecthomas/kingpin.v2"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/kingpin"; - rev = "947dcec5ba9c011838740e680966fd7087a71d0d"; - sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r"; - }; - } - { - goPackagePath = "mvdan.cc/sh"; - fetch = { - type = "git"; - url = "https://github.com/mvdan/sh"; - rev = "8aeb0734cd0f08b7a473c9ac816be8687ca909cc"; - sha256 = "1mj8qfkyb6k490qjy3riq6pm440qajf5lc8m74x7xhq5059qkgxx"; - }; - } -]
\ No newline at end of file diff --git a/nixpkgs/pkgs/development/tools/node-webkit/nw12.nix b/nixpkgs/pkgs/development/tools/node-webkit/nw12.nix index 307e123bf77..ffd2a78f509 100644 --- a/nixpkgs/pkgs/development/tools/node-webkit/nw12.nix +++ b/nixpkgs/pkgs/development/tools/node-webkit/nw12.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, buildEnv, makeWrapper +{ stdenv, lib, fetchurl, buildEnv, makeWrapper , xorg, alsaLib, dbus, glib, gtk2, atk, pango, freetype, fontconfig , gdk-pixbuf, cairo, nss, nspr, gconf, expat, systemd, libcap , libnotify}: @@ -39,7 +39,7 @@ in stdenv.mkDerivation rec { patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/share/nwjs/nw patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/share/nwjs/nwjc - ln -s ${systemd.lib}/lib/libudev.so $out/share/nwjs/libudev.so.0 + ln -s ${lib.getLib systemd}/lib/libudev.so $out/share/nwjs/libudev.so.0 patchelf --set-rpath "${nwEnv}/lib:${nwEnv}/lib64:${stdenv.lib.makeLibraryPath [ stdenv.cc.cc ]}:$out/share/nwjs" $out/share/nwjs/nw patchelf --set-rpath "${nwEnv}/lib:${nwEnv}/lib64:$out/share/nwjs" $out/share/nwjs/nwjc diff --git a/nixpkgs/pkgs/development/tools/nsis/default.nix b/nixpkgs/pkgs/development/tools/nsis/default.nix index bb29bcfdc0f..33be56c539d 100644 --- a/nixpkgs/pkgs/development/tools/nsis/default.nix +++ b/nixpkgs/pkgs/development/tools/nsis/default.nix @@ -1,18 +1,23 @@ -{ stdenv, fetchurl, fetchzip, sconsPackages, zlib }: +{ stdenv +, fetchurl +, fetchzip +, sconsPackages +, zlib +}: stdenv.mkDerivation rec { pname = "nsis"; - version = "3.05"; + version = "3.06.1"; src = fetchurl { url = "mirror://sourceforge/project/nsis/NSIS%203/${version}/nsis-${version}-src.tar.bz2"; - sha256 = "1sbwx5vzpddharkb7nj4q5z3i5fbg4lan63ng738cw4hmc4v7qdn"; + sha256 = "1w1z2m982l6j8lw8hy91c3979wbnqglcf4148f9v79vl32znhpcv"; }; srcWinDistributable = fetchzip { url = "mirror://sourceforge/project/nsis/NSIS%203/${version}/nsis-${version}.zip"; - sha256 = "0i3pzdilyy5g0r2c92pd2jl92ji9f75vv98mndzq8vw03a34yh3q"; + sha256 = "04qm9jqbcybpwcrjlksggffdyafzwxxcaz9xhjw8w5rb95x7lw5q"; }; postUnpack = '' diff --git a/nixpkgs/pkgs/development/tools/nwjs/default.nix b/nixpkgs/pkgs/development/tools/nwjs/default.nix index ab16d951151..4eedc003272 100644 --- a/nixpkgs/pkgs/development/tools/nwjs/default.nix +++ b/nixpkgs/pkgs/development/tools/nwjs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, buildEnv, makeWrapper +{ stdenv, lib, fetchurl, buildEnv, makeWrapper , xorg, alsaLib, dbus, glib, gtk3, atk, pango, freetype, fontconfig , gdk-pixbuf, cairo, nss, nspr, gconf, expat, systemd, libcap @@ -61,7 +61,7 @@ in stdenv.mkDerivation rec { patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/share/nwjs/nw - ln -s ${systemd.lib}/lib/libudev.so $out/share/nwjs/libudev.so.0 + ln -s ${lib.getLib systemd}/lib/libudev.so $out/share/nwjs/libudev.so.0 libpath="$out/share/nwjs/lib/" for f in "$libpath"/*.so; do diff --git a/nixpkgs/pkgs/development/tools/ocaml/camlp4/default.nix b/nixpkgs/pkgs/development/tools/ocaml/camlp4/default.nix index ea1b3965098..73228655cca 100644 --- a/nixpkgs/pkgs/development/tools/ocaml/camlp4/default.nix +++ b/nixpkgs/pkgs/development/tools/ocaml/camlp4/default.nix @@ -43,6 +43,11 @@ stdenv.mkDerivation rec { dontAddPrefix = true; preConfigure = '' + # increase stack space for spacetime variant of the compiler + # https://github.com/ocaml/ocaml/issues/7435 + # but disallowed by darwin sandbox + ulimit -s unlimited || true + configureFlagsArray=( --bindir=$out/bin --libdir=$out/lib/ocaml/${ocaml.version}/site-lib diff --git a/nixpkgs/pkgs/development/tools/ocaml/dune/2.nix b/nixpkgs/pkgs/development/tools/ocaml/dune/2.nix index d785302ebb5..177fa96f5b9 100644 --- a/nixpkgs/pkgs/development/tools/ocaml/dune/2.nix +++ b/nixpkgs/pkgs/development/tools/ocaml/dune/2.nix @@ -1,22 +1,30 @@ -{ stdenv, fetchurl, ocaml, findlib }: +{ stdenv, fetchurl, ocaml, findlib, fetchpatch }: -if stdenv.lib.versionOlder ocaml.version "4.07" +if stdenv.lib.versionOlder ocaml.version "4.08" then throw "dune is not available for OCaml ${ocaml.version}" else stdenv.mkDerivation rec { pname = "dune"; - version = "2.6.2"; + version = "2.7.1"; src = fetchurl { url = "https://github.com/ocaml/dune/releases/download/${version}/dune-${version}.tbz"; - sha256 = "1sc8ax198z42vhc3l6i04kknm9g44whifjivs19qgi3sybrw2vjg"; + sha256 = "0pcjf209gynjwipnpplaqyvyivnawqiwhvqnivhkybisicpqyln3"; }; buildInputs = [ ocaml findlib ]; buildFlags = "release"; + patches = [ + # Fix setup.ml configure path. Remove with the next release. + (fetchpatch { + url = "https://github.com/ocaml/dune/commit/8a3d7f2f2015b71384caa07226d1a89dba9d6c25.patch"; + sha256 = "0dw4q10030h9xcdlxw2vp7qm0hd2qpkb98rir5d55m9vn65w8j28"; + }) + ]; + dontAddPrefix = true; installFlags = [ "PREFIX=${placeholder "out"}" "LIBDIR=$(OCAMLFIND_DESTDIR)" ]; diff --git a/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix b/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix index 888cc51a99d..c0812c39a3e 100644 --- a/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix +++ b/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix @@ -1,18 +1,19 @@ { lib, fetchurl, buildDunePackage , ocaml, findlib, cmdliner, dune_2, cppo, yojson, ocaml-migrate-parsetree +, menhir }: buildDunePackage rec { pname = "js_of_ocaml-compiler"; - version = "3.6.0"; + version = "3.7.0"; useDune2 = true; src = fetchurl { url = "https://github.com/ocsigen/js_of_ocaml/releases/download/${version}/js_of_ocaml-${version}.tbz"; - sha256 = "51eaa89c83ef3168ef270bf7997cbc35a747936d3f51aa6fac58fb0323b4cbb0"; + sha256 = "0rw6cfkl3zlyav8q2w7grxxqjmg35mz5rgvmkiqb58nl4gmgzx6w"; }; - nativeBuildInputs = [ ocaml findlib dune_2 cppo ]; + nativeBuildInputs = [ ocaml findlib dune_2 cppo menhir ]; buildInputs = [ cmdliner ]; configurePlatforms = []; diff --git a/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/default.nix b/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/default.nix index 666cda592fb..9a57b590d6c 100644 --- a/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/default.nix +++ b/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/default.nix @@ -10,8 +10,6 @@ stdenv.mkDerivation { buildInputs = [ findlib ocaml-migrate-parsetree ppx_tools_versioned ]; nativeBuildInputs = [ ocaml findlib dune_2 ]; - postPatch = "patchShebangs lib/generate_stubs.sh"; - propagatedBuildInputs = [ js_of_ocaml-compiler uchar ]; buildPhase = "dune build -p js_of_ocaml"; diff --git a/nixpkgs/pkgs/development/tools/ocaml/merlin/default.nix b/nixpkgs/pkgs/development/tools/ocaml/merlin/default.nix index 4b11dd13983..54712be2b6e 100644 --- a/nixpkgs/pkgs/development/tools/ocaml/merlin/default.nix +++ b/nixpkgs/pkgs/development/tools/ocaml/merlin/default.nix @@ -2,13 +2,13 @@ buildDunePackage rec { pname = "merlin"; - version = "3.3.6"; + version = "3.3.9"; minimumOCamlVersion = "4.02.1"; src = fetchurl { url = "https://github.com/ocaml/merlin/releases/download/v${version}/merlin-v${version}.tbz"; - sha256 = "1360cm0jkn2v2y5p3yzdyw9661a1vpddcibkbfblmk95qafx4civ"; + sha256 = "00ng8299l5rzpak8ljxzr6dgxw6z52ivm91159ahv09xk4d0y5x3"; }; buildInputs = [ yojson ]; diff --git a/nixpkgs/pkgs/development/tools/ocaml/ocamlformat/default.nix b/nixpkgs/pkgs/development/tools/ocaml/ocamlformat/default.nix index c79f65b47a8..069f0471595 100644 --- a/nixpkgs/pkgs/development/tools/ocaml/ocamlformat/default.nix +++ b/nixpkgs/pkgs/development/tools/ocaml/ocamlformat/default.nix @@ -2,7 +2,7 @@ with ocamlPackages; buildDunePackage rec { pname = "ocamlformat"; - version = "0.14.2"; + version = "0.15.0"; minimumOCamlVersion = "4.06"; @@ -10,7 +10,7 @@ with ocamlPackages; buildDunePackage rec { src = fetchurl { url = "https://github.com/ocaml-ppx/ocamlformat/releases/download/${version}/ocamlformat-${version}.tbz"; - sha256 = "16phz1sg9b070p6fm8d42j0piizg05vghdjmw8aj7xm82b1pm7sz"; + sha256 = "0190vz59n6ma9ca1m3syl3mc8i1smj1m3d8x1jp21f710y4llfr6"; }; buildInputs = [ @@ -29,7 +29,7 @@ with ocamlPackages; buildDunePackage rec { meta = { homepage = "https://github.com/ocaml-ppx/ocamlformat"; description = "Auto-formatter for OCaml code"; - maintainers = [ lib.maintainers.Zimmi48 ]; + maintainers = [ lib.maintainers.Zimmi48 lib.maintainers.marsam ]; license = lib.licenses.mit; }; } diff --git a/nixpkgs/pkgs/development/tools/ocaml/ocp-indent/default.nix b/nixpkgs/pkgs/development/tools/ocaml/ocp-indent/default.nix index 729985f87fd..675f66dcf47 100644 --- a/nixpkgs/pkgs/development/tools/ocaml/ocp-indent/default.nix +++ b/nixpkgs/pkgs/development/tools/ocaml/ocp-indent/default.nix @@ -1,12 +1,12 @@ { lib, fetchzip, buildDunePackage, cmdliner }: buildDunePackage rec { - version = "1.8.1"; + version = "1.8.2"; pname = "ocp-indent"; src = fetchzip { url = "https://github.com/OCamlPro/ocp-indent/archive/${version}.tar.gz"; - sha256 = "0h4ysh36q1fxc40inhsdq2swqpfm15lpilqqcafs5ska42pn7s68"; + sha256 = "1dvcl108ir9nqkk4mjm9xhhj4p9dx9bmg8bnms54fizs1x3x8ar3"; }; minimumOCamlVersion = "4.02"; diff --git a/nixpkgs/pkgs/development/tools/ocaml/ocp-index/default.nix b/nixpkgs/pkgs/development/tools/ocaml/ocp-index/default.nix index b9404016b4e..9c888e284fc 100644 --- a/nixpkgs/pkgs/development/tools/ocaml/ocp-index/default.nix +++ b/nixpkgs/pkgs/development/tools/ocaml/ocp-index/default.nix @@ -1,15 +1,15 @@ -{ lib, fetchurl, buildDunePackage, ocp-build, ocp-indent, cmdliner, re }: +{ lib, fetchzip, buildDunePackage, cppo, ocp-indent, cmdliner, re }: buildDunePackage rec { pname = "ocp-index"; - version = "1.2"; + version = "1.2.1"; - src = fetchurl { - url = "https://github.com/OCamlPro/ocp-index/releases/download/${version}/ocp-index-${version}.tbz"; - sha256 = "1lchw02sakjjppmzr0rzlarwbg1lc2bl7pwcfpsiycnaz46x6gmr"; + src = fetchzip { + url = "https://github.com/OCamlPro/ocp-index/archive/${version}.tar.gz"; + sha256 = "08r7mxdnxmhff37fw4hmrpjgckgi5kaiiiirwp4rmdl594z0h9c8"; }; - buildInputs = [ ocp-build cmdliner re ]; + buildInputs = [ cppo cmdliner re ]; propagatedBuildInputs = [ ocp-indent ]; diff --git a/nixpkgs/pkgs/development/tools/omnisharp-roslyn/default.nix b/nixpkgs/pkgs/development/tools/omnisharp-roslyn/default.nix index 973f777d8cb..3c51779c566 100644 --- a/nixpkgs/pkgs/development/tools/omnisharp-roslyn/default.nix +++ b/nixpkgs/pkgs/development/tools/omnisharp-roslyn/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "omnisharp-roslyn"; - version = "1.35.1"; + version = "1.35.2"; src = fetchurl { url = "https://github.com/OmniSharp/omnisharp-roslyn/releases/download/v${version}/omnisharp-mono.tar.gz"; - sha256 = "0gx87qc9r3lhqn6q95y74z67sjcxnazkkdi9zswmaqyvjn8x7vf4"; + sha256 = "0k4crybddqpcg1vi1ax1s85w4hlknz6kaqn4cvv279dkm9aqxbp8"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/development/tools/open-policy-agent/default.nix b/nixpkgs/pkgs/development/tools/open-policy-agent/default.nix index 48a3bf8e0a6..d3fd81a0f94 100644 --- a/nixpkgs/pkgs/development/tools/open-policy-agent/default.nix +++ b/nixpkgs/pkgs/development/tools/open-policy-agent/default.nix @@ -2,16 +2,15 @@ buildGoPackage rec { pname = "open-policy-agent"; - version = "0.15.0"; + version = "0.23.2"; goPackagePath = "github.com/open-policy-agent/opa"; src = fetchFromGitHub { owner = "open-policy-agent"; repo = "opa"; rev = "v${version}"; - sha256 = "0i9735v73a7wfq02p4hsy61g7d7bip6zmb8bnsiz2ma84g2g533w"; + sha256 = "18hpanfrzg6xnq1g0yws6g0lw4y191pnrqphccv13j6kqk3k10ps"; }; - goDeps = ./deps.nix; buildFlagsArray = '' -ldflags= @@ -23,6 +22,5 @@ buildGoPackage rec { homepage = "https://www.openpolicyagent.org"; license = licenses.asl20; maintainers = with maintainers; [ lewo ]; - platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/development/tools/open-policy-agent/deps.nix b/nixpkgs/pkgs/development/tools/open-policy-agent/deps.nix deleted file mode 100644 index ba9eed180d5..00000000000 --- a/nixpkgs/pkgs/development/tools/open-policy-agent/deps.nix +++ /dev/null @@ -1,408 +0,0 @@ -# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) -[ - { - goPackagePath = "github.com/OneOfOne/xxhash"; - fetch = { - type = "git"; - url = "https://github.com/OneOfOne/xxhash"; - rev = "v1.2.3"; - sha256 = "0hxyvv77ghja6vim210s7fa1n2zlvykvjak8s3k3nkj85h611kwb"; - }; - } - { - goPackagePath = "github.com/beorn7/perks"; - fetch = { - type = "git"; - url = "https://github.com/beorn7/perks"; - rev = "3a771d992973"; - sha256 = "1l2lns4f5jabp61201sh88zf3b0q793w4zdgp9nll7mmfcxxjif3"; - }; - } - { - goPackagePath = "github.com/cespare/xxhash"; - fetch = { - type = "git"; - url = "https://github.com/cespare/xxhash"; - rev = "v1.1.0"; - sha256 = "1qyzlcdcayavfazvi03izx83fvip8h36kis44zr2sg7xf6sx6l4x"; - }; - } - { - goPackagePath = "github.com/davecgh/go-spew"; - fetch = { - type = "git"; - url = "https://github.com/davecgh/go-spew"; - rev = "v1.1.1"; - sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y"; - }; - } - { - goPackagePath = "github.com/fsnotify/fsnotify"; - fetch = { - type = "git"; - url = "https://github.com/fsnotify/fsnotify"; - rev = "v1.4.7"; - sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; - }; - } - { - goPackagePath = "github.com/ghodss/yaml"; - fetch = { - type = "git"; - url = "https://github.com/ghodss/yaml"; - rev = "c7ce16629ff4"; - sha256 = "10cyv1gy3zwwkr04kk8cvhifb7xddakyvnk5s13yfcqj9hcjz8d1"; - }; - } - { - goPackagePath = "github.com/gobwas/glob"; - fetch = { - type = "git"; - url = "https://github.com/gobwas/glob"; - rev = "v0.2.3"; - sha256 = "0jxk1x806zn5x86342s72dq2qy64ksb3zrvrlgir2avjhwb18n6z"; - }; - } - { - goPackagePath = "github.com/gogo/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/gogo/protobuf"; - rev = "v1.3.0"; - sha256 = "0slfyrmbpdcppf0z3waar90bpszdhi2gv705ys1b0zx5x6ax8f1a"; - }; - } - { - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "d3de96c4c28e"; - sha256 = "0k41z9dybs3fvgb1jzgnxr91qad9rnf9a269l95jics58m3kn7f5"; - }; - } - { - goPackagePath = "github.com/gorilla/mux"; - fetch = { - type = "git"; - url = "https://github.com/gorilla/mux"; - rev = "521ea7b17d02"; - sha256 = "0bd83nd6jc2vsddwnb8w6gpw6qpfg449n6wb4dmk12ybmdhkwrvf"; - }; - } - { - goPackagePath = "github.com/inconshreveable/mousetrap"; - fetch = { - type = "git"; - url = "https://github.com/inconshreveable/mousetrap"; - rev = "v1.0.0"; - sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152"; - }; - } - { - goPackagePath = "github.com/kisielk/errcheck"; - fetch = { - type = "git"; - url = "https://github.com/kisielk/errcheck"; - rev = "v1.2.0"; - sha256 = "0am6g10ipdxw84byscm7shda654882wjcbinq5c4696m6mhi2qrd"; - }; - } - { - goPackagePath = "github.com/kisielk/gotool"; - fetch = { - type = "git"; - url = "https://github.com/kisielk/gotool"; - rev = "v1.0.0"; - sha256 = "14af2pa0ssyp8bp2mvdw184s5wcysk6akil3wzxmr05wwy951iwn"; - }; - } - { - goPackagePath = "github.com/konsorten/go-windows-terminal-sequences"; - fetch = { - type = "git"; - url = "https://github.com/konsorten/go-windows-terminal-sequences"; - rev = "v1.0.2"; - sha256 = "09mn209ika7ciy87xf2x31dq5fnqw39jidgaljvmqxwk7ff1hnx7"; - }; - } - { - goPackagePath = "github.com/mattn/go-runewidth"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-runewidth"; - rev = "b20a3daf6a39"; - sha256 = "0crivpncmh22696d5cy7k15ll5yqfjcigk0xy73wb6g1q6vnfxs7"; - }; - } - { - goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; - fetch = { - type = "git"; - url = "https://github.com/matttproud/golang_protobuf_extensions"; - rev = "v1.0.1"; - sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya"; - }; - } - { - goPackagePath = "github.com/mna/pigeon"; - fetch = { - type = "git"; - url = "https://github.com/mna/pigeon"; - rev = "bb0192cfc2ae"; - sha256 = "1yid3pm46hjszikbap2wbfh97vpnha0qncywlnm1mk1pzglfgdy9"; - }; - } - { - goPackagePath = "github.com/olekukonko/tablewriter"; - fetch = { - type = "git"; - url = "https://github.com/olekukonko/tablewriter"; - rev = "v0.0.1"; - sha256 = "0hh95glg7d2md185r03wn52j2r33jc4zil0qvcrs66ka7bdxi7vj"; - }; - } - { - goPackagePath = "github.com/peterh/liner"; - fetch = { - type = "git"; - url = "https://github.com/peterh/liner"; - rev = "bf27d3ba8e1d"; - sha256 = "0xx9923l4a46kjd1wpscqw31p4am28xrhd17xgw1cnx06bznb36v"; - }; - } - { - goPackagePath = "github.com/pkg/errors"; - fetch = { - type = "git"; - url = "https://github.com/pkg/errors"; - rev = "059132a15dd0"; - sha256 = "0bxkbh2rq40kdk8i05am5np77cnskx3571v2k300j5mmj1rl1ijg"; - }; - } - { - goPackagePath = "github.com/pmezard/go-difflib"; - fetch = { - type = "git"; - url = "https://github.com/pmezard/go-difflib"; - rev = "v1.0.0"; - sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; - }; - } - { - goPackagePath = "github.com/prometheus/client_golang"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_golang"; - rev = "f30f42803563"; - sha256 = "0d3a9igvpdx516wpvj3b1ki1c4n2lvp5ghvzpqk95j2fxzyyzcxg"; - }; - } - { - goPackagePath = "github.com/prometheus/client_model"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_model"; - rev = "5c3871d89910"; - sha256 = "04psf81l9fjcwascsys428v03fx4fi894h7fhrj2vvcz723q57k0"; - }; - } - { - goPackagePath = "github.com/prometheus/common"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/common"; - rev = "7e9e6cabbd39"; - sha256 = "00nmyp6k6x53gl7csca6bja010wnxf2p2pxfph3y0l2ap44qb38w"; - }; - } - { - goPackagePath = "github.com/prometheus/procfs"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/procfs"; - rev = "185b4288413d"; - sha256 = "0d85429kdw5dgj5zhyiz1sq3i5691vj2gjnda93nnxxzx9acg8cv"; - }; - } - { - goPackagePath = "github.com/rcrowley/go-metrics"; - fetch = { - type = "git"; - url = "https://github.com/rcrowley/go-metrics"; - rev = "3113b8401b8a"; - sha256 = "1m5q5dsvkqz809aag6dyan74wdrp69g2mb9killbv7z4ls2mlfr3"; - }; - } - { - goPackagePath = "github.com/sirupsen/logrus"; - fetch = { - type = "git"; - url = "https://github.com/sirupsen/logrus"; - rev = "v1.4.1"; - sha256 = "1m7ny9jkb98cxqhsp13xa5hnqh1s9f25x04q6arsala4zswsw33c"; - }; - } - { - goPackagePath = "github.com/spaolacci/murmur3"; - fetch = { - type = "git"; - url = "https://github.com/spaolacci/murmur3"; - rev = "f09979ecbc72"; - sha256 = "1lv3zyz3jy2d76bhvvs8svygx66606iygdvwy5cwc0p5z8yghq25"; - }; - } - { - goPackagePath = "github.com/spf13/cobra"; - fetch = { - type = "git"; - url = "https://github.com/spf13/cobra"; - rev = "fe5e611709b0"; - sha256 = "1pn7g9jmhqc9yg6x02dgp4phiggnnxz8a11pv5y4vxhrvkjm6h71"; - }; - } - { - goPackagePath = "github.com/spf13/pflag"; - fetch = { - type = "git"; - url = "https://github.com/spf13/pflag"; - rev = "082b515c9490"; - sha256 = "03jil8szw5hsp0x4pgzdxas2njqij2466p20q1ag18lmgncjl50m"; - }; - } - { - goPackagePath = "github.com/stretchr/objx"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/objx"; - rev = "v0.1.1"; - sha256 = "0iph0qmpyqg4kwv8jsx6a56a7hhqq8swrazv40ycxk9rzr0s8yls"; - }; - } - { - goPackagePath = "github.com/stretchr/testify"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/testify"; - rev = "v1.2.2"; - sha256 = "0dlszlshlxbmmfxj5hlwgv3r22x0y1af45gn1vd198nvvs3pnvfs"; - }; - } - { - goPackagePath = "github.com/yashtewari/glob-intersection"; - fetch = { - type = "git"; - url = "https://github.com/yashtewari/glob-intersection"; - rev = "5c77d914dd0b"; - sha256 = "1mfdk6iwqbhikcccds81knqlrj1phf9pad39fs2y8bzr6n7nqfzz"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "c2843e01d9a2"; - sha256 = "01xgxbj5r79nmisdvpq48zfy8pzaaj90bn6ngd4nf33j9ar1dp8r"; - }; - } - { - goPackagePath = "golang.org/x/lint"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/lint"; - rev = "1baf3a9d7d67"; - sha256 = "0aql4lb9cf2kcb9jx90bvpp9chrmic2y3fwfvdq76hq2qvr4818d"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "3b0461eec859"; - sha256 = "0l00c8l0a8xnv6qdpwfzxxsr58jggacgzdrwiprrfx2xqm37b6d5"; - }; - } - { - goPackagePath = "golang.org/x/sync"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sync"; - rev = "112230192c58"; - sha256 = "05i2k43j2d0llq768hg5pf3hb2yhfzp9la1w5wp0rsnnzblr0lfn"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "d0b11bdaac8a"; - sha256 = "18yfsmw622l7gc5sqriv5qmck6903vvhivpzp8i3xfy3z33dybdl"; - }; - } - { - goPackagePath = "golang.org/x/text"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/text"; - rev = "v0.3.0"; - sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19"; - }; - } - { - goPackagePath = "golang.org/x/tools"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/tools"; - rev = "5eefd052ad72"; - sha256 = "1bgpq8j3a1mwsd9cbp9hqmb5ms6vp4b0a2xsrlpwrfpyswnyagi0"; - }; - } - { - goPackagePath = "golang.org/x/xerrors"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/xerrors"; - rev = "a985d3407aa7"; - sha256 = "00wzr5w8aadipgc3rkk8f11i41znskfj9ix5nhhaxyg7isrslgcj"; - }; - } - { - goPackagePath = "google.golang.org/genproto"; - fetch = { - type = "git"; - url = "https://github.com/google/go-genproto"; - rev = "11092d34479b"; - sha256 = "12qcrjq658zga5fj4n0wgm11pzpr3gafwg25cinl5qcq4p9cnl0r"; - }; - } - { - goPackagePath = "gopkg.in/check.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/check.v1"; - rev = "20d25e280405"; - sha256 = "0k1m83ji9l1a7ng8a7v40psbymxasmssbrrhpdv2wl4rhs0nc3np"; - }; - } - { - goPackagePath = "gopkg.in/fsnotify.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/fsnotify.v1"; - rev = "v1.4.7"; - sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; - }; - } - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/yaml.v2"; - rev = "v2.2.1"; - sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1"; - }; - } -] diff --git a/nixpkgs/pkgs/development/tools/operator-sdk/default.nix b/nixpkgs/pkgs/development/tools/operator-sdk/default.nix index 7954a50a7e0..cec885499bf 100644 --- a/nixpkgs/pkgs/development/tools/operator-sdk/default.nix +++ b/nixpkgs/pkgs/development/tools/operator-sdk/default.nix @@ -2,16 +2,18 @@ buildGoModule rec { pname = "operator-sdk"; - version = "0.19.2"; + version = "1.0.0"; src = fetchFromGitHub { owner = "operator-framework"; repo = pname; rev = "v${version}"; - sha256 = "1lmnxw6l6lknvbwmw5xh238i0j452sib37fw8ybxp64zwvj2sac0"; + sha256 = "1s59rgr0ssics1487mvx0h37zs7dfjimsvkbs2d8wqc3r8asw0g4"; }; - vendorSha256 = "1xk3zw8w2fynww0z4d66nlclhjf52bk4cv3bh51yyd1mr808lip5"; + vendorSha256 = "0xvjsiaa3qvlix1fm07z080vh79wg0xyx2s6jqnqn7fb3nh65kn7"; + + doCheck = false; subPackages = [ "cmd/operator-sdk" ]; diff --git a/nixpkgs/pkgs/development/tools/osslsigncode/default.nix b/nixpkgs/pkgs/development/tools/osslsigncode/default.nix index a867e3850e2..6924ec9e37a 100644 --- a/nixpkgs/pkgs/development/tools/osslsigncode/default.nix +++ b/nixpkgs/pkgs/development/tools/osslsigncode/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "osslsigncode"; - version = "unstable-2019-07-25"; + version = "unstable-2020-08-02"; src = fetchFromGitHub { owner = "mtrojnar"; repo = pname; - rev = "18810b7e0bb1d8e0d25b6c2565a065cf66bce5d7"; - sha256 = "02jnbr3xdsb5dpll3k65080ryrfr7agawmjavwxd0v40w0an5yq8"; + rev = "01b3fb5b542ed0b41e3860aeee7a85b735491ff2"; + sha256 = "03ynm1ycbi86blglma3xiwadck8kc5yb0gawjzlhyv90jidn680l"; }; nativeBuildInputs = [ autoreconfHook libgsf pkgconfig openssl curl ]; @@ -24,8 +24,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/mtrojnar/osslsigncode"; description = "OpenSSL based Authenticode signing for PE/MSI/Java CAB files"; license = licenses.gpl3Plus; - maintainers = [ maintainers.mmahut ]; + maintainers = with maintainers; [ mmahut ]; platforms = platforms.all; }; } - diff --git a/nixpkgs/pkgs/development/tools/out-of-tree/default.nix b/nixpkgs/pkgs/development/tools/out-of-tree/default.nix index ff5a3ec1b54..b902dd2cc40 100644 --- a/nixpkgs/pkgs/development/tools/out-of-tree/default.nix +++ b/nixpkgs/pkgs/development/tools/out-of-tree/default.nix @@ -14,6 +14,8 @@ buildGoModule rec { vendorSha256 = "0kg5c4h7xnwfcfshrh5n76xv98wzr73kxzr8q65iphsjimbxcpy3"; + doCheck = false; + postFixup = '' wrapProgram $out/bin/out-of-tree \ --prefix PATH : "${stdenv.lib.makeBinPath [ qemu docker which ]}" diff --git a/nixpkgs/pkgs/development/tools/packer/default.nix b/nixpkgs/pkgs/development/tools/packer/default.nix index 2cfe95152a3..909e821a6d1 100644 --- a/nixpkgs/pkgs/development/tools/packer/default.nix +++ b/nixpkgs/pkgs/development/tools/packer/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "packer"; - version = "1.6.1"; + version = "1.6.2"; goPackagePath = "github.com/hashicorp/packer"; @@ -11,7 +11,7 @@ buildGoPackage rec { owner = "hashicorp"; repo = "packer"; rev = "v${version}"; - sha256 = "0jm8950rk0cdf84z0yxm8ic3pm353cgmxr1akn6kq1bwg2w0vsrq"; + sha256 = "0kr9whv3s0f8866yjmwg311j3kcj29bp5xwpnv43ama4m1mq3bm7"; }; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/development/tools/packet-cli/default.nix b/nixpkgs/pkgs/development/tools/packet-cli/default.nix index 40561671c59..f7bcc8bf8f4 100644 --- a/nixpkgs/pkgs/development/tools/packet-cli/default.nix +++ b/nixpkgs/pkgs/development/tools/packet-cli/default.nix @@ -2,22 +2,27 @@ buildGoModule rec { pname = "packet-cli"; - version = "0.0.7"; + version = "0.0.8"; src = fetchFromGitHub { owner = "packethost"; repo = pname; rev = version; - sha256 = "1ixdqq0xwy2l2m1w93rzqw5gfrzw7w03r42qab3n733m4jkf4ni1"; + sha256 = "0ys6zyhyi65g0sj15pb6rslgbjgkh73y32gc0yvhfd6xmgzaxpxf"; }; - vendorSha256 = "10praxaiscxq4v3zknrabldxl7rpklkr5wdlwa5lxsx0if8mrvp7"; + vendorSha256 = "1h9p3hrr61hwkhkh4qbw0ld3hd5xi75qm8rwfrpz5z06jba1ll25"; + + postInstall = '' + ln -s $out/bin/packet-cli $out/bin/packet + ''; + + doCheck = false; meta = with stdenv.lib; { description = "Official Packet CLI"; homepage = "https://github.com/packethost/packet-cli"; license = licenses.mit; maintainers = with maintainers; [ filalex77 ]; - platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/development/tools/parinfer-rust/default.nix b/nixpkgs/pkgs/development/tools/parinfer-rust/default.nix index d016d21b738..f1627c7ed39 100644 --- a/nixpkgs/pkgs/development/tools/parinfer-rust/default.nix +++ b/nixpkgs/pkgs/development/tools/parinfer-rust/default.nix @@ -32,6 +32,5 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/eraserhd/parinfer-rust"; license = licenses.isc; maintainers = with maintainers; [ eraserhd ]; - platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/development/tools/parsing/bison/default.nix b/nixpkgs/pkgs/development/tools/parsing/bison/default.nix index 357c8ea17cf..ca422f931da 100644 --- a/nixpkgs/pkgs/development/tools/parsing/bison/default.nix +++ b/nixpkgs/pkgs/development/tools/parsing/bison/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "bison"; - version = "3.6.4"; + version = "3.7.1"; src = fetchurl { url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz"; - sha256 = "1s8kmfhg7a58vm65fc977ckp8zspy8diayrcjhs3cgrqnmjdx0w1"; + sha256 = "04vx6sah3bnr3a5n9knw306sb3y41pjfl7k9ihbsimghkj1m5n8x"; }; nativeBuildInputs = [ m4 perl ] ++ stdenv.lib.optional stdenv.isSunOS help2man; diff --git a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/default.nix b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/default.nix index e77b338a20a..b91acdca688 100644 --- a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/default.nix +++ b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/default.nix @@ -55,13 +55,16 @@ in rustPlatform.buildRustPackage { # needed for the tests rm -rf test/fixtures/grammars ln -s ${grammars} test/fixtures/grammars + + # These functions do not appear in the source code + sed -i /_ts_query_context/d lib/binding_web/exports.json + sed -i /___assert_fail/d lib/binding_web/exports.json ''; # Compile web assembly with emscripten. The --debug flag prevents us from # minifying the JavaScript; passing it allows us to side-step more Node # JS dependencies for installation. preBuild = '' - HOME=/tmp bash ./script/build-wasm --debug ''; @@ -90,7 +93,6 @@ in rustPlatform.buildRustPackage { * Robust enough to provide useful results even in the presence of syntax errors * Dependency-free so that the runtime library (which is written in pure C) can be embedded in any application ''; - platforms = lib.platforms.all; license = lib.licenses.mit; maintainers = with lib.maintainers; [ Profpatsch ]; # Darwin needs some more work with default libraries diff --git a/nixpkgs/pkgs/development/tools/pet/default.nix b/nixpkgs/pkgs/development/tools/pet/default.nix index fde668e8e45..4ed16d41746 100644 --- a/nixpkgs/pkgs/development/tools/pet/default.nix +++ b/nixpkgs/pkgs/development/tools/pet/default.nix @@ -13,6 +13,8 @@ buildGoModule rec { vendorSha256 = "0pnd89iqdj3f719xf4iy5r04n51d0rrrf0qb2zjirpw7vh7g82i9"; + doCheck = false; + subPackages = [ "." ]; meta = with lib; { diff --git a/nixpkgs/pkgs/development/tools/pgformatter/default.nix b/nixpkgs/pkgs/development/tools/pgformatter/default.nix index c1cb8cea8a6..1cd9f9ea17b 100644 --- a/nixpkgs/pkgs/development/tools/pgformatter/default.nix +++ b/nixpkgs/pkgs/development/tools/pgformatter/default.nix @@ -2,13 +2,13 @@ perlPackages.buildPerlPackage rec { pname = "pgformatter"; - version = "4.3"; + version = "4.4"; src = fetchFromGitHub { owner = "darold"; repo = "pgFormatter"; rev = "v${version}"; - sha256 = "0n8ydj01nmnkd8glzjb0yrsyax1pmdfvaxb5xj4pkb2mf6zm94qy"; + sha256 = "1sqjw6q005lws7qhkd26jqyb1xqmpcklzw5hk8paxxi8mzyjn0jp"; }; outputs = [ "out" ]; diff --git a/nixpkgs/pkgs/development/tools/pipenv/default.nix b/nixpkgs/pkgs/development/tools/pipenv/default.nix index 5f9e122c16a..3a6ea879e58 100644 --- a/nixpkgs/pkgs/development/tools/pipenv/default.nix +++ b/nixpkgs/pkgs/development/tools/pipenv/default.nix @@ -6,7 +6,7 @@ with python3.pkgs; let - runtimeDeps = [ + runtimeDeps = ps: with ps; [ certifi setuptools pip @@ -14,15 +14,15 @@ let virtualenv-clone ]; - pythonEnv = python3.withPackages(ps: with ps; runtimeDeps); + pythonEnv = python3.withPackages runtimeDeps; in buildPythonApplication rec { pname = "pipenv"; - version = "2020.6.2"; + version = "2020.8.13"; src = fetchPypi { inherit pname version; - sha256 = "12s7c3f3k5v1szdhklsxwisf9v3dk4mb9fh7762afpgs8mrrmm3x"; + sha256 = "eff0e10eadb330f612edfa5051d3d8e775e9e0e918c3c50361da703bd0daa035"; }; LC_ALL = "en_US.UTF-8"; @@ -36,7 +36,7 @@ in buildPythonApplication rec { --replace "sys.executable" "'${pythonEnv.interpreter}'" ''; - propagatedBuildInputs = runtimeDeps; + propagatedBuildInputs = runtimeDeps python3.pkgs; doCheck = true; checkPhase = '' diff --git a/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/default.nix b/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/default.nix index 5fb646fae88..cca876ca1e6 100644 --- a/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/default.nix +++ b/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/default.nix @@ -24,7 +24,7 @@ in lib.makeScope pkgs.newScope (self: { # Poetry2nix version - version = "1.11.0"; + version = "1.12.0"; /* Returns an attrset { python, poetryPackages, pyProject, poetryLock } for the given pyproject/lockfile. @@ -114,7 +114,7 @@ lib.makeScope pkgs.newScope (self: { __toPluginAble = toPluginAble self; - inherit (hooks) pipBuildHook removePathDependenciesHook poetry2nixFixupHook; + inherit (hooks) pipBuildHook removePathDependenciesHook poetry2nixFixupHook wheelUnpackHook; } ) # Null out any filtered packages, we don't want python.pkgs from nixpkgs @@ -159,13 +159,28 @@ lib.makeScope pkgs.newScope (self: { } ); + inherit (py) pyProject; + + # Add executables from tool.poetry.scripts + scripts = pyProject.tool.poetry.scripts or { }; + hasScripts = scripts != { }; + scriptsPackage = import ./shell-scripts.nix { + inherit scripts lib; + inherit (py) python; + }; + + hasEditable = editablePackageSources != { }; editablePackage = import ./editable.nix { inherit pkgs lib poetryLib editablePackageSources; inherit (py) pyProject python; }; in - py.python.withPackages (_: py.poetryPackages ++ lib.optional (editablePackageSources != { }) editablePackage); + py.python.withPackages ( + _: py.poetryPackages + ++ lib.optional hasEditable editablePackage + ++ lib.optional hasScripts scriptsPackage + ); /* Creates a Python application from pyproject.toml and poetry.lock diff --git a/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/hooks/default.nix b/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/hooks/default.nix index 001a3d09c6b..e248a5e2235 100644 --- a/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/hooks/default.nix +++ b/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/hooks/default.nix @@ -49,4 +49,16 @@ in } ./fixup-hook.sh ) { }; + # When the "wheel" package itself is a wheel the nixpkgs hook (which pulls in "wheel") leads to infinite recursion + # It doesn't _really_ depend on wheel though, it just copies the wheel. + wheelUnpackHook = callPackage + ({}: + makeSetupHook + { + name = "wheel-unpack-hook.sh"; + deps = [ ]; + } ./wheel-unpack-hook.sh + ) { }; + + } diff --git a/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/hooks/wheel-unpack-hook.sh b/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/hooks/wheel-unpack-hook.sh new file mode 100644 index 00000000000..fca808a933b --- /dev/null +++ b/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/hooks/wheel-unpack-hook.sh @@ -0,0 +1,18 @@ +# Setup hook to use in case a wheel is fetched +echo "Sourcing wheel setup hook" + +wheelUnpackPhase(){ + echo "Executing wheelUnpackPhase" + runHook preUnpack + + mkdir -p dist + cp "$src" "dist/$(stripHash "$src")" + +# runHook postUnpack # Calls find...? + echo "Finished executing wheelUnpackPhase" +} + +if [ -z "${dontUseWheelUnpack-}" ] && [ -z "${unpackPhase-}" ]; then + echo "Using wheelUnpackPhase" + unpackPhase=wheelUnpackPhase +fi diff --git a/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix b/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix index 6b784fd8fc5..2791d7dfcb4 100644 --- a/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix +++ b/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix @@ -47,10 +47,16 @@ pythonPackages.callPackage isGit = isSource && source.type == "git"; isLocal = isSource && source.type == "directory"; localDepPath = toPath source.url; - pyProject = poetryLib.readTOML (localDepPath + "/pyproject.toml"); - buildSystemPkgs = poetryLib.getBuildSystemPkgs { - inherit pythonPackages pyProject; - }; + + buildSystemPkgs = + let + pyProjectPath = localDepPath + "/pyproject.toml"; + pyProject = poetryLib.readTOML pyProjectPath; + in + if builtins.pathExists pyProjectPath then poetryLib.getBuildSystemPkgs { + inherit pythonPackages pyProject; + } else [ ]; + fileInfo = let isBdist = f: lib.strings.hasSuffix "whl" f.file; diff --git a/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix b/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix index 202261ecdb9..d722ec71b9a 100644 --- a/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix +++ b/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix @@ -12,6 +12,40 @@ self: super: } ); + ansible = super.ansible.overridePythonAttrs ( + old: { + + prePatch = pkgs.python.pkgs.ansible.prePatch or ""; + + postInstall = pkgs.python.pkgs.ansible.postInstall or ""; + + # Inputs copied from nixpkgs as ansible doesn't specify it's dependencies + # in a correct manner. + propagatedBuildInputs = old.propagatedBuildInputs ++ [ + self.pycrypto + self.paramiko + self.jinja2 + self.pyyaml + self.httplib2 + self.six + self.netaddr + self.dnspython + self.jmespath + self.dopy + self.ncclient + ]; + } + ); + + ansible-lint = super.ansible-lint.overridePythonAttrs ( + old: { + buildInputs = old.buildInputs ++ [ self.setuptools-scm-git-archive ]; + preBuild = '' + export HOME=$(mktemp -d) + ''; + } + ); + astroid = super.astroid.overridePythonAttrs ( old: rec { buildInputs = old.buildInputs ++ [ self.pytest-runner ]; @@ -135,6 +169,15 @@ self: super: } ); + h3 = super.h3.overridePythonAttrs ( + old: { + preBuild = (old.preBuild or "") + '' + substituteInPlace h3/h3.py \ + --replace "'{}/{}'.format(_dirname, libh3_path)" '"${pkgs.h3}/lib/libh3${pkgs.stdenv.hostPlatform.extensions.sharedLibrary}"' + ''; + } + ); + h5py = super.h5py.overridePythonAttrs ( old: if old.format != "wheel" then rec { @@ -324,6 +367,13 @@ self: super: pkgs.pkgconfig ]; + postPatch = '' + cat > setup.cfg <<EOF + [libs] + system_freetype = True + EOF + ''; + propagatedBuildInputs = old.propagatedBuildInputs ++ [ pkgs.libpng pkgs.freetype @@ -357,6 +407,23 @@ self: super: } ); + molecule = + if lib.versionOlder super.molecule.version "3.0.0" then (super.molecule.overridePythonAttrs ( + old: { + patches = (old.patches or [ ]) ++ [ + # Fix build with more recent setuptools versions + (pkgs.fetchpatch { + url = "https://github.com/ansible-community/molecule/commit/c9fee498646a702c77b5aecf6497cff324acd056.patch"; + sha256 = "1g1n45izdz0a3c9akgxx14zhdw6c3dkb48j8pq64n82fa6ndl1b7"; + excludes = [ "pyproject.toml" ]; + }) + ]; + buildInputs = old.buildInputs ++ [ self.setuptools-scm-git-archive ]; + } + )) else super.molecule.overridePythonAttrs (old: { + buildInputs = old.buildInputs ++ [ self.setuptools-scm-git-archive ]; + }); + netcdf4 = super.netcdf4.overridePythonAttrs ( old: { buildInputs = old.buildInputs ++ [ @@ -451,12 +518,16 @@ self: super: psycopg2 = super.psycopg2.overridePythonAttrs ( old: { + buildInputs = old.buildInputs + ++ lib.optional stdenv.isDarwin pkgs.openssl; nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.postgresql ]; } ); psycopg2-binary = super.psycopg2-binary.overridePythonAttrs ( old: { + buildInputs = old.buildInputs + ++ lib.optional stdenv.isDarwin pkgs.openssl; nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.postgresql ]; } ); @@ -753,6 +824,12 @@ self: super: } ); + ffmpeg-python = super.ffmpeg-python.overridePythonAttrs ( + old: { + buildInputs = old.buildInputs ++ [ self.pytest-runner ]; + } + ); + python-prctl = super.python-prctl.overridePythonAttrs ( old: { buildInputs = old.buildInputs ++ [ @@ -882,6 +959,9 @@ self: super: } ); + # nix uses a dash, poetry uses an underscore + typing_extensions = super.typing_extensions or self.typing-extensions; + urwidtrees = super.urwidtrees.overridePythonAttrs ( old: { propagatedBuildInputs = old.propagatedBuildInputs ++ [ @@ -898,6 +978,16 @@ self: super: } ); + vispy = super.vispy.overrideAttrs ( + old: { + inherit (pkgs.python3.pkgs.vispy) patches; + nativeBuildInputs = old.nativeBuildInputs ++ [ + self.cython + self.setuptools-scm-git-archive + ]; + } + ); + uvloop = super.uvloop.overridePythonAttrs ( old: { buildInputs = old.buildInputs ++ lib.optionals stdenv.isDarwin [ @@ -907,17 +997,34 @@ self: super: } ); + # Stop infinite recursion by using bootstrapped pkg from nixpkgs - wheel = ( - pkgs.python3.pkgs.override { + bootstrapped-pip = super.bootstrapped-pip.override { + wheel = (pkgs.python3.pkgs.override { python = self.python; - } - ).wheel.overridePythonAttrs ( - old: - if old.format == "other" then old else { - inherit (super.wheel) pname name version src; - } - ); + }).wheel; + }; + wheel = + let + isWheel = super.wheel.src.isWheel or false; + # If "wheel" is a pre-built binary wheel + wheelPackage = super.buildPythonPackage { + inherit (super.wheel) pname name version src; + inherit (pkgs.python3.pkgs.wheel) meta; + format = "wheel"; + }; + # If "wheel" is built from source + sourcePackage = ( + pkgs.python3.pkgs.override { + python = self.python; + } + ).wheel.overridePythonAttrs ( + old: { + inherit (super.wheel) pname name version src; + } + ); + in + if isWheel then wheelPackage else sourcePackage; zipp = ( diff --git a/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pep425.nix b/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pep425.nix index 7135cace287..ffa78c5dc01 100644 --- a/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pep425.nix +++ b/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pep425.nix @@ -62,7 +62,7 @@ let selectWheel = files: let filesWithoutSources = (builtins.filter (x: hasSuffix ".whl" x.file) files); - isPyAbiCompatible = pyabi: x: x == "none" || lib.hasPrefix pyabi x || ( + isPyAbiCompatible = pyabi: x: x == "none" || lib.hasPrefix pyabi x || lib.hasPrefix x pyabi || ( # The CPython stable ABI is abi3 as in the shared library suffix. python.passthru.implementation == "cpython" && builtins.elemAt (lib.splitString "." python.version) 0 == "3" && diff --git a/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/shell-scripts.nix b/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/shell-scripts.nix new file mode 100644 index 00000000000..cbaa4439afe --- /dev/null +++ b/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/shell-scripts.nix @@ -0,0 +1,41 @@ +{ lib +, scripts +, python +}: +let + mkScript = bin: entrypoint: + let + elem = builtins.elemAt (builtins.split ":" entrypoint); + module = elem 0; + fn = elem 2; + in + '' + cat << EOF >> $out/bin/${bin} + #!${python.interpreter} + import sys + import re + + # Insert "" to add CWD to import path + sys.path.insert(0, "") + + from ${module} import ${fn} + + if __name__ == '__main__': + sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?$', "", sys.argv[0]) + sys.exit(${fn}()) + EOF + chmod +x $out/bin/${bin} + ''; +in +python.pkgs.buildPythonPackage { + name = "poetry2nix-env-scripts"; + dontUnpack = true; + dontUseSetuptoolsBuild = true; + dontConfigure = true; + dontUseSetuptoolsCheck = true; + + installPhase = '' + mkdir -p $out/bin + ${lib.concatStringsSep "\n" (lib.mapAttrsToList mkScript scripts)} + ''; +} diff --git a/nixpkgs/pkgs/development/tools/profiling/heaptrack/default.nix b/nixpkgs/pkgs/development/tools/profiling/heaptrack/default.nix index 817bb117171..ed31f438a0a 100644 --- a/nixpkgs/pkgs/development/tools/profiling/heaptrack/default.nix +++ b/nixpkgs/pkgs/development/tools/profiling/heaptrack/default.nix @@ -6,13 +6,13 @@ mkDerivation rec { pname = "heaptrack"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "KDE"; repo = "heaptrack"; rev = "v${version}"; - sha256 = "0vgwldl5n41r4y3pv8w29gmyln0k2w6m59zrfw9psm4hkxvivzlx"; + sha256 = "0pw82c26da014i1qxnaib3fqa52ijhf0m4swhjc3qq4hm2dx9bxj"; }; nativeBuildInputs = [ cmake extra-cmake-modules ]; diff --git a/nixpkgs/pkgs/development/tools/profiling/sysprof/default.nix b/nixpkgs/pkgs/development/tools/profiling/sysprof/default.nix index 620bce7a0ff..ce731309882 100644 --- a/nixpkgs/pkgs/development/tools/profiling/sysprof/default.nix +++ b/nixpkgs/pkgs/development/tools/profiling/sysprof/default.nix @@ -1,4 +1,5 @@ { stdenv +, lib , desktop-file-utils , fetchurl , fetchpatch @@ -50,7 +51,7 @@ stdenv.mkDerivation rec { wrapGAppsHook gnome3.adwaita-icon-theme ]; - buildInputs = [ glib gtk3 pango polkit systemd.dev systemd.lib libdazzle ]; + buildInputs = [ glib gtk3 pango polkit systemd.dev (lib.getLib systemd) libdazzle ]; mesonFlags = [ "-Dsystemdunitdir=lib/systemd/system" diff --git a/nixpkgs/pkgs/development/tools/proto-contrib/default.nix b/nixpkgs/pkgs/development/tools/proto-contrib/default.nix index 2bd1ed08101..74f47f3f996 100644 --- a/nixpkgs/pkgs/development/tools/proto-contrib/default.nix +++ b/nixpkgs/pkgs/development/tools/proto-contrib/default.nix @@ -13,6 +13,8 @@ buildGoModule rec { vendorSha256 = "1ivvq5ch9grdrwqq29flv9821kyb16k0cj6wgj5v0dyn63w420aw"; + doCheck = false; + meta = with lib; { description = "Contributed tools and other packages on top of the Go proto package"; homepage = "https://github.com/emicklei/proto-contrib"; diff --git a/nixpkgs/pkgs/development/tools/protoc-gen-doc/default.nix b/nixpkgs/pkgs/development/tools/protoc-gen-doc/default.nix index 30457543213..1a1991be949 100644 --- a/nixpkgs/pkgs/development/tools/protoc-gen-doc/default.nix +++ b/nixpkgs/pkgs/development/tools/protoc-gen-doc/default.nix @@ -13,6 +13,8 @@ buildGoModule { vendorSha256 = "17qdpsff8jk7ks5v6ix1rb966x3yvq03vk5bs2zbnxfdra7bv3n6"; + doCheck = false; + meta = with lib; { description = "Documentation generator plugin for Google Protocol Buffers"; longDescription = '' diff --git a/nixpkgs/pkgs/development/tools/prototool/default.nix b/nixpkgs/pkgs/development/tools/prototool/default.nix index a5cf91b70d1..e58b89a2736 100644 --- a/nixpkgs/pkgs/development/tools/prototool/default.nix +++ b/nixpkgs/pkgs/development/tools/prototool/default.nix @@ -15,6 +15,8 @@ buildGoModule rec { vendorSha256 = "0gyj0yrri2j4yxmyn4d4vdhaxf2p08srpjcxg9zpaxwv5rrvipav"; + doCheck = false; + postInstall = '' wrapProgram "$out/bin/prototool" \ --prefix PROTOTOOL_PROTOC_BIN_PATH : "${protobuf}/bin/protoc" \ diff --git a/nixpkgs/pkgs/development/tools/purescript/spago/spago.nix b/nixpkgs/pkgs/development/tools/purescript/spago/spago.nix index 20a1f53f675..b36bc26433d 100644 --- a/nixpkgs/pkgs/development/tools/purescript/spago/spago.nix +++ b/nixpkgs/pkgs/development/tools/purescript/spago/spago.nix @@ -11,11 +11,11 @@ }: mkDerivation { pname = "spago"; - version = "0.15.3"; + version = "0.16.0"; src = fetchgit { url = "https://github.com/purescript/spago.git"; - sha256 = "0spc7r531kmh9magaxzy4jls3bzfazwf8sq3qzk6f292d7ky6n8y"; - rev = "da6d91c19b23f06f3ede793f78599a6589c9e7cd"; + sha256 = "0z4s0z14n1v9wajs7mj2b295rrrw24gdca79drzlv6x1y6dj7sxh"; + rev = "71b093cdf5e48ded645303281ab4a3ea5b730f5d"; fetchSubmodules = true; }; isLibrary = true; diff --git a/nixpkgs/pkgs/development/tools/quicktemplate/default.nix b/nixpkgs/pkgs/development/tools/quicktemplate/default.nix index d9433f535da..8f75540f3a6 100644 --- a/nixpkgs/pkgs/development/tools/quicktemplate/default.nix +++ b/nixpkgs/pkgs/development/tools/quicktemplate/default.nix @@ -13,13 +13,10 @@ buildGoPackage { sha256 = "1pimf5bwivklsr438if6l8by34gr48a05gl6hq07cvc8z6wl01m2"; }; - enableParallelBuilding = true; - meta = with stdenv.lib; { homepage = "https://github.com/valyala/quicktemplate"; description = "Fast, powerful, yet easy to use template engine for Go"; license = licenses.mit; maintainers = with maintainers; [ chiiruno ]; - platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/development/tools/rebazel/default.nix b/nixpkgs/pkgs/development/tools/rebazel/default.nix new file mode 100644 index 00000000000..73a58ee100b --- /dev/null +++ b/nixpkgs/pkgs/development/tools/rebazel/default.nix @@ -0,0 +1,21 @@ +{ lib, rustPlatform, fetchFromGitHub }: +rustPlatform.buildRustPackage rec { + pname = "rebazel"; + version = "0.1.4"; + + src = fetchFromGitHub { + owner = "meetup"; + repo = "rebazel"; + rev = "v${version}"; + hash = "sha256-v84ZXhtJpejQmP61NmP06+qrtMu/0yb7UyD7U12xlME="; + }; + + cargoSha256 = "sha256-2FmtbvtNfNoocj3Ly553KBLfOgBAa/eAxOrfZ3NGzzw="; + + meta = with lib; { + description = "tool for expediting bazel build workflows"; + homepage = "https://github.com/meetup/rebazel"; + license = licenses.mit; + maintainers = with maintainers; [ zimbatm ]; + }; +} diff --git a/nixpkgs/pkgs/development/tools/reftools/default.nix b/nixpkgs/pkgs/development/tools/reftools/default.nix index 02e448918b2..440d2f96133 100644 --- a/nixpkgs/pkgs/development/tools/reftools/default.nix +++ b/nixpkgs/pkgs/development/tools/reftools/default.nix @@ -10,7 +10,8 @@ buildGoModule rec { vendorSha256 = null; - goPackagePath = "github.com/davidrjenni/reftools"; + doCheck = false; + excludedPackages = "\\(cmd/fillswitch/test-fixtures\\)"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/tools/renderizer/default.nix b/nixpkgs/pkgs/development/tools/renderizer/default.nix index d3f010f1916..2b2c57135cb 100644 --- a/nixpkgs/pkgs/development/tools/renderizer/default.nix +++ b/nixpkgs/pkgs/development/tools/renderizer/default.nix @@ -13,6 +13,8 @@ buildGoModule rec { vendorSha256 = "13z357ww4j5bmmy8ag6d6gd5b2dib8kby73q8317pqnqzaxrrbcj"; + doCheck = false; + meta = with stdenv.lib; { description = "CLI to render Go template text files"; inherit (src.meta) homepage; diff --git a/nixpkgs/pkgs/development/tools/reno/default.nix b/nixpkgs/pkgs/development/tools/reno/default.nix index 2b082d03b5f..b05bb2cd26a 100644 --- a/nixpkgs/pkgs/development/tools/reno/default.nix +++ b/nixpkgs/pkgs/development/tools/reno/default.nix @@ -1,27 +1,58 @@ -{ stdenv, fetchurl, pythonPackages }: +{ stdenv +, git +, gnupg1 +, python3Packages +}: -with pythonPackages; buildPythonApplication rec { +with python3Packages; buildPythonApplication rec { pname = "reno"; - version = "2.3.2"; + version = "3.1.0"; - src = fetchurl { - url = "mirror://pypi/r/reno/${pname}-${version}.tar.gz"; - sha256 = "018vl9fj706jjf07xdx8q6761s53mrihjn69yjq09gp0vmp1g7i4"; + # Must be built from python sdist because of versioning quirks + src = fetchPypi { + inherit pname version; + sha256 = "2510e3aae4874674187f88f22f854e6b0ea1881b77039808a68ac1a5e8ee69b6"; }; - # Don't know how to make tests pass - doCheck = false; + propagatedBuildInputs = [ + dulwich + pbr + pyyaml + setuptools # required for finding pkg_resources at runtime + ]; - # Nothing to strip (python files) - dontStrip = true; + checkInputs = [ + # Python packages + pytestCheckHook + docutils + fixtures + sphinx + testtools + testscenarios - propagatedBuildInputs = [ pbr six pyyaml dulwich ]; - buildInputs = [ Babel ]; + # Required programs to run all tests + git + gnupg1 + ]; + + # remove b/c doesn't list all dependencies, and requires a few packages not in nixpkgs + postPatch = '' + rm test-requirements.txt + ''; + + disabledTests = [ + "test_build_cache_db" # expects to be run from a git repository + ]; + + # verify executable + postCheck = '' + $out/bin/reno -h + ''; meta = with stdenv.lib; { description = "Release Notes Manager"; - homepage = "http://docs.openstack.org/developer/reno/"; - license = licenses.asl20; - maintainers = with maintainers; [ guillaumekoenig ]; + homepage = "https://docs.openstack.org/reno/latest"; + license = licenses.asl20; + maintainers = with maintainers; [ drewrisinger guillaumekoenig ]; }; } diff --git a/nixpkgs/pkgs/development/tools/rgp/default.nix b/nixpkgs/pkgs/development/tools/rgp/default.nix index dea0512b7d6..8c3da159d64 100644 --- a/nixpkgs/pkgs/development/tools/rgp/default.nix +++ b/nixpkgs/pkgs/development/tools/rgp/default.nix @@ -13,16 +13,20 @@ , libXi , ncurses5 , qtbase +, qtdeclarative , zlib }: +let + buildNum = "2020-09-11-26"; +in stdenv.mkDerivation rec { pname = "rgp"; - version = "1.7.0.29"; + version = "1.8"; src = fetchurl { - url = "https://github.com/GPUOpen-Tools/radeon_gpu_profiler/releases/download/v${lib.versions.majorMinor version}/RadeonGPUProfiler_${version}.tgz"; - sha256 = "d7d4aa92231796a509dfcf92e9618cac98ae6572c12efd0871eb43afa4e8240a"; + url = "https://github.com/GPUOpen-Tools/radeon_gpu_profiler/releases/download/v${lib.versions.majorMinor version}/RadeonDeveloperTools-${buildNum}.tgz"; + sha256 = "1lpkh7sfpq697lm4xnkpjfchh8zpy49f4mb3c5qcn7brav5iqwfh"; }; nativeBuildInputs = [ makeWrapper autoPatchelfHook ]; @@ -38,6 +42,7 @@ stdenv.mkDerivation rec { libXi ncurses5 qtbase + qtdeclarative zlib ]; diff --git a/nixpkgs/pkgs/development/tools/richgo/default.nix b/nixpkgs/pkgs/development/tools/richgo/default.nix index 03b0af119b7..e6478086f79 100644 --- a/nixpkgs/pkgs/development/tools/richgo/default.nix +++ b/nixpkgs/pkgs/development/tools/richgo/default.nix @@ -13,6 +13,8 @@ buildGoModule rec { vendorSha256 = "1nvk3akjwfcbvif1w4cglsqplcajlwq3mnvk9b75nmn9qaqfbfjf"; + doCheck = false; + subPackages = [ "." ]; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/development/tools/rq/default.nix b/nixpkgs/pkgs/development/tools/rq/default.nix index edd24a8aaa2..68d3bfce06b 100644 --- a/nixpkgs/pkgs/development/tools/rq/default.nix +++ b/nixpkgs/pkgs/development/tools/rq/default.nix @@ -26,6 +26,5 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/dflemstr/rq"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ aristid filalex77 ]; - platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/development/tools/run/default.nix b/nixpkgs/pkgs/development/tools/run/default.nix index f769ab1ebe2..41d1a8a29fd 100644 --- a/nixpkgs/pkgs/development/tools/run/default.nix +++ b/nixpkgs/pkgs/development/tools/run/default.nix @@ -12,6 +12,8 @@ buildGoModule rec { vendorSha256 = "1g5rmiiwqpm8gky9yr5f2a7zsjjmm9i12r7yxj9cz7y3rmw9sw8c"; + doCheck = false; + meta = with stdenv.lib; { description = "Easily manage and invoke small scripts and wrappers"; homepage = "https://github.com/TekWizely/run"; diff --git a/nixpkgs/pkgs/development/tools/rust/bindgen/default.nix b/nixpkgs/pkgs/development/tools/rust/bindgen/default.nix index 2ca4b8070aa..cc1bf1c7476 100644 --- a/nixpkgs/pkgs/development/tools/rust/bindgen/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/bindgen/default.nix @@ -3,7 +3,7 @@ rustPlatform.buildRustPackage rec { pname = "rust-bindgen"; - version = "0.53.2"; + version = "0.54.1"; RUSTFLAGS = "--cap-lints warn"; # probably OK to remove after update @@ -11,10 +11,10 @@ rustPlatform.buildRustPackage rec { owner = "rust-lang"; repo = pname; rev = "v${version}"; - sha256 = "01dkaa2akqrhpxxf0g2zyfdb3nx16y14qsg0a9d5n92c4yyvmwjg"; + sha256 = "116np72w6agsi94xa1bdn6h7sa9gd522h358zlixk9xrhrx7yfn3"; }; - cargoSha256 = "0pm9kh3qrcv5jsbrr476982lg1j31fbvxpzs4gphxl0mv1qmp4zm"; + cargoSha256 = "12a7bd2579jcnkss073v5w5w68fxwvhq6c6ndjy8vp78wg83qich"; libclang = llvmPackages.libclang.lib; #for substituteAll @@ -51,7 +51,7 @@ rustPlatform.buildRustPackage rec { ''; meta = with stdenv.lib; { - description = "C and C++ binding generator"; + description = "Automatically generates Rust FFI bindings to C (and some C++) libraries."; longDescription = '' Bindgen takes a c or c++ header file and turns them into rust ffi declarations. @@ -61,6 +61,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/rust-lang/rust-bindgen"; license = with licenses; [ bsd3 ]; platforms = platforms.unix; - maintainers = [ maintainers.ralith ]; + maintainers = with maintainers; [ johntitor ralith ]; }; } diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-asm/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-asm/default.nix index d8aca4045bf..76b49056a3f 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-asm/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cargo-asm/default.nix @@ -24,6 +24,5 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/gnzlbg/cargo-asm"; license = licenses.mit; maintainers = [ maintainers.danieldk ]; - platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-c/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-c/default.nix new file mode 100644 index 00000000000..ce01fc1f00c --- /dev/null +++ b/nixpkgs/pkgs/development/tools/rust/cargo-c/default.nix @@ -0,0 +1,50 @@ +{ rustPlatform, stdenv, lib, fetchFromGitHub, fetchurl +, pkg-config, openssl +, CoreFoundation, libiconv, Security +}: + +rustPlatform.buildRustPackage rec { + pname = "cargo-c"; + version = "0.6.13"; + + src = stdenv.mkDerivation rec { + name = "${pname}-source-${version}"; + + src = fetchFromGitHub { + owner = "lu-zero"; + repo = pname; + rev = "v${version}"; + sha256 = "0ks2w3gclahidv6r6i0d0d6sli7r8wabxzgmhq03czy5w7kr0x56"; + }; + cargoLock = fetchurl { + url = "https://github.com/lu-zero/${pname}/releases/download/v${version}/Cargo.lock"; + sha256 = "0czy5q8hkjqyn53p7cjxnxfgwygx2a6casjb4nj5gxss2x3haih6"; + }; + + installPhase = '' + mkdir -p $out + cp -R ./* $out/ + cp ${cargoLock} $out/Cargo.lock + ''; + }; + + cargoSha256 = "0jjkcawcz6wacx22zir9ay1qsi5ffk7c4gwa6jpky4a94zr1h690"; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ openssl ] + ++ stdenv.lib.optionals stdenv.isDarwin [ CoreFoundation libiconv Security ]; + + meta = with lib; { + description = "A cargo subcommand to build and install C-ABI compatibile dynamic and static libraries"; + longDescription = '' + Cargo C-ABI helpers. A cargo applet that produces and installs a correct + pkg-config file, a static library and a dynamic library, and a C header + to be used by any C (and C-compatible) software. + ''; + homepage = "https://github.com/lu-zero/cargo-c"; + changelog = "https://github.com/lu-zero/cargo-c/releases/tag/v${version}"; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ primeos ]; + }; +} diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-cache/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-cache/default.nix new file mode 100644 index 00000000000..0f3571045d6 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/rust/cargo-cache/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub, rustPlatform, libiconv, Security }: + +rustPlatform.buildRustPackage rec { + pname = "cargo-cache"; + version = "0.5.1"; + + src = fetchFromGitHub { + owner = "matthiaskrgr"; + repo = pname; + rev = version; + sha256 = "02d593w1x8160p4m3jwm1dyvv383cy7njijlcaw49jczxv5isqbi"; + }; + + cargoSha256 = "150ifd7gq6csrasqw91z4nsaj6w7kf69j0w6wydr3z7bdahmlgqw"; + + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ]; + + checkFlagsArray = [ "offline_tests" ]; + + meta = with stdenv.lib; { + description = "Manage cargo cache (\${CARGO_HOME}, ~/.cargo/), print sizes of dirs and remove dirs selectively"; + homepage = "https://github.com/matthiaskrgr/cargo-cache"; + license = with licenses; [ asl20 /* or */ mit ]; + maintainers = with maintainers; [ filalex77 ]; + }; +} diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-crev/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-crev/default.nix index 1093440ecbf..750b651651c 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-crev/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cargo-crev/default.nix @@ -1,19 +1,28 @@ -{ stdenv, fetchFromGitHub, rustPlatform, Security, openssl, pkgconfig, libiconv, curl }: +{ stdenv +, fetchFromGitHub +, rustPlatform +, perl +, pkg-config +, Security +, curl +, libiconv +, openssl +}: rustPlatform.buildRustPackage rec { pname = "cargo-crev"; - version = "0.16.1"; + version = "0.17.0"; src = fetchFromGitHub { owner = "crev-dev"; repo = "cargo-crev"; rev = "v${version}"; - sha256 = "16da30zbv8f7w8bxsssmrpzm41a966wby1l6ldyiiszs980qh7c5"; + sha256 = "1s5wb5m0d77qi90pyxld98ap37xnxrz3sz5gazq0pp5i9c9xa124"; }; - cargoSha256 = "0z365pgdd95apk2zz2n0gx85s0gf8ccfbqippxqn1fdsppihib6g"; + cargoSha256 = "10dzvzjqib751h2p1pl0z3dy2d17xwrcp9vyfrfr185yximcw2wx"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ perl pkg-config ]; buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ Security libiconv curl ]; diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-embed/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-embed/default.nix new file mode 100644 index 00000000000..dafcd1ded2f --- /dev/null +++ b/nixpkgs/pkgs/development/tools/rust/cargo-embed/default.nix @@ -0,0 +1,27 @@ +{ stdenv, lib +, rustPlatform, fetchFromGitHub +, libusb1, pkg-config, rustfmt }: + +rustPlatform.buildRustPackage rec { + pname = "cargo-embed"; + version = "0.8.0"; + + src = fetchFromGitHub { + owner = "probe-rs"; + repo = pname; + rev = "v${version}"; + sha256 = "0klkgl7c42vhqxj6svw26lcr7rccq89bl17jn3p751x6281zvr35"; + }; + + cargoSha256 = "0w21q2fpr077m8jr24ld3qjimwk1m4fy9dh14fq9nv5xd4f5s8n8"; + + nativeBuildInputs = [ pkg-config rustfmt ]; + buildInputs = [ libusb1 ]; + + meta = with lib; { + description = "A cargo extension for working with microcontrollers."; + homepage = "http://probe.rs/"; + license = with licenses; [ asl20 /* or */ mit ]; + maintainers = with maintainers; [ fooker ]; + }; +} diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-expand/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-expand/default.nix index 93121a11eea..c32a87e7839 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-expand/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cargo-expand/default.nix @@ -18,7 +18,6 @@ rustPlatform.buildRustPackage rec { "A utility and Cargo subcommand designed to let people expand macros in their Rust source code"; homepage = "https://github.com/dtolnay/cargo-expand"; license = with licenses; [ mit asl20 ]; - platforms = platforms.all; maintainers = with maintainers; [ xrelkd ]; }; } diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-flash/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-flash/default.nix new file mode 100644 index 00000000000..d4844de21a0 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/rust/cargo-flash/default.nix @@ -0,0 +1,27 @@ +{ stdenv, lib +, rustPlatform, fetchFromGitHub +, libusb1, pkg-config, rustfmt }: + +rustPlatform.buildRustPackage rec { + pname = "cargo-flash"; + version = "0.8.0"; + + src = fetchFromGitHub { + owner = "probe-rs"; + repo = pname; + rev = "v${version}"; + sha256 = "1bcpv1r4pdpp22w7za7kdy7jl487x3nlwxiz6sqq3iq6wq3j9zj0"; + }; + + cargoSha256 = "1pf117fgw9x9diksqv58cw7i0kzmp25yj73y5ll69sk46b6z4j90"; + + nativeBuildInputs = [ pkg-config rustfmt ]; + buildInputs = [ libusb1 ]; + + meta = with lib; { + description = "A cargo extension for working with microcontrollers."; + homepage = "http://probe.rs/"; + license = with licenses; [ asl20 /* or */ mit ]; + maintainers = with maintainers; [ fooker ]; + }; +} diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-fund/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-fund/default.nix new file mode 100644 index 00000000000..06f99268d0b --- /dev/null +++ b/nixpkgs/pkgs/development/tools/rust/cargo-fund/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchFromGitHub, pkg-config, rustPlatform, Security, curl, openssl, libiconv }: + +rustPlatform.buildRustPackage rec { + pname = "cargo-fund"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "acfoltzer"; + repo = pname; + rev = version; + sha256 = "1jim5bgq3fc33391qpa1q1csbzqf4hk1qyfzwxpcs5pb4ixb6vgk"; + }; + + cargoSha256 = "181gcmaw2w5a6ah8a2ahsnc1zkadpmx1azkwh2a6x8myhzw2dxsj"; + + # The tests need a GitHub API token. + doCheck = false; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ Security libiconv curl ]; + + meta = with stdenv.lib; { + description = "Discover funding links for your project's dependencies"; + homepage = "https://github.com/acfoltzer/cargo-fund"; + license = with licenses; [ mit /* or */ asl20 ]; + maintainers = with maintainers; [ johntitor ]; + }; +} diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-fuzz/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-fuzz/default.nix index ea51cef24bd..14c849ac0af 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-fuzz/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cargo-fuzz/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchurl, runCommand, rustPlatform }: +{ stdenv, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { pname = "cargo-fuzz"; @@ -13,11 +13,12 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "0zxhak79f50m8nw95ny733mk4x2f7kyk6q9v4f7jr2rkcldhgrpr"; + doCheck = false; + meta = with stdenv.lib; { description = "Command line helpers for fuzzing"; homepage = "https://github.com/rust-fuzz/cargo-fuzz"; license = with licenses; [ mit asl20 ]; maintainers = [ maintainers.ekleog ]; - platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-geiger/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-geiger/default.nix index 09956976fb6..d30c3ad6292 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-geiger/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cargo-geiger/default.nix @@ -50,6 +50,5 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/rust-secure-code/cargo-geiger"; license = with licenses; [ asl20 /* or */ mit ]; maintainers = with maintainers; [ evanjs ]; - platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-generate/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-generate/default.nix index 360cb469e6c..5a262762027 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-generate/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cargo-generate/default.nix @@ -29,6 +29,5 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/ashleygwilliams/cargo-generate"; license = licenses.asl20; maintainers = [ maintainers.turbomack ]; - platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-inspect/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-inspect/default.nix index 8626ae243b8..5a8c9150279 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-inspect/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cargo-inspect/default.nix @@ -19,7 +19,6 @@ rustPlatform.buildRustPackage rec { description = "See what Rust is doing behind the curtains"; homepage = "https://github.com/mre/cargo-inspect"; license = with licenses; [ mit asl20 ]; - platforms = platforms.all; maintainers = with maintainers; [ minijackson ]; }; } diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-make/Cargo.lock b/nixpkgs/pkgs/development/tools/rust/cargo-make/Cargo.lock deleted file mode 100644 index 191e96f021f..00000000000 --- a/nixpkgs/pkgs/development/tools/rust/cargo-make/Cargo.lock +++ /dev/null @@ -1,1323 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -[[package]] -name = "adler" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccc9a9dd069569f212bc4330af9f17c4afb5e8ce185e83dbb14f1349dda18b10" - -[[package]] -name = "aho-corasick" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca972c2ea5f742bfce5687b9aef75506a764f61d37f8f649047846a9686ddb66" -dependencies = [ - "memchr 0.1.11", -] - -[[package]] -name = "aho-corasick" -version = "0.7.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "043164d8ba5c4c3035fec9bbee8647c0261d788f3474306f93bb65901cae0e86" -dependencies = [ - "memchr 2.3.3", -] - -[[package]] -name = "ansi_term" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" -dependencies = [ - "winapi 0.3.9", -] - -[[package]] -name = "arrayref" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544" - -[[package]] -name = "arrayvec" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cff77d8686867eceff3105329d4698d96c2391c176d5d03adc90c7389162b5b8" - -[[package]] -name = "attohttpc" -version = "0.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe174d1b67f7b2bafed829c09db039301eb5841f66e43be2cf60b326e7f8e2cc" -dependencies = [ - "flate2", - "http", - "log", - "native-tls", - "openssl", - "url", -] - -[[package]] -name = "atty" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -dependencies = [ - "hermit-abi", - "libc", - "winapi 0.3.9", -] - -[[package]] -name = "autocfg" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d" - -[[package]] -name = "base64" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b41b7ea54a0c9d92199de89e20e58d49f02f8e699814ef3fdf266f6f748d15c7" - -[[package]] -name = "base64" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3441f0f7b02788e948e47f457ca01f1d7e6d92c693bc132c22b087d3141c03ff" - -[[package]] -name = "bitflags" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" - -[[package]] -name = "blake2b_simd" -version = "0.5.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8fb2d74254a3a0b5cac33ac9f8ed0e44aa50378d9dbb2e5d83bd21ed1dc2c8a" -dependencies = [ - "arrayref", - "arrayvec", - "constant_time_eq", -] - -[[package]] -name = "bytes" -version = "0.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "118cf036fbb97d0816e3c34b2d7a1e8cfc60f68fcf63d550ddbe9bd5f59c213b" -dependencies = [ - "loom", -] - -[[package]] -name = "cargo-make" -version = "0.32.0" -dependencies = [ - "ci_info", - "clap", - "colored", - "dirs", - "duckscript", - "duckscriptsdk", - "envmnt", - "fern", - "fsio", - "git_info", - "glob", - "home", - "indexmap", - "log", - "run_script", - "rust_info", - "rusty-hook", - "semver 0.10.0", - "serde", - "serde_derive", - "serde_json", - "shell2batch", - "toml", -] - -[[package]] -name = "cc" -version = "1.0.57" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fde55d2a2bfaa4c9668bbc63f531fbdeee3ffe188f4662511ce2c22b3eedebe" - -[[package]] -name = "cfg-if" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b486ce3ccf7ffd79fdeb678eac06a9e6c09fc88d33836340becb8fffe87c5e33" - -[[package]] -name = "chrono" -version = "0.2.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9213f7cd7c27e95c2b57c49f0e69b1ea65b27138da84a170133fd21b07659c00" -dependencies = [ - "num", - "time", -] - -[[package]] -name = "ci_info" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24f638c70e8c5753795cc9a8c07c44da91554a09e4cf11a7326e8161b0a3c45e" -dependencies = [ - "envmnt", -] - -[[package]] -name = "clap" -version = "2.33.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdfa80d47f954d53a35a64987ca1422f495b8d6483c0fe9f7117b36c2a792129" -dependencies = [ - "ansi_term", - "atty", - "bitflags", - "strsim", - "textwrap", - "unicode-width", - "vec_map", -] - -[[package]] -name = "colored" -version = "1.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4ffc801dacf156c5854b9df4f425a626539c3a6ef7893cc0c5084a23f0b6c59" -dependencies = [ - "atty", - "lazy_static 1.4.0", - "winapi 0.3.9", -] - -[[package]] -name = "constant_time_eq" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" - -[[package]] -name = "core-foundation" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57d24c7a13c43e870e37c1556b74555437870a04514f7685f5b354e090567171" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "core-foundation-sys" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3a71ab494c0b5b860bdc8407ae08978052417070c2ced38573a9157ad75b8ac" - -[[package]] -name = "crc32fast" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba125de2af0df55319f41944744ad91c71113bf74a4646efff39afe1f6842db1" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "crossbeam-utils" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8" -dependencies = [ - "autocfg", - "cfg-if", - "lazy_static 1.4.0", -] - -[[package]] -name = "dirs" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fddc3610d8f9552384e06ebc87f714e1d0b2b64a99194d2faf36d7ae5f48549" -dependencies = [ - "cfg-if", - "dirs-sys", -] - -[[package]] -name = "dirs-sys" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e93d7f5705de3e49895a2b5e0b8855a1c27f080192ae9c32a6432d50741a57a" -dependencies = [ - "libc", - "redox_users", - "winapi 0.3.9", -] - -[[package]] -name = "duckscript" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f4c3da85470786f086bd14c0b299092715a99f8d8bb0ac2b787cbaab71e6ba6" -dependencies = [ - "fsio", -] - -[[package]] -name = "duckscriptsdk" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0033c9c694e0a358f42316e3517442ca9039de8b3838d8320fb129da5dbec28b" -dependencies = [ - "attohttpc", - "base64 0.12.3", - "cfg-if", - "duckscript", - "fs_extra", - "fsio", - "ftp", - "glob", - "home", - "java-properties", - "meval", - "num_cpus", - "rand", - "uname", - "walkdir", - "which", - "whoami", -] - -[[package]] -name = "encoding" -version = "0.2.33" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b0d943856b990d12d3b55b359144ff341533e516d94098b1d3fc1ac666d36ec" -dependencies = [ - "encoding-index-japanese", - "encoding-index-korean", - "encoding-index-simpchinese", - "encoding-index-singlebyte", - "encoding-index-tradchinese", -] - -[[package]] -name = "encoding-index-japanese" -version = "1.20141219.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04e8b2ff42e9a05335dbf8b5c6f7567e5591d0d916ccef4e0b1710d32a0d0c91" -dependencies = [ - "encoding_index_tests", -] - -[[package]] -name = "encoding-index-korean" -version = "1.20141219.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dc33fb8e6bcba213fe2f14275f0963fd16f0a02c878e3095ecfdf5bee529d81" -dependencies = [ - "encoding_index_tests", -] - -[[package]] -name = "encoding-index-simpchinese" -version = "1.20141219.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d87a7194909b9118fc707194baa434a4e3b0fb6a5a757c73c3adb07aa25031f7" -dependencies = [ - "encoding_index_tests", -] - -[[package]] -name = "encoding-index-singlebyte" -version = "1.20141219.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3351d5acffb224af9ca265f435b859c7c01537c0849754d3db3fdf2bfe2ae84a" -dependencies = [ - "encoding_index_tests", -] - -[[package]] -name = "encoding-index-tradchinese" -version = "1.20141219.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd0e20d5688ce3cab59eb3ef3a2083a5c77bf496cb798dc6fcdb75f323890c18" -dependencies = [ - "encoding_index_tests", -] - -[[package]] -name = "encoding_index_tests" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a246d82be1c9d791c5dfde9a2bd045fc3cbba3fa2b11ad558f27d01712f00569" - -[[package]] -name = "envmnt" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0dad160daebf530422640d9496277681d6a2caa3172ec8fd2a315a122829319b" -dependencies = [ - "fsio", - "indexmap", -] - -[[package]] -name = "fern" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c9a4820f0ccc8a7afd67c39a0f1a0f4b07ca1725164271a64939d7aeb9af065" -dependencies = [ - "log", -] - -[[package]] -name = "flate2" -version = "1.0.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68c90b0fc46cf89d227cc78b40e494ff81287a92dd07631e5af0d06fe3cf885e" -dependencies = [ - "cfg-if", - "crc32fast", - "libc", - "miniz_oxide", -] - -[[package]] -name = "fnv" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" - -[[package]] -name = "foreign-types" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" -dependencies = [ - "foreign-types-shared", -] - -[[package]] -name = "foreign-types-shared" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" - -[[package]] -name = "fs_extra" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f2a4a2034423744d2cc7ca2068453168dcdb82c438419e639a26bd87839c674" - -[[package]] -name = "fsio" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2131cb03096f67334dfba2f0bc46afc5564b08a919d042c6e217e2665741fc54" -dependencies = [ - "rand", - "users", -] - -[[package]] -name = "ftp" -version = "3.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "542951aad0071952c27409e3bd7cb62d1a3ad419c4e7314106bf994e0083ad5d" -dependencies = [ - "chrono", - "lazy_static 0.1.16", - "regex 0.1.80", -] - -[[package]] -name = "generator" -version = "0.6.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "add72f17bb81521258fcc8a7a3245b1e184e916bfbe34f0ea89558f440df5c68" -dependencies = [ - "cc", - "libc", - "log", - "rustc_version", - "winapi 0.3.9", -] - -[[package]] -name = "getopts" -version = "0.2.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14dbbfd5c71d70241ecf9e6f13737f7b5ce823821063188d7e46c41d371eebd5" -dependencies = [ - "unicode-width", -] - -[[package]] -name = "getrandom" -version = "0.1.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7abc8dd8451921606d809ba32e95b6111925cd2906060d2dcc29c070220503eb" -dependencies = [ - "cfg-if", - "libc", - "wasi", -] - -[[package]] -name = "git_info" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "641b847f0375f4b2c595438eefc17a9c0fbf47b400cbdd1ad9332bf1e16b779d" - -[[package]] -name = "glob" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" - -[[package]] -name = "hermit-abi" -version = "0.1.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9586eedd4ce6b3c498bc3b4dd92fc9f11166aa908a914071953768066c67909" -dependencies = [ - "libc", -] - -[[package]] -name = "home" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2456aef2e6b6a9784192ae780c0f15bc57df0e918585282325e8c8ac27737654" -dependencies = [ - "winapi 0.3.9", -] - -[[package]] -name = "http" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28d569972648b2c512421b5f2a405ad6ac9666547189d0c5477a3f200f3e02f9" -dependencies = [ - "bytes", - "fnv", - "itoa", -] - -[[package]] -name = "idna" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02e2673c30ee86b5b96a9cb52ad15718aa1f966f5ab9ad54a8b95d5ca33120a9" -dependencies = [ - "matches", - "unicode-bidi", - "unicode-normalization", -] - -[[package]] -name = "indexmap" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c398b2b113b55809ceb9ee3e753fcbac793f1956663f3c36549c1346015c2afe" -dependencies = [ - "autocfg", - "serde", -] - -[[package]] -name = "itoa" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc6f3ad7b9d11a0c00842ff8de1b60ee58661048eb8049ed33c73594f359d7e6" - -[[package]] -name = "java-properties" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "caf4418ade5bde22a283a7f2fb537ea397ec102718f259f2630714e7a5b389fa" -dependencies = [ - "encoding", - "regex 1.3.9", -] - -[[package]] -name = "kernel32-sys" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" -dependencies = [ - "winapi 0.2.8", - "winapi-build", -] - -[[package]] -name = "lazy_static" -version = "0.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf186d1a8aa5f5bee5fd662bc9c1b949e0259e1bcc379d1f006847b0080c7417" - -[[package]] -name = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - -[[package]] -name = "libc" -version = "0.2.71" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9457b06509d27052635f90d6466700c65095fdf75409b3fbdd903e988b886f49" - -[[package]] -name = "log" -version = "0.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "loom" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ecc775857611e1df29abba5c41355cdf540e7e9d4acfdf0f355eefee82330b7" -dependencies = [ - "cfg-if", - "generator", - "scoped-tls", -] - -[[package]] -name = "matches" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" - -[[package]] -name = "memchr" -version = "0.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8b629fb514376c675b98c1421e80b151d3817ac42d7c667717d282761418d20" -dependencies = [ - "libc", -] - -[[package]] -name = "memchr" -version = "2.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400" - -[[package]] -name = "meval" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f79496a5651c8d57cd033c5add8ca7ee4e3d5f7587a4777484640d9cb60392d9" -dependencies = [ - "fnv", - "nom", -] - -[[package]] -name = "miniz_oxide" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be0f75932c1f6cfae3c04000e40114adf955636e19040f9c0a2c380702aa1c7f" -dependencies = [ - "adler", -] - -[[package]] -name = "native-tls" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b0d88c06fe90d5ee94048ba40409ef1d9315d86f6f38c2efdaad4fb50c58b2d" -dependencies = [ - "lazy_static 1.4.0", - "libc", - "log", - "openssl", - "openssl-probe", - "openssl-sys", - "schannel", - "security-framework", - "security-framework-sys", - "tempfile", -] - -[[package]] -name = "nias" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab250442c86f1850815b5d268639dff018c0627022bc1940eb2d642ca1ce12f0" - -[[package]] -name = "nom" -version = "1.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5b8c256fd9471521bcb84c3cdba98921497f1a331cbc15b8030fc63b82050ce" - -[[package]] -name = "num" -version = "0.1.42" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4703ad64153382334aa8db57c637364c322d3372e097840c72000dabdcf6156e" -dependencies = [ - "num-integer", - "num-iter", - "num-traits", -] - -[[package]] -name = "num-integer" -version = "0.1.43" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d59457e662d541ba17869cf51cf177c0b5f0cbf476c66bdc90bf1edac4f875b" -dependencies = [ - "autocfg", - "num-traits", -] - -[[package]] -name = "num-iter" -version = "0.1.41" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a6e6b7c748f995c4c29c5f5ae0248536e04a5739927c74ec0fa564805094b9f" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-traits" -version = "0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac267bcc07f48ee5f8935ab0d24f316fb722d7a1292e2913f0cc196b29ffd611" -dependencies = [ - "autocfg", -] - -[[package]] -name = "num_cpus" -version = "1.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3" -dependencies = [ - "hermit-abi", - "libc", -] - -[[package]] -name = "openssl" -version = "0.10.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d575eff3665419f9b83678ff2815858ad9d11567e082f5ac1814baba4e2bcb4" -dependencies = [ - "bitflags", - "cfg-if", - "foreign-types", - "lazy_static 1.4.0", - "libc", - "openssl-sys", -] - -[[package]] -name = "openssl-probe" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de" - -[[package]] -name = "openssl-sys" -version = "0.9.58" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a842db4709b604f0fe5d1170ae3565899be2ad3d9cbc72dedc789ac0511f78de" -dependencies = [ - "autocfg", - "cc", - "libc", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "percent-encoding" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" - -[[package]] -name = "pkg-config" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05da548ad6865900e60eaba7f589cc0783590a92e940c26953ff81ddbab2d677" - -[[package]] -name = "ppv-lite86" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "237a5ed80e274dbc66f86bd59c1e25edc039660be53194b5fe0a482e0f2612ea" - -[[package]] -name = "proc-macro2" -version = "1.0.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "beae6331a816b1f65d04c45b078fd8e6c93e8071771f41b8163255bbd8d7c8fa" -dependencies = [ - "unicode-xid", -] - -[[package]] -name = "quote" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa563d17ecb180e500da1cfd2b028310ac758de548efdd203e18f283af693f37" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "rand" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" -dependencies = [ - "getrandom", - "libc", - "rand_chacha", - "rand_core", - "rand_hc", -] - -[[package]] -name = "rand_chacha" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" -dependencies = [ - "ppv-lite86", - "rand_core", -] - -[[package]] -name = "rand_core" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" -dependencies = [ - "getrandom", -] - -[[package]] -name = "rand_hc" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" -dependencies = [ - "rand_core", -] - -[[package]] -name = "redox_syscall" -version = "0.1.56" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84" - -[[package]] -name = "redox_users" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09b23093265f8d200fa7b4c2c76297f47e681c655f6f1285a8780d6a022f7431" -dependencies = [ - "getrandom", - "redox_syscall", - "rust-argon2", -] - -[[package]] -name = "regex" -version = "0.1.80" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fd4ace6a8cf7860714a2c2280d6c1f7e6a413486c13298bbc86fd3da019402f" -dependencies = [ - "aho-corasick 0.5.3", - "memchr 0.1.11", - "regex-syntax 0.3.9", - "thread_local 0.2.7", - "utf8-ranges", -] - -[[package]] -name = "regex" -version = "1.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c3780fcf44b193bc4d09f36d2a3c87b251da4a046c87795a0d35f4f927ad8e6" -dependencies = [ - "aho-corasick 0.7.13", - "memchr 2.3.3", - "regex-syntax 0.6.18", - "thread_local 1.0.1", -] - -[[package]] -name = "regex-syntax" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9ec002c35e86791825ed294b50008eea9ddfc8def4420124fbc6b08db834957" - -[[package]] -name = "regex-syntax" -version = "0.6.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26412eb97c6b088a6997e05f69403a802a92d520de2f8e63c2b65f9e0f47c4e8" - -[[package]] -name = "remove_dir_all" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" -dependencies = [ - "winapi 0.3.9", -] - -[[package]] -name = "run_script" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8e8fc35067815a04a35fe2144361e1257b0f1041f0d413664f38e44d1a73cb4" -dependencies = [ - "fsio", -] - -[[package]] -name = "rust-argon2" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bc8af4bda8e1ff4932523b94d3dd20ee30a87232323eda55903ffd71d2fb017" -dependencies = [ - "base64 0.11.0", - "blake2b_simd", - "constant_time_eq", - "crossbeam-utils", -] - -[[package]] -name = "rust_info" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02b506bd796703b88d74a3edb529acde6c71d81bb078c392eecd60a745cb1d2f" - -[[package]] -name = "rustc_version" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" -dependencies = [ - "semver 0.9.0", -] - -[[package]] -name = "rusty-hook" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96cee9be61be7e1cbadd851e58ed7449c29c620f00b23df937cb9cbc04ac21a3" -dependencies = [ - "ci_info", - "getopts", - "nias", - "toml", -] - -[[package]] -name = "ryu" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e" - -[[package]] -name = "same-file" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "schannel" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f05ba609c234e60bee0d547fe94a4c7e9da733d1c962cf6e59efa4cd9c8bc75" -dependencies = [ - "lazy_static 1.4.0", - "winapi 0.3.9", -] - -[[package]] -name = "scoped-tls" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "332ffa32bf586782a3efaeb58f127980944bbc8c4d6913a86107ac2a5ab24b28" - -[[package]] -name = "security-framework" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64808902d7d99f78eaddd2b4e2509713babc3dc3c85ad6f4c447680f3c01e535" -dependencies = [ - "bitflags", - "core-foundation", - "core-foundation-sys", - "libc", - "security-framework-sys", -] - -[[package]] -name = "security-framework-sys" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17bf11d99252f512695eb468de5516e5cf75455521e69dfe343f3b74e4748405" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "semver" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" -dependencies = [ - "semver-parser", -] - -[[package]] -name = "semver" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "394cec28fa623e00903caf7ba4fa6fb9a0e260280bb8cdbbba029611108a0190" -dependencies = [ - "semver-parser", -] - -[[package]] -name = "semver-parser" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" - -[[package]] -name = "serde" -version = "1.0.114" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5317f7588f0a5078ee60ef675ef96735a1442132dc645eb1d12c018620ed8cd3" - -[[package]] -name = "serde_derive" -version = "1.0.114" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a0be94b04690fbaed37cddffc5c134bf537c8e3329d53e982fe04c374978f8e" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "serde_json" -version = "1.0.56" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3433e879a558dde8b5e8feb2a04899cf34fdde1fafb894687e52105fc1162ac3" -dependencies = [ - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "shell2batch" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "185a52ee351c1001753c9e3b2eb48c525ff7f51803a4f2cef4365b5c3b743f65" -dependencies = [ - "regex 1.3.9", -] - -[[package]] -name = "strsim" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" - -[[package]] -name = "syn" -version = "1.0.33" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8d5d96e8cbb005d6959f119f773bfaebb5684296108fb32600c00cde305b2cd" -dependencies = [ - "proc-macro2", - "quote", - "unicode-xid", -] - -[[package]] -name = "tempfile" -version = "3.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9" -dependencies = [ - "cfg-if", - "libc", - "rand", - "redox_syscall", - "remove_dir_all", - "winapi 0.3.9", -] - -[[package]] -name = "textwrap" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" -dependencies = [ - "unicode-width", -] - -[[package]] -name = "thiserror" -version = "1.0.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dfdd070ccd8ccb78f4ad66bf1982dc37f620ef696c6b5028fe2ed83dd3d0d08" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd80fc12f73063ac132ac92aceea36734f04a1d93c1240c6944e23a3b8841793" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "thread-id" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9539db560102d1cef46b8b78ce737ff0bb64e7e18d35b2a5688f7d097d0ff03" -dependencies = [ - "kernel32-sys", - "libc", -] - -[[package]] -name = "thread_local" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8576dbbfcaef9641452d5cf0df9b0e7eeab7694956dd33bb61515fb8f18cfdd5" -dependencies = [ - "thread-id", -] - -[[package]] -name = "thread_local" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14" -dependencies = [ - "lazy_static 1.4.0", -] - -[[package]] -name = "time" -version = "0.1.43" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438" -dependencies = [ - "libc", - "winapi 0.3.9", -] - -[[package]] -name = "tinyvec" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53953d2d3a5ad81d9f844a32f14ebb121f50b650cd59d0ee2a07cf13c617efed" - -[[package]] -name = "toml" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffc92d160b1eef40665be3a05630d003936a3bc7da7421277846c2613e92c71a" -dependencies = [ - "serde", -] - -[[package]] -name = "uname" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b72f89f0ca32e4db1c04e2a72f5345d59796d4866a1ee0609084569f73683dc8" -dependencies = [ - "libc", -] - -[[package]] -name = "unicode-bidi" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5" -dependencies = [ - "matches", -] - -[[package]] -name = "unicode-normalization" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fb19cf769fa8c6a80a162df694621ebeb4dafb606470b2b2fce0be40a98a977" -dependencies = [ - "tinyvec", -] - -[[package]] -name = "unicode-width" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3" - -[[package]] -name = "unicode-xid" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564" - -[[package]] -name = "url" -version = "2.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "829d4a8476c35c9bf0bbce5a3b23f4106f79728039b726d292bb93bc106787cb" -dependencies = [ - "idna", - "matches", - "percent-encoding", -] - -[[package]] -name = "users" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c72f4267aea0c3ec6d07eaabea6ead7c5ddacfafc5e22bcf8d186706851fb4cf" -dependencies = [ - "libc", -] - -[[package]] -name = "utf8-ranges" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1ca13c08c41c9c3e04224ed9ff80461d97e121589ff27c753a16cb10830ae0f" - -[[package]] -name = "vcpkg" -version = "0.2.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6454029bf181f092ad1b853286f23e2c507d8e8194d01d92da4a55c274a5508c" - -[[package]] -name = "vec_map" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" - -[[package]] -name = "walkdir" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "777182bc735b6424e1a57516d35ed72cb8019d85c8c9bf536dccb3445c1a2f7d" -dependencies = [ - "same-file", - "winapi 0.3.9", - "winapi-util", -] - -[[package]] -name = "wasi" -version = "0.9.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" - -[[package]] -name = "which" -version = "4.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5fe1a9cb33fe7cf77d431070d0223e544b1e4e7f7764bad0a3e691a6678a131" -dependencies = [ - "libc", - "thiserror", -] - -[[package]] -name = "whoami" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7884773ab69074615cb8f8425d0e53f11710786158704fca70f53e71b0e05504" - -[[package]] -name = "winapi" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" - -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-build" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-util" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" -dependencies = [ - "winapi 0.3.9", -] - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-make/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-make/default.nix index bffa9186fd5..a1e9f7971f4 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-make/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cargo-make/default.nix @@ -1,32 +1,22 @@ -{ stdenv, fetchurl, runCommand, fetchFromGitHub, rustPlatform, Security, openssl, pkg-config +{ stdenv, fetchurl, runCommand, fetchCrate, rustPlatform, Security, openssl, pkg-config , SystemConfiguration }: rustPlatform.buildRustPackage rec { pname = "cargo-make"; - version = "0.32.0"; + version = "0.32.4"; - src = - let - source = fetchFromGitHub { - owner = "sagiegurari"; - repo = pname; - rev = version; - sha256 = "1bkc3z1w9gbjymmr5lk322kn0rd6b57v92a32jf7nckllxf43807"; - }; - in - runCommand "source" {} '' - cp -R ${source} $out - chmod +w $out - cp ${./Cargo.lock} $out/Cargo.lock - ''; + src = fetchCrate { + inherit pname version; + sha256 = "04x363wz82f0sr4128f1nk1wxnnszxsmaxjs92mbvmpbvry82ivq"; + }; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; - cargoSha256 = "0l7krag7n4kjvh3d4zhkk1jdswsrkag5z664fm1zwvf6rw6sfdmi"; + cargoSha256 = "1fgcxgm800sr0y6ab7c42l335b6c00cx0f2r5rgayi645a47a1zf"; # Some tests fail because they need network access. # However, Travis ensures a proper build. @@ -39,6 +29,5 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/sagiegurari/cargo-make"; license = licenses.asl20; maintainers = with maintainers; [ xrelkd ma27 ]; - platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-raze/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-raze/default.nix index 96b4cd078bc..8df03a4bd15 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-raze/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cargo-raze/default.nix @@ -26,6 +26,5 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/google/cargo-raze"; license = licenses.asl20; maintainers = with maintainers; [ elasticdog ]; - platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-sweep/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-sweep/default.nix index 2dfbfeeb179..72883ab4508 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-sweep/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cargo-sweep/default.nix @@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec { description = "A Cargo subcommand for cleaning up unused build files generated by Cargo"; homepage = "https://github.com/holmgr/cargo-sweep"; license = licenses.mit; - platforms = platforms.all; maintainers = with maintainers; [ xrelkd ]; }; } diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-udeps/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-udeps/default.nix index 97f49631cd0..b7879adcc31 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-udeps/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cargo-udeps/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-udeps"; - version = "0.1.13"; + version = "0.1.14"; src = fetchFromGitHub { owner = "est31"; repo = pname; rev = "v${version}"; - sha256 = "0wxpzrcrdxlihzxzqmrhii5bfxknliqb4d5mka4k42x5vim8pq2f"; + sha256 = "0imvq63i3s9qmm0x8cbaknjap2yfmpzva3y0sxmgkcm8ajkvp114"; }; - cargoSha256 = "0q1q7x1205a8dp35d4dds3mizl6y4d3rfc5gkarri1g189nrk5pl"; + cargoSha256 = "196w9rgz4pwqvkiy839kqz765ljqx1k129w4nvxgxv3rcmy4lbzm"; nativeBuildInputs = [ pkgconfig ]; @@ -26,6 +26,5 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/est31/cargo-udeps"; license = licenses.mit; maintainers = with maintainers; [ b4dm4n ]; - platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-watch/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-watch/default.nix index 91f25923609..8bd4bf6fff8 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-watch/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cargo-watch/default.nix @@ -25,7 +25,6 @@ rustPlatform.buildRustPackage rec { description = "A Cargo subcommand for watching over Cargo project's source"; homepage = "https://github.com/passcod/cargo-watch"; license = licenses.cc0; - platforms = platforms.all; maintainers = with maintainers; [ xrelkd ivan ]; }; } diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-xbuild/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-xbuild/default.nix index 6af944e9c5d..912f5199b4c 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-xbuild/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cargo-xbuild/default.nix @@ -2,22 +2,21 @@ rustPlatform.buildRustPackage rec { pname = "cargo-xbuild"; - version = "0.5.29"; + version = "0.6.0"; src = fetchFromGitHub { owner = "rust-osdev"; repo = pname; rev = "v${version}"; - sha256 = "05wg1xx2mcwb9cplmrpg13jimddlzmv7hf5g3vjppjp8kz2gb7zj"; + sha256 = "0kmnwx2fg4nq009dzwk840z8n4rayvpk6hjpryczv56sjdcqm2zv"; }; - cargoSha256 = "1s2xsfld29shvjzyp16y263hnbqxrq8i2557y0g09xmfm5x0jhix"; + cargoSha256 = "0vnhaf7b2ai151wjadgj7pm5hdcj7rv1ckj5mjn74r3vvds2jdn7"; meta = with stdenv.lib; { description = "Automatically cross-compiles the sysroot crates core, compiler_builtins, and alloc"; homepage = "https://github.com/rust-osdev/cargo-xbuild"; license = with licenses; [ mit asl20 ]; - maintainers = with maintainers; [ xrelkd ]; - platforms = platforms.all; + maintainers = with maintainers; [ johntitor xrelkd ]; }; } diff --git a/nixpkgs/pkgs/development/tools/rust/cbindgen/default.nix b/nixpkgs/pkgs/development/tools/rust/cbindgen/default.nix index 655d726e66e..62b9a616644 100644 --- a/nixpkgs/pkgs/development/tools/rust/cbindgen/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cbindgen/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "rust-cbindgen"; - version = "0.14.3"; + version = "0.14.4"; src = fetchFromGitHub { owner = "eqrion"; repo = "cbindgen"; rev = "v${version}"; - sha256 = "0pw55334i10k75qkig8bgcnlsy613zw2p5j4xyz8v71s4vh1a58j"; + sha256 = "06bis9kk3r0gishzmsq5wk3vv8r78ggk4m800562q2yhnhc37lfd"; }; - cargoSha256 = "0088ijnjhqfvdb1wxy9jc7hq8c0yxgj5brlg68n9vws1mz9rilpy"; + cargoSha256 = "0x8lxlik4n8rmlydcp0vqyiqwqm98cgwvw3h5hm2zviv8v0y8jnr"; buildInputs = stdenv.lib.optional stdenv.isDarwin Security; diff --git a/nixpkgs/pkgs/development/tools/rust/maturin/default.nix b/nixpkgs/pkgs/development/tools/rust/maturin/default.nix index 9eee570f67e..723ea94152c 100644 --- a/nixpkgs/pkgs/development/tools/rust/maturin/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/maturin/default.nix @@ -5,16 +5,16 @@ let inherit (darwin.apple_sdk.frameworks) Security; in rustPlatform.buildRustPackage rec { name = "maturin-${version}"; - version = "0.8.2"; + version = "0.8.3"; src = fetchFromGitHub { owner = "PyO3"; repo = "maturin"; rev = "v${version}"; - sha256 = "1y6bxqbv7k8xvqjzgpf6n2n3yad4qxr2dwwlw8cb0knd7cfl2a2n"; + sha256 = "08l5r7d75id6qzf8xhkjv4hkdr64cq4dbcmdjywmvf9szjbnr65z"; }; - cargoSha256 = "1f12k6n58ycv79bv416566fnsnsng8jk3f6fy5j78py1qgy30swm"; + cargoSha256 = "1n0sxkhcdg2rbzqd7826pa7sxlnn0c2sc8l6lc98xw21vvqisc8n"; nativeBuildInputs = [ pkgconfig ]; @@ -30,6 +30,5 @@ in rustPlatform.buildRustPackage rec { homepage = "https://github.com/PyO3/maturin"; license = licenses.mit; maintainers = [ maintainers.danieldk ]; - platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/development/tools/rust/racer/default.nix b/nixpkgs/pkgs/development/tools/rust/racer/default.nix index da7fe98aafe..86f1989729e 100644 --- a/nixpkgs/pkgs/development/tools/rust/racer/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/racer/default.nix @@ -45,6 +45,5 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/racer-rust/racer"; license = licenses.mit; maintainers = with maintainers; [ jagajaga ma27 ]; - platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/development/tools/rust/racerd/default.nix b/nixpkgs/pkgs/development/tools/rust/racerd/default.nix index 72588b37415..26e2a5ba50e 100644 --- a/nixpkgs/pkgs/development/tools/rust/racerd/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/racerd/default.nix @@ -37,9 +37,9 @@ rustPlatform.buildRustPackage rec { ''; meta = with stdenv.lib; { + broken = true; description = "JSON/HTTP Server based on racer for adding Rust support to editors and IDEs"; homepage = "https://github.com/jwilm/racerd"; license = licenses.asl20; - platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix b/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix index 8302d0a111e..c9c87991a8a 100644 --- a/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix @@ -2,10 +2,10 @@ { rust-analyzer-unwrapped = callPackage ./generic.nix rec { - rev = "2020-08-03"; + rev = "2020-08-24"; version = "unstable-${rev}"; - sha256 = "07xd9gwzjqnjsb5rnxfa9vxc6dmh04mbd1dcwxsz9fv9dcnsx21l"; - cargoSha256 = "0sa8yd3a6y2505w0n9l7d1v03c7dl07zw78fx5r3f4p3lc65n8b4"; + sha256 = "11q5shrq55krgpj7rjfqw84131j5g55zyrwww3cxcbr8ndi3xdnf"; + cargoSha256 = "15kjcgxmigm0lwbp8p0kdxax86ldjqq9q8ysj6khfhqd0173184n"; }; rust-analyzer = callPackage ./wrapper.nix {} { diff --git a/nixpkgs/pkgs/development/tools/rust/rust-analyzer/generic.nix b/nixpkgs/pkgs/development/tools/rust/rust-analyzer/generic.nix index d5ac9eaa5ee..7092f5291dd 100644 --- a/nixpkgs/pkgs/development/tools/rust/rust-analyzer/generic.nix +++ b/nixpkgs/pkgs/development/tools/rust/rust-analyzer/generic.nix @@ -50,6 +50,5 @@ rustPlatform.buildRustPackage { homepage = "https://github.com/rust-analyzer/rust-analyzer"; license = with licenses; [ mit asl20 ]; maintainers = with maintainers; [ oxalica ]; - platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/development/tools/rust/rustup/default.nix b/nixpkgs/pkgs/development/tools/rust/rustup/default.nix index bdd916ccdda..e5ef80b87ee 100644 --- a/nixpkgs/pkgs/development/tools/rust/rustup/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/rustup/default.nix @@ -1,7 +1,13 @@ { stdenv, lib, runCommand, patchelf -, fetchFromGitHub, rustPlatform +, fetchFromGitHub, rustPlatform, makeWrapper , pkgconfig, curl, zlib, Security, CoreServices }: +let + libPath = lib.makeLibraryPath [ + zlib # libz.so.1 + ]; +in + rustPlatform.buildRustPackage rec { pname = "rustup"; version = "1.22.1"; @@ -15,7 +21,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "0ghjrx7y25s6rjp06h0iyv4195x7daj57bqza01i1j4hm5nkhqhi"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ makeWrapper pkgconfig ]; buildInputs = [ curl zlib @@ -24,19 +30,13 @@ rustPlatform.buildRustPackage rec { cargoBuildFlags = [ "--features no-self-update" ]; patches = lib.optionals stdenv.isLinux [ - (let - libPath = lib.makeLibraryPath [ - zlib # libz.so.1 - ]; - in - (runCommand "0001-dynamically-patchelf-binaries.patch" { CC=stdenv.cc; patchelf = patchelf; libPath = "$ORIGIN/../lib:${libPath}"; } '' - export dynamicLinker=$(cat $CC/nix-support/dynamic-linker) - substitute ${./0001-dynamically-patchelf-binaries.patch} $out \ - --subst-var patchelf \ - --subst-var dynamicLinker \ - --subst-var libPath + (runCommand "0001-dynamically-patchelf-binaries.patch" { CC=stdenv.cc; patchelf = patchelf; libPath = "$ORIGIN/../lib:${libPath}"; } '' + export dynamicLinker=$(cat $CC/nix-support/dynamic-linker) + substitute ${./0001-dynamically-patchelf-binaries.patch} $out \ + --subst-var patchelf \ + --subst-var dynamicLinker \ + --subst-var libPath '') - ) ]; doCheck = !stdenv.isAarch64 && !stdenv.isDarwin; @@ -53,6 +53,8 @@ rustPlatform.buildRustPackage rec { done popd + wrapProgram $out/bin/rustup --prefix "LD_LIBRARY_PATH" : "${libPath}" + # tries to create .rustup export HOME=$(mktemp -d) mkdir -p "$out/share/"{bash-completion/completions,fish/vendor_completions.d,zsh/site-functions} @@ -73,6 +75,5 @@ rustPlatform.buildRustPackage rec { homepage = "https://www.rustup.rs/"; license = with licenses; [ asl20 /* or */ mit ]; maintainers = [ maintainers.mic92 ]; - platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/development/tools/rust/svd2rust/default.nix b/nixpkgs/pkgs/development/tools/rust/svd2rust/default.nix index 733504435ec..348fe6d9c71 100644 --- a/nixpkgs/pkgs/development/tools/rust/svd2rust/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/svd2rust/default.nix @@ -23,6 +23,5 @@ buildRustPackage rec { description = "Generate Rust register maps (`struct`s) from SVD files"; homepage = "https://github.com/rust-embedded/svd2rust"; license = with licenses; [ mit asl20 ]; - platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/development/tools/scalafmt/default.nix b/nixpkgs/pkgs/development/tools/scalafmt/default.nix index c445026193b..0f14f52295e 100644 --- a/nixpkgs/pkgs/development/tools/scalafmt/default.nix +++ b/nixpkgs/pkgs/development/tools/scalafmt/default.nix @@ -2,7 +2,7 @@ let baseName = "scalafmt"; - version = "2.6.2"; + version = "2.6.4"; deps = stdenv.mkDerivation { name = "${baseName}-deps-${version}"; buildCommand = '' @@ -13,7 +13,7 @@ let ''; outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "1q2bsc6vqgbgzg8hcz8pn6vl3263ghjfbkn93vijvmz0ivc806j4"; + outputHash = "1h19rsxsn2piifillv29nwks2k9l391jwygjbfy8pc0ha8yi63mw"; }; in stdenv.mkDerivation { diff --git a/nixpkgs/pkgs/development/tools/selenium/chromedriver/default.nix b/nixpkgs/pkgs/development/tools/selenium/chromedriver/default.nix index 8aad3230003..fc743d56016 100644 --- a/nixpkgs/pkgs/development/tools/selenium/chromedriver/default.nix +++ b/nixpkgs/pkgs/development/tools/selenium/chromedriver/default.nix @@ -1,17 +1,17 @@ { stdenv, fetchurl, cairo, fontconfig, freetype, gdk-pixbuf, glib , glibc, gtk2, libX11, makeWrapper, nspr, nss, pango, unzip, gconf -, libXi, libXrender, libXext +, libxcb, libXi, libXrender, libXext }: let allSpecs = { x86_64-linux = { system = "linux64"; - sha256 = "149p43zaz45malmff1274r2bwjcyjwsdickivk3pd0mvnjbfid2r"; + sha256 = "0absr1fp2h87gpyw6jxj2f08sbhkkh3pf13145hfyzdvajj5rfjy"; }; x86_64-darwin = { system = "mac64"; - sha256 = "1xpyqxpsz3r653ls67s6alv4g2vr4lxf29gyxc162ikywyrx80nr"; + sha256 = "1p9k92fgyx0xis6r50vhcpx3iws2gaspq3dnpigglv3bj9yg8zvi"; }; }; @@ -23,12 +23,12 @@ let cairo fontconfig freetype gdk-pixbuf glib gtk2 gconf libX11 nspr nss pango libXrender - gconf libXext libXi + gconf libxcb libXext libXi ]; in stdenv.mkDerivation rec { pname = "chromedriver"; - version = "83.0.4103.39"; + version = "85.0.4183.87"; src = fetchurl { url = "https://chromedriver.storage.googleapis.com/${version}/chromedriver_${spec.system}.zip"; diff --git a/nixpkgs/pkgs/development/tools/skaffold/default.nix b/nixpkgs/pkgs/development/tools/skaffold/default.nix index 398f524af08..f397348416c 100644 --- a/nixpkgs/pkgs/development/tools/skaffold/default.nix +++ b/nixpkgs/pkgs/development/tools/skaffold/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "skaffold"; - version = "1.12.1"; + version = "1.14.0"; goPackagePath = "github.com/GoogleContainerTools/skaffold"; subPackages = ["cmd/skaffold"]; @@ -19,7 +19,7 @@ buildGoPackage rec { owner = "GoogleContainerTools"; repo = "skaffold"; rev = "v${version}"; - sha256 = "1mk4mn9h44v2xs65jjslmi03j3bixg0fkn396hmxp718w68850lz"; + sha256 = "18wk8cnp0sc47drgjc0iis4dkqwr9h5yxi40c1gjsiscrvy5akvc"; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/nixpkgs/pkgs/development/tools/skopeo/default.nix b/nixpkgs/pkgs/development/tools/skopeo/default.nix index f9b1bbd9c45..32b9c61f5d4 100644 --- a/nixpkgs/pkgs/development/tools/skopeo/default.nix +++ b/nixpkgs/pkgs/development/tools/skopeo/default.nix @@ -28,6 +28,8 @@ buildGoModule rec { vendorSha256 = null; + doCheck = false; + nativeBuildInputs = [ pkg-config go-md2man installShellFiles makeWrapper ]; buildInputs = [ gpgme ] diff --git a/nixpkgs/pkgs/development/tools/so/default.nix b/nixpkgs/pkgs/development/tools/so/default.nix new file mode 100644 index 00000000000..0ee2359c841 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/so/default.nix @@ -0,0 +1,27 @@ +{ stdenv, rustPlatform, fetchFromGitHub, openssl, pkg-config, libiconv, Security }: + +rustPlatform.buildRustPackage rec { + pname = "so"; + version = "0.4.2"; + + src = fetchFromGitHub { + owner = "samtay"; + repo = pname; + rev = "v${version}"; + sha256 = "09zswxxli9f5ayjwmvqhkp1yv2s4f435dcfp4cyia1zddbrh2zck"; + }; + + cargoSha256 = "1ddbhy1plag4ckbmlyj47wnky7vgmfa68msl3hl25h1lwmzaf1aq"; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ + libiconv Security + ]; + + meta = with stdenv.lib; { + description = "A TUI interface to the StackExchange network"; + homepage = "https://github.com/samtay/so"; + license = licenses.mit; + maintainers = with maintainers; [ mredaelli ]; + }; +} diff --git a/nixpkgs/pkgs/development/tools/spring-boot-cli/default.nix b/nixpkgs/pkgs/development/tools/spring-boot-cli/default.nix index 15d6553bbb1..38573e07514 100644 --- a/nixpkgs/pkgs/development/tools/spring-boot-cli/default.nix +++ b/nixpkgs/pkgs/development/tools/spring-boot-cli/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "spring-boot-cli"; - version = "2.3.1"; + version = "2.3.2"; src = fetchzip { url = "https://repo.spring.io/release/org/springframework/boot/${pname}/${version}.RELEASE/${pname}-${version}.RELEASE-bin.zip"; - sha256 = "0ddmwcifrmw197vc49b0x8vfampj3n947r4vv4nni5vjclqqfds5"; + sha256 = "1zqfnxz57234227rp303iwis0mjkkjkpcqnj9jgw78gykjnqdmmq"; }; nativeBuildInputs = [ makeWrapper installShellFiles ]; diff --git a/nixpkgs/pkgs/development/tools/statik/default.nix b/nixpkgs/pkgs/development/tools/statik/default.nix index e26431b2687..f535fa055ed 100644 --- a/nixpkgs/pkgs/development/tools/statik/default.nix +++ b/nixpkgs/pkgs/development/tools/statik/default.nix @@ -4,7 +4,6 @@ buildGoPackage { pname = "statik"; version = "unstable-2019-07-31"; goPackagePath = "github.com/rakyll/statik"; - goDeps = ./deps.nix; src = fetchFromGitHub { owner = "rakyll"; @@ -13,13 +12,10 @@ buildGoPackage { sha256 = "15wwgrprfq36pa13b9anp7097q1fqcad28hirvivybmc011p0fri"; }; - enableParallelBuilding = true; - meta = with stdenv.lib; { homepage = "https://github.com/rakyll/statik"; description = "Embed files into a Go executable "; license = licenses.asl20; maintainers = with maintainers; [ chiiruno ]; - platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/development/tools/statik/deps.nix b/nixpkgs/pkgs/development/tools/statik/deps.nix deleted file mode 100644 index 0429d8876b2..00000000000 --- a/nixpkgs/pkgs/development/tools/statik/deps.nix +++ /dev/null @@ -1,3 +0,0 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.3.0 -[ -] diff --git a/nixpkgs/pkgs/development/tools/summon/default.nix b/nixpkgs/pkgs/development/tools/summon/default.nix new file mode 100644 index 00000000000..e01c60e3a89 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/summon/default.nix @@ -0,0 +1,35 @@ +{ stdenv, buildGoModule, fetchFromGitHub, lib, patchResolver ? true }: + +with stdenv.lib; + +buildGoModule rec { + pname = "summon"; + version = "0.8.2"; + + src = fetchFromGitHub { + owner = "cyberark"; + repo = "summon"; + rev = "v${version}"; + sha256 = "1z4xnrncwvp3rfm97zvc0ivvw2fh1hrjhj3rplvidzxjfyasbvwv"; + }; + + vendorSha256 = "1597vrs4b7k6gkmkvf7xnd38rvjixmlcz0j7npmik9nbkm57l74m"; + + subPackages = [ "cmd" ]; + + # Patches provider resolver to support resolving unqualified names + # from $PATH, e.g. `summon -p gopass` instead of `summon -p $(which gopass)` + patches = optional patchResolver [ ./resolve-paths.patch ]; + + postInstall = '' + mv $out/bin/cmd $out/bin/summon + ''; + + meta = with lib; { + description = + "CLI that provides on-demand secrets access for common DevOps tools"; + homepage = "https://cyberark.github.io/summon"; + license = lib.licenses.mit; + maintainers = with maintainers; [ quentini ]; + }; +} diff --git a/nixpkgs/pkgs/development/tools/summon/resolve-paths.patch b/nixpkgs/pkgs/development/tools/summon/resolve-paths.patch new file mode 100644 index 00000000000..cd49c50e2bd --- /dev/null +++ b/nixpkgs/pkgs/development/tools/summon/resolve-paths.patch @@ -0,0 +1,39 @@ +From dd34727ebfbd59738084eeb7c2a020e40a4d0abe Mon Sep 17 00:00:00 2001 +From: Quentin <Quentin Inkling> +Date: Mon, 29 Jun 2020 17:35:04 +0300 +Subject: [PATCH] Patch for + +--- + provider/provider.go | 15 +++++++++++++++ + 1 file changed, 15 insertions(+) + +diff --git a/provider/provider.go b/provider/provider.go +index c1e28d9..f20fdaa 100644 +--- a/provider/provider.go ++++ b/provider/provider.go +@@ -78,7 +78,22 @@ func expandPath(provider string) string { + if path.Base(provider) != provider { + return provider + } ++ ++ var ( ++ stdOut bytes.Buffer ++ stdErr bytes.Buffer ++ ) ++ cmd := exec.Command("which", provider) ++ cmd.Stdout = &stdOut ++ cmd.Stderr = &stdErr ++ err := cmd.Run() ++ ++ if err == nil { ++ return strings.TrimSpace(stdOut.String()) ++ } ++ + return path.Join(DefaultPath, provider) ++ + } + + func getDefaultPath() string { +-- +2.27.0 + diff --git a/nixpkgs/pkgs/development/tools/swiftformat/default.nix b/nixpkgs/pkgs/development/tools/swiftformat/default.nix index ac4502b05ab..c47955695f5 100644 --- a/nixpkgs/pkgs/development/tools/swiftformat/default.nix +++ b/nixpkgs/pkgs/development/tools/swiftformat/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "swiftformat"; - version = "0.44.2"; + version = "0.44.9"; src = fetchFromGitHub { owner = "nicklockwood"; repo = "SwiftFormat"; rev = "${version}"; - sha256 = "17g4w8kmkrhcp7lrfi525ck9jhcm96d0nn93yadacdjcdnchmih1"; + sha256 = "0zajvbaf3r02k53lv5zdxf13apc6chnjmj69zkyac48lpnpbcxq6"; }; preConfigure = "LD=$CC"; diff --git a/nixpkgs/pkgs/development/tools/the-way/default.nix b/nixpkgs/pkgs/development/tools/the-way/default.nix index dc859347899..dce18580577 100644 --- a/nixpkgs/pkgs/development/tools/the-way/default.nix +++ b/nixpkgs/pkgs/development/tools/the-way/default.nix @@ -1,24 +1,36 @@ -{ stdenv, fetchFromGitHub, rustPlatform }: +{ stdenv, fetchFromGitHub, rustPlatform, installShellFiles, AppKit, Security }: rustPlatform.buildRustPackage rec { pname = "the-way"; - version = "0.4.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "out-of-cheese-error"; repo = pname; rev = "v${version}"; - sha256 = "0q7yg90yxnpaafg6sg7mqkh86qkn43kxy73p9nqkkgrikdnrjh5a"; + sha256 = "1whmvzpqm8x1q45mzrp4p40nj251drcryj9z4qjxgjlfsd5d1fxq"; }; - cargoSha256 = "1a747bmc6s007ram0w4xf1y2nb3pphvqnlx59098lr3v7gllp7x3"; - checkFlags = "--test-threads=1"; + nativeBuildInputs = [ installShellFiles ]; + + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ AppKit Security ]; + + cargoSha256 = "0adhgp6blwx7s1hlwqzzsgkzc43q9avxx8a9ykvvv2s1w7m9ql78"; + #checkFlags = "--test-threads=1"; + doCheck = false; + + postInstall = '' + $out/bin/the-way config default tmp.toml + for shell in bash fish zsh; do + THE_WAY_CONFIG=tmp.toml $out/bin/the-way complete $shell > the-way.$shell + installShellCompletion the-way.$shell + done + ''; meta = with stdenv.lib; { description = "Terminal code snippets manager"; homepage = "https://github.com/out-of-cheese-error/the-way"; license = with licenses; [ mit ]; maintainers = with maintainers; [ numkem ]; - platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/development/tools/tracy/default.nix b/nixpkgs/pkgs/development/tools/tracy/default.nix index a5087b3b52c..96f232304aa 100644 --- a/nixpkgs/pkgs/development/tools/tracy/default.nix +++ b/nixpkgs/pkgs/development/tools/tracy/default.nix @@ -1,21 +1,21 @@ -{ stdenv, lib, darwin, fetchFromGitHub, tbb, gtk2, glfw, pkgconfig, freetype, Carbon, AppKit, capstone }: +{ stdenv, lib, darwin, fetchFromGitHub, tbb, gtk3, glfw, pkgconfig, freetype, Carbon, AppKit, capstone }: stdenv.mkDerivation rec { pname = "tracy"; - version = "0.7"; + version = "0.7.1"; src = fetchFromGitHub { owner = "wolfpld"; repo = "tracy"; rev = "v${version}"; - sha256 = "07cmz2w7iv10f9i9q3fhg80s6riy9bxnk9xvc3q4lw47mc150skp"; + sha256 = "13zg3ijzhh7qkhgqff2ca23nd4gj7ac8jr0bp9w1gjf2cpgqkm40"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ glfw capstone ] ++ lib.optionals stdenv.isDarwin [ Carbon AppKit freetype ] - ++ lib.optionals stdenv.isLinux [ gtk2 tbb ]; + ++ lib.optionals stdenv.isLinux [ gtk3 tbb ]; NIX_CFLAGS_COMPILE = [ ] ++ lib.optional stdenv.isLinux "-ltbb" @@ -35,11 +35,15 @@ stdenv.mkDerivation rec { install -D ./update/build/unix/update-release $out/bin/update ''; + fixupPhase = lib.optionalString stdenv.isDarwin '' + install_name_tool -change libcapstone.4.dylib ${capstone}/lib/libcapstone.4.dylib $out/bin/Tracy + ''; + meta = with stdenv.lib; { description = "A real time, nanosecond resolution, remote telemetry frame profiler for games and other applications."; homepage = "https://github.com/wolfpld/tracy"; platforms = platforms.linux ++ platforms.darwin; license = licenses.bsd3; - maintainers = with maintainers; [ mpickering ]; + maintainers = with maintainers; [ mpickering nagisa ]; }; } diff --git a/nixpkgs/pkgs/development/tools/trellis/default.nix b/nixpkgs/pkgs/development/tools/trellis/default.nix index 6fc18fabe7b..21f14adc2f7 100644 --- a/nixpkgs/pkgs/development/tools/trellis/default.nix +++ b/nixpkgs/pkgs/development/tools/trellis/default.nix @@ -8,18 +8,18 @@ let in stdenv.mkDerivation rec { pname = "trellis"; - version = "2020.06.29"; + version = "2020.07.27"; # git describe --tags realVersion = with stdenv.lib; with builtins; - "1.0-176-g${substring 0 7 (elemAt srcs 0).rev}"; + "1.0-182-g${substring 0 7 (elemAt srcs 0).rev}"; srcs = [ (fetchFromGitHub { owner = "SymbiFlow"; repo = "prjtrellis"; - rev = "f93243b000c52b755c70829768d2ae6bcf7bb91a"; - sha256 = "0f7xv99bxmidk7byahc821yzy8mln29gknz3w239i9xbwxzc6wc4"; + rev = "8c0a6382e11b160ed88d17af8493c12a897617ed"; + sha256 = "1g0ppjfw8dq5cg5kl2p1p87grb0i88apaim4f5b6wj4sfqz8iln8"; name = "trellis"; }) diff --git a/nixpkgs/pkgs/development/tools/tychus/default.nix b/nixpkgs/pkgs/development/tools/tychus/default.nix index 82dce7f81e7..5eb6dd09789 100644 --- a/nixpkgs/pkgs/development/tools/tychus/default.nix +++ b/nixpkgs/pkgs/development/tools/tychus/default.nix @@ -23,6 +23,5 @@ buildGoPackage rec { description = "Command line utility to live-reload your application."; homepage = "https://github.com/devlocker/tychus"; license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.all; }; } diff --git a/nixpkgs/pkgs/development/tools/unityhub/default.nix b/nixpkgs/pkgs/development/tools/unityhub/default.nix index 7e62aaf4088..85b7a704b9c 100644 --- a/nixpkgs/pkgs/development/tools/unityhub/default.nix +++ b/nixpkgs/pkgs/development/tools/unityhub/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, appimageTools, gsettings-desktop-schemas, gtk3 }: let - version = "2.3.1"; + version = "2.3.2"; in appimageTools.wrapType2 rec { name = "unityhub"; @@ -13,7 +13,7 @@ in appimageTools.wrapType2 rec { libX11 libXcursor libXdamage libXfixes libXrender libXi libXcomposite libXext libXrandr libXtst libSM libICE libxcb - libselinux pciutils libpulseaudio + libselinux pciutils libpulseaudio libxml2 ]); profile = '' @@ -23,7 +23,7 @@ in appimageTools.wrapType2 rec { src = fetchurl { # mirror of https://public-cdn.cloud.unity3d.com/hub/prod/UnityHub.AppImage url = "https://archive.org/download/unity-hub-${version}/UnityHub.AppImage"; - sha256 = "09nrgjlknl3hgrrl7rc79bmbrq6r6sl49dw0cmvs37vjqnvlr8ny"; + sha256 = "07nfyfp9apshqarc6pgshsczila6x4943hiyyizc55kp85aw0imn"; }; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/development/tools/vagrant/0004-Support-system-installed-plugins.patch b/nixpkgs/pkgs/development/tools/vagrant/0004-Support-system-installed-plugins.patch index f87ff5135b3..fa6555c594e 100644 --- a/nixpkgs/pkgs/development/tools/vagrant/0004-Support-system-installed-plugins.patch +++ b/nixpkgs/pkgs/development/tools/vagrant/0004-Support-system-installed-plugins.patch @@ -1,7 +1,7 @@ From: Antonio Terceiro <terceiro@debian.org> Date: Wed, 27 May 2015 09:36:17 -0300 Subject: Support system-installed plugins -Source: https://salsa.debian.org/ruby-team/vagrant/blob/cb672c6dc0c63f6552c5ec4d6d7d22929d353503/debian/patches/0004-Support-system-installed-plugins.patch +Source: https://salsa.debian.org/ruby-team/vagrant/-/blob/9d86f222/debian/patches/0004-Support-system-installed-plugins.patch Plugins must be installed as regular Ruby libraries, and they must contain /usr/share/vagrant-plugins/plugins.d/$PLUGINNAME.json with the @@ -22,7 +22,7 @@ following content: 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/lib/vagrant/plugin/manager.rb b/lib/vagrant/plugin/manager.rb -index 567347d..d9d76a0 100644 +index 9058e68..2772131 100644 --- a/lib/vagrant/plugin/manager.rb +++ b/lib/vagrant/plugin/manager.rb @@ -18,7 +18,7 @@ module Vagrant @@ -80,7 +80,7 @@ index c6872d4..935d431 100644 end # Add a plugin that is installed to the state file. -@@ -107,6 +123,14 @@ module Vagrant +@@ -107,6 +123,10 @@ module Vagrant f.close FileUtils.mv(f.path, @path) end @@ -88,10 +88,6 @@ index c6872d4..935d431 100644 + # Ignore permission denied against system-installed plugins; regular + # users are not supposed to write there. + raise unless @system -+ rescue Errno::EROFS -+ # Ignore read-only filesystem against system-installed plugins; regular -+ # users are not supposed to write there. -+ raise unless @system end protected diff --git a/nixpkgs/pkgs/development/tools/vagrant/default.nix b/nixpkgs/pkgs/development/tools/vagrant/default.nix index 338e8f68d35..4e2930f97a2 100644 --- a/nixpkgs/pkgs/development/tools/vagrant/default.nix +++ b/nixpkgs/pkgs/development/tools/vagrant/default.nix @@ -5,9 +5,9 @@ let # NOTE: bumping the version and updating the hash is insufficient; # you must use bundix to generate a new gemset.nix in the Vagrant source. - version = "2.2.9"; + version = "2.2.10"; url = "https://github.com/hashicorp/vagrant/archive/v${version}.tar.gz"; - sha256 = "0fbickjjliaw3cpkh3pl9bp56b2gcqn87c5ag67amc450ah43rdq"; + sha256 = "07wlj4m79m9li3za1jkk4imdhqwpca86qz3c0h706s0w8cmv4bbj"; deps = bundlerEnv rec { name = "${pname}-${version}"; @@ -54,13 +54,6 @@ in buildRubyGem rec { ./unofficial-installation-nowarn.patch ./use-system-bundler-version.patch ./0004-Support-system-installed-plugins.patch - - # fix deprecation warning on ruby 2.6.5. - # See also https://github.com/hashicorp/vagrant/pull/11307 - (fetchpatch { - url = "https://github.com/hashicorp/vagrant/commit/d18ed567aaa5da23c9e91ab87f360e7bf6760f13.patch"; - sha256 = "0f61qj41rc3fdggmnha4jrqg4pzmfiriwpsz4fcgf7c0bx6qha7q"; - }) ]; postPatch = '' diff --git a/nixpkgs/pkgs/development/tools/vagrant/gemset.nix b/nixpkgs/pkgs/development/tools/vagrant/gemset.nix index 00838c6e0c5..3c22b74efed 100644 --- a/nixpkgs/pkgs/development/tools/vagrant/gemset.nix +++ b/nixpkgs/pkgs/development/tools/vagrant/gemset.nix @@ -24,20 +24,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ic028k8xgm2dds9mqnvwwx3ibaz32j8455zxr9f4bcnviyahya5"; + sha256 = "08hd3d2lfi19cns4d6wkq51scasn17l83fgbzbjjk3dqccz4rg3j"; type = "gem"; }; - version = "3.0.0"; + version = "4.0.0"; }; concurrent-ruby = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "094387x4yasb797mv07cs3g6f08y56virc2rjcpb1k79rzaj3nhl"; + sha256 = "1vnxrbhi7cq3p4y2v9iwd10v1c7l15is4var14hwnb2jip4fyjzz"; type = "gem"; }; - version = "1.1.6"; + version = "1.1.7"; }; domain_name = { dependencies = ["unf"]; @@ -149,21 +149,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10nq1xjqvkhngiygji831qx9bryjwws95r4vrnlq9142bzkg670s"; + sha256 = "153sx77p16vawrs4qpkv7qlzf9v5fks4g7xqcj1dwk40i6g7rfzk"; type = "gem"; }; - version = "1.8.3"; + version = "1.8.5"; }; listen = { - dependencies = ["rb-fsevent" "rb-inotify" "ruby_dep"]; + dependencies = ["rb-fsevent" "rb-inotify"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01v5mrnfqm6sgm8xn2v5swxsn1wlmq7rzh2i48d4jzjsc7qvb6mx"; + sha256 = "1w923wmdi3gyiky0asqdw5dnh3gcjs2xyn82ajvjfjwh6sn0clgi"; type = "gem"; }; - version = "3.1.5"; + version = "3.2.1"; }; little-plugger = { groups = ["default"]; @@ -191,10 +191,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06j6iaj89h9jhkx1x3hlswqrfnqds8br05xb1qra69dpvbdmjcwn"; + sha256 = "0pkmhcxi8lp74bq5gz9lxrvaiv5w0745kk7s4bw2b1x07qqri0n9"; + type = "gem"; + }; + version = "2.3.0"; + }; + mime = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0nskys7brz2bylhxiknl0z9i19w3wb1knf0h93in6mjq70jdw5cr"; type = "gem"; }; - version = "2.2.2"; + version = "0.4.4"; }; mime-types = { dependencies = ["mime-types-data"]; @@ -222,10 +232,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xy54mjf7xg41l8qrg1bqri75agdqmxap9z466fjismc1rn2jwfr"; + sha256 = "0pb1g1y3dsiahavspyzkdy39j4q377009f6ix0bh1ag4nqw43l0z"; type = "gem"; }; - version = "1.14.1"; + version = "1.15.0"; }; net-scp = { dependencies = ["net-ssh"]; @@ -244,20 +254,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "04674g4n6mryjajlcd82af8g8k95la4b1bj712dh71hw1c9vhw1y"; + sha256 = "185vsybznqgqbb4i2qnxvf1gam8lb634nqcrq7r3i2zy1g6xd8mi"; type = "gem"; }; - version = "2.1.2"; + version = "3.0.0"; }; net-ssh = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "101wd2px9lady54aqmkibvy4j62zk32w0rjz4vnigyg974fsga40"; + sha256 = "0jp3jgcn8cij407xx9ldb5h9c6jv13jc4cf6kk2idclz43ww21c9"; type = "gem"; }; - version = "5.2.0"; + version = "6.1.0"; }; netrc = { groups = ["default"]; diff --git a/nixpkgs/pkgs/development/tools/vagrant/use-system-bundler-version.patch b/nixpkgs/pkgs/development/tools/vagrant/use-system-bundler-version.patch index c386acf4a1c..8262220140a 100644 --- a/nixpkgs/pkgs/development/tools/vagrant/use-system-bundler-version.patch +++ b/nixpkgs/pkgs/development/tools/vagrant/use-system-bundler-version.patch @@ -1,8 +1,8 @@ -diff --git i/lib/vagrant/bundler.rb w/lib/vagrant/bundler.rb -index 301e40e37..e361ab510 100644 ---- i/lib/vagrant/bundler.rb -+++ w/lib/vagrant/bundler.rb -@@ -217,7 +217,7 @@ module Vagrant +diff --git a/lib/vagrant/bundler.rb b/lib/vagrant/bundler.rb +index 336ac1e05..1bfd84c0d 100644 +--- a/lib/vagrant/bundler.rb ++++ b/lib/vagrant/bundler.rb +@@ -470,7 +470,7 @@ module Vagrant source_list = {} system_plugins = plugins.map do |plugin_name, plugin_info| plugin_name if plugin_info["system"] diff --git a/nixpkgs/pkgs/development/tools/vcstool/default.nix b/nixpkgs/pkgs/development/tools/vcstool/default.nix index c4a1cf73987..9657543e0c7 100644 --- a/nixpkgs/pkgs/development/tools/vcstool/default.nix +++ b/nixpkgs/pkgs/development/tools/vcstool/default.nix @@ -5,11 +5,11 @@ with python3Packages; buildPythonApplication rec { pname = "vcstool"; - version = "0.2.7"; + version = "0.2.9"; src = fetchPypi { inherit pname version; - sha256 = "1mq8lmb1wh55cqdj7javq7qia4217h6vf5ljc99gsjyibi7g7d3k"; + sha256 = "1lb0j120sj76swi702ah6ryn770m1y7gh69237zxpyh897pn5paa"; }; propagatedBuildInputs = [ pyyaml setuptools ]; diff --git a/nixpkgs/pkgs/development/tools/vend/default.nix b/nixpkgs/pkgs/development/tools/vend/default.nix index 13aa8aeb6ad..ef59ea8dd65 100644 --- a/nixpkgs/pkgs/development/tools/vend/default.nix +++ b/nixpkgs/pkgs/development/tools/vend/default.nix @@ -1,26 +1,37 @@ { stdenv, buildGoModule, fetchFromGitHub }: -buildGoModule { +buildGoModule rec { pname = "vend"; - version = "unstable-2020-06-04"; - patches = [./remove_tidy.patch]; + /* + This package is used to generate vendor folders for + packages that use the `runVend` option with `buildGoModule`. + + Do not update this package without checking that the vendorSha256 + hashes of packages using the `runVend` option are unchanged + or updating their vendorSha256 hashes if necessary. + */ + version = "1.0.2"; + # Disable the bot + # nixpkgs-update: no auto update + + # Disable `mod tidy`, patch was refused upstream + # https://github.com/nomad-software/vend/pull/9 + patches = [ ./remove_tidy.patch ]; - # A permanent fork from master is maintained to avoid non deterministic go tidy src = fetchFromGitHub { - owner = "c00w"; + owner = "nomad-software"; repo = "vend"; - rev = "24fdebfdb2c3cc0516321a9cf33a3fd81c209c04"; - sha256 = "112p9dz9by2h2m3jha2bv1bvzn2a86bpg1wphgmf9gksjpwy835l"; + rev = "v${version}"; + sha256 = "0h9rwwb56nzs46xsvl92af71i8b3wz3pf9ngi8v0i2bpk7p3p89d"; }; vendorSha256 = null; meta = with stdenv.lib; { - homepage = "https://github.com/c00w/vend"; + homepage = "https://github.com/nomad-software/vend"; description = "A utility which vendors go code including c dependencies"; - maintainers = with maintainers; [ c00w ]; + maintainers = with maintainers; [ c00w mic92 zowoq ]; license = licenses.mit; - platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/development/tools/vultr-cli/default.nix b/nixpkgs/pkgs/development/tools/vultr-cli/default.nix index 6f217c60219..c0b34fe3ca6 100644 --- a/nixpkgs/pkgs/development/tools/vultr-cli/default.nix +++ b/nixpkgs/pkgs/development/tools/vultr-cli/default.nix @@ -2,17 +2,19 @@ buildGoModule rec { pname = "vultr-cli"; - version = "0.3.2"; + version = "0.4.0"; src = fetchFromGitHub { owner = "vultr"; repo = pname; rev = "v${version}"; - sha256 = "1gqc4w5j9x7vxvxah6hmqd5i1lxyybpml7yfzzcbngwgwm3y5ym0"; + sha256 = "0gp1v62iqh3hk46cc5sh8a1nw5nf98m969fdhgxdppwr5dhj9isp"; }; vendorSha256 = null; + doCheck = false; + meta = with stdenv.lib; { description = "Official command line tool for Vultr services"; homepage = "https://github.com/vultr/vultr-cli"; diff --git a/nixpkgs/pkgs/development/tools/vultr/default.nix b/nixpkgs/pkgs/development/tools/vultr/default.nix index 8bd8a55bce8..7c396f69f25 100644 --- a/nixpkgs/pkgs/development/tools/vultr/default.nix +++ b/nixpkgs/pkgs/development/tools/vultr/default.nix @@ -2,21 +2,20 @@ buildGoPackage rec { pname = "vultr"; - version = "2.0.1"; + version = "2.0.2"; goPackagePath = "github.com/JamesClonk/vultr"; src = fetchFromGitHub { owner = "JamesClonk"; repo = "vultr"; rev = "v${version}"; - sha256 = "16wlncf0wax5jhpbfif5k16knigxy89vcby0b821klv6hlm6cc58"; + sha256 = "0br8nxi9syraarp4hzav9a3p4zxhyi45cq5dsclzxi3fga2l6mqg"; }; meta = { description = "A command line tool for Vultr services, a provider for cloud virtual private servers"; homepage = "https://github.com/JamesClonk/vultr"; license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.all; maintainers = [ stdenv.lib.maintainers.zauberpony ]; }; } diff --git a/nixpkgs/pkgs/development/tools/wasm-pack/default.nix b/nixpkgs/pkgs/development/tools/wasm-pack/default.nix index e36e811ea56..93bda0b8180 100644 --- a/nixpkgs/pkgs/development/tools/wasm-pack/default.nix +++ b/nixpkgs/pkgs/development/tools/wasm-pack/default.nix @@ -38,6 +38,5 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/rustwasm/wasm-pack"; license = with licenses; [ asl20 /* or */ mit ]; maintainers = [ maintainers.dhkl ]; - platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/development/tools/wrangler/default.nix b/nixpkgs/pkgs/development/tools/wrangler/default.nix index 6a6d6e39288..fd84afb1617 100644 --- a/nixpkgs/pkgs/development/tools/wrangler/default.nix +++ b/nixpkgs/pkgs/development/tools/wrangler/default.nix @@ -31,6 +31,5 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/cloudflare/wrangler"; license = with licenses; [ asl20 /* or */ mit ]; maintainers = with maintainers; [ filalex77 ]; - platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/development/tools/ws/default.nix b/nixpkgs/pkgs/development/tools/ws/default.nix index 95253895648..4a6d8892208 100644 --- a/nixpkgs/pkgs/development/tools/ws/default.nix +++ b/nixpkgs/pkgs/development/tools/ws/default.nix @@ -14,8 +14,6 @@ buildGoPackage rec { sha256 = "192slrz1cj1chzmfrl0d9ai8bq6s4w0iwpvxkhxb9krga7mkp9xb"; }; - goDeps = ./deps.nix; - meta = with stdenv.lib; { description = "websocket command line tool"; homepage = "https://github.com/hashrocket/ws"; diff --git a/nixpkgs/pkgs/development/tools/ws/deps.nix b/nixpkgs/pkgs/development/tools/ws/deps.nix deleted file mode 100644 index 82988437145..00000000000 --- a/nixpkgs/pkgs/development/tools/ws/deps.nix +++ /dev/null @@ -1,12 +0,0 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 -[ - { - goPackagePath = "github.com/fatih/color"; - fetch = { - type = "git"; - url = "https://github.com/fatih/color"; - rev = "5df930a27be2502f99b292b7cc09ebad4d0891f4"; - sha256 = "1xqwvpn5jkp1xqvv9hx4h7cxrsnamryhy2pszcqpbm28dpd3airb"; - }; - } -] diff --git a/nixpkgs/pkgs/development/tools/wxformbuilder/default.nix b/nixpkgs/pkgs/development/tools/wxformbuilder/default.nix new file mode 100644 index 00000000000..a3f8196b124 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/wxformbuilder/default.nix @@ -0,0 +1,35 @@ +{ stdenv +, fetchFromGitHub +, wxGTK31 +, meson +, ninja +}: + +stdenv.mkDerivation { + pname = "wxFormBuilder"; + version = "unstable-2020-08-18"; + + src = fetchFromGitHub { + owner = "wxFormBuilder"; + repo = "wxFormBuilder"; + rev = "d053665cc33a79dd935b518b5e7aea6baf493c92"; + sha256 = "sha256-hTO7Fyp5ZWpq2CfIYEXB85oOkNrqr6Njfh8h0t9B6wU="; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ + ninja + meson + ]; + + buildInputs = [ + wxGTK31 + ]; + + meta = with stdenv.lib; { + description = "RAD tool for wxWidgets GUI design"; + homepage = "https://github.com/wxFormBuilder/wxFormBuilder"; + license = licenses.gpl2; + maintainers = with maintainers; [ matthuszagh ]; + }; +} diff --git a/nixpkgs/pkgs/development/tools/yarn/default.nix b/nixpkgs/pkgs/development/tools/yarn/default.nix index dfdd921fd03..22ce3553352 100644 --- a/nixpkgs/pkgs/development/tools/yarn/default.nix +++ b/nixpkgs/pkgs/development/tools/yarn/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "yarn"; - version = "1.22.4"; + version = "1.22.5"; src = fetchzip { url = "https://github.com/yarnpkg/yarn/releases/download/v${version}/yarn-v${version}.tar.gz"; - sha256 = "1s054c9cmlmzy6cfkawhaxvaxhqcq0a17n4sb12p0bp2lzkax9lm"; + sha256 = "1yb1pb80jhw6mx1r28hf7zd54dygmnrf30r3fz7kn9nrgdpl5in8"; }; buildInputs = [ nodejs ]; diff --git a/nixpkgs/pkgs/development/tools/ydiff/default.nix b/nixpkgs/pkgs/development/tools/ydiff/default.nix index f3ecbb451f6..510808fc412 100644 --- a/nixpkgs/pkgs/development/tools/ydiff/default.nix +++ b/nixpkgs/pkgs/development/tools/ydiff/default.nix @@ -5,11 +5,11 @@ with pythonPackages; buildPythonApplication rec { pname = "ydiff"; - version = "1.1"; + version = "1.2"; src = fetchPypi { inherit pname version; - sha256 = "0mxcl17sx1d4vaw22ammnnn3y19mm7r6ljbarcjzi519klz26bnf"; + sha256 = "f5430577ecd30974d766ee9b8333e06dc76a947b4aae36d39612a0787865a121"; }; patchPhase = '' diff --git a/nixpkgs/pkgs/development/tools/yj/default.nix b/nixpkgs/pkgs/development/tools/yj/default.nix index a2076668f60..94237abf89b 100644 --- a/nixpkgs/pkgs/development/tools/yj/default.nix +++ b/nixpkgs/pkgs/development/tools/yj/default.nix @@ -20,7 +20,6 @@ buildGoPackage rec { description = ''Convert YAML <=> TOML <=> JSON <=> HCL''; license = licenses.asl20; maintainers = with maintainers; [ Profpatsch ]; - platforms = platforms.all; downloadPage = "https://github.com/sclevine/yj"; updateWalker = true; inherit version; diff --git a/nixpkgs/pkgs/development/tools/yq-go/default.nix b/nixpkgs/pkgs/development/tools/yq-go/default.nix index e830309381f..ea553259961 100644 --- a/nixpkgs/pkgs/development/tools/yq-go/default.nix +++ b/nixpkgs/pkgs/development/tools/yq-go/default.nix @@ -13,6 +13,8 @@ buildGoModule rec { vendorSha256 = "1bjy3qr26zndr3dhh9gd33rhm5gy779525qgzjw4a4mla0p2q6kl"; + doCheck = false; + nativeBuildInputs = [ installShellFiles ]; postInstall = '' diff --git a/nixpkgs/pkgs/development/tools/yq/default.nix b/nixpkgs/pkgs/development/tools/yq/default.nix index c15fad01599..cfca8a32f93 100644 --- a/nixpkgs/pkgs/development/tools/yq/default.nix +++ b/nixpkgs/pkgs/development/tools/yq/default.nix @@ -1,17 +1,38 @@ -{ lib, buildPythonApplication, fetchPypi, pyyaml, xmltodict, jq }: +{ lib +, buildPythonApplication +, fetchPypi +, argcomplete +, pyyaml +, xmltodict +# Test inputs +, coverage +, flake8 +, jq +, pytest +, toml +}: buildPythonApplication rec { pname = "yq"; - version = "2.8.1"; + version = "2.10.1"; - propagatedBuildInputs = [ pyyaml xmltodict jq ]; + propagatedBuildInputs = [ pyyaml xmltodict jq argcomplete ]; - # ValueError: underlying buffer has been detached - doCheck = false; + doCheck = true; + + checkInputs = [ + pytest + coverage + flake8 + jq + toml + ]; + + checkPhase = "pytest ./test/test.py"; src = fetchPypi { inherit pname version; - sha256 = "042p3s011635rbjax9wvwjdrb1kyzw38a6qn59b0j0k7krz6rlr4"; + sha256 = "1h6nnkp53mm4spwy8nyxwvh9j6p4lxvf20j4bgjskhnhaw3jl9gn"; }; meta = with lib; { |