diff options
Diffstat (limited to 'infra/libkookie/nixpkgs/pkgs/development/tools/build-managers')
23 files changed, 343 insertions, 185 deletions
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; |