From 33a5eb7be13f3ef0366be6d1d7435a809c51ade4 Mon Sep 17 00:00:00 2001 From: Madoura Date: Sun, 4 Dec 2022 00:26:46 +0000 Subject: [PATCH 01/32] =?UTF-8?q?rocm-related:=205.3.3=20=E2=86=92=205.4.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit clang-ocl: 5.3.3 → 5.4.0 hip: 5.3.3 → 5.4.0 hipsparse: 5.3.3 → 5.4.0 miopengemm: 5.3.3 → 5.4.0 hipcub: 5.3.3 → 5.4.0 rccl: 5.3.3 → 5.4.0 rocblas: 5.3.3 → 5.4.0 rocfft: 5.3.3 → 5.4.0 miopen: 5.3.3 → 5.4.0 rocm-comgr: 5.3.3 → 5.4.0 rocclr: 5.3.3 → 5.4.0 rocm-device-libs: 5.3.3 → 5.4.0 rocm-cmake: 5.3.3 → 5.4.0 rocm-runtime: 5.3.3 → 5.4.0 rocm-smi: 5.3.3 → 5.4.0 rocm-thunk: 5.3.3 → 5.4.0 rocm-opencl-runtime: 5.3.3 → 5.4.0 llvmPackages_rocm.llvm: 5.3.3 → 5.4.0 rocminfo: 5.3.3 → 5.4.0 rocmlir: 5.3.3 → 5.4.0 rocprim: 5.3.3 → 5.4.0 rocwmma: 5.3.3 → 5.4.0 rocrand: 5.3.3 → 5.4.0 rocsparse: 5.3.3 → 5.4.0 rocthrust: 5.3.3 → 5.4.0 tensile: 5.3.3 → 5.4.0 rocm-llvm: remove obsolete patch hip: remove obsolete substituteInPlace rocmlir: fixup build inputs and cmakeFlags miopen: add nlohmann_json --- pkgs/development/compilers/hip/default.nix | 11 ++++----- .../compilers/llvm/rocm/default.nix | 4 ++-- .../llvm/rocm/install-symlinks.patch | 23 ------------------- pkgs/development/compilers/llvm/rocm/llvm.nix | 4 ---- .../libraries/clang-ocl/default.nix | 2 +- pkgs/development/libraries/hipcub/default.nix | 4 ++-- .../libraries/hipsparse/default.nix | 4 ++-- pkgs/development/libraries/miopen/default.nix | 6 +++-- .../libraries/miopengemm/default.nix | 2 +- pkgs/development/libraries/rccl/default.nix | 4 ++-- .../development/libraries/rocblas/default.nix | 4 ++-- pkgs/development/libraries/rocclr/default.nix | 4 ++-- pkgs/development/libraries/rocfft/default.nix | 4 ++-- .../libraries/rocm-comgr/default.nix | 4 ++-- .../libraries/rocm-device-libs/default.nix | 4 ++-- .../libraries/rocm-opencl-runtime/default.nix | 4 ++-- .../libraries/rocm-runtime/default.nix | 4 ++-- .../libraries/rocm-thunk/default.nix | 4 ++-- .../development/libraries/rocmlir/default.nix | 20 +++++++++++----- .../development/libraries/rocprim/default.nix | 4 ++-- .../development/libraries/rocrand/default.nix | 4 ++-- .../libraries/rocsparse/default.nix | 4 ++-- .../libraries/rocthrust/default.nix | 4 ++-- .../development/libraries/rocwmma/default.nix | 4 ++-- .../development/libraries/tensile/default.nix | 4 ++-- .../build-managers/rocm-cmake/default.nix | 4 ++-- pkgs/development/tools/rocminfo/default.nix | 2 +- pkgs/tools/system/rocm-smi/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 4 +++- 29 files changed, 68 insertions(+), 86 deletions(-) delete mode 100644 pkgs/development/compilers/llvm/rocm/install-symlinks.patch diff --git a/pkgs/development/compilers/hip/default.nix b/pkgs/development/compilers/hip/default.nix index 6aa5463d4bf1c..a2fb609455615 100644 --- a/pkgs/development/compilers/hip/default.nix +++ b/pkgs/development/compilers/hip/default.nix @@ -30,13 +30,13 @@ let hip = stdenv.mkDerivation (finalAttrs: { pname = "hip"; - version = "5.3.3"; + version = "5.4.0"; src = fetchFromGitHub { owner = "ROCm-Developer-Tools"; repo = "HIP"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-kmRvrwnT0h2dBMI+H9d1vmeW3TmDBD+qW4YYhaMV2dE="; + hash = "sha256-34SJM2n3jZWIS2uwpboWOXVFhaVWGK5ELPKD/cJc1zw="; }; patches = [ @@ -60,9 +60,6 @@ let -i "$f" done - substituteInPlace bin/hip_embed_pch.sh \ - --replace '$LLVM_DIR/bin/' "" - sed 's,#!/usr/bin/python,#!${python3.interpreter},' -i hip_prof_gen.py sed -e 's,$ROCM_AGENT_ENUM = "''${ROCM_PATH}/bin/rocm_agent_enumerator";,$ROCM_AGENT_ENUM = "${rocminfo}/bin/rocm_agent_enumerator";,' \ @@ -110,13 +107,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "hip"; - version = "5.3.3"; + version = "5.4.0"; src = fetchFromGitHub { owner = "ROCm-Developer-Tools"; repo = "hipamd"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-i7hT/j+V0LT6Va2XcQyyKXF1guoIyhcOHvn842wCRx4="; + hash = "sha256-VL0vZVv099pZPX0J2pXPFvrhkVO/b6X+ZZDaD9B1hYI="; }; nativeBuildInputs = [ cmake python3 makeWrapper perl ]; diff --git a/pkgs/development/compilers/llvm/rocm/default.nix b/pkgs/development/compilers/llvm/rocm/default.nix index e06ce32fc4dea..7ff3c4bfa1106 100644 --- a/pkgs/development/compilers/llvm/rocm/default.nix +++ b/pkgs/development/compilers/llvm/rocm/default.nix @@ -1,12 +1,12 @@ { stdenv, lib, buildPackages, fetchFromGitHub, callPackage, wrapCCWith, overrideCC }: let - version = "5.3.3"; + version = "5.4.0"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "llvm-project"; rev = "rocm-${version}"; - hash = "sha256-IKo7N8wWvh5PBrZ2mh1Vu5s3uUXhanqYtC4qLV/+JBs="; + hash = "sha256-rlVo77h344PLGj/mIzsw+/ndWywsBsiKDXsEDpWSUno="; }; in rec { clang = wrapCCWith rec { diff --git a/pkgs/development/compilers/llvm/rocm/install-symlinks.patch b/pkgs/development/compilers/llvm/rocm/install-symlinks.patch deleted file mode 100644 index 8d9bb83632db8..0000000000000 --- a/pkgs/development/compilers/llvm/rocm/install-symlinks.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/llvm/cmake/modules/LLVMInstallSymlink.cmake b/llvm/cmake/modules/LLVMInstallSymlink.cmake -index b5c35f706cb7..ac25e40b1436 100644 ---- a/cmake/modules/LLVMInstallSymlink.cmake -+++ b/cmake/modules/LLVMInstallSymlink.cmake -@@ -4,11 +4,16 @@ - - include(GNUInstallDirs) - -+set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/../../../cmake/Modules" ${CMAKE_MODULE_PATH}) -+include(ExtendPath) -+ - function(install_symlink name target outdir) - set(DESTDIR $ENV{DESTDIR}) -- set(bindir "${DESTDIR}${CMAKE_INSTALL_PREFIX}/${outdir}") -+ message(STATUS "Creating ${name} at ${bindir} (${CMAKE_MODULE_PATH})") -+ extend_path(prefixed_outdir "${CMAKE_INSTALL_PREFIX}" "${outdir}") -+ set(bindir "${DESTDIR}${prefixed_outdir}") - -- message(STATUS "Creating ${name}") -+ message(STATUS "Creating ${name} at ${bindir}") - - execute_process( - COMMAND "${CMAKE_COMMAND}" -E create_symlink "${target}" "${name}" diff --git a/pkgs/development/compilers/llvm/rocm/llvm.nix b/pkgs/development/compilers/llvm/rocm/llvm.nix index 6e3be2afc1781..728c9024ee376 100644 --- a/pkgs/development/compilers/llvm/rocm/llvm.nix +++ b/pkgs/development/compilers/llvm/rocm/llvm.nix @@ -52,10 +52,6 @@ in stdenv.mkDerivation (finalAttrs: { "-DSPHINX_WARNINGS_AS_ERRORS=OFF" ]; - patches = [ - ./install-symlinks.patch - ]; - postPatch = '' patchShebangs lib/OffloadArch/make_generated_offload_arch_h.sh substituteInPlace ../clang/cmake/modules/CMakeLists.txt \ diff --git a/pkgs/development/libraries/clang-ocl/default.nix b/pkgs/development/libraries/clang-ocl/default.nix index 7a8d5061bbbc9..bd732c85b61b9 100644 --- a/pkgs/development/libraries/clang-ocl/default.nix +++ b/pkgs/development/libraries/clang-ocl/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "clang-ocl"; - version = "5.3.3"; + version = "5.4.0"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; diff --git a/pkgs/development/libraries/hipcub/default.nix b/pkgs/development/libraries/hipcub/default.nix index 651f5ccc5b598..36727b9bd3538 100644 --- a/pkgs/development/libraries/hipcub/default.nix +++ b/pkgs/development/libraries/hipcub/default.nix @@ -18,7 +18,7 @@ # CUB can also be used as a backend instead of rocPRIM. stdenv.mkDerivation (finalAttrs: { pname = "hipcub"; - version = "5.3.3"; + version = "5.4.0"; outputs = [ "out" @@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCmSoftwarePlatform"; repo = "hipCUB"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-/GMZKbMD1sZQCM2FulM9jiJQ8ByYZinn0C8d/deFh0g="; + hash = "sha256-ctt7jbVqHNHcOm/Lhg0IFbMZ6JChnMylG7fJgZtzFuM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/hipsparse/default.nix b/pkgs/development/libraries/hipsparse/default.nix index 182173fccdb50..950121cec3e1d 100644 --- a/pkgs/development/libraries/hipsparse/default.nix +++ b/pkgs/development/libraries/hipsparse/default.nix @@ -18,7 +18,7 @@ # This can also use cuSPARSE as a backend instead of rocSPARSE stdenv.mkDerivation (finalAttrs: { pname = "hipsparse"; - version = "5.3.3"; + version = "5.4.0"; outputs = [ "out" @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCmSoftwarePlatform"; repo = "hipSPARSE"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-Phcihat774ZSAe1QetE/GSZzGlnCnvS9GwsHBHCaD4c="; + hash = "sha256-JWjmMvqIm4in1aPq2UgYmL0eWjrrRBiU6vH3FnCZZ40="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/miopen/default.nix b/pkgs/development/libraries/miopen/default.nix index 9add23f02a11f..65afe2d4c5249 100644 --- a/pkgs/development/libraries/miopen/default.nix +++ b/pkgs/development/libraries/miopen/default.nix @@ -22,6 +22,7 @@ , boost , sqlite , bzip2 +, nlohmann_json , texlive , doxygen , sphinx @@ -57,7 +58,7 @@ let }; in stdenv.mkDerivation (finalAttrs: { pname = "miopen"; - version = "5.3.3"; + version = "5.4.0"; outputs = [ "out" @@ -71,7 +72,7 @@ in stdenv.mkDerivation (finalAttrs: { owner = "ROCmSoftwarePlatform"; repo = "MIOpen"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-5/JitdGJ0afzK4pGOOywRLsB3/Thc6/71sRkKIxf2Lg="; + hash = "sha256-EOe3LUafOeVLzRoahPdS6DMZ/+6WWeVI7jG25zfPrx8="; }; nativeBuildInputs = [ @@ -97,6 +98,7 @@ in stdenv.mkDerivation (finalAttrs: { boost sqlite bzip2 + nlohmann_json ] ++ lib.optionals buildDocs [ latex doxygen diff --git a/pkgs/development/libraries/miopengemm/default.nix b/pkgs/development/libraries/miopengemm/default.nix index 2246f9cde6a74..63dca83821031 100644 --- a/pkgs/development/libraries/miopengemm/default.nix +++ b/pkgs/development/libraries/miopengemm/default.nix @@ -32,7 +32,7 @@ let }; in stdenv.mkDerivation (finalAttrs: { pname = "miopengemm"; - version = "5.3.3"; + version = "5.4.0"; outputs = [ "out" diff --git a/pkgs/development/libraries/rccl/default.nix b/pkgs/development/libraries/rccl/default.nix index 81b2746b261fe..a59cfc9caf087 100644 --- a/pkgs/development/libraries/rccl/default.nix +++ b/pkgs/development/libraries/rccl/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "rccl"; - version = "5.3.3"; + version = "5.4.0"; outputs = [ "out" @@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCmSoftwarePlatform"; repo = "rccl"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-whRXGD8oINDYhFs8+hEWKWoGNqacGlyy7xi8peA8Qsk="; + hash = "sha256-NbHzRmrUe4kJwkHZtZ+zHjIy2uk+dpN9caE0L5hUnbc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/rocblas/default.nix b/pkgs/development/libraries/rocblas/default.nix index efadcf863a234..cbd409f64cb12 100644 --- a/pkgs/development/libraries/rocblas/default.nix +++ b/pkgs/development/libraries/rocblas/default.nix @@ -30,13 +30,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocblas"; - version = "5.3.3"; + version = "5.4.0"; src = fetchFromGitHub { owner = "ROCmSoftwarePlatform"; repo = "rocBLAS"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-z40WxF+suMeIZihBWJPRWyL20S2FUbeZb5JewmQWOJo="; + hash = "sha256-4art8/KwH2KDLwSYcyzn/m/xwdg5wQQvgHks73aB+60="; }; # We currently need this patch due to faulty toolchain includes diff --git a/pkgs/development/libraries/rocclr/default.nix b/pkgs/development/libraries/rocclr/default.nix index 88a2adb637e43..caddb67271c1c 100644 --- a/pkgs/development/libraries/rocclr/default.nix +++ b/pkgs/development/libraries/rocclr/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocclr"; - version = "5.3.3"; + version = "5.4.0"; src = fetchFromGitHub { owner = "ROCm-Developer-Tools"; repo = "ROCclr"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-dmL9krI/gHGQdOZ53+bQ7WjKcmJ+fZZP0lzF8ITLT4E="; + hash = "sha256-tYFoGafOsJYnRQaOLAaFix6tPD0QPTidOtOicPxP2Vk="; }; patches = [ diff --git a/pkgs/development/libraries/rocfft/default.nix b/pkgs/development/libraries/rocfft/default.nix index 5d9ec9ad1dca0..6d5e50b528880 100644 --- a/pkgs/development/libraries/rocfft/default.nix +++ b/pkgs/development/libraries/rocfft/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocfft"; - version = "5.3.3"; + version = "5.4.0"; outputs = [ "out" @@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCmSoftwarePlatform"; repo = "rocFFT"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-jb2F1fRe+YLloYJ/KtzrptUDhmdBDBtddeW/g55owKM="; + hash = "sha256-XlpWT6PS+VpJjA4iG8yaiFRxE63kugNG1ZyQXoQVJL8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/rocm-comgr/default.nix b/pkgs/development/libraries/rocm-comgr/default.nix index d6dfaa006c373..d483f4c76e4f7 100644 --- a/pkgs/development/libraries/rocm-comgr/default.nix +++ b/pkgs/development/libraries/rocm-comgr/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocm-comgr"; - version = "5.3.3"; + version = "5.4.0"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "ROCm-CompilerSupport"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-LQyMhqcWm8zqt6138fnT7EOq/F8bG3Iuf04PTemVQmg="; + hash = "sha256-qLsrBTeSop7lIQv8gZDwgpvGZJOAq90zsvMi1QpfbAs="; }; sourceRoot = "source/lib/comgr"; diff --git a/pkgs/development/libraries/rocm-device-libs/default.nix b/pkgs/development/libraries/rocm-device-libs/default.nix index 906d33eb17446..0f96a73952766 100644 --- a/pkgs/development/libraries/rocm-device-libs/default.nix +++ b/pkgs/development/libraries/rocm-device-libs/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocm-device-libs"; - version = "5.3.3"; + version = "5.4.0"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "ROCm-Device-Libs"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-rKMe0B/pkDek/ZU37trnJNa8aqvlwxobPb1+VTx/bJU="; + hash = "sha256-8gxvgy2GlROxM5qKtZVu5Lxa1FmTIVlBTpfp8rxhNhk="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/rocm-opencl-runtime/default.nix b/pkgs/development/libraries/rocm-opencl-runtime/default.nix index a465db42a2bbb..3469eab0dd3c5 100644 --- a/pkgs/development/libraries/rocm-opencl-runtime/default.nix +++ b/pkgs/development/libraries/rocm-opencl-runtime/default.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocm-opencl-runtime"; - version = "5.3.3"; + version = "5.4.0"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "ROCm-OpenCL-Runtime"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-QvAF25Zfq9d1M/KIsr2S+Ggxzqw/MQ2OVcm9ZNfjTa8="; + hash = "sha256-E1+Y/fgp5b+7H1LN+O1fwVi0/XRCgvsiSxTY3u/q+8I="; }; nativeBuildInputs = [ cmake rocm-cmake ]; diff --git a/pkgs/development/libraries/rocm-runtime/default.nix b/pkgs/development/libraries/rocm-runtime/default.nix index a387449e0aafe..ace7150b4a83e 100644 --- a/pkgs/development/libraries/rocm-runtime/default.nix +++ b/pkgs/development/libraries/rocm-runtime/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocm-runtime"; - version = "5.3.3"; + version = "5.4.0"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "ROCR-Runtime"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-26E7vA2JlC50zmpaQfDrFMlgjAqmfTdp9/A8g5caDqI="; + hash = "sha256-M9kv1Oe5ZZfd9H/+KUJUoK9L1EdyS2qRp2mJDK0dnPE="; }; sourceRoot = "source/src"; diff --git a/pkgs/development/libraries/rocm-thunk/default.nix b/pkgs/development/libraries/rocm-thunk/default.nix index d1934ed850cc3..826a8950adafc 100644 --- a/pkgs/development/libraries/rocm-thunk/default.nix +++ b/pkgs/development/libraries/rocm-thunk/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocm-thunk"; - version = "5.3.3"; + version = "5.4.0"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "ROCT-Thunk-Interface"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-cM78Bx6uYsxhvdqSVNgmqOUYQnUJVCA7mNpRNNSFv6k="; + hash = "sha256-EU5toaKzVeZpdm/YhaQ0bXq0eoYwYQ5qGLUJzxgZVjE="; }; preConfigure = '' diff --git a/pkgs/development/libraries/rocmlir/default.nix b/pkgs/development/libraries/rocmlir/default.nix index 4f592eddecefa..c7c15b1729451 100644 --- a/pkgs/development/libraries/rocmlir/default.nix +++ b/pkgs/development/libraries/rocmlir/default.nix @@ -3,32 +3,40 @@ , fetchFromGitHub , writeScript , cmake -, hip +, clang +, git +, libxml2 +, libedit , python3 }: stdenv.mkDerivation (finalAttrs: { pname = "rocmlir"; - version = "5.3.3"; + version = "5.4.0"; src = fetchFromGitHub { owner = "ROCmSoftwarePlatform"; repo = "rocMLIR"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-s/5gAH5vh2tgATZemPP66juQFDg8BR2sipzX2Q6pOOQ="; + hash = "sha256-MokE7Ej8mLHTQeLYvKr7PPlsNG6ul91fqfXDlGu5JpI="; }; nativeBuildInputs = [ cmake - hip + clang ]; buildInputs = [ + git + libxml2 + libedit python3 ]; cmakeFlags = [ - "-DBUILD_FAT_LIBMLIRMIOPEN=ON" + "-DCMAKE_C_COMPILER=clang" + "-DCMAKE_CXX_COMPILER=clang++" + "-DBUILD_FAT_LIBROCKCOMPILER=ON" ]; passthru.updateScript = writeScript "update.sh" '' @@ -44,6 +52,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/ROCmSoftwarePlatform/rocMLIR"; license = with licenses; [ asl20 ]; maintainers = teams.rocm.members; - broken = finalAttrs.version != hip.version; + broken = finalAttrs.version != clang.version; }; }) diff --git a/pkgs/development/libraries/rocprim/default.nix b/pkgs/development/libraries/rocprim/default.nix index 33c84822ef520..a04ecf7e62262 100644 --- a/pkgs/development/libraries/rocprim/default.nix +++ b/pkgs/development/libraries/rocprim/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocprim"; - version = "5.3.3"; + version = "5.4.0"; outputs = [ "out" @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCmSoftwarePlatform"; repo = "rocPRIM"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-jfTuGEPyssARpdo0ZnfVJt0MBkoHnmBtf6Zg4xXNJ1U="; + hash = "sha256-VGTrMllQguIJKexdQNXC07KX7TxU/e5oT6VZdlSRcQY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/rocrand/default.nix b/pkgs/development/libraries/rocrand/default.nix index 4bb2cf984c706..1bdf02544c7e2 100644 --- a/pkgs/development/libraries/rocrand/default.nix +++ b/pkgs/development/libraries/rocrand/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocrand"; - version = "5.3.3"; + version = "5.4.0"; outputs = [ "out" @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCmSoftwarePlatform"; repo = "rocRAND"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-awQLqPmhVxegrqqSoC8fiCQJ33bPKZlljSAXnHVcIZo="; + hash = "sha256-5kqVLUINYk8WjnRJ+LqUiCPjLIHcbvIL0Z6BRsj9hvY="; fetchSubmodules = true; # For inline hipRAND }; diff --git a/pkgs/development/libraries/rocsparse/default.nix b/pkgs/development/libraries/rocsparse/default.nix index 0d2e2ae093e09..357a98e5d55cc 100644 --- a/pkgs/development/libraries/rocsparse/default.nix +++ b/pkgs/development/libraries/rocsparse/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocsparse"; - version = "5.3.3"; + version = "5.4.0"; outputs = [ "out" @@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCmSoftwarePlatform"; repo = "rocSPARSE"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-1069oBrIpZ4M9CAkzoQ9a5j3WlCXErirTbgTUZuT6b0="; + hash = "sha256-paibzXYvRnd+4yYvteLf7EYmqeqWDc7BoDByfSMrhYo="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/rocthrust/default.nix b/pkgs/development/libraries/rocthrust/default.nix index 8c3e8921bd44a..919c0cf3d5bf3 100644 --- a/pkgs/development/libraries/rocthrust/default.nix +++ b/pkgs/development/libraries/rocthrust/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocthrust"; - version = "5.3.3"; + version = "5.4.0"; # Comment out these outputs until tests/benchmarks are fixed (upstream?) # outputs = [ @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCmSoftwarePlatform"; repo = "rocThrust"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-WODOeWWL0AOYu0djwDlVZuiJDxcchsAT7BFG9JKYScw="; + hash = "sha256-3OcJUL6T1HJz6TQb1//lumsTxqfwbWbQ4lGuZoKmqbY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/rocwmma/default.nix b/pkgs/development/libraries/rocwmma/default.nix index b2969237e1d4f..2a01f5d74b50f 100644 --- a/pkgs/development/libraries/rocwmma/default.nix +++ b/pkgs/development/libraries/rocwmma/default.nix @@ -34,7 +34,7 @@ let }; in stdenv.mkDerivation (finalAttrs: { pname = "rocwmma"; - version = "5.3.3"; + version = "5.4.0"; outputs = [ "out" @@ -50,7 +50,7 @@ in stdenv.mkDerivation (finalAttrs: { owner = "ROCmSoftwarePlatform"; repo = "rocWMMA"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-wU3R1XGTy7uFbceUyE0wy+XayicuyJIVfd1ih6pbTN0="; + hash = "sha256-HUJPb6IahBgl/v+W4kXludBTNAjRm8k6v0jxKAX+qZM="; }; patches = lib.optionals buildTests [ diff --git a/pkgs/development/libraries/tensile/default.nix b/pkgs/development/libraries/tensile/default.nix index 4c9cb80b80e95..11a317b3f24c3 100644 --- a/pkgs/development/libraries/tensile/default.nix +++ b/pkgs/development/libraries/tensile/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "tensile"; - version = "5.3.3"; + version = "5.4.0"; src = fetchFromGitHub { owner = "ROCmSoftwarePlatform"; repo = "Tensile"; rev = "rocm-${version}"; - hash = "sha256-6A7REYdIw/ZmjrJh7B+wCXZMleh4bf04TFpRItPtctA="; + hash = "sha256-W6yr6mptfsiJSSzPCImgqI1EmsUv+l99SjqkoZsOjag="; }; buildInputs = [ diff --git a/pkgs/development/tools/build-managers/rocm-cmake/default.nix b/pkgs/development/tools/build-managers/rocm-cmake/default.nix index e84f4cff67fa4..4371ed9cc5919 100644 --- a/pkgs/development/tools/build-managers/rocm-cmake/default.nix +++ b/pkgs/development/tools/build-managers/rocm-cmake/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocm-cmake"; - version = "5.3.3"; + version = "5.4.0"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "rocm-cmake"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-AOn3SLprHdeo2FwojQdhRAttUHuaWkO6WlymK8Q8lbc="; + hash = "sha256-JarQqiiZ36WV1d6vyQD546GN1EtoKLcdvcZsG3QWD2Y="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/tools/rocminfo/default.nix b/pkgs/development/tools/rocminfo/default.nix index e69ba80e1364c..43bd1fc8d8d6e 100644 --- a/pkgs/development/tools/rocminfo/default.nix +++ b/pkgs/development/tools/rocminfo/default.nix @@ -7,7 +7,7 @@ # compilers to determine the desired target. , defaultTargets ? []}: stdenv.mkDerivation (finalAttrs: { - version = "5.3.3"; + version = "5.4.0"; pname = "rocminfo"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; diff --git a/pkgs/tools/system/rocm-smi/default.nix b/pkgs/tools/system/rocm-smi/default.nix index 3ade1088f9682..b65dc7af574e2 100644 --- a/pkgs/tools/system/rocm-smi/default.nix +++ b/pkgs/tools/system/rocm-smi/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocm-smi"; - version = "5.3.3"; + version = "5.4.0"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "rocm_smi_lib"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-UbGbkH2vhQ9gv3sSoG+mXap+MdcrP61TN5DcP5F/5nQ="; + hash = "sha256-nkidiDNNU6MGhne9EbYClkODJZw/zZu3LWzlniJKyJE="; }; nativeBuildInputs = [ cmake wrapPython ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7f30247a59c4c..224e959889a2b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15108,7 +15108,9 @@ with pkgs; rocminfo = callPackage ../development/tools/rocminfo { }; - rocmlir = callPackage ../development/libraries/rocmlir { }; + rocmlir = callPackage ../development/libraries/rocmlir { + inherit (llvmPackages_rocm) clang; + }; rocprim = callPackage ../development/libraries/rocprim { }; From c492cf49d1766efbe4eb8a166cf824a9e794f0bb Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 10 Dec 2022 11:26:39 +0100 Subject: [PATCH 02/32] =?UTF-8?q?gajim:=201.5.3=20=E2=86=92=201.5.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/instant-messengers/gajim/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix index 648569a9c0302..e8ac07b50cfb5 100644 --- a/pkgs/applications/networking/instant-messengers/gajim/default.nix +++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix @@ -22,11 +22,11 @@ python3.pkgs.buildPythonApplication rec { pname = "gajim"; - version = "1.5.3"; + version = "1.5.4"; src = fetchurl { url = "https://gajim.org/downloads/${lib.versions.majorMinor version}/gajim-${version}.tar.gz"; - sha256 = "sha256-JSV4592s7oKJzxBghtlrvXqCoO6iCRoYNu/eaqPfuLA="; + sha256 = "sha256-uIzOKiCbHiSVRlXcpE0B/+Ats3cfw4u7eA+KyPriwhk="; }; buildInputs = [ From c03c334ee31aeaa700204ff85aa52cba6f4b0fd0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 10 Dec 2022 13:43:53 +0000 Subject: [PATCH 03/32] librem: 2.9.0 -> 2.10.0 --- pkgs/development/libraries/librem/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/librem/default.nix b/pkgs/development/libraries/librem/default.nix index 6c7bdeec0bdff..f343c4383c4ab 100644 --- a/pkgs/development/libraries/librem/default.nix +++ b/pkgs/development/libraries/librem/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchFromGitHub, zlib, openssl, libre }: stdenv.mkDerivation rec { - version = "2.9.0"; + version = "2.10.0"; pname = "librem"; src = fetchFromGitHub { owner = "baresip"; repo = "rem"; rev = "v${version}"; - sha256 = "sha256-HiVM/opZuR7Gkt421ps+nKiiKERG8sUD8qBLIMGNCJI="; + sha256 = "sha256-wyzpx0WjQLA8UKx4S6QOETMehf51Af5napZsxMXttmM="; }; buildInputs = [ zlib openssl libre ]; makeFlags = [ From 72f5af191f2c799131bfb67398a12301e7663239 Mon Sep 17 00:00:00 2001 From: Madoura Date: Fri, 9 Dec 2022 16:57:33 -0600 Subject: [PATCH 04/32] fetchGitHub: inherit owner and repo for use with rocmUpdateScript --- pkgs/build-support/fetchgithub/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/fetchgithub/default.nix b/pkgs/build-support/fetchgithub/default.nix index fcde7447cbd36..b1a85e9f691bc 100644 --- a/pkgs/build-support/fetchgithub/default.nix +++ b/pkgs/build-support/fetchgithub/default.nix @@ -59,4 +59,4 @@ let ) // privateAttrs // passthruAttrs // { inherit name; }; in -fetcher fetcherArgs // { meta = newMeta; inherit rev; } +fetcher fetcherArgs // { meta = newMeta; inherit rev owner repo; } From 9b98f8433af210894f4bd9d6a76a1602fb9419ae Mon Sep 17 00:00:00 2001 From: Madoura Date: Sat, 3 Dec 2022 18:25:41 -0600 Subject: [PATCH 05/32] rocm-related: create and use a generic updater script --- pkgs/development/compilers/hip/default.nix | 21 ++++++++- pkgs/development/compilers/llvm/rocm/llvm.nix | 44 ++++++++++++------- .../libraries/clang-ocl/default.nix | 14 +++--- pkgs/development/libraries/hipcub/default.nix | 14 +++--- .../libraries/hipsparse/default.nix | 14 +++--- pkgs/development/libraries/miopen/default.nix | 14 +++--- .../libraries/miopengemm/default.nix | 14 +++--- pkgs/development/libraries/rccl/default.nix | 14 +++--- .../development/libraries/rocblas/default.nix | 14 +++--- pkgs/development/libraries/rocclr/default.nix | 13 +++--- pkgs/development/libraries/rocfft/default.nix | 14 +++--- .../libraries/rocm-comgr/default.nix | 21 ++++++--- .../libraries/rocm-device-libs/default.nix | 13 +++--- .../libraries/rocm-opencl-runtime/default.nix | 13 +++--- .../libraries/rocm-runtime/default.nix | 13 +++--- .../libraries/rocm-thunk/default.nix | 16 +++---- .../development/libraries/rocmlir/default.nix | 16 +++---- .../development/libraries/rocprim/default.nix | 14 +++--- .../development/libraries/rocrand/default.nix | 14 +++--- .../libraries/rocsparse/default.nix | 14 +++--- .../libraries/rocthrust/default.nix | 14 +++--- .../development/libraries/rocwmma/default.nix | 14 +++--- .../development/libraries/tensile/default.nix | 14 +++--- .../rocm-modules/update-script/default.nix | 27 ++++++++++++ .../build-managers/rocm-cmake/default.nix | 18 +++++--- pkgs/development/tools/rocminfo/default.nix | 29 ++++++++---- pkgs/tools/system/rocm-smi/default.nix | 19 +++++--- pkgs/top-level/all-packages.nix | 2 + 28 files changed, 257 insertions(+), 204 deletions(-) create mode 100644 pkgs/development/rocm-modules/update-script/default.nix diff --git a/pkgs/development/compilers/hip/default.nix b/pkgs/development/compilers/hip/default.nix index a2fb609455615..066fd906984d7 100644 --- a/pkgs/development/compilers/hip/default.nix +++ b/pkgs/development/compilers/hip/default.nix @@ -165,10 +165,19 @@ stdenv.mkDerivation (finalAttrs: { wrapProgram $out/bin/hipconfig --set HIP_PATH $out --set HSA_PATH ${rocm-runtime} --set HIP_CLANG_PATH ${clang}/bin ''; + # TODO: Separate HIP and hipamd into separate derivations passthru.updateScript = writeScript "update.sh" '' #!/usr/bin/env nix-shell #!nix-shell -i bash -p curl jq common-updater-scripts nix-prefetch-github - version="$(curl ''${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} -sL "https://api.github.com/repos/ROCm-Developer-Tools/HIP/tags" | jq '.[].name | split("-") | .[1] | select( . != null )' --raw-output | sort -n | tail -1)" + version="$(curl ''${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} \ + -sL "https://api.github.com/repos/ROCm-Developer-Tools/HIP/releases?per_page=1" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)" + + IFS='.' read -a version_arr <<< "$version" + + if [ "''${#version_arr[*]}" == 2 ]; then + version="''${version}.0" + fi + current_version="$(grep "version =" pkgs/development/compilers/hip/default.nix | head -n1 | cut -d'"' -f2)" if [[ "$version" != "$current_version" ]]; then tarball_meta="$(nix-prefetch-github ROCm-Developer-Tools HIP --rev "rocm-$version")" @@ -180,7 +189,15 @@ stdenv.mkDerivation (finalAttrs: { echo hip already up-to-date fi - version="$(curl ''${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} -sL "https://api.github.com/repos/ROCm-Developer-Tools/hipamd/tags" | jq '.[].name | split("-") | .[1] | select( . != null )' --raw-output | sort -n | tail -1)" + version="$(curl ''${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} \ + -sL "https://api.github.com/repos/ROCm-Developer-Tools/hipamd/releases?per_page=1" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)" + + IFS='.' read -a version_arr <<< "$version" + + if [ "''${#version_arr[*]}" == 2 ]; then + version="''${version}.0" + fi + current_version="$(grep "version =" pkgs/development/compilers/hip/default.nix | tail -n1 | cut -d'"' -f2)" if [[ "$version" != "$current_version" ]]; then tarball_meta="$(nix-prefetch-github ROCm-Developer-Tools hipamd --rev "rocm-$version")" diff --git a/pkgs/development/compilers/llvm/rocm/llvm.nix b/pkgs/development/compilers/llvm/rocm/llvm.nix index 728c9024ee376..143c9516d5adb 100644 --- a/pkgs/development/compilers/llvm/rocm/llvm.nix +++ b/pkgs/development/compilers/llvm/rocm/llvm.nix @@ -58,24 +58,34 @@ in stdenv.mkDerivation (finalAttrs: { --replace 'FILES_MATCHING' 'NO_SOURCE_PERMISSIONS FILES_MATCHING' ''; - updateScript = writeScript "update.sh" '' - #!/usr/bin/env nix-shell - #!nix-shell -i bash -p curl jq common-updater-scripts nix-prefetch-github - - version="$(curl ''${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} -sL "https://api.github.com/repos/RadeonOpenCompute/llvm-project/releases?per_page=1" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)" - current_version="$(grep "version =" pkgs/development/compilers/llvm/rocm/default.nix | cut -d'"' -f2)" - if [[ "$version" != "$current_version" ]]; then - tarball_meta="$(nix-prefetch-github RadeonOpenCompute llvm-project --rev "rocm-$version")" - tarball_hash="$(nix to-base64 sha256-$(jq -r '.sha256' <<< "$tarball_meta"))" - sed -i "pkgs/development/compilers/llvm/rocm/default.nix" \ - -e 's,version = "\(.*\)",version = "'"$version"'",' \ - -e 's,hash = "\(.*\)",hash = "sha256-'"$tarball_hash"'",' - else - echo rocm-llvm already up-to-date - fi - ''; + passthru = { + isClang = true; + + updateScript = writeScript "update.sh" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p curl jq common-updater-scripts nix-prefetch-github + + version="$(curl ''${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} \ + -sL "https://api.github.com/repos/RadeonOpenCompute/llvm-project/releases?per_page=1" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)" + + IFS='.' read -a version_arr <<< "$version" + + if [ "''${#version_arr[*]}" == 2 ]; then + version="''${version}.0" + fi - passthru.isClang = true; + current_version="$(grep "version =" pkgs/development/compilers/llvm/rocm/default.nix | cut -d'"' -f2)" + if [[ "$version" != "$current_version" ]]; then + tarball_meta="$(nix-prefetch-github RadeonOpenCompute llvm-project --rev "rocm-$version")" + tarball_hash="$(nix to-base64 sha256-$(jq -r '.sha256' <<< "$tarball_meta"))" + sed -i "pkgs/development/compilers/llvm/rocm/default.nix" \ + -e 's,version = "\(.*\)",version = "'"$version"'",' \ + -e 's,hash = "\(.*\)",hash = "sha256-'"$tarball_hash"'",' + else + echo rocm-llvm already up-to-date + fi + ''; + }; meta = with lib; { description = "ROCm fork of the LLVM compiler infrastructure"; diff --git a/pkgs/development/libraries/clang-ocl/default.nix b/pkgs/development/libraries/clang-ocl/default.nix index bd732c85b61b9..3341bc680fb0c 100644 --- a/pkgs/development/libraries/clang-ocl/default.nix +++ b/pkgs/development/libraries/clang-ocl/default.nix @@ -1,7 +1,7 @@ { lib , stdenv , fetchFromGitHub -, writeScript +, rocmUpdateScript , cmake , rocm-cmake , rocm-device-libs @@ -34,13 +34,11 @@ stdenv.mkDerivation (finalAttrs: { "-DCMAKE_CXX_COMPILER=clang++" ]; - passthru.updateScript = writeScript "update.sh" '' - #!/usr/bin/env nix-shell - #!nix-shell -i bash -p curl jq common-updater-scripts - version="$(curl ''${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} \ - -sL "https://api.github.com/repos/RadeonOpenCompute/clang-ocl/releases?per_page=1" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)" - update-source-version clang-ocl "$version" --ignore-same-hash - ''; + passthru.updateScript = rocmUpdateScript { + name = finalAttrs.pname; + owner = finalAttrs.src.owner; + repo = finalAttrs.src.repo; + }; meta = with lib; { description = "OpenCL compilation with clang compiler"; diff --git a/pkgs/development/libraries/hipcub/default.nix b/pkgs/development/libraries/hipcub/default.nix index 36727b9bd3538..68f31e991d61d 100644 --- a/pkgs/development/libraries/hipcub/default.nix +++ b/pkgs/development/libraries/hipcub/default.nix @@ -1,7 +1,7 @@ { lib , stdenv , fetchFromGitHub -, writeScript +, rocmUpdateScript , cmake , rocm-cmake , rocm-runtime @@ -76,13 +76,11 @@ stdenv.mkDerivation (finalAttrs: { rmdir $out/bin ''; - passthru.updateScript = writeScript "update.sh" '' - #!/usr/bin/env nix-shell - #!nix-shell -i bash -p curl jq common-updater-scripts - version="$(curl ''${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} \ - -sL "https://api.github.com/repos/ROCmSoftwarePlatform/hipCUB/releases?per_page=1" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)" - update-source-version hipcub "$version" --ignore-same-hash - ''; + passthru.updateScript = rocmUpdateScript { + name = finalAttrs.pname; + owner = finalAttrs.src.owner; + repo = finalAttrs.src.repo; + }; meta = with lib; { description = "Thin wrapper library on top of rocPRIM or CUB"; diff --git a/pkgs/development/libraries/hipsparse/default.nix b/pkgs/development/libraries/hipsparse/default.nix index 950121cec3e1d..fc1e62e65208e 100644 --- a/pkgs/development/libraries/hipsparse/default.nix +++ b/pkgs/development/libraries/hipsparse/default.nix @@ -1,7 +1,7 @@ { lib , stdenv , fetchFromGitHub -, writeScript +, rocmUpdateScript , cmake , rocm-cmake , rocm-runtime @@ -112,13 +112,11 @@ stdenv.mkDerivation (finalAttrs: { rmdir $out/bin ''; - passthru.updateScript = writeScript "update.sh" '' - #!/usr/bin/env nix-shell - #!nix-shell -i bash -p curl jq common-updater-scripts - version="$(curl ''${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} \ - -sL "https://api.github.com/repos/ROCmSoftwarePlatform/hipSPARSE/releases?per_page=1" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)" - update-source-version hipsparse "$version" --ignore-same-hash - ''; + passthru.updateScript = rocmUpdateScript { + name = finalAttrs.pname; + owner = finalAttrs.src.owner; + repo = finalAttrs.src.repo; + }; meta = with lib; { description = "ROCm SPARSE marshalling library"; diff --git a/pkgs/development/libraries/miopen/default.nix b/pkgs/development/libraries/miopen/default.nix index 65afe2d4c5249..e7bf7bdf0868f 100644 --- a/pkgs/development/libraries/miopen/default.nix +++ b/pkgs/development/libraries/miopen/default.nix @@ -2,7 +2,7 @@ , stdenv , fetchFromGitHub , fetchurl -, writeScript +, rocmUpdateScript , pkg-config , cmake , rocm-cmake @@ -179,13 +179,11 @@ in stdenv.mkDerivation (finalAttrs: { patchelf --set-rpath ${lib.makeLibraryPath (finalAttrs.buildInputs ++ [ hip ])}:$out/lib $test/bin/* ''; - passthru.updateScript = writeScript "update.sh" '' - #!/usr/bin/env nix-shell - #!nix-shell -i bash -p curl jq common-updater-scripts - version="$(curl ''${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} \ - -sL "https://api.github.com/repos/ROCmSoftwarePlatform/MIOpen/releases?per_page=1" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)" - update-source-version miopen "$version" --ignore-same-hash - ''; + passthru.updateScript = rocmUpdateScript { + name = finalAttrs.pname; + owner = finalAttrs.src.owner; + repo = finalAttrs.src.repo; + }; meta = with lib; { description = "Machine intelligence library for ROCm"; diff --git a/pkgs/development/libraries/miopengemm/default.nix b/pkgs/development/libraries/miopengemm/default.nix index 63dca83821031..ecc5ba09aad81 100644 --- a/pkgs/development/libraries/miopengemm/default.nix +++ b/pkgs/development/libraries/miopengemm/default.nix @@ -1,7 +1,7 @@ { lib , stdenv , fetchFromGitHub -, writeScript +, rocmUpdateScript , cmake , rocm-cmake , rocm-opencl-runtime @@ -110,13 +110,11 @@ in stdenv.mkDerivation (finalAttrs: { patchelf --set-rpath ${lib.makeLibraryPath finalAttrs.buildInputs}:$out/lib $benchmark/bin/* ''; - passthru.updateScript = writeScript "update.sh" '' - #!/usr/bin/env nix-shell - #!nix-shell -i bash -p curl jq common-updater-scripts - version="$(curl ''${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} \ - -sL "https://api.github.com/repos/ROCmSoftwarePlatform/MIOpenGEMM/releases?per_page=1" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)" - update-source-version miopengemm "$version" --ignore-same-hash - ''; + passthru.updateScript = rocmUpdateScript { + name = finalAttrs.pname; + owner = finalAttrs.src.owner; + repo = finalAttrs.src.repo; + }; meta = with lib; { description = "OpenCL general matrix multiplication API for ROCm"; diff --git a/pkgs/development/libraries/rccl/default.nix b/pkgs/development/libraries/rccl/default.nix index a59cfc9caf087..6a9b485457493 100644 --- a/pkgs/development/libraries/rccl/default.nix +++ b/pkgs/development/libraries/rccl/default.nix @@ -1,7 +1,7 @@ { lib , stdenv , fetchFromGitHub -, writeScript +, rocmUpdateScript , cmake , rocm-cmake , rocm-runtime @@ -72,13 +72,11 @@ stdenv.mkDerivation (finalAttrs: { rmdir $out/bin ''; - passthru.updateScript = writeScript "update.sh" '' - #!/usr/bin/env nix-shell - #!nix-shell -i bash -p curl jq common-updater-scripts - version="$(curl ''${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} \ - -sL "https://api.github.com/repos/ROCmSoftwarePlatform/rccl/releases?per_page=1" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)" - update-source-version rccl "$version" --ignore-same-hash - ''; + passthru.updateScript = rocmUpdateScript { + name = finalAttrs.pname; + owner = finalAttrs.src.owner; + repo = finalAttrs.src.repo; + }; meta = with lib; { description = "ROCm communication collectives library"; diff --git a/pkgs/development/libraries/rocblas/default.nix b/pkgs/development/libraries/rocblas/default.nix index cbd409f64cb12..24ead8242005c 100644 --- a/pkgs/development/libraries/rocblas/default.nix +++ b/pkgs/development/libraries/rocblas/default.nix @@ -1,7 +1,7 @@ { lib , stdenv , fetchFromGitHub -, writeScript +, rocmUpdateScript , fetchpatch , cmake , rocm-cmake @@ -113,13 +113,11 @@ stdenv.mkDerivation (finalAttrs: { --replace "virtualenv_install(\''${Tensile_TEST_LOCAL_PATH})" "" ''; - passthru.updateScript = writeScript "update.sh" '' - #!/usr/bin/env nix-shell - #!nix-shell -i bash -p curl jq common-updater-scripts - version="$(curl ''${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} \ - -sL "https://api.github.com/repos/ROCmSoftwarePlatform/rocBLAS/releases?per_page=1" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)" - update-source-version rocblas "$version" --ignore-same-hash - ''; + passthru.updateScript = rocmUpdateScript { + name = finalAttrs.pname; + owner = finalAttrs.src.owner; + repo = finalAttrs.src.repo; + }; meta = with lib; { description = "BLAS implementation for ROCm platform"; diff --git a/pkgs/development/libraries/rocclr/default.nix b/pkgs/development/libraries/rocclr/default.nix index caddb67271c1c..2837f57897e74 100644 --- a/pkgs/development/libraries/rocclr/default.nix +++ b/pkgs/development/libraries/rocclr/default.nix @@ -1,7 +1,7 @@ { lib, stdenv , fetchFromGitHub , fetchpatch -, writeScript +, rocmUpdateScript , rocm-comgr }: @@ -42,12 +42,11 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; - passthru.updateScript = writeScript "update.sh" '' - #!/usr/bin/env nix-shell - #!nix-shell -i bash -p curl jq common-updater-scripts - version="$(curl ''${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} -sL "https://api.github.com/repos/ROCm-Developer-Tools/ROCclr/tags" | jq '.[].name | split("-") | .[1] | select( . != null )' --raw-output | sort -n | tail -1)" - update-source-version rocclr "$version" --ignore-same-hash - ''; + passthru.updateScript = rocmUpdateScript { + name = finalAttrs.pname; + owner = finalAttrs.src.owner; + repo = finalAttrs.src.repo; + }; meta = with lib; { description = "Source package of the Radeon Open Compute common language runtime"; diff --git a/pkgs/development/libraries/rocfft/default.nix b/pkgs/development/libraries/rocfft/default.nix index 6d5e50b528880..8dbf5f16a447b 100644 --- a/pkgs/development/libraries/rocfft/default.nix +++ b/pkgs/development/libraries/rocfft/default.nix @@ -1,7 +1,7 @@ { lib , stdenv , fetchFromGitHub -, writeScript +, rocmUpdateScript , cmake , rocm-cmake , rocm-runtime @@ -98,13 +98,11 @@ stdenv.mkDerivation (finalAttrs: { mv $out/rocfft_rtc_helper $out/bin ''; - passthru.updateScript = writeScript "update.sh" '' - #!/usr/bin/env nix-shell - #!nix-shell -i bash -p curl jq common-updater-scripts - version="$(curl ''${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} \ - -sL "https://api.github.com/repos/ROCmSoftwarePlatform/rocFFT/releases?per_page=1" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)" - update-source-version rocfft "$version" --ignore-same-hash - ''; + passthru.updateScript = rocmUpdateScript { + name = finalAttrs.pname; + owner = finalAttrs.src.owner; + repo = finalAttrs.src.repo; + }; meta = with lib; { description = "FFT implementation for ROCm "; diff --git a/pkgs/development/libraries/rocm-comgr/default.nix b/pkgs/development/libraries/rocm-comgr/default.nix index d483f4c76e4f7..2d26f72fc1b05 100644 --- a/pkgs/development/libraries/rocm-comgr/default.nix +++ b/pkgs/development/libraries/rocm-comgr/default.nix @@ -1,4 +1,12 @@ -{ lib, stdenv, fetchFromGitHub, writeScript, cmake, clang, rocm-device-libs, llvm }: +{ lib +, stdenv +, fetchFromGitHub +, rocmUpdateScript +, cmake +, clang +, rocm-device-libs +, llvm +}: stdenv.mkDerivation (finalAttrs: { pname = "rocm-comgr"; @@ -27,12 +35,11 @@ stdenv.mkDerivation (finalAttrs: { patches = [ ./cmake.patch ]; - passthru.updateScript = writeScript "update.sh" '' - #!/usr/bin/env nix-shell - #!nix-shell -i bash -p curl jq common-updater-scripts - version="$(curl ''${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} -sL "https://api.github.com/repos/RadeonOpenCompute/ROCm-CompilerSupport/releases?per_page=1" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)" - update-source-version rocm-comgr "$version" --ignore-same-hash - ''; + passthru.updateScript = rocmUpdateScript { + name = finalAttrs.pname; + owner = finalAttrs.src.owner; + repo = finalAttrs.src.repo; + }; meta = with lib; { description = "APIs for compiling and inspecting AMDGPU code objects"; diff --git a/pkgs/development/libraries/rocm-device-libs/default.nix b/pkgs/development/libraries/rocm-device-libs/default.nix index 0f96a73952766..b6245eea84496 100644 --- a/pkgs/development/libraries/rocm-device-libs/default.nix +++ b/pkgs/development/libraries/rocm-device-libs/default.nix @@ -1,6 +1,6 @@ { lib, stdenv , fetchFromGitHub -, writeScript +, rocmUpdateScript , cmake , clang , llvm @@ -29,12 +29,11 @@ stdenv.mkDerivation (finalAttrs: { patches = [ ./cmake.patch ]; - passthru.updateScript = writeScript "update.sh" '' - #!/usr/bin/env nix-shell - #!nix-shell -i bash -p curl jq common-updater-scripts - version="$(curl ''${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} -sL "https://api.github.com/repos/RadeonOpenCompute/ROCm-Device-Libs/releases?per_page=1" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)" - update-source-version rocm-device-libs "$version" --ignore-same-hash - ''; + passthru.updateScript = rocmUpdateScript { + name = finalAttrs.pname; + owner = finalAttrs.src.owner; + repo = finalAttrs.src.repo; + }; meta = with lib; { description = "Set of AMD-specific device-side language runtime libraries"; diff --git a/pkgs/development/libraries/rocm-opencl-runtime/default.nix b/pkgs/development/libraries/rocm-opencl-runtime/default.nix index 3469eab0dd3c5..1d250195c23c2 100644 --- a/pkgs/development/libraries/rocm-opencl-runtime/default.nix +++ b/pkgs/development/libraries/rocm-opencl-runtime/default.nix @@ -1,7 +1,7 @@ { stdenv , lib , fetchFromGitHub -, writeScript +, rocmUpdateScript , addOpenGLRunpath , cmake , rocm-cmake @@ -68,12 +68,11 @@ stdenv.mkDerivation (finalAttrs: { --replace 'ICD_VENDOR_PATH' '"${addOpenGLRunpath.driverLink}/etc/OpenCL/vendors/"' ''; - passthru.updateScript = writeScript "update.sh" '' - #!/usr/bin/env nix-shell - #!nix-shell -i bash -p curl jq common-updater-scripts - version="$(curl ''${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} -sL "https://api.github.com/repos/RadeonOpenCompute/ROCm-OpenCL-Runtime/tags" | jq '.[].name | split("-") | .[1] | select( . != null )' --raw-output | sort -n | tail -1)" - update-source-version rocm-opencl-runtime "$version" --ignore-same-hash - ''; + passthru.updateScript = rocmUpdateScript { + name = finalAttrs.pname; + owner = finalAttrs.src.owner; + repo = finalAttrs.src.repo; + }; meta = with lib; { description = "OpenCL runtime for AMD GPUs, part of the ROCm stack"; diff --git a/pkgs/development/libraries/rocm-runtime/default.nix b/pkgs/development/libraries/rocm-runtime/default.nix index ace7150b4a83e..86ddf5b77038b 100644 --- a/pkgs/development/libraries/rocm-runtime/default.nix +++ b/pkgs/development/libraries/rocm-runtime/default.nix @@ -1,7 +1,7 @@ { stdenv , lib , fetchFromGitHub -, writeScript +, rocmUpdateScript , addOpenGLRunpath , cmake , pkg-config @@ -48,12 +48,11 @@ stdenv.mkDerivation (finalAttrs: { rm -rf $out/hsa ''; - passthru.updateScript = writeScript "update.sh" '' - #!/usr/bin/env nix-shell - #!nix-shell -i bash -p curl jq common-updater-scripts - version="$(curl ''${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} -sL "https://api.github.com/repos/RadeonOpenCompute/ROCR-Runtime/releases?per_page=1" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)" - update-source-version rocm-runtime "$version" --ignore-same-hash - ''; + passthru.updateScript = rocmUpdateScript { + name = finalAttrs.pname; + owner = finalAttrs.src.owner; + repo = finalAttrs.src.repo; + }; meta = with lib; { description = "Platform runtime for ROCm"; diff --git a/pkgs/development/libraries/rocm-thunk/default.nix b/pkgs/development/libraries/rocm-thunk/default.nix index 826a8950adafc..6bca7a89fc486 100644 --- a/pkgs/development/libraries/rocm-thunk/default.nix +++ b/pkgs/development/libraries/rocm-thunk/default.nix @@ -1,6 +1,7 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub -, writeScript +, rocmUpdateScript , cmake , pkg-config , libdrm @@ -37,12 +38,11 @@ stdenv.mkDerivation (finalAttrs: { cp -r $src/include $out ''; - passthru.updateScript = writeScript "update.sh" '' - #!/usr/bin/env nix-shell - #!nix-shell -i bash -p curl jq common-updater-scripts - version="$(curl ''${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} -sL "https://api.github.com/repos/RadeonOpenCompute/ROCT-Thunk-Interface/tags" | jq '.[].name | split("-") | .[1] | select( . != null )' --raw-output | sort -n | tail -1)" - update-source-version rocm-thunk "$version" --ignore-same-hash - ''; + passthru.updateScript = rocmUpdateScript { + name = finalAttrs.pname; + owner = finalAttrs.src.owner; + repo = finalAttrs.src.repo; + }; meta = with lib; { description = "Radeon open compute thunk interface"; diff --git a/pkgs/development/libraries/rocmlir/default.nix b/pkgs/development/libraries/rocmlir/default.nix index c7c15b1729451..e40eb1b813c1c 100644 --- a/pkgs/development/libraries/rocmlir/default.nix +++ b/pkgs/development/libraries/rocmlir/default.nix @@ -1,7 +1,7 @@ { lib , stdenv , fetchFromGitHub -, writeScript +, rocmUpdateScript , cmake , clang , git @@ -39,13 +39,13 @@ stdenv.mkDerivation (finalAttrs: { "-DBUILD_FAT_LIBROCKCOMPILER=ON" ]; - passthru.updateScript = writeScript "update.sh" '' - #!/usr/bin/env nix-shell - #!nix-shell -i bash -p curl jq common-updater-scripts - version="$(curl ''${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} \ - -sL "https://api.github.com/repos/ROCmSoftwarePlatform/rocMLIR/tags?per_page=2" | jq '.[1].name | split("-") | .[1]' --raw-output)" - update-source-version rocmlir "$version" --ignore-same-hash - ''; + passthru.updateScript = rocmUpdateScript { + name = finalAttrs.pname; + owner = finalAttrs.src.owner; + repo = finalAttrs.src.repo; + page = "tags?per_page=2"; + filter = ".[1].name | split(\"-\") | .[1]"; + }; meta = with lib; { description = "MLIR-based convolution and GEMM kernel generator"; diff --git a/pkgs/development/libraries/rocprim/default.nix b/pkgs/development/libraries/rocprim/default.nix index a04ecf7e62262..9b5fabf0fb001 100644 --- a/pkgs/development/libraries/rocprim/default.nix +++ b/pkgs/development/libraries/rocprim/default.nix @@ -1,7 +1,7 @@ { lib , stdenv , fetchFromGitHub -, writeScript +, rocmUpdateScript , cmake , rocm-cmake , rocm-runtime @@ -72,13 +72,11 @@ stdenv.mkDerivation (finalAttrs: { rmdir $out/bin ''; - passthru.updateScript = writeScript "update.sh" '' - #!/usr/bin/env nix-shell - #!nix-shell -i bash -p curl jq common-updater-scripts - version="$(curl ''${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} \ - -sL "https://api.github.com/repos/ROCmSoftwarePlatform/rocPRIM/releases?per_page=1" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)" - update-source-version rocprim "$version" --ignore-same-hash - ''; + passthru.updateScript = rocmUpdateScript { + name = finalAttrs.pname; + owner = finalAttrs.src.owner; + repo = finalAttrs.src.repo; + }; meta = with lib; { description = "ROCm parallel primitives"; diff --git a/pkgs/development/libraries/rocrand/default.nix b/pkgs/development/libraries/rocrand/default.nix index 1bdf02544c7e2..f0b1cb3e69b61 100644 --- a/pkgs/development/libraries/rocrand/default.nix +++ b/pkgs/development/libraries/rocrand/default.nix @@ -1,7 +1,7 @@ { lib , stdenv , fetchFromGitHub -, writeScript +, rocmUpdateScript , cmake , rocm-cmake , rocm-runtime @@ -75,13 +75,11 @@ stdenv.mkDerivation (finalAttrs: { rmdir $out/bin ''; - passthru.updateScript = writeScript "update.sh" '' - #!/usr/bin/env nix-shell - #!nix-shell -i bash -p curl jq common-updater-scripts - version="$(curl ''${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} \ - -sL "https://api.github.com/repos/ROCmSoftwarePlatform/rocRAND/releases?per_page=1" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)" - update-source-version rocrand "$version" --ignore-same-hash - ''; + passthru.updateScript = rocmUpdateScript { + name = finalAttrs.pname; + owner = finalAttrs.src.owner; + repo = finalAttrs.src.repo; + }; meta = with lib; { description = "Generate pseudo-random and quasi-random numbers"; diff --git a/pkgs/development/libraries/rocsparse/default.nix b/pkgs/development/libraries/rocsparse/default.nix index 357a98e5d55cc..0edee46cfeb35 100644 --- a/pkgs/development/libraries/rocsparse/default.nix +++ b/pkgs/development/libraries/rocsparse/default.nix @@ -2,7 +2,7 @@ , stdenv , fetchFromGitHub , fetchzip -, writeScript +, rocmUpdateScript , cmake , rocm-cmake , rocm-runtime @@ -134,13 +134,11 @@ stdenv.mkDerivation (finalAttrs: { mirror2 = "https://www.cise.ufl.edu/research/sparse/MM"; }; - updateScript = writeScript "update.sh" '' - #!/usr/bin/env nix-shell - #!nix-shell -i bash -p curl jq common-updater-scripts - version="$(curl ''${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} \ - -sL "https://api.github.com/repos/ROCmSoftwarePlatform/rocSPARSE/releases?per_page=1" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)" - update-source-version rocsparse "$version" --ignore-same-hash - ''; + updateScript = rocmUpdateScript { + name = finalAttrs.pname; + owner = finalAttrs.src.owner; + repo = finalAttrs.src.repo; + }; }; meta = with lib; { diff --git a/pkgs/development/libraries/rocthrust/default.nix b/pkgs/development/libraries/rocthrust/default.nix index 919c0cf3d5bf3..2816207808329 100644 --- a/pkgs/development/libraries/rocthrust/default.nix +++ b/pkgs/development/libraries/rocthrust/default.nix @@ -1,7 +1,7 @@ { lib , stdenv , fetchFromGitHub -, writeScript +, rocmUpdateScript , cmake , rocm-cmake , rocm-runtime @@ -74,13 +74,11 @@ stdenv.mkDerivation (finalAttrs: { # rmdir $out/bin # ''; - passthru.updateScript = writeScript "update.sh" '' - #!/usr/bin/env nix-shell - #!nix-shell -i bash -p curl jq common-updater-scripts - version="$(curl ''${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} \ - -sL "https://api.github.com/repos/ROCmSoftwarePlatform/rocThrust/releases?per_page=1" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)" - update-source-version rocthrust "$version" --ignore-same-hash - ''; + passthru.updateScript = rocmUpdateScript { + name = finalAttrs.pname; + owner = finalAttrs.src.owner; + repo = finalAttrs.src.repo; + }; meta = with lib; { description = "ROCm parallel algorithm library"; diff --git a/pkgs/development/libraries/rocwmma/default.nix b/pkgs/development/libraries/rocwmma/default.nix index 2a01f5d74b50f..786d48ee80cae 100644 --- a/pkgs/development/libraries/rocwmma/default.nix +++ b/pkgs/development/libraries/rocwmma/default.nix @@ -1,7 +1,7 @@ { lib , stdenv , fetchFromGitHub -, writeScript +, rocmUpdateScript , cmake , rocm-cmake , hip @@ -121,13 +121,11 @@ in stdenv.mkDerivation (finalAttrs: { rmdir $out/bin ''; - passthru.updateScript = writeScript "update.sh" '' - #!/usr/bin/env nix-shell - #!nix-shell -i bash -p curl jq common-updater-scripts - version="$(curl ''${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} \ - -sL "https://api.github.com/repos/ROCmSoftwarePlatform/rocWMMA/releases?per_page=1" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)" - update-source-version rocwmma "$version" --ignore-same-hash - ''; + passthru.updateScript = rocmUpdateScript { + name = finalAttrs.pname; + owner = finalAttrs.src.owner; + repo = finalAttrs.src.repo; + }; meta = with lib; { description = "Mixed precision matrix multiplication and accumulation"; diff --git a/pkgs/development/libraries/tensile/default.nix b/pkgs/development/libraries/tensile/default.nix index 11a317b3f24c3..df3b580c059f1 100644 --- a/pkgs/development/libraries/tensile/default.nix +++ b/pkgs/development/libraries/tensile/default.nix @@ -1,7 +1,7 @@ { lib , stdenv , fetchFromGitHub -, writeScript +, rocmUpdateScript , buildPythonPackage , pyyaml , msgpack @@ -25,13 +25,11 @@ buildPythonPackage rec { pandas ]; - passthru.updateScript = writeScript "update.sh" '' - #!/usr/bin/env nix-shell - #!nix-shell -i bash -p curl jq common-updater-scripts - version="$(curl ''${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} \ - -sL "https://api.github.com/repos/ROCmSoftwarePlatform/Tensile/releases?per_page=1" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)" - update-source-version tensile "$version" --ignore-same-hash - ''; + passthru.updateScript = rocmUpdateScript { + name = pname; + owner = src.owner; + repo = src.repo; + }; meta = with lib; { description = "GEMMs and tensor contractions"; diff --git a/pkgs/development/rocm-modules/update-script/default.nix b/pkgs/development/rocm-modules/update-script/default.nix new file mode 100644 index 0000000000000..1d2b268a34b6b --- /dev/null +++ b/pkgs/development/rocm-modules/update-script/default.nix @@ -0,0 +1,27 @@ +{ runtimeShell +, writeScript +}: + +{ name ? "" +, owner ? "" +, repo ? "" +, page ? "releases?per_page=1" +, filter ? ".[0].tag_name | split(\"-\") | .[1]" +}: + +let + updateScript = writeScript "update.sh" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p curl jq common-updater-scripts + version="$(curl ''${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} \ + -sL "https://api.github.com/repos/${owner}/${repo}/${page}" | jq '${filter}' --raw-output)" + + IFS='.' read -a version_arr <<< "$version" + + if [ "''${#version_arr[*]}" == 2 ]; then + version="''${version}.0" + fi + + update-source-version ${name} "$version" --ignore-same-hash + ''; +in [ updateScript ] diff --git a/pkgs/development/tools/build-managers/rocm-cmake/default.nix b/pkgs/development/tools/build-managers/rocm-cmake/default.nix index 4371ed9cc5919..0a3e44e022996 100644 --- a/pkgs/development/tools/build-managers/rocm-cmake/default.nix +++ b/pkgs/development/tools/build-managers/rocm-cmake/default.nix @@ -1,4 +1,9 @@ -{ lib, stdenv, fetchFromGitHub, writeScript, cmake }: +{ lib +, stdenv +, fetchFromGitHub +, rocmUpdateScript +, cmake +}: stdenv.mkDerivation (finalAttrs: { pname = "rocm-cmake"; @@ -13,12 +18,11 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake ]; - passthru.updateScript = writeScript "update.sh" '' - #!/usr/bin/env nix-shell - #!nix-shell -i bash -p curl jq common-updater-scripts - version="$(curl ''${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} -sL "https://api.github.com/repos/RadeonOpenCompute/rocm-cmake/tags" | jq '.[].name | split("-") | .[1] | select( . != null )' --raw-output | sort -n | tail -1)" - update-source-version rocm-cmake "$version" --ignore-same-hash - ''; + passthru.updateScript = rocmUpdateScript { + name = finalAttrs.pname; + owner = finalAttrs.src.owner; + repo = finalAttrs.src.repo; + }; meta = with lib; { description = "CMake modules for common build tasks for the ROCm stack"; diff --git a/pkgs/development/tools/rocminfo/default.nix b/pkgs/development/tools/rocminfo/default.nix index 43bd1fc8d8d6e..34dcb52526bd0 100644 --- a/pkgs/development/tools/rocminfo/default.nix +++ b/pkgs/development/tools/rocminfo/default.nix @@ -1,14 +1,27 @@ -{ stdenv, lib, fetchFromGitHub, writeScript, fetchpatch, cmake, rocm-runtime, python3, rocm-cmake, busybox, gnugrep +{ stdenv +, lib +, fetchFromGitHub +, rocmUpdateScript +, fetchpatch +, cmake +, rocm-runtime +, python3 +, rocm-cmake +, busybox +, gnugrep # rocminfo requires that the calling user have a password and be in # the video group. If we let rocm_agent_enumerator rely upon # rocminfo's output, then it, too, has those requirements. Instead, # we can specify the GPU targets for this system (e.g. "gfx803" for # Polaris) such that no system call is needed for downstream # compilers to determine the desired target. -, defaultTargets ? []}: +, defaultTargets ? [] +}: + stdenv.mkDerivation (finalAttrs: { version = "5.4.0"; pname = "rocminfo"; + src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "rocminfo"; @@ -19,6 +32,7 @@ stdenv.mkDerivation (finalAttrs: { enableParallelBuilding = true; nativeBuildInputs = [ cmake ]; buildInputs = [ rocm-cmake rocm-runtime ]; + cmakeFlags = [ "-DROCM_DIR=${rocm-runtime}" "-DROCRTST_BLD_TYPE=Release" @@ -37,12 +51,11 @@ stdenv.mkDerivation (finalAttrs: { echo '${lib.concatStringsSep "\n" defaultTargets}' > $out/bin/target.lst ''; - passthru.updateScript = writeScript "update.sh" '' - #!/usr/bin/env nix-shell - #!nix-shell -i bash -p curl jq common-updater-scripts - version="$(curl ''${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} -sL "https://api.github.com/repos/RadeonOpenCompute/rocminfo/tags" | jq '.[].name | split("-") | .[1] | select( . != null )' --raw-output | sort -n | tail -1)" - update-source-version rocminfo "$version" --ignore-same-hash - ''; + passthru.updateScript = rocmUpdateScript { + name = finalAttrs.pname; + owner = finalAttrs.src.owner; + repo = finalAttrs.src.repo; + }; meta = with lib; { description = "ROCm Application for Reporting System Info"; diff --git a/pkgs/tools/system/rocm-smi/default.nix b/pkgs/tools/system/rocm-smi/default.nix index b65dc7af574e2..33bda1e564554 100644 --- a/pkgs/tools/system/rocm-smi/default.nix +++ b/pkgs/tools/system/rocm-smi/default.nix @@ -1,4 +1,10 @@ -{ lib, stdenv, fetchFromGitHub, writeScript, cmake, wrapPython }: +{ lib +, stdenv +, fetchFromGitHub +, rocmUpdateScript +, cmake +, wrapPython +}: stdenv.mkDerivation (finalAttrs: { pname = "rocm-smi"; @@ -19,12 +25,11 @@ stdenv.mkDerivation (finalAttrs: { wrapPythonProgramsIn $out ''; - passthru.updateScript = writeScript "update.sh" '' - #!/usr/bin/env nix-shell - #!nix-shell -i bash -p curl jq common-updater-scripts - version="$(curl ''${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} -sL "https://api.github.com/repos/RadeonOpenCompute/rocm_smi_lib/releases?per_page=1" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)" - update-source-version rocm-smi "$version" --ignore-same-hash - ''; + passthru.updateScript = rocmUpdateScript { + name = finalAttrs.pname; + owner = finalAttrs.src.owner; + repo = finalAttrs.src.repo; + }; meta = with lib; { description = "System management interface for AMD GPUs supported by ROCm"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 224e959889a2b..bb5e22f3858c2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15149,6 +15149,8 @@ with pkgs; useOpenCL = true; }; + rocmUpdateScript = callPackage ../development/rocm-modules/update-script { }; + rtags = callPackage ../development/tools/rtags { inherit (darwin) apple_sdk; }; From 463ca6768c129e71ba9cb7870dc04bf2683f4df9 Mon Sep 17 00:00:00 2001 From: Madoura Date: Sat, 3 Dec 2022 22:01:07 -0600 Subject: [PATCH 06/32] miopen: disable fetching KDBs by default --- pkgs/development/libraries/miopen/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/miopen/default.nix b/pkgs/development/libraries/miopen/default.nix index e7bf7bdf0868f..d48adb09a04c0 100644 --- a/pkgs/development/libraries/miopen/default.nix +++ b/pkgs/development/libraries/miopen/default.nix @@ -31,9 +31,13 @@ , buildDocs ? true , buildTests ? false # LFS isn't working, so we will manually fetch these -# This isn't strictly required, but is recommended +# This isn't strictly required, but is recommended to enable # https://github.com/ROCmSoftwarePlatform/MIOpen/issues/1373 -, fetchKDBs ? true +# +# MIOpen will produce a very large output due to KDBs fetched +# Also possibly in the future because of KDB generation +# This is disabled by default so we can cache on hydra +, fetchKDBs ? false , useOpenCL ? false }: @@ -191,8 +195,5 @@ in stdenv.mkDerivation (finalAttrs: { license = with licenses; [ mit ]; maintainers = teams.rocm.members; broken = finalAttrs.version != hip.version; - # MIOpen will produce a very large output due to KDBs fetched - # Also possibly in the future because of KDB generation - hydraPlatforms = [ ]; }; }) From fbb79459e6f57e8c7e1fe0419e9e90960879c517 Mon Sep 17 00:00:00 2001 From: Madoura Date: Sun, 4 Dec 2022 09:36:13 -0600 Subject: [PATCH 07/32] composable_kernel: use unstableGitUpdater --- pkgs/development/libraries/composable_kernel/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/composable_kernel/default.nix b/pkgs/development/libraries/composable_kernel/default.nix index c5653be28942a..f4395871047eb 100644 --- a/pkgs/development/libraries/composable_kernel/default.nix +++ b/pkgs/development/libraries/composable_kernel/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, unstableGitUpdater , cmake , rocm-cmake , hip @@ -77,6 +78,8 @@ stdenv.mkDerivation (finalAttrs: { mv bin/example_* $example/bin ''; + passthru.updateScript = unstableGitUpdater { }; + meta = with lib; { description = "Performance portable programming model for machine learning tensor operators"; homepage = "https://github.com/ROCmSoftwarePlatform/composable_kernel"; From 90e3db28758406b25ea941bc971a3e1ae5a294ab Mon Sep 17 00:00:00 2001 From: Madoura Date: Sat, 10 Dec 2022 19:53:48 +0000 Subject: [PATCH 08/32] =?UTF-8?q?composable=5Fkernel:=20unstable-2022-11-1?= =?UTF-8?q?9=20=E2=86=92=20unstable-2022-12-08?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/libraries/composable_kernel/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/composable_kernel/default.nix b/pkgs/development/libraries/composable_kernel/default.nix index f4395871047eb..f41a97b99ad76 100644 --- a/pkgs/development/libraries/composable_kernel/default.nix +++ b/pkgs/development/libraries/composable_kernel/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "composable_kernel"; - version = "unstable-2022-11-19"; + version = "unstable-2022-12-08"; outputs = [ "out" @@ -29,8 +29,8 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "ROCmSoftwarePlatform"; repo = "composable_kernel"; - rev = "43a889b72e3faabf04c16ff410d387ce28486c3e"; - hash = "sha256-DDRrWKec/RcOhW3CrN0gl9NZsp0Bjnja7HAiTcEh7qg="; + rev = "d58b7f5155b44c8b608f3edc6a6eab314493ec1a"; + hash = "sha256-4nzyaWhPnY/0TygcoJAqVzdgfXOkf+o/BE2V9N+Bm7Q="; }; nativeBuildInputs = [ From 75d7299df1438a2f96fa6f47ef454a2cb41e6be3 Mon Sep 17 00:00:00 2001 From: Madoura Date: Sat, 10 Dec 2022 16:53:12 -0600 Subject: [PATCH 09/32] Revert "rocm-llvm: enable clang-tools-extra for clang-tidy" This reverts commit c998cad49d07e8686a805a088a679ab15e0b0551. --- pkgs/development/compilers/llvm/rocm/llvm.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/llvm/rocm/llvm.nix b/pkgs/development/compilers/llvm/rocm/llvm.nix index 143c9516d5adb..b148b936ca56c 100644 --- a/pkgs/development/compilers/llvm/rocm/llvm.nix +++ b/pkgs/development/compilers/llvm/rocm/llvm.nix @@ -41,7 +41,7 @@ in stdenv.mkDerivation (finalAttrs: { "-DCMAKE_BUILD_TYPE=${if debugVersion then "Debug" else "Release"}" "-DLLVM_INSTALL_UTILS=ON" # Needed by rustc "-DLLVM_TARGETS_TO_BUILD=AMDGPU;${llvmNativeTarget}" - "-DLLVM_ENABLE_PROJECTS=clang;lld;compiler-rt;clang-tools-extra" + "-DLLVM_ENABLE_PROJECTS=clang;lld;compiler-rt" ] ++ lib.optionals enableManpages [ "-DLLVM_BINUTILS_INCDIR=${libbfd.dev}/include" From 7e6e7b6936ef1b57554064838ba7fc5c8a062314 Mon Sep 17 00:00:00 2001 From: figsoda Date: Sun, 11 Dec 2022 20:03:27 -0500 Subject: [PATCH 10/32] felix-fm: 2.1.1 -> 2.2.0 Diff: https://github.com/kyoheiu/felix/compare/v2.1.1...v2.2.0 Changelog: https://github.com/kyoheiu/felix/blob/v2.2.0/CHANGELOG.md --- pkgs/applications/file-managers/felix-fm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/file-managers/felix-fm/default.nix b/pkgs/applications/file-managers/felix-fm/default.nix index 79b1d62509b7c..2e5353faeb7b0 100644 --- a/pkgs/applications/file-managers/felix-fm/default.nix +++ b/pkgs/applications/file-managers/felix-fm/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "felix"; - version = "2.1.1"; + version = "2.2.0"; src = fetchFromGitHub { owner = "kyoheiu"; repo = pname; rev = "v${version}"; - sha256 = "sha256-0wYYElXm7Nr1zjtWLSdBaUVsb+2CN4TwaJr5g1juUUs="; + sha256 = "sha256-wc1hBHqVH/ooXqF97Ev/mVdbfS9JCrreq2n2PIg/pEs="; }; - cargoSha256 = "sha256-SnXZkMrAhhP8lVFCd6LKHFSg9o2K1Wy+z/4oUZOHoXw="; + cargoSha256 = "sha256-CraJexOepja1CJnp9ngCVBWiFy84rWXzDRTWa0sxQs0="; nativeBuildInputs = [ pkg-config ]; From c23666473c8bf88a46ea24444a6c40a5dacb16bd Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Mon, 12 Dec 2022 13:04:39 +0100 Subject: [PATCH 11/32] doc: Remove all section numbers Simplicity. We use anchors nowadays. Nobody should be printing this. --- doc/doc-support/parameters.xml | 9 ++++++--- nixos/doc/manual/default.nix | 9 ++++++--- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/doc/doc-support/parameters.xml b/doc/doc-support/parameters.xml index 8b413dcd337a7..50ff25fe10750 100644 --- a/doc/doc-support/parameters.xml +++ b/doc/doc-support/parameters.xml @@ -2,11 +2,14 @@ - - + + + + + - + diff --git a/nixos/doc/manual/default.nix b/nixos/doc/manual/default.nix index 6db20cdd64182..9b72e840f4b10 100644 --- a/nixos/doc/manual/default.nix +++ b/nixos/doc/manual/default.nix @@ -102,11 +102,14 @@ let ''; manualXsltprocOptions = toString [ - "--param section.autolabel 1" - "--param section.label.includes.component.label 1" + "--param chapter.autolabel 0" + "--param part.autolabel 0" + "--param preface.autolabel 0" + "--param reference.autolabel 0" + "--param section.autolabel 0" "--stringparam html.stylesheet 'style.css overrides.css highlightjs/mono-blue.css'" "--stringparam html.script './highlightjs/highlight.pack.js ./highlightjs/loader.js'" - "--param xref.with.number.and.title 1" + "--param xref.with.number.and.title 0" "--param toc.section.depth 0" "--param generate.consistent.ids 1" "--stringparam admon.style ''" From 28a5476184f8f8a78b7414a9a1bc482ccc7b5b36 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Mon, 12 Dec 2022 09:32:09 -0300 Subject: [PATCH 12/32] treewide: remove e-user from maintainers According to https://github.com/NixOS/nixpkgs/pull/22789#issuecomment-757687683, the maintainer doesn't use NixOS anymore. --- maintainers/maintainer-list.nix | 6 ------ pkgs/applications/audio/sisco.lv2/default.nix | 2 +- pkgs/os-specific/linux/semodule-utils/default.nix | 2 +- pkgs/os-specific/linux/sssd/default.nix | 2 +- pkgs/tools/misc/ding-libs/default.nix | 2 +- pkgs/tools/text/sgml/jade/default.nix | 2 +- 6 files changed, 5 insertions(+), 11 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 39b94a5e75b41..47d7ad9f194e4 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3847,12 +3847,6 @@ githubId = 15128988; name = "Maksim Dzabraev"; }; - e-user = { - email = "nixos@sodosopa.io"; - github = "outergod"; - githubId = 93086; - name = "Alexander Kahl"; - }; eadwu = { email = "edmund.wu@protonmail.com"; github = "eadwu"; diff --git a/pkgs/applications/audio/sisco.lv2/default.nix b/pkgs/applications/audio/sisco.lv2/default.nix index 5aa407a15023c..8fd514abea512 100644 --- a/pkgs/applications/audio/sisco.lv2/default.nix +++ b/pkgs/applications/audio/sisco.lv2/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { description = "Simple audio oscilloscope with variable time scale, triggering, cursors and numeric readout in LV2 plugin format"; homepage = "http://x42.github.io/sisco.lv2/"; license = licenses.gpl2; - maintainers = [ maintainers.e-user ]; + maintainers = [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/os-specific/linux/semodule-utils/default.nix b/pkgs/os-specific/linux/semodule-utils/default.nix index c7aaec55c764e..999a4b2578eee 100644 --- a/pkgs/os-specific/linux/semodule-utils/default.nix +++ b/pkgs/os-specific/linux/semodule-utils/default.nix @@ -22,6 +22,6 @@ stdenv.mkDerivation rec { description = "SELinux policy core utilities (packaging additions)"; license = licenses.gpl2; inherit (libsepol.meta) homepage platforms; - maintainers = [ maintainers.e-user ]; + maintainers = [ ]; }; } diff --git a/pkgs/os-specific/linux/sssd/default.nix b/pkgs/os-specific/linux/sssd/default.nix index 30311bbd58c41..efd2078d99aea 100644 --- a/pkgs/os-specific/linux/sssd/default.nix +++ b/pkgs/os-specific/linux/sssd/default.nix @@ -101,6 +101,6 @@ stdenv.mkDerivation rec { changelog = "https://sssd.io/release-notes/sssd-${version}.html"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = with maintainers; [ e-user illustris ]; + maintainers = with maintainers; [ illustris ]; }; } diff --git a/pkgs/tools/misc/ding-libs/default.nix b/pkgs/tools/misc/ding-libs/default.nix index 9c397bb9be0c7..db2c2f5e146f1 100644 --- a/pkgs/tools/misc/ding-libs/default.nix +++ b/pkgs/tools/misc/ding-libs/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { description = "'D is not GLib' utility libraries"; homepage = "https://pagure.io/SSSD/ding-libs"; platforms = with lib.platforms; linux; - maintainers = with lib.maintainers; [ e-user ]; + maintainers = with lib.maintainers; [ ]; license = [ lib.licenses.gpl3 lib.licenses.lgpl3 ]; }; } diff --git a/pkgs/tools/text/sgml/jade/default.nix b/pkgs/tools/text/sgml/jade/default.nix index 8aeaaaa424940..891e26017e68c 100644 --- a/pkgs/tools/text/sgml/jade/default.nix +++ b/pkgs/tools/text/sgml/jade/default.nix @@ -39,6 +39,6 @@ stdenv.mkDerivation rec { license = "custom"; homepage = "http://www.jclark.com/jade/"; platforms = with lib.platforms; linux; - maintainers = with lib.maintainers; [ e-user ]; + maintainers = with lib.maintainers; [ ]; }; } From ebb5623e04adcac6ea289baff97bc77b56b6b6f0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 12 Dec 2022 12:46:49 +0000 Subject: [PATCH 13/32] clojure: 1.11.1.1200 -> 1.11.1.1208 --- pkgs/development/interpreters/clojure/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/clojure/default.nix b/pkgs/development/interpreters/clojure/default.nix index 78095d6d9d317..406c5bc15ab52 100644 --- a/pkgs/development/interpreters/clojure/default.nix +++ b/pkgs/development/interpreters/clojure/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "clojure"; - version = "1.11.1.1200"; + version = "1.11.1.1208"; src = fetchurl { # https://clojure.org/releases/tools url = "https://download.clojure.org/install/clojure-tools-${version}.tar.gz"; - sha256 = "sha256-296cS91Ct9paZ9h5VItFKOSQPOc+4mwylia2Fl1Xthw="; + sha256 = "sha256-bn9uNM46oYc0wxJJ8HMGbE8/2mnYxm/p9S6MhYfhcQM="; }; nativeBuildInputs = [ From 729486a6670feeb91c4305f0090e1a03cd28ca96 Mon Sep 17 00:00:00 2001 From: Ryan Hendrickson Date: Mon, 12 Dec 2022 10:10:46 -0500 Subject: [PATCH 14/32] wine, winetricks: add updateScript --- pkgs/applications/emulators/wine/base.nix | 1 + pkgs/applications/emulators/wine/sources.nix | 71 +++++++++++++++++++ .../applications/emulators/wine/update-lib.sh | 49 +++++++++++++ .../emulators/wine/winetricks.nix | 4 ++ 4 files changed, 125 insertions(+) create mode 100644 pkgs/applications/emulators/wine/update-lib.sh diff --git a/pkgs/applications/emulators/wine/base.nix b/pkgs/applications/emulators/wine/base.nix index 699aa303462ae..f1ae106df46af 100644 --- a/pkgs/applications/emulators/wine/base.nix +++ b/pkgs/applications/emulators/wine/base.nix @@ -185,6 +185,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) { passthru = { inherit pkgArches; + inherit (src) updateScript; tests = { inherit (nixosTests) wine; }; }; meta = { diff --git a/pkgs/applications/emulators/wine/sources.nix b/pkgs/applications/emulators/wine/sources.nix index 7306112ce259b..e00f39406719f 100644 --- a/pkgs/applications/emulators/wine/sources.nix +++ b/pkgs/applications/emulators/wine/sources.nix @@ -12,6 +12,15 @@ let fetchurl = args@{url, sha256, ...}: pkgs.fetchFromGitHub { inherit owner repo rev sha256; } // args; fetchFromGitLab = args@{domain, owner, repo, rev, sha256, ...}: pkgs.fetchFromGitLab { inherit domain owner repo rev sha256; } // args; + + updateScriptPreamble = '' + set -eou pipefail + PATH=${with pkgs; lib.makeBinPath [ common-updater-scripts coreutils curl gnugrep gnused jq nix ]} + sources_file=${__curPos.file} + source ${./update-lib.sh} + ''; + + inherit (pkgs) writeShellScript; in rec { stable = fetchurl rec { @@ -42,6 +51,24 @@ in rec { # Also look for root certificates at $NIX_SSL_CERT_FILE ./cert-path.patch ]; + + updateScript = writeShellScript "update-wine-stable" ('' + ${updateScriptPreamble} + major=''${UPDATE_NIX_OLD_VERSION%.*} + latest_stable=$(get_latest_wine_version "$major.0") + latest_gecko=$(get_latest_lib_version wine-gecko) + + # Can't use autobump on stable because we don't want the path + # to become . + if [[ "$UPDATE_NIX_OLD_VERSION" != "$latest_stable" ]]; then + set_version_and_sha256 stable "$latest_stable" "$(nix-prefetch-url "$wine_url_base/source/$major.0/wine-$latest_stable.tar.xz")" + fi + + autobump stable.gecko32 "$latest_gecko" + autobump stable.gecko64 "$latest_gecko" + + do_update + ''); }; unstable = fetchurl rec { @@ -56,6 +83,23 @@ in rec { url = "https://dl.winehq.org/wine/wine-mono/${version}/wine-mono-${version}-x86.msi"; sha256 = "sha256-ZBP/Mo679+x2icZI/rNUbYEC3thlB50fvwMxsUs6sOw="; }; + + updateScript = writeShellScript "update-wine-unstable" '' + ${updateScriptPreamble} + major=''${UPDATE_NIX_OLD_VERSION%.*} + latest_unstable=$(get_latest_wine_version "$major.x") + latest_mono=$(get_latest_lib_version wine-mono) + + update_staging() { + staging_url=$(get_source_attr staging.url) + set_source_attr staging sha256 "\"$(to_sri "$(nix-prefetch-url --unpack "''${staging_url//$1/$2}")")\"" + } + + autobump unstable "$latest_unstable" "" update_staging + autobump unstable.mono "$latest_mono" + + do_update + ''; }; staging = fetchFromGitHub rec { @@ -81,6 +125,22 @@ in rec { inherit (unstable) gecko32 gecko64; inherit (unstable) mono; + + updateScript = writeShellScript "update-wine-wayland" '' + ${updateScriptPreamble} + wayland_rev=$(get_source_attr wayland.rev) + + latest_wayland_rev=$(curl -s 'https://gitlab.collabora.com/api/v4/projects/2847/repository/branches/wayland' | jq -r .commit.id) + + if [[ "$wayland_rev" != "$latest_wayland_rev" ]]; then + latest_wayland=$(curl -s 'https://gitlab.collabora.com/alf/wine/-/raw/wayland/VERSION' | cut -f3 -d' ') + wayland_url=$(get_source_attr wayland.url) + set_version_and_sha256 wayland "$latest_wayland" "$(nix-prefetch-url --unpack "''${wayland_url/$wayland_rev/$latest_wayland_rev}")" + set_source_attr wayland rev "\"$latest_wayland_rev\"" + fi + + do_update + ''; }; winetricks = fetchFromGitHub rec { @@ -90,5 +150,16 @@ in rec { owner = "Winetricks"; repo = "winetricks"; rev = version; + + updateScript = writeShellScript "update-winetricks" '' + ${updateScriptPreamble} + winetricks_repourl=$(get_source_attr winetricks.gitRepoUrl) + + latest_winetricks=$(list-git-tags --url="$winetricks_repourl" | grep -E '^[0-9]{8}$' | sort --reverse --numeric-sort | head -n 1) + + autobump winetricks "$latest_winetricks" 'nix-prefetch-url --unpack' + + do_update + ''; }; } diff --git a/pkgs/applications/emulators/wine/update-lib.sh b/pkgs/applications/emulators/wine/update-lib.sh new file mode 100644 index 0000000000000..8192d3b5ab588 --- /dev/null +++ b/pkgs/applications/emulators/wine/update-lib.sh @@ -0,0 +1,49 @@ +wine_url_base=https://dl.winehq.org/wine + +sed_exprs=() + +get_source_attr() { + nix-instantiate --eval --json -E "(let pkgs = import ./. {}; in pkgs.callPackage $sources_file { inherit pkgs; }).$1" | jq -r +} + +set_source_attr() { + path="$1" + name="$2" + value="$3" + line=$(nix-instantiate --eval -E "(builtins.unsafeGetAttrPos \"$name\" (let pkgs = import ./. {}; in pkgs.callPackage $sources_file { inherit pkgs; }).$path).line") + sed_exprs+=(-e "${line}s@[^ ].*\$@$name = $value;@") +} + +set_version_and_sha256() { + set_source_attr "$1" version "\"$2\"" + set_source_attr "$1" sha256 "\"$(to_sri "$3")\"" +} + +get_latest_wine_version() { + list-directory-versions --pname=wine --url="$wine_url_base/source/$1" | grep -v 'diff\|rc\|tar' | sort --reverse --version-sort -u | head -n 1 +} + +get_latest_lib_version() { + curl -s "$wine_url_base/$1/" | grep -o 'href="[0-9.]*/"' | sed 's_^href="\(.*\)/"_\1_' | sort --reverse --version-sort -u | head -n 1 +} + +to_sri() { + nix --extra-experimental-features nix-command hash to-sri --type sha256 "$1" +} + +autobump() { + attr="$1" + latest="$2" + fetcher="${3:-nix-prefetch-url}" + more="${4:-}" + version=$(get_source_attr "$attr.version") + if [[ "$version" != "$latest" ]]; then + url=$(get_source_attr "$attr.url") + set_version_and_sha256 "$attr" "$latest" "$($fetcher "${url//$version/$latest}")" + [[ -z "$more" ]] || $more "$version" "$latest" + fi +} + +do_update() { + [[ "${#sed_exprs[@]}" -eq 0 ]] || sed -i "${sed_exprs[@]}" "$sources_file" +} diff --git a/pkgs/applications/emulators/wine/winetricks.nix b/pkgs/applications/emulators/wine/winetricks.nix index 61ca6515c4486..c5d8e9bd95b3a 100644 --- a/pkgs/applications/emulators/wine/winetricks.nix +++ b/pkgs/applications/emulators/wine/winetricks.nix @@ -24,6 +24,10 @@ stdenv.mkDerivation rec { "$out/bin/winetricks" ''; + passthru = { + inherit (src) updateScript; + }; + meta = { description = "A script to install DLLs needed to work around problems in Wine"; license = lib.licenses.lgpl21; From 6b27ccc1fb7f39321fec23680e6394938e523e9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 12 Dec 2022 17:06:05 +0100 Subject: [PATCH 15/32] sysdig: 0.29.3 -> 0.30.2 --- pkgs/os-specific/linux/sysdig/default.nix | 30 ++++++++++++++++++----- 1 file changed, 24 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix index 4f5f3b585dadc..21f232d0c2da9 100644 --- a/pkgs/os-specific/linux/sysdig/default.nix +++ b/pkgs/os-specific/linux/sysdig/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub, fetchpatch, cmake, kernel, installShellFiles, pkg-config , luajit, ncurses, perl, jsoncpp, libb64, openssl, curl, jq, gcc, elfutils, tbb, protobuf, grpc -, libyamlcpp, nlohmann_json +, libyamlcpp, nlohmann_json, re2 }: with lib; let # Compare with https://github.com/draios/sysdig/blob/dev/cmake/modules/falcosecurity-libs.cmake - libsRev = "e5c53d648f3c4694385bbe488e7d47eaa36c229a"; - libsSha256 = "sha256-pG10y5PpDqaF/cq8oAvax5B/ls2UTRQd7tCfBjWVf0U="; + libsRev = "0.9.1"; + libsSha256 = "sha256-X+zLEnage8AuGdGn9sl1RN9b1CKTA1ErrdPNbYKY0s0="; # Compare with https://github.com/falcosecurity/libs/blob/master/cmake/modules/valijson.cmake#L17 valijson = fetchFromGitHub { @@ -17,16 +17,23 @@ let sha256 = "sha256-ZD19Q2MxMQd3yEKbY90GFCrerie5/jzgO8do4JQDoKM="; }; + driver = fetchFromGitHub { + owner = "falcosecurity"; + repo = "libs"; + rev = "3.0.1+driver"; + sha256 = "sha256-bK9wv17bVl93rOqw7JICnMOM0fDtPIErfMmUmNKOD5c="; + }; + in stdenv.mkDerivation rec { pname = "sysdig"; - version = "0.29.3"; + version = "0.30.2"; src = fetchFromGitHub { owner = "draios"; repo = "sysdig"; rev = version; - sha256 = "sha256-dMLeroOd9CgvmgQdPfX8oBxQSyksZi/hP4vO03JhlF0="; + sha256 = "sha256-bDlrnTfm43zpYBIiP2MGB+LM5jtalmeUNtWHgxe81HM="; }; nativeBuildInputs = [ cmake perl installShellFiles pkg-config ]; @@ -40,6 +47,8 @@ stdenv.mkDerivation rec { gcc elfutils tbb + libb64 + re2 protobuf grpc libyamlcpp @@ -57,12 +66,21 @@ stdenv.mkDerivation rec { sha256 = libsSha256; }} libs chmod -R +w libs - cmakeFlagsArray+=("-DFALCOSECURITY_LIBS_SOURCE_DIR=$(pwd)/libs" "-DVALIJSON_INCLUDE=${valijson}/include") + cp -r ${driver} driver-src + chmod -R +w driver-src + cmakeFlagsArray+=( + "-DFALCOSECURITY_LIBS_SOURCE_DIR=$(pwd)/libs" + "-DVALIJSON_INCLUDE=${valijson}/include" + "-DDRIVER_SOURCE_DIR=$(pwd)/driver-src/driver" + ) ''; cmakeFlags = [ "-DUSE_BUNDLED_DEPS=OFF" "-DSYSDIG_VERSION=${version}" + "-DUSE_BUNDLED_B64=OFF" + "-DUSE_BUNDLED_TBB=OFF" + "-DUSE_BUNDLED_RE2=OFF" "-DCREATE_TEST_TARGETS=OFF" ] ++ optional (kernel == null) "-DBUILD_DRIVER=OFF"; From c9563115f333a88a0898449621e7e5c4d26ee6fe Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 12 Dec 2022 17:40:37 +0100 Subject: [PATCH 16/32] nuclei: 2.8.2 -> 2.8.3 Diff: https://github.com/projectdiscovery/nuclei/compare/v2.8.2...v2.8.3 Changelog: https://github.com/projectdiscovery/nuclei/releases/tag/v2.8.3 --- pkgs/tools/security/nuclei/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/nuclei/default.nix b/pkgs/tools/security/nuclei/default.nix index f7163ebce667a..67f627c28a112 100644 --- a/pkgs/tools/security/nuclei/default.nix +++ b/pkgs/tools/security/nuclei/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "nuclei"; - version = "2.8.2"; + version = "2.8.3"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = pname; rev = "v${version}"; - hash = "sha256-iH2+y5J6fgHae23YBwZ5WT/V2JCXFz7PtB/t2+S7PDk="; + hash = "sha256-yh7bKJBj8Y73wT8MXZp6CYZ2y0gLebYZk9Pif8BC2a0="; }; vendorHash = "sha256-snBbte1TNDRcFwzq4QtixmqHarvQJ7E8euYPEYFlXe0="; From 659eadaf12fe7be4e13999f853260a571a169468 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 12 Dec 2022 17:27:57 +0000 Subject: [PATCH 17/32] jackett: 0.20.2352 -> 0.20.2365 --- pkgs/servers/jackett/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix index 8293c9589abc5..83af4bd772b81 100644 --- a/pkgs/servers/jackett/default.nix +++ b/pkgs/servers/jackett/default.nix @@ -9,13 +9,13 @@ buildDotnetModule rec { pname = "jackett"; - version = "0.20.2352"; + version = "0.20.2365"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "vxe5B+R5zxKlvnxnXXw9tfgtXGNlEZF3z14NZ7pA3zE="; + sha256 = "ROnqVJuTotIii87DRVEJ9AKiqZluFEOfVVu6669x2og="; }; projectFile = "src/Jackett.Server/Jackett.Server.csproj"; From 105607e11799140c8883b1b889e34ce4f6ec9194 Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Mon, 12 Dec 2022 14:06:50 -0500 Subject: [PATCH 18/32] delve: 1.20.0 -> 1.20.1 Diff: https://github.com/go-delve/delve/compare/v1.20.0...v1.20.1 --- pkgs/development/tools/delve/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/delve/default.nix b/pkgs/development/tools/delve/default.nix index d8efaea3fde87..6285a0a164e06 100644 --- a/pkgs/development/tools/delve/default.nix +++ b/pkgs/development/tools/delve/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "delve"; - version = "1.20.0"; + version = "1.20.1"; src = fetchFromGitHub { owner = "go-delve"; repo = "delve"; rev = "v${version}"; - sha256 = "sha256-1on1+YTuPCl/XfgfCB49thvqiN45IAHebP12gQlhzsE="; + sha256 = "sha256-X1vds6+brQ5pl7MG2/n0CqCoS0nbjnQUcIgJqji/u60="; }; vendorSha256 = null; From f5d555c28ea5ba734604dd14433e556f77370eac Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 12 Dec 2022 14:32:30 -0500 Subject: [PATCH 19/32] teams: add figsoda to the vim team and codeowners --- .github/CODEOWNERS | 4 ++-- maintainers/team-list.nix | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 41d539dd5f1dd..303c430b8e57f 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -224,10 +224,10 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt /pkgs/top-level/emacs-packages.nix @adisbladis # Neovim -/pkgs/applications/editors/neovim @jonringer @teto +/pkgs/applications/editors/neovim @figsoda @jonringer @teto # VimPlugins -/pkgs/applications/editors/vim/plugins @jonringer +/pkgs/applications/editors/vim/plugins @figsoda @jonringer # VsCode Extensions /pkgs/applications/editors/vscode/extensions @jonringer diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 5e5a61875dbf3..af6684a03f9e3 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -743,6 +743,7 @@ with lib.maintainers; { vim = { members = [ + figsoda jonringer softinio teto From ae339869beaf30072fe68e47049e3b4920b93ad1 Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 12 Dec 2022 14:41:26 -0500 Subject: [PATCH 20/32] delve: set meta.mainProgram --- pkgs/development/tools/delve/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/tools/delve/default.nix b/pkgs/development/tools/delve/default.nix index d8efaea3fde87..327904979500d 100644 --- a/pkgs/development/tools/delve/default.nix +++ b/pkgs/development/tools/delve/default.nix @@ -46,5 +46,6 @@ buildGoModule rec { homepage = "https://github.com/go-delve/delve"; maintainers = with maintainers; [ SuperSandro2000 vdemeester ]; license = licenses.mit; + mainProgram = "dlv"; }; } From 495b71906c2b63e90ef7dbed334222c00c82738d Mon Sep 17 00:00:00 2001 From: Mike Dalrymple Date: Mon, 12 Dec 2022 12:07:15 -0800 Subject: [PATCH 21/32] docs: added missing semicolon in example --- nixos/doc/manual/configuration/wireless.section.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/doc/manual/configuration/wireless.section.md b/nixos/doc/manual/configuration/wireless.section.md index 6b223d843ac5d..3299d2d7ecb8a 100644 --- a/nixos/doc/manual/configuration/wireless.section.md +++ b/nixos/doc/manual/configuration/wireless.section.md @@ -50,7 +50,7 @@ networking.wireless.networks = { echelon = { pskRaw = "dca6d6ed41f4ab5a984c9f55f6f66d4efdc720ebf66959810f4329bb391c5435"; }; -} +}; ``` or you can use it to directly generate the `wpa_supplicant.conf`: From 5766b2b5e2fea889f9ad8e8b1afeff06103dabd9 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 12 Dec 2022 21:32:48 +0100 Subject: [PATCH 22/32] newsflash: 2.2.2 -> 2.2.3 --- .../networking/feedreaders/newsflash/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/feedreaders/newsflash/default.nix b/pkgs/applications/networking/feedreaders/newsflash/default.nix index 7b53d2210feb6..5d5e8615a8550 100644 --- a/pkgs/applications/networking/feedreaders/newsflash/default.nix +++ b/pkgs/applications/networking/feedreaders/newsflash/default.nix @@ -21,19 +21,19 @@ stdenv.mkDerivation (finalAttrs: { pname = "newsflash"; - version = "2.2.2"; + version = "2.2.3"; src = fetchFromGitLab { owner = "news-flash"; repo = "news_flash_gtk"; rev = "refs/tags/v.${finalAttrs.version}"; - sha256 = "sha256-QEfbuTJ0spp0g/XPoS0ZaqudSkWZtXMd3ZTzAHiv45Q="; + sha256 = "sha256-ms0CVYSYccRuiLBZ+lEEyMH0Zhti5sMM49XuEUe9sKw="; }; cargoDeps = rustPlatform.fetchCargoTarball { name = "${finalAttrs.pname}-${finalAttrs.version}"; src = finalAttrs.src; - sha256 = "sha256-AGsiB+xNSZzaG/PFgjKNKQopRUcyX27sLdyhT626Gcc="; + sha256 = "sha256-QbjXjdKMjGwXQ3DoyAJN1SxnHjVeAk140j1me/iWlZQ="; }; patches = [ From c04f46c96397eab978c1d20ad6901c3f6a3a862b Mon Sep 17 00:00:00 2001 From: Azat Bahawi Date: Mon, 12 Dec 2022 23:56:34 +0300 Subject: [PATCH 23/32] zmusic: init at 1.1.11 --- pkgs/development/libraries/zmusic/default.nix | 69 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 71 insertions(+) create mode 100644 pkgs/development/libraries/zmusic/default.nix diff --git a/pkgs/development/libraries/zmusic/default.nix b/pkgs/development/libraries/zmusic/default.nix new file mode 100644 index 0000000000000..1b5ac51b120d5 --- /dev/null +++ b/pkgs/development/libraries/zmusic/default.nix @@ -0,0 +1,69 @@ +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, alsa-lib +, cmake +, fluidsynth +, libsndfile +, mpg123 +, ninja +, pkg-config +, soundfont-fluid +, zlib +}: + +stdenv.mkDerivation rec { + pname = "zmusic"; + version = "1.1.11"; + + src = fetchFromGitHub { + owner = "ZDoom"; + repo = "ZMusic"; + rev = version; + hash = "sha256-QvP8ranwBs8VupBie4vrHdm517OOpCuV3Rbjeb/L9PY="; + }; + + outputs = [ "out" "dev" ]; + + patches = [ + (fetchpatch { + name = "system-fluidsynth.patch"; + url = "https://git.alpinelinux.org/aports/plain/testing/zmusic/system-fluidsynth.patch?id=59bac94da374cb01bc2a0e49d9e9287812fa1ac0"; + hash = "sha256-xKaqiNk1Kt9yNLB22IVmSEtGeOtxrCi7YtFCmhNr0MI="; + }) + ]; + + postPatch = '' + substituteInPlace source/mididevices/music_fluidsynth_mididevice.cpp \ + --replace "/usr/share/sounds/sf2" "${soundfont-fluid}/share/soundfonts" \ + --replace "FluidR3_GM.sf2" "FluidR3_GM2-2.sf2" + ''; + + nativeBuildInputs = [ + cmake + ninja + pkg-config + ]; + + buildInputs = [ + alsa-lib + fluidsynth + libsndfile + mpg123 + zlib + ]; + + meta = with lib; { + description = "GZDoom's music system as a standalone library"; + homepage = "https://github.com/ZDoom/ZMusic"; + license = with licenses; [ + free + gpl3Plus + lgpl21Plus + lgpl3Plus + ]; + platforms = platforms.linux; + maintainers = with maintainers; [ azahi lassulus ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 726b157b81c9c..35a8c33bb3a9e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13478,6 +13478,8 @@ with pkgs; zmap = callPackage ../tools/security/zmap { }; + zmusic = callPackage ../development/libraries/zmusic { }; + zpool-iostat-viz = callPackage ../tools/filesystems/zpool-iostat-viz { }; From 3f2752723f642c3a2cade8e26c0a9f5e32b5e221 Mon Sep 17 00:00:00 2001 From: Azat Bahawi Date: Mon, 12 Dec 2022 23:56:49 +0300 Subject: [PATCH 24/32] gzdoom: 4.8.2 -> 4.10.0 --- pkgs/games/gzdoom/default.nix | 201 +++++++++++++++++----------------- 1 file changed, 98 insertions(+), 103 deletions(-) diff --git a/pkgs/games/gzdoom/default.nix b/pkgs/games/gzdoom/default.nix index 3eb69fa3c1120..aaa800269a75e 100644 --- a/pkgs/games/gzdoom/default.nix +++ b/pkgs/games/gzdoom/default.nix @@ -1,107 +1,102 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, makeWrapper, openal, fluidsynth -, soundfont-fluid, libGL, SDL2, bzip2, zlib, libjpeg, libsndfile, libvpx, mpg123 -, game-music-emu, pkg-config, copyDesktopItems, makeDesktopItem, gtk3 }: - -let - zmusic = stdenv.mkDerivation rec { - pname = "zmusic"; - version = "1.1.3"; - - src = fetchFromGitHub { - owner = "ZDoom"; - repo = "ZMusic"; - rev = version; - hash = "sha256-wrNWfTIbNU/S2qFObUSkb6qyaceh+Y7Loxqudl86+W4="; - }; - - nativeBuildInputs = [ cmake pkg-config ]; - - buildInputs = [ fluidsynth ]; - - cmakeFlags = [ "-DDYN_FLUIDSYNTH=OFF" ]; - - preConfigure = '' - sed -i \ - -e "s@/usr/share/sounds/sf2/@${soundfont-fluid}/share/soundfonts/@g" \ - -e "s@FluidR3_GM.sf2@FluidR3_GM2-2.sf2@g" \ - source/mididevices/music_fluidsynth_mididevice.cpp - ''; +{ lib +, stdenv +, fetchFromGitHub +, makeWrapper +, makeDesktopItem +, copyDesktopItems +, SDL2 +, bzip2 +, cmake +, fluidsynth +, game-music-emu +, gtk3 +, libGL +, libjpeg +, libsndfile +, libvpx +, mpg123 +, ninja +, openal +, pkg-config +, vulkan-loader +, zlib +, zmusic +}: + +stdenv.mkDerivation rec { + pname = "gzdoom"; + version = "4.10.0"; + + src = fetchFromGitHub { + owner = "ZDoom"; + repo = "gzdoom"; + rev = "g${version}"; + fetchSubmodules = true; + hash = "sha256-F3p2X/hjPV9fuaA7T2bQTP6SlKcfc8GniJgv8BcopGw="; }; - gzdoom = stdenv.mkDerivation rec { - pname = "gzdoom"; - version = "4.8.2"; - - src = fetchFromGitHub { - owner = "ZDoom"; - repo = "gzdoom"; - rev = "g${version}"; - hash = "sha256-aT7DUZih3EDqncaXYIPIyGsz4fI267N29PmN3qyVjyo="; - fetchSubmodules = true; - }; - - nativeBuildInputs = [ cmake makeWrapper pkg-config copyDesktopItems ]; - buildInputs = [ - SDL2 - bzip2 - fluidsynth - game-music-emu - gtk3 - libGL - libjpeg - libsndfile - libvpx - mpg123 - openal - zlib - zmusic - ]; - - patches = [ - (fetchpatch { # TODO: Delete me when upgrading to 4.9 - url = "https://github.com/ZDoom/gzdoom/commit/aae85a1b9169953d8dcc5f138a477d5c7d75addb.patch"; - sha256 = "upuLDgVMaGaFSVaDV9Hj13DR5LUma51xv+Mfsz9m9a0="; - }) - ]; - - NIX_CFLAGS_LINK = "-lopenal -lfluidsynth"; - - cmakeFlags = [ "-DDYN_GTK=OFF" ]; - - desktopItems = [ - (makeDesktopItem { - name = "gzdoom"; - exec = "gzdoom"; - desktopName = "GZDoom"; - categories = [ "Game" ]; - }) - ]; - - installPhase = '' - runHook preInstall - - install -Dm755 gzdoom "$out/lib/gzdoom/gzdoom" - for i in *.pk3; do - install -Dm644 "$i" "$out/lib/gzdoom/$i" - done - for i in fm_banks/*; do - install -Dm644 "$i" "$out/lib/gzdoom/$i" - done - for i in soundfonts/*; do - install -Dm644 "$i" "$out/lib/gzdoom/$i" - done - mkdir $out/bin - makeWrapper $out/lib/gzdoom/gzdoom $out/bin/gzdoom - - runHook postInstall + outputs = [ "out" "doc" ]; + + nativeBuildInputs = [ + cmake + copyDesktopItems + makeWrapper + ninja + pkg-config + ]; + + buildInputs = [ + SDL2 + bzip2 + fluidsynth + game-music-emu + gtk3 + libGL + libjpeg + libsndfile + libvpx + mpg123 + openal + vulkan-loader + zlib + zmusic + ]; + + postPatch = '' + substituteInPlace tools/updaterevision/UpdateRevision.cmake \ + --replace "ret_var(Tag)" "ret_var(\"${src.rev}\")" \ + --replace "ret_var(Timestamp)" "ret_var(\"1970-00-00 00:00:00 +0000\")" \ + --replace "ret_var(Hash)" "ret_var(\"${src.rev}\")" + ''; + + cmakeFlags = [ + "-DDYN_GTK=OFF" + "-DDYN_OPENAL=OFF" + ]; + + desktopItems = [ + (makeDesktopItem { + name = "gzdoom"; + exec = "gzdoom"; + desktopName = "GZDoom"; + categories = [ "Game" ]; + }) + ]; + + postInstall = '' + mv $out/bin/gzdoom $out/share/games/doom/gzdoom + makeWrapper $out/share/games/doom/gzdoom $out/bin/gzdoom + ''; + + meta = with lib; { + homepage = "https://github.com/ZDoom/gzdoom"; + description = "Modder-friendly OpenGL and Vulkan source port based on the DOOM engine"; + longDescription = '' + GZDoom is a feature centric port for all DOOM engine games, based on + ZDoom, adding an OpenGL renderer and powerful scripting capabilities. ''; - - meta = with lib; { - homepage = "https://github.com/ZDoom/gzdoom"; - description = "A Doom source port based on ZDoom. It features an OpenGL renderer and lots of new features"; - license = licenses.gpl3Plus; - platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ azahi lassulus ]; - }; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ azahi lassulus ]; }; -in gzdoom +} From 845ac5dc21634595f65a624e883e2b5cf14ac900 Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 12 Dec 2022 15:58:54 -0500 Subject: [PATCH 25/32] docs: generate docs --- nixos/doc/manual/from_md/configuration/wireless.section.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/doc/manual/from_md/configuration/wireless.section.xml b/nixos/doc/manual/from_md/configuration/wireless.section.xml index 82bc201351574..d39ec4fac493e 100644 --- a/nixos/doc/manual/from_md/configuration/wireless.section.xml +++ b/nixos/doc/manual/from_md/configuration/wireless.section.xml @@ -54,7 +54,7 @@ networking.wireless.networks = { echelon = { pskRaw = "dca6d6ed41f4ab5a984c9f55f6f66d4efdc720ebf66959810f4329bb391c5435"; }; -} +}; or you can use it to directly generate the From cd44ef375fefe8a99e6edb1705464394bc8dcca0 Mon Sep 17 00:00:00 2001 From: "\"Andrey Kuznetsov\"" <"fear@loathing.in"> Date: Mon, 12 Dec 2022 21:11:32 +0000 Subject: [PATCH 26/32] vimPlugins: update --- .../editors/vim/plugins/generated.nix | 234 +++++++++--------- 1 file changed, 117 insertions(+), 117 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 19602ee4b5d3a..600b4133d938f 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -185,12 +185,12 @@ final: prev: Navigator-nvim = buildVimPluginFrom2Nix { pname = "Navigator.nvim"; - version = "2022-11-16"; + version = "2022-12-12"; src = fetchFromGitHub { owner = "numToStr"; repo = "Navigator.nvim"; - rev = "2ef04f4be7a9ffc648751e8c0d0c7236074c1dc1"; - sha256 = "0yszjbl4q4pn3f6k90jx2i4bkqm55r4gjl7s6fmf6igcphmslkgm"; + rev = "4a1043074517fc35217f47c7fa3ff320c47f83f5"; + sha256 = "17w2qnaxq0iyhcfv6613zsh4g0plwr5fiv9qvs3m8z049jm5rbiv"; }; meta.homepage = "https://github.com/numToStr/Navigator.nvim/"; }; @@ -281,12 +281,12 @@ final: prev: SchemaStore-nvim = buildVimPluginFrom2Nix { pname = "SchemaStore.nvim"; - version = "2022-12-06"; + version = "2022-12-12"; src = fetchFromGitHub { owner = "b0o"; repo = "SchemaStore.nvim"; - rev = "cb67722e14fbfafd2ba3913bd9850005816ccccf"; - sha256 = "1afsd603v2v68d7cwp9vhjbdy5b89jwrkrra284akc1gmzkbck3d"; + rev = "88a5121859a96c42b75165946e7ff0d318c31a8e"; + sha256 = "10aqwqx9jxc9hpp9ivni4lq91n5zm0qpiqr6f9zz0ch2m8yz3mdv"; }; meta.homepage = "https://github.com/b0o/SchemaStore.nvim/"; }; @@ -486,12 +486,12 @@ final: prev: aerial-nvim = buildVimPluginFrom2Nix { pname = "aerial.nvim"; - version = "2022-12-01"; + version = "2022-12-12"; src = fetchFromGitHub { owner = "stevearc"; repo = "aerial.nvim"; - rev = "50d28ad4e3e1ff89b5fc1bff985760c19c2fa782"; - sha256 = "1m8wix6myx572d13qbn3g77az9zwbiszcldjk1nqq3isz2ix2b8n"; + rev = "97279a10cc797af96d3e7295026e51e4968d09a1"; + sha256 = "14mylgpk764iac0rwvwgm1k77na7p2df5q1iav5mygl2jfl5amss"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/aerial.nvim/"; @@ -979,12 +979,12 @@ final: prev: calendar-vim = buildVimPluginFrom2Nix { pname = "calendar.vim"; - version = "2022-12-11"; + version = "2022-12-12"; src = fetchFromGitHub { owner = "itchyny"; repo = "calendar.vim"; - rev = "3b91377f0e8655894b29c166c796ab9e2c0bf077"; - sha256 = "1121rlyd9kj08ixnjq541x02ckf5g2l1gyic342d11lpwwbpmqc7"; + rev = "d3aad0aa9d432cf8a312f3c33ae63987f8eae0f5"; + sha256 = "1i2w80h0zcm7i40hlp1r1ym5d7hk3m2ar19a6i6q4j6ws2wr29a0"; }; meta.homepage = "https://github.com/itchyny/calendar.vim/"; }; @@ -1735,12 +1735,12 @@ final: prev: coc-nvim = buildVimPluginFrom2Nix { pname = "coc.nvim"; - version = "2022-12-06"; + version = "2022-12-12"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "6adfb13aa16733aa5ede483f428750ce03954c4d"; - sha256 = "02nchj8kb038x75p7p4kvlpvvhfnc51v88ymffpjszplxmih5znn"; + rev = "45346d5a2591c55ac464e4060a281d6b09a9fed3"; + sha256 = "04sm1kaav6m1m72bwzkvr1scr8m36vxw9pgjk65nbahraiasf71p"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; @@ -2023,24 +2023,24 @@ final: prev: coq-artifacts = buildVimPluginFrom2Nix { pname = "coq.artifacts"; - version = "2022-12-11"; + version = "2022-12-12"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq.artifacts"; - rev = "9a1f60036152f55337095f754d2cba7c56224357"; - sha256 = "1idfkgvgswz2jlrp06ijazfh6j3qd57x9m1swzq0r412q504bnll"; + rev = "9a227a77325daaaba4605e5423d70302724a2b9c"; + sha256 = "0w4gxph7lfn2l5hsipnqxa4lzsy4zw54c66ws78kkj2hgf4l7g8w"; }; meta.homepage = "https://github.com/ms-jpq/coq.artifacts/"; }; coq-thirdparty = buildVimPluginFrom2Nix { pname = "coq.thirdparty"; - version = "2022-12-11"; + version = "2022-12-12"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq.thirdparty"; - rev = "eb30460696570af7d6adc75870274ec541cfce71"; - sha256 = "1d67vyvz8fwibsp8vbiqjkjdkxcixgj53czc1v2p50q3d98bhv49"; + rev = "4c8ccb671c03903bae9af3c5c4f9af72957dfc98"; + sha256 = "1kl6cjr0hvciwpg18q7bmqvi71i1pirxdcv09vp4zk6mi7f9d9qm"; }; meta.homepage = "https://github.com/ms-jpq/coq.thirdparty/"; }; @@ -2059,12 +2059,12 @@ final: prev: coq_nvim = buildVimPluginFrom2Nix { pname = "coq_nvim"; - version = "2022-12-11"; + version = "2022-12-12"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq_nvim"; - rev = "6a49da213ab217360cbcad46df01f3be74a2970e"; - sha256 = "0dn47bwk4irpwb0r99zw2m23nqvas9hc5k78vxssr1zpilcbg58d"; + rev = "000dab4a373bc9ca86bb9392578edefbb90e33fe"; + sha256 = "03niqwmnkn3dz4n1hi7mjn290hnmvcn3nxg17nzr8akj6ks8cxv1"; }; meta.homepage = "https://github.com/ms-jpq/coq_nvim/"; }; @@ -2625,12 +2625,12 @@ final: prev: dracula-nvim = buildVimPluginFrom2Nix { pname = "dracula.nvim"; - version = "2022-12-09"; + version = "2022-12-12"; src = fetchFromGitHub { owner = "Mofiqul"; repo = "dracula.nvim"; - rev = "3fef2ddad976873dd9c9e769e14bd6ae10a3fdff"; - sha256 = "1f0g63h2kbs5vzfan7cfirk3c0aqv3mhp32bpf3scalrdrwr5mpi"; + rev = "1ee6072c6638de86abc9aef43ac315fd7eede6aa"; + sha256 = "0xq0m5qy3c48bvc6rrhr9w3rzy51a0gl2wi4y64mxp96aapz7j6h"; }; meta.homepage = "https://github.com/Mofiqul/dracula.nvim/"; }; @@ -2831,12 +2831,12 @@ final: prev: fern-vim = buildVimPluginFrom2Nix { pname = "fern.vim"; - version = "2022-11-07"; + version = "2022-12-11"; src = fetchFromGitHub { owner = "lambdalisue"; repo = "fern.vim"; - rev = "908a3db77d5a061d98a45c36f8483886a8868c90"; - sha256 = "0fbz3317bilp8iznrjm6vzqgby20fq11nha5c2wzps92f4bcyp96"; + rev = "41710c31fffa76d08b8cfcd53d5defa7c07a3fc6"; + sha256 = "0859is1vxk8qz3bav12ppqsdrwaf2lfwfc55wnjpwjhld951pky3"; }; meta.homepage = "https://github.com/lambdalisue/fern.vim/"; }; @@ -2976,12 +2976,12 @@ final: prev: friendly-snippets = buildVimPluginFrom2Nix { pname = "friendly-snippets"; - version = "2022-12-05"; + version = "2022-12-12"; src = fetchFromGitHub { owner = "rafamadriz"; repo = "friendly-snippets"; - rev = "9b3e497cf0c3abcf73d791968a9768a22405fa13"; - sha256 = "14j3w7aqnz62fxkrhyklbip9qpdj0cmfxj3japvxbjksh7iba35b"; + rev = "6e527e04b003739b67bcf62152282e658de16063"; + sha256 = "1ji0k854gjvf5qd6brcbwvz7kp9whl12yjmfvnji6cldwhaprx0q"; }; meta.homepage = "https://github.com/rafamadriz/friendly-snippets/"; }; @@ -3144,12 +3144,12 @@ final: prev: ghcid = buildVimPluginFrom2Nix { pname = "ghcid"; - version = "2022-09-19"; + version = "2022-12-12"; src = fetchFromGitHub { owner = "ndmitchell"; repo = "ghcid"; - rev = "0e05a83f7683140038b1c5513938e1256f9b190e"; - sha256 = "04zn8a7b47z9vkg5acqv6my790d0f28gi94wwrxndm9c70fcw55l"; + rev = "41dd2cfd805478c5601df229549029b20f930381"; + sha256 = "1zwrh2wss3igx10bh85zh55hjahhn5nda2w8na8cz8qld0prpc3v"; }; meta.homepage = "https://github.com/ndmitchell/ghcid/"; }; @@ -3396,12 +3396,12 @@ final: prev: gruvbox-nvim = buildVimPluginFrom2Nix { pname = "gruvbox.nvim"; - version = "2022-12-06"; + version = "2022-12-12"; src = fetchFromGitHub { owner = "ellisonleao"; repo = "gruvbox.nvim"; - rev = "d2efdea91ec79e480e51d5149d58daa328633c43"; - sha256 = "1nqx2g2z1gbg907n7vhcgak4bd0qz7na5pl8i3jyk5cc22z0mzfc"; + rev = "c64ec557672c9c8ecc71a438533525482021377f"; + sha256 = "0q8y068cl75c12c2l9viw58p7swcjgn2p42wlvm9c0ks4mz03bgm"; }; meta.homepage = "https://github.com/ellisonleao/gruvbox.nvim/"; }; @@ -3467,12 +3467,12 @@ final: prev: haskell-tools-nvim = buildVimPluginFrom2Nix { pname = "haskell-tools.nvim"; - version = "2022-12-11"; + version = "2022-12-12"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "haskell-tools.nvim"; - rev = "c2701b5d15f9634dbdcae0e34d6f6ec952adc5da"; - sha256 = "1s8vm54d3n5c1g89cw04n88fmyn6cgcyygshpj46m0qgykpigs20"; + rev = "eefbcd2b1bd0b0e5ef8fcc2c087017db1e126d66"; + sha256 = "1gk3471lz4mg2k3jsl5y2jh3a16b564s6907i9bhprc4mgq5p7bg"; }; meta.homepage = "https://github.com/MrcJkb/haskell-tools.nvim/"; }; @@ -4043,12 +4043,12 @@ final: prev: leap-nvim = buildVimPluginFrom2Nix { pname = "leap.nvim"; - version = "2022-12-05"; + version = "2022-12-12"; src = fetchFromGitHub { owner = "ggandor"; repo = "leap.nvim"; - rev = "f28b1e7c1eee525adb17c24de3cc15a7fa1a6ef9"; - sha256 = "0b311535cvqybg4m517wm7xpjrc0shi3za56c0v5zs6sjnm0n2vs"; + rev = "3336057e841e1adcf1daf9430c9b435a9a010b84"; + sha256 = "1c0dasxgq057z2jv1cngrk2gqrwzci2rx5mhizwixk2g40n6d4xy"; }; meta.homepage = "https://github.com/ggandor/leap.nvim/"; }; @@ -4151,12 +4151,12 @@ final: prev: lightline-bufferline = buildVimPluginFrom2Nix { pname = "lightline-bufferline"; - version = "2022-11-23"; + version = "2022-12-12"; src = fetchFromGitHub { owner = "mengelbrecht"; repo = "lightline-bufferline"; - rev = "b6773302598503da8f6cb32aa47c96ff456dbdac"; - sha256 = "1g2afxk8gi09v6j6hddymis2xvn1d20ndks0mjzc0lwrr3yvwzkv"; + rev = "e4db24252d9b1bd7b329511e8caa69fefed67362"; + sha256 = "0lf8sbf1m0y76sqcqv7faybiballgy9n775vv33v80ax2rmgq62y"; }; meta.homepage = "https://github.com/mengelbrecht/lightline-bufferline/"; }; @@ -4486,12 +4486,12 @@ final: prev: luasnip = buildVimPluginFrom2Nix { pname = "luasnip"; - version = "2022-12-10"; + version = "2022-12-11"; src = fetchFromGitHub { owner = "l3mon4d3"; repo = "luasnip"; - rev = "40b5c6272384d90365e7149e0fcc73afae5e87cc"; - sha256 = "1hsp7d9mb877whm7rcbvg4k3l9rjz3p3jfjwsr6n6wpspq9xids1"; + rev = "8b25e74761eead3dc47ce04b5e017fd23da7ad7e"; + sha256 = "0jf85bynp91dyg4xx06w4ha0cim6m5v26g5wxpml3flmwglj58fa"; fetchSubmodules = true; }; meta.homepage = "https://github.com/l3mon4d3/luasnip/"; @@ -4967,12 +4967,12 @@ final: prev: neoconf-nvim = buildVimPluginFrom2Nix { pname = "neoconf.nvim"; - version = "2022-12-10"; + version = "2022-12-12"; src = fetchFromGitHub { owner = "folke"; repo = "neoconf.nvim"; - rev = "7c59fa1292377a43e314d6d493438ff8af8aa853"; - sha256 = "0n4n5cyppnhwg5gd865iy6ifm36ysw876v5rphnhlvlsa34alng6"; + rev = "7b6ec340b347fe560e77db25785ffd0b215ff138"; + sha256 = "0sqsn7amvlfgg4avwwp0vjay1l867g6wf8d7g8971hp1dssz4x51"; }; meta.homepage = "https://github.com/folke/neoconf.nvim/"; }; @@ -4991,12 +4991,12 @@ final: prev: neodev-nvim = buildVimPluginFrom2Nix { pname = "neodev.nvim"; - version = "2022-12-07"; + version = "2022-12-12"; src = fetchFromGitHub { owner = "folke"; repo = "neodev.nvim"; - rev = "f353ec5ac10a9e581c92dc0f937025c54e216022"; - sha256 = "1wmy5hncm1lz5r99vcspg95435yyg0jdzm2kjca79nsmqp613ffl"; + rev = "17c6f31af8cb4c561275e89cd93d2cedda896706"; + sha256 = "0r5d0zfq3ch6l5khrggb7b6c7lammgbq5bl787rscvmvdmcngf6c"; }; meta.homepage = "https://github.com/folke/neodev.nvim/"; }; @@ -5015,12 +5015,12 @@ final: prev: neogit = buildVimPluginFrom2Nix { pname = "neogit"; - version = "2022-12-06"; + version = "2022-12-12"; src = fetchFromGitHub { owner = "TimUntersberger"; repo = "neogit"; - rev = "19bc8377e61482f36703a3e1651aef206af88086"; - sha256 = "0599ljv4f8vsk3h4rpisqj69c4sgjw51rpv8nz7s9nbn43crcqy1"; + rev = "66030fc1c3b7b6d5bc31ece188bc472ee2d91ee1"; + sha256 = "1mfap26fpfh4ynxgg7m6a8k132d5h07iv6hfmpd55csfa19prvp5"; }; meta.homepage = "https://github.com/TimUntersberger/neogit/"; }; @@ -5351,12 +5351,12 @@ final: prev: nord-nvim = buildVimPluginFrom2Nix { pname = "nord.nvim"; - version = "2022-11-25"; + version = "2022-12-12"; src = fetchFromGitHub { owner = "shaunsingh"; repo = "nord.nvim"; - rev = "4b6d4072923cfc3a3f6aea55eafd8b4ad0ddc489"; - sha256 = "1bvwhqcpdkym94wyr7jn26jd81sz5hzsikd129x22ynwakq0ajzw"; + rev = "11445b5a28155baaf289c2212b5eb6a3e29e0e57"; + sha256 = "0bs5cck14hyipxxmpvpw5vlifhl1cn3hfajxz87hhvlw6bgsghzs"; }; meta.homepage = "https://github.com/shaunsingh/nord.nvim/"; }; @@ -5399,12 +5399,12 @@ final: prev: null-ls-nvim = buildVimPluginFrom2Nix { pname = "null-ls.nvim"; - version = "2022-12-10"; + version = "2022-12-12"; src = fetchFromGitHub { owner = "jose-elias-alvarez"; repo = "null-ls.nvim"; - rev = "adaa799264c92eea42d500c8b98e19caf32c14dc"; - sha256 = "1vi9n07mf258pkkhh8c28l846j88f248gzwcrv40i8n3v3mxz7f6"; + rev = "623cc25016647eb62392aead7612f27d539c33de"; + sha256 = "0kxjd17qxs6x18r5hxg9ii7mlcj1nwvj6j0d3rdplp2bqbrx6hb1"; }; meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/"; }; @@ -5627,12 +5627,12 @@ final: prev: nvim-dap = buildVimPluginFrom2Nix { pname = "nvim-dap"; - version = "2022-12-09"; + version = "2022-12-12"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap"; - rev = "a8fd28aec46fe9f5dd42f8d5939217ce60787d73"; - sha256 = "0sxq0nlhgk2q1yz8nyj21z2mxgfg383jm00s6j0hggq02v3a86mz"; + rev = "68d96871118a13365f3c33e4838990030fff80ec"; + sha256 = "0kb2kc61fhnf4g95vy5mhck4jm9ijlgmv3rv613j0i9aslnlipm1"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap/"; }; @@ -5759,12 +5759,12 @@ final: prev: nvim-highlite = buildVimPluginFrom2Nix { pname = "nvim-highlite"; - version = "2022-12-03"; + version = "2022-12-12"; src = fetchFromGitHub { owner = "Iron-E"; repo = "nvim-highlite"; - rev = "bc4f02545a0ee3b474e30d6654efe41f5a0a1cb5"; - sha256 = "0v0yva74h1gk8piwil0pg5r5w663psrkg42y1sgpbla70i7j12ff"; + rev = "44895245d10d98b221ba60858a4a94fd229b54ff"; + sha256 = "0ns32lk3k1dshvikbpm43nkciiv9d0frwm1bp8721p9w1cgi0amm"; }; meta.homepage = "https://github.com/Iron-E/nvim-highlite/"; }; @@ -5879,12 +5879,12 @@ final: prev: nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2022-12-11"; + version = "2022-12-12"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "6eb24ef9175d1fa3c7a23e115854b1a2d923d386"; - sha256 = "0qwc6c1s37vyv913m984yicj3fkich26c06zs86q6pnc1n65cfl9"; + rev = "0c038493b37e67bed287ff99722a9ced5cdfe617"; + sha256 = "1hpxvmm407dhzaqb531wz1147y28m9z62lsz8s8ry60zc5s8rqhd"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -5915,12 +5915,12 @@ final: prev: nvim-luapad = buildVimPluginFrom2Nix { pname = "nvim-luapad"; - version = "2022-10-26"; + version = "2022-12-11"; src = fetchFromGitHub { owner = "rafcamlet"; repo = "nvim-luapad"; - rev = "6efe3806c6e0d9ae684d756d4d7053cbdfb562eb"; - sha256 = "0d0lcaxxqwg2cw8gx4zmddwvb49xxrvlc03ij68wwwmvjgvw2v01"; + rev = "a5b3d6aa1fe5fe75e6124927392a9d3a60a0ecce"; + sha256 = "05b2wnw9p5wpcc85fh40ddw90ls4k0mcmpa5rcadhy5c4xaf3q2h"; }; meta.homepage = "https://github.com/rafcamlet/nvim-luapad/"; }; @@ -5951,12 +5951,12 @@ final: prev: nvim-navic = buildVimPluginFrom2Nix { pname = "nvim-navic"; - version = "2022-11-27"; + version = "2022-12-11"; src = fetchFromGitHub { owner = "smiteshp"; repo = "nvim-navic"; - rev = "343e07de11b15f93e44ebd47eb98dce6b7da2e6b"; - sha256 = "14rdzmh8w7qvmvqdv360nba1l2phmmbxs90ifjrxicw21b48jmyi"; + rev = "7a2b823152fe4de65ee7925b0e32d26ed73bc57c"; + sha256 = "00hsnlbr6s2ljwzl5ayjw1m2bdm4kmypl7xlg2p8l1yjnnsk4dn4"; }; meta.homepage = "https://github.com/smiteshp/nvim-navic/"; }; @@ -6083,12 +6083,12 @@ final: prev: nvim-surround = buildVimPluginFrom2Nix { pname = "nvim-surround"; - version = "2022-11-24"; + version = "2022-12-11"; src = fetchFromGitHub { owner = "kylechui"; repo = "nvim-surround"; - rev = "6b45fbffdabb2d8cd80d310006c92e59cec8fd74"; - sha256 = "1qdhyclzsw1inwwzw3kr1jxq3cz0qr358whj93y16x7id3ylsx52"; + rev = "6cc6b54d3728a17e34bb5c9b9db05c7e5690813d"; + sha256 = "06sbki4m8za9zsj643fj5wzx44xsa1nv23as1m9ip99cwqrvxqcc"; }; meta.homepage = "https://github.com/kylechui/nvim-surround/"; }; @@ -6107,24 +6107,24 @@ final: prev: nvim-tree-lua = buildVimPluginFrom2Nix { pname = "nvim-tree.lua"; - version = "2022-12-11"; + version = "2022-12-12"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-tree.lua"; - rev = "7177d95ac0f46bf02ff3f8375e135149a3fc79b8"; - sha256 = "1h0qvy6dh1lkm74r11r6d989adfbcx3xszyj13pchcangp7mhfrv"; + rev = "0cd8ac4751c39440a1c28c6be4704f3597807d29"; + sha256 = "1avm9ds7lbi2fjpqcq7v05j7h91d0id3absdc95q4bgrfx3rnw5w"; }; meta.homepage = "https://github.com/nvim-tree/nvim-tree.lua/"; }; nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2022-12-10"; + version = "2022-12-12"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "619f1ace03860d668c7a661332c38480f2db2584"; - sha256 = "05gj2gxi5bhi2xg6ihgwckjkcspaijdyrgbwzh96hz766s0zz3f3"; + rev = "ae0317d78a9f6fad78870d6645b60528e13ae6fa"; + sha256 = "16d70n17fli233y4aigsr4ddm2h6myj85p4lsl2xk5sypd5bkczc"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; @@ -6167,12 +6167,12 @@ final: prev: nvim-treesitter-textobjects = buildVimPluginFrom2Nix { pname = "nvim-treesitter-textobjects"; - version = "2022-12-10"; + version = "2022-12-12"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-textobjects"; - rev = "e8b7807e0398754bd7dbb5cae043340374975f77"; - sha256 = "18vc5nzvxijg8nm7k635y0w95lihqgwyix4ljwrx7gqr73smwqv9"; + rev = "731be7f2358fb9f3e2bc7d8698b82c882cf132a4"; + sha256 = "08wfd3ykas1pzqmfljk0945fp78337jfnl0maqws6il5f5l8lbzg"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/"; }; @@ -6359,12 +6359,12 @@ final: prev: onedarkpro-nvim = buildVimPluginFrom2Nix { pname = "onedarkpro.nvim"; - version = "2022-12-09"; + version = "2022-12-11"; src = fetchFromGitHub { owner = "olimorris"; repo = "onedarkpro.nvim"; - rev = "ceb1ad90a20c39a87799e5f0facfa02d7cb19a23"; - sha256 = "0wq15k4g02hi7dvkwg1j7mr2cgl6yvisk9dsyzkdsh30yfpg11cb"; + rev = "74275ddff64746b311b0f1ee1a60b01f857ff2c8"; + sha256 = "0ib109jrz6jvag8jghr21jjd4rrsql9iqk1bl8gjd4ylhjsb38li"; }; meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/"; }; @@ -6419,12 +6419,12 @@ final: prev: orgmode = buildVimPluginFrom2Nix { pname = "orgmode"; - version = "2022-12-09"; + version = "2022-12-12"; src = fetchFromGitHub { owner = "nvim-orgmode"; repo = "orgmode"; - rev = "aba09c510a60ad469f3fd46e0a7c492ec610e5fb"; - sha256 = "0mv1wa4p5bsylvjc7z979bhh3flpyndkvzvz079l2kanja033996"; + rev = "1b8819bc6201b0a32c64ca13852c82186c2b2119"; + sha256 = "0dnv47ai6f9rcbr1q345smj3nxhyqfmb92a17w5hqfpifgsmsaim"; }; meta.homepage = "https://github.com/nvim-orgmode/orgmode/"; }; @@ -8239,12 +8239,12 @@ final: prev: treesj = buildVimPluginFrom2Nix { pname = "treesj"; - version = "2022-12-11"; + version = "2022-12-12"; src = fetchFromGitHub { owner = "Wansmer"; repo = "treesj"; - rev = "3a28195c7d683fe076df51849f8252c7da50c8b4"; - sha256 = "1aj8m1845dajiffisw23fha6w5r34m2k7dipdarm9qkipf59i3b2"; + rev = "9afe7983ce6351936a81d57adac651dc8f16c20b"; + sha256 = "1na8yxl0b1150c6b4shigh3asm2gy1yjlidp6bxhivzwh01rpp9j"; }; meta.homepage = "https://github.com/Wansmer/treesj/"; }; @@ -9499,12 +9499,12 @@ final: prev: vim-dasht = buildVimPluginFrom2Nix { pname = "vim-dasht"; - version = "2020-07-11"; + version = "2022-12-11"; src = fetchFromGitHub { owner = "sunaku"; repo = "vim-dasht"; - rev = "c1c91ecfd30f0e4e946854a6f7c67eb2d1e21c98"; - sha256 = "0ldkyzsn4b555pb9qdr0k6w6m3w7ziy7v6bcnx0n8ppq4fl68pz2"; + rev = "fe72990f761160c5a8b551dcaa0d3a3927830f52"; + sha256 = "03fxm3p89y3mjr2bqkqb8wy32xvffrnn4pzf2920xrgcpdx41ff9"; }; meta.homepage = "https://github.com/sunaku/vim-dasht/"; }; @@ -10605,12 +10605,12 @@ final: prev: vim-jsdoc = buildVimPluginFrom2Nix { pname = "vim-jsdoc"; - version = "2021-11-20"; + version = "2022-12-12"; src = fetchFromGitHub { owner = "heavenshell"; repo = "vim-jsdoc"; - rev = "71c98ed6eacb4f1c0b9e4950ef679eda6a651cdd"; - sha256 = "0jxcmriva73s0icllpbh6q6s2fw0ysjm7fk449kdd5fvd5y5ssq5"; + rev = "9234b2e2590e973c06113c05abd180de0c9dbcc1"; + sha256 = "04793snqfy6p27pl31mghfaszbwwb08fg93bv35ah3ghv3abyh7c"; }; meta.homepage = "https://github.com/heavenshell/vim-jsdoc/"; }; @@ -13525,12 +13525,12 @@ final: prev: catppuccin-nvim = buildVimPluginFrom2Nix { pname = "catppuccin-nvim"; - version = "2022-12-10"; + version = "2022-12-11"; src = fetchFromGitHub { owner = "catppuccin"; repo = "nvim"; - rev = "1d22da687d36c37133b13f2b41658c1c989e77e0"; - sha256 = "1mrdb8l4qpq39fbanwgk55mjhx55j8yif2h9bm4q6f0vqqs0n505"; + rev = "e7fbf2496ce0f1cdf9883a6b99d86afc2f3efadc"; + sha256 = "0y7scdkzn3j580vk0m3n4vksnhdnq3fgx6qr9vygk15jn1qxdga8"; }; meta.homepage = "https://github.com/catppuccin/nvim/"; }; @@ -13549,24 +13549,24 @@ final: prev: chad = buildVimPluginFrom2Nix { pname = "chad"; - version = "2022-12-11"; + version = "2022-12-12"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "75b70f46770332e1bd51a4b0f2798a16b448e37b"; - sha256 = "05jkbs77ffn9cpm8r005r208g6c03ammlmn7x62rlp25in4gyd0n"; + rev = "ac29dc7e06b340baeee7273d3232cca346f6f7cd"; + sha256 = "0chxw8cm8x9v0nawasipsx5f7fapfp5b31jfz217nydhhwwvfr2h"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; dracula-vim = buildVimPluginFrom2Nix { pname = "dracula-vim"; - version = "2022-11-30"; + version = "2022-12-12"; src = fetchFromGitHub { owner = "dracula"; repo = "vim"; - rev = "947e5298766f30bdb813749bf867913b29a06eac"; - sha256 = "0yvahswdzqphay5wak2rlaqjaf44kylsvmx697slwp8h1846xchw"; + rev = "b7645942bf91154f76ca016b612131168522d19e"; + sha256 = "1x91l9dkmzkfj4dmzg2vm0qxkmr2ilmqql7c774jcwfhr90zd54x"; }; meta.homepage = "https://github.com/dracula/vim/"; }; From ee017f0c68e4e593e3e37b1ca6a5952db08a886d Mon Sep 17 00:00:00 2001 From: "\"Andrey Kuznetsov\"" <"fear@loathing.in"> Date: Mon, 12 Dec 2022 21:12:49 +0000 Subject: [PATCH 27/32] vimPlugins.lspsaga-nvim-original: init at 2022-12-12 --- pkgs/applications/editors/vim/plugins/generated.nix | 12 ++++++++++++ .../editors/vim/plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 600b4133d938f..8f5a56512d32a 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -13595,6 +13595,18 @@ final: prev: meta.homepage = "https://github.com/gruvbox-community/gruvbox/"; }; + lspsaga-nvim-original = buildVimPluginFrom2Nix { + pname = "lspsaga-nvim-original"; + version = "2022-12-12"; + src = fetchFromGitHub { + owner = "glepnir"; + repo = "lspsaga.nvim"; + rev = "db0c1414efb928a9387e0a3271d75dcc3370822f"; + sha256 = "0gg6vyrj13iwn4kj5jinm8799i6smyxnyrqz8qm7bay4lzbsg7mr"; + }; + meta.homepage = "https://github.com/glepnir/lspsaga.nvim/"; + }; + mattn-calendar-vim = buildVimPluginFrom2Nix { pname = "mattn-calendar-vim"; version = "2022-02-10"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index c72727be28d3b..48995b748fdbf 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -373,6 +373,7 @@ https://github.com/ray-x/lsp_signature.nvim/,, https://github.com/lspcontainers/lspcontainers.nvim/,, https://github.com/onsails/lspkind-nvim/,, https://github.com/tami5/lspsaga.nvim/,, +https://github.com/glepnir/lspsaga.nvim/,main,lspsaga-nvim-original https://github.com/arkav/lualine-lsp-progress/,, https://github.com/nvim-lualine/lualine.nvim/,, https://github.com/l3mon4d3/luasnip/,, From ac96250768795ae53aa14067e2ceb4306e7c658d Mon Sep 17 00:00:00 2001 From: "\"Andrey Kuznetsov\"" <"fear@loathing.in"> Date: Mon, 12 Dec 2022 21:13:30 +0000 Subject: [PATCH 28/32] vimPlugins.winbar-nvim: init at 2022-07-18 --- pkgs/applications/editors/vim/plugins/generated.nix | 12 ++++++++++++ .../editors/vim/plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 8f5a56512d32a..8bab9b6a32b33 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -13294,6 +13294,18 @@ final: prev: meta.homepage = "https://github.com/gcmt/wildfire.vim/"; }; + winbar-nvim = buildVimPluginFrom2Nix { + pname = "winbar.nvim"; + version = "2022-07-18"; + src = fetchFromGitHub { + owner = "fgheng"; + repo = "winbar.nvim"; + rev = "13739fdb31be51a1000486189662596f07a59a31"; + sha256 = "1b9zfn5fpgibgjn64a6hb8w9d0zprkm1bz050fcd1vrv9dq1s7s7"; + }; + meta.homepage = "https://github.com/fgheng/winbar.nvim/"; + }; + windows-nvim = buildVimPluginFrom2Nix { pname = "windows.nvim"; version = "2022-11-17"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 48995b748fdbf..ec766cce86c44 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -1116,6 +1116,7 @@ https://github.com/mattn/webapi-vim/,, https://github.com/folke/which-key.nvim/,, https://github.com/gelguy/wilder.nvim/,, https://github.com/gcmt/wildfire.vim/,, +https://github.com/fgheng/winbar.nvim/,main, https://github.com/anuvyklack/windows.nvim/,, https://github.com/sindrets/winshift.nvim/,, https://github.com/wannesm/wmgraphviz.vim/,, From 51ce0ddd48aa653583ad8c15ce6a61f70ab69a15 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Mon, 12 Dec 2022 23:16:07 +0100 Subject: [PATCH 29/32] vimPlugins.vim-teal: init at 2021-01-05 --- pkgs/applications/editors/vim/plugins/generated.nix | 12 ++++++++++++ .../editors/vim/plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 19602ee4b5d3a..3508c6269e1d3 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -12416,6 +12416,18 @@ final: prev: meta.homepage = "https://github.com/tpope/vim-tbone/"; }; + vim-teal = buildVimPluginFrom2Nix { + pname = "vim-teal"; + version = "2021-01-05"; + src = fetchFromGitHub { + owner = "teal-language"; + repo = "vim-teal"; + rev = "d2aa107b257879e774680792a2aebaf9cd5742e0"; + sha256 = "02ag8vhmh1zj99vhvqslfnasw9i5psx396r7qyag0yyzyp9ynzkc"; + }; + meta.homepage = "https://github.com/teal-language/vim-teal/"; + }; + vim-terraform = buildVimPluginFrom2Nix { pname = "vim-terraform"; version = "2021-07-10"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index c72727be28d3b..96936684f4904 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -1042,6 +1042,7 @@ https://github.com/machakann/vim-swap/,, https://github.com/dhruvasagar/vim-table-mode/,, https://github.com/kana/vim-tabpagecd/,, https://github.com/tpope/vim-tbone/,, +https://github.com/teal-language/vim-teal/,HEAD, https://github.com/hashivim/vim-terraform/,, https://github.com/juliosueiras/vim-terraform-completion/,, https://github.com/vim-test/vim-test/,, From f5c7a97d534a6cd0a5774e9f3a5fd045f998374d Mon Sep 17 00:00:00 2001 From: Juuso Haavisto Date: Mon, 12 Dec 2022 21:33:22 +0200 Subject: [PATCH 30/32] cbqn: remove unnecessary darwin build flag --- pkgs/development/interpreters/bqn/cbqn/default.nix | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/pkgs/development/interpreters/bqn/cbqn/default.nix b/pkgs/development/interpreters/bqn/cbqn/default.nix index a1aad41fe973e..1766c45995a37 100644 --- a/pkgs/development/interpreters/bqn/cbqn/default.nix +++ b/pkgs/development/interpreters/bqn/cbqn/default.nix @@ -56,12 +56,7 @@ stdenv.mkDerivation rec { ${bqn-path} ./build/genRuntime ${mbqn-source} build/bytecodeLocal/ '' else '' cp ${cbqn-bytecode-files}/src/gen/{compiles,explain,formatter,runtime0,runtime1,src} build/bytecodeLocal/gen/ - '') - # Need to adjust ld flags for darwin manually - # https://github.com/dzaima/CBQN/issues/26 - + lib.optionalString stdenv.hostPlatform.isDarwin '' - makeFlagsArray+=(LD_LIBS="-ldl -lffi") - ''; + ''); installPhase = '' runHook preInstall From 6450cba8b68f14dbd63dbf8319de779f1d2bce6a Mon Sep 17 00:00:00 2001 From: Nathan Viets Date: Mon, 12 Dec 2022 12:58:46 -0600 Subject: [PATCH 31/32] xgboost: adding self to maintainers list --- pkgs/development/libraries/xgboost/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/xgboost/default.nix b/pkgs/development/libraries/xgboost/default.nix index b4d668d5fba17..7cf8e083f348a 100644 --- a/pkgs/development/libraries/xgboost/default.nix +++ b/pkgs/development/libraries/xgboost/default.nix @@ -65,6 +65,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/dmlc/xgboost"; license = licenses.asl20; platforms = platforms.unix; - maintainers = with maintainers; [ abbradar ]; + maintainers = with maintainers; [ abbradar nviets ]; }; } From 1d0b181e2fb96136ae8b755114b7f7d1799f44e5 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Fri, 9 Dec 2022 16:08:28 +0800 Subject: [PATCH 32/32] slurp: fix cross compilation after https://github.com/emersion/slurp/commit/e5fe57abcc3a1a9f25c9e488f952ba1900afafe4 --- pkgs/tools/wayland/slurp/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/tools/wayland/slurp/default.nix b/pkgs/tools/wayland/slurp/default.nix index 17b2bb3521b19..50c02d83be234 100644 --- a/pkgs/tools/wayland/slurp/default.nix +++ b/pkgs/tools/wayland/slurp/default.nix @@ -24,6 +24,10 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-jUuY2wuN00libHDaJEmrvQAb1o989Ly3nLyKHV0jz8Q="; }; + depsBuildBuild = [ + pkg-config + ]; + nativeBuildInputs = [ meson ninja