diff options
Diffstat (limited to 'infra/libkookie/nixpkgs/pkgs/development/tools')
302 files changed, 3260 insertions, 2426 deletions
diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/ammonite/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/ammonite/default.nix index 82e38e2a25f8..20b26437e75f 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/ammonite/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/ammonite/default.nix @@ -1,12 +1,15 @@ -{ stdenv, fetchurl, jre, disableRemoteLogging ? true }: +{ stdenv, fetchurl, jre, nixosTests, writeScript, common-updater-scripts, git +, nixfmt, nix, coreutils, gnused, disableRemoteLogging ? true }: with stdenv.lib; let + repo = "git@github.com:lihaoyi/Ammonite.git"; + common = { scalaVersion, sha256 }: stdenv.mkDerivation rec { pname = "ammonite"; - version = "2.2.0"; + version = "2.3.8"; src = fetchurl { url = @@ -20,10 +23,41 @@ let install -Dm755 $src $out/bin/amm sed -i '0,/java/{s|java|${jre}/bin/java|}' $out/bin/amm '' + optionalString (disableRemoteLogging) '' - sed -i '0,/ammonite.Main/{s|ammonite.Main|ammonite.Main --no-remote-logging|}' $out/bin/amm + sed -i "0,/ammonite.Main/{s|ammonite.Main'|ammonite.Main' --no-remote-logging|}" $out/bin/amm sed -i '1i #!/bin/sh' $out/bin/amm ''; + passthru = { + tests = { inherit (nixosTests) ammonite; }; + + updateScript = writeScript "update.sh" '' + #!${stdenv.shell} + set -o errexit + PATH=${ + stdenv.lib.makeBinPath [ + common-updater-scripts + coreutils + git + gnused + nix + nixfmt + ] + } + oldVersion="$(nix-instantiate --eval -E "with import ./. {}; lib.getVersion ${pname}" | tr -d '"')" + latestTag="$(git -c 'versionsort.suffix=-' ls-remote --exit-code --refs --sort='version:refname' --tags ${repo} '*.*.*' | tail --lines=1 | cut --delimiter='/' --fields=3)" + if [ "$oldVersion" != "$latestTag" ]; then + nixpkgs="$(git rev-parse --show-toplevel)" + default_nix="$nixpkgs/pkgs/development/tools/ammonite/default.nix" + update-source-version ${pname}_2_12 "$latestTag" --version-key=version --print-changes + sed -i "s|$latestTag|$oldVersion|g" "$default_nix" + update-source-version ${pname}_2_13 "$latestTag" --version-key=version --print-changes + nixfmt "$default_nix" + else + echo "${pname} is already up-to-date" + fi + ''; + }; + meta = { description = "Improved Scala REPL"; longDescription = '' @@ -41,10 +75,10 @@ let in { ammonite_2_12 = common { scalaVersion = "2.12"; - sha256 = "0nclfqwy3jfn1680z1hd0zzmc0b79wpvx6gn1jnm19aq7qcvh5zp"; + sha256 = "1kzk0437h2wd9jhwkvjkiaj6mscz4bh85iv266x9zz4zssb355hs"; }; ammonite_2_13 = common { scalaVersion = "2.13"; - sha256 = "104bnahn382sb6vwjvchsg0jrnkkwjn08rfh0g5ra7lwhgcj2719"; + sha256 = "0js84m6yqjd7d77md38z6nk3qzlm1ms8brzczaw05zq2c90pdbz7"; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix index 48805d168089..b4cfa356b277 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "cargo-tarpaulin"; - version = "0.14.3"; + version = "0.17.0"; src = fetchFromGitHub { owner = "xd009642"; repo = "tarpaulin"; - rev = "${version}"; - sha256 = "03d8h5b174699yivaamlvaqzck9zs119jk29yf70dvxw7cs0nngv"; + rev = version; + sha256 = "1z104cd3wg718x1d89znppx4h6f0c6icgmpcllyrd0d19lb71a2b"; }; nativeBuildInputs = [ @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { ]; buildInputs = [ openssl ]; - cargoSha256 = "0zzp2wyq48j6n64fm37qfl65cg4yzf9ysichhkmkc6viq8x0f66d"; + cargoSha256 = "0pn9xgryfb7f0plx50v9i7hsv1wib87pi0fl43cv6hgqyrdb52ny"; #checkFlags = [ "--test-threads" "1" ]; doCheck = false; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/analysis/checkstyle/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/analysis/checkstyle/default.nix index 5dba30e76636..786ed360ef33 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/analysis/checkstyle/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/analysis/checkstyle/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, makeWrapper, jre }: stdenv.mkDerivation rec { - version = "8.36"; + version = "8.38"; pname = "checkstyle"; src = fetchurl { url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${version}/checkstyle-${version}-all.jar"; - sha256 = "1f8g330akx3sdc35dgvy6kksr7y3dnnj7029qrpn745bd9fh92hh"; + sha256 = "1j4k75iv32fsp40ajdfm99zady5c0h0f39xvmv70frp8p58kq3rl"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/analysis/codeql/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/analysis/codeql/default.nix index e450bbefe242..fc37324bc925 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/analysis/codeql/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/analysis/codeql/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { pname = "codeql"; - version = "2.2.5"; + version = "2.4.0"; 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 = "1x9crby4idkvfy6i5l0r00ixnx3ij68zjh1l5n92hyzlf0snv28d"; + sha256 = "1mplya2dyqqmm6gj4if2k4h2fra15rxf2yfnhphqhz40kz75sxk8"; }; nativeBuildInputs = [ diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/analysis/coz/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/analysis/coz/default.nix index 09bb44dc55f0..42b47a9a8fd8 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/analysis/coz/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/analysis/coz/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://github.com/plasma-umass/coz"; - description = "Coz: Causal Profiling"; + description = "Profiler based on casual profiling"; license = stdenv.lib.licenses.bsd2; maintainers = with stdenv.lib.maintainers; [ zimbatm ]; }; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/analysis/cppcheck/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/analysis/cppcheck/default.nix index 8e2c28336cf7..8858ac59ae6b 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/analysis/cppcheck/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/analysis/cppcheck/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "cppcheck"; - version = "2.1"; + version = "2.2"; src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2"; - sha256 = "1xx5i6z9a36h7k4ipikrk2zidk7jcjv8ryqyq2m5hnwy0gpyw9mb"; + sha256 = "1dcf053cqci2ha3yy817y02yz9mhrkgddcbnn6gj82j6k87a4rq4"; }; buildInputs = [ pcre ] ++ stdenv.lib.optionals withZ3 [ z3 ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/analysis/flow/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/analysis/flow/default.nix index cc3ef8ed0f7f..23f35c2c7881 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/analysis/flow/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/analysis/flow/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "flow"; - version = "0.133.0"; + version = "0.138.0"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "refs/tags/v${version}"; - sha256 = "1r4s4gw50pvp4r4mq2w45s9i7fbkf7zycgp8rrj1dqzmkl9v6kii"; + sha256 = "08f7rihk663bwfxccl6fh6p5qn31025lhr5fmcxi3hl3jirwzb6n"; }; installPhase = '' diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/analysis/frama-c/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/analysis/frama-c/default.nix index 179a74c56d50..94012ce7ff68 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/analysis/frama-c/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/analysis/frama-c/default.nix @@ -1,12 +1,13 @@ { lib, stdenv, fetchurl, makeWrapper, writeText , autoconf, ncurses, graphviz, doxygen -, ocamlPackages, ltl2ba, coq, why3, +, ocamlPackages, ltl2ba, coq, why3 +, gdk-pixbuf, wrapGAppsHook }: let mkocamlpath = p: "${p}/lib/ocaml/${ocamlPackages.ocaml.version}/site-lib"; runtimeDeps = with ocamlPackages; [ - apron + apron.dev biniou camlzip easy-format @@ -23,46 +24,44 @@ in stdenv.mkDerivation rec { pname = "frama-c"; - version = "21.1"; - slang = "Scandium"; + version = "22.0"; + slang = "Titanium"; src = fetchurl { url = "http://frama-c.com/download/frama-c-${version}-${slang}.tar.gz"; - sha256 = "0qq0d08dzr0dmdjysiimdqmwlzgnn932vp5kf8lfn3nl45ai09dy"; + sha256 = "1mq1fijka95ydrla486yr4w6wdl9l7vmp512s1q00b0p6lmfwmkh"; }; preConfigure = lib.optionalString stdenv.cc.isClang "configureFlagsArray=(\"--with-cpp=clang -E -C\")"; - nativeBuildInputs = [ autoconf makeWrapper ]; + nativeBuildInputs = [ autoconf wrapGAppsHook ]; buildInputs = with ocamlPackages; [ ncurses ocaml findlib ltl2ba ocamlgraph yojson menhir camlzip lablgtk coq graphviz zarith apron why3 mlgmpidl doxygen + gdk-pixbuf ]; enableParallelBuilding = true; - fixupPhase = '' - for p in $out/bin/frama-c{,-gui}; - do - wrapProgram $p --prefix OCAMLPATH ':' ${ocamlpath} - done + preFixup = '' + gappsWrapperArgs+=(--prefix OCAMLPATH ':' ${ocamlpath}) ''; # Allow loading of external Frama-C plugins setupHook = writeText "setupHook.sh" '' addFramaCPath () { if test -d "''$1/lib/frama-c/plugins"; then - export FRAMAC_PLUGIN="''${FRAMAC_PLUGIN}''${FRAMAC_PLUGIN:+:}''$1/lib/frama-c/plugins" - export OCAMLPATH="''${OCAMLPATH}''${OCAMLPATH:+:}''$1/lib/frama-c/plugins" + export FRAMAC_PLUGIN="''${FRAMAC_PLUGIN-}''${FRAMAC_PLUGIN:+:}''$1/lib/frama-c/plugins" + export OCAMLPATH="''${OCAMLPATH-}''${OCAMLPATH:+:}''$1/lib/frama-c/plugins" fi if test -d "''$1/lib/frama-c"; then - export OCAMLPATH="''${OCAMLPATH}''${OCAMLPATH:+:}''$1/lib/frama-c" + export OCAMLPATH="''${OCAMLPATH-}''${OCAMLPATH:+:}''$1/lib/frama-c" fi if test -d "''$1/share/frama-c/"; then - export FRAMAC_EXTRA_SHARE="''${FRAMAC_EXTRA_SHARE}''${FRAMAC_EXTRA_SHARE:+:}''$1/share/frama-c" + export FRAMAC_EXTRA_SHARE="''${FRAMAC_EXTRA_SHARE-}''${FRAMAC_EXTRA_SHARE:+:}''$1/share/frama-c" fi } diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/analysis/nix-linter/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/analysis/nix-linter/default.nix index 62de8bdfdaaf..138933ebb57f 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/analysis/nix-linter/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/analysis/nix-linter/default.nix @@ -1,6 +1,7 @@ { lib , mkDerivation , fetchFromGitHub +, fetchpatch , fixplate , tasty , tasty-hunit @@ -36,6 +37,14 @@ mkDerivation rec { executableHaskellDepends = [ streamly mtl path pretty-terminal text base aeson cmdargs containers hnix bytestring path-io ]; testHaskellDepends = [ tasty tasty-hunit tasty-th ]; + patches = [ + # raise upper bound on hnix https://github.com/Synthetica9/nix-linter/pull/46 + (fetchpatch { + url = "https://github.com/Synthetica9/nix-linter/commit/b406024e525977b3c69d78d6a94a683e2ded121f.patch"; + sha256 = "0viwbprslcmy70bxy3v27did79nqhlc0jcx4kp0lycswaccvnp1j"; + }) + ]; + description = "Linter for Nix(pkgs), based on hnix"; homepage = "https://github.com/Synthetica9/nix-linter"; license = lib.licenses.bsd3; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/analysis/pev/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/analysis/pev/default.nix index cf09d249a9a7..42e382c8bcad 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/analysis/pev/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/analysis/pev/default.nix @@ -1,24 +1,30 @@ { stdenv, openssl, fetchFromGitHub }: + stdenv.mkDerivation { - name = "pev-unstable-2018-07-22"; - buildInputs = [ openssl ]; + pname = "pev"; + version = "unstable-2020-05-23"; + src = fetchFromGitHub { owner = "merces"; repo = "pev"; - rev = "aa4ef7f"; - sha256 = "00a3g486343lhqcsf4vrdy5xif6v3cgcf2y8yp5b96x15c0wid36"; + rev = "beec2b4f09585fea919ed41ce466dee06be0b6bf"; + sha256 = "sha256-HrMbk9YbuqkoBBM7+rfXpqVEnd1rDl2rMePdcfU1WDg="; fetchSubmodules = true; }; + buildInputs = [ openssl ]; + + enableParallelBuilding = true; + makeFlags = [ "prefix=$(out)" ]; + installFlags = [ "prefix=$(out)" ]; meta = with stdenv.lib; { - description = "pev is a full-featured, open source, multiplatform command line toolkit to work with PE (Portable Executables) binaries"; - homepage = "http://pev.sourceforge.net/"; + description = "A full-featured, open source, multiplatform command line toolkit to work with PE (Portable Executables) binaries"; + homepage = "https://pev.sourceforge.net/"; license = licenses.gpl2; + maintainers = with maintainers; [ jeschli ]; platforms = platforms.linux; - maintainers = [ maintainers.jeschli ]; }; - } diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/analysis/pmd/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/analysis/pmd/default.nix index f91cdbead82c..497a244f68b4 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/analysis/pmd/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/analysis/pmd/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "pmd"; - version = "6.26.0"; + version = "6.29.0"; src = fetchurl { url = "mirror://sourceforge/pmd/pmd-bin-${version}.zip"; - sha256 = "1vlqwrbqk2cbp8kgxkm61c4blai81ib35yjf6wms16w0hvbqf2b4"; + sha256 = "08iibpf9jhkk7ihsmlm85wpjwy1bvznbvggvqyw6109f9gzlrvvq"; }; nativeBuildInputs = [ unzip makeWrapper ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/analysis/radare2/cutter.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/analysis/radare2/cutter.nix index 1cef52a34443..d4a102ac097b 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/analysis/radare2/cutter.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/analysis/radare2/cutter.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ fetchFromGitHub, lib, mkDerivation # nativeBuildInputs , qmake, pkgconfig # Qt @@ -8,7 +8,7 @@ , python3 , wrapQtAppsHook }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "radare2-cutter"; version = "1.12.0"; @@ -30,21 +30,31 @@ stdenv.mkDerivation rec { --replace "include(lib_radare2.pri)" "" ''; - nativeBuildInputs = [ qmake pkgconfig ]; - buildInputs = [ qtbase qtsvg qtwebengine r2-for-cutter python3 wrapQtAppsHook ]; + nativeBuildInputs = [ qmake pkgconfig python3 wrapQtAppsHook ]; + propagatedBuildInputs = [ python3.pkgs.pyside2 ]; + buildInputs = [ qtbase qtsvg qtwebengine r2-for-cutter python3 ]; - qmakeFlags = [ + qmakeFlags = with python3.pkgs; [ "CONFIG+=link_pkgconfig" "PKGCONFIG+=r_core" # Leaving this enabled doesn't break build but generates errors # at runtime (to console) about being unable to load needed bits. # Disable until can be looked at. "CUTTER_ENABLE_JUPYTER=false" + # Enable support for Python plugins + "CUTTER_ENABLE_PYTHON=true" + "CUTTER_ENABLE_PYTHON_BINDINGS=true" + "SHIBOKEN_EXTRA_OPTIONS+=-I${r2-for-cutter}/include/libr" ]; + preBuild = '' + export NIX_LDFLAGS="$NIX_LDFLAGS $(pkg-config --libs python3-embed)" + qtWrapperArgs+=(--prefix PYTHONPATH : "$PYTHONPATH") + ''; + enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "A Qt and C++ GUI for radare2 reverse engineering framework"; homepage = src.meta.homepage; license = licenses.gpl3; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/analysis/randoop/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/analysis/randoop/default.nix index 0e57509d9f73..b51b26eab172 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/analysis/randoop/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/analysis/randoop/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, unzip }: stdenv.mkDerivation rec { - version = "4.2.4"; + version = "4.2.5"; pname = "randoop"; src = fetchurl { url = "https://github.com/randoop/randoop/releases/download/v${version}/${pname}-${version}.zip"; - sha256 = "1p6l5xzz7cbhrk5wy3906llhnwk0l8nck53pvi0l57kz7bdnag5w"; + sha256 = "0v3vla3k6csfb8w0j9njrhcjj4n7yh172n9wv6z397f1sa0fs202"; }; buildInputs = [ unzip ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/analysis/retdec/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/analysis/retdec/default.nix index 55c077f932d9..b0e5319df2d6 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/analysis/retdec/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/analysis/retdec/default.nix @@ -135,8 +135,7 @@ in stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "avast-tl"; - repo = "retdec"; - name = "retdec-${version}"; + repo = pname; rev = "refs/tags/v${version}"; sha256 = "0chky656lsddn20bnm3pmz6ix20y4a0y8swwr42hrhi01vkhmzrp"; }; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/analysis/rr/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/analysis/rr/default.nix index 47832c5ae2a3..5e80d5b096db 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/analysis/rr/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/analysis/rr/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, cmake, libpfm, zlib, pkgconfig, python3Packages, which, procps, gdb, capnproto }: stdenv.mkDerivation rec { - version = "5.3.0"; + version = "5.4.0"; pname = "rr"; src = fetchFromGitHub { owner = "mozilla"; repo = "rr"; rev = version; - sha256 = "1x6l1xsdksnhz9v50p4r7hhmr077cq20kaywqy1jzdklvkjqzf64"; + sha256 = "1sfldgkkmsdyaqa28i5agcykc63gwm3zjihd64g86i852w8al2w6"; }; postPatch = '' diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/analysis/svlint/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/analysis/svlint/default.nix index adf17dabecee..51b363c6be33 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/analysis/svlint/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/analysis/svlint/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "svlint"; - version = "0.4.7"; + version = "0.4.8"; src = fetchFromGitHub { owner = "dalance"; repo = "svlint"; rev = "v${version}"; - sha256 = "0gn68achvhyxljvhw5rwraxjcgdwrl1bwbsn596ka15nrk4lwb34"; + sha256 = "1anbanvaikj8g5jcmjd165krzvjdwj1cl8f3vm1nmy997x8vxihf"; }; - cargoSha256 = "0v94zsh4jhzjnqbkgwn8rjbs72i5cw2nmkwn7xhdbbwxh17a88x4"; + cargoSha256 = "18xnqsrnf2gc9zny8ayzf1bah8mq1fy5k807cz039gqz36cvnma0"; meta = with lib; { description = "SystemVerilog linter"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/analysis/tflint/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/analysis/tflint/default.nix index fe7b834e8e81..32c1fca634b6 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/analysis/tflint/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/analysis/tflint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "tflint"; - version = "0.20.2"; + version = "0.21.0"; src = fetchFromGitHub { owner = "terraform-linters"; repo = pname; rev = "v${version}"; - sha256 = "123ndg7byrflczxzhk2c48bb8wlwgqzf1m0dzi0mnw3h52qiqjyp"; + sha256 = "0gdv2l10v19mjskv0f0aphxbzvdx6py0w6n9yg4wn6g7j7c61szd"; }; - vendorSha256 = "1prf1hffvwl2hdkrr8hqz1wwcz2n9dzhf68ziz5k3fzsx30jki9l"; + vendorSha256 = "0s5ingyl0m939k1qxc1qiyhiabi3ml0qz33s3rbd4hmcg907yjga"; doCheck = false; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/analysis/valgrind/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/analysis/valgrind/default.nix index 2e485b3ed67b..60d3a7c5ebc9 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/analysis/valgrind/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/analysis/valgrind/default.nix @@ -86,5 +86,6 @@ stdenv.mkDerivation rec { "riscv32-linux" "riscv64-linux" "alpha-linux" ]; + broken = stdenv.isDarwin; # https://hydra.nixos.org/build/128521440/nixlog/2 }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/apktool/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/apktool/default.nix index 529f705e1012..2ff9c58fb339 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/apktool/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/apktool/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "apktool"; - version = "2.4.1"; + version = "2.5.0"; src = fetchurl { urls = [ "https://bitbucket.org/iBotPeaches/apktool/downloads/apktool_${version}.jar" "https://github.com/iBotPeaches/Apktool/releases/download/v${version}/apktool_${version}.jar" ]; - sha256 = "0ljsh8nx065isnyzzrwddypikkfhyqsww0w02cgwgh8x3lhndsxx"; + sha256 = "1r4z0z2c1drjd4ynpf36dklxs3hq1wdnzh63mk2yk4mmk75xg4mk"; }; phases = [ "installPhase" ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/aws-sam-cli/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/aws-sam-cli/default.nix index a486d318608c..52b1a26d8143 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/aws-sam-cli/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/aws-sam-cli/default.nix @@ -1,20 +1,12 @@ { fetchFromGitHub , lib -, python +, python3 , enableTelemetry ? false }: let - py = python.override { + py = python3.override { packageOverrides = self: super: { - aws-sam-translator = super.aws-sam-translator.overridePythonAttrs (oldAttrs: rec { - version = "1.25.0"; - src = oldAttrs.src.override { - inherit version; - sha256 = "08756yl5lpqgrpr80f2b6bdcgygr37l6q1yygklcg9hz4yfpccav"; - }; - }); - flask = super.flask.overridePythonAttrs (oldAttrs: rec { version = "1.0.2"; src = oldAttrs.src.override { @@ -39,11 +31,11 @@ with py.pkgs; buildPythonApplication rec { pname = "aws-sam-cli"; - version = "1.0.0rc1"; + version = "1.6.2"; src = fetchPypi { inherit pname version; - sha256 = "011b334gdvd9lhqia8c952q3cmzj99vik680180nbp0qh2xw6zpf"; + sha256 = "0scnymhhiiqrs2j0jaypxgq2wg1qf1w8f55qfay0b3nf51y6mh8y"; }; # Tests are not included in the PyPI package @@ -75,12 +67,13 @@ buildPythonApplication rec { # fix over-restrictive version bounds postPatch = '' substituteInPlace requirements/base.txt \ - --replace "boto3~=1.13.0, >=1.13.0" "boto3~=1.14.3" \ - --replace "serverlessrepo==0.1.9" "serverlessrepo~=0.1.9" \ - --replace "python-dateutil~=2.6, <2.8.1" "python-dateutil~=2.6" \ + --replace "boto3~=1.14.0, >=1.14.23" "boto3~=1.14" \ + --replace "docker~=4.2.0" "docker~=4.3.1" \ --replace "jmespath~=0.9.5" "jmespath~=0.10.0" \ - --replace "tomlkit==0.5.8" "tomlkit~=0.7.0" \ - --replace "requests==2.23.0" "requests~=2.24" + --replace "python-dateutil~=2.6, <2.8.1" "python-dateutil~=2.6" \ + --replace "requests==2.23.0" "requests~=2.24" \ + --replace "serverlessrepo==0.1.9" "serverlessrepo~=0.1.9" \ + --replace "tomlkit==0.5.8" "tomlkit~=0.7.0" ''; meta = with lib; { diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/azcopy/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/azcopy/default.nix index 3d0fe8513c8a..1c5bb899b69b 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/azcopy/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/azcopy/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "azure-storage-azcopy"; - version = "10.6.0"; + version = "10.7.0"; src = fetchFromGitHub { owner = "Azure"; repo = "azure-storage-azcopy"; rev = "v${version}"; - sha256 = "0izjnbldgf0597j4rh2ir9jsc2nzp9vwxcgllvkm5lh1xqf6i0nf"; + sha256 = "0l2109r9a8fhd66zgsi56zdmy390fpnvy08rbxf6rfc0a55n96ka"; }; subPackages = [ "." ]; - vendorSha256 = "10sxkb2dh1il4ps15dlvq0xsry8hax27imb5qg3khdmjhb4yaj7k"; + vendorSha256 = "032yzl8mmgmmxbpsymndp4ddgi572jh5drwql0bjjabp3yqwj1g1"; doCheck = false; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/backblaze-b2/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/backblaze-b2/default.nix index 46e54465ab67..446d54f90ca4 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/backblaze-b2/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/backblaze-b2/default.nix @@ -1,42 +1,37 @@ -{ - fetchFromGitHub, - lib, - python3Packages, -}: +{ fetchFromGitHub, lib, python3Packages }: python3Packages.buildPythonApplication rec { pname = "backblaze-b2"; - version = "2.0.2"; + version = "2.1.0"; src = fetchFromGitHub { owner = "Backblaze"; repo = "B2_Command_Line_Tool"; rev = "v${version}"; - sha256 = "00zs0a580vvfm2w4ja68mc46360p475wlgagjkq1hi4m8s4qwd75"; + sha256 = "1kkpvxqgh5pw4kr8lh5gy9d7960hv9zvajbjiqhj6xgykwbpbgmq"; }; propagatedBuildInputs = with python3Packages; [ b2sdk class-registry + phx-class-registry setuptools ]; - checkInputs = with python3Packages; [ - nose - ]; + checkInputs = with python3Packages; [ pytestCheckHook ]; - # doCheck = false; - checkPhase = '' - nosetests - ''; + disabledTests = [ + "test_files_headers" + "test_integration" + ]; postInstall = '' mv "$out/bin/b2" "$out/bin/backblaze-b2" sed 's/b2/backblaze-b2/' -i contrib/bash_completion/b2 - mkdir -p "$out/etc/bash_completion.d" - cp contrib/bash_completion/b2 "$out/etc/bash_completion.d/backblaze-b2" + mkdir -p "$out/share/bash-completion/completions" + cp contrib/bash_completion/b2 "$out/share/bash-completion/completions/backblaze-b2" ''; meta = with lib; { diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/bazel-kazel/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/bazel-kazel/default.nix index 20b17de0c211..c8127256a612 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/bazel-kazel/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/bazel-kazel/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "bazel-kazel"; - version = "0.1.1"; + version = "0.1.3"; src = fetchFromGitHub { owner = "kubernetes"; repo = "repo-infra"; rev = "v${version}"; - sha256 = "0d59kf0y12sa1bki7gzcb2nzppwj3gxlv133bsnl9gc8vx1d8ldg"; + sha256 = "1mmla4j30ka368gsf4v8h23f32rsc4fpyrqswafw98x07xngmmqr"; }; vendorSha256 = "1pzkjh4n9ai8yqi98bkdhicjdr2l8j3fckl5n90c2gdcwqyxvgkf"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/bazelisk/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/bazelisk/default.nix index 26a0dd866703..2a20888426d0 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/bazelisk/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/bazelisk/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "bazelisk"; - version = "1.7.2"; + version = "1.7.4"; src = fetchFromGitHub { owner = "bazelbuild"; repo = pname; rev = "v${version}"; - sha256 = "0psqhv2cm2xwjyivaza2s6x780q6yjn1nsjdy538zjky22dazqq4"; + sha256 = "1mc1l2g2qrg9djpyyz203a6dpx5fxllisybmhrpmikyza15w935q"; }; vendorSha256 = "116wy1a7gmi2w8why9hszhcybfvpwp4iq62vshb25cdcma6q4mjh"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/build-managers/apache-ant/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/build-managers/apache-ant/default.nix index b0411090fbe5..caa9bc3b9eb7 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/build-managers/apache-ant/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/build-managers/apache-ant/default.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv, coreutils, makeWrapper }: -let version = "1.10.8"; in +let version = "1.10.9"; 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 = "0zh94csb2hl6ir2ccn18ps506mjgh3mffnrb8wpsmp1x5fcykha5"; + sha256 = "1ab8ybczvk12501dnj450a3d4v43ca0pjhk33s175hax46s58z47"; }; contrib = fetchurl { diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix index 4cde308b8359..0c9f4d7c50a0 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix @@ -7,7 +7,7 @@ }: buildBazelPackage rec { - name = "bazel-remote-${version}"; + pname = "bazel-remote"; version = "1.0.0"; src = fetchFromGitHub { diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_3/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_3/default.nix index 0bfc9071d7e6..0b5a7362ded1 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_3/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_3/default.nix @@ -48,9 +48,10 @@ let srcs.bazel_skylib srcs.io_bazel_rules_sass srcs.platforms - (if stdenv.hostPlatform.isDarwin - then srcs."java_tools_javac11_darwin-v8.0.zip" - else srcs."java_tools_javac11_linux-v8.0.zip") + # `bazel query` wants all of these to be available regardless of platform. + srcs."java_tools_javac11_darwin-v8.0.zip" + srcs."java_tools_javac11_linux-v8.0.zip" + srcs."java_tools_javac11_windows-v8.0.zip" srcs."coverage_output_generator-v2.1.zip" srcs.build_bazel_rules_nodejs srcs."android_tools_pkg-0.19.0rc1.tar.gz" @@ -131,10 +132,21 @@ let bazelRC = writeTextFile { name = "bazel-rc"; text = '' - build --override_repository=${remote_java_tools.name}=${remote_java_tools} - build --distdir=${distDir} startup --server_javabase=${runJdk} + # Can't use 'common'; https://github.com/bazelbuild/bazel/issues/3054 + # Most commands inherit from 'build' anyway. + build --distdir=${distDir} + fetch --distdir=${distDir} + query --distdir=${distDir} + + build --override_repository=${remote_java_tools.name}=${remote_java_tools} + fetch --override_repository=${remote_java_tools.name}=${remote_java_tools} + query --override_repository=${remote_java_tools.name}=${remote_java_tools} + + # Provide a default java toolchain, this will be the same as ${runJdk} + build --host_javabase='@local_jdk//:jdk' + # load default location for the system wide configuration try-import /etc/bazel.bazelrc ''; @@ -534,7 +546,7 @@ stdenv.mkDerivation rec { export TEST_TMPDIR=$(pwd) hello_test () { - $out/bin/bazel test --distdir=${distDir} \ + $out/bin/bazel test \ --test_output=errors \ --java_toolchain='${javaToolchain}' \ examples/cpp:hello-success_test \ diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/build-managers/bear/cmakepaths.patch b/infra/libkookie/nixpkgs/pkgs/development/tools/build-managers/bear/cmakepaths.patch deleted file mode 100644 index d237267078e6..000000000000 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/build-managers/bear/cmakepaths.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 04c5c58..429ca47 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -24,7 +24,7 @@ set(CMAKE_OSX_ARCHITECTURES "i386;x86_64" CACHE STRING "Rogue") - - set(EAR_LIB_FILE ${CMAKE_SHARED_LIBRARY_PREFIX}ear${CMAKE_SHARED_LIBRARY_SUFFIX}) - set(EAR_LIB_PATH "${CMAKE_INSTALL_LIBDIR}/bear") --set(DEFAULT_PRELOAD_FILE ${CMAKE_INSTALL_PREFIX}/${EAR_LIB_PATH}/${EAR_LIB_FILE} CACHE STRING "Default path to libear.") -+set(DEFAULT_PRELOAD_FILE ${EAR_LIB_PATH}/${EAR_LIB_FILE} CACHE STRING "Default path to libear.") - - add_subdirectory(libear) - add_subdirectory(bear) diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/build-managers/bear/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/build-managers/bear/default.nix index bc7bb46cd5b9..756e68b56781 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/build-managers/bear/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/build-managers/bear/default.nix @@ -1,22 +1,49 @@ -{ stdenv, fetchFromGitHub, cmake, python3 }: +{ stdenv +, fetchFromGitHub +, cmake +, pkg-config +, grpc +, protobuf +, openssl +, nlohmann_json +, gtest +, fmt +, spdlog +, c-ares +, abseil-cpp +, zlib +}: stdenv.mkDerivation rec { pname = "bear"; - version = "2.4.2"; + version = "3.0.3"; src = fetchFromGitHub { owner = "rizsotto"; repo = pname; rev = version; - sha256 = "1w1kyjzvvy5lj16kn3yyf7iil2cqlfkszi8kvagql7f5h5l6w9b1"; + sha256 = "1abx5h6xy0h3mz29ial5si8smkmjzla050d130pcc6dzr4ic642w"; }; - nativeBuildInputs = [ cmake ]; - buildInputs = [ python3 ]; # just for shebang of bin/bear + nativeBuildInputs = [ cmake pkg-config ]; - doCheck = false; # all fail + buildInputs = [ + grpc + protobuf + openssl + nlohmann_json + gtest + fmt + spdlog + c-ares + abseil-cpp + zlib + ]; - patches = [ ./ignore_wrapper.patch ./cmakepaths.patch ]; + patches = [ + # Default libexec would be set to /nix/store/*-bear//nix/store/*-bear/libexec/... + ./no-double-relative.patch + ]; meta = with stdenv.lib; { description = "Tool that generates a compilation database for clang tooling"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/build-managers/bear/ignore_wrapper.patch b/infra/libkookie/nixpkgs/pkgs/development/tools/build-managers/bear/ignore_wrapper.patch deleted file mode 100644 index 8effc723bbab..000000000000 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/build-managers/bear/ignore_wrapper.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- a/bear/main.py.in -+++ b/bear/main.py.in -@@ -49,6 +49,7 @@ import tempfile - import shutil - import contextlib - import logging -+from distutils.spawn import find_executable - - # Map of ignored compiler option for the creation of a compilation database. - # This map is used in _split_command method, which classifies the parameters -@@ -569,7 +570,15 @@ class Compilation: - (compiler, language, rest of the command) otherwise """ - - if command: # not empty list will allow to index '0' and '1:' -- executable = os.path.basename(command[0]) # type: str -+ executable_file = find_executable(command[0]) -+ if executable_file: -+ absolute_executable = os.path.realpath(executable_file) -+ # Ignore Nix wrappers. -+ if 'wrapper' in absolute_executable: -+ return None -+ executable = os.path.basename(absolute_executable) -+ else: -+ executable = os.path.basename(command[0]) - parameters = command[1:] # type: List[str] - # 'wrapper' 'parameters' and - # 'wrapper' 'compiler' 'parameters' are valid.
\ No newline at end of file diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/build-managers/bear/no-double-relative.patch b/infra/libkookie/nixpkgs/pkgs/development/tools/build-managers/bear/no-double-relative.patch new file mode 100644 index 000000000000..0184bdfd6ba7 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/build-managers/bear/no-double-relative.patch @@ -0,0 +1,14 @@ +diff --git a/source/config.h.in b/source/config.h.in +index 2ca8853..2564c63 100644 +--- a/source/config.h.in ++++ b/source/config.h.in +@@ -65,6 +65,6 @@ constexpr char VERSION[] = "@CMAKE_PROJECT_VERSION@"; + + constexpr char CITNAMES_DEFAULT_PATH[] = "@ROOT_INSTALL_PREFIX@/@CMAKE_INSTALL_BINDIR@/citnames"; + constexpr char INTERCEPT_DEFAULT_PATH[] = "@ROOT_INSTALL_PREFIX@/@CMAKE_INSTALL_BINDIR@/intercept"; +-constexpr char LIBRARY_DEFAULT_PATH[] = "@ROOT_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBEXECDIR@/@CMAKE_SHARED_LIBRARY_PREFIX@exec@CMAKE_SHARED_LIBRARY_SUFFIX@"; +-constexpr char EXECUTOR_DEFAULT_PATH[] = "@ROOT_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBEXECDIR@/er"; +-constexpr char WRAPPER_DEFAULT_PATH[] = "@ROOT_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBEXECDIR@/wrapper.d"; ++constexpr char LIBRARY_DEFAULT_PATH[] = "@CMAKE_INSTALL_LIBEXECDIR@/@CMAKE_SHARED_LIBRARY_PREFIX@exec@CMAKE_SHARED_LIBRARY_SUFFIX@"; ++constexpr char EXECUTOR_DEFAULT_PATH[] = "@CMAKE_INSTALL_LIBEXECDIR@/er"; ++constexpr char WRAPPER_DEFAULT_PATH[] = "@CMAKE_INSTALL_LIBEXECDIR@/wrapper.d"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/build-managers/bloop/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/build-managers/bloop/default.nix index 45612182ed96..4c6d47ecb189 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/build-managers/bloop/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/build-managers/bloop/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "bloop"; - version = "1.4.4"; + version = "1.4.5"; bloop-coursier-channel = fetchurl { url = "https://github.com/scalacenter/bloop/releases/download/v${version}/bloop-coursier.json"; - sha256 = "1pyf559bpnsmvca4kw36nb9lwkwa9q0ghrpa117s96dhvrp3i2bv"; + sha256 = "0a3ayvq62nbfrcs2xgrfqg27h0wf9x28pxabmwd8y0ncafsnifjy"; }; bloop-bash = fetchurl { @@ -54,8 +54,8 @@ stdenv.mkDerivation rec { outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = if stdenv.isLinux && stdenv.isx86_64 then "0hf0priy93zqba78a9nvbgl3mzwlc4jz43gz7cv2cdkj6x0lp0y1" - else if stdenv.isDarwin && stdenv.isx86_64 then "0g2rnmlfnqymji4f4rn0kaz7hipgv3bakdpn08600gg1f3s8gabw" + outputHash = if stdenv.isLinux && stdenv.isx86_64 then "0wh02djny3a9882423lh4kf67z981d1ky85gfphsw52fbdhbzmn9" + else if stdenv.isDarwin && stdenv.isx86_64 then "0db30zbqpa9q285hspaba124dfnnr1gmlrxwwvn9szxz1d55n417" else throw "unsupported platform"; }; @@ -85,7 +85,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://scalacenter.github.io/bloop/"; license = licenses.asl20; - description = "Bloop is a Scala build server and command-line tool to make the compile and test developer workflows fast and productive in a build-tool-agnostic way"; + description = "A Scala build server and command-line tool to make the compile and test developer workflows fast and productive in a build-tool-agnostic way"; platforms = [ "x86_64-linux" "x86_64-darwin" ]; maintainers = with maintainers; [ tomahna ]; }; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/build-managers/cmake/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/build-managers/cmake/default.nix index 559a4c191b68..ef8a5324487d 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/build-managers/cmake/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/build-managers/cmake/default.nix @@ -5,6 +5,7 @@ , ps , isBootstrap ? false , useSharedLibraries ? (!isBootstrap && !stdenv.isCygwin) +, useOpenSSL ? !isBootstrap, openssl , useNcurses ? false, ncurses , useQt4 ? false, qt4 , withQt5 ? false, qtbase @@ -19,12 +20,12 @@ stdenv.mkDerivation rec { + lib.optionalString useNcurses "-cursesUI" + lib.optionalString withQt5 "-qt5UI" + lib.optionalString useQt4 "-qt4UI"; - version = "3.18.2"; + version = "3.19.1"; 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 = "0zhxsnxm5d8wdarz2gs3r41r1dfrnh35ki75fa684gaxfzy40kjx"; + sha256 = "1fisi9rlijw9wd0yjzk1c6j7ljnb2yiq5iqnrz6m1xkflyinw9hx"; }; patches = [ @@ -44,15 +45,17 @@ stdenv.mkDerivation rec { setupHook = ./setup-hook.sh; - buildInputs = - [ setupHook pkgconfig ] + depsBuildBuild = [ buildPackages.stdenv.cc ]; + + nativeBuildInputs = [ setupHook pkgconfig ]; + + buildInputs = [] ++ lib.optionals useSharedLibraries [ bzip2 curl expat libarchive xz zlib libuv rhash ] + ++ lib.optional useOpenSSL openssl ++ lib.optional useNcurses ncurses ++ lib.optional useQt4 qt4 ++ lib.optional withQt5 qtbase; - depsBuildBuild = [ buildPackages.stdenv.cc ]; - propagatedBuildInputs = lib.optional stdenv.isDarwin ps; preConfigure = '' @@ -91,13 +94,15 @@ stdenv.mkDerivation rec { "-DCMAKE_AR=${lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ar" "-DCMAKE_RANLIB=${lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ranlib" "-DCMAKE_STRIP=${lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}strip" - ] + + "-DCMAKE_USE_OPENSSL=${if useOpenSSL then "ON" else "OFF"}" # Avoid depending on frameworks. - ++ lib.optional (!useNcurses) "-DBUILD_CursesDialog=OFF"; + "-DBUILD_CursesDialog=${if useNcurses then "ON" else "OFF"}" + ]; # make install attempts to use the just-built cmake preInstall = lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) '' - sed -i 's|bin/cmake|${buildPackages.cmake}/bin/cmake|g' Makefile + sed -i 's|bin/cmake|${buildPackages.cmakeMinimal}/bin/cmake|g' Makefile ''; dontUseCmakeConfigure = true; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/build-managers/gn/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/build-managers/gn/default.nix index 599e10af1a9a..3c0abb3edeab 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/build-managers/gn/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/build-managers/gn/default.nix @@ -59,6 +59,6 @@ in stdenv.mkDerivation { homepage = "https://gn.googlesource.com/gn"; license = licenses.bsd3; platforms = platforms.unix; - maintainers = with maintainers; [ stesie matthewbauer ]; + maintainers = with maintainers; [ stesie matthewbauer primeos ]; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/build-managers/gradle/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/build-managers/gradle/default.nix index 73e9bc7b5601..d06282739afe 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/build-managers/gradle/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/build-managers/gradle/default.nix @@ -51,15 +51,15 @@ rec { }; }; - gradle_latest = gradle_6_6; + gradle_latest = gradle_6_7; - gradle_6_6 = gradleGen rec { - name = "gradle-6.6"; - nativeVersion = "0.22-milestone-4"; + gradle_6_7 = gradleGen rec { + name = "gradle-6.7"; + nativeVersion = "0.22-milestone-8"; src = fetchurl { url = "https://services.gradle.org/distributions/${name}-bin.zip"; - sha256 = "09a0fnz6fn8yaxm3q3iwyjm3nnaz7k8i1xlpc7sm414py043by76"; + sha256 = "1i6zm55wzy13wvvmf3804b0rs47yrqqablf4gpf374ls05cpgmca"; }; }; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/build-managers/meson/boost-Do-not-add-system-paths-on-nix.patch b/infra/libkookie/nixpkgs/pkgs/development/tools/build-managers/meson/boost-Do-not-add-system-paths-on-nix.patch new file mode 100644 index 000000000000..5b9020b3d540 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/build-managers/meson/boost-Do-not-add-system-paths-on-nix.patch @@ -0,0 +1,40 @@ +From 536108b10271f2f42d41c7d9ddb4ce2ea1851f4f Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= <mail@nh2.me> +Date: Sat, 17 Oct 2020 19:27:08 +0200 +Subject: [PATCH] boost: Do not add system paths on nix + +--- + mesonbuild/dependencies/boost.py | 17 +---------------- + 1 file changed, 1 insertion(+), 16 deletions(-) + +diff --git a/mesonbuild/dependencies/boost.py b/mesonbuild/dependencies/boost.py +index 907c0c275..ecaf11b18 100644 +--- a/mesonbuild/dependencies/boost.py ++++ b/mesonbuild/dependencies/boost.py +@@ -643,22 +643,7 @@ class BoostDependency(ExternalDependency): + roots += [x for x in candidates if x.name.lower().startswith('boost') and x.is_dir()] + else: + tmp = [] # type: T.List[Path] +- +- # Homebrew +- brew_boost = Path('/usr/local/Cellar/boost') +- if brew_boost.is_dir(): +- tmp += [x for x in brew_boost.iterdir()] +- +- # Add some default system paths +- tmp += [Path('/opt/local')] +- tmp += [Path('/usr/local/opt/boost')] +- tmp += [Path('/usr/local')] +- tmp += [Path('/usr')] +- +- # Cleanup paths +- tmp = [x for x in tmp if x.is_dir()] +- tmp = [x.resolve() for x in tmp] +- roots += tmp ++ # Do not add any non-explicit paths on nix + + return roots + +-- +2.25.4 + diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/build-managers/meson/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/build-managers/meson/default.nix index 8421fb7d70a0..cd506b970f60 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/build-managers/meson/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/build-managers/meson/default.nix @@ -3,17 +3,16 @@ , stdenv , writeTextDir , substituteAll -, pkgsHostHost , fetchpatch }: python3.pkgs.buildPythonApplication rec { pname = "meson"; - version = "0.55.3"; + version = "0.56.0"; src = python3.pkgs.fetchPypi { inherit pname version; - sha256 = "19cjy24mfaswxyvqmns6rd7hx05ybqb663zlgklspfr8l4jjmvbb"; + sha256 = "04vj250bwrzq7c0z1r96b0z0vgirvn0m367wm3ygqmfdy67x6799"; }; patches = [ @@ -52,14 +51,15 @@ python3.pkgs.buildPythonApplication rec { # cut-in-half-by-\0 store path references. # Let’s just clear the whole rpath and hope for the best. ./clear-old-rpath.patch + + # Patch out default boost search paths to avoid impure builds on + # unsandboxed non-NixOS builds, see: + # https://github.com/NixOS/nixpkgs/issues/86131#issuecomment-711051774 + ./boost-Do-not-add-system-paths-on-nix.patch ]; setupHook = ./setup-hook.sh; - # Ensure there will always be a native C compiler when meson is used, as a - # workaround until https://github.com/mesonbuild/meson/pull/6512 lands. - depsHostHostPropagated = [ pkgsHostHost.stdenv.cc ]; - # 0.45 update enabled tests but they are failing doCheck = false; # checkInputs = [ ninja pkgconfig ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/build-managers/mill/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/build-managers/mill/default.nix index 3fc893fd07cf..a3865e2c52c9 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/build-managers/mill/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/build-managers/mill/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mill"; - version = "0.8.0"; + version = "0.9.3"; src = fetchurl { url = "https://github.com/lihaoyi/mill/releases/download/${version}/${version}"; - sha256 = "04pf76iyrbq2h2hksx0r2fmnd0d9mi6an24zvfv7k79rch11cql1"; + sha256 = "0x9mvcm5znyi7w6cpiasj2v6f63y7d8qdck7lx03p2k6i9aa2f77"; }; nativeBuildInputs = [ makeWrapper ]; @@ -21,8 +21,7 @@ stdenv.mkDerivation rec { # can't use wrapProgram because it sets --argv0 makeWrapper "$out/bin/.mill-wrapped" "$out/bin/mill" \ --prefix PATH : "${jre}/bin" \ - --set JAVA_HOME "${jre}" \ - --set MILL_VERSION "${version}" + --set JAVA_HOME "${jre}" runHook postInstall ''; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/build-managers/msbuild/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/build-managers/msbuild/default.nix index aea215cc927d..1b805df95a08 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/build-managers/msbuild/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/build-managers/msbuild/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { nuget sources Add -Name nixos -Source $(pwd)/nixos # license check is case sensitive - mv LICENSE license + mv LICENSE license.bak && mv license.bak license mkdir -p artifacts unzip ${xplat} -d artifacts diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/build-managers/ninja/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/build-managers/ninja/default.nix index bc5ad7744d68..8fc81a1a979d 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/build-managers/ninja/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/build-managers/ninja/default.nix @@ -4,13 +4,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "ninja"; - version = "1.10.1"; + version = "1.10.2"; src = fetchFromGitHub { owner = "ninja-build"; repo = "ninja"; rev = "v${version}"; - sha256 = "1bmv7zfqwp48ga6vnqvy0gzkclv40xgq19q4ihl58r6cn4swccn3"; + sha256 = "0mspq4mvx41qri2v2zlg2y3znx5gfw6d8s3czbcfpr2218qbpz55"; }; nativeBuildInputs = [ python3 re2c ] ++ optionals buildDocs [ asciidoc docbook_xml_dtd_45 docbook_xsl libxslt.bin ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/build-managers/qbs/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/build-managers/qbs/default.nix index d4f94c1aed97..359c942d189a 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/build-managers/qbs/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/build-managers/qbs/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "qbs"; - version = "1.16.0"; + version = "1.17.0"; src = fetchFromGitHub { owner = "qbs"; repo = "qbs"; rev = "v${version}"; - sha256 = "1kg11s3figpkvgd85p0zk416s57gnvlzrz1isbc2lv13adidf041"; + sha256 = "0sd4qwl1wh8b1hck846plrgddkrdwdfqwk2dgh5hdsrlrvx5xjrr"; }; nativeBuildInputs = [ qmake ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/build-managers/rebar3/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/build-managers/rebar3/default.nix index 5c0fff134a7e..bf28868d0e70 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/build-managers/rebar3/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/build-managers/rebar3/default.nix @@ -3,79 +3,85 @@ tree }: let - version = "3.12.0"; + version = "3.14.2"; + + # Dependencies should match the ones in: + # https://github.com/erlang/rebar3/blob/${version}/rebar.lock + # `sha256` could also be taken from https://hex.pm - Checksum - erlware_commons = fetchHex { - pkg = "erlware_commons"; - version = "1.3.1"; - sha256 = "7aada93f368d0a0430122e39931b7fb4ac9e94dbf043cdc980ad4330fd9cd166"; - }; - ssl_verify_fun = fetchHex { - pkg = "ssl_verify_fun"; - version = "1.1.3"; - sha256 = "2e120e6505d6e9ededb2836611dfe2f7028432dc280957998e154307b5ea92fe"; - }; - certifi = fetchHex { - pkg = "certifi"; - version = "2.3.1"; - sha256 = "e12d667d042c11d130594bae2b0097e63836fe8b1e6d6b2cc48f8bb7a2cf7d68"; - }; - providers = fetchHex { - pkg = "providers"; - version = "1.7.0"; - sha256 = "8be66129ca85c2fa74efd8737cdaedd31c1c1af51dd2fd601495a6def4cae4a6"; - }; - getopt = fetchHex { - pkg = "getopt"; - version = "1.0.1"; - sha256 = "53e1ab83b9ceb65c9672d3e7a35b8092e9bdc9b3ee80721471a161c10c59959c"; - }; bbmustache = fetchHex { pkg = "bbmustache"; - version = "1.6.0"; - sha256 = "53e02d296512a57be03a98c91541b34d2ca64930268030b2d12364a0332015df"; + version = "1.10.0"; + sha256 = "43effa3fd4bb9523157af5a9e2276c493495b8459fc8737144aa186cb13ce2ee"; }; - relx = fetchHex { - pkg = "relx"; - version = "3.28.0"; - sha256 = "8afb871c0a2a27f0063d973903fc64d2207bc705ecc3607462920683d24ac7b5"; + certifi = fetchHex { + pkg = "certifi"; + version = "2.5.2"; + sha256 = "3b3b5f36493004ac3455966991eaf6e768ce9884693d9968055aeeeb1e575040"; }; cf = fetchHex { pkg = "cf"; - version = "0.2.2"; - sha256 = "08cvy7skn5d2k4manlx5k3anqgjdvajjhc5jwxbaszxw34q3na28"; + version = "0.3.1"; + sha256 = "315e8d447d3a4b02bcdbfa397ad03bbb988a6e0aa6f44d3add0f4e3c3bf97672"; }; cth_readable = fetchHex { pkg = "cth_readable"; - version = "1.4.3"; - sha256 = "0wr0hba6ka74s3628jrrd7ynjdh7syxigkh7ildg8fgi20ab88fd"; + version = "1.4.9"; + sha256 = "b4c6ababdb046c5f2fbb3c22f030b4c5a679083956dcdd29c1df0cb30b18da24"; + }; + erlware_commons = fetchHex { + pkg = "erlware_commons"; + version = "1.3.1"; + sha256 = "7aada93f368d0a0430122e39931b7fb4ac9e94dbf043cdc980ad4330fd9cd166"; }; eunit_formatters = fetchHex { pkg = "eunit_formatters"; version = "0.5.0"; sha256 = "1jb3hzb216r29x2h4pcjwfmx1k81431rgh5v0mp4x5146hhvmj6n"; }; - hex_core = fetchHex { - pkg = "hex_core"; - version = "0.4.0"; - sha256 = "8ace8c6cfa10df4cb8be876f42f7446890e124203c094cc7b4e7616fb8de5d7f"; + getopt = fetchHex { + pkg = "getopt"; + version = "1.0.1"; + sha256 = "53e1ab83b9ceb65c9672d3e7a35b8092e9bdc9b3ee80721471a161c10c59959c"; }; parse_trans = fetchHex { pkg = "parse_trans"; version = "3.3.0"; - sha256 = "0q5r871bzx1a8fa06yyxdi3xkkp7v5yqazzah03d6yl3vsmn7vqp"; + sha256 = "17ef63abde837ad30680ea7f857dd9e7ced9476cdd7b0394432af4bfc241b960"; + }; + providers = fetchHex { + pkg = "providers"; + version = "1.8.1"; + sha256 = "e45745ade9c476a9a469ea0840e418ab19360dc44f01a233304e118a44486ba0"; + }; + relx = fetchHex { + pkg = "relx"; + version = "4.1.0"; + sha256 = "b94a3f96697a479ee5217a853345e0f4977bdf40d3c040af0d3d80fadad82af4"; + }; + ssl_verify_fun = fetchHex { + pkg = "ssl_verify_fun"; + version = "1.1.6"; + sha256 = "bdb0d2471f453c88ff3908e7686f86f9be327d065cc1ec16fa4540197ea04680"; }; + hex_core = fetchHex { + pkg = "hex_core"; + version = "0.7.1"; + sha256 = "05c60411511b6dc79affcd99a93e67d71e1b9d6abcb28ba75cd4ebc8585b8d02"; + }; in stdenv.mkDerivation rec { pname = "rebar3"; inherit version erlang; + # How to obtain `sha256`: + # nix-prefetch-url --unpack https://github.com/erlang/rebar3/archive/${version}.tar.gz src = fetchFromGitHub { owner = "erlang"; repo = pname; rev = version; - sha256 = "0936ix7lfwsamssap58b265zid7x2m97azrr2qpjcln3xysd16lg"; + sha256 = "02gz6xs8j5rm14r6dndcpdm8q3rl4mcj363gnnx4y5xvvfnv9bfa"; }; bootstrapper = ./rebar3-nix-bootstrap; @@ -86,18 +92,19 @@ stdenv.mkDerivation rec { mkdir -p _checkouts mkdir -p _build/default/lib/ - cp --no-preserve=mode -R ${erlware_commons} _checkouts/erlware_commons - cp --no-preserve=mode -R ${providers} _checkouts/providers - cp --no-preserve=mode -R ${getopt} _checkouts/getopt cp --no-preserve=mode -R ${bbmustache} _checkouts/bbmustache cp --no-preserve=mode -R ${certifi} _checkouts/certifi cp --no-preserve=mode -R ${cf} _checkouts/cf cp --no-preserve=mode -R ${cth_readable} _checkouts/cth_readable + cp --no-preserve=mode -R ${erlware_commons} _checkouts/erlware_commons cp --no-preserve=mode -R ${eunit_formatters} _checkouts/eunit_formatters + cp --no-preserve=mode -R ${getopt} _checkouts/getopt + cp --no-preserve=mode -R ${parse_trans} _checkouts/parse_trans + cp --no-preserve=mode -R ${providers} _checkouts/providers cp --no-preserve=mode -R ${relx} _checkouts/relx cp --no-preserve=mode -R ${ssl_verify_fun} _checkouts/ssl_verify_fun + cp --no-preserve=mode -R ${hex_core} _checkouts/hex_core - cp --no-preserve=mode -R ${parse_trans} _checkouts/parse_trans # Bootstrap script expects the dependencies in _build/default/lib # TODO: Make it accept checkouts? diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/build-managers/rocm-cmake/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/build-managers/rocm-cmake/default.nix index ae2e63e040b1..8f01b9aca318 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/build-managers/rocm-cmake/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/build-managers/rocm-cmake/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "rocm-cmake"; - version = "3.8.0"; + version = "3.10.0"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "rocm-cmake"; rev = "rocm-${version}"; - sha256 = "1x1mj1acarhin319zycms8sqm9ylw2mcdbkpqjlb8yfsgiaa99ja"; + hash = "sha256-1T0S2GWA/ojRZMRyWgtFQ2rzmIqvMvaa19jI4Fl9R44="; }; nativeBuildInputs = [ cmake ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/build-managers/sbt-extras/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/build-managers/sbt-extras/default.nix index 49d18d9e8575..3b433ea5e77a 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/build-managers/sbt-extras/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/build-managers/sbt-extras/default.nix @@ -1,18 +1,17 @@ -{ stdenv, fetchFromGitHub, which, curl, makeWrapper, jdk }: +{ stdenv, fetchFromGitHub, which, curl, makeWrapper, jdk, writeScript +, common-updater-scripts, cacert, git, nixfmt, nix, jq, coreutils, gnused +, nixosTests }: -let - rev = "1e9230f35879ce23cbd8d16add07d2134fd479c9"; - version = "2020-09-24"; -in -stdenv.mkDerivation { - name = "sbt-extras-${version}"; - inherit version; +stdenv.mkDerivation rec { + pname = "sbt-extras"; + rev = "be2f5d98f13884a18eaf5205458f985575dbe13a"; + version = "2020-11-23"; src = fetchFromGitHub { owner = "paulp"; repo = "sbt-extras"; inherit rev; - sha256 = "1k6vknjjbhr5jfpiyh2yzayn2ziqi1bb862l1q2786q59161ij3j"; + sha256 = "00acnj357fcwx7w25axaj0l5ync97ixsixg8s55r7hwibkxn0fa7"; }; dontBuild = true; @@ -26,14 +25,53 @@ stdenv.mkDerivation { install bin/sbt $out/bin - wrapProgram $out/bin/sbt --prefix PATH : ${stdenv.lib.makeBinPath [ which curl ]} + wrapProgram $out/bin/sbt --prefix PATH : ${ + stdenv.lib.makeBinPath [ which curl ] + } ''; + passthru = { + tests = { inherit (nixosTests) sbt-extras; }; + + updateScript = writeScript "update.sh" '' + #!${stdenv.shell} + set -xo errexit + PATH=${ + stdenv.lib.makeBinPath [ + common-updater-scripts + curl + cacert + git + nixfmt + nix + jq + coreutils + gnused + ] + } + + oldVersion="$(nix-instantiate --eval -E "with import ./. {}; lib.getVersion ${pname}" | tr -d '"')" + latestSha="$(curl -L -s https://api.github.com/repos/paulp/sbt-extras/commits\?sha\=master\&since\=$oldVersion | jq -r '.[0].sha')" + + if [ ! "null" = "$latestSha" ]; then + nixpkgs="$(git rev-parse --show-toplevel)" + default_nix="$nixpkgs/pkgs/development/tools/build-managers/sbt-extras/default.nix" + latestDate="$(curl -L -s https://api.github.com/repos/paulp/sbt-extras/commits/$latestSha | jq '.commit.committer.date' | sed 's|"\(.*\)T.*|\1|g')" + update-source-version ${pname} "$latestSha" --version-key=rev + update-source-version ${pname} "$latestDate" --ignore-same-hash + nixfmt "$default_nix" + else + echo "${pname} is already up-to-date" + fi + ''; + }; + meta = { - description = "A more featureful runner for sbt, the simple/scala/standard build tool"; + description = + "A more featureful runner for sbt, the simple/scala/standard build tool"; homepage = "https://github.com/paulp/sbt-extras"; license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ puffnfresh ]; + maintainers = with stdenv.lib.maintainers; [ nequissimus puffnfresh ]; platforms = stdenv.lib.platforms.unix; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/build-managers/sbt/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/build-managers/sbt/default.nix index 2ff15d68871a..ebcae9e63eea 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/build-managers/sbt/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/build-managers/sbt/default.nix @@ -1,13 +1,14 @@ -{ stdenv, fetchurl, jre, autoPatchelfHook, zlib }: +{ stdenv, fetchurl, jre, autoPatchelfHook, zlib, writeScript +, common-updater-scripts, git, nixfmt, nix, coreutils, gnused, nixosTests }: stdenv.mkDerivation rec { pname = "sbt"; - version = "1.4.0"; + version = "1.4.4"; src = fetchurl { url = "https://github.com/sbt/sbt/releases/download/v${version}/sbt-${version}.tgz"; - sha256 = "1mgfs732w1c1p7dna7h47x8h073lvjs224fqlpkkvq10153mnxxl"; + sha256 = "0ibdq8g2bcanc7gcjslia89khlccn11inqmkx3y7pbqrc63y1yif"; }; patchPhase = '' @@ -34,4 +35,35 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ nequissimus ]; platforms = platforms.unix; }; + + passthru = { + tests = { inherit (nixosTests) sbt; }; + + updateScript = writeScript "update.sh" '' + #!${stdenv.shell} + set -o errexit + PATH=${ + stdenv.lib.makeBinPath [ + common-updater-scripts + git + nixfmt + nix + coreutils + gnused + ] + } + + oldVersion="$(nix-instantiate --eval -E "with import ./. {}; lib.getVersion sbt" | tr -d '"')" + latestTag="$(git -c 'versionsort.suffix=-' ls-remote --exit-code --refs --sort='version:refname' --tags git@github.com:sbt/sbt.git '*.*.*' | tail --lines=1 | cut --delimiter='/' --fields=3 | sed 's|^v||g')" + + if [ ! "$oldVersion" = "$latestTag" ]; then + update-source-version sbt "$latestTag" --version-key=version --print-changes + nixpkgs="$(git rev-parse --show-toplevel)" + default_nix="$nixpkgs/pkgs/development/tools/build-managers/sbt/default.nix" + nixfmt "$default_nix" + else + echo "sbt is already up-to-date" + fi + ''; + }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/build-managers/shards/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/build-managers/shards/default.nix index 53bc057fc131..dc990af910fe 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/build-managers/shards/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/build-managers/shards/default.nix @@ -1,30 +1,56 @@ -{ stdenv, fetchFromGitHub, crystal }: +{ stdenv +, fetchFromGitHub +, crystal_0_34 +, crystal_0_35 +}: -crystal.buildCrystalPackage rec { - pname = "shards"; - version = "0.10.0"; +let + generic = ( + { version + , sha256 + , crystal + }: - src = fetchFromGitHub { - owner = "crystal-lang"; - repo = "shards"; - rev = "v${version}"; - sha256 = "1bjy3hcdqq8769bx73f3pwn26rnkj23dngyfbw4iv32bw23x1d49"; - }; + crystal.buildCrystalPackage { + pname = "shards"; + inherit version; + + src = fetchFromGitHub { + owner = "crystal-lang"; + repo = "shards"; + rev = "v${version}"; + inherit sha256; + }; - # we cannot use `make` here as it would introduce a dependency on itself - format = "crystal"; + # we cannot use `make` here as it would introduce a dependency on itself + format = "crystal"; + shardsFile = ./shards.nix; + crystalBinaries.shards.src = "./src/shards.cr"; - shardsFile = ./shards.nix; + # tries to execute git which fails spectacularly + doCheck = false; - crystalBinaries.shards.src = "./src/shards.cr"; + meta = with stdenv.lib; { + description = "Dependency manager for the Crystal language"; + license = licenses.asl20; + maintainers = with maintainers; [ peterhoeg ]; + inherit (crystal.meta) homepage platforms; + }; + } + ); - # tries to execute git which fails spectacularly - doCheck = false; +in rec { + shards_0_11 = generic { + version = "0.11.1"; + sha256 = "05qnhc23xbmicdl4fwyxfpcvd8jq4inzh6v7jsjjw4n76vzb1f71"; + crystal = crystal_0_34; + }; - meta = with stdenv.lib; { - description = "Dependency manager for the Crystal language"; - license = licenses.asl20; - maintainers = with maintainers; [ peterhoeg ]; - inherit (crystal.meta) homepage platforms; + shards_0_12 = generic { + version = "0.12.0"; + sha256 = "0dginczw1gc5qlb9k4b6ldxzqz8n97jrrnjvj3mm9wcdbc9j6h3c"; + crystal = crystal_0_35; }; + + shards = shards_0_12; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/build-managers/tup/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/build-managers/tup/default.nix index 80ee38105ca5..628e0c4797b3 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/build-managers/tup/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/build-managers/tup/default.nix @@ -1,18 +1,19 @@ -{ stdenv, fetchFromGitHub, fuse, pkgconfig, pcre }: +{ stdenv, fetchFromGitHub, fuse3, pkgconfig, pcre }: stdenv.mkDerivation rec { pname = "tup"; - version = "0.7.9"; + version = "0.7.10"; + outputs = [ "bin" "man" "out" ]; src = fetchFromGitHub { owner = "gittup"; repo = "tup"; rev = "v${version}"; - sha256 = "1b9rllwfdmjvfmwvzqfbqfi1flf4y9zzjmyp0dizq23gpkvhi42f"; + sha256 = "1qd07h4wi0743l7z2vybfvhwp61g2p2pc5qhl40672ryl24nvd1d"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ fuse pcre ]; + buildInputs = [ fuse3 pcre ]; configurePhase = '' sed -i 's/`git describe`/v${version}/g' src/tup/link.sh @@ -30,11 +31,8 @@ stdenv.mkDerivation rec { ''; installPhase = '' - mkdir -p $out/bin - cp tup $out/bin/ - - mkdir -p $out/share/man/man1 - cp tup.1 $out/share/man/man1/ + install -D tup -t $bin/bin/ + install -D tup.1 -t $man/share/man/man1/ ''; setupHook = ./setup-hook.sh; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/buildah/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/buildah/default.nix index 666437126a71..e69e35442b3f 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/buildah/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/buildah/default.nix @@ -14,13 +14,13 @@ buildGoModule rec { pname = "buildah"; - version = "1.16.4"; + version = "1.18.0"; src = fetchFromGitHub { owner = "containers"; repo = "buildah"; rev = "v${version}"; - sha256 = "1i7v4chbgl15n3vn1liinjd4lxaxk9q2lyi1l2ak7iazx9px6cn9"; + sha256 = "0kn31y5g7269mjaw5ddfsiaan93s62i8zzxg4xl01dg3dkkadwc4"; }; outputs = [ "out" "man" ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/buildah/wrapper.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/buildah/wrapper.nix index bdc48bd6b1f7..dfa465cfdea7 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/buildah/wrapper.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/buildah/wrapper.nix @@ -9,7 +9,7 @@ , conmon # Container runtime monitor , slirp4netns # User-mode networking for unprivileged namespaces , fuse-overlayfs # CoW for images, much faster than default vfs -, utillinux # nsenter +, util-linux # nsenter , cni-plugins # not added to path , iptables }: @@ -23,7 +23,7 @@ let conmon slirp4netns fuse-overlayfs - utillinux + util-linux iptables ] ++ extraPackages); diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/buildkit/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/buildkit/default.nix index d4c143b0bd02..00a285c67d02 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/buildkit/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/buildkit/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "buildkit"; - version = "0.7.2"; + version = "0.8.0"; goPackagePath = "github.com/moby/buildkit"; subPackages = [ "cmd/buildctl" ] ++ stdenv.lib.optionals stdenv.isLinux [ "cmd/buildkitd" ]; @@ -11,7 +11,7 @@ buildGoPackage rec { owner = "moby"; repo = "buildkit"; rev = "v${version}"; - sha256 = "0kn2ad0rh3xlcxjxslkyrfxhv3cx88996nhxn86605x1mybxb2iq"; + sha256 = "0qcgq93wj77i912xqhwrzkzaqz608ilczfn5kcsrf9jk2m1gnx7m"; }; buildFlagsArray = [ "-ldflags=-s -w -X ${goPackagePath}/version.Version=${version} -X ${goPackagePath}/version.Revision=${src.rev}" ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/buildpack/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/buildpack/default.nix index 1d8e53ba5256..dbb45df40c25 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/buildpack/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/buildpack/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "pack"; - version = "0.13.0"; + version = "0.15.1"; src = fetchFromGitHub { owner = "buildpacks"; repo = pname; rev = "v${version}"; - sha256 = "0h7lgsg5d74pfa15kx0y3ngnvmz64znqk2k73iyjya9pi9h8hh88"; + sha256 = "026qy81hfblx98z9hip7gpqcfqgzfhm5bimg6p9gi5fd5wsbfs4c"; }; - vendorSha256 = "1c38g169kq9kv6x0x1rlg39ywbc1q66fndby0v85b3ri3xb52869"; + vendorSha256 = "0i6nplh1papcmdzas9f8pkccsx5csbxxkvy5a6130jjbwdm14jw7"; nativeBuildInputs = [ installShellFiles ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/cask/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/cask/default.nix index 710503560691..925d10b23b44 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/cask/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/cask/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { homepage = "https://cask.readthedocs.io/en/latest/index.html"; license = licenses.gpl3Plus; - platforms = platforms.linux; + platforms = platforms.all; maintainers = [ maintainers.flexw ]; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/castxml/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/castxml/default.nix index 0a455b4d7cdf..90be513bd50f 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/castxml/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/castxml/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub -, pythonPackages +, python3Packages , cmake , llvmPackages , libffi, libxml2, zlib @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { sha256 = "0ypj67xrgj228myp7l1gsjw1ja97q68nmj98dsd33srmiayqraj4"; }; - nativeBuildInputs = [ cmake ] ++ stdenv.lib.optionals withMan [ pythonPackages.sphinx ]; + nativeBuildInputs = [ cmake ] ++ stdenv.lib.optionals withMan [ python3Packages.sphinx ]; clangVersion = lib.getVersion llvmPackages.clang; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/clj-kondo/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/clj-kondo/default.nix index f64041d1be84..702e5935689d 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/clj-kondo/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/clj-kondo/default.nix @@ -1,23 +1,23 @@ -{ stdenv, lib, graalvm8, fetchurl }: +{ stdenv, lib, graalvm11-ce, fetchurl }: stdenv.mkDerivation rec { pname = "clj-kondo"; - version = "2020.04.05"; + version = "2020.11.07"; reflectionJson = fetchurl { name = "reflection.json"; url = "https://raw.githubusercontent.com/borkdude/${pname}/v${version}/reflection.json"; - sha256 = "1m6kja38p6aypawbynkyq8bdh8wpdjmyqrhslinqid9r8cl25rcq"; + sha256 = "0mwclqjh38alkddr5r7bfqn5lplx06h9gladi89kp06qdxc1hp7a"; }; src = fetchurl { url = "https://github.com/borkdude/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar"; - sha256 = "0k9samcqkpkdgzbzr2bpixf75987lsabh97101v1fg12qvjhf187"; + sha256 = "1xqryfcn82bp8wasqnllfgvhl5w9zm63yw8c2kgxz18dayhq4i31"; }; dontUnpack = true; - buildInputs = [ graalvm8 ]; + buildInputs = [ graalvm11-ce ]; buildPhase = '' native-image \ @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { description = "A linter for Clojure code that sparks joy"; homepage = "https://github.com/borkdude/clj-kondo"; license = licenses.epl10; - platforms = graalvm8.meta.platforms; + platforms = graalvm11-ce.meta.platforms; maintainers = with maintainers; [ jlesquembre bandresen ]; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/cloud-nuke/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/cloud-nuke/default.nix index 6e070f3cc5f2..5fcaa35378d7 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/cloud-nuke/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/cloud-nuke/default.nix @@ -1,19 +1,21 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "cloud-nuke"; - version = "0.1.18"; + version = "0.1.24"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "v${version}"; - sha256 = "1amk9bjrc9svvgllif2vr6xx7kc3xmwjbyb8prnm5zp82hymk5f1"; + sha256 = "11d335lx6pa8pvsiv9m00ig8b8y203rzad4krr0p9c04ppw0c966"; }; - goPackagePath = "github.com/gruntwork-io/cloud-nuke"; + vendorSha256 = "1dr1sql0ph3k6hylgikhiaaskxwnsynspp770p9i7y7fasmb53jw"; - goDeps = ./deps.nix; + buildFlagsArray = [ "-ldflags=-s -w -X main.VERSION=${version}" ]; + + doCheck = false; meta = with lib; { homepage = "https://github.com/gruntwork-io/cloud-nuke"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/cloud-nuke/deps.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/cloud-nuke/deps.nix deleted file mode 100644 index c354bd985fd3..000000000000 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/cloud-nuke/deps.nix +++ /dev/null @@ -1,219 +0,0 @@ -# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix) -[ - { - goPackagePath = "github.com/aws/aws-sdk-go"; - fetch = { - type = "git"; - url = "https://github.com/aws/aws-sdk-go"; - rev = "1f4898f67806740d2a91c9dfe9a8be8a61523eb4"; - sha256 = "1znjv4irzqxwizdp3dxgb5w9x06xjs79a3s68afzrblz97kf94kc"; - }; - } - { - goPackagePath = "github.com/bgentry/speakeasy"; - fetch = { - type = "git"; - url = "https://github.com/bgentry/speakeasy"; - rev = "4aabc24848ce5fd31929f7d1e4ea74d3709c14cd"; - sha256 = "02dfrj0wyphd3db9zn2mixqxwiz1ivnyc5xc7gkz58l5l27nzp8s"; - }; - } - { - goPackagePath = "github.com/boombuler/barcode"; - fetch = { - type = "git"; - url = "https://github.com/boombuler/barcode"; - rev = "3cfea5ab600ae37946be2b763b8ec2c1cf2d272d"; - sha256 = "1fzb8wz1ny2sc78g9rm0bcm80pgwvkm2k6lmim2sb4jgm1j3sajd"; - }; - } - { - goPackagePath = "github.com/davecgh/go-spew"; - fetch = { - type = "git"; - url = "https://github.com/davecgh/go-spew"; - rev = "346938d642f2ec3594ed81d874461961cd0faa76"; - sha256 = "0d4jfmak5p6lb7n2r6yvf5p1zcw0l8j74kn55ghvr7zr7b7axm6c"; - }; - } - { - goPackagePath = "github.com/fatih/color"; - fetch = { - type = "git"; - url = "https://github.com/fatih/color"; - rev = "570b54cabe6b8eb0bc2dfce68d964677d63b5260"; - sha256 = "1hw9hgkfzbzqjhy29pqpk20xggxaqjv45wx8yn69488mw5ph7khh"; - }; - } - { - goPackagePath = "github.com/go-errors/errors"; - fetch = { - type = "git"; - url = "https://github.com/go-errors/errors"; - rev = "d98b870cc4e05f1545532a80e9909be8216095b6"; - sha256 = "1skj4vh9h7c5lk1pw8y6740w2k99z398jl0aasn63x83viqjf1zw"; - }; - } - { - goPackagePath = "github.com/go-sql-driver/mysql"; - fetch = { - type = "git"; - url = "https://github.com/go-sql-driver/mysql"; - rev = "72cd26f257d44c1114970e19afddcd812016007e"; - sha256 = "1fvsvwc1v2i0gqn01mynvi1shp5xm0xaym6xng09fcbqb56lbjx1"; - }; - } - { - goPackagePath = "github.com/golang/mock"; - fetch = { - type = "git"; - url = "https://github.com/golang/mock"; - rev = "b48cb6623c04dae64c28537143aca42d16561daf"; - sha256 = "1zb4n285mv85dh3y2f8fqbs30h2dhzw7vbczr6z0zg2gqr6vzg0q"; - }; - } - { - goPackagePath = "github.com/google/uuid"; - fetch = { - type = "git"; - url = "https://github.com/google/uuid"; - rev = "064e2069ce9c359c118179501254f67d7d37ba24"; - sha256 = "1b1ibx3rbiv7xwa9kz4b4zpp1fza5cjnn8v6749b4vrkjjmp3rqb"; - }; - } - { - goPackagePath = "github.com/gruntwork-io/gruntwork-cli"; - fetch = { - type = "git"; - url = "https://github.com/gruntwork-io/gruntwork-cli"; - rev = "94044eeeb0a48b5e8dd52190fa0d0daba53e157f"; - sha256 = "1x6g2s4f66c4pb8dwvjnj4i70ik43ak2x189v2ys218nz4zkjs74"; - }; - } - { - goPackagePath = "github.com/gruntwork-io/terratest"; - fetch = { - type = "git"; - url = "https://github.com/gruntwork-io/terratest"; - rev = "bd5fdfc1564ec40a149a6e579d6ca20ebf2eaca4"; - sha256 = "1vbipykcwhmzs2qxfxdnq3gdi3i5ds6pykjjxqw3f1llad2dihby"; - }; - } - { - goPackagePath = "github.com/jmespath/go-jmespath"; - fetch = { - type = "git"; - url = "https://github.com/jmespath/go-jmespath"; - rev = "c2b33e84"; - sha256 = "1r6w7ydx8ydryxk3sfhzsk8m6f1nsik9jg3i1zhi69v4kfl4d5cz"; - }; - } - { - goPackagePath = "github.com/mattn/go-colorable"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-colorable"; - rev = "167de6bfdfba052fa6b2d3664c8f5272e23c9072"; - sha256 = "1nwjmsppsjicr7anq8na6md7b1z84l9ppnlr045hhxjvbkqwalvx"; - }; - } - { - goPackagePath = "github.com/mattn/go-isatty"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-isatty"; - rev = "0360b2af4f38e8d38c7fce2a9f4e702702d73a39"; - sha256 = "06w45aqz2a6yrk25axbly2k5wmsccv8cspb94bfmz4izvw8h927n"; - }; - } - { - goPackagePath = "github.com/pmezard/go-difflib"; - fetch = { - type = "git"; - url = "https://github.com/pmezard/go-difflib"; - rev = "792786c7400a136282c1664665ae0a8db921c6c2"; - sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; - }; - } - { - goPackagePath = "github.com/pquerna/otp"; - fetch = { - type = "git"; - url = "https://github.com/pquerna/otp"; - rev = "43bebefda392017900e7a7b237b4c914c6a55b50"; - sha256 = "088njs8i7b0syyz20hzd3lcjxy61chc518d71lvykw2g9c9wsc7l"; - }; - } - { - goPackagePath = "github.com/sirupsen/logrus"; - fetch = { - type = "git"; - url = "https://github.com/sirupsen/logrus"; - rev = "d682213848ed68c0a260ca37d6dd5ace8423f5ba"; - sha256 = "0nzyqwzx3k7nqfq8q7yv32gaf3ymq3bpwhkmw1hj2zakq5a93d8x"; - }; - } - { - goPackagePath = "github.com/stretchr/testify"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/testify"; - rev = "3ebf1ddaeb260c4b1ae502a01c7844fa8c1fa0e9"; - sha256 = "09r89m1wy4cjv2nps1ykp00qjpi0531r07q3s34hr7m6njk4srkl"; - }; - } - { - 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 = "13931e22f9e72ea58bb73048bc752b48c6d4d4ac"; - sha256 = "1621j82c1hiw4pxjdvaf5qyirwv5c0bqwlrhhna9pnjsgr5pkw33"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "ca1201d0de80cfde86cb01aea620983605dfe99b"; - sha256 = "16j9xyby1vfl4ch6wqzafxxxnxvcp8vhzknpchwabci1f2zcsn6i"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "2c42eef0765b9837fbdab12011af7830f55f88f0"; - sha256 = "0gj9nwryyzf9rn33gl3zm6rxvg1zhrhwi36akipqj37x4g86h3gz"; - }; - } - { - goPackagePath = "google.golang.org/appengine"; - fetch = { - type = "git"; - url = "https://github.com/golang/appengine"; - rev = "b2f4a3cf3c67576a2ee09e1fe62656a5086ce880"; - sha256 = "0zxlvwzxwkwz4bs4h9zc9979dx76y4xf9ks4d22bclg47dv59yry"; - }; - } - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://github.com/go-yaml/yaml"; - rev = "53403b58ad1b561927d19068c655246f2db79d48"; - sha256 = "1inf7svydzscwv9fcjd2rm61a4xjk6jkswknybmns2n58shimapw"; - }; - } -]
\ No newline at end of file diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/conftest/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/conftest/default.nix index ee048466a3d5..1f12afe3f748 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/conftest/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/conftest/default.nix @@ -2,26 +2,38 @@ buildGoModule rec { pname = "conftest"; - version = "0.21.0"; + version = "0.22.0"; src = fetchFromGitHub { owner = "open-policy-agent"; repo = "conftest"; rev = "v${version}"; - sha256 = "15xdsjv53hjgmdxzdakj07ggickw1jkcii31ycb3q8nh1ki05rhq"; + sha256 = "1mjfb39h6z8dbrqxlvrvnzid7la6wj709kx7dva4126i84cmpyf1"; }; - vendorSha256 = "0795npr09680nmxiz9riq5v6rp91qgkvw1lc2mn9gzakv1ywl5rq"; + vendorSha256 = "08c4brwvjp9f7cpzywxns6dkhl3jzq9ckyvphm2jnm2kxmkawbbn"; doCheck = false; - buildFlagsArray = '' - -ldflags= - -X main.version=${version} - ''; + buildFlagsArray = [ + "-ldflags=" + "-s" + "-w" + "-X github.com/open-policy-agent/conftest/internal/commands.version=${version}" + ]; meta = with lib; { description = "Write tests against structured configuration data"; + longDescription = '' + Conftest helps you write tests against structured configuration data. + Using Conftest you can write tests for your Kubernetes configuration, + Tekton pipeline definitions, Terraform code, Serverless configs or any + other config files. + + Conftest uses the Rego language from Open Policy Agent for writing the + assertions. You can read more about Rego in 'How do I write policies' in + the Open Policy Agent documentation. + ''; inherit (src.meta) homepage; license = licenses.asl20; maintainers = with maintainers; [ yurrriq ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix index ceaa704b565c..223b814708d3 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix @@ -1,8 +1,8 @@ -{ fetchFromGitHub, stdenv, buildGoPackage, +{ fetchFromGitHub, stdenv, buildGoModule, makeWrapper, coreutils, git, openssh, bash, gnused, gnugrep }: -buildGoPackage rec { +buildGoModule rec { name = "buildkite-agent-${version}"; - version = "3.17.0"; + version = "3.26.0"; goPackagePath = "github.com/buildkite/agent"; @@ -10,17 +10,18 @@ buildGoPackage rec { owner = "buildkite"; repo = "agent"; rev = "v${version}"; - sha256 = "0a7x919kxnpdn0pnhc5ilx1z6ninx8zgjvsd0jcg4qwh0qqp5ppr"; + sha256 = "1z8hiamg3h1fnsmr8j5l9q6c8cd81lqmd00gcmz4spw73pqfxg3r"; }; + + vendorSha256 = "1kxnpn4py8a2rz1gwg0y3yiwcwphj38pkp2k9z1p85ccm2wblljz"; + postPatch = '' substituteInPlace bootstrap/shell/shell.go --replace /bin/bash ${bash}/bin/bash ''; nativeBuildInputs = [ makeWrapper ]; - # on Linux, the TMPDIR is /build which is the same prefix as this package - # remove once #35068 is merged - noAuditTmpdir = stdenv.isLinux; + doCheck = false; postInstall = '' # Fix binary name @@ -43,6 +44,6 @@ buildGoPackage rec { homepage = "https://buildkite.com/docs/agent"; license = licenses.mit; maintainers = with maintainers; [ pawelpacana zimbatm rvl ]; - platforms = platforms.unix; + platforms = with platforms; unix ++ darwin; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/continuous-integration/drone-cli/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/continuous-integration/drone-cli/default.nix index 66fb878aa26e..2a8e10008c2b 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/continuous-integration/drone-cli/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/continuous-integration/drone-cli/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchFromGitHub, buildGoModule }: -let version = "1.2.2"; +let version = "1.2.4"; in buildGoModule rec { inherit version; pname = "drone-cli"; revision = "v${version}"; - vendorSha256 = "1ryh94cj37j8x6qwxr5ydyw6cnjppakg1w84sipm11d0vvv98bhi"; + vendorSha256 = "0v94rwxkbj85l3brbm792xf1rfs3vgnwpgjczwqip1gm159dpnd7"; doCheck = false; @@ -18,7 +18,7 @@ in buildGoModule rec { owner = "drone"; repo = "drone-cli"; rev = revision; - sha256 = "082yqm72y8s3v06gkcg947p62sd63y3r2bmdsrfgdrzb5w5a75bl"; + sha256 = "14sm5k2ifvr4g9369zqgb92vrr4rc0bxf5m52l3g8bd2s8fq8nx8"; }; meta = with stdenv.lib; { diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/continuous-integration/fly/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/continuous-integration/fly/default.nix index c85f5473de88..f993faf544d7 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/continuous-integration/fly/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/continuous-integration/fly/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "fly"; - version = "6.5.1"; + version = "6.7.2"; src = fetchFromGitHub { owner = "concourse"; repo = "concourse"; rev = "v${version}"; - sha256 = "0ldw40xn9nb5picly32nq558x0klvkyrr9af0jfngbvm4l5209bc"; + sha256 = "0c5alf2a0088i25mglla9dl4m3wr5y8pnl5cczgn06sz8qp9a0s0"; }; vendorSha256 = "1fxbxkg7disndlmb065abnfn7sn79qclkcbizmrq49f064w1ijr4"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index b59a45617288..db2d228ce454 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -1,16 +1,16 @@ { lib, buildGoPackage, fetchFromGitLab, fetchurl }: let - version = "13.4.1"; + version = "13.6.0"; # Gitlab runner embeds some docker images these are prebuilt for arm and x86_64 docker_x86_64 = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-x86_64.tar.xz"; - sha256 = "0yc4yfqhh51p0nz0sl2qfp48n431qgp23wn3aqq3jg4fh9578prb"; + sha256 = "0q1f4dmdkqrdzs3mb5wk6k6x50li4c7js0blzfcz3f3n8gm925jw"; }; docker_arm = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-arm.tar.xz"; - sha256 = "1n50izz21dmd14qm6y9fsgwf5f0r9829dv79mvlqxmh1q87acm93"; + sha256 = "1hxjqk4in1a2abcyxj7556fcscxq4cfy24cgcmh1qhvirnm5j6mc"; }; in buildGoPackage rec { @@ -30,7 +30,7 @@ buildGoPackage rec { owner = "gitlab-org"; repo = "gitlab-runner"; rev = "v${version}"; - sha256 = "10k3xn3fapwx52s3r3pk972k1s7793cgja7g1fvm06pic8l7q05g"; + sha256 = "0vwky4hdkh1qvd61zdf2avbbnn3ya6pdicqggh2fx7k04pnp05mh"; }; patches = [ ./fix-shell-path.patch ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/continuous-integration/jenkins/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/continuous-integration/jenkins/default.nix index d9eb540c3f2e..13a6d596599a 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/continuous-integration/jenkins/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/continuous-integration/jenkins/default.nix @@ -1,12 +1,13 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, common-updater-scripts, coreutils, git, gnused, nix, nixfmt +, writeScript, nixosTests, jq, cacert, curl }: stdenv.mkDerivation rec { pname = "jenkins"; - version = "2.249.2"; + version = "2.263.1"; src = fetchurl { url = "http://mirrors.jenkins.io/war-stable/${version}/jenkins.war"; - sha256 = "08m5z4ik96gnhw92hjzch7rpvrs0dipi9fps4rihwwzg5k26rc0v"; + sha256 = "1wfn5r356fqy8ypqnw44ir0cy8qr5ck6xckxnnn2c9x324mypv8f"; }; buildCommand = '' @@ -14,11 +15,50 @@ stdenv.mkDerivation rec { cp "$src" "$out/webapps/jenkins.war" ''; + passthru = { + tests = { inherit (nixosTests) jenkins; }; + + updateScript = writeScript "update.sh" '' + #!${stdenv.shell} + set -o errexit + PATH=${ + stdenv.lib.makeBinPath [ + cacert + common-updater-scripts + coreutils + curl + git + gnused + jq + nix + nixfmt + ] + } + + core_json="$(curl -s --fail --location https://updates.jenkins.io/stable/update-center.actual.json | jq .core)" + oldVersion=$(nix-instantiate --eval -E "with import ./. {}; lib.getVersion jenkins" | tr -d '"') + + version="$(jq -r .version <<<$core_json)" + sha256="$(jq -r .sha256 <<<$core_json)" + hash="$(nix-hash --type sha256 --to-base32 "$sha256")" + url="$(jq -r .url <<<$core_json)" + + if [ ! "$oldVersion" = "$version" ]; then + update-source-version jenkins "$version" "$hash" "$url" + nixpkgs="$(git rev-parse --show-toplevel)" + default_nix="$nixpkgs/pkgs/development/tools/continuous-integration/jenkins/default.nix" + nixfmt "$default_nix" + else + echo "jenkins is already up-to-date" + fi + ''; + }; + meta = with stdenv.lib; { description = "An extendable open source continuous integration server"; homepage = "https://jenkins-ci.org"; license = licenses.mit; platforms = platforms.all; - maintainers = with maintainers; [ coconnor fpletz earldouglas ]; + maintainers = with maintainers; [ coconnor fpletz earldouglas nequissimus ]; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/continuous-integration/jenkins/update.sh b/infra/libkookie/nixpkgs/pkgs/development/tools/continuous-integration/jenkins/update.sh deleted file mode 100755 index 4f2f6527eccc..000000000000 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/continuous-integration/jenkins/update.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl common-updater-scripts jq - -set -eu -o pipefail - -core_json="$(curl -s --fail --location https://updates.jenkins.io/stable/update-center.actual.json | jq .core)" -oldVersion=$(nix-instantiate --eval -E "with import ./. {}; lib.getVersion jenkins" | tr -d '"') - -version="$(jq -r .version <<<$core_json)" -sha256="$(jq -r .sha256 <<<$core_json)" -hash="$(nix-hash --type sha256 --to-base32 "$sha256")" -url="$(jq -r .url <<<$core_json)" - -if [ ! "${oldVersion}" = "${version}" ]; then - update-source-version jenkins "$version" "$hash" "$url" - nixpkgs="$(git rev-parse --show-toplevel)" - default_nix="$nixpkgs/pkgs/development/tools/continuous-integration/jenkins/default.nix" - git add "${default_nix}" - git commit -m "jenkins: ${oldVersion} -> ${version}" -else - echo "jenkins is already up-to-date" -fi diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/coursier/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/coursier/default.nix index b3ae0328c4e2..0d42bcff7cf6 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/coursier/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/coursier/default.nix @@ -1,18 +1,25 @@ -{ stdenv, fetchurl, makeWrapper, jre }: +{ stdenv, fetchurl, makeWrapper, jre, writeScript, common-updater-scripts +, coreutils, git, gnused, nix, nixfmt }: let - zshCompletion = version: fetchurl { - url = "https://raw.githubusercontent.com/coursier/coursier/v${version}/modules/cli/src/main/resources/completions/zsh"; - sha256 = "1mn6cdmf59nkz5012wgd3gd6hpk2w4629sk8z95230ky8487dac3"; + version = "2.0.7"; + + zshCompletion = fetchurl { + url = + "https://raw.githubusercontent.com/coursier/coursier/v${version}/modules/cli/src/main/resources/completions/zsh"; + sha256 = "0afxzrk9w1qinfsz55jjrxydw0fcv6p722g1q955dl7f6xbab1jh"; }; -in -stdenv.mkDerivation rec { + + repo = "git@github.com:coursier/coursier.git"; +in stdenv.mkDerivation rec { + inherit version; + pname = "coursier"; - version = "2.0.3"; src = fetchurl { - url = "https://github.com/coursier/coursier/releases/download/v${version}/coursier"; - sha256 = "0jvccyiqrq1iws2q9m3vivzw08jl0p77n9qbf22hgb3zhspfdnyx"; + url = + "https://github.com/coursier/coursier/releases/download/v${version}/coursier"; + sha256 = "1m6b12cqbwsk4xf2r79y51154j6ws6f0kiw1yj57gylw7pjkgfnk"; }; nativeBuildInputs = [ makeWrapper ]; @@ -23,12 +30,42 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/coursier --prefix PATH ":" ${jre}/bin # copy zsh completion - install -Dm755 ${zshCompletion version} $out/share/zsh/site-functions/_coursier + install -Dm755 ${zshCompletion} $out/share/zsh/site-functions/_coursier + ''; + + passthru.updateScript = writeScript "update.sh" '' + #!${stdenv.shell} + set -o errexit + PATH=${ + stdenv.lib.makeBinPath [ + common-updater-scripts + coreutils + git + gnused + nix + nixfmt + ] + } + oldVersion="$(nix-instantiate --eval -E "with import ./. {}; lib.getVersion ${pname}" | tr -d '"')" + latestTag="$(git -c 'versionsort.suffix=-' ls-remote --exit-code --refs --sort='version:refname' --tags ${repo} 'v*.*.*' | tail --lines=1 | cut --delimiter='/' --fields=3 | sed 's|^v||g')" + if [ "$oldVersion" != "$latestTag" ]; then + nixpkgs="$(git rev-parse --show-toplevel)" + default_nix="$nixpkgs/pkgs/development/tools/coursier/default.nix" + update-source-version ${pname} "$latestTag" --version-key=version --print-changes + url="${builtins.head zshCompletion.urls}" + completion_url=$(echo $url | sed "s|$oldVersion|$latestTag|g") + completion_sha256="$(nix-prefetch-url --type sha256 $completion_url)" + sed -i "s|${zshCompletion.outputHash}|$completion_sha256|g" "$default_nix" + nixfmt "$default_nix" + else + echo "${pname} is already up-to-date" + fi ''; meta = with stdenv.lib; { homepage = "https://get-coursier.io/"; - description = "A Scala library to fetch dependencies from Maven / Ivy repositories"; + description = + "A Scala library to fetch dependencies from Maven / Ivy repositories"; license = licenses.asl20; maintainers = with maintainers; [ adelbertc nequissimus ]; }; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/database/dbmate/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/database/dbmate/default.nix index 4858b84abfa6..fe7721f5ed4c 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/database/dbmate/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/database/dbmate/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "dbmate"; - version = "1.10.0"; + version = "1.11.0"; src = fetchFromGitHub { owner = "amacneil"; repo = "dbmate"; rev = "v${version}"; - sha256 = "09zb7r8f6m1w9ax9ayaxjzwmqcgx5f6x4lclfi1wdn6f6qaans4w"; + sha256 = "1q1hyrd1zlynyb0720fd1lwg22l3bwjbcak2aplh259p698gwyf5"; }; - vendorSha256 = "012kgdvw7hj3m40v3nnpg916n02nxv19zid07h8g4qwprzg49iq2"; + vendorSha256 = "197zpjvvv9xpfbw443kbxvhjmjqmx1h2bj1xl2vwgf0w64mkk84z"; doCheck = false; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/database/ephemeralpg/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/database/ephemeralpg/default.nix index 53f3c1df628d..b2599cce4307 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/database/ephemeralpg/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/database/ephemeralpg/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, postgresql, getopt, makeWrapper }: stdenv.mkDerivation rec { pname = "ephemeralpg"; - version = "3.0"; + version = "3.1"; src = fetchurl { url = "http://ephemeralpg.org/code/${pname}-${version}.tar.gz"; - sha256 = "1j0g7g114ma7y7sadbng5p1ss1zsm9zpicm77qspym6565733vvh"; + sha256 = "1ap22ki8yz6agd0qybcjgs4b9izw1rwwcgpxn3jah2ccfyax34s6"; }; buildInputs = [ makeWrapper ]; installPhase = '' @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/pg_tmp --prefix PATH : ${stdenv.lib.makeBinPath [ postgresql getopt ]} ''; meta = with stdenv.lib; { - description = ''Run tests on an isolated, temporary PostgreSQL database.''; + description = "Run tests on an isolated, temporary PostgreSQL database"; license = licenses.isc; homepage = "http://ephemeralpg.org/"; platforms = platforms.all; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/database/liquibase/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/database/liquibase/default.nix index 75ccca43a690..bdb2f8cbd757 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/database/liquibase/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/database/liquibase/default.nix @@ -10,11 +10,11 @@ in stdenv.mkDerivation rec { pname = "liquibase"; - version = "4.0.0"; + version = "4.2.1"; src = fetchurl { url = "https://github.com/liquibase/liquibase/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "06wpvqyv7w749l3ndvzg1p774rv1apbmbpwbdlad57pih4nqa7mm"; + sha256 = "1fv92f71p7pk3r4aj88kgaiblfii3z4fjbchyj1c9k6br0gwbw8b"; }; buildInputs = [ jre makeWrapper ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/database/litecli/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/database/litecli/default.nix index 17f7e2c7e492..3d24ac34b3eb 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/database/litecli/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/database/litecli/default.nix @@ -2,7 +2,7 @@ python3Packages.buildPythonApplication rec { pname = "litecli"; - version = "1.3.2"; + version = "1.4.1"; # Python 2 won't have prompt_toolkit 2.x.x # See: https://github.com/NixOS/nixpkgs/blob/f49e2ad3657dede09dc998a4a98fd5033fb52243/pkgs/top-level/python-packages.nix#L3408 @@ -10,7 +10,7 @@ python3Packages.buildPythonApplication rec { src = python3Packages.fetchPypi { inherit pname version; - sha256 = "0bfx7fw6jnkqxa82xvd10yx1w2wbmrrqxwbh4anp5x9wnl91a9lp"; + sha256 = "FARWjtbS5zi/XQDyAVImUmArLj8xATz1jZ4jnXFdq1w="; }; propagatedBuildInputs = with python3Packages; [ diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/database/pgcli/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/database/pgcli/default.nix index b6d7f65896e8..36a85e6361cb 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/database/pgcli/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/database/pgcli/default.nix @@ -1,4 +1,4 @@ -{ buildPythonApplication, lib, fetchPypi, isPy3k +{ buildPythonApplication, lib, fetchPypi, isPy3k, fetchpatch , cli-helpers, click, configobj, humanize, prompt_toolkit, psycopg2 , pygments, sqlparse, pgspecial, setproctitle, keyring, pytest, mock }: @@ -19,6 +19,15 @@ buildPythonApplication rec { pygments sqlparse pgspecial setproctitle keyring ]; + patches = [ + (fetchpatch { + name = "enable-sqlparse-4.patch"; + url = "https://github.com/dbcli/pgcli/pull/1224/commits/55d534d41051887c637b6300e08a9f70e6656020.patch"; + sha256 = "01r8qc7qzb6mz0xq2xnrgyackbapf43ng6l88qpzd9lw2pwksc8w"; + includes = [ "pgcli/packages/parseutils/ctes.py" "tests/test_sqlcompletion.py" "setup.py" ]; + }) + ]; + postPatch = '' substituteInPlace setup.py \ --replace "prompt_toolkit>=2.0.6,<3.0.0" "prompt_toolkit" diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/database/pgweb/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/database/pgweb/default.nix new file mode 100644 index 000000000000..de9d0847f8b6 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/database/pgweb/default.nix @@ -0,0 +1,26 @@ +{ buildGoPackage, fetchFromGitHub, lib }: + +buildGoPackage rec { + pname = "pgweb"; + version = "0.11.7"; + + src = fetchFromGitHub { + owner = "sosedoff"; + repo = pname; + rev = "v${version}"; + sha256 = "1df3vixxca80i040apbim80nqni94q882ykn3cglyccyl0iz59ix"; + }; + + goPackagePath = "github.com/sosedoff/pgweb"; + + meta = with lib; { + description = "A web-based database browser for PostgreSQL"; + longDescription = '' + A simple postgres browser that runs as a web server. You can view data, + run queries and examine tables and indexes. + ''; + homepage = "https://sosedoff.github.io/pgweb/"; + license = licenses.mit; + maintainers = with maintainers; [ zupo ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/deadcode/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/deadcode/default.nix index 516eeff2091f..014acc89e1f7 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/deadcode/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/deadcode/default.nix @@ -22,7 +22,7 @@ buildGoPackage rec { }; meta = with lib; { - description = "deadcode is a very simple utility which detects unused declarations in a Go package"; + description = "Very simple utility which detects unused declarations in a Go package"; homepage = "https://github.com/remyoudompheng/go-misc/tree/master/deadcode"; license = licenses.bsd3; maintainers = with maintainers; [ kalbasit ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/doctl/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/doctl/default.nix index 45795b67ea4a..bca11130c7e6 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/doctl/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/doctl/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "doctl"; - version = "1.46.0"; + version = "1.53.0"; vendorSha256 = null; @@ -32,7 +32,7 @@ buildGoModule rec { owner = "digitalocean"; repo = "doctl"; rev = "v${version}"; - sha256 = "1f9gw1qjannswx1vy64a5a2cfr8azsci241pk0xhrhk6aqpjzx1n"; + sha256 = "1zw6gdmy1jlwi7rrbdxg7pkiq54ha0h1gmzphn3mflfk7lmgyikm"; }; meta = with lib; { diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/documentation/doxygen/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/documentation/doxygen/default.nix index 772b654df935..613dec86d7cd 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/documentation/doxygen/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/documentation/doxygen/default.nix @@ -1,15 +1,14 @@ -{ stdenv, cmake, fetchurl, python3, flex, bison, qt4, CoreServices, libiconv }: +{ stdenv, cmake, fetchFromGitHub, python3, flex, bison, qt5, CoreServices, libiconv }: stdenv.mkDerivation rec { - - 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 = "1lvqfw2yzba588c5ggl8yhw7aw4xkk44mrghsd9yqlajc48x25dc"; + pname = "doxygen"; + version = "1.8.20"; + + src = fetchFromGitHub { + owner = "doxygen"; + repo = "doxygen"; + rev = "Release_${stdenv.lib.replaceStrings [ "." ] [ "_" ] version}"; + sha256 = "17chvi3i80rj4750smpizf562xjzd2xcv5rfyh997pyvc1zbq5rh"; }; nativeBuildInputs = [ @@ -20,19 +19,18 @@ stdenv.mkDerivation rec { ]; buildInputs = - stdenv.lib.optional (qt4 != null) qt4 + stdenv.lib.optionals (qt5 != null) (with qt5; [ qtbase wrapQtAppsHook ]) ++ stdenv.lib.optional stdenv.isSunOS libiconv ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices libiconv ]; cmakeFlags = [ "-DICONV_INCLUDE_DIR=${libiconv}/include" ] ++ - stdenv.lib.optional (qt4 != null) "-Dbuild_wizard=YES"; + stdenv.lib.optional (qt5 != null) "-Dbuild_wizard=YES"; NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-mmacosx-version-min=10.9"; - enableParallelBuilding = true; - doCheck = false; # fails + enableParallelBuilding = false; meta = { license = stdenv.lib.licenses.gpl2Plus; @@ -47,6 +45,6 @@ stdenv.mkDerivation rec { manual (in LaTeX) from a set of documented source files. ''; - platforms = if qt4 != null then stdenv.lib.platforms.linux else stdenv.lib.platforms.unix; + platforms = if qt5 != null then stdenv.lib.platforms.linux else stdenv.lib.platforms.unix; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/documentation/gtk-doc/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/documentation/gtk-doc/default.nix index c93ee954ceab..4645c63e71da 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/documentation/gtk-doc/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/documentation/gtk-doc/default.nix @@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec { pname = "gtk-doc"; - version = "1.32"; + version = "1.33.0"; format = "other"; @@ -22,8 +22,8 @@ python3.pkgs.buildPythonApplication rec { domain = "gitlab.gnome.org"; owner = "GNOME"; repo = pname; - rev = "GTK_DOC_${stdenv.lib.replaceStrings ["."] ["_"] version }"; - sha256 = "14fihxj662gg4ln1ngff6s52zzkpbcc58qa0nxysxypnhp0h4ypk"; + rev = version; + sha256 = "ahOTEWwVVwHt8TDWBnPKHIAUq0GXllEvMRmaKul1Tq0="; }; patches = [ @@ -68,10 +68,6 @@ python3.pkgs.buildPythonApplication rec { --replace "${python3}" "" ''; - # find: ‘...-gtk-doc-1.32/lib/python3.8/site-packages’: No such file or directory - # https://github.com/NixOS/nixpkgs/pull/90208#issuecomment-644051108 - dontUsePythonRecompileBytecode = true; - passthru = { # Consumers are expected to copy the m4 files to their source tree, let them reuse the patch respect_xml_catalog_files_var_patch = ./respect-xml-catalog-files-var.patch; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/dt-schema/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/dt-schema/default.nix index 776a3b06143a..0392c4c95f9d 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/dt-schema/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/dt-schema/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "dtschema"; - version = "2020.8.1"; + version = "2020.11"; src = fetchPypi { inherit pname version; - sha256 = "5c98202abb4977aac6a2995a7f4ed2f7e51739db6fd72861d29681f865c27c1b"; + sha256 = "ad052d293eadb5b64631bfffac62c496427ad4105e76eef19a5422ba762ee734"; }; nativeBuildInputs = [ setuptools_scm git ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/eclipse-mat/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/eclipse-mat/default.nix index 44411d0db72c..600b2b0e56ce 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/eclipse-mat/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/eclipse-mat/default.nix @@ -31,7 +31,7 @@ let in stdenv.mkDerivation rec { pname = "eclipse-mat"; - version = "${pVersion}"; + version = pVersion; src = fetchurl { url = "http://ftp.halifax.rwth-aachen.de/eclipse//mat/${baseVersion}/rcp/MemoryAnalyzer-${version}-linux.gtk.x86_64.zip"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/electron/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/electron/default.nix index c9df28e5cded..48250d7ceb33 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/electron/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/electron/default.nix @@ -1,11 +1,26 @@ -{ stdenv, libXScrnSaver, makeWrapper, fetchurl, wrapGAppsHook, glib, gtk3, unzip, atomEnv, libuuid, at-spi2-atk, at-spi2-core, libdrm, mesa }@args: +{ stdenv +, libXScrnSaver +, makeWrapper +, fetchurl +, wrapGAppsHook +, glib +, gtk3 +, unzip +, atomEnv +, libuuid +, at-spi2-atk +, at-spi2-core +, libdrm +, mesa +, libxkbcommon +}@args: let mkElectron = import ./generic.nix args; in rec { - electron = electron_10; + electron = electron_11; electron_3 = mkElectron "3.1.13" { x86_64-linux = "1psmbplz6jhnnf6hmfhxbmmhn4n1dpnhzbc12pxn645xhfpk9ark"; @@ -21,6 +36,7 @@ rec { i686-linux = "bf96b1736141737bb064e48bdb543302fd259de634b1790b7cf930525f47859f"; armv7l-linux = "2d970b3020627e5381fd4916dd8fa50ca9556202c118ab4cba09c293960689e9"; aarch64-linux = "938b7cc5f917247a120920df30374f86414b0c06f9f3dc7ab02be1cadc944e55"; + headers = "0943wc2874s58pkpzm1l55ycgbhv60m62r8aix88gl45i6zngb2g"; }; electron_5 = mkElectron "5.0.13" { @@ -29,6 +45,7 @@ rec { i686-linux = "ccf4a5ed226928a30bd3ea830913d99853abb089bd4a6299ffa9fa0daa8d026a"; armv7l-linux = "96ad83802bc61d87bb952027d49e5dd297f58e4493e66e393b26e51e09065add"; aarch64-linux = "01f0fd313b060fb28a1022d68fb224d415fa22986e2a8f4aded6424b65e35add"; + headers = "0najajj1kjj0rbqzjvk9ipq0pgympwad77hs019cz2m8ssaxqfrv"; }; electron_6 = mkElectron "6.1.12" { @@ -37,6 +54,7 @@ rec { i686-linux = "4e61dc4aed1c1b933b233e02833948f3b17f81f3444f02e9108a78c0540159ab"; armv7l-linux = "06071b4dc59a6773ff604550ed9e7a7ae8722b5343cbb5d4b94942fe537211dc"; aarch64-linux = "4ae23b75be821044f7e5878fe8e56ab3109cbd403ecd88221effa6abf850260b"; + headers = "0im694h8wqp31yzncwfnhz5g1ijrmqnypcakl0h7xcn7v25yp7s3"; }; electron_7 = mkElectron "7.3.3" { @@ -45,29 +63,42 @@ rec { i686-linux = "5fb756900af43a9daa6c63ccd0ac4752f5a479b8c6ae576323fd925dbe5ecbf5"; armv7l-linux = "830678f6db27fa4852cf456d8b2828a3e4e3c63fe2bced6b358eae88d1063793"; aarch64-linux = "03d06120464c353068e2ac6c40f89eedffd6b5b3c4c96efdb406c96a6136a066"; + headers = "0ink72nac345s54ws6vlij2mjixglyn5ygx14iizpskn4ka1vr4b"; }; - 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.5.5" { + x86_64-linux = "8058442ab4a18d73ca644d4a6f001e374c3736bc7e37db0275c29011681f1f22"; + x86_64-darwin = "02bb9f672c063b23782bee6e336864609eed72cffeeea875a3b43c868c6bd8b3"; + i686-linux = "c8ee6c3d86576fe7546fb31b9318cb55a9cd23c220357a567d1cb4bf1b8d7f74"; + armv7l-linux = "0130d1fcd741552d2823bc8166eae9f8fc9f17cd7c0b2a7a5889d753006c0874"; + aarch64-linux = "ca16d8f82b3cb47716dc9db273681e9b7cd79df39894a923929c99dd713c45f5"; + headers = "18frb1z5qkyff5z1w44mf4iz9aw9j4lq0h9yxgfnp33zf7sl9qb5"; }; - 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.3.5" { + x86_64-linux = "9db6610289a4e0ce39c71501384baef5a58dde24d947fdead577f2a6b59123aa"; + x86_64-darwin = "d30aca66a0280a47284a3625d781c62fd0bb9b7f318bb05b8b34751ee14a3a78"; + i686-linux = "b69614b1d34f9a98e182cc43bf8d35626038d300ee9fb886f7501dbb597c7e61"; + armv7l-linux = "d929dabe7a83df232ec08b138ed2b0540b86e7dfa33f2f45f60b9949fa1ca88f"; + aarch64-linux = "41fafb72f0d18d3b9f34e6f4638f551d914aae6eb6f9ea463ace5ee4bf90bb30"; + headers = "10snhi8q0izd3aqdfymhidfja34n4xbmd7h3lzghcczp77is2i5b"; }; - electron_10 = mkElectron "10.1.1" { - x86_64-linux = "4147e88bdbec6893bf9927f0d4f3dd090d26705f5b7f688223bc65253a8b0220"; - x86_64-darwin = "5b6814ae1064cc337efcdb2ad01ab9daa003a6a1d6e05d79288ede0a3665b991"; - i686-linux = "d29682b7ea44dcdca5e7265bd1e28046275295a9ac23982af3d216a7f47a7a57"; - armv7l-linux = "341a2eacb0381c1f409b8e28cf2c0fe6f75a61410614baf80309f51dd4201a34"; - aarch64-linux = "d5e5b069f3173ed89f4cca7e9723f28a5f7a720637b7addac02972c5db042b6c"; + electron_10 = mkElectron "10.1.6" { + x86_64-linux = "d538ed7bb632d213a4b88d13bb038de65b85ae7b28a574c9efac7dc5a502ebbf"; + x86_64-darwin = "7f24c666cc59935a49e5b82b4d4c1d008e4d6fac49c78d0645596f2cc8c7218d"; + i686-linux = "009bbee26ddbf748b33588714ccc565257ff697cde2110e6b6547e3f510da85e"; + armv7l-linux = "e8999af21f7e58c4dc27594cd75438e1a5922d3cea62be63c927d29cba120951"; + aarch64-linux = "b906998ddaf96da94a43bbe38108d83250846222de2727c268ad50f24c55f0da"; + headers = "1qj6s0h612hwmh4nzafz406vybr1rhskal2mcm1ll62rnzf98k3z"; + }; + + electron_11 = mkElectron "11.0.3" { + x86_64-linux = "e2b397142ea10f494c9922ee0176fef1ea4a1899a3064feb038c9505e57fb1ff"; + x86_64-darwin = "32d5eeb03447203e1ae797bf273baf6fb7775ef0db9a3cfa875fdcddf7286027"; + i686-linux = "c1a773140d251938e2a2acd2ef52f64fc4185ea0dcab1c34c8fa07e08ec25729"; + armv7l-linux = "932e6499289b97c33ab239a72b4cf1d0a7152d1ff9ade01058d3219481da0c2e"; + aarch64-linux = "db92e96c03dfbc56159dad5d87ff11f2a1ff208730e9821788bd45ddb5db63c0"; + headers = "1r2s7088g72nanjc0fqrz1gqrbf1akrq6b7a9w6x7wj95ysc85q0"; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/electron/generic.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/electron/generic.nix index f24358676dd7..ee3609783c29 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/electron/generic.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/electron/generic.nix @@ -1,4 +1,19 @@ -{ stdenv, libXScrnSaver, makeWrapper, fetchurl, wrapGAppsHook, glib, gtk3, unzip, atomEnv, libuuid, at-spi2-atk, at-spi2-core, libdrm, mesa }: +{ stdenv +, libXScrnSaver +, makeWrapper +, fetchurl +, wrapGAppsHook +, glib +, gtk3 +, unzip +, atomEnv +, libuuid +, at-spi2-atk +, at-spi2-core +, libdrm +, mesa +, libxkbcommon +}: version: hashes: let @@ -18,6 +33,11 @@ let sha256 = hash; }; + headersFetcher = vers: hash: fetchurl { + url = "https://atom.io/download/electron/v${vers}/node-v${vers}-headers.tar.gz"; + sha256 = hash; + }; + tags = { i686-linux = "linux-ia32"; x86_64-linux = "linux-x64"; @@ -32,9 +52,14 @@ let common = platform: { inherit name version meta; src = fetcher version (get tags platform) (get hashes platform); + passthru.headers = headersFetcher version hashes.headers; }; - electronLibPath = with stdenv.lib; makeLibraryPath ([ libuuid at-spi2-atk at-spi2-core ] ++ optionals (! versionOlder version "9.0.0") [ libdrm mesa ]); + electronLibPath = with stdenv.lib; makeLibraryPath ( + [ libuuid at-spi2-atk at-spi2-core ] + ++ optionals (! versionOlder version "9.0.0") [ libdrm mesa ] + ++ optionals (! versionOlder version "11.0.0") [ libxkbcommon ] + ); linux = { buildInputs = [ glib gtk3 ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/electron/print-hashes.sh b/infra/libkookie/nixpkgs/pkgs/development/tools/electron/print-hashes.sh index 45656a8f7b2b..d6c5d94ec41e 100755 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/electron/print-hashes.sh +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/electron/print-hashes.sh @@ -20,9 +20,10 @@ SYSTEMS=( ) hashfile="$(nix-prefetch-url --print-path "https://github.com/electron/electron/releases/download/v${VERSION}/SHASUMS256.txt" 2>/dev/null | tail -n1)" +headers="$(nix-prefetch-url "https://atom.io/download/electron/v${VERSION}/node-v${VERSION}-headers.tar.gz")" + +# Entry similar to the following goes in default.nix: -echo "Entry similar to the following goes in default.nix:" -echo echo " electron_${VERSION%%.*} = mkElectron \"${VERSION}\" {" for S in "${!SYSTEMS[@]}"; do @@ -30,4 +31,6 @@ for S in "${!SYSTEMS[@]}"; do echo " $S = \"$hash\";" done +echo " headers = \"$headers\";" + echo " };" diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/errcheck/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/errcheck/default.nix index 01dc924c811d..3c42c1437a47 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/errcheck/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/errcheck/default.nix @@ -1,26 +1,20 @@ -{ buildGoPackage -, lib -, fetchFromGitHub -}: +{ lib, fetchFromGitHub, buildGoModule }: -buildGoPackage rec { +buildGoModule rec { pname = "errcheck"; - version = "1.1.0"; - - goPackagePath = "github.com/kisielk/errcheck"; - excludedPackages = "\\(testdata\\)"; + version = "1.4.0"; src = fetchFromGitHub { owner = "kisielk"; repo = "errcheck"; rev = "v${version}"; - sha256 = "19vd4rxmqbk5lpiav3pf7df3yjlz0l0dwx9mn0gjq5f998iyhy6y"; + sha256 = "00skyvy31yliw0f395j5h3gichi5n2q1m24izjidxvyc2av7pjn6"; }; - goDeps = ./deps.nix; + vendorSha256 = "0mx506qb5sy6p4zqjs1n0w7dg8pz2wf982qi9v7nrhxysl2rlnxf"; meta = with lib; { - description = "errcheck is a program for checking for unchecked errors in go programs"; + description = "Program for checking for unchecked errors in go programs"; homepage = "https://github.com/kisielk/errcheck"; license = licenses.mit; maintainers = with maintainers; [ kalbasit ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/errcheck/deps.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/errcheck/deps.nix deleted file mode 100644 index 8470c9e12aa6..000000000000 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/errcheck/deps.nix +++ /dev/null @@ -1,20 +0,0 @@ -[ - { - goPackagePath = "github.com/kisielk/gotool"; - fetch = { - type = "git"; - url = "https://github.com/kisielk/gotool"; - rev = "80517062f582ea3340cd4baf70e86d539ae7d84d"; - sha256 = "14af2pa0ssyp8bp2mvdw184s5wcysk6akil3wzxmr05wwy951iwn"; - }; - } - { - goPackagePath = "golang.org/x/tools"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/tools"; - rev = "3a10b9bf0a52df7e992a8c3eb712a86d3c896c75"; - sha256 = "19f3dijcc54jnd7458jab2dgpd0gzccmv2qympd9wi8cc8jpnhws"; - }; - } -] diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/fdroidserver/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/fdroidserver/default.nix index 2b96830b0022..1b0c44f57548 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/fdroidserver/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/fdroidserver/default.nix @@ -23,6 +23,7 @@ python.pkgs.buildPythonApplication rec { ${python.interpreter} setup.py compile_catalog ''; postInstall = '' + patchShebangs gradlew-fdroid install -m 0755 gradlew-fdroid $out/bin ''; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/fedora-coreos-config-transpiler/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/fedora-coreos-config-transpiler/default.nix index 7ff7af7d18e7..0d9bad0e41fa 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/fedora-coreos-config-transpiler/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/fedora-coreos-config-transpiler/default.nix @@ -4,13 +4,13 @@ with lib; buildGoModule rec { pname = "fcct"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "coreos"; repo = "fcct"; rev = "v${version}"; - sha256 = "18hmnip1s0smp58q500p8dfbrmi4i3nsyq22ri5cs53wbvz3ih1l"; + sha256 = "1ffjn0l38szpkgd11mfaiynf9n8ljndv122l8amwiwp5mrh3hsl6"; }; vendorSha256 = null; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/flyway/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/flyway/default.nix index c89b7acc51d8..af58da175100 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/flyway/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/flyway/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, jre_headless, makeWrapper }: let - version = "6.5.5"; + version = "7.3.1"; 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 = "0g40lgrm9cslkdr4yn0h737djdr9fdyrc4hkq7wsrj0wx6d819dn"; + sha256 = "1qridl42jldwv6wka7l54g354aj9f3vbgzhyz5gdz5vdzs9x93w8"; }; nativeBuildInputs = [ makeWrapper ]; dontBuild = true; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/gauge/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/gauge/default.nix index 8755466ec8ce..d7ec8564cf16 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/gauge/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/gauge/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "gauge"; - version = "1.1.3"; + version = "1.1.5"; goPackagePath = "github.com/getgauge/gauge"; excludedPackages = ''\(build\|man\)''; @@ -11,7 +11,7 @@ buildGoPackage rec { owner = "getgauge"; repo = "gauge"; rev = "v${version}"; - sha256 = "11qllg1alv9khkgjarpzlsqg5ygisjprg79n2jqhv1w6izx88cqc"; + sha256 = "0jijw9x1ccqbb9kkzx1bj3wsq6v1415hvlbiihswqbb559bcmira"; }; meta = with stdenv.lib; { diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/git-quick-stats/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/git-quick-stats/default.nix index 0ceb6f566a31..500c9a55c1d8 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/git-quick-stats/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/git-quick-stats/default.nix @@ -6,7 +6,7 @@ , git , gnugrep , ncurses -, utillinux +, util-linux }: stdenv.mkDerivation rec { @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { git gnugrep ncurses - utillinux + util-linux ]; in '' diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/github/bump/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/github/bump/default.nix new file mode 100644 index 000000000000..791b8b7aa916 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/github/bump/default.nix @@ -0,0 +1,29 @@ +{ buildGoModule, fetchFromGitHub, lib }: + +buildGoModule rec { + pname = "bump"; + version = "0.2.2"; + + src = fetchFromGitHub { + owner = "mroth"; + repo = pname; + rev = "v${version}"; + sha256 = "0092jn7nxnr64fyb2yy9amrd8gl7q9p70a2yq9jrgr1pyrlrazbq"; + }; + + vendorSha256 = "0w5sqg1ii4vp7iijs6ffbskkj2xqggbr40j6wxrjrbjr1qisl8r1"; + + doCheck = false; + + buildFlagsArray = [ + "-ldflags=-X main.buildVersion=${version} -X main.buildCommit=${version} -X main.buildDate=1970-01-01" + ]; + + meta = with lib; { + license = licenses.mit; + homepage = "https://github.com/mroth/bump"; + description = "CLI tool to draft a GitHub Release for the next semantic version"; + maintainers = with maintainers; [ doronbehar ]; + }; +} + diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/glade/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/glade/default.nix index 85bc037b1976..363e429b6baa 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/glade/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/glade/default.nix @@ -2,14 +2,19 @@ , gettext , fetchurl , python3 +, meson +, ninja , pkg-config , gtk3 , glib +, gjs +, webkitgtk , gobject-introspection , wrapGAppsHook , itstool , libxml2 , docbook-xsl-nons +, docbook_xml_dtd_42 , gnome3 , gdk-pixbuf , libxslt @@ -18,19 +23,22 @@ stdenv.mkDerivation rec { pname = "glade"; - version = "3.36.0"; + version = "3.38.2"; src = fetchurl { url = "mirror://gnome/sources/glade/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "023gx8rj51njn8fsb6ma5kz1irjpxi4js0n8rwy22inc4ysldd8r"; + sha256 = "1dxsiz9ahqkxg2a1dw9sbd8jg59y5pdz4c1gvnbmql48gmj8gz4q"; }; nativeBuildInputs = [ + meson + ninja pkg-config gettext itstool wrapGAppsHook docbook-xsl-nons + docbook_xml_dtd_42 libxslt libxml2 gobject-introspection @@ -39,6 +47,8 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 glib + gjs + webkitgtk libxml2 python3 python3.pkgs.pygobject3 @@ -47,8 +57,6 @@ stdenv.mkDerivation rec { gnome3.adwaita-icon-theme ]; - enableParallelBuilding = true; - passthru = { updateScript = gnome3.updateScript { packageName = pname; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/gllvm/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/gllvm/default.nix index 7c4213b4cc0b..efa7ae21c3a5 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/gllvm/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/gllvm/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "gllvm"; - version = "1.2.7"; + version = "1.2.9"; goPackagePath = "github.com/SRI-CSL/gllvm"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "SRI-CSL"; repo = "gllvm"; rev = "v${version}"; - sha256 = "13cmmgbcdfgyxnxqfrn4m6vf0bhpday8lmrr3sm6rk48g77cq203"; + sha256 = "15cgngvd9mg057iz32fk5kcprcvvavahbvfvl5ds8x7shbm60g7s"; }; meta = with stdenv.lib; { diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/glslviewer/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/glslviewer/default.nix index b9e46ca41e17..84b3d2a6b1ee 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/glslviewer/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/glslviewer/default.nix @@ -1,28 +1,28 @@ { stdenv, fetchFromGitHub, glfw, pkgconfig, libXrandr, libXdamage , libXext, libXrender, libXinerama, libXcursor, libXxf86vm, libXi -, libX11, libGLU, python2Packages, ensureNewerSourcesForZipFilesHook +, libX11, libGLU, python3Packages, ensureNewerSourcesForZipFilesHook , Cocoa }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "glslviewer"; - version = "2019-04-22"; + version = "1.6.8"; src = fetchFromGitHub { owner = "patriciogonzalezvivo"; repo = "glslViewer"; - rev = "fa3e2ed4810927d189e480b704366cca22f281f3"; - sha256 = "1888jxi84f2nnc0kpzqrn2cada1z4zqyq8ss4ppb5y3wy7d87qjn"; + rev = version; + sha256 = "0v7x93b61ama0gmzlx1zc56jgi7bvzsfvbkfl82xzwf2h5g1zni7"; }; - nativeBuildInputs = [ pkgconfig ensureNewerSourcesForZipFilesHook ]; + nativeBuildInputs = [ pkgconfig ensureNewerSourcesForZipFilesHook python3Packages.six ]; buildInputs = [ glfw libGLU glfw libXrandr libXdamage libXext libXrender libXinerama libXcursor libXxf86vm libXi libX11 - ] ++ (with python2Packages; [ python setuptools wrapPython ]) + ] ++ (with python3Packages; [ python setuptools wrapPython ]) ++ stdenv.lib.optional stdenv.isDarwin Cocoa; - pythonPath = with python2Packages; [ requests ]; + pythonPath = with python3Packages; [ pyyaml requests ]; # Makefile has /usr/local/bin hard-coded for 'make install' preConfigure = '' @@ -31,6 +31,7 @@ stdenv.mkDerivation { --replace '/usr/bin/clang++' 'clang++' substituteInPlace Makefile \ --replace 'python setup.py install' "python setup.py install --prefix=$out" + 2to3 -w bin/* ''; preInstall = '' diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/go-migrate/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/go-migrate/default.nix index 96b66ebc0b5f..3a424014ec33 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/go-migrate/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/go-migrate/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "go-migrate"; - version = "4.12.2"; + version = "4.14.1"; src = fetchFromGitHub { owner = "golang-migrate"; repo = "migrate"; rev = "v${version}"; - sha256 = "0vrc9y90aamj618sfipq2sgzllhdr4hmicj4yvl147klwb1rxlz6"; + sha256 = "1mgs3bngghmirmn0pw351m54darv8d5iymlxcjqw3vr0cyn5aqj0"; }; - vendorSha256 = "0jpz5xvwsw4l7nmi7s1grvbfy4xjp50hrjycwicgv2ll719gz5v0"; + vendorSha256 = "071gfyx6iqla8ir7ianw1z62rdsds9shakzqs9wn34ll1kdbd4rv"; subPackages = [ "cmd/migrate" ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/go-protobuf/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/go-protobuf/default.nix index 28d429c64328..c5e9af3e7bbf 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/go-protobuf/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/go-protobuf/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "go-protobuf"; - version = "1.4.2"; + version = "1.4.3"; src = fetchFromGitHub { owner = "golang"; repo = "protobuf"; rev = "v${version}"; - sha256 = "0m5z81im4nsyfgarjhppayk4hqnrwswr3nix9mj8pff8x9jvcjqw"; + sha256 = "1kf1d7xmyjvy0z6j5czp6nqyvj9zrk6liv6znif08927xqfrzyln"; }; vendorSha256 = "04w9vhkrwb2zfqk73xmhignjyvjqmz1j93slkqp7v8jj2dhyla54"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/go-tools/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/go-tools/default.nix index ec4b1ee66b3d..c566ea528b3f 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/go-tools/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/go-tools/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "go-tools"; - version = "2020.1.5"; + version = "2020.1.6"; src = fetchFromGitHub { owner = "dominikh"; repo = "go-tools"; rev = version; - sha256 = "1ry3ywncc9qkmh8ihh67v6k8nmqhq2gvfyrl1ykl4z6s56b7f9za"; + sha256 = "1r83gx7k4fiz3wlshhniz1i39xv492nni1nvfxjfqgnmkavb6r4x"; }; - vendorSha256 = "0nbbngsphklzhcmqafrw1im2l1vnfcma9sb4vskdpdrsadv5ss5r"; + vendorSha256 = "1g04rzirjv90s1i542cqi2abhgh8b74qwhp1hp1cszgb7k8nndmr"; doCheck = false; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/goconst/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/goconst/default.nix index 5c2e40032e95..987a3285f8be 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/goconst/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/goconst/default.nix @@ -5,7 +5,7 @@ buildGoPackage rec { pname = "goconst"; - version = "1.2.0"; + version = "1.4.0"; goPackagePath = "github.com/jgautheron/goconst"; @@ -15,7 +15,7 @@ buildGoPackage rec { owner = "jgautheron"; repo = "goconst"; rev = version; - sha256 = "10yy9llmbznaq3v11sxywk1wpwhn0ddly7lxs31z1sf8paan7aig"; + sha256 = "0jp9vg5l4wcvnf653h3d8ay2n7y717l9z34rls1vrsaf0qdf1r6v"; }; meta = with lib; { diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/gofumpt/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/gofumpt/default.nix index 080f4bd3305a..82ae3d4bb7b8 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/gofumpt/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/gofumpt/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gofumpt"; - version = "2019-11-11"; + version = "2020-10-27"; src = fetchFromGitHub { owner = "mvdan"; repo = pname; - rev = "eb442649d62000da5d11671f3beb1afa1b746fd7"; - sha256 = "1cw9mmavxz8gxzzwsllvf5lwb2wwi19jbc7hcwxsi4ywp7a84gh0"; + rev = "85d5401eb0f699d87b0d6c949dd4c0d5fb23f2e0"; + sha256 = "0n72d7p4y89kfilcdx3qb63qy6xm8dyp6q8s8954wrkm2wlhkwiy"; }; - vendorSha256 = "14a3p163xy861xb6x160wy15hzjc75n36jdyzaxl877i17shba8z"; + vendorSha256 = "1s546hp4ngzqvfx7dbd43k7b94z0mvndgdkndh4ypkkl3rpd9kkz"; doCheck = false; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/golangci-lint/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/golangci-lint/default.nix index 1eaa00e80864..ddcbbb127585 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/golangci-lint/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/golangci-lint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "golangci-lint"; - version = "1.31.0"; + version = "1.33.0"; src = fetchFromGitHub { owner = "golangci"; repo = "golangci-lint"; rev = "v${version}"; - sha256 = "10divgsc095jiw7n3gwzikbgvsd0hdwjyv469vq939zm7rqq3acy"; + sha256 = "1yqq5jai0npkjzfk2h121nv3pgqfqi5c3vs22wyv6qwnlia97yin"; }; - vendorSha256 = "1pa99jfz6i696x6v06aq56r0kmxmz4khb1hw7pvxds0bn16a4swr"; + vendorSha256 = "1kmsfsa5z41mjxi15a4zra1qhskm5pjcfbk09c99xbv27pin5yrj"; doCheck = false; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/google-app-engine-go-sdk/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/google-app-engine-go-sdk/default.nix index 001edf5c038e..485b2c3625fb 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/google-app-engine-go-sdk/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/google-app-engine-go-sdk/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchzip, python27, python27Packages, makeWrapper }: +{ stdenv, fetchzip, python3Packages, makeWrapper }: -with python27Packages; +with python3Packages; stdenv.mkDerivation rec { pname = "google-app-engine-go-sdk"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { sha256 = "0s8sqyc72lnc7dxd4cl559gyfx83x71jjpsld3i3nbp3mwwamczp"; }; - buildInputs = [python27 makeWrapper]; + buildInputs = [ python makeWrapper ]; installPhase = '' mkdir -p $out/bin $out/share/ @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { # create wrappers with correct env for i in goapp go-app-stager *.py; do makeWrapper "$out/share/go_appengine/$i" "$out/bin/$i" \ - --prefix PATH : "${python27}/bin" \ + --prefix PATH : "${python}/bin" \ --prefix PYTHONPATH : "$(toPythonPath ${cffi}):$(toPythonPath ${cryptography}):$(toPythonPath ${pyopenssl})" done ''; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/gopls/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/gopls/default.nix index 66582969714f..49b8c8a3306f 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/gopls/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/gopls/default.nix @@ -2,19 +2,22 @@ buildGoModule rec { pname = "gopls"; - version = "0.5.1"; + version = "0.5.3"; src = fetchgit { rev = "gopls/v${version}"; url = "https://go.googlesource.com/tools"; - sha256 = "1vnidc8kaisdyprylsibddpdksm84c6qr528768yvi93crdmddls"; + sha256 = "04dkrvk5190kyfa9swxpl0m3xq9g90qp8j7yxhi87wyb8giqbll2"; }; modRoot = "gopls"; - vendorSha256 = "048qs6ygav8al3sz9vwf6fqaahkr8wr3dj1yd2jhr7c5h30n4rs2"; + vendorSha256 = "0ml8n6qnq9nprn7kv138qy0i2q8qawzd0lhh3v2qw39j0aj5fb7z"; doCheck = false; + # Only build gopls, and not the integration tests or documentation generator. + subPackages = [ "." ]; + meta = with stdenv.lib; { description = "Official language server for the Go language"; homepage = "https://github.com/golang/tools/tree/master/gopls"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/gosec/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/gosec/default.nix index ffbd98a45772..44862bb3311d 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/gosec/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/gosec/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "gosec"; - version = "2.4.0"; + version = "2.5.0"; subPackages = [ "cmd/gosec" ]; @@ -10,10 +10,10 @@ buildGoModule rec { owner = "securego"; repo = pname; rev = "v${version}"; - sha256 = "0mqijzr3vj4wycykqpjz9xw9fhpbnzz988z2q3nldb5ax0pyrxca"; + sha256 = "0hwa4sxw9sqzivg80nqsi9g1hz8apnnck73x5dvnn1zbwvycx3g9"; }; - vendorSha256 = "063dpq1k5lykp18gshlgg098yvppicv3cz8gjn1mvfhac2rl9yqr"; + vendorSha256 = "1lldi56kah689xf8n1hfpk9qy0gbci62xnjs5jrh54kbgka23gvw"; doCheck = false; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/gotestsum/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/gotestsum/default.nix index 71bccc74ce65..8ccc1b593fd7 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/gotestsum/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/gotestsum/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gotestsum"; - version = "0.5.3"; + version = "0.6.0"; src = fetchFromGitHub { owner = "gotestyourself"; repo = "gotestsum"; rev = "v${version}"; - sha256 = "1jq529m788yp3b6j4dhxgcw7qm1lyxx1ir2vwr41vp7gh17fmwar"; + sha256 = "0w0s2qvwnb69s18gvkkbwsx9zh7yi8ksnnrfpl8az8sybk6m1iaz"; }; - vendorSha256 = "1injixhllv41glb3yz276gjrkiwwkfimrhb367d2pvjpzqmhplan"; + vendorSha256 = "09cifc69z1ashjw1mqgbi0gh90h2sypqyl0jswxxcqk89ibgy3am"; doCheck = false; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/gotools/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/gotools/default.nix index 11926b3b0c66..606092e8cdcb 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/gotools/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/gotools/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "gotools-unstable"; - version = "2020-04-21"; - rev = "72e4a01eba4315301fd9ce00c8c2f492580ded8a"; + version = "2020-10-27"; + rev = "eafbe7b904eb2418efc832e36ac634dc09084f10"; src = fetchgit { inherit rev; url = "https://go.googlesource.com/tools"; - sha256 = "0a8c7j4w784w441j3j3bh640vy1g6g214641qv485wyi0xj49anf"; + sha256 = "0884znfbm44f4ddjkm0g7qg2a257kwzv1ismd2m225f3c69n3mdg"; }; # The gopls folder contains a Go submodule which causes a build failure. @@ -25,7 +25,7 @@ buildGoModule rec { rm -rf gopls ''; - vendorSha256 = "0pplmqxrnc8qnr5708igx4dm7rb0hicvhg6lh5hj8zkx38nb19s0"; + vendorSha256 = "18qpjmmjpk322fvf81cafkpl3spv7hpdpymhympmld9isgzggfyz"; doCheck = false; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/halfempty/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/halfempty/default.nix index e576b2321c69..c8c267f91872 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/halfempty/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/halfempty/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, glib, utillinux, scowl }: +{ lib, stdenv, fetchFromGitHub, pkgconfig, glib, util-linux, scowl }: stdenv.mkDerivation rec { pname = "halfempty"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0838pw0ccjvlxmjygzrnppz1fx1a10vjzdgjbxgb4wgpqjr8v6vc"; }; - nativeBuildInputs = [ pkgconfig utillinux ]; + nativeBuildInputs = [ pkgconfig util-linux ]; buildInputs = [ glib ]; enableParallelBuilding = true; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/haskell/dconf2nix/dconf2nix.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/haskell/dconf2nix/dconf2nix.nix index 60b9ba3e0e45..4d7dca12f8fc 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/haskell/dconf2nix/dconf2nix.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/haskell/dconf2nix/dconf2nix.nix @@ -3,11 +3,11 @@ }: mkDerivation { pname = "dconf2nix"; - version = "0.0.6"; + version = "0.0.7"; src = fetchgit { url = "https://github.com/gvolpe/dconf2nix.git"; - sha256 = "0ql3xrr05kg1xrfxq86mhzh5ky33sngx57sahzck3rb8fv2g6amv"; - rev = "cf976e033c1a89f897924baa219c3b227fe68489"; + sha256 = "04p8di1ckv5fkfa61pjg5xp8vcw091lz1kw39lh4w8ks2zjwaha1"; + rev = "34c523e920b79208c3b4c0ad371900b0948799f7"; fetchSubmodules = true; }; isLibrary = true; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/default.nix index 0c1b6d0dbcca..a19e05759136 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/default.nix @@ -1,22 +1,22 @@ { mkDerivation, aeson, base, binary, blaze-markup, brittany , bytestring, containers, data-default, deepseq, directory, extra -, fetchgit, filepath, fingertree, floskell, fourmolu, ghc -, ghc-boot-th, ghc-exactprint, ghc-paths, ghc-source-gen, ghcide -, gitrev, hashable, haskell-lsp, hie-bios, hls-plugin-api, hslogger +, fetchgit, filepath, floskell, fourmolu, ghc, ghc-boot-th +, ghc-paths, ghcide, gitrev, hashable, haskell-lsp, hie-bios +, hls-hlint-plugin, hls-plugin-api, hls-tactics-plugin, hslogger , hspec, hspec-core, lens, lsp-test, mtl, optparse-applicative -, optparse-simple, ormolu, process, refinery, regex-tdfa, retrie -, safe-exceptions, shake, stdenv, stm, stylish-haskell, syb, tasty +, 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 , unordered-containers, yaml }: mkDerivation { pname = "haskell-language-server"; - version = "0.5.0.0"; + version = "0.6.0.0"; src = fetchgit { url = "https://github.com/haskell/haskell-language-server.git"; - sha256 = "1qi762fa72487i8fspxmr8xizm9n2s1shxsvnvsl67vj9if573r9"; - rev = "3ca2a6cd267f373aae19f59e1cf9e04b6524eff3"; + sha256 = "027fq6752024wzzq9izsilm5lkq9gmpxf82rixbimbijw0yk4pwj"; + rev = "372a12e797069dc3ac4fa33dcaabe3b992999d7c"; fetchSubmodules = true; }; isLibrary = true; @@ -29,12 +29,12 @@ mkDerivation { ]; executableHaskellDepends = [ aeson base binary brittany bytestring containers deepseq directory - extra filepath fingertree floskell fourmolu ghc ghc-boot-th - ghc-exactprint ghc-paths ghc-source-gen ghcide gitrev hashable - haskell-lsp hie-bios hls-plugin-api hslogger lens mtl - optparse-applicative optparse-simple ormolu process refinery - regex-tdfa retrie safe-exceptions shake stylish-haskell syb - temporary text time transformers unordered-containers + extra filepath floskell fourmolu ghc ghc-boot-th ghc-paths ghcide + gitrev hashable haskell-lsp hie-bios hls-hlint-plugin + hls-plugin-api hls-tactics-plugin hslogger lens mtl + optparse-applicative optparse-simple ormolu process regex-tdfa + retrie safe-exceptions shake stylish-haskell temporary text time + transformers unordered-containers ]; testHaskellDepends = [ aeson base blaze-markup bytestring containers data-default diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-ghcide.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-ghcide.nix deleted file mode 100644 index 450c665bef85..000000000000 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-ghcide.nix +++ /dev/null @@ -1,60 +0,0 @@ -{ mkDerivation, aeson, array, async, base, base16-bytestring -, binary, bytestring, Chart, Chart-diagrams, containers -, cryptohash-sha1, data-default, deepseq, diagrams, diagrams-svg -, directory, extra, fetchgit, filepath, fingertree, fuzzy, ghc -, ghc-boot, ghc-boot-th, ghc-check, ghc-paths -, ghc-typelits-knownnat, gitrev, Glob, haddock-library, hashable -, haskell-lsp, haskell-lsp-types, hie-bios, hslogger -, implicit-hie-cradle, lens, lsp-test, mtl, network-uri -, optparse-applicative, prettyprinter, prettyprinter-ansi-terminal -, process, QuickCheck, quickcheck-instances -, record-dot-preprocessor, record-hasfield, 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.4.0"; - src = fetchgit { - url = "https://github.com/haskell/ghcide"; - sha256 = "0zv14mvfhmwwkhyzkr38qpvyffa8ywzp41lr1k55pbrc5b10fjr6"; - rev = "0bfce3114c28bd00f7bf5729c32ec0f23a8d8854"; - fetchSubmodules = true; - }; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson array async base base16-bytestring binary bytestring - containers cryptohash-sha1 data-default deepseq directory extra - filepath fingertree fuzzy ghc ghc-boot ghc-boot-th ghc-check - ghc-paths Glob haddock-library hashable haskell-lsp - haskell-lsp-types hie-bios hslogger implicit-hie-cradle 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 - lens lsp-test optparse-applicative process safe-exceptions text - unordered-containers - ]; - testHaskellDepends = [ - 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 record-dot-preprocessor - record-hasfield 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/haskell/ghcide#readme"; - description = "The core of an IDE"; - license = stdenv.lib.licenses.asl20; -} diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-hlint-plugin.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-hlint-plugin.nix new file mode 100644 index 000000000000..3a730dc71642 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-hlint-plugin.nix @@ -0,0 +1,26 @@ +{ mkDerivation, aeson, apply-refact, base, binary, bytestring +, containers, data-default, deepseq, Diff, directory, extra +, fetchgit, filepath, ghc, ghc-lib, ghc-lib-parser-ex, ghcide +, hashable, haskell-lsp, hlint, hls-plugin-api, hslogger, lens +, regex-tdfa, shake, stdenv, temporary, text, transformers +, unordered-containers +}: +mkDerivation { + pname = "hls-hlint-plugin"; + version = "0.1.0.0"; + src = fetchgit { + url = "https://github.com/haskell/haskell-language-server.git"; + sha256 = "027fq6752024wzzq9izsilm5lkq9gmpxf82rixbimbijw0yk4pwj"; + rev = "372a12e797069dc3ac4fa33dcaabe3b992999d7c"; + fetchSubmodules = true; + }; + postUnpack = "sourceRoot+=/plugins/hls-hlint-plugin; echo source root reset to $sourceRoot"; + libraryHaskellDepends = [ + aeson apply-refact base binary bytestring containers data-default + deepseq Diff directory extra filepath ghc ghc-lib ghc-lib-parser-ex + ghcide hashable haskell-lsp hlint hls-plugin-api hslogger lens + regex-tdfa shake temporary text transformers unordered-containers + ]; + description = "Hlint integration plugin with Haskell Language Server"; + license = stdenv.lib.licenses.asl20; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-tactics-plugin.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-tactics-plugin.nix new file mode 100644 index 000000000000..3d168622fb7d --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-tactics-plugin.nix @@ -0,0 +1,32 @@ +{ mkDerivation, aeson, base, checkers, containers, deepseq +, directory, extra, fetchgit, filepath, fingertree, generic-lens +, ghc, ghc-boot-th, ghc-exactprint, ghc-source-gen, ghcide +, haskell-lsp, hie-bios, hls-plugin-api, hspec, lens, mtl +, QuickCheck, refinery, retrie, shake, stdenv, syb, text +, transformers +}: +mkDerivation { + pname = "hls-tactics-plugin"; + version = "0.5.1.0"; + src = fetchgit { + url = "https://github.com/haskell/haskell-language-server.git"; + sha256 = "027fq6752024wzzq9izsilm5lkq9gmpxf82rixbimbijw0yk4pwj"; + rev = "372a12e797069dc3ac4fa33dcaabe3b992999d7c"; + fetchSubmodules = true; + }; + postUnpack = "sourceRoot+=/plugins/tactics; echo source root reset to $sourceRoot"; + libraryHaskellDepends = [ + aeson base containers deepseq directory extra filepath fingertree + generic-lens ghc ghc-boot-th ghc-exactprint ghc-source-gen ghcide + haskell-lsp hls-plugin-api lens mtl refinery retrie shake syb text + transformers + ]; + testHaskellDepends = [ + base checkers containers ghc hie-bios hls-plugin-api hspec mtl + QuickCheck + ]; + homepage = "https://github.com/isovector/hls-tactics-plugin#readme"; + description = "LSP server for GHC"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/update.sh b/infra/libkookie/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/update.sh index fd22a80126d9..fbd97b5488a8 100755 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/update.sh +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/update.sh @@ -16,24 +16,6 @@ set -eo pipefail script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" # =========================== -# ghcide fork on https://github.com/wz1000/ghcide -# =========================== - -# ghcide derivation created with cabal2nix. -ghcide_derivation_file="${script_dir}/hls-ghcide.nix" - -# This is the current revision of hls in Nixpkgs. -ghcide_old_version="$(sed -En 's/.*\bversion = "(.*?)".*/\1/p' "$ghcide_derivation_file")" - -# 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'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/haskell/ghcide" > "$ghcide_derivation_file" - -# =========================== # HLS maintainer's Brittany fork # =========================== @@ -67,5 +49,7 @@ echo "Updating haskell-language-server from old version $hls_old_version to new echo "Running cabal2nix and outputting to ${hls_derivation_file}..." cabal2nix --revision "$hls_new_version" "https://github.com/haskell/haskell-language-server.git" > "$hls_derivation_file" +cabal2nix --revision "$hls_new_version" --subpath plugins/tactics "https://github.com/haskell/haskell-language-server.git" > "${script_dir}/hls-tactics-plugin.nix" +cabal2nix --revision "$hls_new_version" --subpath plugins/hls-hlint-plugin "https://github.com/haskell/haskell-language-server.git" > "${script_dir}/hls-hlint-plugin.nix" echo "Finished." diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/hcloud/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/hcloud/default.nix index 704477421ceb..edaaa9c3a68e 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/hcloud/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/hcloud/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "hcloud"; - version = "1.19.1"; + version = "1.20.0"; src = fetchFromGitHub { owner = "hetznercloud"; repo = "cli"; rev = "v${version}"; - sha256 = "0iq04jfqvmwlm6947kzz4c3a33lvwxvj42z179rc3126b5v7bq54"; + sha256 = "0sjshcppcfdfz29nsrzvrciypcb4r7fbl2sqhlkcq948b7k3jk8b"; }; nativeBuildInputs = [ installShellFiles ]; - vendorSha256 = "1svwrb5wyz5d8fgx36bpypnfq4hmpfxyd197cla9wnqpbkia7n5r"; + vendorSha256 = "0q6jm2ghwrbjxn76i8wz72xjdmwfvl5dn8n4zilyjjx9vvllwdjw"; doCheck = false; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/impl/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/impl/default.nix index 327226fe7a1e..825aa0c1fa6b 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/impl/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/impl/default.nix @@ -20,7 +20,7 @@ buildGoPackage rec { goDeps = ./deps.nix; meta = with lib; { - description = "impl generates method stubs for implementing an interface"; + description = "Generate method stubs for implementing an interface"; homepage = "https://github.com/josharian/impl"; license = licenses.mit; maintainers = with maintainers; [ kalbasit ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/java/visualvm/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/java/visualvm/default.nix index 6cf97277bb5a..4c0ec3bc29d2 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/java/visualvm/default.nix +++ b/infra/libkookie/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.4"; + version = "2.0.5"; pname = "visualvm"; src = fetchzip { url = "https://github.com/visualvm/visualvm.src/releases/download/${version}/visualvm_${builtins.replaceStrings ["."] [""] version}.zip"; - sha256 = "1ic6gjsw90j7pr1yyplmk1zc319ld49i6d4zlgs7mlz1m4bn5jv3"; + sha256 = "19xf79rbilslpibi1mi31jplrgf8anpm06s6sxqh8v1qs84vkxdm"; }; desktopItem = makeDesktopItem { diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/jbake/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/jbake/default.nix index ad127b94960f..44d537f97626 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/jbake/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/jbake/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = with stdenv.lib; { - description = "JBake is a Java based, open source, static site/blog generator for developers & designers"; + description = "Java based, open source, static site/blog generator for developers & designers"; homepage = "https://jbake.org/"; license = licenses.mit; maintainers = with maintainers; [ moaxcp ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/jira_cli/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/jira_cli/default.nix index 19d6fa392dd2..4040debf15ea 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/jira_cli/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/jira_cli/default.nix @@ -4,10 +4,10 @@ let in buildPythonApplication rec { pname = "jira-cli"; - version = "2.2"; + version = "3.0"; src = fetchPypi { inherit pname version; - sha256 = "314118d5d851394ebf910122fd7ce871f63581393968c71456441eb56be3b112"; + sha256 = "86f7d4ad7292c9a27bbc265d09e7bcd00ef8159f20172998d85f25aad53b0df6"; }; postPatch = '' diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/jq/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/jq/default.nix index 8605ef398a1c..63c7e01a4b8d 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/jq/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/jq/default.nix @@ -1,26 +1,26 @@ -{ stdenv, fetchurl, oniguruma }: +{ stdenv, nixosTests, fetchurl, oniguruma }: stdenv.mkDerivation rec { pname = "jq"; - version="1.6"; + version = "1.6"; src = fetchurl { - url="https://github.com/stedolan/jq/releases/download/jq-${version}/jq-${version}.tar.gz"; - sha256="0wmapfskhzfwranf6515nzmm84r7kwljgfs7dg6bjgxakbicis2x"; + url = + "https://github.com/stedolan/jq/releases/download/jq-${version}/jq-${version}.tar.gz"; + sha256 = "0wmapfskhzfwranf6515nzmm84r7kwljgfs7dg6bjgxakbicis2x"; }; outputs = [ "bin" "doc" "man" "dev" "lib" "out" ]; buildInputs = [ oniguruma ]; - configureFlags = - [ + configureFlags = [ "--bindir=\${bin}/bin" "--sbindir=\${bin}/bin" "--datadir=\${doc}/share" "--mandir=\${man}/share/man" - ] - # jq is linked to libjq: + ] + # jq is linked to libjq: ++ stdenv.lib.optional (!stdenv.isDarwin) "LDFLAGS=-Wl,-rpath,\\\${libdir}"; doInstallCheck = true; @@ -30,8 +30,10 @@ stdenv.mkDerivation rec { $bin/bin/jq --help >/dev/null ''; + passthru.tests = { inherit (nixosTests) jq; }; + meta = with stdenv.lib; { - description = ''A lightweight and flexible command-line JSON processor''; + description = "A lightweight and flexible command-line JSON processor"; license = licenses.mit; maintainers = with maintainers; [ raskin globin ]; platforms = with platforms; linux ++ darwin; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/jsonnet-bundler/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/jsonnet-bundler/default.nix new file mode 100644 index 000000000000..4286a454ff02 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/jsonnet-bundler/default.nix @@ -0,0 +1,26 @@ +{ buildGoModule, fetchFromGitHub, lib }: + +buildGoModule rec { + pname = "jsonnet-bundler"; + version = "0.4.0"; + + src = fetchFromGitHub { + owner = "jsonnet-bundler"; + repo = "jsonnet-bundler"; + rev = "v${version}"; + sha256 = "0pk6nf8r0wy7lnsnzyjd3vgq4b2kb3zl0xxn01ahpaqgmwpzajlk"; + }; + + vendorSha256 = null; + + subPackages = [ "cmd/jb" ]; + + buildFlagsArray = [ "-ldflags=-s -w -X main.Version=${version}" ]; + + meta = with lib; { + description = "A jsonnet package manager"; + homepage = "https://github.com/jsonnet-bundler/jsonnet-bundler"; + license = licenses.asl20; + maintainers = with maintainers; [ preisschild ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/k6/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/k6/default.nix index 4dbd890df180..35972f9cce53 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/k6/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/k6/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "k6"; - version = "0.28.0"; + version = "0.29.0"; goPackagePath = "github.com/loadimpact/k6"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "loadimpact"; repo = pname; rev = "v${version}"; - sha256 = "0zpkavl6sg6kcb7wc92lzi4svvv3284xs20zbmgq4i9i5z1njdkx"; + sha256 = "1zkw7jga8nsqycvrwnqxifbb5la2z4bmxg3l5638i4xlpn58g711"; }; subPackages = [ "./" ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/kind/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/kind/default.nix index 6ea2c87f8888..55f0a0e9f305 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/kind/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/kind/default.nix @@ -4,16 +4,16 @@ with stdenv.lib; buildGoModule rec { pname = "kind"; - version = "0.8.1"; + version = "0.9.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "kubernetes-sigs"; repo = "kind"; - sha256 = "0r301nqvycik8fwlghq0cymmq4rm7xp8haj39i2nynxyw8zk6zym"; + sha256 = "1kyjmlp1kmr3lwylnya6w392j1qpqgbvcacwpnz3ifyh3pbv32qr"; }; - vendorSha256 = "1qvbm8v8yah6r6cw1cvdw79yiwxb2amzdkkzvzbwigy0j4bvn9mi"; + vendorSha256 = "04fmqh6lhvvzpvf1l2xk1r8687k5jx2lb5199rgmjbfnjgsa0q2d"; doCheck = false; @@ -21,7 +21,7 @@ buildGoModule rec { nativeBuildInputs = [ installShellFiles ]; postInstall = '' - for shell in bash zsh; do + for shell in bash fish zsh; do $out/bin/kind completion $shell > kind.$shell installShellCompletion kind.$shell done diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/knightos/genkfs/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/knightos/genkfs/default.nix new file mode 100644 index 000000000000..b826c1a58b99 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/knightos/genkfs/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitHub, cmake, asciidoc }: + +stdenv.mkDerivation rec { + pname = "genkfs"; + version = "1.3.2"; + + src = fetchFromGitHub { + owner = "KnightOS"; + repo = "genkfs"; + rev = version; + sha256 = "0f50idd2bb73b05qjmwlirjnhr1bp43zhrgy6z949ab9a7hgaydp"; + }; + + nativeBuildInputs = [ asciidoc cmake ]; + + hardeningDisable = [ "format" ]; + + meta = with stdenv.lib; { + homepage = "https://knightos.org/"; + description = "Utility to write a KFS filesystem into a ROM file"; + license = licenses.mit; + maintainers = with maintainers; [ siraben ]; + platforms = platforms.all; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/knightos/kpack/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/knightos/kpack/default.nix index c1ecb963d243..657a1712ed24 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/knightos/kpack/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/knightos/kpack/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "kpack"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "KnightOS"; repo = "kpack"; rev = version; - sha256 = "0kakfbzdvq5ldv1gdzl473j73c9nfdyx4xzfkriglkrqmksqc329"; + sha256 = "1l6bm2j45946i80qgwhrixg9sckazwb5x4051s76d3mapq9bara8"; }; nativeBuildInputs = [ cmake ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/knightos/mkrom/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/knightos/mkrom/default.nix index 380bdc58d49b..46482a849134 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/knightos/mkrom/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/knightos/mkrom/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "mkrom"; - version = "1.0.2"; + version = "1.0.3"; src = fetchFromGitHub { owner = "KnightOS"; repo = "mkrom"; rev = version; - sha256 = "1nx3787gvs04xdvvamzkjkn9nmy2w70ja8dnh4szk420mvpc85na"; + sha256 = "0xgvanya40mdwy35j94j61hsp80dm5b440iphmr5ng3kjgchvpx2"; }; nativeBuildInputs = [ diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/ktlint/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/ktlint/default.nix index fce25903aca9..7e71c08ec4b1 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/ktlint/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/ktlint/default.nix @@ -1,38 +1,31 @@ -{ stdenv, fetchurl, makeWrapper, jre }: +{ stdenv, fetchurl, makeWrapper, jre_headless }: stdenv.mkDerivation rec { pname = "ktlint"; - version = "0.37.2"; + version = "0.40.0"; src = fetchurl { url = "https://github.com/shyiko/ktlint/releases/download/${version}/ktlint"; - sha256 = "1hhycvvp21gy6g71hwf3pk2jnccpnhcf2z7c85shzffhddy1wc0v"; + sha256 = "17n1xdalz38h9p4ylcpkbbqp22b1np5l8y5l3r58kaf9k8p6cfa7"; }; nativeBuildInputs = [ makeWrapper ]; - propagatedBuildInputs = [ jre ]; - - unpackCmd = '' - mkdir -p ${pname}-${version} - cp $curSrc ${pname}-${version}/ktlint - ''; + dontUnpack = true; installPhase = '' - mkdir -p $out/bin - mv ktlint $out/bin/ktlint - chmod +x $out/bin/ktlint + install -Dm755 $src $out/bin/ktlint ''; postFixup = '' - wrapProgram $out/bin/ktlint --prefix PATH : "${jre}/bin" + wrapProgram $out/bin/ktlint --prefix PATH : "${jre_headless}/bin" ''; meta = with stdenv.lib; { description = "An anti-bikeshedding Kotlin linter with built-in formatter"; homepage = "https://ktlint.github.io/"; license = licenses.mit; - platforms = platforms.all; + platforms = jre_headless.meta.platforms; maintainers = with maintainers; [ tadfisher ]; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/kubie/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/kubie/default.nix index 1895cd0786dd..cae76669ab42 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/kubie/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/kubie/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "kubie"; - version = "0.9.1"; + version = "0.11.1"; src = fetchFromGitHub { rev = "v${version}"; owner = "sbstp"; repo = "kubie"; - sha256 = "0q1dxry10iaf7zx6vyr0da4ihqx7l8dlyhlqm8qqfz913h2wam8c"; + sha256 = "0q21qd9fhchggby18gzyvds517n9vq7b1rr0gmzik4036ykg1lm2"; }; - cargoSha256 = "13zs2xz3s4732zxsimg7b22d9707ln4gpscznxi13cjkf5as9gbz"; + cargoSha256 = "0dp4prv8c2a6mxl7wskpc65qlfjphdxshb4q2bswqa5i21h8r534"; nativeBuildInputs = [ installShellFiles ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/kustomize/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/kustomize/default.nix index 63a3c7746688..79c484586111 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/kustomize/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/kustomize/default.nix @@ -2,9 +2,9 @@ buildGoModule rec { pname = "kustomize"; - version = "3.8.1"; - # rev is the 3.8.1 commit, mainly for kustomize version command output - rev = "6a50372dd5686df22750b0c729adaf369fbf193c"; + version = "3.8.7"; + # rev is the 3.8.7 commit, mainly for kustomize version command output + rev = "ad092cc7a91c07fdf63a2e4b7f13fa588a39af4f"; buildFlagsArray = let t = "sigs.k8s.io/kustomize/api/provenance"; in '' @@ -17,13 +17,13 @@ buildGoModule rec { owner = "kubernetes-sigs"; repo = pname; rev = "kustomize/v${version}"; - sha256 = "07zdp6xv8viwnaz1qacwhg82dlzcrgb8dls6yz9qk4qcnsk6badx"; + sha256 = "1942cyaj6knf8mc3q2vcz6rqqc6lxdd6nikry9m0idk5l1b09x1m"; }; # avoid finding test and development commands sourceRoot = "source/kustomize"; - vendorSha256 = "01ff3w4hwp4ynqhg8cplv0i2ixs811d2x2j6xbh1lslyyh3z3wc5"; + vendorSha256 = "0y77ykfcbn4l0x85c3hb1lgjpy64kimx3s1qkn38gpmi4lphvkkl"; meta = with lib; { description = "Customization of kubernetes YAML configurations"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/lazygit/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/lazygit/default.nix index a4107ad1100d..b04a42d57b6b 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/lazygit/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/lazygit/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "lazygit"; - version = "0.23.2"; + version = "0.23.7"; src = fetchFromGitHub { owner = "jesseduffield"; repo = pname; rev = "v${version}"; - sha256 = "sha256-G/oAKIG0TSEjaVi6vN2wg/apOztGLiqqYLfZy6Tmmgc="; + sha256 = "05s0rj785dm9dqr30ak5hi26qy0z2w71zljyln5is4frckxkcvng"; }; vendorSha256 = null; @@ -20,6 +20,6 @@ buildGoModule rec { description = "Simple terminal UI for git commands"; homepage = "https://github.com/jesseduffield/lazygit"; license = licenses.mit; - maintainers = with maintainers; [ fpletz equirosa filalex77 ]; + maintainers = with maintainers; [ fpletz equirosa Br1ght0ne ]; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/lc3tools/0001-mangle-configure.patch b/infra/libkookie/nixpkgs/pkgs/development/tools/lc3tools/0001-mangle-configure.patch new file mode 100644 index 000000000000..80b5c7d21174 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/lc3tools/0001-mangle-configure.patch @@ -0,0 +1,29 @@ +diff --git a/configure b/configure +index 46f9af4..dfc1b3e 100755 +--- a/configure ++++ b/configure +@@ -17,10 +17,11 @@ esac + + # Some binaries that we'll need, and the places that we might find them. + +-binlist="uname flex gcc wish rm cp mkdir chmod sed" +-pathlist="/bin /usr/bin /usr/local/bin /sw/bin /usr/x116/bin /usr/X11R6/bin" +-libpathlist="/lib /usr/lib /usr/local/lib" +-incpathlist="/include /usr/include /usr/local/include" ++IFS=: ++binlist="uname:flex:gcc:wish:rm:cp:mkdir:chmod:sed" ++pathlist=$PATH ++libpathlist=$LIBS ++incpathlist=$INCLUDES + + + # Find the binaries (or die trying). +@@ -55,7 +56,7 @@ case `$uname -s` in + echo "Configuring for Cygwin..." + ;; + Linux*) echo "Configuring for Linux..." +- OS_SIM_LIBS="-lcurses" ++ # OS_SIM_LIBS="-lcurses" + ;; + SunOS*) echo "Configuring for Solaris..." + OS_SIM_LIBS="-lcurses -lsocket -lnsl" diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/lc3tools/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/lc3tools/default.nix new file mode 100644 index 000000000000..25b476f68c06 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/lc3tools/default.nix @@ -0,0 +1,42 @@ +{ stdenv, fetchurl, unzip, flex, tk, ncurses, readline }: + +stdenv.mkDerivation { + pname = "lc3tools"; + version = "0.12"; + + src = fetchurl { + url = "https://highered.mheducation.com/sites/dl/free/0072467509/104652/lc3tools_v12.zip"; + hash = "sha256-PTM0ole8pHiJmUaahjPwcBQY8/hVVgQhADZ4bSABt3I="; + }; + + patches = [ + # the original configure looks for things in the FHS path + # I have modified it to take environment vars + ./0001-mangle-configure.patch + ]; + + nativeBuildInputs = [ unzip ]; + buildInputs = [ flex tk ncurses readline ]; + + # lumetta published this a while ago but handrolled his configure + # jank in the original packaging makes this necessary: + LIBS = "${flex}/lib:${ncurses}/lib:${readline}/lib"; + INCLUDES = "${flex}/include:${ncurses}/include:${readline}/include"; + + # it doesn't take `--prefix` + prefixKey = "--installdir "; + + postInstall = '' + rm $out/{COPYING,NO_WARRANTY,README} + mkdir -p $out/{bin,share/lc3tools} + + mv -t $out/share/lc3tools $out/lc3os* + mv -t $out/bin $out/lc3* + ''; + + meta = with stdenv.lib; { + description = "Toolchain and emulator for the LC-3 architecture"; + license = licenses.gpl2; + maintainers = with maintainers; [ anna328p ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/literate-programming/Literate/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/literate-programming/Literate/default.nix index c418c16b6704..428e6e444a21 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/literate-programming/Literate/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/literate-programming/Literate/default.nix @@ -1,12 +1,13 @@ { stdenv, fetchgit, dmd, dub }: stdenv.mkDerivation { - name = "Literate-2019-01-08"; + pname = "Literate"; + version = "unstable-2020-09-02"; src = fetchgit { url = "https://github.com/zyedidia/Literate.git"; - rev = "e20c5c86713701d4d17fd2881779d758a27a3e5a"; - sha256 = "1pr7iipcnp6jxi13341p5b3szdrvs7aixpfbwifj6lgbb45vg9sm"; + rev = "533991cca6ec7a608a778396d32d51b35182d944"; + sha256 = "09h1as01z0fw0bj0kf1g9nlhvinya7sqq2x8qb6zmhvqqm6v4n49"; }; buildInputs = [ dmd dub ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/mdk/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/mdk/default.nix index 2a0b18806011..5c8924ee21be 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/mdk/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/mdk/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, intltool, pkgconfig, glib }: stdenv.mkDerivation { - name = "gnu-mdk-1.2.10"; + name = "gnu-mdk-1.3.0"; src = fetchurl { - url = "https://ftp.gnu.org/gnu/mdk/v1.2.10/mdk-1.2.10.tar.gz"; - sha256 = "1rwcq2b5vvv7318j92nxc5dayj27dpfhzc4rjiv4ccvsc0x35x5h"; + url = "https://ftp.gnu.org/gnu/mdk/v1.3.0/mdk-1.3.0.tar.gz"; + sha256 = "0bhk3c82kyp8167h71vdpbcr852h5blpnwggcswqqwvvykbms7lb"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ intltool glib ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/metals/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/metals/default.nix index 55125fbeff45..0d8911e5b213 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/metals/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/metals/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "metals"; - version = "0.9.4"; + version = "0.9.7"; deps = stdenv.mkDerivation { name = "${pname}-deps-${version}"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ''; outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "1k07gg13z3kambvvrxsc27781cd5npb2a50ahdbj7x6j6h67k0pg"; + outputHash = "0aky4vbbm5hi6jnd2n1aimqznbbaya05c7vdgaqhy3630ks3w4k9"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/minizinc/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/minizinc/default.nix index bf182a1ae418..1d01ef97f401 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/minizinc/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/minizinc/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { homepage = "https://www.minizinc.org/"; - description = "MiniZinc is a medium-level constraint modelling language"; + description = "A medium-level constraint modelling language"; longDescription = '' MiniZinc is a medium-level constraint modelling diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/abi-dumper/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/abi-dumper/default.nix index 3d11d25560dc..dc2a6d00b5f0 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/abi-dumper/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/abi-dumper/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "abi-dumper"; - version = "1.1"; + version = "1.2"; src = fetchFromGitHub { owner = "lvc"; repo = "abi-dumper"; rev = version; - sha256 = "1byhw132aj7a5a5zh5s3pnjlrhdk4cz6xd5irp1y08jl980qba5j"; + sha256 = "1i00rfnddrrb9lb1l6ib19g3a76pyasl9lb7rqz2p998gav1gjp2"; }; patchPhase = '' diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/act/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/act/default.nix index 9456335d72ad..4bb2d3d62456 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/act/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/act/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "act"; - version = "0.2.16"; + version = "0.2.17"; src = fetchFromGitHub { owner = "nektos"; repo = pname; rev = "v${version}"; - sha256 = "0zhn6av1adphkk9g13m5na63r8fqcjw8wibcja9v9mbw886zcc3p"; + sha256 = "0s7bgm2q7z9xpaj6kfvg63v12k35ckaxwmh6bbjh15xibaw58183"; }; vendorSha256 = "0bcrw3hf92m7n58lrlm0vj1wiwwy82q2rl1a725q3d6xwvi5kh9h"; @@ -22,6 +22,6 @@ buildGoModule rec { homepage = "https://github.com/nektos/act"; changelog = "https://github.com/nektos/act/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ filalex77 ]; + maintainers = with maintainers; [ Br1ght0ne ]; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/arcanist/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/arcanist/default.nix index fcddf1d0cacc..14ef09ee7ed0 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/arcanist/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/arcanist/default.nix @@ -1,20 +1,24 @@ -{ stdenv, fetchFromGitHub, php, flex }: +{ bison +, fetchFromGitHub +, flex +, php +, stdenv +}: # 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} + 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} ''; in - stdenv.mkDerivation { pname = "arcanist"; version = "20200711"; @@ -25,7 +29,7 @@ stdenv.mkDerivation { rev = "2565cc7b4d1dbce6bc7a5b3c4e72ae94be4712fe"; sha256 = "0jiv4aj4m5750dqw9r8hizjkwiyxk4cg4grkr63sllsa2dpiibxw"; }; - buildInputs = [ php flex ]; + buildInputs = [ bison flex php ]; postPatch = stdenv.lib.optionalString stdenv.isAarch64 '' substituteInPlace support/xhpast/Makefile \ @@ -33,13 +37,15 @@ stdenv.mkDerivation { ''; buildPhase = '' + make cleanall -C support/xhpast make xhpast -C support/xhpast ''; installPhase = '' mkdir -p $out/bin $out/libexec make install -C support/xhpast - cp -R $src $out/libexec/arcanist + make cleanall -C support/xhpast + cp -R . $out/libexec/arcanist ${makeArcWrapper "arc"} ${makeArcWrapper "phage"} @@ -53,9 +59,9 @@ stdenv.mkDerivation { meta = { description = "Command line interface to Phabricator"; - homepage = "http://phabricator.org"; - license = stdenv.lib.licenses.asl20; - platforms = stdenv.lib.platforms.unix; + homepage = "http://phabricator.org"; + license = stdenv.lib.licenses.asl20; + platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/argbash/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/argbash/default.nix index 0c0511ec7922..3efff5009439 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/argbash/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/argbash/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "matejak"; repo = "argbash"; - rev = "${version}"; + rev = version; sha256 = "1xdhpbnc0xjv6ydcm122hhdjcl77jhiqnccjfqjp3cd1lfmzvg8v"; }; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/asls/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/asls/default.nix index 5b53456deac6..0e08acdeb450 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/asls/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/asls/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "asls"; - version = "0.5.0"; + version = "0.5.1"; src = fetchurl { url = "https://github.com/saulecabrera/asls/releases/download/v${version}/bin.tar.gz"; - sha256 = "1h6r2lbf54aylzmbiy74ys42fhjv9q824bdrcp40gxx1v2yjc5h5"; + sha256 = "05kp44p4q4sdykfw0b4k9j3qdp0qvwgjbs48ncmnd0ass0xrmi3s"; }; buildInputs = [ erlangR22 ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/autogen/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/autogen/default.nix index 3e634bedfd19..23235499cfbd 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/autogen/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/autogen/default.nix @@ -42,13 +42,27 @@ stdenv.mkDerivation rec { guile libxml2 ]; - configureFlags = stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ - "--with-libxml2=${libxml2.dev}" - "--with-libxml2-cflags=-I${libxml2.dev}/include/libxml2" - # the configure check for regcomp wants to run a host program - "libopts_cv_with_libregex=yes" - #"MAKEINFO=${buildPackages.texinfo}/bin/makeinfo" - ]; + preConfigure = '' + export MAN_PAGE_DATE=$(date '+%Y-%m-%d' -d "@$SOURCE_DATE_EPOCH") + ''; + + configureFlags = + [ + # Make sure to use a static value for the timeout. If we do not set a value + # here autogen will select one based on the execution time of the configure + # phase which is not really reproducible. + # + # If you are curious about the number 78, it has been cargo-culted from + # Debian: https://salsa.debian.org/debian/autogen/-/blob/master/debian/rules#L21 + "--enable-timeout=78" + ] + ++ (stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + "--with-libxml2=${libxml2.dev}" + "--with-libxml2-cflags=-I${libxml2.dev}/include/libxml2" + # the configure check for regcomp wants to run a host program + "libopts_cv_with_libregex=yes" + #"MAKEINFO=${buildPackages.texinfo}/bin/makeinfo" + ]); #doCheck = true; # not reliable diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/automake/automake-1.16.x.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/automake/automake-1.16.x.nix index d6353fc0b9cf..58c559fcc566 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/automake/automake-1.16.x.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/automake/automake-1.16.x.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, perl, autoconf }: stdenv.mkDerivation rec { - name = "automake-1.16.2"; + name = "automake-1.16.3"; src = fetchurl { url = "mirror://gnu/automake/${name}.tar.xz"; - sha256 = "1l7dkqbsmbf94ax29jj1jf6a0r6ikc8jybg1p5m0c3ki7pg5ki6c"; + sha256 = "0fmz2fhmzcpacnprl5msphvaflwiy0hvpgmqlgfny72ddijzfazz"; }; nativeBuildInputs = [ autoconf perl ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/binutils/R_ARM_COPY.patch b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/binutils/R_ARM_COPY.patch new file mode 100644 index 000000000000..874809863523 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/binutils/R_ARM_COPY.patch @@ -0,0 +1,29 @@ +@@ -, +, @@ +--- + bfd/elf32-arm.c | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) +--- a/bfd/elf32-arm.c ++++ a/bfd/elf32-arm.c +@@ -15398,7 +15398,11 @@ elf32_arm_adjust_dynamic_symbol (struct bfd_link_info * info, + linker to copy the initial value out of the dynamic object and into + the runtime process image. We need to remember the offset into the + .rel(a).bss section we are going to use. */ +- if ((h->root.u.def.section->flags & SEC_READONLY) != 0) ++ if (info->nocopyreloc == 0 ++ && (h->root.u.def.section->flags & SEC_ALLOC) != 0 ++ /* PR 16177: A copy is only needed if the input section is readonly. */ ++ && (h->root.u.def.section->flags & SEC_READONLY) != 0 ++ && h->size != 0) + { + s = globals->root.sdynrelro; + srel = globals->root.sreldynrelro; +@@ -15410,6 +15414,8 @@ elf32_arm_adjust_dynamic_symbol (struct bfd_link_info * info, + } + if (info->nocopyreloc == 0 + && (h->root.u.def.section->flags & SEC_ALLOC) != 0 ++ /* PR 16177: A copy is only needed if the input section is readonly. */ ++ && (h->root.u.def.section->flags & SEC_READONLY) != 0 + && h->size != 0) + { + elf32_arm_allocate_dynrelocs (info, srel, 1); + diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/binutils/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/binutils/default.nix index b352e63a27cc..978ec3f2f99f 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/binutils/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/binutils/default.nix @@ -8,6 +8,7 @@ , bison ? null , flex , texinfo +, perl }: # Note: this package is used for bootstrapping fetchurl, and thus @@ -21,7 +22,10 @@ let # Remove gold-symbol-visibility patch when updating, the proper fix # is now upstream. # https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=commitdiff;h=330b90b5ffbbc20c5de6ae6c7f60c40fab2e7a4f;hp=99181ccac0fc7d82e7dabb05dc7466e91f1645d3 - version = "2.31.1"; + version = "${minorVersion}${patchVersion}"; + minorVersion = if stdenv.targetPlatform.isOr1k then "2.34" else "2.31"; + patchVersion = if stdenv.targetPlatform.isOr1k then "" else ".1"; + basename = "binutils"; # The targetPrefix prepended to binary names to allow multiple binuntils on the # PATH to both be usable. @@ -33,33 +37,49 @@ let rev = "708acc851880dbeda1dd18aca4fd0a95b2573b36"; sha256 = "1kdrz6fki55lm15rwwamn74fnqpy0zlafsida2zymk76n3656c63"; }; - # HACK to ensure that we preserve source from bootstrap binutils to not rebuild LLVM - normal-src = stdenv.__bootPackages.binutils-unwrapped.src or (fetchurl { + + # binutils sources not part of the bootstrap. + non-boot-src = (fetchurl { url = "mirror://gnu/binutils/${basename}-${version}.tar.bz2"; - sha256 = "1l34hn1zkmhr1wcrgf0d4z7r3najxnw3cx2y2fk7v55zjlk3ik7z"; + sha256 = { + "2.31.1" = "1l34hn1zkmhr1wcrgf0d4z7r3najxnw3cx2y2fk7v55zjlk3ik7z"; + "2.34" = "1rin1f5c7wm4n3piky6xilcrpf2s0n3dd5vqq8irrxkcic3i1w49"; + }.${version}; }); + + # HACK to ensure that we preserve source from bootstrap binutils to not rebuild LLVM + normal-src = stdenv.__bootPackages.binutils-unwrapped.src or non-boot-src; + + # Platforms where we directly use the final source. + # Generally for cross-compiled platforms, where the boot source won't compile. + skipBootSrc = stdenv.targetPlatform.isOr1k; + + # Select the specific source according to the platform in use. + src = if stdenv.targetPlatform.isVc4 then vc4-binutils-src + else if skipBootSrc then non-boot-src + else normal-src; + + patchesDir = ./patches + "/${minorVersion}"; in stdenv.mkDerivation { pname = targetPrefix + basename; - inherit version; - - src = if stdenv.targetPlatform.isVc4 then vc4-binutils-src else normal-src; + inherit src version; patches = [ # Make binutils output deterministic by default. - ./deterministic.patch + "${patchesDir}/deterministic.patch" # Bfd looks in BINDIR/../lib for some plugins that don't # exist. This is pointless (since users can't install plugins # there) and causes a cycle between the lib and bin outputs, so # get rid of it. - ./no-plugins.patch + "${patchesDir}/no-plugins.patch" # Help bfd choose between elf32-littlearm, elf32-littlearm-symbian, and # elf32-littlearm-vxworks in favor of the first. # https://github.com/NixOS/nixpkgs/pull/30484#issuecomment-345472766 - ./disambiguate-arm-targets.patch + "${patchesDir}/disambiguate-arm-targets.patch" # For some reason bfd ld doesn't search DT_RPATH when cross-compiling. It's # not clear why this behavior was decided upon but it has the unfortunate @@ -67,25 +87,38 @@ stdenv.mkDerivation { # shared objects when cross-compiling. Consequently, we are forced to # override this behavior, forcing ld to search DT_RPATH even when # cross-compiling. - ./always-search-rpath.patch - - ] ++ lib.optionals (!stdenv.targetPlatform.isVc4) - [ + "${patchesDir}/always-search-rpath.patch" + ] + # For version 2.31 exclusively + ++ lib.optionals (!stdenv.targetPlatform.isVc4 && minorVersion == "2.31") [ # https://sourceware.org/bugzilla/show_bug.cgi?id=22868 - ./gold-symbol-visibility.patch + ./patches/2.31/gold-symbol-visibility.patch # https://sourceware.org/bugzilla/show_bug.cgi?id=23428 # un-break features so linking against musl doesn't produce crash-only binaries - ./0001-x86-Add-a-GNU_PROPERTY_X86_ISA_1_USED-note-if-needed.patch - ./0001-x86-Properly-merge-GNU_PROPERTY_X86_ISA_1_USED.patch - ./0001-x86-Properly-add-X86_ISA_1_NEEDED-property.patch - ] ++ lib.optional stdenv.targetPlatform.isiOS ./support-ios.patch; + ./patches/2.31/0001-x86-Add-a-GNU_PROPERTY_X86_ISA_1_USED-note-if-needed.patch + ./patches/2.31/0001-x86-Properly-merge-GNU_PROPERTY_X86_ISA_1_USED.patch + ./patches/2.31/0001-x86-Properly-add-X86_ISA_1_NEEDED-property.patch + ] + ++ lib.optional stdenv.targetPlatform.isiOS ./support-ios.patch + ++ # This patch was suggested by Nick Clifton to fix + # https://sourceware.org/bugzilla/show_bug.cgi?id=16177 + # It can be removed when that 7-year-old bug is closed. + # This binutils bug causes GHC to emit broken binaries on armv7, and + # indeed GHC will refuse to compile with a binutils suffering from it. See + # this comment for more information: + # https://gitlab.haskell.org/ghc/ghc/issues/4210#note_78333 + lib.optional stdenv.targetPlatform.isAarch32 ./R_ARM_COPY.patch + ; outputs = [ "out" "info" "man" ]; depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ bison + ] ++ lib.optionals (lib.versionAtLeast version "2.34") [ + perl + texinfo ] ++ (lib.optionals stdenv.targetPlatform.isiOS [ autoreconfHook ]) ++ lib.optionals stdenv.targetPlatform.isVc4 [ texinfo flex ]; @@ -149,7 +182,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; passthru = { - inherit targetPrefix; + inherit targetPrefix patchesDir; }; meta = with lib; { diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/binutils/0001-x86-Add-a-GNU_PROPERTY_X86_ISA_1_USED-note-if-needed.patch b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/binutils/patches/2.31/0001-x86-Add-a-GNU_PROPERTY_X86_ISA_1_USED-note-if-needed.patch index 5a047b0f0703..5a047b0f0703 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/binutils/0001-x86-Add-a-GNU_PROPERTY_X86_ISA_1_USED-note-if-needed.patch +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/binutils/patches/2.31/0001-x86-Add-a-GNU_PROPERTY_X86_ISA_1_USED-note-if-needed.patch diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/binutils/0001-x86-Properly-add-X86_ISA_1_NEEDED-property.patch b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/binutils/patches/2.31/0001-x86-Properly-add-X86_ISA_1_NEEDED-property.patch index ca50d9a57cd1..ca50d9a57cd1 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/binutils/0001-x86-Properly-add-X86_ISA_1_NEEDED-property.patch +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/binutils/patches/2.31/0001-x86-Properly-add-X86_ISA_1_NEEDED-property.patch diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/binutils/0001-x86-Properly-merge-GNU_PROPERTY_X86_ISA_1_USED.patch b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/binutils/patches/2.31/0001-x86-Properly-merge-GNU_PROPERTY_X86_ISA_1_USED.patch index 866d6db8ce24..866d6db8ce24 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/binutils/0001-x86-Properly-merge-GNU_PROPERTY_X86_ISA_1_USED.patch +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/binutils/patches/2.31/0001-x86-Properly-merge-GNU_PROPERTY_X86_ISA_1_USED.patch diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/binutils/always-search-rpath.patch b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/binutils/patches/2.31/always-search-rpath.patch index 2e9956e6b6e4..2e9956e6b6e4 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/binutils/always-search-rpath.patch +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/binutils/patches/2.31/always-search-rpath.patch diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/binutils/build-components-separately.patch b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/binutils/patches/2.31/build-components-separately.patch index d3cd0d2131cc..d3cd0d2131cc 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/binutils/build-components-separately.patch +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/binutils/patches/2.31/build-components-separately.patch diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/binutils/deterministic.patch b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/binutils/patches/2.31/deterministic.patch index 736e0aca6ce1..736e0aca6ce1 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/binutils/deterministic.patch +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/binutils/patches/2.31/deterministic.patch diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/binutils/disambiguate-arm-targets.patch b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/binutils/patches/2.31/disambiguate-arm-targets.patch index abbfa73da05d..abbfa73da05d 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/binutils/disambiguate-arm-targets.patch +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/binutils/patches/2.31/disambiguate-arm-targets.patch diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/binutils/gold-symbol-visibility.patch b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/binutils/patches/2.31/gold-symbol-visibility.patch index 0fb05a482d1c..0fb05a482d1c 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/binutils/gold-symbol-visibility.patch +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/binutils/patches/2.31/gold-symbol-visibility.patch diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/binutils/no-plugins.patch b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/binutils/patches/2.31/no-plugins.patch index 9624b7976b70..9624b7976b70 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/binutils/no-plugins.patch +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/binutils/patches/2.31/no-plugins.patch diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/binutils/patches/2.34/always-search-rpath.patch b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/binutils/patches/2.34/always-search-rpath.patch new file mode 100644 index 000000000000..2e9956e6b6e4 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/binutils/patches/2.34/always-search-rpath.patch @@ -0,0 +1,14 @@ +diff --git a/ld/genscripts.sh b/ld/genscripts.sh +index b6940d376d..0feb1adfd0 100755 +--- a/ld/genscripts.sh ++++ b/ld/genscripts.sh +@@ -125,6 +125,9 @@ if test "x$NATIVE" = "xyes" ; then + USE_LIBPATH=yes + fi + ++# TODO: why is this needed? ++USE_LIBPATH=yes ++ + # Set the library search path, for libraries named by -lfoo. + # If LIB_PATH is defined (e.g., by Makefile) and non-empty, it is used. + # Otherwise, the default is set here. diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/binutils/patches/2.34/build-components-separately.patch b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/binutils/patches/2.34/build-components-separately.patch new file mode 100644 index 000000000000..38fa4934a28a --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/binutils/patches/2.34/build-components-separately.patch @@ -0,0 +1,164 @@ +diff --git a/bfd/configure.ac b/bfd/configure.ac +index c5bfbd5d..45ad4c26 100644 +--- a/bfd/configure.ac ++++ b/bfd/configure.ac +@@ -278,31 +278,19 @@ AC_CACHE_CHECK(linker --as-needed support, bfd_cv_ld_as_needed, + + LT_LIB_M + +-# When building a shared libbfd, link against the pic version of libiberty +-# so that apps that use libbfd won't need libiberty just to satisfy any +-# libbfd references. +-# We can't do that if a pic libiberty is unavailable since including non-pic +-# code would insert text relocations into libbfd. + SHARED_LIBADD= +-SHARED_LDFLAGS= ++SHARED_LDFLAGS=-liberty + if test "$enable_shared" = "yes"; then +-changequote(,)dnl +- x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'` +-changequote([,])dnl +- if test -n "$x"; then +- SHARED_LIBADD="-L`pwd`/../libiberty/pic -liberty" +- fi +- + case "${host}" in + # More hacks to build DLLs on Windows. + *-*-cygwin*) + SHARED_LDFLAGS="-no-undefined" +- SHARED_LIBADD="-L`pwd`/../libiberty -liberty -L`pwd`/../intl -lintl -lcygwin -lkernel32" ++ SHARED_LIBADD="-liberty -lintl -lcygwin -lkernel32" + ;; + + # Use built-in libintl on macOS, since it is not provided by libc. + *-*-darwin*) +- SHARED_LIBADD="-L`pwd`/../libiberty/pic -L`pwd`/../intl -liberty -lintl" ++ SHARED_LIBADD="-liberty -lintl" + ;; + esac + +diff --git a/opcodes/Makefile.am b/opcodes/Makefile.am +index 4f06074a..6836c589 100644 +--- a/opcodes/Makefile.am ++++ b/opcodes/Makefile.am +@@ -51,7 +51,7 @@ libopcodes_la_LDFLAGS += -rpath $(rpath_bfdlibdir) + endif + + # This is where bfd.h lives. +-BFD_H = ../bfd/bfd.h ++BFD_H = $(BFDDIR)/bfd.h + + BUILD_LIBS = @BUILD_LIBS@ + BUILD_LIB_DEPS = @BUILD_LIB_DEPS@ +@@ -301,7 +301,7 @@ OFILES = @BFD_MACHINES@ + # development.sh is used to determine -Werror default. + CONFIG_STATUS_DEPENDENCIES = $(BFDDIR)/development.sh + +-AM_CPPFLAGS = -I. -I$(srcdir) -I../bfd -I$(INCDIR) -I$(BFDDIR) @HDEFINES@ @INCINTL@ ++AM_CPPFLAGS = -I. -I$(srcdir) -I$(INCDIR) -I$(BFDDIR) @HDEFINES@ @INCINTL@ + + disassemble.lo: disassemble.c + if am__fastdepCC +@@ -322,12 +322,21 @@ libopcodes_la_SOURCES = dis-buf.c disassemble.c dis-init.c + # old version of libbfd, or to pick up libbfd for the wrong architecture + # if host != build. So for building with shared libraries we use a + # hardcoded path to libbfd.so instead of relying on the entries in libbfd.la. +-libopcodes_la_DEPENDENCIES = $(OFILES) @SHARED_DEPENDENCIES@ ++libopcodes_la_DEPENDENCIES = $(OFILES) @SHARED_DEPENDENCIES@ libtool-soversion + libopcodes_la_LIBADD = $(OFILES) @SHARED_LIBADD@ +-libopcodes_la_LDFLAGS += -release `cat ../bfd/libtool-soversion` @SHARED_LDFLAGS@ ++libopcodes_la_LDFLAGS += -release `cat libtool-soversion` @SHARED_LDFLAGS@ + # Allow dependency tracking to work on all the source files. + EXTRA_libopcodes_la_SOURCES = $(LIBOPCODES_CFILES) + ++libtool-soversion: ++ @echo "creating $@" ++ bfd_soversion="$(VERSION)" ;\ ++ . $(BFDDIR)/development.sh ;\ ++ if test "$$development" = true ; then \ ++ bfd_soversion="$(VERSION).$${bfd_version_date}" ;\ ++ fi ;\ ++ echo "$${bfd_soversion}" > $@ ++ + # libtool will build .libs/libopcodes.a. We create libopcodes.a in + # the build directory so that we don't have to convert all the + # programs that use libopcodes.a simultaneously. This is a hack which +diff --git a/opcodes/configure.ac b/opcodes/configure.ac +index 00be9c88..6e589ae4 100644 +--- a/opcodes/configure.ac ++++ b/opcodes/configure.ac +@@ -86,6 +86,7 @@ AC_PROG_INSTALL + + AC_CHECK_HEADERS(string.h strings.h stdlib.h limits.h) + ACX_HEADER_STRING ++GCC_HEADER_STDINT(bfd_stdint.h) + + AC_CHECK_DECLS([basename, stpcpy]) + +@@ -137,61 +138,27 @@ AC_CACHE_CHECK(linker --as-needed support, bfd_cv_ld_as_needed, + + LT_LIB_M + +-#Libs for generator progs +-if test "x$cross_compiling" = "xno"; then +- BUILD_LIBS=../libiberty/libiberty.a +- BUILD_LIB_DEPS=$BUILD_LIBS +-else +- # if cross-compiling, assume that the system provides -liberty +- # and that the version is compatible with new headers. +- BUILD_LIBS=-liberty +- BUILD_LIB_DEPS= +-fi +-BUILD_LIBS="$BUILD_LIBS $LIBINTL" +-BUILD_LIB_DEPS="$BUILD_LIB_DEPS $LIBINTL_DEP" ++BUILD_LIBS="-liberty $LIBINTL" ++BUILD_LIB_DEPS="$LIBINTL_DEP" + + AC_SUBST(BUILD_LIBS) + AC_SUBST(BUILD_LIB_DEPS) + + # Horrible hacks to build DLLs on Windows and a shared library elsewhere. + SHARED_LDFLAGS= +-SHARED_LIBADD= ++SHARED_LIBADD=-liberty + SHARED_DEPENDENCIES= + if test "$enable_shared" = "yes"; then +-# When building a shared libopcodes, link against the pic version of libiberty +-# so that apps that use libopcodes won't need libiberty just to satisfy any +-# libopcodes references. +-# We can't do that if a pic libiberty is unavailable since including non-pic +-# code would insert text relocations into libopcodes. + # Note that linking against libbfd as we do here, which is itself linked + # against libiberty, may not satisfy all the libopcodes libiberty references + # since libbfd may not pull in the entirety of libiberty. +-changequote(,)dnl +- x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'` +-changequote([,])dnl +- if test -n "$x"; then +- SHARED_LIBADD="-L`pwd`/../libiberty/pic -liberty" +- fi +- + case "${host}" in + *-*-cygwin*) + SHARED_LDFLAGS="-no-undefined" +- SHARED_LIBADD="-L`pwd`/../bfd -lbfd -L`pwd`/../libiberty -liberty -L`pwd`/../intl -lintl -lcygwin" ++ SHARED_LIBADD="-lbfd -liberty -lintl -lcygwin" + ;; +- *-*-darwin*) +- SHARED_LIBADD="-Wl,`pwd`/../bfd/.libs/libbfd.dylib ${SHARED_LIBADD}" +- SHARED_DEPENDENCIES="../bfd/libbfd.la" +- ;; + *) +- case "$host_vendor" in +- hp) +- SHARED_LIBADD="-Wl,`pwd`/../bfd/.libs/libbfd.sl ${SHARED_LIBADD}" +- ;; +- *) +- SHARED_LIBADD="-Wl,`pwd`/../bfd/.libs/libbfd.so ${SHARED_LIBADD}" +- ;; +- esac +- SHARED_DEPENDENCIES="../bfd/libbfd.la" ++ SHARED_LIBADD="-lbfd ${SHARED_LIBADD}" + ;; + esac + diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/binutils/patches/2.34/deterministic.patch b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/binutils/patches/2.34/deterministic.patch new file mode 100644 index 000000000000..736e0aca6ce1 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/binutils/patches/2.34/deterministic.patch @@ -0,0 +1,12 @@ +diff -ur orig/binutils-2.23.1/ld/ldlang.c binutils-2.23.1/ld/ldlang.c +--- orig/ld/ldlang.c ++++ new/ld/ldlang.c +@@ -3095,6 +3095,8 @@ + ldfile_output_machine)) + einfo (_("%P%F:%s: can not set architecture: %E\n"), name); + ++ link_info.output_bfd->flags |= BFD_DETERMINISTIC_OUTPUT; ++ + link_info.hash = bfd_link_hash_table_create (link_info.output_bfd); + if (link_info.hash == NULL) + einfo (_("%P%F: can not create hash table: %E\n")); diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/binutils/patches/2.34/disambiguate-arm-targets.patch b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/binutils/patches/2.34/disambiguate-arm-targets.patch new file mode 100644 index 000000000000..abbfa73da05d --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/binutils/patches/2.34/disambiguate-arm-targets.patch @@ -0,0 +1,23 @@ +diff --git a/bfd/elf32-arm.c b/bfd/elf32-arm.c +index 9f956d3..f5b61f1 100644 +--- a/bfd/elf32-arm.c ++++ b/bfd/elf32-arm.c +@@ -19585,7 +19585,10 @@ elf32_arm_vxworks_final_write_processing (bfd *abfd, bfd_boolean linker) + #undef ELF_MAXPAGESIZE + #define ELF_MAXPAGESIZE 0x1000 + ++/* Prioritize elf32-*arm (priority 1) over elf32-*arm-vxworks (priority 2) */ ++#define elf_match_priority 2 + #include "elf32-target.h" ++#undef elf_match_priority + + + /* Merge backend specific data from an object file to the output +@@ -19974,4 +19977,7 @@ elf32_arm_symbian_plt_sym_val (bfd_vma i, const asection *plt, + #undef ELF_MAXPAGESIZE + #define ELF_MAXPAGESIZE 0x8000 + ++/* Prioritize elf32-*arm (priority 1) over elf32-*arm-symbian (priority 2) */ ++#define elf_match_priority 2 + #include "elf32-target.h" ++#undef elf_match_priority diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/binutils/patches/2.34/no-plugins.patch b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/binutils/patches/2.34/no-plugins.patch new file mode 100644 index 000000000000..68cf51b7dd3c --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/binutils/patches/2.34/no-plugins.patch @@ -0,0 +1,21 @@ +diff --git a/bfd/plugin.c b/bfd/plugin.c +index 537ab60311..bfe7957f96 100644 +--- a/bfd/plugin.c ++++ b/bfd/plugin.c +@@ -386,6 +386,7 @@ load_plugin (bfd *abfd) + if (plugin_program_name == NULL) + return found; + ++#if 0 + /* Try not to search the same dir twice, by looking at st_dev and + st_ino for the dir. If we are on a file system that always sets + st_ino to zero or the actual st_ino is zero we might waste some +@@ -437,7 +438,7 @@ load_plugin (bfd *abfd) + if (found) + break; + } +- ++#endif + return found; + } + diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/blackfire/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/blackfire/default.nix index 08496d9f5202..27e043a9ac49 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/blackfire/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/blackfire/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "blackfire-agent"; - version = "1.44.1"; + version = "1.44.2"; src = fetchurl { url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire-php/blackfire-agent_${version}_amd64.deb"; - sha256 = "1p00flipm5x6r36gblfrfrd14byipilybrhfzv8rzpahz2b7r5hb"; + sha256 = "1bam4sb0yhxciykph7wn41zs8fa7c9iwnbihd5kza0cylbb7fbkb"; }; nativeBuildInputs = [ diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/blackfire/php-probe.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/blackfire/php-probe.nix index 5de2a05349a6..97b5f9ed82c5 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/blackfire/php-probe.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/blackfire/php-probe.nix @@ -14,14 +14,15 @@ let soFile = { "7.3" = "blackfire-20180731"; "7.4" = "blackfire-20190902"; + "8.0" = "blackfire-20200930"; }.${lib.versions.majorMinor php.version} or (throw "Unsupported PHP version."); in stdenv.mkDerivation rec { pname = "php-blackfire"; - version = "1.41.0"; + version = "1.46.4"; src = fetchurl { url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire-php/blackfire-php_${version}_amd64.deb"; - sha256 = "0vbl48bccswk9ygb4sshn24cl33fk0xg8d1bcg7ihvdc45any9ww"; + sha256 = "1p46zi1hh9calkcfgqz60c6rdi9i7i16ylj84iibi6k0pc690fjy"; }; nativeBuildInputs = [ diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/ccache/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/ccache/default.nix index e0a6a8065b5a..f9254b2cf15e 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/ccache/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/ccache/default.nix @@ -1,23 +1,46 @@ -{ stdenv, fetchFromGitHub, asciidoc-full, gperf, perl, autoreconfHook, zlib, makeWrapper }: +{ lib +, stdenv +, fetchFromGitHub +, substituteAll +, binutils +, asciidoc +, cmake +, perl +, zstd +, xcodebuild +, makeWrapper +}: let ccache = stdenv.mkDerivation rec { pname = "ccache"; - version = "3.7.11"; + version = "4.1"; src = fetchFromGitHub { - owner = "ccache"; - repo = "ccache"; + owner = pname; + repo = pname; rev = "v${version}"; - sha256 = "03c6riz4vb0jipplk69c1j8arjjrjn676kglsrzqf8cidrh8j91c"; + sha256 = "1az11q3wmr8wc7alx9l70wq9am41cm0y17g5gsaqmahws3dxfi8m"; }; - nativeBuildInputs = [ asciidoc-full autoreconfHook gperf perl ]; + patches = lib.optional stdenv.isDarwin (substituteAll { + src = ./force-objdump-on-darwin.patch; + objdump = "${binutils.bintools}/bin/objdump"; + }); - buildInputs = [ zlib ]; + nativeBuildInputs = [ asciidoc cmake perl ]; + + buildInputs = [ zstd ]; outputs = [ "out" "man" ]; - doCheck = !stdenv.isDarwin; + doCheck = true; + checkInputs = lib.optional stdenv.isDarwin xcodebuild; + checkPhase = '' + export HOME=$(mktemp -d) + ctest --output-on-failure ${lib.optionalString stdenv.isDarwin '' + -E '^(test.nocpp2|test.modules)$' + ''} + ''; passthru = { # A derivation that provides gcc and g++ commands, but that @@ -63,9 +86,10 @@ let ccache = stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Compiler cache for fast recompilation of C/C++ code"; - homepage = "https://ccache.dev/"; + homepage = "https://ccache.dev"; downloadPage = "https://ccache.dev/download.html"; license = licenses.gpl3Plus; + maintainers = with maintainers; [ metadark r-burns ]; platforms = platforms.unix; }; }; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/ccache/force-objdump-on-darwin.patch b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/ccache/force-objdump-on-darwin.patch new file mode 100644 index 000000000000..81a4f27ab736 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/ccache/force-objdump-on-darwin.patch @@ -0,0 +1,31 @@ +diff --git a/test/run b/test/run +index 9623e49d..3df1c5a8 100755 +--- a/test/run ++++ b/test/run +@@ -126,23 +126,17 @@ file_size() { + objdump_cmd() { + local file="$1" + +- if $HOST_OS_APPLE; then +- xcrun dwarfdump -r 0 "$file" +- elif $HOST_OS_WINDOWS || $HOST_OS_CYGWIN; then ++ if $HOST_OS_WINDOWS || $HOST_OS_CYGWIN; then + # For some reason objdump only shows the basename of the file, so fall + # back to brute force and ignorance. + strings "$1" + else +- objdump -W "$file" ++ @objdump@ -W "$file" + fi + } + + objdump_grep_cmd() { +- if $HOST_OS_APPLE; then +- fgrep -q "\"$1\"" +- else +- fgrep -q ": $1" +- fi ++ fgrep -q ": $1" + } + + expect_stat() { diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/ccls/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/ccls/default.nix index ba57ef561f3e..16365a462a94 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/ccls/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/ccls/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "ccls"; - version = "0.20190823.6"; + version = "0.20201025"; src = fetchFromGitHub { owner = "MaskRay"; repo = "ccls"; rev = version; - sha256 = "11h5nwk4qqshf3i8yr4bxpnvmidrhkzd0zxhf1xqv8cv6r08k47f"; + sha256 = "13v00q1bz8g0ckw1sv0zyicbc44irc00vhwxdv3vvwlvylm7s21p"; }; nativeBuildInputs = [ cmake ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/circleci-cli/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/circleci-cli/default.nix index b434358e1d20..ac8a4c8bb7c9 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/circleci-cli/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/circleci-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "circleci-cli"; - version = "0.1.9454"; + version = "0.1.11508"; src = fetchFromGitHub { owner = "CircleCI-Public"; repo = pname; rev = "v${version}"; - sha256 = "0ld7lb69wmhyrpqjaj1pddx93x529qk2fzyrwlipglwn3mbala5a"; + sha256 = "1m0jy7h9mksgj85r4jcpb5nabcs9vrfbrky31acwbibzjxxw9afg"; }; - vendorSha256 = "1zd95n9k2fags0qh3wvjinxv1ahygr958mmiax2kz117yipaz4rb"; + vendorSha256 = "15l9f87vgspdsxhwqdm56z3dvrspc8k1bbyvhhhnvqf3fkiki2bw"; doCheck = false; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/cli11/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/cli11/default.nix index 0d058ef1f881..25ec42eac8e0 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/cli11/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/cli11/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - description = "CLI11 is a command line parser for C++11"; + description = "Command line parser for C++11"; homepage = "https://github.com/CLIUtils/CLI11"; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ nand0p ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/clojure-lsp/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/clojure-lsp/default.nix index 65f12bfbb098..1641df1562a8 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/clojure-lsp/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/clojure-lsp/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "clojure-lsp"; - version = "20200828T065654"; + version = "20201009T224414"; src = fetchurl { url = "https://github.com/snoe/clojure-lsp/releases/download/release-${version}/${pname}"; - sha256 = "1399xjcnnb7vazy1jv3h7lnh1dyn81yk2bwi6ai991a9fsinjnf2"; + sha256 = "1az87b4cq6yyibs4knd0ywd0qfgmfzai4bqry4b7h2ycnfhfxdpa"; }; dontUnpack = true; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/cproto/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/cproto/default.nix index ef0e2cab7771..e18196fe595f 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/cproto/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/cproto/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "cproto"; - version = "4.7p"; + version = "4.7q"; src = fetchurl { urls = [ @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { # No version listings and apparently no versioned tarball over http(s). "ftp://ftp.invisible-island.net/cproto/cproto-${version}.tgz" ]; - sha256 = "0vm1784yw8gax1r7bzgq0chjgfzwxvmkala2awghmd3zyi7k60nj"; + sha256 = "138n5j6lkanbbdcs63irzxny4nfgp0zk66z621xjbnybf920svpk"; }; # patch made by Joe Khoobyar copied from gentoo bugs diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/creduce/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/creduce/default.nix index 943adf0e469b..fc6f7156a81b 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/creduce/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/creduce/default.nix @@ -3,7 +3,7 @@ , flex , zlib , perlPackages -, utillinux +, util-linux }: stdenv.mkDerivation rec { @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { # so let's make sure it knows where to find it: postPatch = stdenv.lib.optionalString stdenv.isLinux '' substituteInPlace creduce/creduce_utils.pm --replace \ - lscpu ${utillinux}/bin/lscpu + lscpu ${util-linux}/bin/lscpu ''; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/dfu-util/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/dfu-util/default.nix index ecd40f20fd4c..9af9ddc0df7c 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/dfu-util/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/dfu-util/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "dfu-util"; - version = "0.9"; + version = "0.10"; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libusb1 ]; src = fetchurl { url = "http://dfu-util.sourceforge.net/releases/${pname}-${version}.tar.gz"; - sha256 = "0czq73m92ngf30asdzrfkzraag95hlrr74imbanqq25kdim8qhin"; + sha256 = "0hlvc47ccf5hry13saqhc1j5cdq5jyjv4i05kj0mdh3rzj6wagd0"; }; meta = with stdenv.lib; { diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/editorconfig-checker/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/editorconfig-checker/default.nix index 3975ad3511fb..401bbdbee6ef 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/editorconfig-checker/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/editorconfig-checker/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "editorconfig-checker"; - version = "2.1.0"; + version = "2.2.0"; src = fetchFromGitHub { owner = "editorconfig-checker"; repo = "editorconfig-checker"; - rev = "${version}"; - sha256 = "09v8gqwcaay3bqbidparmg20dy0mvlrzh34591hanbrx3cwhrz3f"; + rev = version; + sha256 = "18gz94h2x1z6g6r7v9cdixkbcaigd7cl08af6smlkaa89j0aki32"; }; - vendorSha256 = "132blcdw3lywxhqslkcpwwvkzl4cpbbkhb7ba8mrvfgl5kvfm1q0"; + vendorSha256 = "1z4j8vm9mnhjhhmhlj0ycs8b1wpm7lhsfqjnk7w8gfapvj3yfk6h"; doCheck = false; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/fujprog/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/fujprog/default.nix index e15e48b0f2a9..e5cd2e0e2ddf 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/fujprog/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/fujprog/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "kost"; - repo = "${pname}"; + repo = pname; rev = "v${version}"; sha256 = "08kzkzd5a1wfd1aycywdynxh3qy6n7z9i8lihkahmb4xac3chmz5"; }; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/gdb/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/gdb/default.nix index a4806634432d..d9bac6e3c83c 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/gdb/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/gdb/default.nix @@ -26,11 +26,11 @@ assert pythonSupport -> python3 != null; stdenv.mkDerivation rec { pname = targetPrefix + basename; - version = "9.2"; + version = "10.1"; src = fetchurl { url = "mirror://gnu/gdb/${basename}-${version}.tar.xz"; - sha256 = "0mf5fn8v937qwnal4ykn3ji1y2sxk0fa1yfqi679hxmpg6pdf31n"; + sha256 = "1h32dckz1y8fnyxh22iyw8h3hnhxr79v1ng85px3ljn1xv71wbzq"; }; postPatch = if stdenv.isDarwin then '' diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/gengetopt/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/gengetopt/default.nix index 114a7530f271..0a3b0b1c7508 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/gengetopt/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/gengetopt/default.nix @@ -10,6 +10,10 @@ stdenv.mkDerivation rec { }; doCheck = true; + # attempts to open non-existent file + preCheck = '' + rm tests/test_conf_parser_save.sh + ''; enableParallelBuilding = true; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/hydra-cli/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/hydra-cli/default.nix index 6cd439a898b8..10ecd8174af4 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/hydra-cli/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/hydra-cli/default.nix @@ -2,16 +2,15 @@ rustPlatform.buildRustPackage rec { pname = "hydra-cli"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "nlewo"; repo = pname; rev = "v${version}"; - sha256 = "1jdlmc45hwblcxs6hvy3gi2dr7qyzs1sg5zr26jrpxrbvqqzrdhc"; + sha256 = "1fd3swdjx249971ak1bgndm5kh6rlzbfywmydn122lhfi6ry6a03"; }; - - cargoSha256 = "1sj80a99iakxxa698gggiszsrxwlwhr2sx4wmsni0cshx6z2x6za"; + cargoSha256 = "1fjzcgayyha270bdxl5p6c337nq8zj4h81rk4ih9czyz3yaxga3f"; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/hydra/common.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/hydra/common.nix index 4e9daab9bf1c..4af9fe045874 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/hydra/common.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/hydra/common.nix @@ -66,6 +66,7 @@ let TextDiff TextTable XMLSimple + YAML nix nix.perl-bindings git diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/hydra/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/hydra/default.nix index a6b0383d54f7..7aa1e05a88e4 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/hydra/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/hydra/default.nix @@ -1,40 +1,17 @@ { fetchFromGitHub, nixStable, callPackage, nixFlakes, nixosTests }: { - # Package for phase-1 of the db migration for Hydra. - # https://github.com/NixOS/hydra/pull/711 - hydra-migration = callPackage ./common.nix { - version = "2020-02-10"; - src = fetchFromGitHub { - owner = "NixOS"; - repo = "hydra"; - rev = "add4f610ce6f206fb44702b5a894d877b3a30e3a"; - sha256 = "1d8hdgjx2ys0zmixi2ydmimdq7ml20h1ji4amwawcyw59kssh6l3"; - }; - nix = nixStable; - migration = true; - - tests = { - db-migration = nixosTests.hydra-db-migration.mig; - basic = nixosTests.hydra.hydra-migration; - }; - }; - - # Hydra from latest master branch. Contains breaking changes, - # so when having an older version, `pkgs.hydra-migration` should be deployed first. - hydra-unstable = callPackage ./common.nix { - version = "2020-09-02"; + version = "2020-10-20"; src = fetchFromGitHub { owner = "NixOS"; repo = "hydra"; - rev = "e707990e2d6afab203c7ef1d769d49c564eff151"; - sha256 = "0iilf953f6s58szzyd1hzc9b2b2yw8lhbsb8xrb08szpfz7ifwqa"; + rev = "79d34ed7c93af2daf32cf44ee0e3e0768f13f97c"; + sha256 = "1lql899430137l6ghnhyz0ivkayy83fdr087ck2wq3gf1jv8pccj"; }; nix = nixFlakes; tests = { - db-migration = nixosTests.hydra-db-migration.mig; basic = nixosTests.hydra.hydra-unstable; }; }; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/iozone/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/iozone/default.nix index e6beeca1d727..93e2673be63a 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/iozone/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/iozone/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gnuplot }: +{ stdenv, lib, fetchurl, gnuplot }: let target = if stdenv.hostPlatform.system == "i686-linux" then @@ -13,11 +13,12 @@ let in stdenv.mkDerivation rec { - name = "iozone-3.471"; + pname = "iozone"; + version = "3.490"; src = fetchurl { - url = "http://www.iozone.org/src/current/iozone3_471.tar"; - sha256 = "0w63b3d4ws1sm52lpdd08sl7n4ay438dl3wy0q9la12iq81rglid"; + url = "http://www.iozone.org/src/current/iozone${lib.replaceStrings ["."] ["_"] version}.tar"; + sha256 = "1vagmm2k2bzlpahl2a2arpfmk3cd5nzhxi842a8mdag2b8iv9bay"; }; license = fetchurl { diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/itm-tools/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/itm-tools/default.nix index 6fb256951115..a121cc670993 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/itm-tools/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/itm-tools/default.nix @@ -25,4 +25,4 @@ rustPlatform.buildRustPackage rec { license = with licenses; [ asl20 mit ]; maintainers = with maintainers; [ hh sb0 ]; }; -}
\ No newline at end of file +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/lsof/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/lsof/default.nix index 274577c4a4c5..e5988b1d5a9a 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/lsof/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/lsof/default.nix @@ -4,7 +4,7 @@ let dialect = with stdenv.lib; last (splitString "-" stdenv.hostPlatform.system) stdenv.mkDerivation rec { pname = "lsof"; - version = "4.93.2"; + version = "4.94.0"; depsBuildBuild = [ buildPackages.stdenv.cc ]; buildInputs = [ ncurses ]; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { owner = "lsof-org"; repo = "lsof"; rev = version; - sha256 = "1gd6r0nv8xz76pmvk52dgmfl0xjvkxl0s51b4jk4a0lphw3393yv"; + sha256 = "0yxv2jg6rnzys49lyrz9yjb4knamah4xvlqj596y6ix3vm4k3chp"; }; patches = [ ./no-build-info.patch ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/macdylibbundler/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/macdylibbundler/default.nix index 103c534dfa3d..5008175363cb 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/macdylibbundler/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/macdylibbundler/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, makeWrapper, fetchFromGitHub, cctools }: stdenv.mkDerivation { pname = "macdylibbundler"; @@ -11,8 +11,15 @@ stdenv.mkDerivation { sha256 = "149p3dcnap4hs3nhq5rfvr3m70rrb5hbr5xkj1h0gsfp0d7gvxnj"; }; + buildInputs = [ makeWrapper ]; + makeFlags = [ "PREFIX=$(out)" ]; + postInstall = '' + wrapProgram $out/bin/dylibbundler \ + --prefix PATH ":" "${cctools}/bin" + ''; + meta = with stdenv.lib; { description = "Utility to ease bundling libraries into executables for OSX"; longDescription = '' diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/mdl/Gemfile.lock b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/mdl/Gemfile.lock index 04268d3306c2..0e5b7b016722 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/mdl/Gemfile.lock +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/mdl/Gemfile.lock @@ -1,15 +1,24 @@ GEM remote: https://rubygems.org/ specs: - kramdown (1.17.0) - mdl (0.5.0) - kramdown (~> 1.12, >= 1.12.0) - mixlib-cli (~> 1.7, >= 1.7.0) - mixlib-config (~> 2.2, >= 2.2.1) - mixlib-cli (1.7.0) - mixlib-config (2.2.18) + chef-utils (16.7.61) + kramdown (2.3.0) + rexml + kramdown-parser-gfm (1.1.0) + kramdown (~> 2.0) + mdl (0.11.0) + kramdown (~> 2.3) + kramdown-parser-gfm (~> 1.1) + mixlib-cli (~> 2.1, >= 2.1.1) + mixlib-config (>= 2.2.1, < 4) + mixlib-shellout + mixlib-cli (2.1.8) + mixlib-config (3.0.9) tomlrb - tomlrb (1.2.8) + mixlib-shellout (3.2.2) + chef-utils + rexml (3.2.4) + tomlrb (2.0.0) PLATFORMS ruby diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/mdl/gemset.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/mdl/gemset.nix index 6d48be1cbcb0..f2d332a95bb8 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/mdl/gemset.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/mdl/gemset.nix @@ -1,34 +1,56 @@ { + chef-utils = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "14xd2md3cda42afl28hr5q4ng195zmqfn04w2bxr4s2fb0gglbrz"; + type = "gem"; + }; + version = "16.7.61"; + }; kramdown = { + dependencies = ["rexml"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1vmw752c26ny2jwl0npn0gbyqwgz4hdmlpxnsld9qi9xhk5b1qh7"; + type = "gem"; + }; + version = "2.3.0"; + }; + kramdown-parser-gfm = { + dependencies = ["kramdown"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1n1c4jmrh5ig8iv1rw81s4mw4xsp4v97hvf8zkigv4hn5h542qjq"; + sha256 = "0a8pb3v951f4x7h968rqfsa19c8arz21zw1vaj42jza22rap8fgv"; type = "gem"; }; - version = "1.17.0"; + version = "1.1.0"; }; mdl = { - dependencies = ["kramdown" "mixlib-cli" "mixlib-config"]; + dependencies = ["kramdown" "kramdown-parser-gfm" "mixlib-cli" "mixlib-config" "mixlib-shellout"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "047hp8z1ma630wp38bm1giklkf385rp6wly8aidn825q831w2g4i"; + sha256 = "0vgzq6v2scd8n4cmx8rrypqmchnhg4wccrhiakg2i8fzv7wxplqq"; type = "gem"; }; - version = "0.5.0"; + version = "0.11.0"; }; mixlib-cli = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0647msh7kp7lzyf6m72g6snpirvhimjm22qb8xgv9pdhbcrmcccp"; + sha256 = "1ydxlfgd7nnj3rp1y70k4yk96xz5cywldjii2zbnw3sq9pippwp6"; type = "gem"; }; - version = "1.7.0"; + version = "2.1.8"; }; mixlib-config = { dependencies = ["tomlrb"]; @@ -36,19 +58,40 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1gm6yj9cbbgsl9x4xqxga0vz5w0ksq2jnq1wj8hvgm5c4wfcrswb"; + sha256 = "1askip583sfnz25gywd508l3vj5wnvx9vp7gm1sfnixm7amssrwq"; + type = "gem"; + }; + version = "3.0.9"; + }; + mixlib-shellout = { + dependencies = ["chef-utils"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0y1z0phkdhpbsn8vz7a86nhkr7ra619j86z5p75amz61kfpw42z9"; + type = "gem"; + }; + version = "3.2.2"; + }; + rexml = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1mkvkcw9fhpaizrhca0pdgjcrbns48rlz4g6lavl5gjjq3rk2sq3"; type = "gem"; }; - version = "2.2.18"; + version = "3.2.4"; }; tomlrb = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0g28ssfal6vry3cmhy509ba3vi5d5aggz1gnffnvvmc8ml8vkpiv"; + sha256 = "0ssyvjcvaisv70f21arlmnw5a1ryzmxzz4538vdwfslz9xxl27sr"; type = "gem"; }; - version = "1.2.8"; + version = "2.0.0"; }; }
\ No newline at end of file diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/mkcert/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/mkcert/default.nix index ec4042a2a276..0f110ae0b082 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/mkcert/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/mkcert/default.nix @@ -2,21 +2,21 @@ buildGoModule rec { pname = "mkcert"; - version = "1.4.1"; + version = "1.4.3"; src = fetchFromGitHub { owner = "FiloSottile"; repo = pname; rev = "v${version}"; - sha256 = "0w1ji96hbd3anzsz82xjcafsqhgyz7c7n41rsq60yrllwbj5946f"; + sha256 = "0q0069ripnpb027krc4yk47552xl5rp0ymxf1j2mln9wdmfq65ba"; }; - vendorSha256 = "0b8ggdpbyxx5n2myhchhlwmm5nndwpykp1ylnzdyw12mdskfvn9h"; + vendorSha256 = "133vlx825g4zay88ppylsz93q4gnd9ari12x1h57qvk45rwxqx95"; doCheck = false; buildFlagsArray = '' - -ldflags=-X main.Version=v${version} + -ldflags=-s -w -X main.Version=v${version} ''; meta = with lib; { diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/nix-build-uncached/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/nix-build-uncached/default.nix index eca2dc966624..7886c7c450ac 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/nix-build-uncached/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/nix-build-uncached/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "nix-build-uncached"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "Mic92"; repo = "nix-build-uncached"; rev = "v${version}"; - sha256 = "106k4234gpi8mr0n0rfsgwk4z7v0b2gim0r5bhjvg2v566j67g02"; + sha256 = "1v9xyv0hhvfw61k4pbgzrlgy7igl619cangi40fkh7gdvs01dxz4"; }; vendorSha256 = null; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/openocd/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/openocd/default.nix index 47212e9967d0..5c8e95f7fd4b 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/openocd/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/openocd/default.nix @@ -1,18 +1,27 @@ -{ stdenv, lib, fetchgit, libftdi1, libusb1, pkgconfig, hidapi, autoreconfHook }: +{ stdenv +, lib +, fetchgit +, autoreconfHook +, pkg-config +, hidapi +, libftdi1 +, libusb1 +}: stdenv.mkDerivation rec { pname = "openocd"; - version = "2020-09-02"; + version = "unstable-2020-11-11"; src = fetchgit { url = "https://git.code.sf.net/p/openocd/code"; - rev = "d46f28c2ea2611f5fbbc679a5eed253d3dcd2fe3"; - sha256 = "1256qqhn3pxmijfk1x0y5b5kc5ar88ivykkvx0h1m7pdwqfs6zm9"; + rev = "06c7a53f1fff20bcc4be9e63f83ae98664777f34"; + sha256 = "0g0w7g94r88ylfpwswnhh8czlf5iqvd991ssn4gfcfd725lpdb01"; fetchSubmodules = true; }; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; - buildInputs = [ libftdi1 libusb1 hidapi ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; + + buildInputs = [ hidapi libftdi1 libusb1 ]; configureFlags = [ "--enable-jtag_vpi" @@ -29,6 +38,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isGNU [ "-Wno-error=cpp" + "-Wno-error=strict-prototypes" # fixes build failure with hidapi 0.10.0 ]; postInstall = lib.optionalString stdenv.isLinux '' diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/reviewdog/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/reviewdog/default.nix index de8a113d1011..fccee0ede2b6 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/reviewdog/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/reviewdog/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "reviewdog"; - version = "0.10.2"; + version = "0.11.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "1xi5dfdy66qa6xvy60fk2lmp9gxyi0nfkyvybcazn8mrd99hfh6l"; + sha256 = "0n7hk3va25ym8sb900i1s1hjszgwrfl7gfsjbj1m330fidh3q6jc"; }; - vendorSha256 = "0cxi01jxg89lsk91dv782746i8g9ksanx8igmgafq9vq25lld7yg"; + vendorSha256 = "0xscirzi0gqww33ngwh29jiylarj0w5snn9kvv43wfrphb6c79s5"; doCheck = false; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/scc/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/scc/default.nix index 8a6a1471d0a4..5fc23547615a 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/scc/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/scc/default.nix @@ -19,7 +19,7 @@ buildGoModule rec { meta = with stdenv.lib; { homepage = "https://github.com/boyter/scc"; description = "A very fast accurate code counter with complexity calculations and COCOMO estimates written in pure Go"; - maintainers = with maintainers; [ sigma filalex77 ]; + maintainers = with maintainers; [ sigma Br1ght0ne ]; license = with licenses; [ unlicense /* or */ mit ]; platforms = platforms.unix; }; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/stlink/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/stlink/default.nix index 7793d9185e75..7595b84721cf 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/stlink/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/stlink/default.nix @@ -5,7 +5,7 @@ let libusb1' = if stdenv.isDarwin then libusb1.override { withStatic = true; } else libusb1; # IMPORTANT: You need permissions to access the stlink usb devices. -# Add services.udev.pkgs = [ pkgs.stlink ] to your configuration.nix +# Add services.udev.packages = [ pkgs.stlink ] to your configuration.nix in stdenv.mkDerivation rec { pname = "stlink"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/stm32cubemx/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/stm32cubemx/default.nix index 80549d8848f3..9fe34aecade2 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/stm32cubemx/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/stm32cubemx/default.nix @@ -1,7 +1,7 @@ { stdenv, requireFile, makeDesktopItem, libicns, imagemagick, jre, fetchzip }: let - version = "5.6.1"; + version = "6.0.1"; desktopItem = makeDesktopItem { name = "stm32CubeMX"; exec = "stm32cubemx"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { src = fetchzip { url = "https://sw-center.st.com/packs/resource/library/stm32cube_mx_v${builtins.replaceStrings ["."] [""] version}.zip"; - sha256 = "1y4a340wcjl88kjw1f1x85ffp4b5g1psryn9mgkd717w2bfpf29l"; + sha256 = "15vxca1pgpgxgiz4wisrw0lylffdwnn4n46z9n0q37f8hmzlrk8f"; stripRoot= false; }; @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { microcontrollers and microprocessors, as well as the generation of the corresponding initialization C code for the Arm® Cortex®-M core or a partial Linux® Device Tree for Arm® Cortex®-A core), through a - step-by-step process. + step-by-step process. ''; homepage = "https://www.st.com/en/development-tools/stm32cubemx.html"; license = licenses.unfree; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/swig/3.x.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/swig/3.x.nix index 75b0113b4977..853a240ffc35 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/swig/3.x.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/swig/3.x.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "SWIG, an interface compiler that connects C/C++ code to higher-level languages"; + description = "An interface compiler that connects C/C++ code to higher-level languages"; homepage = "http://swig.org/"; # Different types of licenses available: http://www.swig.org/Release/LICENSE . license = licenses.gpl3Plus; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/terraformer/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/terraformer/default.nix index 6ff0dd77aae2..47c9c15a0cc7 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/terraformer/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/terraformer/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "terraformer"; - version = "0.8.8"; + version = "0.8.10"; src = fetchFromGitHub { owner = "GoogleCloudPlatform"; repo = pname; rev = version; - sha256 = "1lzf30vpa0blbkz4ngnhrn3hpbqflqd4sni4bly9yqh4fnc44nvi"; + sha256 = "005i66d2gkyixqh9sk452la7z86d5x9q3njngjf4z9slcbpgk7bl"; }; - vendorSha256 = "087448wkaw6jxv9d26hck4w3vdh06vcgywna6ydkqvxr0hp011b6"; + vendorSha256 = "02i1q11nivdlkhf9chpi03p8jpa0fx9wbf79j834qv4fqy7jqf6l"; subPackages = [ "." ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/usb-modeswitch/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/usb-modeswitch/default.nix index 731ac836412a..18926a85528c 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/usb-modeswitch/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/usb-modeswitch/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, pkgconfig, makeWrapper -, libusb1, tcl, utillinux, coreutils, bash }: +, libusb1, tcl, util-linux, coreutils, bash }: stdenv.mkDerivation rec { pname = "usb-modeswitch"; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { postFixup = '' wrapProgram $out/bin/usb_modeswitch_dispatcher \ - --set PATH ${lib.makeBinPath [ utillinux coreutils bash ]} + --set PATH ${lib.makeBinPath [ util-linux coreutils bash ]} ''; buildInputs = [ libusb1 tcl ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/ycmd/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/ycmd/default.nix index 02298d93b8af..4bbff3ca33f8 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/ycmd/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/ycmd/default.nix @@ -18,9 +18,10 @@ stdenv.mkDerivation { sha256 = "1c5axdngxaxj5vc6lr8sxb99mr5adsm1dnjckaxc23kq78pc8cn7"; }; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake ] + ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; buildInputs = [ boost llvmPackages.libclang ] - ++ stdenv.lib.optional stdenv.isDarwin [ fixDarwinDylibNames Cocoa ]; + ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin Cocoa; buildPhase = '' export EXTRA_CMAKE_ARGS=-DPATH_TO_LLVM_ROOT=${llvmPackages.clang-unwrapped} diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/yodl/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/yodl/default.nix index 758bebb57df8..6bb7e1377af3 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/yodl/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/yodl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, perl, icmake, utillinux }: +{ stdenv, fetchFromGitLab, perl, icmake, util-linux }: stdenv.mkDerivation rec { pname = "yodl"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { patchShebangs scripts/ substituteInPlace INSTALL.im --replace /usr $out substituteInPlace macros/rawmacros/startdoc.pl --replace /usr/bin/perl ${perl}/bin/perl - substituteInPlace scripts/yodl2whatever.in --replace getopt ${utillinux}/bin/getopt + substituteInPlace scripts/yodl2whatever.in --replace getopt ${util-linux}/bin/getopt ''; # Set TERM because icmbuild calls tput. diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/mmixware/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/mmixware/default.nix new file mode 100644 index 000000000000..0b0d394b4e1e --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/mmixware/default.nix @@ -0,0 +1,44 @@ +{ stdenv, fetchFromGitLab, tetex }: + +stdenv.mkDerivation { + pname = "mmixware"; + version = "unstable-2019-02-19"; + + src = fetchFromGitLab { + domain = "gitlab.lrz.de"; + owner = "mmix"; + repo = "mmixware"; + rev = "a330d68aafcfe739ecaaece888a669b8e7d9bcb8"; + sha256 = "0bq0d19vqhfbpk4mcqzmd0hygbkhapl1mzlfkcr6afx0fhlhi087"; + }; + + hardeningDisable = [ "format" ]; + + postPatch = '' + substituteInPlace Makefile --replace 'rm abstime.h' "" + ''; + + nativeBuildInputs = [ tetex ]; + enableParallelBuilding = true; + + makeFlags = [ "all" "doc" "CFLAGS=-O2" ]; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/doc + cp *.ps $out/share/doc + install -Dm755 mmixal -t $out/bin + install -Dm755 mmix -t $out/bin + install -Dm755 mmotype -t $out/bin + install -Dm755 mmmix -t $out/bin + runHook postInstall + ''; + + meta = with stdenv.lib; { + description = "MMIX simulator and assembler"; + homepage = "https://www-cs-faculty.stanford.edu/~knuth/mmix-news.html"; + maintainers = with maintainers; [ siraben ]; + platforms = platforms.unix; + license = licenses.publicDomain; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/nsis/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/nsis/default.nix index 33be56c539dc..303ea6a00fe8 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/nsis/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/nsis/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { installTargets = [ "install-compiler" ]; meta = with stdenv.lib; { - description = "NSIS is a free scriptable win32 installer/uninstaller system that doesn't suck and isn't huge"; + description = "A free scriptable win32 installer/uninstaller system that doesn't suck and isn't huge"; homepage = "https://nsis.sourceforge.io/"; license = licenses.zlib; platforms = platforms.linux; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/ocaml/camlp5/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/ocaml/camlp5/default.nix index 7e7c185fbc7a..5fb76a526016 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/ocaml/camlp5/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/ocaml/camlp5/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation { - name = "camlp5-7.12"; + name = "camlp5-7.13"; src = fetchzip { - url = "https://github.com/camlp5/camlp5/archive/rel712.tar.gz"; - sha256 = "12ix5g15bys932hyf9gs637iz76m0ji9075d83jfdmx85q30llgf"; + url = "https://github.com/camlp5/camlp5/archive/rel713.tar.gz"; + sha256 = "1d9spy3f5ahixm8nxxk086kpslzva669a5scn49am0s7vx4i71kp"; }; buildInputs = [ ocaml ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/ocaml/obelisk/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/ocaml/obelisk/default.nix index e7528d4f7728..483e9c45df01 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/ocaml/obelisk/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/ocaml/obelisk/default.nix @@ -1,24 +1,20 @@ -{ stdenv, fetchFromGitHub, ocamlPackages }: +{ lib, fetchurl, ocamlPackages }: -stdenv.mkDerivation rec { +ocamlPackages.buildDunePackage rec { pname = "obelisk"; - version = "0.4.0"; - src = fetchFromGitHub { - owner = "lelio-brun"; - repo = "obelisk"; - rev = "v${version}"; - sha256 = "0rw85knbwqj2rys1hh5qy8sfdqb4mb1wsriy38n7zcpbwim47vb8"; + version = "0.5.2"; + useDune2 = true; + src = fetchurl { + url = "https://github.com/Lelio-Brun/Obelisk/releases/download/v${version}/obelisk-v${version}.tbz"; + sha256 = "0s86gkypyrkrp83xnay258ijri3yjwj3marsjnjf8mz58z0zd9g6"; }; - buildInputs = with ocamlPackages; [ ocaml findlib ocamlbuild menhir ]; - - installFlags = [ "BINDIR=$(out)/bin" ]; + buildInputs = with ocamlPackages; [ menhir re ]; meta = { description = "A simple tool which produces pretty-printed output from a Menhir parser file (.mly)"; - license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.vbgl ]; - inherit (src.meta) homepage; - inherit (ocamlPackages.ocaml.meta) platforms; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.vbgl ]; + homepage = "https://github.com/Lelio-Brun/Obelisk"; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/ocaml/ocamlformat/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/ocaml/ocamlformat/default.nix index 5b607d3d6c64..1de95187af2f 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/ocaml/ocamlformat/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/ocaml/ocamlformat/default.nix @@ -1,115 +1,43 @@ -{ lib, fetchurl, fetchzip, ocamlPackages }: +{ lib, fetchurl, fetchzip, callPackage }: -with ocamlPackages; - -let - mkOCamlformat = { - version, - sha256, - buildInputs, - useDune2 ? true, - tarballName ? "ocamlformat-${version}.tbz", - # The 'src' argument can be removed when 0.11.0 is pruned - src ? fetchurl { - url = "https://github.com/ocaml-ppx/ocamlformat/releases/download/${version}/${tarballName}"; - inherit sha256; - } - }: - buildDunePackage rec { - pname = "ocamlformat"; - - minimumOCamlVersion = "4.06"; - - inherit src version useDune2 buildInputs; - - meta = { - homepage = "https://github.com/ocaml-ppx/ocamlformat"; - description = "Auto-formatter for OCaml code"; - maintainers = [ lib.maintainers.Zimmi48 lib.maintainers.marsam ]; - license = lib.licenses.mit; - }; - }; - - post_0_11_buildInputs = [ - base - cmdliner - fpath - ocaml-migrate-parsetree - odoc - re - stdio - uuseg - uutf - ]; - - post_0_14_buildInputs = [ - base - cmdliner - fpath - ocaml-migrate-parsetree - odoc - re - stdio - uuseg - uutf - fix - menhir - ]; -in +let mkOCamlformat = callPackage ./generic.nix; in # Older versions should be removed when their usage decrease # This script scraps Github looking for OCamlformat's options and versions usage: # https://gist.github.com/Julow/110dc94308d6078225e0665e3eccd433 rec { - ocamlformat_0_11_0 = mkOCamlformat rec { + ocamlformat_0_11_0 = mkOCamlformat { version = "0.11.0"; - src = fetchzip { - url = "https://github.com/ocaml-ppx/ocamlformat/archive/0.11.0.tar.gz"; - inherit sha256; - }; - sha256 = "0zvjn71jd4d3znnpgh0yphb2w8ggs457b6bl6cg1fmpdgxnds6yx"; - useDune2 = false; - buildInputs = post_0_11_buildInputs; }; ocamlformat_0_12 = mkOCamlformat { version = "0.12"; - sha256 = "1zi8x597dhp2822j6j28s84yyiqppl7kykpwqqclx6ybypvlzdpj"; - useDune2 = false; - buildInputs = post_0_11_buildInputs; }; ocamlformat_0_13_0 = mkOCamlformat rec { version = "0.13.0"; - sha256 = "0ki2flqi3xkhw9mfridivb6laxm7gml8rj9qz42vqmy9yx76jjxq"; tarballName = "ocamlformat-${version}-2.tbz"; - useDune2 = false; - buildInputs = post_0_11_buildInputs; }; ocamlformat_0_14_0 = mkOCamlformat { version = "0.14.0"; - sha256 = "070c0x6z5y0lyls56zm34g8lyc093wkr0jfp50dvrkr9fk1sx2wi"; - buildInputs = post_0_14_buildInputs; }; ocamlformat_0_14_1 = mkOCamlformat { version = "0.14.1"; - sha256 = "03wn46xib63748157xchj7gflkw5000fcjw6n89h9g82q9slazaa"; - buildInputs = post_0_14_buildInputs; }; ocamlformat_0_14_2 = mkOCamlformat { version = "0.14.2"; - sha256 = "16phz1sg9b070p6fm8d42j0piizg05vghdjmw8aj7xm82b1pm7sz"; - buildInputs = post_0_14_buildInputs; + }; + + ocamlformat_0_14_3 = mkOCamlformat { + version = "0.14.3"; }; ocamlformat_0_15_0 = mkOCamlformat { version = "0.15.0"; - sha256 = "0190vz59n6ma9ca1m3syl3mc8i1smj1m3d8x1jp21f710y4llfr6"; - buildInputs = post_0_14_buildInputs; }; ocamlformat = ocamlformat_0_15_0; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/ocaml/ocamlformat/generic.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/ocaml/ocamlformat/generic.nix new file mode 100644 index 000000000000..c39ade7c0745 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/ocaml/ocamlformat/generic.nix @@ -0,0 +1,68 @@ +{ lib, fetchurl, fetchzip, ocamlPackages +, version +, tarballName ? "ocamlformat-${version}.tbz", +}: + +let src = + if version == "0.11.0" + then fetchzip { + url = "https://github.com/ocaml-ppx/ocamlformat/archive/0.11.0.tar.gz"; + sha256 = "0zvjn71jd4d3znnpgh0yphb2w8ggs457b6bl6cg1fmpdgxnds6yx"; + } else fetchurl { + url = "https://github.com/ocaml-ppx/ocamlformat/releases/download/${version}/${tarballName}"; + sha256 = { + "0.12" = "1zi8x597dhp2822j6j28s84yyiqppl7kykpwqqclx6ybypvlzdpj"; + "0.13.0" = "0ki2flqi3xkhw9mfridivb6laxm7gml8rj9qz42vqmy9yx76jjxq"; + "0.14.0" = "070c0x6z5y0lyls56zm34g8lyc093wkr0jfp50dvrkr9fk1sx2wi"; + "0.14.1" = "03wn46xib63748157xchj7gflkw5000fcjw6n89h9g82q9slazaa"; + "0.14.2" = "16phz1sg9b070p6fm8d42j0piizg05vghdjmw8aj7xm82b1pm7sz"; + "0.14.3" = "13pfakdncddm41cp61p0l98scawbvhx1q4zdsglv7ph87l7zwqfl"; + "0.15.0" = "0190vz59n6ma9ca1m3syl3mc8i1smj1m3d8x1jp21f710y4llfr6"; + }."${version}"; + } +; in + +with ocamlPackages; + +buildDunePackage rec { + pname = "ocamlformat"; + inherit src version; + + minimumOCamlVersion = "4.06"; + + useDune2 = lib.versionAtLeast version "0.14"; + + buildInputs = + if lib.versionAtLeast version "0.14" + then [ + base + cmdliner + fpath + ocaml-migrate-parsetree + odoc + re + stdio + uuseg + uutf + fix + menhir + ] else [ + base + cmdliner + fpath + ocaml-migrate-parsetree + odoc + re + stdio + uuseg + uutf + ]; + + meta = { + homepage = "https://github.com/ocaml-ppx/ocamlformat"; + description = "Auto-formatter for OCaml code"; + maintainers = [ lib.maintainers.Zimmi48 lib.maintainers.marsam ]; + license = lib.licenses.mit; + }; +} + diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/ocaml/ocamlify/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/ocaml/ocamlify/default.nix index 42faa33fbe1c..9b06a55f07d0 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/ocaml/ocamlify/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/ocaml/ocamlify/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { dontStrip = true; meta = { - homepage = "http://forge.ocamlcore.org/projects/ocamlmod/ocamlmod"; + homepage = "https://forge.ocamlcore.org/projects/ocamlmod/ocamlmod"; description = "Generate OCaml modules from source files"; platforms = ocaml.meta.platforms or []; license = stdenv.lib.licenses.lgpl21; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/ocaml/ocamlmod/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/ocaml/ocamlmod/default.nix index 46a87dc3ffed..49342d7b8485 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/ocaml/ocamlmod/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/ocaml/ocamlmod/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { dontStrip = true; meta = { - homepage = "http://forge.ocamlcore.org/projects/ocamlmod/ocamlmod"; + homepage = "https://forge.ocamlcore.org/projects/ocamlmod/ocamlmod"; description = "Generate OCaml modules from source files"; platforms = ocaml.meta.platforms or []; maintainers = with stdenv.lib.maintainers; [ diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/ocaml/ocp-build/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/ocaml/ocp-build/default.nix index 4ebea6766211..57db51612245 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/ocaml/ocp-build/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/ocaml/ocp-build/default.nix @@ -1,24 +1,19 @@ -{ stdenv, fetchpatch, fetchFromGitHub, ocaml, findlib, ncurses }: +{ stdenv, fetchFromGitHub, ocaml, findlib, ncurses, cmdliner, re }: let - version = "1.99.19-beta"; + version = "1.99.21"; in stdenv.mkDerivation { - name = "ocaml${ocaml.version}-ocp-build-${version}"; + name = "ocaml${ocaml.version}-ocp-build-${version}-beta"; src = fetchFromGitHub { owner = "OCamlPro"; repo = "ocp-build"; - rev = version; - sha256 = "162k5l0cxyqanxlml5v8mqapdq5qbqc9m4b8wdjq7mf523b3h2zj"; + rev = "v${version}"; + sha256 = "1641xzik98c7xnjwxpacijd6d9jzx340fmdn6i372z8h554jjlg9"; }; - patches = stdenv.lib.optional (stdenv.lib.versionAtLeast ocaml.version "4.08") (fetchpatch { - url = "https://raw.githubusercontent.com/ocaml/opam-repository/master/packages/ocp-pp/ocp-pp.1.99.19-beta/files/0001-Fix-ocp-pp-for-changes-in-compiler-libs.patch"; - sha256 = "0s0s2hh4d7cmwd6i7ixjgb79vij0r1v54m0vwwi26b3fips09qyn"; - }); - - buildInputs = [ ocaml findlib ]; + buildInputs = [ ocaml findlib cmdliner re ]; propagatedBuildInputs = [ ncurses ]; preInstall = "mkdir -p $out/bin"; preConfigure = '' diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/omniorb/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/omniorb/default.nix index 350407098a41..2ab8fa23dde0 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/omniorb/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/omniorb/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; meta = with stdenv.lib; { - description = "omniORB is a robust high performance CORBA ORB for C++ and Python. It is freely available under the terms of the GNU Lesser General Public License (for the libraries), and GNU General Public License (for the tools). omniORB is largely CORBA 2.6 compliant"; + description = "A robust high performance CORBA ORB for C++ and Python. It is freely available under the terms of the GNU Lesser General Public License (for the libraries), and GNU General Public License (for the tools). omniORB is largely CORBA 2.6 compliant"; homepage = "http://omniorb.sourceforge.net/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ smironov ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/omnisharp-roslyn/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/omnisharp-roslyn/default.nix index c435d80b08fc..9dd085b421fe 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/omnisharp-roslyn/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/omnisharp-roslyn/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "omnisharp-roslyn"; - version = "1.37.1"; + version = "1.37.4"; src = fetchurl { url = "https://github.com/OmniSharp/omnisharp-roslyn/releases/download/v${version}/omnisharp-mono.tar.gz"; - sha256 = "04pyychzwhhcv0js0qyramz6nd0wz03qqqgvz1j9m9wxyiz0dv3c"; + sha256 = "0pknphydf194n7rjyax4mh8n7j8679j0jflw63gfgh37daxry0r2"; }; nativeBuildInputs = [ makeWrapper ]; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin cd .. - cp -r src $out/ + cp -r src $out/ ls -al $out/src makeWrapper ${mono5}/bin/mono $out/bin/omnisharp \ --add-flags "$out/src/OmniSharp.exe" diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/open-policy-agent/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/open-policy-agent/default.nix index d6dbbcc493db..58e8163420ed 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/open-policy-agent/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/open-policy-agent/default.nix @@ -1,26 +1,33 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "open-policy-agent"; - version = "0.24.0"; + version = "0.25.0"; - goPackagePath = "github.com/open-policy-agent/opa"; src = fetchFromGitHub { owner = "open-policy-agent"; repo = "opa"; rev = "v${version}"; - sha256 = "0fv2rq8a01hapcpgfqp71v113iyyzs5w1sam14h9clyr1vqrbcf2"; + sha256 = "078ksgdl34yrr1w4l2p9r0zysxwzq7ml00mixhdr86rkmjii85zl"; }; + vendorSha256 = null; + subPackages = [ "." ]; - buildFlagsArray = '' - -ldflags= - -X ${goPackagePath}/version.Version=${version} - ''; + buildFlagsArray = [ + "-ldflags=" + "-X github.com/open-policy-agent/opa/version.Version=${version}" + ]; meta = with lib; { description = "General-purpose policy engine"; + longDescription = '' + The Open Policy Agent (OPA, pronounced "oh-pa") is an open source, general-purpose policy engine that unifies + policy enforcement across the stack. OPA provides a high-level declarative language that let’s you specify policy + as code and simple APIs to offload policy decision-making from your software. You can use OPA to enforce policies + in microservices, Kubernetes, CI/CD pipelines, API gateways, and more. + ''; homepage = "https://www.openpolicyagent.org"; license = licenses.asl20; maintainers = with maintainers; [ lewo ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/operator-sdk/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/operator-sdk/default.nix index c803207f88ac..f97611c77853 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/operator-sdk/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/operator-sdk/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "operator-sdk"; - version = "1.0.1"; + version = "1.2.0"; src = fetchFromGitHub { owner = "operator-framework"; repo = pname; rev = "v${version}"; - sha256 = "1p2ra7mqn7crip6sjgq2j49782ncvs4qahjwg6jk5rdvvi4hbyc7"; + sha256 = "03iy4a5jlsmmzn8cpyp35sc2kgz6shg18ah0qdzkadqqalqlldy8"; }; - vendorSha256 = "0zy540cbfm1kfc5sp802a9a5l2gkpgqprn8mlh9zg4d4shni61wa"; + vendorSha256 = "0dls086lw3sbal4rf0l3xb0sp6g393n9ylkpzppp75myj7v900vv"; doCheck = false; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/oq/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/oq/default.nix index 04526eb70b6e..3a3e8addf73c 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/oq/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/oq/default.nix @@ -40,7 +40,7 @@ crystal.buildCrystalPackage rec { description = "A performant, and portable jq wrapper"; homepage = "https://blacksmoke16.github.io/oq/"; license = licenses.mit; - maintainers = with maintainers; [ filalex77 ]; + maintainers = with maintainers; [ Br1ght0ne ]; platforms = platforms.unix; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/osslsigncode/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/osslsigncode/default.nix index 6924ec9e37a7..ef673ed018f2 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/osslsigncode/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/osslsigncode/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "osslsigncode"; - version = "unstable-2020-08-02"; + version = "2.1"; src = fetchFromGitHub { owner = "mtrojnar"; repo = pname; - rev = "01b3fb5b542ed0b41e3860aeee7a85b735491ff2"; - sha256 = "03ynm1ycbi86blglma3xiwadck8kc5yb0gawjzlhyv90jidn680l"; + rev = version; + sha256 = "0iwxdzqan2bswz62pmwjcyh01vs6ifpdcannw3s192gqzac1lgg3"; }; nativeBuildInputs = [ autoreconfHook libgsf pkgconfig openssl curl ]; @@ -24,7 +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 = with maintainers; [ mmahut ]; + maintainers = with maintainers; [ mmahut prusnak ]; platforms = platforms.all; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/overcommit/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/overcommit/default.nix index 5fa3dfa0f03a..6b90160245d8 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/overcommit/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/overcommit/default.nix @@ -9,7 +9,7 @@ bundlerApp { description = "Tool to manage and configure Git hooks"; homepage = "https://github.com/sds/overcommit"; license = licenses.mit; - maintainers = with maintainers; [ filalex77 ]; + maintainers = with maintainers; [ Br1ght0ne ]; platforms = platforms.unix; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/packer/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/packer/default.nix index d6df39e7a23a..b44f50a37ad8 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/packer/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/packer/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "packer"; - version = "1.6.4"; + version = "1.6.5"; goPackagePath = "github.com/hashicorp/packer"; @@ -11,7 +11,7 @@ buildGoPackage rec { owner = "hashicorp"; repo = "packer"; rev = "v${version}"; - sha256 = "0nkbm5iamkzi5x64107apnwmqxs4a75pxw935pwpm69ry4535r7w"; + sha256 = "sha256-M4PZnqdU5+w/B821cs1bJYzeilqdZ93fh5PErVgqBOQ="; }; meta = with stdenv.lib; { diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/packet-cli/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/packet-cli/default.nix index f7bcc8bf8f49..4c4cb6a28d42 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/packet-cli/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/packet-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "packet-cli"; - version = "0.0.8"; + version = "0.1.1"; src = fetchFromGitHub { owner = "packethost"; repo = pname; rev = version; - sha256 = "0ys6zyhyi65g0sj15pb6rslgbjgkh73y32gc0yvhfd6xmgzaxpxf"; + sha256 = "089fcn7yslijjivyvwl85j32gfwif8aazqdhm6hi676lz80ssppp"; }; - vendorSha256 = "1h9p3hrr61hwkhkh4qbw0ld3hd5xi75qm8rwfrpz5z06jba1ll25"; + vendorSha256 = "1p3v4pzw9hc1iviv1zghw9imbd23nlp24dpa8hf0w8a03jvpy96x"; postInstall = '' ln -s $out/bin/packet-cli $out/bin/packet @@ -23,6 +23,6 @@ buildGoModule rec { description = "Official Packet CLI"; homepage = "https://github.com/packethost/packet-cli"; license = licenses.mit; - maintainers = with maintainers; [ filalex77 ]; + maintainers = with maintainers; [ Br1ght0ne ]; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/packet-sd/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/packet-sd/default.nix new file mode 100644 index 000000000000..33d61eca718a --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/packet-sd/default.nix @@ -0,0 +1,24 @@ +{ buildGoModule, fetchFromGitHub, lib }: +buildGoModule rec { + pname = "prometheus-packet-sd"; + version = "0.0.3"; + + src = fetchFromGitHub { + owner = "packethost"; + repo = "prometheus-packet-sd"; + rev = "v${version}"; + sha256 = "sha256-2k8AsmyhQNNZCzpVt6JdgvI8IFb5pRi4ic6Yn2NqHMM="; + }; + + vendorSha256 = null; + + subPackages = [ "." ]; + + meta = with lib; { + description = "Prometheus service discovery for Equinix Metal"; + homepage = "https://github.com/packethost/prometheus-packet-sd"; + license = licenses.asl20; + platforms = platforms.linux; + maintainers = [ maintainers.andir ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/antlr/4.7.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/antlr/4.8.nix index 23267bf24313..1c88c82e16ae 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/antlr/4.7.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/antlr/4.8.nix @@ -2,12 +2,12 @@ , fetchFromGitHub, cmake, ninja, pkgconfig, libuuid, darwin }: let - version = "4.7.2"; + version = "4.8"; source = fetchFromGitHub { owner = "antlr"; repo = "antlr4"; rev = version; - sha256 = "1pl0zs6c6wx9nmq30s7ccpc3dl72az55i8vfp574fw9sywmvxmlj"; + sha256 = "1qal3add26qxskm85nk7r758arladn5rcyjinmhlhznmpbbv9j8m"; }; runtime = { @@ -41,7 +41,7 @@ let src = fetchurl { url ="https://www.antlr.org/download/antlr-${version}-complete.jar"; - sha256 = "1d40nfkq3ws8g4ksx4gj6l6m2l9j4b605q6sf68z5vvmg5nkhlk8"; + sha256 = "0nms976cnqyr1ndng3haxkmknpdq6xli4cpf4x4al0yr21l9v93k"; }; dontUnpack = true; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/bison/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/bison/default.nix index 70fd733e1ee5..aa8d8df2c1d1 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/bison/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/bison/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "bison"; - version = "3.7.2"; + version = "3.7.4"; src = fetchurl { url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz"; - sha256 = "111ax2imnydvrpcys5ami8ixn0a50m7a5pims7cbyysi8h8djp21"; + sha256 = "1qkp2rfi5njyp5c5avajab00aj74pkmkgzkvshv4p2ydkhswgazv"; }; nativeBuildInputs = [ m4 perl ] ++ stdenv.lib.optional stdenv.isSunOS help2man; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/bisonc++/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/bisonc++/default.nix new file mode 100644 index 000000000000..c6a4fc1a068d --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/bisonc++/default.nix @@ -0,0 +1,56 @@ +{stdenv, fetchurl, fetchFromGitLab +, yodl, icmake, flexcpp, bobcat +}: +stdenv.mkDerivation rec { + pname = "bisonc++"; + version = "6.04.00"; + + src = fetchFromGitLab { + domain = "gitlab.com"; + owner = "fbb-git"; + repo = "bisoncpp"; + rev = "6.04.00"; + sha256 = "sha256:0aa9bij4g08ilsk6cgrbgi03vyhqr9fn6j2164sjin93m63212wl"; + }; + + buildInputs = [ bobcat ]; + + nativeBuildInputs = [ yodl icmake flexcpp ]; + + setSourceRoot = '' + sourceRoot="$(echo */bisonc++)" + ''; + + gpl = fetchurl { + url = "https://www.gnu.org/licenses/old-licenses/gpl-2.0.txt"; + sha256 = "sha256:0hq6i0dm4420825fdm0lnnppbil6z67ls67n5kgjcd912dszjxw1"; + }; + + postPatch = '' + substituteInPlace INSTALL.im --replace /usr $out + patchShebangs . + for file in $(find documentation -type f); do + substituteInPlace "$file" --replace /usr/share/common-licenses/GPL ${gpl} + substituteInPlace "$file" --replace /usr $out + done + ''; + + buildPhase = '' + ./build program + ./build man + ./build manual + ''; + + installPhase = '' + ./build install x + ''; + + meta = with stdenv.lib; { + inherit version; + description = "A parser generator like bison, but it generates C++ code"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ raskin ]; + platforms = platforms.linux; + homepage = "https://fbb-git.gitlab.io/bisoncpp/"; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/byacc/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/byacc/default.nix index be526085b757..60e6796850c2 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/byacc/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/byacc/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "byacc"; - version = "20200330"; + version = "20200910"; src = fetchurl { urls = [ "ftp://ftp.invisible-island.net/byacc/${pname}-${version}.tgz" "https://invisible-mirror.net/archives/byacc/${pname}-${version}.tgz" ]; - sha256 = "1c0zyn6v286i09jlc8gx6jyaa5438qyy985rqsd76kb8ibfy56g0"; + sha256 = "0c6gbvlgzi6yflri22w7fa2w3k5m3jk0xb5a43f3vwpa783hcn8a"; }; configureFlags = [ diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/tree-sitter/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/tree-sitter/default.nix index 63082f60ac2c..e34350615636 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/tree-sitter/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/tree-sitter/default.nix @@ -3,6 +3,9 @@ , writeShellScript, runCommand, which , rustPlatform, jq, nix-prefetch-git, xe, curl, emscripten , callPackage +, enableShared ? true +, enableStatic ? false +, Security }: # TODO: move to carnix or https://github.com/kolloch/crate2nix @@ -11,9 +14,9 @@ let # 1) change all these hashes # 2) nix-build -A tree-sitter.updater.update-all-grammars # 3) run the ./result script that is output by that (it updates ./grammars) - version = "0.17.1"; - sha256 = "sha256-k61actAEyao/Ea8aw9PCm252U+1I0d43MAYC68/lui4="; - cargoSha256 = "sha256-Jp/Fl20ZZfaIdWinOOujNVH5JjJNtyUYHfyTrmeeoRg="; + version = "0.17.3"; + sha256 = "sha256-uQs80r9cPX8Q46irJYv2FfvuppwonSS5HVClFujaP+U="; + cargoSha256 = "sha256-fonlxLNh9KyEwCj7G5vxa7cM/DlcHNFbQpp0SwVQ3j4="; src = fetchFromGitHub { owner = "tree-sitter"; @@ -49,6 +52,8 @@ in rustPlatform.buildRustPackage { pname = "tree-sitter"; inherit src version cargoSha256; + buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + nativeBuildInputs = [ emscripten which ]; postPatch = '' @@ -68,6 +73,12 @@ in rustPlatform.buildRustPackage { bash ./script/build-wasm --debug ''; + postInstall = '' + PREFIX=$out make install + ${lib.optionalString (!enableShared) "rm $out/lib/*.so{,.*}"} + ${lib.optionalString (!enableStatic) "rm $out/lib/*.a"} + ''; + # test result: FAILED. 120 passed; 13 failed; 0 ignored; 0 measured; 0 filtered out doCheck = false; @@ -95,9 +106,8 @@ in rustPlatform.buildRustPackage { ''; license = lib.licenses.mit; maintainers = with lib.maintainers; [ Profpatsch ]; - # Darwin needs some more work with default libraries # Aarch has test failures with how tree-sitter compiles the generated C files - broken = stdenv.isDarwin || stdenv.isAarch64; + broken = stdenv.isAarch64; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix index 083dc61a96f8..e9cb0a1db6ed 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix @@ -5,6 +5,7 @@ embedded-template = (builtins.fromJSON (builtins.readFile ./tree-sitter-embedded-template.json)); go = (builtins.fromJSON (builtins.readFile ./tree-sitter-go.json)); html = (builtins.fromJSON (builtins.readFile ./tree-sitter-html.json)); + java = (builtins.fromJSON (builtins.readFile ./tree-sitter-java.json)); javascript = (builtins.fromJSON (builtins.readFile ./tree-sitter-javascript.json)); jsdoc = (builtins.fromJSON (builtins.readFile ./tree-sitter-jsdoc.json)); json = (builtins.fromJSON (builtins.readFile ./tree-sitter-json.json)); diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json b/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json index 99af884be9f7..16aef8ee33e9 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-cpp", - "rev": "5e7476bd014445abdae879661e9caf299215478a", - "date": "2020-05-14T11:46:56-07:00", - "path": "/nix/store/xz540ah1xx06n3wwmk3ym72nj0bz82hh-tree-sitter-cpp", - "sha256": "0v2l5269bhbpzcd929r3pn88gqcczx6spsq7p6ibsvsydbwj95wx", + "rev": "fb8250eef8b4cf1ce104806c50dc206e388b0e72", + "date": "2020-11-02T09:46:58-08:00", + "path": "/nix/store/qmza43f0fraa111bg50vaxsgnrs5kqs1-tree-sitter-cpp", + "sha256": "1sbk5a2p1fh6798naiswsap6fpj7n7bqhwd3xdyi35xf613qpwsi", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-go.json b/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-go.json index 67d58d64063a..612b8eb64d88 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-go.json +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-go.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-go", - "rev": "34181774b3e86b7801c939c79c7b80a82df91a2b", - "date": "2020-08-13T12:21:50-07:00", - "path": "/nix/store/3a5w7pz1m74y0lhbzq3bw3k2297lypqs-tree-sitter-go", - "sha256": "0cfi7ghs0m3iqwd4jvsqgsj4gnfikn1j2q0wbkdfvz2j25l0qwq0", + "rev": "dadfd9c9aab2630632e61cfce645c13c35aa092f", + "date": "2020-10-27T13:42:16-04:00", + "path": "/nix/store/91a8w265vjc955hyp7cqvpm8ks9zcmqv-tree-sitter-go", + "sha256": "1pwbzkg7s0l2fhr4p1rpcldjcpxbkaqsm3q81543almc75k38x8w", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-java.json b/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-java.json new file mode 100644 index 000000000000..260dc4d10c00 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-java.json @@ -0,0 +1,10 @@ +{ + "url": "https://github.com/tree-sitter/tree-sitter-java", + "rev": "f7b62ac33d63bea56ce202ace107aaa4285e50af", + "date": "2020-10-27T13:41:02-04:00", + "path": "/nix/store/h51zjbzdrm89gczcdv7nyih54vnd2xps-tree-sitter-java", + "sha256": "0jbh79brs1dskfqw05s9ndrp46hibyc37nfvhxlvanmgj3pjwgxb", + "fetchSubmodules": false, + "deepClone": false, + "leaveDotGit": false +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json b/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json index 9020e8a40bc3..68008d393d1f 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-javascript", - "rev": "3d5493495b62b4ff8e8c24aee7519dd904e25813", - "date": "2020-09-21T17:18:41-07:00", - "path": "/nix/store/bhjws8yif1ihhvhfsrdrp4inf03ks08r-tree-sitter-javascript", - "sha256": "10fscmclcgl1a0314ppkfy0s7pmiiz5vjipbmks76608kic8nzpp", + "rev": "852f11b394804ac2a8986f8bcaafe77753635667", + "date": "2020-10-27T13:43:40-04:00", + "path": "/nix/store/7a9nd3prxbv2izvilqdxf58his097ak7-tree-sitter-javascript", + "sha256": "1cdqx75fm7fvna0iymw7n03a7f6gayfg97qwqz3himi0775fz9ir", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json b/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json index 1c057f51ea99..402c4c087b18 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-python", - "rev": "30f538aa1f932a2864c102694761d3127a61dc68", - "date": "2020-09-21T13:21:51-07:00", - "path": "/nix/store/bxv85lm636xdsdqjf4n7sxjlhhh35qnv-tree-sitter-python", - "sha256": "0hzzz90pn1qwyl5xk03cah62rbvp1c1yp1pw2m3hifqflxg4rs1g", + "rev": "d245768132eb6cb74d8a394ca4d29dc57169b096", + "date": "2020-10-27T13:20:04-04:00", + "path": "/nix/store/afv7ibxpf5c2shafa89cnza88hsfb7kj-tree-sitter-python", + "sha256": "075r5i2id2rn76xm3pcrn5cpvj63dlaxcpvphig39a4c9f9hrpdx", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ruby.json b/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ruby.json index 06418942b4de..d5a1767a23ce 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ruby.json +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ruby.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-ruby", - "rev": "a6fcb529e9097a2efbbb3f4857e42773e7f2474f", - "date": "2020-05-26T16:18:48-07:00", - "path": "/nix/store/yqd5b7ky21scahnhrik9psalbkwi3ab3-tree-sitter-ruby", - "sha256": "0bxg5lfdazz5mlfnf0amcygvc8b2ydzl2blvbbhnziyx92r8di6q", + "rev": "f86d90cce578e28c824afdcdbdca7d031b88c0b0", + "date": "2020-11-02T20:49:49-08:00", + "path": "/nix/store/gs0hhb1dlgmv0y60zyyz7ki30yvpddfx-tree-sitter-ruby", + "sha256": "1n1irdjfmv27p5ia2vqzv8zfsq19pxi0as0wrkb7z7s1lqr1gwrb", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json b/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json index 9f037cdc0947..4e0e2e2f7f47 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-rust", - "rev": "40620bf4097cbc9cea79504d7e877865df43a19e", - "date": "2020-05-15T10:53:35-07:00", - "path": "/nix/store/r24bba6gxchb5zqzghna8yjvqnngbv4a-tree-sitter-rust", - "sha256": "0hjp6nsskw341g97x41481b3zfwh8g853fs9six6j1mh92irmv6y", + "rev": "cf47ff80cbd8bdc6dd649a005c5f5d73f9c347e2", + "date": "2020-11-04T06:23:40-08:00", + "path": "/nix/store/8cvjxw8cz5jrkqwvgq88r7rfm269xwk1-tree-sitter-rust", + "sha256": "0yzcag0yy3ncxwpnb3fmsw8bxaidp7z8kbl8wwaxaj2vvxxf6sam", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json b/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json index 7081d3036cf1..d31f72754bf8 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-typescript", - "rev": "5a38a5bd04364d9f48b902fd1514e075b98b0edc", - "date": "2020-09-17T10:19:01-07:00", - "path": "/nix/store/b3q7vz9zhgjdbv3c2xap4k2ghpdjp2yf-tree-sitter-typescript", - "sha256": "1mxwvzqbaaq11cz7zidiwr29fs0b6ycf3nadwdkgiz8c6x2xx398", + "rev": "73afadbd117a8e8551758af9c3a522ef46452119", + "date": "2020-10-20T12:15:52-07:00", + "path": "/nix/store/wrgp1j5l50cigv5cmlxikw693a55i6g9-tree-sitter-typescript", + "sha256": "0dsbmcvjzys9s229drp1l8anram7d6nsx1nixl5m9znw54hr4w9p", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/pgloader/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/pgloader/default.nix index 94ba95b2d92f..6d4bcaadd118 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/pgloader/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/pgloader/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://pgloader.io/"; - description = "pgloader loads data into PostgreSQL and allows you to implement Continuous Migration from your current database to PostgreSQL"; + description = "Loads data into PostgreSQL and allows you to implement Continuous Migration from your current database to PostgreSQL"; maintainers = with maintainers; [ mguentner ]; license = licenses.postgresql; platforms = platforms.all; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/pipenv/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/pipenv/default.nix index 3a6ea879e58b..2eff05b04ea7 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/pipenv/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/pipenv/default.nix @@ -18,11 +18,11 @@ let in buildPythonApplication rec { pname = "pipenv"; - version = "2020.8.13"; + version = "2020.11.15"; src = fetchPypi { inherit pname version; - sha256 = "eff0e10eadb330f612edfa5051d3d8e775e9e0e918c3c50361da703bd0daa035"; + sha256 = "8253fe6f9cfb3791a54da8a0571f73c918cb3457dd908684c1800a13a06ec4c1"; }; LC_ALL = "en_US.UTF-8"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/bin/poetry2nix b/infra/libkookie/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/bin/poetry2nix index 355cebfd50c4..559025f3ec45 100755 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/bin/poetry2nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/bin/poetry2nix @@ -7,60 +7,127 @@ import toml import json import sys - -argparser = argparse.ArgumentParser(description="Poetry2nix CLI") - -subparsers = argparser.add_subparsers(dest="subcommand") -subparsers.required = True - -parser_lock = subparsers.add_parser("lock", help="Generate overrides for git hashes",) -parser_lock.add_argument( - "--lock", default="poetry.lock", help="Path to input poetry.lock", -) -parser_lock.add_argument( - "--out", default="poetry-git-overlay.nix", help="Output file", -) - - -def fetch_git(pkg): - return ( - pkg["name"], - subprocess.run( - [ - "nix-prefetch-git", - "--fetch-submodules", - "--url", - pkg["source"]["url"], - "--rev", - pkg["source"]["reference"], - ], - stdout=subprocess.PIPE, - stderr=subprocess.PIPE, - ), +from typing import Dict, Any, Tuple, List + + +class Package: + def __init__(self, attrs: Dict[str, Any]) -> None: + self.attrs = attrs + self.name = attrs["name"] + self.source = self.attrs["source"] + + def fetch(self) -> Tuple["Package", subprocess.CompletedProcess]: + raise NotImplementedError() + + def expression(self, output: str) -> str: + raise NotImplementedError() + + +class UrlPackage(Package): + def fetch(self) -> Tuple[Package, subprocess.CompletedProcess]: + return ( + self, + subprocess.run( + [ + "nix-prefetch-url", + "--unpack", + self.source["url"], + ], + stdout=subprocess.PIPE, + stderr=subprocess.PIPE, + text=True + ), + ) + + def expression(self, output: str) -> str: + sha256 = output.rstrip() + return textwrap.dedent(""" + %s = super.%s.overridePythonAttrs ( + _: { + src = pkgs.fetchzip { + url = "%s"; + sha256 = "%s"; + }; + } + );""" % (self.name, self.name, self.source["url"], sha256)) + + +class GitPackage(Package): + def fetch(self) -> Tuple[Package, subprocess.CompletedProcess]: + reference = self.source.get("resolved_reference", self.source["reference"]) + + return ( + self, + subprocess.run( + [ + "nix-prefetch-git", + "--fetch-submodules", + "--url", + self.source["url"], + "--rev", + reference, + ], + stdout=subprocess.PIPE, + stderr=subprocess.PIPE, + text=True + ), + ) + + def expression(self, output: str) -> str: + meta = json.loads(output) + return textwrap.dedent(""" + %s = super.%s.overridePythonAttrs ( + _: { + src = pkgs.fetchgit { + url = "%s"; + rev = "%s"; + sha256 = "%s"; + }; + } + );""" % (self.name, self.name, meta["url"], meta["rev"], meta["sha256"])) + + +def parse_args() -> argparse.Namespace: + argparser = argparse.ArgumentParser(description="Poetry2nix CLI") + + subparsers = argparser.add_subparsers(dest="subcommand") + subparsers.required = True + + parser_lock = subparsers.add_parser("lock", help="Generate overrides for git hashes",) + parser_lock.add_argument( + "--lock", default="poetry.lock", help="Path to input poetry.lock", + ) + parser_lock.add_argument( + "--out", default="poetry-git-overlay.nix", help="Output file", ) + return argparser.parse_args() -def indent(expr, spaces=2): +def indent(expr: str, spaces: int = 2) -> str: i = " " * spaces return "\n".join([(i if l != "" else "") + l for l in expr.split("\n")]) -if __name__ == "__main__": - args = argparser.parse_args() +def main() -> None: + args = parse_args() with open(args.lock) as lockf: lock = toml.load(lockf) - pkgs = [] + pkgs: List[Package] = [] for pkg in lock["package"]: if "source" in pkg: - pkgs.append(pkg) + source_type = pkg["source"]["type"] + if source_type == "git": + pkgs.append(GitPackage(pkg)) + elif source_type == "url": + pkgs.append(UrlPackage(pkg)) with ThreadPoolExecutor() as e: futures = [] for pkg in pkgs: - futures.append(e.submit(fetch_git, pkg)) + futures.append(e.submit(pkg.fetch)) lines = [ "{ pkgs }:", @@ -68,30 +135,13 @@ if __name__ == "__main__": ] for f in futures: - drv_name, p = f.result() + package, p = f.result() if p.returncode != 0: - sys.stderr.buffer.write(p.stderr) - sys.stderr.buffer.flush() + sys.stderr.write(p.stderr) + sys.stderr.flush() exit(p.returncode) - - meta = json.loads(p.stdout.decode()) - lines.append( - indent( - textwrap.dedent( - """ - %s = super.%s.overridePythonAttrs ( - _: { - src = pkgs.fetchgit { - url = "%s"; - rev = "%s"; - sha256 = "%s"; - }; - } - );""" - % (drv_name, drv_name, meta["url"], meta["rev"], meta["sha256"]) - ) - ) - ) + expr = package.expression(p.stdout) + lines.append(indent(expr)) lines.extend(["", "}", ""]) @@ -101,3 +151,7 @@ if __name__ == "__main__": fout.write(expr) print(f"Wrote {args.out}") + + +if __name__ == "__main__": + main() diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/default.nix index e47dbc99f2a7..b0e65ed85a08 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/default.nix @@ -71,7 +71,7 @@ in lib.makeScope pkgs.newScope (self: { # Poetry2nix version - version = "1.13.0"; + version = "1.14.0"; /* Returns an attrset { python, poetryPackages, pyProject, poetryLock } for the given pyproject/lockfile. diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/hooks/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/hooks/default.nix index 6d60df284739..a66989f70e56 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/hooks/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/hooks/default.nix @@ -1,11 +1,11 @@ { python -, callPackage +, buildPackages , makeSetupHook -, yj , wheel , pip }: let + callPackage = python.pythonForBuild.pkgs.callPackage; pythonInterpreter = python.pythonForBuild.interpreter; pythonSitePackages = python.sitePackages; in @@ -20,7 +20,7 @@ in deps = [ ]; substitutions = { inherit pythonInterpreter; - yj = "${yj}/bin/yj"; + yj = "${buildPackages.yj}/bin/yj"; pyprojectPatchScript = "${./pyproject-without-path.py}"; }; } ./remove-path-dependencies.sh diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix index 9619e3649379..c01f99c01d44 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix @@ -27,6 +27,7 @@ pythonPackages.callPackage , ... }@args: let + inherit (pkgs) stdenv; inherit (poetryLib) isCompatible getManyLinuxDeps fetchFromPypi moduleName; inherit (import ./pep425.nix { @@ -45,6 +46,7 @@ pythonPackages.callPackage toPath = s: pwd + "/${s}"; isSource = source != null; isGit = isSource && source.type == "git"; + isUrl = isSource && source.type == "url"; isLocal = isSource && source.type == "directory"; localDepPath = toPath source.url; @@ -91,7 +93,7 @@ pythonPackages.callPackage "toml" # Toml is an extra for setuptools-scm ]; baseBuildInputs = lib.optional (! lib.elem name skipSetupToolsSCM) pythonPackages.setuptools-scm; - format = if isLocal then "pyproject" else if isGit then "pyproject" else fileInfo.format; + format = if isLocal || isGit || isUrl then "pyproject" else fileInfo.format; in buildPythonPackage { pname = moduleName name; @@ -113,9 +115,10 @@ pythonPackages.callPackage buildInputs = ( baseBuildInputs + ++ lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) pythonPackages.setuptools ++ lib.optional (!isSource) (getManyLinuxDeps fileInfo.name).pkg ++ lib.optional isLocal buildSystemPkgs - ++ lib.optional (!__isBootstrap) [ pythonPackages.poetry ] + ++ lib.optional (!__isBootstrap) pythonPackages.poetry ); propagatedBuildInputs = @@ -157,14 +160,22 @@ pythonPackages.callPackage ( builtins.fetchGit { inherit (source) url; - rev = source.reference; + rev = source.resolved_reference or source.reference; ref = sourceSpec.branch or sourceSpec.rev or sourceSpec.tag or "HEAD"; } - ) else if isLocal then (poetryLib.cleanPythonSources { src = localDepPath; }) else - fetchFromPypi { - pname = name; - inherit (fileInfo) file hash kind; - }; + ) + else if isUrl then + builtins.fetchTarball + { + inherit (source) url; + } + else if isLocal then + (poetryLib.cleanPythonSources { src = localDepPath; }) + else + fetchFromPypi { + pname = name; + inherit (fileInfo) file hash kind; + }; } ) { } diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix index ca6c0c7cc49b..16d66c48af8b 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix @@ -93,7 +93,7 @@ self: super: ( super.cffi.overridePythonAttrs ( old: { - buildInputs = old.buildInputs ++ [ pkgs.libffi ]; + buildInputs = old.buildInputs or [ ] ++ [ pkgs.libffi ]; } ) ); @@ -106,6 +106,12 @@ self: super: } ); + colour = super.colour.overridePythonAttrs ( + old: { + buildInputs = old.buildInputs ++ [ self.d2to1 ]; + } + ); + configparser = super.configparser.overridePythonAttrs ( old: { buildInputs = old.buildInputs ++ [ @@ -120,6 +126,8 @@ self: super: cryptography = super.cryptography.overridePythonAttrs ( old: { + nativeBuildInputs = old.nativeBuildInputs or [ ] + ++ stdenv.lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) self.python.pythonForBuild.pkgs.cffi; buildInputs = old.buildInputs ++ [ pkgs.openssl ]; } ); @@ -324,6 +332,17 @@ self: super: } ); + jira = super.jira.overridePythonAttrs ( + old: { + inherit (pkgs.python3Packages.jira) patches; + buildInputs = old.buildInputs ++ [ + self.pytestrunner + self.cryptography + self.pyjwt + ]; + } + ); + jsonpickle = super.jsonpickle.overridePythonAttrs ( old: { dontPreferSetupPy = true; @@ -499,6 +518,31 @@ self: super: buildInputs = oa.buildInputs ++ [ self.pbr ]; }); + mpi4py = super.mpi4py.overridePythonAttrs ( + old: + let + cfg = pkgs.writeTextFile { + name = "mpi.cfg"; + text = ( + lib.generators.toINI + { } + { + mpi = { + mpicc = "${pkgs.openmpi.outPath}/bin/mpicc"; + }; + } + ); + }; + in + { + propagatedBuildInputs = old.propagatedBuildInputs ++ [ pkgs.openmpi ]; + enableParallelBuilding = true; + preBuild = '' + ln -sf ${cfg} mpi.cfg + ''; + } + ); + multiaddr = super.multiaddr.overridePythonAttrs ( old: { buildInputs = old.buildInputs ++ [ self.pytest-runner ]; @@ -584,8 +628,8 @@ self: super: withMysql = old.passthru.withMysql or false; in { - buildInputs = old.buildInputs ++ [ self.cython pkgs.sqlite ]; - propagatedBuildInputs = old.propagatedBuildInputs + buildInputs = old.buildInputs or [ ] ++ [ pkgs.sqlite ]; + propagatedBuildInputs = old.propagatedBuildInputs or [ ] ++ lib.optional withPostgres self.psycopg2 ++ lib.optional withMysql self.mysql-connector; } @@ -602,8 +646,8 @@ self: super: # "Vendor" dependencies (for build-system support) postPatch = '' echo "import sys" >> poetry/__init__.py - for path in ''${PYTHONPATH//:/ }; do echo $path; done | uniq | while read path; do - echo "sys.path.insert(0, \"$path\")" >> poetry/__init__.py + for path in $propagatedBuildInputs; do + echo "sys.path.insert(0, \"$path\")" >> poetry/__init__.py done ''; @@ -796,6 +840,14 @@ self: super: } ); + python-bugzilla = super.python-bugzilla.overridePythonAttrs ( + old: { + nativeBuildInputs = old.nativeBuildInputs ++ [ + self.docutils + ]; + } + ); + python-ldap = super.python-ldap.overridePythonAttrs ( old: { buildInputs = old.buildInputs ++ [ pkgs.openldap pkgs.cyrus_sasl ]; @@ -924,6 +976,15 @@ self: super: } ); + pytest-django = super.pytest-django.overridePythonAttrs ( + old: { + postPatch = '' + substituteInPlace setup.py --replace "'pytest>=3.6'," "" + substituteInPlace setup.py --replace "'pytest>=3.6'" "" + ''; + } + ); + pytest-runner = super.pytest-runner or super.pytestrunner; python-jose = super.python-jose.overridePythonAttrs ( @@ -1090,6 +1151,43 @@ self: super: } ); + torch = lib.makeOverridable + ({ enableCuda ? false + , cudatoolkit ? pkgs.cudatoolkit_10_1 + , pkg ? super.torch + }: pkg.overrideAttrs (old: + { + preConfigure = + if (!enableCuda) then '' + export USE_CUDA=0 + '' else '' + export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${cudatoolkit}/targets/x86_64-linux/lib" + ''; + preFixup = lib.optionalString (!enableCuda) '' + # For some reason pytorch retains a reference to libcuda even if it + # is explicitly disabled with USE_CUDA=0. + find $out -name "*.so" -exec ${pkgs.patchelf}/bin/patchelf --remove-needed libcuda.so.1 {} \; + ''; + buildInputs = old.buildInputs ++ lib.optionals enableCuda [ + pkgs.linuxPackages.nvidia_x11 + pkgs.nccl.dev + pkgs.nccl.out + ]; + propagatedBuildInputs = [ + super.numpy + super.future + ]; + }) + ) + { }; + + typeguard = super.typeguard.overridePythonAttrs (old: { + postPatch = '' + substituteInPlace setup.py \ + --replace 'setup()' 'setup(version="${old.version}")' + ''; + }); + # nix uses a dash, poetry uses an underscore typing_extensions = super.typing_extensions or self.typing-extensions; @@ -1193,4 +1291,30 @@ self: super: } ); + credis = super.credis.overridePythonAttrs ( + old: { + buildInputs = old.buildInputs ++ [ self.cython ]; + } + ); + + hashids = super.hashids.overridePythonAttrs ( + old: { + buildInputs = old.buildInputs ++ [ self.flit-core ]; + } + ); + + supervisor = super.supervisor.overridePythonAttrs ( + old: { + propagatedBuildInputs = old.propagatedBuildInputs ++ [ + self.meld3 + self.setuptools + ]; + } + ); + + cytoolz = super.cytoolz.overridePythonAttrs ( + old: { + propagatedBuildInputs = old.propagatedBuildInputs ++ [ self.toolz ]; + } + ); } diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pep425.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pep425.nix index d32e3aacce6c..e333bd497184 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pep425.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pep425.nix @@ -87,7 +87,7 @@ let filtered = builtins.filter filterWheel filesWithoutSources; choose = files: let - osxMatches = [ "10_12" "10_11" "10_10" "10_9" "any" ]; + osxMatches = [ "10_12" "10_11" "10_10" "10_9" "10_8" "10_7" "any" ]; linuxMatches = [ "manylinux1_" "manylinux2010_" "manylinux2014_" "any" ]; chooseLinux = x: lib.take 1 (findBestMatches linuxMatches x); chooseOSX = x: lib.take 1 (findBestMatches osxMatches x); diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/default.nix index f93eb119b20f..70470ba17222 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/default.nix @@ -15,8 +15,8 @@ poetry2nix.mkPoetryApplication { # "Vendor" dependencies (for build-system support) postPatch = '' echo "import sys" >> poetry/__init__.py - for path in ''${PYTHONPATH//:/ }; do echo $path; done | uniq | while read path; do - echo "sys.path.insert(0, \"$path\")" >> poetry/__init__.py + for path in $propagatedBuildInputs; do + echo "sys.path.insert(0, \"$path\")" >> poetry/__init__.py done ''; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/pyproject.toml b/infra/libkookie/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/pyproject.toml index f099a4cac805..0868175ea45d 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/pyproject.toml +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "poetry" -version = "1.1.0" +version = "1.1.4" description = "Python dependency management and packaging made easy." authors = [ "Sébastien Eustace <sebastien@eustace.io>" diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/src.json b/infra/libkookie/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/src.json index 51894768c1d9..4a1e8890c28c 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/src.json +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/src.json @@ -1,7 +1,7 @@ { "owner": "python-poetry", "repo": "poetry", - "rev": "539d7f732c34c821258a9853cd3078cbda34a717", - "sha256": "0kl23dkq9n112z1pqjg6f1wv3qk77ij6q5glg15lwrj7yrl9k65c", + "rev": "8312e3f2dbfa126cd311c666fea30656941e1bd3", + "sha256": "0lx3qpz5dad0is7ki5a4vxphvc8cm8fnv4bmrx226a6nvvaj6ahs", "fetchSubmodules": true } diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/profiling/sysprof/capture.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/profiling/sysprof/capture.nix new file mode 100644 index 000000000000..a1f5d00332c4 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/profiling/sysprof/capture.nix @@ -0,0 +1,30 @@ +{ stdenv +, meson +, ninja +, sysprof +}: + +stdenv.mkDerivation rec { + pname = "libsysprof-capture"; + + inherit (sysprof) src version; + + nativeBuildInputs = [ + meson + ninja + ]; + + mesonFlags = [ + "-Dwith_sysprofd=none" + "-Dlibsysprof=false" + "-Dhelp=false" + "-Denable_tools=false" + "-Denable_tests=false" + "-Denable_examples=false" + ]; + + meta = sysprof.meta // { + description = "Static library for Sysprof capture data generation"; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/profiling/sysprof/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/profiling/sysprof/default.nix index ce7313098822..49b8e88486ca 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/profiling/sysprof/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/profiling/sysprof/default.nix @@ -2,7 +2,6 @@ , lib , desktop-file-utils , fetchurl -, fetchpatch , gettext , glib , gtk3 @@ -21,24 +20,15 @@ stdenv.mkDerivation rec { pname = "sysprof"; - version = "3.36.0"; + version = "3.38.1"; outputs = [ "out" "lib" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "024i0gzqnm79rpr4gqxdvcj6gvf82xdlcp2p1k9ikcppmi6xnw46"; + sha256 = "1z2i9187f2jx456l7h07wy8m9a0p7pj3xiv1aji3snq7rjb1lkj0"; }; - patches = [ - # Fix 32-bit builds - # https://gitlab.gnome.org/GNOME/sysprof/merge_requests/24 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/sysprof/commit/5dea152c7728f5a37370ad8a229115833e36b4f6.patch"; - sha256 = "0c76s7r329pbdlmgvm3grn89iylrxv5wg87craqp937nwk3wb80g"; - }) - ]; - nativeBuildInputs = [ desktop-file-utils gettext diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/purescript/spago/spago.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/purescript/spago/spago.nix index b36bc26433d3..4a5ad361e9fd 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/purescript/spago/spago.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/purescript/spago/spago.nix @@ -2,20 +2,20 @@ , base, bower-json, bytestring, Cabal, containers, dhall, directory , either, exceptions, extra, fetchgit, file-embed, filepath, foldl , fsnotify, github, Glob, hpack, hspec, hspec-discover -, hspec-megaparsec, http-client, http-conduit, lens-family-core -, megaparsec, mtl, network-uri, open-browser, optparse-applicative -, prettyprinter, process, QuickCheck, retry, rio, rio-orphans, safe -, semver-range, stdenv, stm, tar, template-haskell, temporary, text -, time, transformers, turtle, unliftio, unordered-containers -, vector, versions, with-utf8, zlib +, hspec-megaparsec, http-client, http-conduit, http-types +, lens-family-core, megaparsec, mtl, network-uri, open-browser +, optparse-applicative, prettyprinter, process, QuickCheck, retry +, rio, rio-orphans, safe, semver-range, stdenv, stm, tar +, template-haskell, temporary, text, time, transformers, turtle +, unliftio, unordered-containers, vector, versions, with-utf8, zlib }: mkDerivation { pname = "spago"; - version = "0.16.0"; + version = "0.17.0"; src = fetchgit { url = "https://github.com/purescript/spago.git"; - sha256 = "0z4s0z14n1v9wajs7mj2b295rrrw24gdca79drzlv6x1y6dj7sxh"; - rev = "71b093cdf5e48ded645303281ab4a3ea5b730f5d"; + sha256 = "1w9y1gvk307f92gixs5g02zbg0xwhrshwmc5j97pxhbzzg9qjidy"; + rev = "3309afdef25e3e77f991a079eed78ff2f750e463"; fetchSubmodules = true; }; isLibrary = true; @@ -24,7 +24,7 @@ mkDerivation { aeson aeson-pretty ansi-terminal async-pool base bower-json bytestring Cabal containers dhall directory either exceptions file-embed filepath foldl fsnotify github Glob http-client - http-conduit lens-family-core megaparsec mtl network-uri + http-conduit http-types lens-family-core megaparsec mtl network-uri open-browser optparse-applicative prettyprinter process retry rio rio-orphans safe semver-range stm tar template-haskell temporary text time transformers turtle unliftio unordered-containers vector diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/react-native-debugger/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/react-native-debugger/default.nix index 3cb5ae2b9306..6ee5e884ea2d 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/react-native-debugger/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/react-native-debugger/default.nix @@ -38,10 +38,10 @@ let ]; in stdenv.mkDerivation rec { pname = "react-native-debugger"; - version = "0.11.4"; + version = "0.11.5"; src = fetchurl { url = "https://github.com/jhen0409/react-native-debugger/releases/download/v${version}/rn-debugger-linux-x64.zip"; - sha256 = "1dnlxdqcn90r509ff5003fibkrprdr0ydpnwg5p0xzs6rz3k8698"; + sha256 = "0b917lihypx7ansy64dmwvgi943yy0n6fs8myam635bsr4l1srzb"; }; buildInputs = [ unzip ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/reftools/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/reftools/default.nix index 440d2f961337..a31108f33812 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/reftools/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/reftools/default.nix @@ -23,7 +23,7 @@ buildGoModule rec { }; meta = with lib; { - description = "reftools - refactoring tools for Go"; + description = "Refactoring tools for Go"; homepage = "https://github.com/davidrjenni/reftools"; license = licenses.bsd2; maintainers = with maintainers; [ kalbasit ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/repository-managers/nexus/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/repository-managers/nexus/default.nix index 247227411844..e955a844dc88 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/repository-managers/nexus/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/repository-managers/nexus/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "nexus"; - version = "3.22.0-02"; + version = "3.28.1-01"; src = fetchurl { url = "https://sonatype-download.global.ssl.fastly.net/nexus/3/nexus-${version}-unix.tar.gz"; - sha256 = "12433fgva03gsgi37xqgkdnbglgq4b66lmzk5cyxfg22szl4xvwz"; + sha256 = "0qba2qaz85hf0vgix3qyqdl8yzdb6qr91sgdmxv3fgjhyvnvqyy8"; }; preferLocalBuild = true; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/rgp/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/rgp/default.nix index 8c3da159d64e..8beeccfa2fd1 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/rgp/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/rgp/default.nix @@ -7,6 +7,7 @@ , fontconfig , freetype , glib +, libGLU , libglvnd , libX11 , libxcb @@ -18,15 +19,15 @@ }: let - buildNum = "2020-09-11-26"; + buildNum = "2020-11-19-376"; in stdenv.mkDerivation rec { pname = "rgp"; - version = "1.8"; + version = "1.9"; src = fetchurl { - url = "https://github.com/GPUOpen-Tools/radeon_gpu_profiler/releases/download/v${lib.versions.majorMinor version}/RadeonDeveloperTools-${buildNum}.tgz"; - sha256 = "1lpkh7sfpq697lm4xnkpjfchh8zpy49f4mb3c5qcn7brav5iqwfh"; + url = "https://gpuopen.com/download/radeon-developer-tool-suite/RadeonDeveloperToolSuite-${buildNum}.tgz"; + sha256 = "f71ibuMerd0SmXKSDjaTj7xtyy1dWzkZ5s0PlGtQ1+k="; }; nativeBuildInputs = [ makeWrapper autoPatchelfHook ]; @@ -36,6 +37,7 @@ stdenv.mkDerivation rec { fontconfig freetype glib + libGLU libglvnd libX11 libxcb @@ -54,12 +56,10 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/opt/rgp $out/bin cp -r . $out/opt/rgp/ - # Breaks autoPatchelfHook and has no known usage - rm $out/opt/rgp/AMDToolsDownloader - for prog in RadeonGPUProfiler RadeonDeveloperPanel RadeonDeveloperService RadeonDeveloperServiceCLI; do + for prog in RadeonDeveloperPanel RadeonDeveloperService RadeonDeveloperServiceCLI RadeonGPUAnalyzer RadeonGPUProfiler rga rtda; do # makeWrapper is needed so that executables are started from the opt - # directory, where qt.conf is + # directory, where qt.conf and other tools are makeWrapper \ $out/opt/rgp/$prog \ $out/bin/$prog @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A tool from AMD that allows for deep inspection of GPU workloads"; - homepage = "https://gpuopen.com/gaming-product/radeon-gpu-profiler-rgp/"; + homepage = "https://gpuopen.com/rgp/"; license = licenses.unfree; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ Flakebi ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/rq/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/rq/default.nix index 68d3bfce06b0..838740d1fd0e 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/rq/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/rq/default.nix @@ -25,6 +25,6 @@ rustPlatform.buildRustPackage rec { description = "A tool for doing record analysis and transformation"; homepage = "https://github.com/dflemstr/rq"; license = with licenses; [ asl20 ]; - maintainers = with maintainers; [ aristid filalex77 ]; + maintainers = with maintainers; [ aristid Br1ght0ne ]; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/rubocop/Gemfile.lock b/infra/libkookie/nixpkgs/pkgs/development/tools/rubocop/Gemfile.lock index 0e6e3a7f3610..6b6a3a995918 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/rubocop/Gemfile.lock +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/rubocop/Gemfile.lock @@ -1,21 +1,26 @@ GEM remote: https://rubygems.org/ specs: - ast (2.4.0) - jaro_winkler (1.5.4) - parallel (1.19.1) - parser (2.6.5.0) - ast (~> 2.4.0) + ast (2.4.1) + parallel (1.19.2) + parser (2.7.2.0) + ast (~> 2.4.1) rainbow (3.0.0) - rubocop (0.77.0) - jaro_winkler (~> 1.5.1) + regexp_parser (1.8.2) + rexml (3.2.4) + rubocop (1.1.0) parallel (~> 1.10) - parser (>= 2.6) + parser (>= 2.7.1.5) rainbow (>= 2.2.2, < 4.0) + regexp_parser (>= 1.8) + rexml + rubocop-ast (>= 1.0.1) ruby-progressbar (~> 1.7) - unicode-display_width (>= 1.4.0, < 1.7) + unicode-display_width (>= 1.4.0, < 2.0) + rubocop-ast (1.1.0) + parser (>= 2.7.1.5) ruby-progressbar (1.10.1) - unicode-display_width (1.6.0) + unicode-display_width (1.7.0) PLATFORMS ruby diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/rubocop/gemset.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/rubocop/gemset.nix index d7e1b9328dc1..c1f55f7aca27 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/rubocop/gemset.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/rubocop/gemset.nix @@ -4,62 +4,83 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "184ssy3w93nkajlz2c70ifm79jp3j737294kbc5fjw69v1w0n9x7"; + sha256 = "1l3468czzjmxl93ap40hp7z94yxp4nbag0bxqs789bm30md90m2a"; type = "gem"; }; - version = "2.4.0"; + version = "2.4.1"; }; - jaro_winkler = { + parallel = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1y8l6k34svmdyqxya3iahpwbpvmn3fswhwsvrz0nk1wyb8yfihsh"; + sha256 = "17b127xxmm2yqdz146qwbs57046kn0js1h8synv01dwqz2z1kp2l"; type = "gem"; }; - version = "1.5.4"; + version = "1.19.2"; }; - parallel = { + parser = { + dependencies = ["ast"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12jijkap4akzdv11lm08dglsc8jmc87xcgq6947i1s3qb69f4zn2"; + sha256 = "1f7gmm60yla325wlnd3qkxs59qm2y0aan8ljpg6k18rwzrrfil6z"; type = "gem"; }; - version = "1.19.1"; + version = "2.7.2.0"; }; - parser = { - dependencies = ["ast"]; + rainbow = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09davv4ld6caqlczw64vhwf8hr41apys3cj8v2h96yxs4qg1m2iw"; + sha256 = "0bb2fpjspydr6x0s8pn1pqkzmxszvkfapv0p4627mywl7ky4zkhk"; type = "gem"; }; - version = "2.6.5.0"; + version = "3.0.0"; }; - rainbow = { + regexp_parser = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bb2fpjspydr6x0s8pn1pqkzmxszvkfapv0p4627mywl7ky4zkhk"; + sha256 = "0x4s82lgf0l71y3xc9gp4qxkrgx1kv8f6avdqd68l46ijbyvicdm"; type = "gem"; }; - version = "3.0.0"; + version = "1.8.2"; + }; + rexml = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1mkvkcw9fhpaizrhca0pdgjcrbns48rlz4g6lavl5gjjq3rk2sq3"; + type = "gem"; + }; + version = "3.2.4"; }; rubocop = { - dependencies = ["jaro_winkler" "parallel" "parser" "rainbow" "ruby-progressbar" "unicode-display_width"]; + dependencies = ["parallel" "parser" "rainbow" "regexp_parser" "rexml" "rubocop-ast" "ruby-progressbar" "unicode-display_width"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1nw87ngw4a9r3dpgykb872zcm640m7k0nk17qv537fmss2hl8shl"; + type = "gem"; + }; + version = "1.1.0"; + }; + rubocop-ast = { + dependencies = ["parser"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0m88b1bgbhmmbdnz2xv6n0il0j4q5qm9jbc0vf1zsaxmxqp06nx9"; + sha256 = "0ami6n3vnpm9y5z6wd4c6y2infijajizjjwv8fq0wrcjvr3zivzz"; type = "gem"; }; - version = "0.77.0"; + version = "1.1.0"; }; ruby-progressbar = { groups = ["default"]; @@ -76,9 +97,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08kfiniak1pvg3gn5k6snpigzvhvhyg7slmm0s2qx5zkj62c1z2w"; + sha256 = "06i3id27s60141x6fdnjn5rar1cywdwy64ilc59cz937303q3mna"; type = "gem"; }; - version = "1.6.0"; + version = "1.7.0"; }; }
\ No newline at end of file diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/rufo/Gemfile b/infra/libkookie/nixpkgs/pkgs/development/tools/rufo/Gemfile new file mode 100644 index 000000000000..5db4a68b13ca --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/rufo/Gemfile @@ -0,0 +1,3 @@ +source 'https://rubygems.org' + +gem 'rufo' diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/rufo/Gemfile.lock b/infra/libkookie/nixpkgs/pkgs/development/tools/rufo/Gemfile.lock new file mode 100644 index 000000000000..f63ff520e687 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/rufo/Gemfile.lock @@ -0,0 +1,13 @@ +GEM + remote: https://rubygems.org/ + specs: + rufo (0.12.0) + +PLATFORMS + ruby + +DEPENDENCIES + rufo + +BUNDLED WITH + 2.1.4 diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/rufo/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/rufo/default.nix new file mode 100644 index 000000000000..d64173700e77 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/rufo/default.nix @@ -0,0 +1,16 @@ +{ bundlerApp, bundlerUpdateScript, lib }: + +bundlerApp { + pname = "rufo"; + gemdir = ./.; + exes = [ "rufo" ]; + + passthru.updateScript = bundlerUpdateScript "rufo"; + + meta = with lib; { + description = "Ruby formatter"; + homepage = "https://github.com/ruby-formatter/rufo"; + license = licenses.mit; + maintainers = with maintainers; [ andersk ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/rufo/gemset.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/rufo/gemset.nix new file mode 100644 index 000000000000..cd5c2c462a98 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/rufo/gemset.nix @@ -0,0 +1,12 @@ +{ + rufo = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0nwasskcm0nrf7f52019x4fvxa5zckj4fcvf4cdl0qflrcwb1l9f"; + type = "gem"; + }; + version = "0.12.0"; + }; +}
\ No newline at end of file diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/run/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/run/default.nix index 41d1a8a29fd8..7ec08d02020a 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/run/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/run/default.nix @@ -18,7 +18,7 @@ buildGoModule rec { description = "Easily manage and invoke small scripts and wrappers"; homepage = "https://github.com/TekWizely/run"; license = licenses.mit; - maintainers = with maintainers; [ rawkode filalex77 ]; + maintainers = with maintainers; [ rawkode Br1ght0ne ]; platforms = platforms.unix; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/rust/bindgen/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/rust/bindgen/default.nix index 0c476a58e3d8..01e29036dbc7 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/rust/bindgen/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/rust/bindgen/default.nix @@ -3,7 +3,7 @@ rustPlatform.buildRustPackage rec { pname = "rust-bindgen"; - version = "0.54.1"; + version = "0.55.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 = "116np72w6agsi94xa1bdn6h7sa9gd522h358zlixk9xrhrx7yfn3"; + sha256 = "0cbc78zrhda4adza88g05sy04chixqay2ylgdjgmf13h607hp3kn"; }; - cargoSha256 = "12a7bd2579jcnkss073v5w5w68fxwvhq6c6ndjy8vp78wg83qich"; + cargoSha256 = "1dv1ywdy701bnc2jv5jq0hnpal1snlizaj9w6k1wxyrp9szjd48w"; libclang = llvmPackages.libclang.lib; #for substituteAll diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/rust/cargo-bloat/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/rust/cargo-bloat/default.nix index 8374e0653560..51d19f5ad6fd 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/rust/cargo-bloat/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/rust/cargo-bloat/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-bloat"; - version = "0.9.3"; + version = "0.10.0"; src = fetchFromGitHub { owner = "RazrFalcon"; repo = pname; rev = "v${version}"; - sha256 = "04h9yyna47cgn2d232v2fpbgki9gg4lykpmx46ncpsq4g6azl1a9"; + sha256 = "0bqzzh8vfqm7dpnb0fv4calnhsg9p3c5j06ycvg621p4zp4fydh2"; }; - cargoSha256 = "0lzc2nwz9lpwxv704k40d1416qnf3wy3g6ad8w8xbkfc6ydcaa4l"; + cargoSha256 = "1323lcl8fa21pgx3jhwl4w9f8qz3jjxb5qdvib9jdzqxnnw320xs"; meta = with lib; { description = "A tool and Cargo subcommand that helps you find out what takes most of the space in your executable"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/rust/cargo-c/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/rust/cargo-c/default.nix index 41c03923ec05..ee0074f7d839 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/rust/cargo-c/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/rust/cargo-c/default.nix @@ -5,7 +5,7 @@ rustPlatform.buildRustPackage rec { pname = "cargo-c"; - version = "0.6.15"; + version = "0.6.18"; src = stdenv.mkDerivation rec { name = "${pname}-source-${version}"; @@ -14,11 +14,11 @@ rustPlatform.buildRustPackage rec { owner = "lu-zero"; repo = pname; rev = "v${version}"; - sha256 = "04hrk3vy8294vxcsggdpcs8hg3ykzj2564ifsqc4zwz4b4wd1p8l"; + sha256 = "1dh5z210nl8grjxb8zxch8h7799w61bah7r2j0s07091rcpfsrsb"; }; cargoLock = fetchurl { url = "https://github.com/lu-zero/${pname}/releases/download/v${version}/Cargo.lock"; - sha256 = "0rqb6ssqsdlm8zbshbxkwxlyy7j7p2gyficavzz33cw9g6fpmzbd"; + sha256 = "1h5wmfmm2a2ilyw3ar88rqm7yvdc2vhyx4pgg781615ax52fhjli"; }; installPhase = '' @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { ''; }; - cargoSha256 = "1q2s28nqd6l9qmhmdksdjjlypxry5ff18i2pgwmgiilcry51mj4b"; + cargoSha256 = "0ll9p2rbnw46zd9m2bmdmn99v9jjjf8i33xpkvd1rx42ki7sys62"; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/rust/cargo-cache/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/rust/cargo-cache/default.nix index 0f3571045d67..3271e7951fac 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/rust/cargo-cache/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/rust/cargo-cache/default.nix @@ -21,6 +21,6 @@ rustPlatform.buildRustPackage rec { 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 ]; + maintainers = with maintainers; [ Br1ght0ne ]; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/rust/cargo-crev/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/rust/cargo-crev/default.nix index 750b651651c4..6c85a5238039 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/rust/cargo-crev/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/rust/cargo-crev/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-crev"; - version = "0.17.0"; + version = "0.18.0"; src = fetchFromGitHub { owner = "crev-dev"; repo = "cargo-crev"; rev = "v${version}"; - sha256 = "1s5wb5m0d77qi90pyxld98ap37xnxrz3sz5gazq0pp5i9c9xa124"; + sha256 = "1ccwa44hpmpd57ff6w02rvrs63wxwmgls2i1rn285rxypmbysrp0"; }; - cargoSha256 = "10dzvzjqib751h2p1pl0z3dy2d17xwrcp9vyfrfr185yximcw2wx"; + cargoSha256 = "1sffivpgrn4my57pcrg46b2yg6fmhxj61d2sqvg60fjljrg595zn"; nativeBuildInputs = [ perl pkg-config ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/rust/cargo-embed/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/rust/cargo-embed/default.nix index a9c18b021bf5..e4c5d8ab48c7 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/rust/cargo-embed/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/rust/cargo-embed/default.nix @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "A cargo extension for working with microcontrollers"; - homepage = "http://probe.rs/"; + homepage = "https://probe.rs/"; license = with licenses; [ asl20 /* or */ mit ]; maintainers = with maintainers; [ fooker ]; }; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/rust/cargo-expand/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/rust/cargo-expand/default.nix index c32a87e7839f..09650e8a3868 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/rust/cargo-expand/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/rust/cargo-expand/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-expand"; - version = "1.0.0"; + version = "1.0.4"; src = fetchFromGitHub { owner = "dtolnay"; repo = pname; rev = version; - sha256 = "0bdv6h3mzmv46pdyvwl0v0bg719dlsxlx378ws6vgi1cga24g37i"; + sha256 = "09jdqf1f8kl2c3k4cp8j3qqb96gclhncvfdwg2l3bmh5r10id9b3"; }; - cargoSha256 = "0qpihfgfqxw5fyhn124c5lbfaxr717bqf8mrbagh3vdgvk75j0qz"; + cargoSha256 = "0mx01h2zv7mpyi8s1545b7hjxn9aslzpbngrq4ii9rfqznz3r8k9"; meta = with lib; { description = diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/rust/cargo-flash/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/rust/cargo-flash/default.nix index e5d23c9258cd..dbd79f179aa3 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/rust/cargo-flash/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/rust/cargo-flash/default.nix @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "A cargo extension for working with microcontrollers"; - homepage = "http://probe.rs/"; + homepage = "https://probe.rs/"; license = with licenses; [ asl20 /* or */ mit ]; maintainers = with maintainers; [ fooker ]; }; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/rust/cargo-make/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/rust/cargo-make/default.nix index a1e9f7971f4d..881a53872c96 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/rust/cargo-make/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/rust/cargo-make/default.nix @@ -4,11 +4,11 @@ rustPlatform.buildRustPackage rec { pname = "cargo-make"; - version = "0.32.4"; + version = "0.32.9"; src = fetchCrate { inherit pname version; - sha256 = "04x363wz82f0sr4128f1nk1wxnnszxsmaxjs92mbvmpbvry82ivq"; + sha256 = "0f6avprq0d65v5fk3kn2kvw3w024f21yq6v8y7d9rbwqxxf87jlf"; }; nativeBuildInputs = [ pkg-config ]; @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; - cargoSha256 = "1fgcxgm800sr0y6ab7c42l335b6c00cx0f2r5rgayi645a47a1zf"; + cargoSha256 = "0v0657hh8ivqaq4sn0saaiz06shxavhrh9mksjlzj7c2ym6cxkih"; # Some tests fail because they need network access. # However, Travis ensures a proper build. diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/rust/cargo-udeps/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/rust/cargo-udeps/default.nix index b7879adcc31c..840f2ae27c3c 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/rust/cargo-udeps/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/rust/cargo-udeps/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-udeps"; - version = "0.1.14"; + version = "0.1.16"; src = fetchFromGitHub { owner = "est31"; repo = pname; rev = "v${version}"; - sha256 = "0imvq63i3s9qmm0x8cbaknjap2yfmpzva3y0sxmgkcm8ajkvp114"; + sha256 = "1h89xq91gbnbagfmvig5lkxyl08qwgdaf9vr55p599pmv190xq8s"; }; - cargoSha256 = "196w9rgz4pwqvkiy839kqz765ljqx1k129w4nvxgxv3rcmy4lbzm"; + cargoSha256 = "17931z5nbigfzvvhr6k64s2j9p1sp9nvmy5fyf92j3ci02dplm5c"; nativeBuildInputs = [ pkgconfig ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/rust/cbindgen/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/rust/cbindgen/default.nix index 62b9a616644d..0b557af42585 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/rust/cbindgen/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/rust/cbindgen/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "rust-cbindgen"; - version = "0.14.4"; + version = "0.15.0"; src = fetchFromGitHub { owner = "eqrion"; repo = "cbindgen"; rev = "v${version}"; - sha256 = "06bis9kk3r0gishzmsq5wk3vv8r78ggk4m800562q2yhnhc37lfd"; + sha256 = "19bwllrajks286wl4zc5axgh4m9qqxdnc5024c30hyk0xnjffd0c"; }; - cargoSha256 = "0x8lxlik4n8rmlydcp0vqyiqwqm98cgwvw3h5hm2zviv8v0y8jnr"; + cargoSha256 = "1lzzckzcgj496chbfd6lhwxcangv0krx8m5k2jwffnb9mfgac7hx"; buildInputs = stdenv.lib.optional stdenv.isDarwin Security; @@ -24,6 +24,6 @@ rustPlatform.buildRustPackage rec { description = "A project for generating C bindings from Rust code"; homepage = "https://github.com/eqrion/cbindgen"; license = licenses.mpl20; - maintainers = with maintainers; [ jtojnar andir ]; + maintainers = with maintainers; [ jtojnar ]; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/rust/crate2nix/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/rust/crate2nix/default.nix new file mode 100644 index 000000000000..a941d43bb9d8 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/rust/crate2nix/default.nix @@ -0,0 +1,47 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, makeWrapper + +, cargo +, nix +, nix-prefetch-git +}: + +rustPlatform.buildRustPackage rec { + pname = "crate2nix"; + version = "0.8.0"; + + src = fetchFromGitHub + { + owner = "kolloch"; + repo = pname; + rev = version; + sha256 = "sha256-pqg1BsEq3kGmUzt1zpQvXgdnRcIsiuIyvtUBi3VxtZ4="; + } + "/crate2nix"; + + cargoSha256 = "sha256-dAMWrGNMleQ3lDbG46Hr4qvCyxR+QcPOUZw9r2/CxV4="; + + nativeBuildInputs = [ makeWrapper ]; + + # Tests use nix(1), which tries (and fails) to set up /nix/var inside the + # sandbox + doCheck = false; + + postFixup = '' + wrapProgram $out/bin/crate2nix \ + --suffix PATH ":" ${lib.makeBinPath [ cargo nix nix-prefetch-git ]} + ''; + + meta = with lib; { + description = "A Nix build file generator for Rust crates."; + longDescription = '' + Crate2nix generates Nix files from Cargo.toml/lock files + so that you can build every crate individually in a Nix sandbox. + ''; + homepage = "https://github.com/kolloch/crate2nix"; + license = licenses.asl20; + maintainers = with maintainers; [ kolloch andir cole-h ]; + platforms = platforms.all; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix index 77a0328fc375..a398b7e504df 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix @@ -2,10 +2,10 @@ { rust-analyzer-unwrapped = callPackage ./generic.nix rec { - rev = "2020-10-12"; + rev = "2020-11-09"; version = "unstable-${rev}"; - sha256 = "194xax87pwdh3p8zx46igvqwznlpnl4jp8lj987616gyldfgall0"; - cargoSha256 = "1rvf3a2fpqpf4q52pi676qzq7h0xfqlcbp15sc5vqc8nbbs7c7vw"; + sha256 = "sha256-SX9dvx2JtYZBxA3+dHQKX/jrjbAMy37/SAybDjlYcSs="; + cargoSha256 = "sha256-+td+wMmI+MyGz9oPC+SPO2TmAV0+3lOORNY7xf6s3vI="; }; rust-analyzer = callPackage ./wrapper.nix {} { diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/rust/rust-analyzer/downgrade-smol_str.patch b/infra/libkookie/nixpkgs/pkgs/development/tools/rust/rust-analyzer/downgrade-smol_str.patch deleted file mode 100644 index c3ceb0963336..000000000000 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/rust/rust-analyzer/downgrade-smol_str.patch +++ /dev/null @@ -1,82 +0,0 @@ -This patch revert 875ad9b5c410200f5072515ae91b4ff51cff0448 (Bump smol_str from 0.1.16 to 0.1.17 ). - -diff --git a/Cargo.lock b/Cargo.lock -index 477af57aa..8b9055879 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -1470,9 +1470,9 @@ checksum = "fbee7696b84bbf3d89a1c2eccff0850e3047ed46bfcd2e92c29a2d074d57e252" - - [[package]] - name = "smol_str" --version = "0.1.17" -+version = "0.1.16" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "6ca0f7ce3a29234210f0f4f0b56f8be2e722488b95cb522077943212da3b32eb" -+checksum = "2f7909a1d8bc166a862124d84fdc11bda0ea4ed3157ccca662296919c2972db1" - dependencies = [ - "serde", - ] -diff --git a/crates/hir_expand/src/name.rs b/crates/hir_expand/src/name.rs -index a5750d829..49841c7a1 100644 ---- a/crates/hir_expand/src/name.rs -+++ b/crates/hir_expand/src/name.rs -@@ -43,8 +43,8 @@ impl Name { - } - - /// Shortcut to create inline plain text name -- const fn new_inline(text: &str) -> Name { -- Name::new_text(SmolStr::new_inline(text)) -+ const fn new_inline_ascii(text: &[u8]) -> Name { -+ Name::new_text(SmolStr::new_inline_from_ascii(text.len(), text)) - } - - /// Resolve a name from the text of token. -@@ -127,7 +127,7 @@ pub mod known { - $( - #[allow(bad_style)] - pub const $ident: super::Name = -- super::Name::new_inline(stringify!($ident)); -+ super::Name::new_inline_ascii(stringify!($ident).as_bytes()); - )* - }; - } -@@ -210,8 +210,8 @@ pub mod known { - ); - - // self/Self cannot be used as an identifier -- pub const SELF_PARAM: super::Name = super::Name::new_inline("self"); -- pub const SELF_TYPE: super::Name = super::Name::new_inline("Self"); -+ pub const SELF_PARAM: super::Name = super::Name::new_inline_ascii(b"self"); -+ pub const SELF_TYPE: super::Name = super::Name::new_inline_ascii(b"Self"); - - #[macro_export] - macro_rules! name { -diff --git a/crates/hir_ty/src/infer.rs b/crates/hir_ty/src/infer.rs -index 9a7785c76..2b53b8297 100644 ---- a/crates/hir_ty/src/infer.rs -+++ b/crates/hir_ty/src/infer.rs -@@ -555,7 +555,7 @@ impl<'a> InferenceContext<'a> { - - fn resolve_lang_item(&self, name: &str) -> Option<LangItemTarget> { - let krate = self.resolver.krate()?; -- let name = SmolStr::new_inline(name); -+ let name = SmolStr::new_inline_from_ascii(name.len(), name.as_bytes()); - self.db.lang_item(krate, name) - } - -diff --git a/crates/mbe/src/syntax_bridge.rs b/crates/mbe/src/syntax_bridge.rs -index d987b2500..a8ad917fb 100644 ---- a/crates/mbe/src/syntax_bridge.rs -+++ b/crates/mbe/src/syntax_bridge.rs -@@ -636,10 +636,7 @@ impl<'a> TreeSink for TtTreeSink<'a> { - let (text, id) = match leaf { - tt::Leaf::Ident(ident) => (ident.text.clone(), ident.id), - tt::Leaf::Punct(punct) => { -- assert!(punct.char.is_ascii()); -- let char = &(punct.char as u8); -- let text = std::str::from_utf8(std::slice::from_ref(char)).unwrap(); -- (SmolStr::new_inline(text), punct.id) -+ (SmolStr::new_inline_from_ascii(1, &[punct.char as u8]), punct.id) - } - tt::Leaf::Literal(lit) => (lit.text.clone(), lit.id), - }; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/rust/rust-analyzer/generic.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/rust/rust-analyzer/generic.nix index b25f74b90f66..1bab5b951837 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/rust/rust-analyzer/generic.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/rust/rust-analyzer/generic.nix @@ -16,18 +16,6 @@ rustPlatform.buildRustPackage { inherit rev sha256; }; - # FIXME: Temporary fixes for our rust 1.45.0 - cargoPatches = [ - ./downgrade-smol_str.patch # Requires rustc 1.46.0 - ]; - - patches = [ - ./no-track_env_var.patch # Requires rustc 1.47.0 - ./no-match-unsizing-in-const-fn.patch # Requires rustc 1.46.0 - ./no-loop-in-const-fn.patch # Requires rustc 1.46.0 - ./no-option-zip.patch # Requires rustc 1.46.0 - ]; - buildAndTestSubdir = "crates/rust-analyzer"; cargoBuildFlags = lib.optional useMimalloc "--features=mimalloc"; @@ -41,7 +29,7 @@ rustPlatform.buildRustPackage { inherit doCheck; preCheck = lib.optionalString doCheck '' - export RUST_SRC_PATH=${rustPlatform.rustcSrc} + export RUST_SRC_PATH=${rustPlatform.rustLibSrc} ''; doInstallCheck = true; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/rust/rust-analyzer/no-loop-in-const-fn.patch b/infra/libkookie/nixpkgs/pkgs/development/tools/rust/rust-analyzer/no-loop-in-const-fn.patch deleted file mode 100644 index e750b3c4e122..000000000000 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/rust/rust-analyzer/no-loop-in-const-fn.patch +++ /dev/null @@ -1,223 +0,0 @@ -This patch revert 4b989009e3839cfc6f021d1552a46561cee6cde2 (CONST LOOPS ARE HERE). - -diff --git a/crates/parser/src/grammar/expressions.rs b/crates/parser/src/grammar/expressions.rs -index 5f885edfd..e72929f8c 100644 ---- a/crates/parser/src/grammar/expressions.rs -+++ b/crates/parser/src/grammar/expressions.rs -@@ -316,7 +316,7 @@ fn expr_bp(p: &mut Parser, mut r: Restrictions, bp: u8) -> (Option<CompletedMark - } - - const LHS_FIRST: TokenSet = -- atom::ATOM_EXPR_FIRST.union(TokenSet::new(&[T![&], T![*], T![!], T![.], T![-]])); -+ atom::ATOM_EXPR_FIRST.union(token_set![T![&], T![*], T![!], T![.], T![-]]); - - fn lhs(p: &mut Parser, r: Restrictions) -> Option<(CompletedMarker, BlockLike)> { - let m; -diff --git a/crates/parser/src/grammar/expressions/atom.rs b/crates/parser/src/grammar/expressions/atom.rs -index 66a92a4e1..ba6dd2fbc 100644 ---- a/crates/parser/src/grammar/expressions/atom.rs -+++ b/crates/parser/src/grammar/expressions/atom.rs -@@ -15,7 +15,7 @@ use super::*; - // let _ = b"e"; - // let _ = br"f"; - // } --pub(crate) const LITERAL_FIRST: TokenSet = TokenSet::new(&[ -+pub(crate) const LITERAL_FIRST: TokenSet = token_set![ - TRUE_KW, - FALSE_KW, - INT_NUMBER, -@@ -25,8 +25,8 @@ pub(crate) const LITERAL_FIRST: TokenSet = TokenSet::new(&[ - STRING, - RAW_STRING, - BYTE_STRING, -- RAW_BYTE_STRING, --]); -+ RAW_BYTE_STRING -+]; - - pub(crate) fn literal(p: &mut Parser) -> Option<CompletedMarker> { - if !p.at_ts(LITERAL_FIRST) { -@@ -39,7 +39,7 @@ pub(crate) fn literal(p: &mut Parser) -> Option<CompletedMarker> { - - // E.g. for after the break in `if break {}`, this should not match - pub(super) const ATOM_EXPR_FIRST: TokenSet = -- LITERAL_FIRST.union(paths::PATH_FIRST).union(TokenSet::new(&[ -+ LITERAL_FIRST.union(paths::PATH_FIRST).union(token_set![ - T!['('], - T!['{'], - T!['['], -@@ -59,9 +59,9 @@ pub(super) const ATOM_EXPR_FIRST: TokenSet = - T![loop], - T![for], - LIFETIME, -- ])); -+ ]); - --const EXPR_RECOVERY_SET: TokenSet = TokenSet::new(&[LET_KW, R_DOLLAR]); -+const EXPR_RECOVERY_SET: TokenSet = token_set![LET_KW, R_DOLLAR]; - - pub(super) fn atom_expr(p: &mut Parser, r: Restrictions) -> Option<(CompletedMarker, BlockLike)> { - if let Some(m) = literal(p) { -diff --git a/crates/parser/src/grammar/items.rs b/crates/parser/src/grammar/items.rs -index 22810e6fb..8fd8f3b80 100644 ---- a/crates/parser/src/grammar/items.rs -+++ b/crates/parser/src/grammar/items.rs -@@ -26,7 +26,7 @@ pub(super) fn mod_contents(p: &mut Parser, stop_on_r_curly: bool) { - } - } - --pub(super) const ITEM_RECOVERY_SET: TokenSet = TokenSet::new(&[ -+pub(super) const ITEM_RECOVERY_SET: TokenSet = token_set![ - FN_KW, - STRUCT_KW, - ENUM_KW, -@@ -41,7 +41,7 @@ pub(super) const ITEM_RECOVERY_SET: TokenSet = TokenSet::new(&[ - USE_KW, - MACRO_KW, - T![;], --]); -+]; - - pub(super) fn item_or_macro(p: &mut Parser, stop_on_r_curly: bool) { - let m = p.start(); -diff --git a/crates/parser/src/grammar/paths.rs b/crates/parser/src/grammar/paths.rs -index 5d297e2d6..52562afa4 100644 ---- a/crates/parser/src/grammar/paths.rs -+++ b/crates/parser/src/grammar/paths.rs -@@ -3,7 +3,7 @@ - use super::*; - - pub(super) const PATH_FIRST: TokenSet = -- TokenSet::new(&[IDENT, T![self], T![super], T![crate], T![:], T![<]]); -+ token_set![IDENT, T![self], T![super], T![crate], T![:], T![<]]; - - pub(super) fn is_path_start(p: &Parser) -> bool { - is_use_path_start(p) || p.at(T![<]) -diff --git a/crates/parser/src/grammar/patterns.rs b/crates/parser/src/grammar/patterns.rs -index 796f206e1..07b1d6dd5 100644 ---- a/crates/parser/src/grammar/patterns.rs -+++ b/crates/parser/src/grammar/patterns.rs -@@ -2,18 +2,9 @@ - - use super::*; - --pub(super) const PATTERN_FIRST: TokenSet = -- expressions::LITERAL_FIRST.union(paths::PATH_FIRST).union(TokenSet::new(&[ -- T![box], -- T![ref], -- T![mut], -- T!['('], -- T!['['], -- T![&], -- T![_], -- T![-], -- T![.], -- ])); -+pub(super) const PATTERN_FIRST: TokenSet = expressions::LITERAL_FIRST -+ .union(paths::PATH_FIRST) -+ .union(token_set![T![box], T![ref], T![mut], T!['('], T!['['], T![&], T![_], T![-], T![.]]); - - pub(crate) fn pattern(p: &mut Parser) { - pattern_r(p, PAT_RECOVERY_SET); -@@ -83,7 +74,7 @@ fn pattern_single_r(p: &mut Parser, recovery_set: TokenSet) { - } - - const PAT_RECOVERY_SET: TokenSet = -- TokenSet::new(&[LET_KW, IF_KW, WHILE_KW, LOOP_KW, MATCH_KW, R_PAREN, COMMA]); -+ token_set![LET_KW, IF_KW, WHILE_KW, LOOP_KW, MATCH_KW, R_PAREN, COMMA]; - - fn atom_pat(p: &mut Parser, recovery_set: TokenSet) -> Option<CompletedMarker> { - let m = match p.nth(0) { -diff --git a/crates/parser/src/grammar/types.rs b/crates/parser/src/grammar/types.rs -index 1ea130ac5..9d00eb9b9 100644 ---- a/crates/parser/src/grammar/types.rs -+++ b/crates/parser/src/grammar/types.rs -@@ -2,7 +2,7 @@ - - use super::*; - --pub(super) const TYPE_FIRST: TokenSet = paths::PATH_FIRST.union(TokenSet::new(&[ -+pub(super) const TYPE_FIRST: TokenSet = paths::PATH_FIRST.union(token_set![ - T!['('], - T!['['], - T![<], -@@ -16,16 +16,16 @@ pub(super) const TYPE_FIRST: TokenSet = paths::PATH_FIRST.union(TokenSet::new(&[ - T![for], - T![impl], - T![dyn], --])); -+]); - --const TYPE_RECOVERY_SET: TokenSet = TokenSet::new(&[ -+const TYPE_RECOVERY_SET: TokenSet = token_set![ - T![')'], - T![,], - L_DOLLAR, - // test_err struct_field_recover - // struct S { f pub g: () } - T![pub], --]); -+]; - - pub(crate) fn type_(p: &mut Parser) { - type_with_bounds_cond(p, true); -diff --git a/crates/parser/src/token_set.rs b/crates/parser/src/token_set.rs -index a68f0144e..994017acf 100644 ---- a/crates/parser/src/token_set.rs -+++ b/crates/parser/src/token_set.rs -@@ -9,21 +9,15 @@ pub(crate) struct TokenSet(u128); - impl TokenSet { - pub(crate) const EMPTY: TokenSet = TokenSet(0); - -- pub(crate) const fn new(kinds: &[SyntaxKind]) -> TokenSet { -- let mut res = 0u128; -- let mut i = 0; -- while i < kinds.len() { -- res |= mask(kinds[i]); -- i += 1 -- } -- TokenSet(res) -+ pub(crate) const fn singleton(kind: SyntaxKind) -> TokenSet { -+ TokenSet(mask(kind)) - } - - pub(crate) const fn union(self, other: TokenSet) -> TokenSet { - TokenSet(self.0 | other.0) - } - -- pub(crate) const fn contains(&self, kind: SyntaxKind) -> bool { -+ pub(crate) fn contains(&self, kind: SyntaxKind) -> bool { - self.0 & mask(kind) != 0 - } - } -@@ -32,10 +26,16 @@ const fn mask(kind: SyntaxKind) -> u128 { - 1u128 << (kind as usize) - } - -+#[macro_export] -+macro_rules! token_set { -+ ($($t:expr),*) => { TokenSet::EMPTY$(.union(TokenSet::singleton($t)))* }; -+ ($($t:expr),* ,) => { token_set!($($t),*) }; -+} -+ - #[test] - fn token_set_works_for_tokens() { - use crate::SyntaxKind::*; -- let ts = TokenSet::new(&[EOF, SHEBANG]); -+ let ts = token_set![EOF, SHEBANG]; - assert!(ts.contains(EOF)); - assert!(ts.contains(SHEBANG)); - assert!(!ts.contains(PLUS)); -diff --git a/xtask/src/install.rs b/xtask/src/install.rs -index d829790d7..b25a6e301 100644 ---- a/xtask/src/install.rs -+++ b/xtask/src/install.rs -@@ -7,7 +7,7 @@ use anyhow::{bail, format_err, Context, Result}; - use crate::not_bash::{pushd, run}; - - // Latest stable, feel free to send a PR if this lags behind. --const REQUIRED_RUST_VERSION: u32 = 46; -+const REQUIRED_RUST_VERSION: u32 = 43; - - pub struct InstallCmd { - pub client: Option<ClientOpt>, diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/rust/rust-analyzer/no-match-unsizing-in-const-fn.patch b/infra/libkookie/nixpkgs/pkgs/development/tools/rust/rust-analyzer/no-match-unsizing-in-const-fn.patch deleted file mode 100644 index 3bdd4c8a727b..000000000000 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/rust/rust-analyzer/no-match-unsizing-in-const-fn.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/crates/assists/src/handlers/convert_integer_literal.rs b/crates/assists/src/handlers/convert_integer_literal.rs -index ea35e833a..4df80a3c0 100644 ---- a/crates/assists/src/handlers/convert_integer_literal.rs -+++ b/crates/assists/src/handlers/convert_integer_literal.rs -@@ -105,7 +105,7 @@ impl IntegerLiteralBase { - } - } - -- const fn base(&self) -> u32 { -+ fn base(&self) -> u32 { - match self { - Self::Binary => 2, - Self::Octal => 8, -@@ -114,14 +114,14 @@ impl IntegerLiteralBase { - } - } - -- const fn prefix_len(&self) -> usize { -+ fn prefix_len(&self) -> usize { - match self { - Self::Decimal => 0, - _ => 2, - } - } - -- const fn bases() -> &'static [IntegerLiteralBase] { -+ fn bases() -> &'static [IntegerLiteralBase] { - &[ - IntegerLiteralBase::Binary, - IntegerLiteralBase::Octal, diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/rust/rust-analyzer/no-option-zip.patch b/infra/libkookie/nixpkgs/pkgs/development/tools/rust/rust-analyzer/no-option-zip.patch deleted file mode 100644 index 5b1089ba9b87..000000000000 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/rust/rust-analyzer/no-option-zip.patch +++ /dev/null @@ -1,52 +0,0 @@ -diff --git a/crates/assists/src/handlers/merge_imports.rs b/crates/assists/src/handlers/merge_imports.rs -index fe33cee53..2184a4154 100644 ---- a/crates/assists/src/handlers/merge_imports.rs -+++ b/crates/assists/src/handlers/merge_imports.rs -@@ -32,7 +32,7 @@ pub(crate) fn merge_imports(acc: &mut Assists, ctx: &AssistContext) -> Option<() - if let Some(use_item) = tree.syntax().parent().and_then(ast::Use::cast) { - let (merged, to_delete) = - next_prev().filter_map(|dir| neighbor(&use_item, dir)).find_map(|use_item2| { -- try_merge_imports(&use_item, &use_item2, MergeBehaviour::Full).zip(Some(use_item2)) -+ Some((try_merge_imports(&use_item, &use_item2, MergeBehaviour::Full)?, use_item2)) - })?; - - rewriter.replace_ast(&use_item, &merged); -@@ -44,7 +44,7 @@ pub(crate) fn merge_imports(acc: &mut Assists, ctx: &AssistContext) -> Option<() - } else { - let (merged, to_delete) = - next_prev().filter_map(|dir| neighbor(&tree, dir)).find_map(|use_tree| { -- try_merge_trees(&tree, &use_tree, MergeBehaviour::Full).zip(Some(use_tree)) -+ Some((try_merge_trees(&tree, &use_tree, MergeBehaviour::Full)?, use_tree)) - })?; - - rewriter.replace_ast(&tree, &merged); -diff --git a/crates/assists/src/utils/insert_use.rs b/crates/assists/src/utils/insert_use.rs -index f6025c99a..f9bd31cf3 100644 ---- a/crates/assists/src/utils/insert_use.rs -+++ b/crates/assists/src/utils/insert_use.rs -@@ -274,7 +274,7 @@ fn common_prefix(lhs: &ast::Path, rhs: &ast::Path) -> Option<(ast::Path, ast::Pa - } - res = Some((lhs_curr.clone(), rhs_curr.clone())); - -- match lhs_curr.parent_path().zip(rhs_curr.parent_path()) { -+ match zip(lhs_curr.parent_path(), rhs_curr.parent_path()) { - Some((lhs, rhs)) => { - lhs_curr = lhs; - rhs_curr = rhs; -@@ -452,7 +452,7 @@ fn find_insert_position( - let path_node_iter = scope - .as_syntax_node() - .children() -- .filter_map(|node| ast::Use::cast(node.clone()).zip(Some(node))) -+ .filter_map(|node| Some((ast::Use::cast(node.clone())?, node))) - .flat_map(|(use_, node)| { - let tree = use_.use_tree()?; - let path = tree.path()?; -@@ -989,3 +989,7 @@ use foo::bar::baz::Qux;", - assert_eq!(result.map(|u| u.to_string()), None); - } - } -+ -+fn zip<T, U>(x: Option<T>, y: Option<U>) -> Option<(T, U)> { -+ Some((x?, y?)) -+} diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/rust/rust-analyzer/no-track_env_var.patch b/infra/libkookie/nixpkgs/pkgs/development/tools/rust/rust-analyzer/no-track_env_var.patch deleted file mode 100644 index f5173c4bacbc..000000000000 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/rust/rust-analyzer/no-track_env_var.patch +++ /dev/null @@ -1,120 +0,0 @@ -This patch revert 3d169bd3f4cdc2dc3dd09eadbbc17c19214d69f3 (Add track_env_var to the proc macro server). - -diff --git a/crates/proc_macro_srv/src/proc_macro/bridge/client.rs b/crates/proc_macro_srv/src/proc_macro/bridge/client.rs -index 55d6330cc..cb4b3bdb0 100644 ---- a/crates/proc_macro_srv/src/proc_macro/bridge/client.rs -+++ b/crates/proc_macro_srv/src/proc_macro/bridge/client.rs -@@ -160,7 +160,6 @@ macro_rules! define_handles { - } - define_handles! { - 'owned: -- FreeFunctions, - TokenStream, - TokenStreamBuilder, - TokenStreamIter, -diff --git a/crates/proc_macro_srv/src/proc_macro/bridge/mod.rs b/crates/proc_macro_srv/src/proc_macro/bridge/mod.rs -index b97886eb9..aeb05aad4 100644 ---- a/crates/proc_macro_srv/src/proc_macro/bridge/mod.rs -+++ b/crates/proc_macro_srv/src/proc_macro/bridge/mod.rs -@@ -57,10 +57,6 @@ use std::thread; - macro_rules! with_api { - ($S:ident, $self:ident, $m:ident) => { - $m! { -- FreeFunctions { -- fn drop($self: $S::FreeFunctions); -- fn track_env_var(var: &str, value: Option<&str>); -- }, - TokenStream { - fn drop($self: $S::TokenStream); - fn clone($self: &$S::TokenStream) -> $S::TokenStream; -diff --git a/crates/proc_macro_srv/src/proc_macro/bridge/server.rs b/crates/proc_macro_srv/src/proc_macro/bridge/server.rs -index 3acb239af..45d41ac02 100644 ---- a/crates/proc_macro_srv/src/proc_macro/bridge/server.rs -+++ b/crates/proc_macro_srv/src/proc_macro/bridge/server.rs -@@ -11,8 +11,6 @@ use super::client::HandleStore; - /// Declare an associated item of one of the traits below, optionally - /// adjusting it (i.e., adding bounds to types and default bodies to methods). - macro_rules! associated_item { -- (type FreeFunctions) => -- (type FreeFunctions: 'static;); - (type TokenStream) => - (type TokenStream: 'static + Clone;); - (type TokenStreamBuilder) => -diff --git a/crates/proc_macro_srv/src/proc_macro/mod.rs b/crates/proc_macro_srv/src/proc_macro/mod.rs -index fc6e7344f..ee0dc9722 100644 ---- a/crates/proc_macro_srv/src/proc_macro/mod.rs -+++ b/crates/proc_macro_srv/src/proc_macro/mod.rs -@@ -924,25 +924,3 @@ impl fmt::Debug for Literal { - self.0.fmt(f) - } - } -- --pub mod tracked_env { -- use std::env::{self, VarError}; -- use std::ffi::OsStr; -- -- /// Retrieve an environment variable and add it to build dependency info. -- /// Build system executing the compiler will know that the variable was accessed during -- /// compilation, and will be able to rerun the build when the value of that variable changes. -- /// Besides the dependency tracking this function should be equivalent to `env::var` from the -- /// standard library, except that the argument must be UTF-8. -- pub fn var<K: AsRef<OsStr> + AsRef<str>>(key: K) -> Result<String, VarError> { -- use std::ops::Deref; -- -- let key: &str = key.as_ref(); -- let value = env::var(key); -- super::bridge::client::FreeFunctions::track_env_var( -- key, -- value.as_ref().map(|t| t.deref()).ok(), -- ); -- value -- } --} -diff --git a/crates/proc_macro_srv/src/rustc_server.rs b/crates/proc_macro_srv/src/rustc_server.rs -index c5fe3591e..7d1695c86 100644 ---- a/crates/proc_macro_srv/src/rustc_server.rs -+++ b/crates/proc_macro_srv/src/rustc_server.rs -@@ -242,8 +242,6 @@ impl TokenStreamBuilder { - } - } - --pub struct FreeFunctions; -- - #[derive(Clone)] - pub struct TokenStreamIter { - trees: IntoIter<TokenTree>, -@@ -256,7 +254,6 @@ pub struct Rustc { - } - - impl server::Types for Rustc { -- type FreeFunctions = FreeFunctions; - type TokenStream = TokenStream; - type TokenStreamBuilder = TokenStreamBuilder; - type TokenStreamIter = TokenStreamIter; -@@ -270,13 +267,6 @@ impl server::Types for Rustc { - type MultiSpan = Vec<Span>; - } - --impl server::FreeFunctions for Rustc { -- fn track_env_var(&mut self, _var: &str, _value: Option<&str>) { -- // FIXME: track env var accesses -- // https://github.com/rust-lang/rust/pull/71858 -- } --} -- - impl server::TokenStream for Rustc { - fn new(&mut self) -> Self::TokenStream { - Self::TokenStream::new() -diff --git a/xtask/src/install.rs b/xtask/src/install.rs -index fcc4f05e4..d829790d7 100644 ---- a/xtask/src/install.rs -+++ b/xtask/src/install.rs -@@ -7,7 +7,7 @@ use anyhow::{bail, format_err, Context, Result}; - use crate::not_bash::{pushd, run}; - - // Latest stable, feel free to send a PR if this lags behind. --const REQUIRED_RUST_VERSION: u32 = 47; -+const REQUIRED_RUST_VERSION: u32 = 46; - - pub struct InstallCmd { - pub client: Option<ClientOpt>, diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/rust/rust-analyzer/update.sh b/infra/libkookie/nixpkgs/pkgs/development/tools/rust/rust-analyzer/update.sh index b0435be72083..f08ea67cf22d 100755 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/rust/rust-analyzer/update.sh +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/rust/rust-analyzer/update.sh @@ -24,24 +24,24 @@ echo "$old_rev -> $rev" sha256=$(nix-prefetch -f "$nixpkgs" rust-analyzer-unwrapped.src --rev "$rev") # Clear cargoSha256 to avoid inconsistency. -sed -e "s/rev = \".*\"/rev = \"$rev\"/" \ - -e "s/sha256 = \".*\"/sha256 = \"$sha256\"/" \ - -e "s/cargoSha256 = \".*\"/cargoSha256 = \"\"/" \ +sed -e "s#rev = \".*\"#rev = \"$rev\"#" \ + -e "s#sha256 = \".*\"#sha256 = \"$sha256\"#" \ + -e "s#cargoSha256 = \".*\"#cargoSha256 = \"\"#" \ --in-place ./default.nix node_src="$(nix-build "$nixpkgs" -A rust-analyzer.src --no-out-link)/editors/code" # Check vscode compatibility req_vscode_ver="$(jq '.engines.vscode' "$node_src/package.json" --raw-output)" req_vscode_ver="${req_vscode_ver#^}" -cur_vscode_ver="$(nix eval --raw -f "$nixpkgs" vscode.version)" -if [[ "$(nix eval "(builtins.compareVersions \"$req_vscode_ver\" \"$cur_vscode_ver\")")" -gt 0 ]]; then +cur_vscode_ver="$(nix-instantiate --eval --strict "$nixpkgs" -A vscode.version | tr -d '"')" +if [[ "$(nix-instantiate --eval --strict -E "(builtins.compareVersions \"$req_vscode_ver\" \"$cur_vscode_ver\")")" -gt 0 ]]; then echo "vscode $cur_vscode_ver is incompatible with the extension requiring ^$req_vscode_ver" exit 1 fi echo "Prebuilding for cargoSha256" cargo_sha256=$(nix-prefetch "{ sha256 }: (import $nixpkgs {}).rust-analyzer-unwrapped.cargoDeps.overrideAttrs (_: { outputHash = sha256; })") -sed "s/cargoSha256 = \".*\"/cargoSha256 = \"$cargo_sha256\"/" \ +sed "s#cargoSha256 = \".*\"#cargoSha256 = \"$cargo_sha256\"#" \ --in-place ./default.nix # Update vscode extension diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/rust/rust-analyzer/wrapper.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/rust/rust-analyzer/wrapper.nix index 8ca3ff1a6d20..bed206281826 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/rust/rust-analyzer/wrapper.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/rust/rust-analyzer/wrapper.nix @@ -4,7 +4,8 @@ lib.makeOverridable ({ unwrapped, pname ? "rust-analyzer", version ? unwrapped.version, - rustcSrc ? rustPlatform.rustcSrc, + # Use name from `RUST_SRC_PATH` + rustSrc ? rustPlatform.rustLibSrc, }: runCommandNoCC "${pname}-${version}" { inherit pname version; inherit (unwrapped) src meta; @@ -12,5 +13,5 @@ lib.makeOverridable ({ } '' mkdir -p $out/bin makeWrapper ${unwrapped}/bin/rust-analyzer $out/bin/rust-analyzer \ - --set-default RUST_SRC_PATH "${rustcSrc}" + --set-default RUST_SRC_PATH "${rustSrc}" '') diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/scry/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/scry/default.nix index ed823896ad0f..dcb8087372da 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/scry/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/scry/default.nix @@ -38,6 +38,6 @@ in crystal.buildCrystalPackage rec { description = "Code analysis server for the Crystal programming language"; homepage = "https://github.com/crystal-lang-tools/scry"; license = licenses.mit; - maintainers = with maintainers; [ peterhoeg filalex77 ]; + maintainers = with maintainers; [ peterhoeg Br1ght0ne ]; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/sd-local/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/sd-local/default.nix index 06f6c08feefa..b7e6021a6d8e 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/sd-local/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/sd-local/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "sd-local"; - version = "1.0.5"; + version = "1.0.17"; src = fetchFromGitHub { owner = "screwdriver-cd"; repo = pname; rev = "v${version}"; - sha256 = "09j1wcx66sz2b0pps0bgbay5x06lc0d2awxjvd5zi8wqnbsrdq60"; + sha256 = "13krr1zjh544swv4frfapvyi7bm8qf121x6qz9jqbw2cm3mid301"; }; - vendorSha256 = "1qy51jx181rwim2v53ysgf7rys0nmxsbawvsbh3z1ihh3dlgw5bc"; + vendorSha256 = "1y4nyw7rpgipblxqaps2zsd07cin8d0i0g9gvsnc3vifi6g29s8z"; subPackages = [ "." ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/selenium/chromedriver/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/selenium/chromedriver/default.nix index fc743d560168..de1c9c9c11aa 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/selenium/chromedriver/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/selenium/chromedriver/default.nix @@ -1,17 +1,20 @@ -{ stdenv, fetchurl, cairo, fontconfig, freetype, gdk-pixbuf, glib -, glibc, gtk2, libX11, makeWrapper, nspr, nss, pango, unzip, gconf +{ stdenv, fetchurl, unzip, makeWrapper +, cairo, fontconfig, freetype, gdk-pixbuf, glib +, glibc, gtk2, libX11, nspr, nss, pango, gconf , libxcb, libXi, libXrender, libXext }: + let + upstream-info = (stdenv.lib.importJSON ../../../../applications/networking/browsers/chromium/upstream-info.json).stable.chromedriver; allSpecs = { x86_64-linux = { system = "linux64"; - sha256 = "0absr1fp2h87gpyw6jxj2f08sbhkkh3pf13145hfyzdvajj5rfjy"; + sha256 = upstream-info.sha256_linux; }; x86_64-darwin = { system = "mac64"; - sha256 = "1p9k92fgyx0xis6r50vhcpx3iws2gaspq3dnpigglv3bj9yg8zvi"; + sha256 = upstream-info.sha256_darwin; }; }; @@ -25,10 +28,10 @@ let libX11 nspr nss pango libXrender gconf libxcb libXext libXi ]; -in -stdenv.mkDerivation rec { + +in stdenv.mkDerivation rec { pname = "chromedriver"; - version = "85.0.4183.87"; + version = upstream-info.version; src = fetchurl { url = "https://chromedriver.storage.googleapis.com/${version}/chromedriver_${spec.system}.zip"; @@ -47,10 +50,18 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = "https://sites.google.com/a/chromium.org/chromedriver"; + homepage = "https://chromedriver.chromium.org/"; description = "A WebDriver server for running Selenium tests on Chrome"; + longDescription = '' + WebDriver is an open source tool for automated testing of webapps across + many browsers. It provides capabilities for navigating to web pages, user + input, JavaScript execution, and more. ChromeDriver is a standalone + server that implements the W3C WebDriver standard. + ''; license = licenses.bsd3; - maintainers = [ maintainers.goibhniu maintainers.marsam ]; + maintainers = with maintainers; [ goibhniu marsam primeos ]; + # Note from primeos: By updating Chromium I also update Google Chrome and + # ChromeDriver. platforms = attrNames allSpecs; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/selenium/server/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/selenium/server/default.nix index a93275f6e2ed..a6d60e33ee36 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/selenium/server/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/selenium/server/default.nix @@ -4,8 +4,8 @@ with stdenv.lib; let - minorVersion = "3.6"; - patchVersion = "0"; + minorVersion = "3.141"; + patchVersion = "59"; in stdenv.mkDerivation rec { pname = "selenium-server-standalone"; @@ -13,7 +13,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "http://selenium-release.storage.googleapis.com/${minorVersion}/selenium-server-standalone-${version}.jar"; - sha256 = "11v340nm8vzqc2bkmbjfm9a7j4dj0bi9bfk8wdpfan0fb8prf772"; + sha256 = "1jzkx0ahsb27zzzfvjqv660x9fz2pbcddgmhdzdmasxns5vipxxc"; }; dontUnpack = true; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/skaffold/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/skaffold/default.nix index d0b0bff05be1..0f29fc741c63 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/skaffold/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/skaffold/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "skaffold"; - version = "1.15.0"; + version = "1.17.1"; goPackagePath = "github.com/GoogleContainerTools/skaffold"; subPackages = ["cmd/skaffold"]; @@ -19,7 +19,7 @@ buildGoPackage rec { owner = "GoogleContainerTools"; repo = "skaffold"; rev = "v${version}"; - sha256 = "0cir9ld61pq1rziw6vyz1ihkq0aylzrsxg1vqb9544rwnbq7z2qs"; + sha256 = "1q1rzqsga728cjv89lpgnwjb22azlmkffki9m0q21r1njzc3w74h"; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/sourcetrail/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/sourcetrail/default.nix index 9e41f209cfd6..91653d3773e1 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/sourcetrail/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/sourcetrail/default.nix @@ -1,77 +1,213 @@ -{ stdenv, fetchurl, autoPatchelfHook -, zlib, expat, dbus, openssl, python3 }: +{ stdenv, fetchFromGitHub, callPackage, writeScript, cmake, wrapQtAppsHook +, boost, qt5, llvmPackages, gcc, jdk, pythonPackages, desktop-file-utils +, shared-mime-info, imagemagick, which, coreutils, maven, fetchpatch }: + +let + # TODO: remove when version incompatibility issue with python3Packages.jedi is + # resolved + parso = pythonPackages.callPackage ./parso.nix {}; + jedi = pythonPackages.callPackage ./jedi.nix { inherit parso; }; + + pythonIndexer = pythonPackages.callPackage ./python.nix { inherit jedi parso; }; + javaIndexer = callPackage ./java.nix {}; + + # Upstream script: + # https://github.com/CoatiSoftware/Sourcetrail/blob/master/script/update_java_indexer.sh + installJavaIndexer = writeScript "update_java_indexer.sh" '' + #!${stdenv.shell} + + cd "$(dirname "$0")/.." + dst="$out/opt/sourcetrail/share/data/java/lib" + + mkdir -p "$dst" + cp "${javaIndexer}/target/java-indexer-1.0.jar" "$dst/java-indexer.jar" + cp -r java_indexer/lib/*.jar "$dst" + ''; + + # Upstream script: + # https://github.com/CoatiSoftware/Sourcetrail/blob/master/script/download_python_indexer.sh + installPythonIndexer = writeScript "download_python_indexer.sh" '' + #!${stdenv.shell} + mkdir -p $out/opt/sourcetrail/share/data + ln -s "${pythonIndexer}/bin" "$out/opt/sourcetrail/share/data/python" + ''; +in stdenv.mkDerivation rec { pname = "sourcetrail"; - version = "2019.3.46"; + version = "2020.2.43"; - src = fetchurl { - name = "sourtrail.tar.gz"; - url = "https://www.sourcetrail.com/downloads/${version}/linux/64bit"; - sha256 = "0dnkxr3fijcsbn6pd20lyxhr9ns6ji1c4dffly9s16yq4x9ad5r4"; + src = fetchFromGitHub { + owner = "CoatiSoftware"; + repo = "Sourcetrail"; + rev = version; + sha256 = "0jp9y86xzkcxikc1cn4f6gqgg6zdssck08677ldagw25p1zadvzw"; }; - nativeBuildInputs = [ autoPatchelfHook ]; - buildInputs = [ zlib expat dbus stdenv.cc.cc openssl python3 ]; - - installPhase = '' - runHook preInstall - - mkdir -p $out/bin $out/opt - - mv -v setup/share $out - mv -v data/gui/icon/logo_1024_1024.png $out/share/icons/sourcetrail.png - mv -v data/gui/icon/project_256_256.png $out/share/icons/project-sourcetrail.png - - mkdir -p $out/share/sourcetrail/doc - mv -v README EULA.txt $out/share/sourcetrail/doc - mv -v plugin $out/share/sourcetrail - - cp -rv . $out/opt - - rm $out/opt/lib/libssl.so - rm $out/opt/lib/platforms/{libqeglfs.so,libqwebgl.so} - ln -s ${openssl}/lib/libssl.so $out/opt/lib/libssl.so - - substituteInPlace \ - $out/share/applications/sourcetrail.desktop \ - --replace /usr/bin/ $out/bin/ - - cat <<EOF > $out/bin/sourcetrail - #! ${stdenv.shell} -e + patches = let + url = commit: "https://github.com/CoatiSoftware/Sourcetrail/commit/${commit}.patch"; + in [ + ./disable-updates.patch + ./disable-failing-tests.patch # FIXME: 5 test cases failing due to sandbox + # TODO: remove on next release + (fetchpatch { + name = "fix-filecopy.patch"; + url = url "d079d1787c9e5cadcf41a003666dc0746cc1cda0"; + sha256 = "0mixy2a4s16kv2q89k7y4dv21wnv2zd86i4gdwn3xz977y8hf92b"; + }) + (fetchpatch { + name = "fix-broken-test.patch"; + url = url "85329174bac8a301733100dc4540258f977e2c5a"; + sha256 = "17l4417sbmkrgr6v3fbazlmkzl9774zrpjv2n9zwfrz52y30f7b9"; + }) + ]; + + nativeBuildInputs = [ + cmake + jdk + wrapQtAppsHook + desktop-file-utils + imagemagick + javaIndexer # the resulting jar file is copied by our install script + ] ++ stdenv.lib.optionals doCheck testBinPath; + buildInputs = [ + boost pythonIndexer shared-mime-info + ] ++ (with qt5; [ qtbase qtsvg ]) + ++ (with llvmPackages; [ libclang llvm ]); + binPath = [ gcc jdk.jre maven which ]; + testBinPath = binPath ++ [ coreutils ]; + + cmakeFlags = [ + "-DBoost_USE_STATIC_LIBS=OFF" + "-DBUILD_CXX_LANGUAGE_PACKAGE=ON" + "-DCMAKE_PREFIX_PATH=${llvmPackages.clang-unwrapped}" + "-DBUILD_JAVA_LANGUAGE_PACKAGE=ON" + "-DBUILD_PYTHON_LANGUAGE_PACKAGE=ON" + ]; + + postPatch = let + major = stdenv.lib.versions.major version; + minor = stdenv.lib.versions.minor version; + patch = stdenv.lib.versions.patch version; + in '' + # Upstream script obtains it's version from git: + # https://github.com/CoatiSoftware/Sourcetrail/blob/master/cmake/version.cmake + cat > cmake/version.cmake <<EOF + set(GIT_BRANCH "") + set(GIT_COMMIT_HASH "") + set(GIT_VERSION_NUMBER "") + set(VERSION_YEAR "${major}") + set(VERSION_MINOR "${minor}") + set(VERSION_COMMIT "${patch}") + set(BUILD_TYPE "Release") + set(VERSION_STRING "${major}.${minor}.${patch}") + EOF - # XXX: Sourcetrail somehow copies the initial config files into the home - # directory without write permissions. We currently just copy them - # ourselves to work around this problem. - setup_config() { - local src dst + # Sourcetrail attempts to copy clang headers from the LLVM store path + substituteInPlace CMakeLists.txt \ + --replace "\''${LLVM_BINARY_DIR}" '${llvmPackages.clang-unwrapped}' - [ ! -d ~/.config/sourcetrail ] && mkdir -p ~/.config/sourcetrail - for src in $out/opt/data/fallback/*; do - dst=~/.config/sourcetrail/"\$(basename "\$src")" - if [ ! -e "\$dst" ]; then - cp -r "\$src" "\$dst" - fi - done + patchShebangs script + ln -sf ${installJavaIndexer} script/update_java_indexer.sh + ln -sf ${installPythonIndexer} script/download_python_indexer.sh + ''; - chmod -R u+w ~/.config/sourcetrail - } + # Sourcetrail doesn't use the usual cmake install() commands and instead uses + # its own bash script for packaging. Since we're not able to reuse the script, + # we'll have to roll our own in nixpkgs. + # + # Sourcetrail currently assumes one of the following two layouts for the + # placement of its files: + # + # AppImage Layout Traditional Layout + # ├── bin/ ├── sourcetrail* + # │  └── sourcetrail* └── data/ + # └── share/ + # └── data/ sourcetrail: application executable + # data: contains assets exlusive to Sourcetrail + # + # The AppImage layout is the one currently used by the upstream project for + # packaging its Linux port. We can't use this layout as-is for nixpkgs, + # because Sourcetrail treating $out/share/data as its own might lead to + # conflicts with other packages when linked into a Nix profile. + # + # On the other hand, the traditional layout isn't used by the upstream project + # anymore so there's a risk that it might become unusable at any time in the + # future. Since it's hard to detect these problems at build time, it's not a + # good idea to use this layout for packaging in nixpkgs. + # + # Considering the problems with the above layouts, we go with the third + # option, a slight variation of the AppImage layout: + # + # nixpkgs + # ├── bin/ + # │  └── sourcetrail* (wrapper for opt/sourcetrail/bin/sourcetrail) + # └── opt/sourcetrail/ + # ├── bin/ + # │  └── sourcetrail* + # └── share/ + # └── data/ + # + # Upstream install script: + # https://github.com/CoatiSoftware/Sourcetrail/blob/master/setup/Linux/createPackages.sh + installPhase = '' + mkdir -p $out/opt/sourcetrail/bin + cp app/Sourcetrail $out/opt/sourcetrail/bin/sourcetrail + cp app/sourcetrail_indexer $out/opt/sourcetrail/bin/sourcetrail_indexer + + desktop-file-install --dir=$out/share/applications \ + --set-key Exec --set-value $out/bin/sourcetrail \ + ../setup/Linux/data/sourcetrail.desktop + + mkdir -p $out/share/mime/packages + cp ../setup/Linux/data/sourcetrail-mime.xml $out/share/mime/packages/ + + mkdir -p $out/opt/sourcetrail/share + cp -R ../bin/app/data $out/opt/sourcetrail/share + cp -R ../bin/app/user/projects $out/opt/sourcetrail/share/data/fallback + rm $out/opt/sourcetrail/share/data/*_template.xml + rm -r $out/opt/sourcetrail/share/data/install + + for size in 48 64 128 256 512; do + mkdir -p $out/share/icons/hicolor/''${size}x''${size}/apps/ + convert app/data/gui/icon/logo_1024_1024.png -resize ''${size}x''${size} \ + $out/share/icons/hicolor/''${size}x''${size}/apps/sourcetrail.png + done + + mkdir -p $out/bin + makeQtWrapper $out/opt/sourcetrail/bin/sourcetrail $out/bin/sourcetrail \ + --prefix PATH : ${stdenv.lib.makeBinPath binPath} + ''; - [ -d "\$HOME" ] && setup_config - export PATH="\$PATH:${python3}/bin" - exec "$out/opt/Sourcetrail.sh" "\$@" - EOF + checkPhase = '' + rm -rf ../bin/app/data/{python,java/lib} + ln -s $out/opt/sourcetrail/share/data/python ../bin/app/data/python + ln -s $out/opt/sourcetrail/share/data/java/lib ../bin/app/data/java/lib + + pushd test + # shorten PATH to prevent build failures + wrapQtApp ./Sourcetrail_test \ + --set PATH "" \ + --prefix PATH : ${stdenv.lib.makeBinPath testBinPath} \ + --set MAVEN_OPTS "-Dmaven.repo.local=$TMPDIR/m2repo" + ./Sourcetrail_test + popd + + rm ../bin/app/data/{python,java/lib} + ''; - chmod +x $out/bin/sourcetrail + # This has to be done manually in the installPhase because the actual binary + # lives in $out/opt/sourcetrail/bin, which isn't covered by wrapQtAppsHook + dontWrapQtApps = true; - runHook postInstall - ''; + # FIXME: some test cases are disabled in the patch phase + doCheck = true; meta = with stdenv.lib; { homepage = "https://www.sourcetrail.com"; description = "A cross-platform source explorer for C/C++ and Java"; - platforms = [ "x86_64-linux" ]; - license = licenses.unfree; + platforms = platforms.all; + license = licenses.gpl3; maintainers = with maintainers; [ midchildan ]; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/sourcetrail/disable-failing-tests.patch b/infra/libkookie/nixpkgs/pkgs/development/tools/sourcetrail/disable-failing-tests.patch new file mode 100644 index 000000000000..7903642ef585 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/sourcetrail/disable-failing-tests.patch @@ -0,0 +1,48 @@ +diff --git a/src/test/SourceGroupTestSuite.cpp b/src/test/SourceGroupTestSuite.cpp +index b5c5562a..d56b83bb 100644 +--- a/src/test/SourceGroupTestSuite.cpp ++++ b/src/test/SourceGroupTestSuite.cpp +@@ -522,6 +522,7 @@ TEST_CASE("sourcegroup java gradle generates expected output") + + TEST_CASE("sourcegroup java maven generates expected output") + { ++ return; + std::vector<FilePath> mavenPaths = utility::getMavenExecutablePathDetector()->getPaths(); + + REQUIRE(!mavenPaths.empty()); +diff --git a/src/test/UtilityMavenTestSuite.cpp b/src/test/UtilityMavenTestSuite.cpp +index f48fe2b6..363ef64a 100644 +--- a/src/test/UtilityMavenTestSuite.cpp ++++ b/src/test/UtilityMavenTestSuite.cpp +@@ -17,6 +17,7 @@ TEST_CASE("maven path detector is working") + + TEST_CASE("maven wrapper detects source directories of simple projects") + { ++ return; + std::shared_ptr<PathDetector> mavenPathDetector = utility::getMavenExecutablePathDetector(); + REQUIRE(!mavenPathDetector->getPaths().empty()); + +@@ -41,6 +42,7 @@ TEST_CASE("maven wrapper detects source directories of simple projects") + + TEST_CASE("maven wrapper detects source and test directories of simple projects") + { ++ return; + std::shared_ptr<PathDetector> mavenPathDetector = utility::getMavenExecutablePathDetector(); + REQUIRE(!mavenPathDetector->getPaths().empty()); + +@@ -65,6 +67,7 @@ TEST_CASE("maven wrapper detects source and test directories of simple projects" + + TEST_CASE("maven wrapper detects source directories of nested modules") + { ++ return; + std::shared_ptr<PathDetector> mavenPathDetector = utility::getMavenExecutablePathDetector(); + REQUIRE(!mavenPathDetector->getPaths().empty()); + +@@ -101,6 +104,7 @@ TEST_CASE("maven wrapper detects source directories of nested modules") + + TEST_CASE("maven wrapper detects source and test directories of nested modules") + { ++ return; + std::shared_ptr<PathDetector> mavenPathDetector = utility::getMavenExecutablePathDetector(); + REQUIRE(!mavenPathDetector->getPaths().empty()); + diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/sourcetrail/disable-updates.patch b/infra/libkookie/nixpkgs/pkgs/development/tools/sourcetrail/disable-updates.patch new file mode 100644 index 000000000000..112af857c59e --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/sourcetrail/disable-updates.patch @@ -0,0 +1,13 @@ +diff --git a/src/lib/settings/ApplicationSettings.cpp b/src/lib/settings/ApplicationSettings.cpp +index 1be13ccd..db6098e1 100644 +--- a/src/lib/settings/ApplicationSettings.cpp ++++ b/src/lib/settings/ApplicationSettings.cpp +@@ -593,7 +593,7 @@ void ApplicationSettings::setUserToken(std::string token) + + bool ApplicationSettings::getAutomaticUpdateCheck() const + { +- return getValue<bool>("user/update_check/automatic", true); ++ return false; + } + + void ApplicationSettings::setAutomaticUpdateCheck(bool automaticUpdates) diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/sourcetrail/java.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/sourcetrail/java.nix new file mode 100644 index 000000000000..7056dca447f7 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/sourcetrail/java.nix @@ -0,0 +1,27 @@ +{ pkgs, javaPackages }: + +let + javaIndexer = javaPackages.mavenbuild { + name = "sourcetrail-java-indexer-${pkgs.sourcetrail.version}"; + src = pkgs.sourcetrail.src; + m2Path = "com/sourcetrail/java-indexer"; + + # This doesn't include all required dependencies. We still rely on binary + # copies of maven packages included in the source repo for building. + mavenDeps = with javaPackages; [ + mavenCompiler_3_2 + plexusCompilerApi_2_4 + plexusCompilerJavac_2_4 + plexusCompilerManager_2_4 + ]; + + meta = { + description = "Java indexer for Sourcetrail"; + }; + }; +in +javaIndexer.overrideAttrs (drv: { + postUnpack = '' + export sourceRoot=''${sourceRoot}/java_indexer + ''; +}) diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/sourcetrail/jedi.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/sourcetrail/jedi.nix new file mode 100644 index 000000000000..14a40a6e6db4 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/sourcetrail/jedi.nix @@ -0,0 +1,36 @@ +# Taken from a past commit of nixpkgs + +{ stdenv, buildPythonPackage, fetchPypi, pytest, glibcLocales, tox, pytestcov, parso }: + +buildPythonPackage rec { + pname = "jedi"; + + # TODO: Remove this package when version incompatibility issue with + # python3Packages.jedi is resolved. + # + # Upstream requirements: + # https://github.com/CoatiSoftware/SourcetrailPythonIndexer#requirements + version = "0.17.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "86ed7d9b750603e4ba582ea8edc678657fb4007894a12bcf6f4bb97892f31d20"; + }; + + checkInputs = [ pytest glibcLocales tox pytestcov ]; + + propagatedBuildInputs = [ parso ]; + + checkPhase = '' + LC_ALL="en_US.UTF-8" py.test test + ''; + + # tox required for tests: https://github.com/davidhalter/jedi/issues/808 + doCheck = false; + + meta = with stdenv.lib; { + homepage = "https://github.com/davidhalter/jedi"; + description = "An autocompletion tool for Python that can be used for text editors"; + license = licenses.lgpl3Plus; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/sourcetrail/parso.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/sourcetrail/parso.nix new file mode 100644 index 000000000000..bd5d5b86ac51 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/sourcetrail/parso.nix @@ -0,0 +1,29 @@ +# Taken from a past commit of nixpkgs + +{ lib +, buildPythonPackage +, fetchPypi +, pytest +}: + +buildPythonPackage rec { + pname = "parso"; + + # TODO: Remove along with ./jedi.nix when version compatiblity issue is + # resolved. + version = "0.7.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "908e9fae2144a076d72ae4e25539143d40b8e3eafbaeae03c1bfe226f4cdf12c"; + }; + + checkInputs = [ pytest ]; + + meta = { + description = "A Python Parser"; + homepage = "https://github.com/davidhalter/parso"; + license = lib.licenses.mit; + }; + +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/sourcetrail/python.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/sourcetrail/python.nix new file mode 100644 index 000000000000..113abb77d61b --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/sourcetrail/python.nix @@ -0,0 +1,68 @@ +{ stdenv, lib, fetchFromGitHub, wrapPython, python, jedi, parso, cmake, swig }: + +stdenv.mkDerivation rec { + pname = "SourcetrailPythonIndexer"; + version = "v1_db25_p5"; + + src = fetchFromGitHub { + owner = "CoatiSoftware"; + repo = pname; + rev = version; + sha256 = "05hlpd3am029pv1wi6mys3q0ggp64axmg8bdf1fabl9cl9jffscq"; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ wrapPython cmake swig ]; + buildInputs = [ python ]; + pythonPath = [ jedi parso ]; + + dontUseCmakeConfigure = true; + cmakeFlags = [ + "-DBUILD_BINDINGS_PYTHON=1" + "-DPYTHON_VERSION=${lib.versions.majorMinor python.version}" + ]; + + buildPhase = '' + pushd SourcetrailDB + cmake -Bbuild $cmakeFlags . + pushd build + make -j $NIX_BUILD_CORES + popd + popd + ''; + + checkPhase = '' + buildPythonPath "$pythonPath" + + # FIXME: some tests are failing + # PYTHONPATH="$program_PYTHONPATH:SourcetrailDB/build/bindings_python" \ + # ${python}/bin/python test.py + PYTHONPATH="$program_PYTHONPATH:SourcetrailDB/build/bindings_python" \ + ${python}/bin/python test_shallow.py + ''; + + installPhase = '' + shopt -s extglob + mkdir -p $out/{bin,libexec} + + cp !(run).py $out/libexec # copy *.py excluding run.py (needs extglob) + cat <(echo '#!/usr/bin/env python') run.py > $out/libexec/run.py + chmod +x $out/libexec/run.py + ln -s $out/libexec/run.py $out/bin/SourcetrailPythonIndexer + + pushd SourcetrailDB/build/bindings_python + cp sourcetraildb.py $out/libexec + cp _sourcetraildb* $out/libexec/_sourcetraildb.so + popd + + wrapPythonProgramsIn "$out/libexec" "$pythonPath" + ''; + + doCheck = true; + + meta = with lib; { + description = "Python indexer for Sourcetrail"; + homepage = "https://github.com/CoatiSoftware/SourcetrailPythonIndexer"; + license = licenses.gpl3; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/swiftformat/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/swiftformat/default.nix index c47955695f5c..cb3ed5217f08 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/swiftformat/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/swiftformat/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "nicklockwood"; repo = "SwiftFormat"; - rev = "${version}"; + rev = version; sha256 = "0zajvbaf3r02k53lv5zdxf13apc6chnjmj69zkyac48lpnpbcxq6"; }; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/the-way/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/the-way/default.nix index 6042f5f891a6..5506201b7427 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/the-way/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/the-way/default.nix @@ -2,20 +2,20 @@ rustPlatform.buildRustPackage rec { pname = "the-way"; - version = "0.7.0"; + version = "0.12.1"; src = fetchFromGitHub { owner = "out-of-cheese-error"; repo = pname; rev = "v${version}"; - sha256 = "1whmvzpqm8x1q45mzrp4p40nj251drcryj9z4qjxgjlfsd5d1fxq"; + sha256 = "0lvkrfszmn594n9qkf518c38c0fwzm32y997wlf28l3hpj6yqddq"; }; nativeBuildInputs = [ installShellFiles ]; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ AppKit Security ]; - cargoSha256 = "0adhgp6blwx7s1hlwqzzsgkzc43q9avxx8a9ykvvv2s1w7m9ql78"; + cargoSha256 = "1aiyfsvmrqcmlw0z1944i9s5g3yxc39na5mf16pb9a4bhw8zcwjr"; checkFlagsArray = stdenv.lib.optionals stdenv.isDarwin [ "--skip=copy" ]; cargoParallelTestThreads = false; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/tracy/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/tracy/default.nix index 5839a7771d0f..4efef71f6ad0 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/tracy/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/tracy/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "tracy"; - version = "0.7.3"; + version = "0.7.4"; src = fetchFromGitHub { owner = "wolfpld"; repo = "tracy"; rev = "v${version}"; - sha256 = "06xznk7nslw9km7hia2pfb5filjqalgx6cah48skxnah148svq2y"; + sha256 = "0s39kimpc03x48kh7lyhblfs8y4mdzcz3g7f806h90x7zndsmfxj"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/trellis/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/trellis/default.nix index 21f14adc2f71..c9884a8eacd8 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/trellis/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/trellis/default.nix @@ -3,37 +3,34 @@ , cmake }: -let - boostWithPython3 = boost.override { python = python3; enablePython = true; }; -in stdenv.mkDerivation rec { pname = "trellis"; - version = "2020.07.27"; + version = "2020.11.25"; # git describe --tags realVersion = with stdenv.lib; with builtins; - "1.0-182-g${substring 0 7 (elemAt srcs 0).rev}"; + "1.0-476-g${substring 0 7 (elemAt srcs 0).rev}"; srcs = [ (fetchFromGitHub { owner = "SymbiFlow"; repo = "prjtrellis"; - rev = "8c0a6382e11b160ed88d17af8493c12a897617ed"; - sha256 = "1g0ppjfw8dq5cg5kl2p1p87grb0i88apaim4f5b6wj4sfqz8iln8"; + rev = "a441cd9d0390648e96bf27096626eb2c904096de"; + sha256 = "1rsck44n4mf9v3vfac51ksrhcs84s7q297nq1kjkzzvmsx09gd9k"; name = "trellis"; }) (fetchFromGitHub { owner = "SymbiFlow"; repo = "prjtrellis-db"; - rev = "c137076fdd8bfca3d2bf9cdacda9983dbbec599a"; - sha256 = "1br0vw8wwcn2qhs8kxkis5xqlr2nw7r3mf1qwjp8xckd6fa1wlcw"; + rev = "2cf058e7a3ba36134d21e34823e9b2ecaaceac2c"; + sha256 = "1hjaw5jkwiaiznm2z0smy88m2cdz63cd51z4nibajfih7ikvkj6g"; name = "trellis-database"; }) ]; sourceRoot = "trellis"; - buildInputs = [ boostWithPython3 ]; + buildInputs = [ boost ]; nativeBuildInputs = [ cmake python3 ]; cmakeFlags = [ "-DCURRENT_GIT_VERSION=${realVersion}" diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/vagrant/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/vagrant/default.nix index 4e2930f97a28..b3f1bf1a5b8f 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/vagrant/default.nix +++ b/infra/libkookie/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.10"; + version = "2.2.14"; url = "https://github.com/hashicorp/vagrant/archive/v${version}.tar.gz"; - sha256 = "07wlj4m79m9li3za1jkk4imdhqwpca86qz3c0h706s0w8cmv4bbj"; + sha256 = "sha256-vsb7RFjT9l4N6BzwIvVLcRtA4n/c8jk20B6RUMkyhJs="; deps = bundlerEnv rec { name = "${pname}-${version}"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/vagrant/gemset.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/vagrant/gemset.nix index 3c22b74efed0..169c3533efcb 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/vagrant/gemset.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/vagrant/gemset.nix @@ -39,17 +39,6 @@ }; version = "1.1.7"; }; - domain_name = { - dependencies = ["unf"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0lcqjsmixjp52bnlgzh4lg9ppsk52x9hpwdjd53k8jnbah2602h0"; - type = "gem"; - }; - version = "0.5.20190701"; - }; ed25519 = { groups = ["default"]; platforms = []; @@ -65,20 +54,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1nwzxnqhr31fn7nbqmffcysvxjdfl3bhxi0bld5qqhcnfc1xd13x"; + sha256 = "09l8lz3j00m898li0yfsnb6ihc63rdvhw3k5xczna5zrjk104f2l"; type = "gem"; }; - version = "1.9.0"; + version = "1.10.0"; }; - erubis = { + excon = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1fj827xqjs91yqsydf0zmfyw9p4l2jz5yikg3mppz6d7fi8kyrb3"; + sha256 = "1hi89v53pm2abfv9j8lgqdd7hgkr7fr0gwrczr940iwbb3xv7rrs"; type = "gem"; }; - version = "2.7.0"; + version = "0.78.0"; }; ffi = { groups = ["default"]; @@ -122,17 +111,6 @@ }; version = "0.1.5"; }; - http-cookie = { - dependencies = ["domain_name"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "004cgs4xg5n6byjs7qld0xhsjq3n6ydfh897myr2mibvh6fjc49g"; - type = "gem"; - }; - version = "1.0.3"; - }; httpclient = { groups = ["default"]; platforms = []; @@ -160,10 +138,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1w923wmdi3gyiky0asqdw5dnh3gcjs2xyn82ajvjfjwh6sn0clgi"; + sha256 = "0028p1fss6pvw4mlpjqdmxfzsm8ww79irsadbibrr7f23qfn8ykr"; type = "gem"; }; - version = "3.2.1"; + version = "3.3.1"; }; little-plugger = { groups = ["default"]; @@ -196,16 +174,6 @@ }; version = "2.3.0"; }; - mime = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0nskys7brz2bylhxiknl0z9i19w3wb1knf0h93in6mjq70jdw5cr"; - type = "gem"; - }; - version = "0.4.4"; - }; mime-types = { dependencies = ["mime-types-data"]; groups = ["default"]; @@ -222,10 +190,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1z75svngyhsglx0y2f9rnil2j08f9ab54b3l95bpgz67zq2if753"; + sha256 = "0ipjyfwn9nlvpcl8knq3jk4g5f12cflwdbaiqxcq1s7vwfwfxcag"; type = "gem"; }; - version = "3.2020.0512"; + version = "3.2020.1104"; }; multi_json = { groups = ["default"]; @@ -264,20 +232,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jp3jgcn8cij407xx9ldb5h9c6jv13jc4cf6kk2idclz43ww21c9"; + sha256 = "1hlyp6z3ffwdcnzq9khrkz6waxggn4hnzsczbp3mz61lhx4qiri3"; type = "gem"; }; - version = "6.1.0"; - }; - netrc = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0gzfmcywp1da8nzfqsql2zqi648mfnx6qwkig3cv36n9m0yy676y"; - type = "gem"; - }; - version = "0.11.0"; + version = "6.2.0.rc1"; }; nori = { groups = ["default"]; @@ -321,17 +279,6 @@ }; version = "0.2.5"; }; - rest-client = { - dependencies = ["http-cookie" "mime-types" "netrc"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1hzcs2r7b5bjkf2x2z3n8z6082maz0j8vqjiciwgg3hzb63f958j"; - type = "gem"; - }; - version = "2.0.2"; - }; ruby_dep = { groups = ["default"]; platforms = []; @@ -362,37 +309,16 @@ }; version = "2.3.0"; }; - unf = { - dependencies = ["unf_ext"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0bh2cf73i2ffh4fcpdn9ir4mhq8zi50ik0zqa1braahzadx536a9"; - type = "gem"; - }; - version = "0.1.4"; - }; - unf_ext = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0wc47r23h063l8ysws8sy24gzh74mks81cak3lkzlrw4qkqb3sg4"; - type = "gem"; - }; - version = "0.0.7.7"; - }; vagrant_cloud = { - dependencies = ["rest-client"]; + dependencies = ["excon" "log4r"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "16jpnq4xa7gavm024wk1rgmkfb850g89rv56f26dkh0rdhbqiqvs"; + sha256 = "0b3b9ybd6mskfz2vffb6li2y6njdc9xqhik9c4mvzq9dchxpbxlj"; type = "gem"; }; - version = "2.0.3"; + version = "3.0.2"; }; wdm = { groups = ["default"]; @@ -410,10 +336,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13c0vf32vinkp3ia86rvq779dacl37v4v2814v4g9qrk3liv0dym"; + sha256 = "0k9i86v805gpya3pyqahjykljbdwpjsrk7hsdqrl05j2rpidvk4v"; type = "gem"; }; - version = "2.3.4"; + version = "2.3.5"; }; winrm-elevated = { dependencies = ["erubi" "winrm" "winrm-fs"]; @@ -421,10 +347,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1yawwrs3pnvbbm9xn0nbzvyl92kgf1jr439qfbqx0mb8zzkyi2dv"; + sha256 = "1lmlaii8qapn84wxdg5d82gbailracgk67d0qsnbdnffcg8kswzd"; type = "gem"; }; - version = "1.2.1"; + version = "1.2.3"; }; winrm-fs = { dependencies = ["erubi" "logging" "rubyzip" "winrm"]; @@ -432,9 +358,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "093f698l9b9cx6vcqwjc9hi5hbd86ynp1g5c7g9k18y6h7fxjk43"; + sha256 = "0gb91k6s1yjqw387x4w1nkpnxblq3pjdqckayl0qvz5n3ygdsb0d"; type = "gem"; }; - version = "1.3.4"; + version = "1.3.5"; }; }
\ No newline at end of file diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/vagrant/gemset_libvirt.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/vagrant/gemset_libvirt.nix index 2631833dc009..df6b6c40496b 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/vagrant/gemset_libvirt.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/vagrant/gemset_libvirt.nix @@ -1,24 +1,34 @@ { + builder = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "045wzckxpwcqzrjr353cxnyaxgf0qg22jh00dcx7z38cys5g1jlr"; + type = "gem"; + }; + version = "3.2.4"; + }; excon = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15l9w0938c19nxmrp09n75qpmm64k12xj69h47yvxzcxcpbgnkb2"; + sha256 = "1hi89v53pm2abfv9j8lgqdd7hgkr7fr0gwrczr940iwbb3xv7rrs"; type = "gem"; }; - version = "0.62.0"; + version = "0.78.0"; }; fog-core = { - dependencies = ["builder" "excon" "formatador"]; + dependencies = ["builder" "excon" "formatador" "mime-types"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ac25s2wv7m6av7h7vjzd2bg3srhnn5yrz3lq1xpimhnfmp82sw6"; + sha256 = "0bwqm9n69y5y0a5iickr358z7w4hml3flqwfz8b7cnj1ldabhnjn"; type = "gem"; }; - version = "1.43.0"; + version = "2.2.3"; }; fog-json = { dependencies = ["fog-core" "multi_json"]; @@ -37,10 +47,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0gk16gsjd51x71wla7h5jqr6x5ywpwz5l8jdv76f9mr6fp1j2bkf"; + sha256 = "0by97bx0szdz47kdy0fqvx6j2kzy5yhrwbvvsfbh27dm9c0vfwgr"; type = "gem"; }; - version = "0.5.0"; + version = "0.7.0"; }; fog-xml = { dependencies = ["fog-core" "nokogiri"]; @@ -68,20 +78,51 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01v6jjpvh3gnq6sgllpfqahlgxzj50ailwhj9b3cd20hi2dx0vxp"; + sha256 = "158fawfwmv2sq4whqqaksfykkiad2xxrrj0nmpnc6vnlzi1bp7iz"; + type = "gem"; + }; + version = "2.3.1"; + }; + mime-types = { + dependencies = ["mime-types-data"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1zj12l9qk62anvk9bjvandpa6vy4xslil15wl6wlivyf51z773vh"; type = "gem"; }; - version = "2.1.0"; + version = "3.3.1"; + }; + mime-types-data = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0ipjyfwn9nlvpcl8knq3jk4g5f12cflwdbaiqxcq1s7vwfwfxcag"; + type = "gem"; + }; + version = "3.2020.1104"; }; mini_portile2 = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13d32jjadpjj6d2wdhkfpsmy68zjx90p49bgf8f7nkpz86r1fr11"; + sha256 = "15zplpfw3knqifj9bpf604rb3wc1vhq6363pd6lvhayng8wql5vy"; + type = "gem"; + }; + version = "2.4.0"; + }; + multi_json = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0pb1g1y3dsiahavspyzkdy39j4q377009f6ix0bh1ag4nqw43l0z"; type = "gem"; }; - version = "2.3.0"; + version = "1.15.0"; }; nokogiri = { dependencies = ["mini_portile2"]; @@ -89,10 +130,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0byyxrazkfm29ypcx5q4syrv126nvjnf7z6bqi01sqkv4llsi4qz"; + sha256 = "0xmf60nj5kg9vaj5bysy308687sgmkasgx06vbbnf94p52ih7si2"; type = "gem"; }; - version = "1.8.5"; + version = "1.10.10"; }; ruby-libvirt = { groups = ["default"]; @@ -110,9 +151,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1wm5yvml3sxdzpnlp4q6yhy695syy8byd1g7cxll4pmj1kwlknym"; + sha256 = "1b1m8fg1rin6ps15ykqhwz6qm7isadb83r22b733dkw2gvvj91jv"; type = "gem"; }; - version = "0.0.45"; + version = "0.2.1"; }; -} +}
\ No newline at end of file diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/vala-language-server/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/vala-language-server/default.nix new file mode 100644 index 000000000000..f26615e26b7a --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/vala-language-server/default.nix @@ -0,0 +1,59 @@ +{ stdenv +, fetchFromGitHub +, nix-update-script +, meson +, ninja +, pkg-config +, scdoc +, gnome-builder +, gnused +, glib +, libgee +, json-glib +, jsonrpc-glib +, vala +}: + +stdenv.mkDerivation rec { + pname = "vala-language-server"; + version = "0.48.1"; + + src = fetchFromGitHub { + owner = "benwaffle"; + repo = pname; + rev = version; + sha256 = "12k095052jkvbiyz8gzkj6w7r7p16d5m18fyikl48yvh5nln8fw0"; + }; + + passthru = { + updateScript = nix-update-script { + attrPath = pname; + }; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + scdoc + # GNOME Builder Plugin + gnused + gnome-builder + ]; + + buildInputs = [ + glib + libgee + json-glib + jsonrpc-glib + vala + ]; + + meta = with stdenv.lib; { + description = "Code Intelligence for Vala & Genie"; + homepage = "https://github.com/benwaffle/vala-language-server"; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ andreasfelix worldofpeace ]; + platforms = platforms.linux; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/vala-lint/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/vala-lint/default.nix index 199f1626c891..378bc935e22a 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/vala-lint/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/vala-lint/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "vala-lint-unstable"; - version = "2019-10-11"; + version = "2020-08-18"; src = fetchFromGitHub { owner = "vala-lang"; repo = "vala-lint"; - rev = "a077bbec30dea128616a23583ce3f8364ff2ef11"; - sha256 = "0w0rmaj4v42wc4vq2lfjnj6airag5ahv6522xkw3j1nmccxq3s72"; + rev = "fc5dd9e95bc61540b404d5bc070c0629903baad9"; + sha256 = "n6pp6vYGaRF8B3phWp/e9KnpKGf0Op+xGVdT6HHe0rM="; }; nativeBuildInputs = [ diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/vcstool/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/vcstool/default.nix index 9657543e0c70..e99f7dca9bf5 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/vcstool/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/vcstool/default.nix @@ -5,11 +5,11 @@ with python3Packages; buildPythonApplication rec { pname = "vcstool"; - version = "0.2.9"; + version = "0.2.15"; src = fetchPypi { inherit pname version; - sha256 = "1lb0j120sj76swi702ah6ryn770m1y7gh69237zxpyh897pn5paa"; + sha256 = "b1fce6fcef7b117b245a72dc8658a128635749d01dc7e9d1316490f89f9c2fde"; }; propagatedBuildInputs = [ pyyaml setuptools ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/vgo2nix/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/vgo2nix/default.nix index 880703383d11..d48787ea017a 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/vgo2nix/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/vgo2nix/default.nix @@ -1,41 +1,39 @@ -{ stdenv -, lib -, buildGoPackage -, go +{ lib +, fetchFromGitHub +, buildGoModule , makeWrapper , nix-prefetch-git -, fetchFromGitHub +, go }: -buildGoPackage { +buildGoModule { pname = "vgo2nix"; - version = "unstable-2020-05-05"; - goPackagePath = "github.com/adisbladis/vgo2nix"; - - nativeBuildInputs = [ makeWrapper ]; + version = "unstable-2020-11-07"; src = fetchFromGitHub { owner = "nix-community"; repo = "vgo2nix"; - rev = "71e59bf268d5257a0f89b2f59cd20fd468c8c6ac"; - sha256 = "1pcdkknq2v7nrs0siqcvvq2x0qqz5snwdz2lpjnad8i33rwhmayh"; + rev = "4546d8056ab09ece3d2489594627c0541b15a397"; + sha256 = "0n9pf0i5y59kiiv6dq8h8w1plaz9w6s67rqr2acqgxa45iq36mkh"; }; - goDeps = ./deps.nix; + vendorSha256 = "1lzhhg9wimn8nfzrrla5bshgk1ghnlsdfmq6iask0zqz311g96bv"; + + subPackages = [ "." ]; + + nativeBuildInputs = [ makeWrapper ]; allowGoReference = true; - postInstall = with stdenv; let - binPath = lib.makeBinPath [ nix-prefetch-git go ]; - in '' - wrapProgram $out/bin/vgo2nix --prefix PATH : ${binPath} + postInstall = '' + wrapProgram $out/bin/vgo2nix --prefix PATH : ${lib.makeBinPath [ nix-prefetch-git go ]} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Convert go.mod files to nixpkgs buildGoPackage compatible deps.nix files"; homepage = "https://github.com/nix-community/vgo2nix"; license = licenses.mit; - maintainers = with maintainers; [ adisbladis ]; + maintainers = with maintainers; [ adisbladis SuperSandro2000 ]; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/vgo2nix/deps.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/vgo2nix/deps.nix deleted file mode 100644 index 2d9a130e43e3..000000000000 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/vgo2nix/deps.nix +++ /dev/null @@ -1,210 +0,0 @@ -# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) -[ - { - goPackagePath = "github.com/alecthomas/assert"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/assert"; - rev = "405dbfeb8e38"; - sha256 = "1l567pi17k593nrd1qlbmiq8z9jy3qs60px2a16fdpzjsizwqx8l"; - }; - } - { - goPackagePath = "github.com/alecthomas/colour"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/colour"; - rev = "60882d9e2721"; - sha256 = "0iq566534gbzkd16ixg7fk298wd766821vvs80838yifx9yml5vs"; - }; - } - { - goPackagePath = "github.com/alecthomas/kingpin"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/kingpin"; - rev = "v2.2.6"; - sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r"; - }; - } - { - goPackagePath = "github.com/alecthomas/repr"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/repr"; - rev = "117648cd9897"; - sha256 = "05v1rgzdqc8razf702laagrvhvx68xd9yxxmzd3dyz0d6425pdrp"; - }; - } - { - goPackagePath = "github.com/alecthomas/template"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/template"; - rev = "a0175ee3bccc"; - sha256 = "0qjgvvh26vk1cyfq9fadyhfgdj36f1iapbmr5xp6zqipldz8ffxj"; - }; - } - { - goPackagePath = "github.com/alecthomas/units"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/units"; - rev = "2efee857e7cf"; - sha256 = "1j65b91qb9sbrml9cpabfrcf07wmgzzghrl7809hjjhrmbzri5bl"; - }; - } - { - 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/mattn/go-isatty"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-isatty"; - rev = "v0.0.3"; - sha256 = "06w45aqz2a6yrk25axbly2k5wmsccv8cspb94bfmz4izvw8h927n"; - }; - } - { - goPackagePath = "github.com/orivej/e"; - fetch = { - type = "git"; - url = "https://github.com/orivej/e"; - rev = "ac3492690fda"; - sha256 = "11jizr28kfkr6zscjxg95pqi6cjp08aqnhs41sdhc98nww78ilkr"; - }; - } - { - goPackagePath = "github.com/orivej/go-nix"; - fetch = { - type = "git"; - url = "https://github.com/orivej/go-nix"; - rev = "dae45d921a44"; - sha256 = "17hfmsz8hs3h2d5c06j1bvbw8ijrhzm3iz911z5zydsl4x7y0cgy"; - }; - } - { - goPackagePath = "github.com/pkg/profile"; - fetch = { - type = "git"; - url = "https://github.com/pkg/profile"; - rev = "v1.2.1"; - sha256 = "0blqmvgqvdbqmh3fp9pfdxc9w1qfshrr0zy9whj0sn372bw64qnr"; - }; - } - { - 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/sergi/go-diff"; - fetch = { - type = "git"; - url = "https://github.com/sergi/go-diff"; - rev = "v1.0.0"; - sha256 = "0swiazj8wphs2zmk1qgq75xza6m19snif94h2m6fi8dqkwqdl7c7"; - }; - } - { - goPackagePath = "github.com/stretchr/testify"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/testify"; - rev = "v1.2.2"; - sha256 = "0dlszlshlxbmmfxj5hlwgv3r22x0y1af45gn1vd198nvvs3pnvfs"; - }; - } - { - goPackagePath = "github.com/yuin/goldmark"; - fetch = { - type = "git"; - url = "https://github.com/yuin/goldmark"; - rev = "v1.1.27"; - sha256 = "1872cqnii0kwiqcy81yin0idvjy5mdy4zlzz0csb319lcjs3b923"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "87dc89f01550"; - sha256 = "0z4i1m2yn3f31ci7wvcm2rxkx2yiv7a78mfzklncmsz2k97rlh2g"; - }; - } - { - goPackagePath = "golang.org/x/mod"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/mod"; - rev = "v0.2.0"; - sha256 = "1fp6885dclq77mh73v7i54v2b9llpv4di193zc8vmsbbkkc483cl"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "0de0cce0169b"; - sha256 = "1db7s5kbzyh2zd5lpv05n7hp8wbwdvgk0wpiwrlnig94mkr0y5aq"; - }; - } - { - goPackagePath = "golang.org/x/sync"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sync"; - rev = "cd5d95a43a6e"; - sha256 = "1nqkyz2y1qvqcma52ijh02s8aiqmkfb95j08f6zcjhbga3ds6hds"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "97732733099d"; - sha256 = "118hkp01i4z1f5h6hcjm0ff2ngqhrzj1f7731n0kw8dr6hvbx0sw"; - }; - } - { - 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 = "0c9eba77bc32"; - sha256 = "1xz0jyxdmibkams6vd61va5cw963l25jjf3i9r33m0i739qwg4lj"; - }; - } - { - goPackagePath = "golang.org/x/xerrors"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/xerrors"; - rev = "9bdfabe68543"; - sha256 = "1yjfi1bk9xb81lqn85nnm13zz725wazvrx3b50hx19qmwg7a4b0c"; - }; - } -] diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/vulkan-validation-layers/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/vulkan-validation-layers/default.nix index ec696339fdcb..6e89f03e5137 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/vulkan-validation-layers/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/vulkan-validation-layers/default.nix @@ -51,6 +51,11 @@ stdenv.mkDerivation rec { pname = "vulkan-validation-layers"; version = "1.2.141.0"; + # If we were to use "dev" here instead of headers, the setupHook would be + # placed in that output instead of "out". + outputs = ["out" "headers"]; + outputInclude = "headers"; + src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-ValidationLayers"; @@ -78,6 +83,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DGLSLANG_INSTALL_DIR=${localGlslang}" + "-DBUILD_LAYER_SUPPORT_FILES=ON" ]; # Help vulkan-loader find the validation layers diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/vultr-cli/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/vultr-cli/default.nix index c0b34fe3ca68..b3b3bd1b9f53 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/vultr-cli/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/vultr-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "vultr-cli"; - version = "0.4.0"; + version = "2.0.0"; src = fetchFromGitHub { owner = "vultr"; repo = pname; rev = "v${version}"; - sha256 = "0gp1v62iqh3hk46cc5sh8a1nw5nf98m969fdhgxdppwr5dhj9isp"; + sha256 = "05qxbqq9mlq2jmyj5m9vmgw6s6a3wj06hmxj74g9lgqg8xyfglnh"; }; vendorSha256 = null; @@ -19,6 +19,6 @@ buildGoModule rec { description = "Official command line tool for Vultr services"; homepage = "https://github.com/vultr/vultr-cli"; license = licenses.asl20; - maintainers = with maintainers; [ filalex77 ]; + maintainers = with maintainers; [ Br1ght0ne ]; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/wabt/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/wabt/default.nix index a8ade2b815cc..b910a31e1552 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/wabt/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/wabt/default.nix @@ -2,22 +2,16 @@ stdenv.mkDerivation rec { pname = "wabt"; - version = "1.0.19"; + version = "1.0.20"; src = fetchFromGitHub { owner = "WebAssembly"; repo = "wabt"; rev = version; - sha256 = "0g1iy1icnjfkc0dadkrif4nlixpvq626023rgj02m9al64gf9hvx"; + sha256 = "1wwyljppxz03slvgx809g87mdrglpimz4xaici71a9mqwjpgj0l8"; fetchSubmodules = true; }; - # https://github.com/WebAssembly/wabt/pull/1408 - patches = [ (fetchpatch { - url = "https://github.com/WebAssembly/wabt/pull/1408/commits/28505f4db6e4561cf6840af5c304a9aa900c4987.patch"; - sha256 = "1nh1ddsak6w51np17xf2r7i0czxrjslz1i4impmmp88h5bp2yjba"; - }) ]; - nativeBuildInputs = [ cmake ]; cmakeFlags = [ "-DBUILD_TESTS=OFF" "-DCMAKE_PROJECT_VERSION=${version}" ]; buildInputs = [ python3 ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/wally-cli/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/wally-cli/default.nix index d9abe6163a26..ffa666468595 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/wally-cli/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/wally-cli/default.nix @@ -27,8 +27,8 @@ buildGoModule rec { meta = with lib; { description = "A tool to flash firmware to mechanical keyboards"; homepage = "https://ergodox-ez.com/pages/wally-planck"; - platforms = platforms.linux; + platforms = with platforms; linux ++ darwin; license = licenses.mit; - maintainers = [ maintainers.spacekookie ]; + maintainers = with maintainers; [ spacekookie r-burns ]; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/wrangler/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/wrangler/default.nix index fd84afb16175..b7020eacdc32 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/wrangler/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/wrangler/default.nix @@ -1,19 +1,19 @@ -{ stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl, curl, darwin }: +{ stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl, curl, darwin, perl }: rustPlatform.buildRustPackage rec { pname = "wrangler"; - version = "1.10.3"; + version = "1.12.2"; src = fetchFromGitHub { owner = "cloudflare"; repo = pname; rev = "v${version}"; - sha256 = "0703zlrmv0if575rj1mrgfg1a5qbf98sqjhhj09hab69i96wbrk9"; + sha256 = "1w0j6if1fnih1036hlb9a3c6wgjw4p057llhjf0f3d568ah1244a"; }; - cargoSha256 = "0znzyqzvbqcl4mmxpsvaf592xrs968x57czj45jibmafq033dbfa"; + cargoSha256 = "0d9wvdjjakznz8dnqx4gqxh0xkxrh4229460hg6dr9qn492p7nfx"; - nativeBuildInputs = stdenv.lib.optionals stdenv.isLinux [ pkg-config ]; + nativeBuildInputs = [ perl ] ++ stdenv.lib.optionals stdenv.isLinux [ pkg-config ]; buildInputs = stdenv.lib.optionals stdenv.isLinux [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ @@ -30,6 +30,6 @@ rustPlatform.buildRustPackage rec { description = "A CLI tool designed for folks who are interested in using Cloudflare Workers"; homepage = "https://github.com/cloudflare/wrangler"; license = with licenses; [ asl20 /* or */ mit ]; - maintainers = with maintainers; [ filalex77 ]; + maintainers = with maintainers; [ Br1ght0ne ]; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/xqilla/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/xqilla/default.nix index 7d8029ee1f14..e97a6f1cdb78 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/xqilla/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/xqilla/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-xerces=${xercesc}" ]; meta = with stdenv.lib; { - description = "XQilla is an XQuery and XPath 2 library and command line utility written in C++, implemented on top of the Xerces-C library"; + description = "An XQuery and XPath 2 library and command line utility written in C++, implemented on top of the Xerces-C library"; license = licenses.asl20 ; maintainers = with maintainers; [ obadz ]; platforms = platforms.all; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/yarn/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/yarn/default.nix index 22ce3553352f..7151c872e4d0 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/yarn/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/yarn/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "yarn"; - version = "1.22.5"; + version = "1.22.10"; src = fetchzip { url = "https://github.com/yarnpkg/yarn/releases/download/v${version}/yarn-v${version}.tar.gz"; - sha256 = "1yb1pb80jhw6mx1r28hf7zd54dygmnrf30r3fz7kn9nrgdpl5in8"; + sha256 = "0pdimll8lhsnqfafhdaxd6h6mgxhj1c7h56r111cmxhzw462y3mr"; }; buildInputs = [ nodejs ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/yq-go/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/yq-go/default.nix index 3d9d6cf0a0cb..479494e515d7 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/yq-go/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/yq-go/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "yq-go"; - version = "3.4.0"; + version = "3.4.1"; src = fetchFromGitHub { owner = "mikefarah"; rev = version; repo = "yq"; - sha256 = "1rvs27c5mz55zqq9c7yif0dms53bd30d8ylh45f3y3zgh82jihp8"; + sha256 = "09kcqa15assjhp3kdffa3yhc2vykinzgscjzg996qa85kjircy9b"; }; vendorSha256 = "0l5bhbp8dfq04hb4xcpx96ksfwx4xvk0pj5ma00rk3z913ikygcd"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/ytt/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/ytt/default.nix new file mode 100644 index 000000000000..05410bbaec52 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/ytt/default.nix @@ -0,0 +1,25 @@ +{ lib, buildGoModule, fetchFromGitHub }: +buildGoModule rec { + pname = "ytt"; + version = "0.30.0"; + + src = fetchFromGitHub { + owner = "vmware-tanzu"; + repo = "carvel-ytt"; + rev = "v${version}"; + sha256 = "0v9wp15aj4r7wif8i897zwj3c6bg41b95kk7vi3a3bzin814qn6l"; + }; + + goPackagePath = "github.com/vmware-tanzu/carvel-ytt"; + + vendorSha256 = null; + + subPackages = [ "cmd/ytt" ]; + + meta = with lib; { + description = "YAML templating tool that allows configuration of complex software via reusable templates with user-provided values"; + homepage = "https://get-ytt.io"; + license = licenses.asl20; + maintainers = with maintainers; [ brodes ]; + }; +} |