diff options
Diffstat (limited to 'pkgs/development')
181 files changed, 3498 insertions, 1449 deletions
diff --git a/pkgs/development/compilers/ghc/9.6.5.nix b/pkgs/development/compilers/ghc/9.6.5.nix new file mode 100644 index 0000000000000..0f1ac5022f8bf --- /dev/null +++ b/pkgs/development/compilers/ghc/9.6.5.nix @@ -0,0 +1,4 @@ +import ./common-hadrian.nix { + version = "9.6.5"; + sha256 = "87b389924f98c1a26c205122757338c8dab33ad1fcf670faa22622742432b93c"; +} diff --git a/pkgs/development/compilers/ghc/common-hadrian.nix b/pkgs/development/compilers/ghc/common-hadrian.nix index b201379668b1b..079bbefbae4ce 100644 --- a/pkgs/development/compilers/ghc/common-hadrian.nix +++ b/pkgs/development/compilers/ghc/common-hadrian.nix @@ -5,7 +5,7 @@ if rev != null then "https://gitlab.haskell.org/ghc/ghc.git" else "https://downloads.haskell.org/ghc/${version}/ghc-${version}-src.tar.xz" - +, postFetch ? null }: { lib @@ -146,6 +146,8 @@ inherit url sha256; } // lib.optionalAttrs (rev != null) { inherit rev; + } // lib.optionalAttrs (postFetch != null) { + inherit postFetch; }) # GHC's build system hadrian built from the GHC-to-build's source tree diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index ab7771e947339..73808dc431a92 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -1,5 +1,11 @@ import ./common-hadrian.nix { - version = "9.11.20240323"; - rev = "8f7cfc7ee00978fda14f31ce4a56ad4639c07138"; - sha256 = "1id5gmn472zrzx372hy4wci5sby941jd8imspgaam6vrqxibdyln"; + version = "9.11.20240410"; + rev = "1b1a92bd25c3f7249cf922c5dbf4415d2de44a36"; + sha256 = "sha256-2HdhxhVrKn8c/ZOGYoYThqXpod2OPiGXgH+mAV69Ip0="; + # The STM benchmark contains chanbench.hs and ChanBench.hs causing a hash + # mismatch on case insensitive filesystems. See also + # https://gitlab.haskell.org/ghc/packages/stm/-/issues/2 + postFetch = '' + rm -rf "$out/libraries/stm/bench" + ''; } diff --git a/pkgs/development/compilers/ghdl/default.nix b/pkgs/development/compilers/ghdl/default.nix index be6c3f7e98ef5..84109f7436fae 100644 --- a/pkgs/development/compilers/ghdl/default.nix +++ b/pkgs/development/compilers/ghdl/default.nix @@ -13,13 +13,13 @@ assert backend == "mcode" || backend == "llvm"; stdenv.mkDerivation (finalAttrs: { pname = "ghdl-${backend}"; - version = "4.0.0"; + version = "4.1.0"; src = fetchFromGitHub { owner = "ghdl"; repo = "ghdl"; rev = "v${finalAttrs.version}"; - hash = "sha256-KQwesrj2g8cDCyiEb5j4bkM5O3fGPuXzGUOEEGw6zRI="; + hash = "sha256-tPSHer3qdtEZoPh9BsEyuTOrXgyENFUyJqnUS3UYAvM="; }; LIBRARY_PATH = "${stdenv.cc.libc}/lib"; diff --git a/pkgs/development/compilers/gmqcc/default.nix b/pkgs/development/compilers/gmqcc/default.nix index a030133fba52f..f027fa8fb13d9 100644 --- a/pkgs/development/compilers/gmqcc/default.nix +++ b/pkgs/development/compilers/gmqcc/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "gmqcc"; - version = "unstable-2021-07-09"; + version = "0-unstable-2023-05-05"; src = fetchFromGitHub { owner = "graphitemaster"; repo = "gmqcc"; - rev = "297eab9e5e2c9cc4f41201b68821593a5cf9a725"; - sha256 = "1hl2qn7402ia03kjkblj4q4wfypxkil99sivsyk2vrnwwpdp4nzx"; + rev = "2fe0af00e78d55edecd7ca7ee1808c4ea946b05f"; + hash = "sha256-AyuwsUIt+P/D4ABuIXGJxpp0TMAbnDg+R2iNMy6WjRw="; }; installPhase = '' diff --git a/pkgs/development/compilers/jasmin-compiler/default.nix b/pkgs/development/compilers/jasmin-compiler/default.nix index dcb2bf87692f3..9efe47ae371e8 100644 --- a/pkgs/development/compilers/jasmin-compiler/default.nix +++ b/pkgs/development/compilers/jasmin-compiler/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "jasmin-compiler"; - version = "2023.06.2"; + version = "2023.06.3"; src = fetchurl { url = "https://github.com/jasmin-lang/jasmin/releases/download/v${version}/jasmin-compiler-v${version}.tar.bz2"; - hash = "sha256-I3+MP2Q7ENOdQdvvCqcyD+I8ImF6c+9HQDpY6QUWuY8="; + hash = "sha256-Fp3QMsBaPOA6L6kOgffoHaJAypJDt8JxT8EVDDpPAKs="; }; sourceRoot = "jasmin-compiler-v${version}/compiler"; diff --git a/pkgs/development/compilers/llvm/18/clang/default.nix b/pkgs/development/compilers/llvm/18/clang/default.nix deleted file mode 100644 index 1e777c6132e43..0000000000000 --- a/pkgs/development/compilers/llvm/18/clang/default.nix +++ /dev/null @@ -1,139 +0,0 @@ -{ lib, stdenv, llvm_meta -, monorepoSrc, runCommand -, substituteAll, cmake, ninja, libxml2, libllvm, version, python3 -, buildLlvmTools -, fixDarwinDylibNames -, enableManpages ? false -}: - -let - self = stdenv.mkDerivation (finalAttrs: rec { - pname = "clang"; - inherit version; - - src = runCommand "${pname}-src-${version}" {} '' - mkdir -p "$out" - cp -r ${monorepoSrc}/cmake "$out" - cp -r ${monorepoSrc}/${pname} "$out" - cp -r ${monorepoSrc}/clang-tools-extra "$out" - ''; - - sourceRoot = "${src.name}/${pname}"; - - nativeBuildInputs = [ cmake ninja python3 ] - ++ lib.optional (lib.versionAtLeast version "18" && enableManpages) python3.pkgs.myst-parser - ++ lib.optional enableManpages python3.pkgs.sphinx - ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; - - buildInputs = [ libxml2 libllvm ]; - - cmakeFlags = [ - "-DCLANG_INSTALL_PACKAGE_DIR=${placeholder "dev"}/lib/cmake/clang" - "-DCLANGD_BUILD_XPC=OFF" - "-DLLVM_ENABLE_RTTI=ON" - "-DLLVM_INCLUDE_TESTS=OFF" - ] ++ lib.optionals enableManpages [ - "-DCLANG_INCLUDE_DOCS=ON" - "-DLLVM_ENABLE_SPHINX=ON" - "-DSPHINX_OUTPUT_MAN=ON" - "-DSPHINX_OUTPUT_HTML=OFF" - "-DSPHINX_WARNINGS_AS_ERRORS=OFF" - ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ - "-DLLVM_TABLEGEN_EXE=${buildLlvmTools.llvm}/bin/llvm-tblgen" - "-DCLANG_TABLEGEN=${buildLlvmTools.libclang.dev}/bin/clang-tblgen" - # Added in LLVM15: - # `clang-tidy-confusable-chars-gen`: https://github.com/llvm/llvm-project/commit/c3574ef739fbfcc59d405985a3a4fa6f4619ecdb - # `clang-pseudo-gen`: https://github.com/llvm/llvm-project/commit/cd2292ef824591cc34cc299910a3098545c840c7 - "-DCLANG_TIDY_CONFUSABLE_CHARS_GEN=${buildLlvmTools.libclang.dev}/bin/clang-tidy-confusable-chars-gen" - "-DCLANG_PSEUDO_GEN=${buildLlvmTools.libclang.dev}/bin/clang-pseudo-gen" - ]; - - patches = [ - ./purity.patch - # https://reviews.llvm.org/D51899 - ./gnu-install-dirs.patch - ../../common/clang/add-nostdlibinc-flag.patch - (substituteAll { - src = ../../common/clang/clang-at-least-16-LLVMgold-path.patch; - libllvmLibdir = "${libllvm.lib}/lib"; - }) - ]; - - postPatch = '' - (cd tools && ln -s ../../clang-tools-extra extra) - '' + lib.optionalString stdenv.hostPlatform.isMusl '' - sed -i -e 's/lgcc_s/lgcc_eh/' lib/Driver/ToolChains/*.cpp - ''; - - outputs = [ "out" "lib" "dev" "python" ]; - - postInstall = '' - ln -sv $out/bin/clang $out/bin/cpp - - # Move libclang to 'lib' output - moveToOutput "lib/libclang.*" "$lib" - moveToOutput "lib/libclang-cpp.*" "$lib" - substituteInPlace $dev/lib/cmake/clang/ClangTargets-release.cmake \ - --replace "\''${_IMPORT_PREFIX}/lib/libclang." "$lib/lib/libclang." \ - --replace "\''${_IMPORT_PREFIX}/lib/libclang-cpp." "$lib/lib/libclang-cpp." - - mkdir -p $python/bin $python/share/clang/ - mv $out/bin/{git-clang-format,scan-view} $python/bin - if [ -e $out/bin/set-xcode-analyzer ]; then - mv $out/bin/set-xcode-analyzer $python/bin - fi - mv $out/share/clang/*.py $python/share/clang - rm $out/bin/c-index-test - patchShebangs $python/bin - - mkdir -p $dev/bin - cp bin/{clang-tblgen,clang-tidy-confusable-chars-gen,clang-pseudo-gen} $dev/bin - ''; - - passthru = { - inherit libllvm; - isClang = true; - hardeningUnsupportedFlags = [ - "fortify3" - ]; - hardeningUnsupportedFlagsByTargetPlatform = targetPlatform: - lib.optional (!(targetPlatform.isx86_64 || targetPlatform.isAarch64)) "zerocallusedregs" - ++ (finalAttrs.passthru.hardeningUnsupportedFlags or []); - }; - - meta = llvm_meta // { - homepage = "https://clang.llvm.org/"; - description = "A C language family frontend for LLVM"; - longDescription = '' - The Clang project provides a language front-end and tooling - infrastructure for languages in the C language family (C, C++, Objective - C/C++, OpenCL, CUDA, and RenderScript) for the LLVM project. - It aims to deliver amazingly fast compiles, extremely useful error and - warning messages and to provide a platform for building great source - level tools. The Clang Static Analyzer and clang-tidy are tools that - automatically find bugs in your code, and are great examples of the sort - of tools that can be built using the Clang frontend as a library to - parse C/C++ code. - ''; - mainProgram = "clang"; - }; - } // lib.optionalAttrs enableManpages { - pname = "clang-manpages"; - - ninjaFlags = [ "docs-clang-man" ]; - - installPhase = '' - mkdir -p $out/share/man/man1 - # Manually install clang manpage - cp docs/man/*.1 $out/share/man/man1/ - ''; - - outputs = [ "out" ]; - - doCheck = false; - - meta = llvm_meta // { - description = "man page for Clang ${version}"; - }; - }); -in self diff --git a/pkgs/development/coq-modules/iris-named-props/default.nix b/pkgs/development/coq-modules/iris-named-props/default.nix index c4d167750432b..4499e435230c7 100644 --- a/pkgs/development/coq-modules/iris-named-props/default.nix +++ b/pkgs/development/coq-modules/iris-named-props/default.nix @@ -5,7 +5,7 @@ mkCoqDerivation rec { owner = "tchajed"; inherit version; defaultVersion = with lib.versions; lib.switch coq.version [ - { case = range "8.16" "8.18"; out = "2023-08-14"; } + { case = range "8.16" "8.19"; out = "2023-08-14"; } ] null; release."2023-08-14".sha256 = "sha256-gu9qOdHO0qJ2B9Y9Vf66q08iNJcfuECJO66fizFB08g="; release."2023-08-14".rev = "ca1871dd33649f27257a0fbf94076acc80ecffbc"; diff --git a/pkgs/development/coq-modules/iris/default.nix b/pkgs/development/coq-modules/iris/default.nix index 30d3cb8e51da6..ae6798243b6ac 100644 --- a/pkgs/development/coq-modules/iris/default.nix +++ b/pkgs/development/coq-modules/iris/default.nix @@ -6,12 +6,14 @@ mkCoqDerivation rec { owner = "iris"; inherit version; defaultVersion = with lib.versions; lib.switch coq.coq-version [ + { case = range "8.18" "8.19"; out = "4.2.0"; } { case = range "8.16" "8.18"; out = "4.1.0"; } { case = range "8.13" "8.17"; out = "4.0.0"; } { case = range "8.12" "8.14"; out = "3.5.0"; } { case = range "8.11" "8.13"; out = "3.4.0"; } { case = range "8.9" "8.10"; out = "3.3.0"; } ] null; + release."4.2.0".sha256 = "sha256-HuiHIe+5letgr1NN1biZZFq0qlWUbFmoVI7Q91+UIfM="; release."4.1.0".sha256 = "sha256-nTZUeZOXiH7HsfGbMKDE7vGrNVCkbMaWxdMWUcTUNlo="; release."4.0.0".sha256 = "sha256-Jc9TmgGvkiDaz9IOoExyeryU1E+Q37GN24NIM397/Gg="; release."3.6.0".sha256 = "sha256:02vbq597fjxd5znzxdb54wfp36412wz2d4yash4q8yddgl1kakmj"; diff --git a/pkgs/development/coq-modules/stdpp/default.nix b/pkgs/development/coq-modules/stdpp/default.nix index 370ab6e95f5aa..6eb8f77149cc3 100644 --- a/pkgs/development/coq-modules/stdpp/default.nix +++ b/pkgs/development/coq-modules/stdpp/default.nix @@ -6,12 +6,14 @@ mkCoqDerivation rec { domain = "gitlab.mpi-sws.org"; owner = "iris"; defaultVersion = with lib.versions; lib.switch coq.coq-version [ + { case = range "8.18" "8.19"; out = "1.10.0"; } { case = range "8.16" "8.18"; out = "1.9.0"; } { case = range "8.13" "8.17"; out = "1.8.0"; } { case = range "8.12" "8.14"; out = "1.6.0"; } { case = range "8.11" "8.13"; out = "1.5.0"; } { case = range "8.8" "8.10"; out = "1.4.0"; } ] null; + release."1.10.0".sha256 = "sha256-bfynevIKxAltvt76lsqVxBmifFkzEhyX8lRgTKxr21I="; release."1.9.0".sha256 = "sha256-OXeB+XhdyzWMp5Karsz8obp0rTeMKrtG7fu/tmc9aeI="; release."1.8.0".sha256 = "sha256-VkIGBPHevHeHCo/Q759Q7y9WyhSF/4SMht4cOPuAXHU="; release."1.7.0".sha256 = "sha256:0447wbzm23f9rl8byqf6vglasfn6c1wy6cxrrwagqjwsh3i5lx8y"; diff --git a/pkgs/development/cuda-modules/cudatoolkit/default.nix b/pkgs/development/cuda-modules/cudatoolkit/default.nix index 5a983aaf5c705..e5606f9395129 100644 --- a/pkgs/development/cuda-modules/cudatoolkit/default.nix +++ b/pkgs/development/cuda-modules/cudatoolkit/default.nix @@ -411,7 +411,7 @@ backendStdenv.mkDerivation rec { }; meta = with lib; { - description = "A compiler for NVIDIA GPUs, math libraries, and tools"; + description = "The deprecated runfile-based CUDAToolkit installation (a compiler for NVIDIA GPUs, math libraries, and tools)"; homepage = "https://developer.nvidia.com/cuda-toolkit"; platforms = [ "x86_64-linux" ]; license = licenses.nvidiaCuda; diff --git a/pkgs/development/cuda-modules/cudatoolkit/redist-wrapper.nix b/pkgs/development/cuda-modules/cudatoolkit/redist-wrapper.nix new file mode 100644 index 0000000000000..6bdcdecbacd6f --- /dev/null +++ b/pkgs/development/cuda-modules/cudatoolkit/redist-wrapper.nix @@ -0,0 +1,86 @@ +{ + lib, + symlinkJoin, + backendStdenv, + cudaOlder, + cudatoolkit-legacy-runfile, + cudaVersion, + cuda_cccl ? null, + cuda_cudart ? null, + cuda_cuobjdump ? null, + cuda_cupti ? null, + cuda_cuxxfilt ? null, + cuda_gdb ? null, + cuda_nvcc ? null, + cuda_nvdisasm ? null, + cuda_nvml_dev ? null, + cuda_nvprune ? null, + cuda_nvrtc ? null, + cuda_nvtx ? null, + cuda_profiler_api ? null, + cuda_sanitizer_api ? null, + libcublas ? null, + libcufft ? null, + libcurand ? null, + libcusolver ? null, + libcusparse ? null, + libnpp ? null, +}: + +let + getAllOutputs = p: [ + (lib.getBin p) + (lib.getLib p) + (lib.getDev p) + ]; + hostPackages = [ + cuda_cuobjdump + cuda_gdb + cuda_nvcc + cuda_nvdisasm + cuda_nvprune + ]; + targetPackages = [ + cuda_cccl + cuda_cudart + cuda_cupti + cuda_cuxxfilt + cuda_nvml_dev + cuda_nvrtc + cuda_nvtx + cuda_profiler_api + cuda_sanitizer_api + libcublas + libcufft + libcurand + libcusolver + libcusparse + libnpp + ]; + + # This assumes we put `cudatoolkit` in `buildInputs` instead of `nativeBuildInputs`: + allPackages = (map (p: p.__spliced.buildHost or p) hostPackages) ++ targetPackages; +in + +if cudaOlder "11.4" then + cudatoolkit-legacy-runfile +else + symlinkJoin rec { + name = "cuda-merged-${cudaVersion}"; + version = cudaVersion; + + paths = builtins.concatMap getAllOutputs allPackages; + + passthru = { + cc = lib.warn "cudaPackages.cudatoolkit is deprecated, refer to the manual and use splayed packages instead" backendStdenv.cc; + lib = symlinkJoin { + inherit name; + paths = map (p: lib.getLib p) allPackages; + }; + }; + + meta = with lib; { + description = "A wrapper substituting the deprecated runfile-based CUDA installation"; + license = licenses.nvidiaCuda; + }; + } diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 585cfd2a7049b..00dcc3b7a5d8e 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2611,15 +2611,6 @@ self: super: { # 2022-03-16: Bounds need to be loosened https://github.com/obsidiansystems/dependent-sum-aeson-orphans/issues/10 dependent-sum-aeson-orphans = doJailbreak super.dependent-sum-aeson-orphans; - # 2022-03-16: package qualified import issue: https://github.com/ghcjs/ghcjs-dom/issues/101 - ghcjs-dom = assert super.ghcjs-dom.version == "0.9.5.0"; overrideCabal (old: { - postPatch = '' - sed -i 's/import "jsaddle-dom" GHCJS.DOM.Document/import "ghcjs-dom-jsaddle" GHCJS.DOM.Document/' src/GHCJS/DOM/Document.hs - '' + (old.postPatch or ""); - }) - # 2023-07-15: Restrictive upper bounds on text - (doJailbreak super.ghcjs-dom); - # Too strict bounds on chell: https://github.com/fpco/haskell-filesystem/issues/24 system-fileio = doJailbreak super.system-fileio; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index f8d16ce0c3405..7885fa5f21d73 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -167,6 +167,7 @@ broken-packages: - animascii # failure in job https://hydra.nixos.org/build/233211290 at 2023-09-02 - Animas # failure in job https://hydra.nixos.org/build/233256636 at 2023-09-02 - animate # failure in job https://hydra.nixos.org/build/233243661 at 2023-09-02 + - anitomata-aseprite # failure in job https://hydra.nixos.org/build/255675501 at 2024-04-16 - anki-tools # failure in job https://hydra.nixos.org/build/233205129 at 2023-09-02 - annotated-fix # failure in job https://hydra.nixos.org/build/233241215 at 2023-09-02 - anonymous-sums # failure in job https://hydra.nixos.org/build/233222773 at 2023-09-02 @@ -736,6 +737,7 @@ broken-packages: - chalmers-lava2000 # failure in job https://hydra.nixos.org/build/233239592 at 2023-09-02 - changelog-d # failure in job https://hydra.nixos.org/build/252716175 at 2024-03-16 - changelog-d # failure in job https://hydra.nixos.org/build/253689337 at 2024-03-31 + - changelog-d # failure in job https://hydra.nixos.org/build/255671571 at 2024-04-16 - changelogged # failure in job https://hydra.nixos.org/build/233211675 at 2023-09-02 - character-cases # failure in job https://hydra.nixos.org/build/233197636 at 2023-09-02 - charter # failure in job https://hydra.nixos.org/build/233237264 at 2023-09-02 @@ -786,6 +788,7 @@ broken-packages: - CLASE # failure in job https://hydra.nixos.org/build/233234459 at 2023-09-02 - clash-prelude # failure in job https://hydra.nixos.org/build/233252128 at 2023-09-02 - Clash-Royale-Hack-Cheats # failure in job https://hydra.nixos.org/build/233216034 at 2023-09-02 + - ClasshSS # failure in job https://hydra.nixos.org/build/255688076 at 2024-04-16 - ClassLaws # failure in job https://hydra.nixos.org/build/233243019 at 2023-09-02 - classy-effects-base # failure in updateAutotoolsGnuConfigScriptsPhase in job https://hydra.nixos.org/build/237233636 at 2023-10-21 - classy-influxdb-simple # failure in job https://hydra.nixos.org/build/233253418 at 2023-09-02 @@ -1312,6 +1315,7 @@ broken-packages: - disco # failure in job https://hydra.nixos.org/build/233212298 at 2023-09-02 - discordian-calendar # failure in job https://hydra.nixos.org/build/233218124 at 2023-09-02 - discord-types # failure in job https://hydra.nixos.org/build/233251778 at 2023-09-02 + - discount # failure in job https://hydra.nixos.org/build/256329404 at 2024-04-16 - discrete # failure in job https://hydra.nixos.org/build/233206492 at 2023-09-02 - DiscussionSupportSystem # failure in job https://hydra.nixos.org/build/233244662 at 2023-09-02 - Dish # failure in job https://hydra.nixos.org/build/233233264 at 2023-09-02 @@ -1594,6 +1598,7 @@ broken-packages: - exherbo-cabal # failure in job https://hydra.nixos.org/build/233206319 at 2023-09-02 - exh # failure in job https://hydra.nixos.org/build/233253883 at 2023-09-02 - exif # failure in job https://hydra.nixos.org/build/233229247 at 2023-09-02 + - exiftool # failure in job https://hydra.nixos.org/build/255692636 at 2024-04-16 - exigo-schema # failure in job https://hydra.nixos.org/build/233197808 at 2023-09-02 - exinst-deepseq # failure in job https://hydra.nixos.org/build/233207947 at 2023-09-02 - exinst-hashable # failure in job https://hydra.nixos.org/build/233210438 at 2023-09-02 @@ -1983,6 +1988,7 @@ broken-packages: - ghci-ng # failure in job https://hydra.nixos.org/build/233229533 at 2023-09-02 - ghcitui # failure in job https://hydra.nixos.org/build/252737339 at 2024-03-16 - ghcjs-base-stub # timeout + - ghcjs-dom-javascript # failure in job https://hydra.nixos.org/build/255688382 at 2024-04-16 - ghcjs-dom-jsffi # failure in job https://hydra.nixos.org/build/233215225 at 2023-09-02 - ghcjs-fetch # timeout - ghcjs-promise # failure in job https://hydra.nixos.org/build/233243985 at 2023-09-02 @@ -2008,6 +2014,7 @@ broken-packages: - gh-labeler # failure in job https://hydra.nixos.org/build/233233139 at 2023-09-02 - giak # failure in job https://hydra.nixos.org/build/233242229 at 2023-09-02 - gi-ayatana-appindicator3 # failure in job https://hydra.nixos.org/build/253681898 at 2024-03-31 + - gibberish # failure in job https://hydra.nixos.org/build/255688714 at 2024-04-16 - gi-clutter # failure in job https://hydra.nixos.org/build/233252753 at 2023-09-02 - gi-coglpango # failure in job https://hydra.nixos.org/build/233194401 at 2023-09-02 - Gifcurry # failure in job https://hydra.nixos.org/build/233200204 at 2023-09-02 @@ -3258,6 +3265,7 @@ broken-packages: - kademlia # failure in job https://hydra.nixos.org/build/233250935 at 2023-09-02 - kafka-client # failure in job https://hydra.nixos.org/build/233243580 at 2023-09-02 - kafka-client-sync # failure in job https://hydra.nixos.org/build/233208699 at 2023-09-02 + - kafka-interchange # failure in job https://hydra.nixos.org/build/255676938 at 2024-04-16 - Kalman # failure in job https://hydra.nixos.org/build/233210601 at 2023-09-02 - kalman # failure in job https://hydra.nixos.org/build/233226292 at 2023-09-02 - kangaroo # failure in job https://hydra.nixos.org/build/233222234 at 2023-09-02 @@ -3595,6 +3603,7 @@ broken-packages: - lsfrom # failure in job https://hydra.nixos.org/build/233211705 at 2023-09-02 - lsh # failure in job https://hydra.nixos.org/build/233256686 at 2023-09-02 - lsp-client # failure in job https://hydra.nixos.org/build/233219871 at 2023-09-02 + - ltext # failure in job https://hydra.nixos.org/build/255686825 at 2024-04-16 - lti13 # failure in job https://hydra.nixos.org/build/252715722 at 2024-03-16 - ltiv1p1 # failure in job https://hydra.nixos.org/build/233200883 at 2023-09-02 - ltk # failure in job https://hydra.nixos.org/build/233244152 at 2023-09-02 @@ -4087,6 +4096,7 @@ broken-packages: - nixfromnpm # failure in job https://hydra.nixos.org/build/233239168 at 2023-09-02 - nixpkgs-update # failure in job https://hydra.nixos.org/build/233196708 at 2023-09-02 - nix-tools # failure in job https://hydra.nixos.org/build/233662959 at 2023-09-02 + - nkeys # failure in job https://hydra.nixos.org/build/255693929 at 2024-04-16 - nlp-scores # failure in job https://hydra.nixos.org/build/233232770 at 2023-09-02 - NMap # failure in job https://hydra.nixos.org/build/233246148 at 2023-09-02 - nme # failure in job https://hydra.nixos.org/build/233224069 at 2023-09-02 @@ -4153,6 +4163,7 @@ broken-packages: - OGL # failure in job https://hydra.nixos.org/build/233255135 at 2023-09-02 - ogma-language-c # failure in job https://hydra.nixos.org/build/233228824 at 2023-09-02 - ogma-language-cocospec # failure in job https://hydra.nixos.org/build/233235359 at 2023-09-02 + - ogma-language-jsonspec # failure in job https://hydra.nixos.org/build/255671054 at 2024-04-16 - ogma-language-smv # failure in job https://hydra.nixos.org/build/233239832 at 2023-09-02 - ogmarkup # failure in job https://hydra.nixos.org/build/233229980 at 2023-09-02 - ohloh-hs # failure in job https://hydra.nixos.org/build/233228177 at 2023-09-02 @@ -4183,6 +4194,7 @@ broken-packages: - onpartitions # failure in job https://hydra.nixos.org/build/233226163 at 2023-09-02 - onu-course # failure in job https://hydra.nixos.org/build/233233153 at 2023-09-02 - oops # failure in job https://hydra.nixos.org/build/252738443 at 2024-03-16 + - op2 # failure in job https://hydra.nixos.org/build/255683846 at 2024-04-16 - opaleye-classy # failure in job https://hydra.nixos.org/build/233214120 at 2023-09-02 - opaleye-sqlite # failure in job https://hydra.nixos.org/build/233191474 at 2023-09-02 - opaleye-trans # failure in job https://hydra.nixos.org/build/233210536 at 2023-09-02 @@ -4429,6 +4441,7 @@ broken-packages: - persistent-equivalence # failure in job https://hydra.nixos.org/build/233208713 at 2023-09-02 - persistent-generic # failure in job https://hydra.nixos.org/build/233220060 at 2023-09-02 - persistent-mongoDB # failure in job https://hydra.nixos.org/build/233207971 at 2023-09-02 + - persistent-mtl # failure in job https://hydra.nixos.org/build/255677987 at 2024-04-16 - persistent-odbc # failure in job https://hydra.nixos.org/build/233191221 at 2023-09-02 - persistent-postgresql-streaming # failure in job https://hydra.nixos.org/build/233194038 at 2023-09-02 - persistent-ratelimit # failure in job https://hydra.nixos.org/build/233224537 at 2023-09-02 @@ -4455,6 +4468,7 @@ broken-packages: - pgvector # failure in job https://hydra.nixos.org/build/233202205 at 2023-09-02 - phasechange # failure in job https://hydra.nixos.org/build/233254293 at 2023-09-02 - phaser # failure in job https://hydra.nixos.org/build/233250604 at 2023-09-02 + - phkdf # failure in job https://hydra.nixos.org/build/255669790 at 2024-04-16 - phoityne # failure in job https://hydra.nixos.org/build/233195238 at 2023-09-02 - phoityne-vscode # failure in job https://hydra.nixos.org/build/233190938 at 2023-09-02 - phone-metadata # failure in job https://hydra.nixos.org/build/233256096 at 2023-09-02 @@ -4536,6 +4550,7 @@ broken-packages: - platinum-parsing # failure in job https://hydra.nixos.org/build/233225071 at 2023-09-02 - PlayingCards # failure in job https://hydra.nixos.org/build/233239100 at 2023-09-02 - playlists # failure in job https://hydra.nixos.org/build/233240151 at 2023-09-02 + - plegg # failure in job https://hydra.nixos.org/build/255679256 at 2024-04-16 - plex # failure in job https://hydra.nixos.org/build/241435308 at 2023-11-19 - plist-buddy # failure in job https://hydra.nixos.org/build/233199181 at 2023-09-02 - plist # failure in job https://hydra.nixos.org/build/233233906 at 2023-09-02 @@ -4590,6 +4605,7 @@ broken-packages: - polysemy-several # failure in job https://hydra.nixos.org/build/233216921 at 2023-09-02 - polysemy-socket # failure in job https://hydra.nixos.org/build/233195754 at 2023-09-02 - polysemy-test # failure in job https://hydra.nixos.org/build/236686974 at 2023-10-04 + - polysemy-zoo # failure in job https://hydra.nixos.org/build/255673786 at 2024-04-16 - polyseq # failure in job https://hydra.nixos.org/build/233191210 at 2023-09-02 - polytypeable # failure in job https://hydra.nixos.org/build/233211797 at 2023-09-02 - polyvariadic # failure in job https://hydra.nixos.org/build/233250822 at 2023-09-02 @@ -5092,6 +5108,7 @@ broken-packages: - rosso # failure in job https://hydra.nixos.org/build/233230103 at 2023-09-02 - rotating-log # failure in job https://hydra.nixos.org/build/233206245 at 2023-09-02 - rounding # failure in job https://hydra.nixos.org/build/233234537 at 2023-09-02 + - RoundingFiasco # failure in job https://hydra.nixos.org/build/255680622 at 2024-04-16 - roundtrip-aeson # failure in job https://hydra.nixos.org/build/233253408 at 2023-09-02 - rowrecord # failure in job https://hydra.nixos.org/build/233208964 at 2023-09-02 - R-pandoc # failure in job https://hydra.nixos.org/build/233192114 at 2023-09-02 @@ -5126,6 +5143,7 @@ broken-packages: - safe-access # failure in job https://hydra.nixos.org/build/252736917 at 2024-03-16 - safe-buffer-monad # failure in job https://hydra.nixos.org/build/233192108 at 2023-09-02 - safe-coerce # failure in job https://hydra.nixos.org/build/233244289 at 2023-09-02 + - safe-coloured-text-gen # failure in job https://hydra.nixos.org/build/255682500 at 2024-04-16 - safe-coloured-text-layout # failure in job https://hydra.nixos.org/build/233247031 at 2023-09-02 - safecopy-migrate # failure in job https://hydra.nixos.org/build/233224574 at 2023-09-02 - safecopy-store # failure in job https://hydra.nixos.org/build/233227973 at 2023-09-02 @@ -5223,6 +5241,7 @@ broken-packages: - selda-postgresql # failure in job https://hydra.nixos.org/build/245539286 at 2024-01-02 - selectors # failure in job https://hydra.nixos.org/build/233227433 at 2023-09-02 - selenium # failure in job https://hydra.nixos.org/build/233214276 at 2023-09-02 + - sel # failure in job https://hydra.nixos.org/build/255671988 at 2024-04-16 - selinux # failure in job https://hydra.nixos.org/build/233192853 at 2023-09-02 - Semantique # failure in job https://hydra.nixos.org/build/233199841 at 2023-09-02 - semdoc # failure in job https://hydra.nixos.org/build/233258790 at 2023-09-02 @@ -5877,6 +5896,7 @@ broken-packages: - tcp-streams # failure in job https://hydra.nixos.org/build/252713034 at 2024-03-16 - tcp-streams-openssl # failure in job https://hydra.nixos.org/build/233258076 at 2023-09-02 - tdigest-Chart # failure in job https://hydra.nixos.org/build/233244784 at 2023-09-02 + - tdlib-types # failure in job https://hydra.nixos.org/build/255678555 at 2024-04-16 - tdoc # failure in job https://hydra.nixos.org/build/233250532 at 2023-09-02 - tds # failure in job https://hydra.nixos.org/build/233201528 at 2023-09-02 - teams # failure in job https://hydra.nixos.org/build/233228277 at 2023-09-02 @@ -5973,6 +5993,7 @@ broken-packages: - tga # failure in job https://hydra.nixos.org/build/233198921 at 2023-09-02 - thank-you-stars # failure in job https://hydra.nixos.org/build/233219923 at 2023-09-02 - th-build # failure in job https://hydra.nixos.org/build/233224794 at 2023-09-02 + - th-deepstrict # failure in job https://hydra.nixos.org/build/255670533 at 2024-04-16 - th-dict-discovery # failure in job https://hydra.nixos.org/build/233204140 at 2023-09-02 - theatre-dev # failure in updateAutotoolsGnuConfigScriptsPhase in job https://hydra.nixos.org/build/239251083 at 2023-11-10 - THEff # failure in job https://hydra.nixos.org/build/233221239 at 2023-09-02 @@ -6673,6 +6694,7 @@ broken-packages: - yarn2nix # failure in job https://hydra.nixos.org/build/233216079 at 2023-09-02 - yarr # failure in job https://hydra.nixos.org/build/233209487 at 2023-09-02 - yate # failure in job https://hydra.nixos.org/build/233231754 at 2023-09-02 + - yaya # failure in job https://hydra.nixos.org/build/255668220 at 2024-04-16 - yaya-test # failure in job https://hydra.nixos.org/build/233254306 at 2023-09-02 - yaya-unsafe-test # failure in job https://hydra.nixos.org/build/233194827 at 2023-09-02 - yeller # failure in job https://hydra.nixos.org/build/233240270 at 2023-09-02 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 221062282a988..4799e9c3bc1c2 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -28,6 +28,9 @@ default-package-overrides: - gi-gdkx11 < 4 # 2021-11-09: ghc-bignum is bundled starting with 9.0.1; only 1.0 builds with GHCs prior to 9.2.1 - ghc-bignum == 1.0 + # Needs to be pinned to match jsaddle from Stackage LTS (9.8.*) + - jsaddle-dom < 0.9.9.0 + - jsaddle-webkit2gtk < 0.9.9.0 extra-packages: - Cabal-syntax == 3.6.* # Dummy package that ensures packages depending on Cabal-syntax can work for Cabal < 3.8 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml index c4bdc86e5333c..17ce50df0fc3c 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml @@ -1,4 +1,4 @@ -# Stackage LTS 22.14 +# Stackage LTS 22.16 # This file is auto-generated by # maintainers/scripts/haskell/update-stackage.sh default-package-overrides: @@ -489,7 +489,7 @@ default-package-overrides: - bitvec ==1.1.5.0 - bitwise-enum ==1.0.1.2 - blake2 ==0.3.0.1 - - Blammo ==1.1.2.1 + - Blammo ==1.1.2.2 - blank-canvas ==0.7.4 - blanks ==0.5.0 - blas-carray ==0.1.0.2 @@ -684,7 +684,7 @@ default-package-overrides: - commonmark-extensions ==0.2.5.4 - commonmark-pandoc ==0.2.2.1 - commutative ==0.0.2 - - commutative-semigroups ==0.1.0.2 + - commutative-semigroups ==0.1.1.0 - comonad ==5.0.8 - compact ==0.2.0.0 - compactmap ==0.1.4.3 @@ -999,7 +999,7 @@ default-package-overrides: - enum-text ==0.5.3.0 - envelope ==0.2.2.0 - envparse ==0.5.0 - - envy ==2.1.2.0 + - envy ==2.1.3.0 - epub-metadata ==5.2 - eq ==4.3 - equal-files ==0.0.5.4 @@ -1085,7 +1085,7 @@ default-package-overrides: - FindBin ==0.0.5 - fingertree ==0.1.5.0 - finite-typelits ==0.1.6.0 - - first-class-families ==0.8.0.1 + - first-class-families ==0.8.1.0 - fits-parse ==0.3.6 - fitspec ==0.4.10 - fixed ==0.3 @@ -1325,7 +1325,7 @@ default-package-overrides: - happy ==1.20.1.1 - happy-meta ==0.2.1.0 - HasBigDecimal ==0.2.0.0 - - hashable ==1.4.3.0 + - hashable ==1.4.4.0 - hashids ==1.1.1.0 - hashing ==0.1.1.0 - hashmap ==1.3.3 @@ -1845,7 +1845,7 @@ default-package-overrides: - matchable ==0.1.2.1 - mathexpr ==0.3.1.0 - math-extras ==0.1.1.0 - - math-functions ==0.3.4.3 + - math-functions ==0.3.4.4 - mathlist ==0.2.0.0 - matplotlib ==0.7.7 - matrices ==0.5.0 @@ -1861,9 +1861,9 @@ default-package-overrides: - med-module ==0.1.3 - megaparsec ==9.5.0 - megaparsec-tests ==9.5.0 - - mega-sdist ==0.4.3.0 + - mega-sdist ==0.4.3.1 - membership ==0.0.1 - - memcache ==0.3.0.1 + - memcache ==0.3.0.2 - memfd ==1.0.1.3 - memory ==0.18.0 - MemoTrie ==0.6.11 @@ -2089,7 +2089,7 @@ default-package-overrides: - Only ==0.1 - oo-prototypes ==0.1.0.0 - oops ==0.2.0.1 - - opaleye ==0.10.2.1 + - opaleye ==0.10.2.3 - OpenAL ==1.7.0.5 - openapi3 ==3.2.4 - open-browser ==0.2.1.0 @@ -2135,7 +2135,7 @@ default-package-overrides: - pandoc-cli ==3.1.11.1 - pandoc-dhall-decoder ==0.1.0.1 - pandoc-lua-engine ==0.2.1.2 - - pandoc-lua-marshal ==0.2.5 + - pandoc-lua-marshal ==0.2.6 - pandoc-plot ==1.8.0 - pandoc-server ==0.1.0.5 - pandoc-throw ==0.1.0.0 @@ -2258,7 +2258,7 @@ default-package-overrides: - posix-paths ==0.3.0.0 - posix-pty ==0.2.2 - possibly ==1.0.0.0 - - postgres-options ==0.2.1.0 + - postgres-options ==0.2.2.0 - postgresql-binary ==0.13.1.3 - postgresql-libpq ==0.10.0.0 - postgresql-libpq-notify ==0.2.0.0 @@ -2489,7 +2489,7 @@ default-package-overrides: - runmemo ==1.0.0.1 - run-st ==0.1.3.3 - rvar ==0.3.0.2 - - rzk ==0.7.3 + - rzk ==0.7.4 - s3-signer ==0.5.0.0 - safe ==0.3.21 - safe-coloured-text ==0.2.0.2 @@ -2892,7 +2892,7 @@ default-package-overrides: - text-builder-linear ==0.1.2 - text-conversions ==0.3.1.1 - text-format ==0.3.2.1 - - text-icu ==0.8.0.4 + - text-icu ==0.8.0.5 - text-iso8601 ==0.1 - text-latin1 ==0.3.1 - text-ldap ==0.1.1.14 @@ -2940,8 +2940,8 @@ default-package-overrides: - th-test-utils ==1.2.1 - th-utilities ==0.2.5.0 - thyme ==0.4 - - tidal ==1.9.4 - - tidal-link ==1.0.2 + - tidal ==1.9.5 + - tidal-link ==1.0.3 - tile ==0.3.0.0 - time-compat ==1.9.6.1 - time-domain ==0.1.0.3 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index f1167559605cb..dcaa495f6b699 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -1012,7 +1012,7 @@ dont-distribute-packages: - cqrs-test - cqrs-testkit - crackNum - - crackNum_3_10 + - crackNum_3_12 - craft - craftwerk-cairo - craftwerk-gtk @@ -1483,6 +1483,7 @@ dont-distribute-packages: - fxpak - g2 - g2q + - g3p-hash - gact - galois-fft - galois-field @@ -2401,6 +2402,7 @@ dont-distribute-packages: - ixset-typed-conversions - iyql - j2hs + - jackpolynomials - java-bridge-extras - java-character - java-reflect @@ -3088,6 +3090,8 @@ dont-distribute-packages: - persistable-record - persistable-types-HDBC-pg - persistent-audit + - persistent-event-source + - persistent-eventsource - persistent-hssqlppp - persistent-map - persistent-mysql-haskell @@ -3341,6 +3345,7 @@ dont-distribute-packages: - razom-text-util - rbr - rc + - rdf4h-vocab-activitystreams - rdioh - react - react-flux-servant @@ -3925,6 +3930,7 @@ dont-distribute-packages: - tbox - tccli - tdd-util + - tdlib - techlab - telegram-bot - telegram-raw-api @@ -4284,6 +4290,7 @@ dont-distribute-packages: - wyvern - xcffib - xdcc + - xdg-basedir-compliant - xhb-atom-cache - xhb-ewmh - xml-catalog @@ -4325,6 +4332,10 @@ dont-distribute-packages: - yaml-streamly - yarr-image-io - yavie + - yaya-containers + - yaya-hedgehog + - yaya-quickcheck + - yaya-unsafe - ycextra - yeamer - yeshql diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 8bec59f4da599..72cc9c4c85a94 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -1073,6 +1073,8 @@ self: super: builtins.intersectAttrs super { # very useful. # Flag added in Agda 2.6.4.1, was always enabled before (enableCabalFlag "debug") + # Split outputs to reduce closure size + enableSeparateBinOutput ]; # ats-format uses cli-setup in Setup.hs which is quite happy to write diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index c80f544d34e96..f66a166c2ce3f 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -2101,15 +2101,14 @@ self: { "Blammo" = callPackage ({ mkDerivation, aeson, base, bytestring, case-insensitive, clock , containers, dlist, envparse, exceptions, fast-logger, hspec - , http-types, lens, markdown-unlit, monad-logger-aeson, mtl, text - , time, unliftio, unliftio-core, unordered-containers, vector, wai + , http-types, lens, markdown-unlit, monad-logger + , monad-logger-aeson, mtl, text, time, unliftio, unliftio-core + , unordered-containers, vector, wai }: mkDerivation { pname = "Blammo"; - version = "1.1.2.1"; - sha256 = "0j71glqsvzrmvj5ag32n48ib8wyyasjw0vdz2g93l2g2zhmsyz8y"; - revision = "1"; - editedCabalFile = "12kfvkvc78d386w4v8wdhwb3xd6470cnpqsaxd5kwldvvaz5hznj"; + version = "1.1.2.2"; + sha256 = "1yk670v8qiri7ivxjmpbbbs447ayspmq382qh5ag31yb23wwq5f4"; libraryHaskellDepends = [ aeson base bytestring case-insensitive clock containers dlist envparse exceptions fast-logger http-types lens monad-logger-aeson @@ -2117,7 +2116,8 @@ self: { wai ]; testHaskellDepends = [ - aeson base bytestring hspec markdown-unlit mtl text time + aeson base bytestring envparse hspec markdown-unlit monad-logger + mtl text time ]; testToolDepends = [ markdown-unlit ]; description = "Batteries-included Structured Logging library"; @@ -3397,6 +3397,8 @@ self: { ]; description = "Typified Tailwind for Rapid Development"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "ClassyPrelude" = callPackage @@ -7170,6 +7172,20 @@ self: { license = lib.licenses.bsd3; }) {}; + "GOST34112012-Hash" = callPackage + ({ mkDerivation, base, bytestring, text, utf8-string }: + mkDerivation { + pname = "GOST34112012-Hash"; + version = "0.1.1.2"; + sha256 = "143nppw4b5drfx3444a1gw02x0cjj0ngfcrai1aj03mf88ikgjj4"; + revision = "2"; + editedCabalFile = "0rir26yvx52qvrzribdy3l2d07p4wq287iwr62qn4h0wdc4240dh"; + libraryHaskellDepends = [ base bytestring ]; + testHaskellDepends = [ base bytestring text utf8-string ]; + description = "Bindings to the GOST R 34.11-2012 hashing implementation"; + license = lib.licenses.bsd2; + }) {}; + "GPX" = callPackage ({ mkDerivation, base, comonad, comonad-transformers, containers , data-lens, hxt, newtype, xsd @@ -12349,8 +12365,8 @@ self: { pname = "JuicyPixels"; version = "3.3.8"; sha256 = "0gmndzcbqys34sf6y8db13r5gaqa1cp9zxyb4vav788m6p5gd86k"; - revision = "1"; - editedCabalFile = "1gbmls58qdlip8nsysy1qsnf7wrw8cgss7i7vmbxxnf9ni0iawn9"; + revision = "2"; + editedCabalFile = "0xc9qlfgrlf6v4h5m9rcwy58wsa4ksm8fpnx3fyh5ld9x3nhgfpd"; libraryHaskellDepends = [ base binary bytestring containers deepseq mtl primitive transformers vector zlib @@ -16759,6 +16775,19 @@ self: { broken = true; }) {}; + "PenroseKiteDart" = callPackage + ({ mkDerivation, base, containers, diagrams-lib, hspec }: + mkDerivation { + pname = "PenroseKiteDart"; + version = "1.0.0"; + sha256 = "068r77shs4j5vhwdzwwxq0c3ajx0nhrm8apdb8j2h5kb0s3yav5y"; + libraryHaskellDepends = [ base containers diagrams-lib ]; + testHaskellDepends = [ base containers diagrams-lib hspec ]; + benchmarkHaskellDepends = [ base containers diagrams-lib ]; + description = "Library to explore Penrose's Kite and Dart Tilings"; + license = lib.licenses.bsd3; + }) {}; + "PerfectHash" = callPackage ({ mkDerivation, array, base, binary, bytestring, cmph, containers , digest, time @@ -18336,6 +18365,20 @@ self: { mainProgram = "RollingDirectory"; }) {}; + "RoundingFiasco" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "RoundingFiasco"; + version = "0.1.0.0"; + sha256 = "1n51zrbngiickyh7mqm3jnvnf7qcbjdrqz5q4pjqpx9cl9hx7yl0"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base ]; + description = "rounding variants floor, ceil and truncate for floating point operations +-*/√…"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "RoyalMonad" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -22588,6 +22631,8 @@ self: { pname = "Win32-services"; version = "0.4.0.1"; sha256 = "1skf8w3d1n61847bjpvll3bql65mrc6vg03q84bg21mlh77mx1s3"; + revision = "1"; + editedCabalFile = "1c3xxdg4adk00d3k9jxxw7vigibkmyp31bf1lzyng3jgw55qawj9"; libraryHaskellDepends = [ base Win32 Win32-errors ]; librarySystemDepends = [ Advapi32 ]; description = "Windows service applications"; @@ -23207,6 +23252,25 @@ self: { license = lib.licenses.bsd3; }) {}; + "Yampa_0_14_8" = callPackage + ({ mkDerivation, base, criterion, deepseq, filepath, random + , simple-affine-space, time + }: + mkDerivation { + pname = "Yampa"; + version = "0.14.8"; + sha256 = "0w33n17haja7jzwhha7j6psqkcyq0k06ddckbs96yqldmq96il18"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base deepseq random simple-affine-space + ]; + benchmarkHaskellDepends = [ base criterion filepath time ]; + description = "Elegant Functional Reactive Programming Language for Hybrid Systems"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "Yampa-core" = callPackage ({ mkDerivation, base, deepseq, random, vector-space }: mkDerivation { @@ -35919,7 +35983,9 @@ self: { testToolDepends = [ hspec-discover ]; description = "Code gen for Aseprite animations"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; mainProgram = "aseprite2haskell"; + broken = true; }) {}; "anki-tools" = callPackage @@ -41175,8 +41241,8 @@ self: { }: mkDerivation { pname = "atp-haskell"; - version = "1.14.2"; - sha256 = "1gwcs0iafg5q2n14nrksd152p3a84wisp451q73h3pph9ldrq2h3"; + version = "1.14.3"; + sha256 = "12qw8y0vy2nb0ciw5q0g5wxs6qws3pad3ifv7mga543ay4chypy5"; libraryHaskellDepends = [ applicative-extras base containers extra HUnit mtl parsec pretty template-haskell time @@ -44579,8 +44645,8 @@ self: { }: mkDerivation { pname = "bank-holiday-germany"; - version = "1.2.0.0"; - sha256 = "17xqwa51rv64k7szvlpix4gm9g65rwjjlcmkn9khpyjis396zx4f"; + version = "1.3.0.0"; + sha256 = "1agf4flql5xkj2rpdbdxpmvajhigcwzbxsmrh76bckmcj2b38k9f"; libraryHaskellDepends = [ base time ]; testHaskellDepends = [ base doctest hedgehog hspec hspec-hedgehog time @@ -49160,32 +49226,31 @@ self: { }) {}; "binrep" = callPackage - ({ mkDerivation, aeson, base, bytestring, deepseq, flatparse, gauge - , generic-data-functions, generic-random, hspec, hspec-discover - , mason, megaparsec, parser-combinators, QuickCheck - , quickcheck-instances, refined1, strongweak, text, text-icu - , vector, vector-sized + ({ mkDerivation, base, bytestring, bytezap, deepseq, flatparse + , gauge, generic-data-asserts, generic-data-functions + , generic-random, hspec, hspec-discover, parser-combinators + , QuickCheck, quickcheck-instances, refined1, strongweak, text + , text-icu }: mkDerivation { pname = "binrep"; - version = "0.5.0"; - sha256 = "069038cx1b0ch2g0jf94l1wp8f09zrcr1xlzflrgpk2ka1y5rr3c"; + version = "0.6.0"; + sha256 = "1rd27h3i39zibz7dvwk53akqkrfhwln2igfczxdwflhav372ah18"; libraryHaskellDepends = [ - aeson base bytestring deepseq flatparse generic-data-functions - mason megaparsec parser-combinators refined1 strongweak text - text-icu vector vector-sized + base bytestring bytezap deepseq flatparse generic-data-asserts + generic-data-functions parser-combinators refined1 strongweak text + text-icu ]; testHaskellDepends = [ - aeson base bytestring deepseq flatparse generic-data-functions - generic-random hspec mason megaparsec parser-combinators QuickCheck - quickcheck-instances refined1 strongweak text text-icu vector - vector-sized + base bytestring bytezap deepseq flatparse generic-data-asserts + generic-data-functions generic-random hspec parser-combinators + QuickCheck quickcheck-instances refined1 strongweak text text-icu ]; testToolDepends = [ hspec-discover ]; benchmarkHaskellDepends = [ - aeson base bytestring deepseq flatparse gauge - generic-data-functions mason megaparsec parser-combinators refined1 - strongweak text text-icu vector vector-sized + base bytestring bytezap deepseq flatparse gauge + generic-data-asserts generic-data-functions parser-combinators + refined1 strongweak text text-icu ]; description = "Encode precise binary representations directly in types"; license = lib.licenses.mit; @@ -51816,8 +51881,8 @@ self: { ({ mkDerivation, bluefin-internal }: mkDerivation { pname = "bluefin"; - version = "0.0.3.0"; - sha256 = "1b1050pbxqi0hyz4xkm56v54rp5c0z9sr36swwg07xmkv52g7hil"; + version = "0.0.4.2"; + sha256 = "08r1xma5kg7kcc88lflq59kz3qs1qix2pg4hq882pabis0lnwr64"; libraryHaskellDepends = [ bluefin-internal ]; description = "The Bluefin effect system"; license = lib.licenses.mit; @@ -51829,8 +51894,8 @@ self: { }: mkDerivation { pname = "bluefin-internal"; - version = "0.0.3.0"; - sha256 = "1xsb5qxmfaw2bb0jslz2hr04lihxc7r51x8rsqnvdly05a8vxglv"; + version = "0.0.4.2"; + sha256 = "1jgql7bvv4zaqigafbrk3bydp2fyab0za5rpw7nz6fxvnxn3w9aj"; libraryHaskellDepends = [ base monad-control transformers transformers-base unliftio-core ]; @@ -56422,8 +56487,8 @@ self: { ({ mkDerivation, base, bytestring, primitive, text }: mkDerivation { pname = "bytezap"; - version = "1.0.0"; - sha256 = "198nvi6dk8s6mb24z31xaz6yqfaiyrgwm1bhmjak4sbgpp3jika5"; + version = "1.1.0"; + sha256 = "08nr0iyj80bc19fj8dgfzyyb1dws93lclpmgxq2m0jcaxxzid1kj"; libraryHaskellDepends = [ base bytestring primitive text ]; description = "Bytestring builder with zero intermediate allocation"; license = lib.licenses.mit; @@ -57843,8 +57908,8 @@ self: { pname = "cabal-plan"; version = "0.7.3.0"; sha256 = "0rjyf5dh13kqwjr520i4w1g7y37nv4rn7vbpkgcjf5qi9f2m9p6c"; - revision = "2"; - editedCabalFile = "13y7ypl763wirrd2i5az9dcgw69vnrd7nb7xd6v3bcrxwj9snams"; + revision = "3"; + editedCabalFile = "1d9wii8gca1g7q6dr3y4yi08xnq2dw5wfk911abp34r5vf8zmgwm"; configureFlags = [ "-fexe" ]; isLibrary = true; isExecutable = true; @@ -69466,8 +69531,8 @@ self: { ({ mkDerivation, base, containers }: mkDerivation { pname = "commutative-semigroups"; - version = "0.1.0.2"; - sha256 = "0r8kagn44ms59qsni71igbryiwb8hv3swq81a1jnac7smfj3l51l"; + version = "0.1.1.0"; + sha256 = "07b4w4z68dkfz26rm5b6b9fpgcssxr8lqx4snd2qhbf0qr29m8pk"; libraryHaskellDepends = [ base containers ]; description = "Commutative semigroups"; license = lib.licenses.bsd3; @@ -76023,18 +76088,19 @@ self: { mainProgram = "crackNum"; }) {}; - "crackNum_3_10" = callPackage - ({ mkDerivation, base, directory, filepath, libBF, process, sbv - , tasty, tasty-golden + "crackNum_3_12" = callPackage + ({ mkDerivation, base, deepseq, directory, filepath, ghc, libBF + , process, sbv, tasty, tasty-golden }: mkDerivation { pname = "crackNum"; - version = "3.10"; - sha256 = "00zkd6rv84axzvfbkaz4cfpv2vnmlyrmyya30a0rnxh8gad0ix5g"; + version = "3.12"; + sha256 = "1d1hn24c9xdnb19h8c0nakq7825q0gv4b4pxbf8cpwjsspb155wm"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - base directory filepath libBF process sbv tasty tasty-golden + base deepseq directory filepath ghc libBF process sbv tasty + tasty-golden ]; description = "Crack various integer and floating-point data formats"; license = lib.licenses.bsd3; @@ -78928,7 +78994,6 @@ self: { testHaskellDepends = [ base hspec text ]; description = "Currencies representation, pretty printing and conversion"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "currency" = callPackage @@ -89187,6 +89252,8 @@ self: { librarySystemDepends = [ markdown ]; description = "Haskell bindings to the discount Markdown library"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {markdown = null;}; "discover-instances" = callPackage @@ -89546,8 +89613,8 @@ self: { }: mkDerivation { pname = "distributed-process"; - version = "0.7.5"; - sha256 = "1si3s8540nyybsyzbh6qa96aanvd8qf70b9lgcg78jn4a1fww7c9"; + version = "0.7.6"; + sha256 = "0kfgz8nrg8pdnw56msdkdlc1y894giz6jmgss6gxmhrr929rsnlz"; libraryHaskellDepends = [ base binary bytestring containers data-accessor deepseq distributed-static exceptions hashable mtl network-transport random @@ -90001,18 +90068,18 @@ self: { "distributed-process-tests" = callPackage ({ mkDerivation, ansi-terminal, base, binary, bytestring - , distributed-process, distributed-static, HUnit, network - , network-transport, network-transport-inmemory, random, rematch - , setenv, stm, test-framework, test-framework-hunit + , distributed-process, distributed-static, exceptions, HUnit + , network, network-transport, network-transport-inmemory, random + , rematch, setenv, stm, test-framework, test-framework-hunit }: mkDerivation { pname = "distributed-process-tests"; - version = "0.4.11"; - sha256 = "0rpmmyl3bal61q1gg6kk57i8whvard8r6f6w57pdgspp2sy5bhh7"; + version = "0.4.12"; + sha256 = "1jr7xgmwsy89hyih81w54bid8664rgqd8mxvwcd6xa6b41n90r7f"; libraryHaskellDepends = [ ansi-terminal base binary bytestring distributed-process - distributed-static HUnit network network-transport random rematch - setenv stm test-framework test-framework-hunit + distributed-static exceptions HUnit network network-transport + random rematch setenv stm test-framework test-framework-hunit ]; testHaskellDepends = [ base network network-transport network-transport-inmemory @@ -91741,18 +91808,17 @@ self: { "domain-auth" = callPackage ({ mkDerivation, asn1-encoding, asn1-types, attoparsec, base - , bytestring, containers, crypton, crypton-x509, dns, doctest - , iproute, memory, network, pretty-simple, word8 + , bytestring, containers, crypton, crypton-x509, dns, iproute + , memory, network, pretty-simple, word8 }: mkDerivation { pname = "domain-auth"; - version = "0.2.3"; - sha256 = "1kwc7rgqcv5jyi8071cbfac5q3anhdd0jl1kq5x9bnync6lriv69"; + version = "0.2.4"; + sha256 = "0vmmyc1pq4ck6x0c4nbdzn4mr6l16355i74lp7cczizcjjraymj8"; libraryHaskellDepends = [ asn1-encoding asn1-types attoparsec base bytestring containers - crypton crypton-x509 dns iproute memory network word8 + crypton crypton-x509 dns iproute memory network pretty-simple word8 ]; - testHaskellDepends = [ base doctest pretty-simple ]; description = "Domain authentication library"; license = lib.licenses.bsd3; }) {}; @@ -98554,26 +98620,6 @@ self: { }: mkDerivation { pname = "envy"; - version = "2.1.2.0"; - sha256 = "1msabmxhcafblvadhshda65g5mhzca3719p6dqy6ifrj8202bkr4"; - libraryHaskellDepends = [ - base bytestring containers mtl text time transformers - ]; - testHaskellDepends = [ - base bytestring hspec mtl QuickCheck quickcheck-instances text time - transformers - ]; - description = "An environmentally friendly way to deal with environment variables"; - license = lib.licenses.bsd3; - maintainers = [ lib.maintainers.sternenseemann ]; - }) {}; - - "envy_2_1_3_0" = callPackage - ({ mkDerivation, base, bytestring, containers, hspec, mtl - , QuickCheck, quickcheck-instances, text, time, transformers - }: - mkDerivation { - pname = "envy"; version = "2.1.3.0"; sha256 = "088nha6hcd4knqxyqb2v7d3px7nqcqg2qm2gd1qrws21dcc6lkbl"; libraryHaskellDepends = [ @@ -98585,7 +98631,6 @@ self: { ]; description = "An environmentally friendly way to deal with environment variables"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.sternenseemann ]; }) {}; @@ -101737,14 +101782,16 @@ self: { }: mkDerivation { pname = "exiftool"; - version = "0.2.0.4"; - sha256 = "1aa6n86xwgzz075pkwicxl817fvpl7qmwaxrxq85xa5zyl2718bk"; + version = "0.2.0.5"; + sha256 = "1n6d7yf23rnrxj5lf6vfc1l7igk1w88l89hvkxjfz0qrqz2cc0vx"; libraryHaskellDepends = [ aeson base base64 bytestring hashable process scientific temporary text unordered-containers vector ]; description = "Haskell bindings to ExifTool"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "exigo-schema" = callPackage @@ -106856,6 +106903,22 @@ self: { maintainers = [ lib.maintainers.turion ]; }) {}; + "finite-typelits_0_2_0_0" = callPackage + ({ mkDerivation, base, deepseq, QuickCheck, tagged + , template-haskell + }: + mkDerivation { + pname = "finite-typelits"; + version = "0.2.0.0"; + sha256 = "048f0az0qvkz35i0y1a2nsnbv3yvkfkywal6jhkqchab1ak9bml8"; + libraryHaskellDepends = [ base deepseq tagged template-haskell ]; + testHaskellDepends = [ base deepseq QuickCheck ]; + description = "A type inhabited by finitely many values, indexed by type-level naturals"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.turion ]; + }) {}; + "finito" = callPackage ({ mkDerivation, base, numeric-domains, propeller, split , transformers @@ -106983,10 +107046,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "first-class-families"; - version = "0.8.0.1"; - sha256 = "0wnsq69f2br9h9hnf8sx41pchwjag86hb41ivjl7wx81psyqy72a"; - revision = "2"; - editedCabalFile = "0idiqb4ckwa7hya827gc2cbjh83wmz3cppnl124834pkla2h99np"; + version = "0.8.1.0"; + sha256 = "1zynw2nvclx3rqjpd9g78mrmhll11x59s21hjppqsgv47zbf5vmk"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "First-class type families"; @@ -110843,8 +110904,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "free-alacarte"; - version = "0.1.0.3"; - sha256 = "1djx7v5n0fc29c4ix6fx51gg2khsy57fd89vknwzqzx3c22skgxm"; + version = "0.1.0.4"; + sha256 = "0zv3rsbacjh055spn77q3yz9f7mrsdw5kdbmynxv9hrpg584218x"; libraryHaskellDepends = [ base ]; description = "Free monads based on intuitions from the Data types à la Carte"; license = lib.licenses.gpl3Only; @@ -112201,20 +112262,18 @@ self: { }) {}; "ftp-client" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, connection - , containers, exceptions, network, tasty, tasty-hspec, transformers + ({ mkDerivation, attoparsec, base, bytestring, containers + , crypton-connection, exceptions, hspec, network, transformers }: mkDerivation { pname = "ftp-client"; - version = "0.5.1.4"; - sha256 = "0c2xn2q24imrfgsx4zxzi24ciwkrly6n47lc5k5406j5b4znn5lf"; - revision = "3"; - editedCabalFile = "1a7xya5c89lj4s73bd0cgr53id53xz4fnqzrizdibb6a90ml7g9r"; + version = "0.5.1.5"; + sha256 = "08sxbk4s3prh22b1c19cv571fgdc5k9347i17jqmvfwjl3lkv5w7"; libraryHaskellDepends = [ - attoparsec base bytestring connection containers exceptions network - transformers + attoparsec base bytestring containers crypton-connection exceptions + network transformers ]; - testHaskellDepends = [ base bytestring tasty tasty-hspec ]; + testHaskellDepends = [ base bytestring hspec ]; description = "Transfer files with FTP and FTPS"; license = lib.licenses.publicDomain; hydraPlatforms = lib.platforms.none; @@ -113719,6 +113778,8 @@ self: { pname = "g2"; version = "0.2.0.0"; sha256 = "1d4vd357l7arxd0dwyy97c6cz6x3dqm4camfsp4dpdjry7bc8r9q"; + revision = "1"; + editedCabalFile = "00k9mwdjjck6mx9dnqwxa3z5lnqm3mskhnp3sh750a9ykmwfmx5f"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -113773,6 +113834,7 @@ self: { ]; description = "Global Password Prehash Protocol"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; }) {}; "g4ip" = callPackage @@ -115209,13 +115271,25 @@ self: { license = lib.licenses.mit; }) {}; + "generic-data-asserts" = callPackage + ({ mkDerivation, base, type-spec }: + mkDerivation { + pname = "generic-data-asserts"; + version = "0.2.0"; + sha256 = "1v2pfibff26bsy5z3q1fv45v30p6hmmrka6c4chpd7abn89hknz1"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base type-spec ]; + description = "Structural assertions on generic data representations"; + license = lib.licenses.mit; + }) {}; + "generic-data-functions" = callPackage - ({ mkDerivation, base, text }: + ({ mkDerivation, base, contravariant, text }: mkDerivation { pname = "generic-data-functions"; - version = "0.2.0"; - sha256 = "1vpjj61lw0bqngxvsqlljq71b773krwiw80vdff0fy94y1d2arj8"; - libraryHaskellDepends = [ base text ]; + version = "0.5.0"; + sha256 = "0qjbwn0b59i5lrq26v36ai7z8xckid3gjz33w6l0kq1cvpfvzrnx"; + libraryHaskellDepends = [ base contravariant text ]; description = "Familiar functions lifted to generic data types"; license = lib.licenses.mit; maintainers = [ lib.maintainers.raehik ]; @@ -118697,8 +118771,8 @@ self: { }: mkDerivation { pname = "ghc-source-gen"; - version = "0.4.4.1"; - sha256 = "0fbzvybj86apy4xkx1m4gbp7gybmd87ab64f6sngpsbkk5shxsrk"; + version = "0.4.5.0"; + sha256 = "18v6i0a6j72brwr7zq0j0igmkzigx3w4a6rdhq8cn768vflpflvv"; libraryHaskellDepends = [ base ghc ]; testHaskellDepends = [ base ghc ghc-paths QuickCheck tasty tasty-hunit tasty-quickcheck @@ -119477,12 +119551,12 @@ self: { license = lib.licenses.mit; }) {}; - "ghcjs-base_0_2_1_0" = callPackage + "ghcjs-base_0_8_0_0" = callPackage ({ mkDerivation }: mkDerivation { pname = "ghcjs-base"; - version = "0.2.1.0"; - sha256 = "05dw3kvrwgipxjg1i3gfirqz260azcmgj1rwp7m37a94q4550bcq"; + version = "0.8.0.0"; + sha256 = "1bbgvyw4vbwi7whidldrxi46hjx9hsg3hp6l2py30528n7hfdpdp"; description = "base library for GHCJS"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; @@ -119525,8 +119599,8 @@ self: { }: mkDerivation { pname = "ghcjs-dom"; - version = "0.9.5.0"; - sha256 = "1ya4ns81xwri8knbhmkbxpvm48q4ygyn1sqq873sbpsawknqcn65"; + version = "0.9.9.0"; + sha256 = "11zc5p7d74c5q3rq3vzczf16y7r0lci3ddvq1nry6jsfrxkklziy"; libraryHaskellDepends = [ base containers ghcjs-dom-jsaddle text transformers ]; @@ -119557,12 +119631,24 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "ghcjs-dom-javascript" = callPackage + ({ mkDerivation }: + mkDerivation { + pname = "ghcjs-dom-javascript"; + version = "0.9.9.0"; + sha256 = "0vhk1gjr5g5cp6rzkr9p0km4mrdi61kfwk8jc0w97wkwmi030qcb"; + description = "DOM library using JSFFI and GHCJS"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "ghcjs-dom-jsaddle" = callPackage ({ mkDerivation, jsaddle-dom }: mkDerivation { pname = "ghcjs-dom-jsaddle"; - version = "0.9.5.0"; - sha256 = "12y95c10f16ysbbsfhwmw3pyyp339rm1hnzsb7hbbiwh6g2kx8vd"; + version = "0.9.9.0"; + sha256 = "0r9xkp23j3w8c6qwsx4zyd8g8a3pryx073rw84k7fl8nfsjb0b7m"; libraryHaskellDepends = [ jsaddle-dom ]; doHaddock = false; description = "DOM library that supports both GHCJS and GHC using jsaddle"; @@ -119573,8 +119659,8 @@ self: { ({ mkDerivation }: mkDerivation { pname = "ghcjs-dom-jsffi"; - version = "0.9.5.0"; - sha256 = "1pmxrhpdh4630q0z8a8pqg5m7323a1w1z8ny2fvb1acr12x6l1f0"; + version = "0.9.9.0"; + sha256 = "0fhcs89x180kw75qgbfh28wjyn55frwdfj4rqlqa1smx0fwhzyy1"; description = "DOM library using JSFFI and GHCJS"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; @@ -121444,6 +121530,8 @@ self: { doHaddock = false; description = "Generate easy-to-remember, hard-to-guess passwords"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "gibbon" = callPackage @@ -121462,22 +121550,22 @@ self: { "gigaparsec" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, gauge, knob - , pretty-terminal, selective, tasty, tasty-expected-failure + , pretty-terminal, rt, selective, tasty, tasty-expected-failure , tasty-hunit, template-haskell }: mkDerivation { pname = "gigaparsec"; - version = "0.2.5.1"; - sha256 = "1ks2wv3n478r4532q7lfyll51kkrzsgh58akz9yflnv9n038sfr5"; + version = "0.3.0.0"; + sha256 = "13r2h7k37rwbig9ka75202vgifprjf719xp9zgrnrqa3dxpynh93"; libraryHaskellDepends = [ - base containers pretty-terminal selective template-haskell + base containers pretty-terminal rt selective template-haskell ]; testHaskellDepends = [ - base bytestring containers deepseq knob tasty + base bytestring containers deepseq knob rt tasty tasty-expected-failure tasty-hunit ]; benchmarkHaskellDepends = [ base deepseq gauge ]; - description = "Refreshed parsec-style library for compatiblity with Scala parsley"; + description = "Refreshed parsec-style library for compatibility with Scala parsley"; license = lib.licenses.bsd3; }) {}; @@ -128878,8 +128966,8 @@ self: { }: mkDerivation { pname = "greenclip"; - version = "4.1.0"; - sha256 = "1z52ffb3f0iflls3bjlwzpz4w3a904vj67c1zsdyql6j2xpln6n4"; + version = "4.2.0"; + sha256 = "03y179mjck7i1f9jw5j6aj1mzgvr91fzmdsbmzhabdjnhcl9b1r6"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -132096,8 +132184,8 @@ self: { pname = "hackage-security"; version = "0.6.2.4"; sha256 = "10jcxn3ihsaf2dv0wyrccjszwqz2cpgv2k8bwqxfjhjbn0xmp4lb"; - revision = "1"; - editedCabalFile = "0n3jss7hignrjzgzrk2krq9jffh1bfarmacmjlmigcg5ha91d5cn"; + revision = "3"; + editedCabalFile = "15y006779ssm21ypcg291307gv2xrg740aqw4ky8qsxyrmcyj4sg"; libraryHaskellDepends = [ base base16-bytestring base64-bytestring bytestring Cabal Cabal-syntax containers cryptohash-sha256 directory ed25519 @@ -132113,7 +132201,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "hackage-security_0_6_2_5" = callPackage + "hackage-security_0_6_2_6" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, base64-bytestring , bytestring, Cabal, Cabal-syntax, containers, cryptohash-sha256 , directory, ed25519, filepath, ghc-prim, lukko, mtl, network @@ -132123,8 +132211,8 @@ self: { }: mkDerivation { pname = "hackage-security"; - version = "0.6.2.5"; - sha256 = "1az2bziiw3dlz1bfz2nblklrszr45l7rdmnxkvj37pilchihkj45"; + version = "0.6.2.6"; + sha256 = "0sfvd5y9v01bjsxsrf446ldcqf56arzr94jk2zsvj49yddbn2hif"; libraryHaskellDepends = [ base base16-bytestring base64-bytestring bytestring Cabal Cabal-syntax containers cryptohash-sha256 directory ed25519 @@ -133828,8 +133916,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "halfsplit"; - version = "0.4.2.0"; - sha256 = "1fa2bdch3rqprfvjy3rmhb7zkbzfqnyzi193ayh5zlsmshx5w0cl"; + version = "0.4.3.0"; + sha256 = "1y09vl853nsc6fx19bwmmmh9k7di825j4y7rsm06wyk35m911yv7"; libraryHaskellDepends = [ base ]; description = "A library to provide special kind of two-column output for Phladiprelio"; license = lib.licenses.mit; @@ -136169,22 +136257,24 @@ self: { "hashable" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, filepath - , ghc-bignum, ghc-prim, HUnit, QuickCheck, random, test-framework - , test-framework-hunit, test-framework-quickcheck2, text, unix + , ghc-bignum, ghc-prim, HUnit, os-string, QuickCheck, random + , test-framework, test-framework-hunit, test-framework-quickcheck2 + , text, unix }: mkDerivation { pname = "hashable"; - version = "1.4.3.0"; - sha256 = "1xdhg8mn1i3bci7sbw9nx18sxadkz6fw7rfbnw4n4y4i51nb3vrj"; + version = "1.4.4.0"; + sha256 = "0n27mz24xsjlcdxcs4irxai4zafaimnwg6cbnfr442a4912xd8qz"; revision = "1"; - editedCabalFile = "153i7nzxqmimb565yrq0c6wnypmmzvf2rvvqldja1xqdzan6igzk"; + editedCabalFile = "1nskqpfd2qdc83ffdi9aj446ff06f8z3av0cx68slwn5fj1268mf"; libraryHaskellDepends = [ base bytestring containers deepseq filepath ghc-bignum ghc-prim - text + os-string text ]; testHaskellDepends = [ - base bytestring ghc-prim HUnit QuickCheck random test-framework - test-framework-hunit test-framework-quickcheck2 text unix + base bytestring filepath ghc-prim HUnit os-string QuickCheck random + test-framework test-framework-hunit test-framework-quickcheck2 text + unix ]; description = "A class for types that can be converted to a hash value"; license = lib.licenses.bsd3; @@ -140016,8 +140106,8 @@ self: { }: mkDerivation { pname = "haskoin-store"; - version = "1.4.0"; - sha256 = "0fvy3n2dc54vssrz1mm6acv1nsnmwbmx6kgi14pkqll3fx9i6m4g"; + version = "1.5.0"; + sha256 = "01lrrbz6811jcj47bj2ah0i23jkx2gdl326s2hx03rvfnygbz1bq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -143956,8 +144046,8 @@ self: { pname = "hedgehog"; version = "1.4"; sha256 = "1sz685n2ljriqwfpfy57adbsc6gyrd4x7jmy628803rfalqznjpm"; - revision = "4"; - editedCabalFile = "0c0wvp1ax1zjk9p45hmblf0pabl83ddy6vl5nh6xi53cx8l6rxm0"; + revision = "5"; + editedCabalFile = "1majbvnqywyqfzm7qm7bhwmfzi3jamiz7d5ql4yvzsix8wg4rbag"; libraryHaskellDepends = [ ansi-terminal async barbies base bytestring concurrent-output containers deepseq directory erf exceptions lifted-async mmorph @@ -147489,6 +147579,17 @@ self: { mainProgram = "hiedb"; }) {}; + "hiedb-plugin" = callPackage + ({ mkDerivation, base, directory, filepath, ghc, hiedb, stm }: + mkDerivation { + pname = "hiedb-plugin"; + version = "0.1.0"; + sha256 = "163sj0yqa2srnh9w5a219hgnm1ljq7y76x1h2lbgpyx6bmw3vkn9"; + libraryHaskellDepends = [ base directory filepath ghc hiedb stm ]; + description = "See README on Github for more information"; + license = lib.licenses.mit; + }) {}; + "hieraclus" = callPackage ({ mkDerivation, base, containers, HUnit, mtl, multiset }: mkDerivation { @@ -155914,10 +156015,8 @@ self: { }: mkDerivation { pname = "hs-opentelemetry-instrumentation-auto"; - version = "0.1.0.0"; - sha256 = "1kp5fslrpaxyfj365hg1h4p6mbr8785pql6hwp507iydkawjlamc"; - revision = "2"; - editedCabalFile = "0shc5psmgdw0sskz21ars13ph3ylq3cyd3a54ji4v0mzihlw3rh0"; + version = "0.1.0.1"; + sha256 = "00qsmldcn20c5vsy617w0kcn4dw0l730n74bdrp2acv1jpppaa4v"; libraryHaskellDepends = [ base bytestring containers directory ghc hs-opentelemetry-api parsec text time toml-parser unliftio @@ -160333,13 +160432,13 @@ self: { }: mkDerivation { pname = "hspray"; - version = "0.2.4.0"; - sha256 = "0zc85y4wcalvf57gjr24v8w1x63wb388v0pdqa0n2awi950nf7dd"; + version = "0.2.5.0"; + sha256 = "00md7i8g7sqxac7lplgdxy6csabaz35bm2lnb6c290fn261mvlx1"; libraryHaskellDepends = [ base containers hashable matrix numeric-prelude text unordered-containers ]; - testHaskellDepends = [ base tasty tasty-hunit ]; + testHaskellDepends = [ base numeric-prelude tasty tasty-hunit ]; benchmarkHaskellDepends = [ base tasty-bench ]; description = "Multivariate polynomials"; license = lib.licenses.gpl3Only; @@ -160723,8 +160822,8 @@ self: { ({ mkDerivation, base, directory, parsec, random, unix }: mkDerivation { pname = "hsshellscript"; - version = "3.6.2"; - sha256 = "1p59graa3y2f7apv22qqmaw0l4lgawip6bxs4dpgf9nb5cgwk9iy"; + version = "3.6.4"; + sha256 = "0xglkx1x8wgqfrgcdzsg7l727ygb1hjfmgd86p5j9qpqral9003n"; libraryHaskellDepends = [ base directory parsec random unix ]; description = "Using Haskell for Unix shell scripting tasks"; license = lib.licenses.lgpl3Plus; @@ -162276,10 +162375,8 @@ self: { }: mkDerivation { pname = "http-client-rustls"; - version = "0.0.0.0"; - sha256 = "1rwiclqc1hpxgaqz6y8pxl96g68bg8d8m1clapg60fgmyj0zjnha"; - revision = "1"; - editedCabalFile = "0qhs7zbkw0zp1rv96da484kxizlx9vkc8n7zr8rz9w55gszb2bcf"; + version = "0.0.1.0"; + sha256 = "1yx93cfvn8zqvsrl2bg6zv12acvmbz2d66wyhb7w53jib7gwzk8z"; libraryHaskellDepends = [ base bytestring http-client network resourcet rustls text ]; @@ -163274,7 +163371,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "http2_5_1_2" = callPackage + "http2_5_1_4" = callPackage ({ mkDerivation, aeson, aeson-pretty, array, async, base , base16-bytestring, bytestring, case-insensitive, containers , crypton, directory, filepath, gauge, Glob, hspec, hspec-discover @@ -163284,10 +163381,8 @@ self: { }: mkDerivation { pname = "http2"; - version = "5.1.2"; - sha256 = "0gp8z7hldfvfwn20aq8lpcxjgzd733g949ypnv14k8x5ncb1kvcx"; - revision = "1"; - editedCabalFile = "10k46jg4rbs3nn5fjak9jh0ldri9514ix843180i3ha18z1dsl8r"; + version = "5.1.4"; + sha256 = "0asf51bfzbn0nxp0zn58089ym1c4wkcmh67qdd0s094r1qh9d5x2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -163317,10 +163412,8 @@ self: { }: mkDerivation { pname = "http2-client"; - version = "0.10.0.0"; - sha256 = "0kv4qa9cbwwj6b62manzpl1sk4jnsb5vx2y73w49drlfkrw1vpgy"; - revision = "2"; - editedCabalFile = "02frmqjcpx1d3c3y54z8ajckmd3dkjing3j9xaphmr6i3s9nbpa0"; + version = "0.10.0.1"; + sha256 = "1051qcnnigxyq20067r26gm3wp61p4ipga2pzjymd2wvnndx56hg"; libraryHaskellDepends = [ async base bytestring containers deepseq http2 lifted-async lifted-base mtl network stm time tls transformers-base @@ -163433,8 +163526,10 @@ self: { }: mkDerivation { pname = "http2-tls"; - version = "0.2.7"; - sha256 = "00n62n13f4w42d3kyc34prycwb9mv7sy8qpc8kk53y8shdix6x5z"; + version = "0.2.8"; + sha256 = "0zb9wgwlyd4lac3ivcm9s49xjx226fiqxnx11rb39fnkyvldw01w"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base bytestring crypton-x509-store crypton-x509-validation data-default-class http2 network network-control network-run recv @@ -168916,15 +169011,15 @@ self: { }) {}; "imp" = callPackage - ({ mkDerivation, base, containers, exceptions, ghc, hspec - , transformers + ({ mkDerivation, base, Cabal-syntax, containers, exceptions, ghc + , hspec, transformers }: mkDerivation { pname = "imp"; - version = "1.0.1.0"; - sha256 = "1isxa5wbr8v9v6amydvhlkwvwsamr0jrw9996n1fj6311vwwh831"; + version = "1.0.2.0"; + sha256 = "1r0z0s6q8xfjyk098w3p1qvs8d8fl6y2mna867j7i8ksvvjm5khd"; libraryHaskellDepends = [ - base containers exceptions ghc transformers + base Cabal-syntax containers exceptions ghc transformers ]; testHaskellDepends = [ base exceptions ghc hspec ]; description = "A GHC plugin for automatically importing modules"; @@ -171261,8 +171356,8 @@ self: { pname = "integer-logarithms"; version = "1.0.3.1"; sha256 = "0zzapclfabc76g8jzsbsqwdllx2zn0gp4raq076ib6v0mfgry2lv"; - revision = "5"; - editedCabalFile = "03f07vv1xqvv53fiarn4rpj2hzsa9bx7lw883axmgzv49qrzq3ad"; + revision = "6"; + editedCabalFile = "146n3p1wzpwk3l675x6sr2qgzbfrnnzfpj2x8am5r74c8mns3585"; libraryHaskellDepends = [ array base ghc-bignum ghc-prim ]; testHaskellDepends = [ base QuickCheck smallcheck tasty tasty-hunit tasty-quickcheck @@ -174712,21 +174807,22 @@ self: { }) {}; "jackpolynomials" = callPackage - ({ mkDerivation, array, base, hspray, hypergeomatrix, ilist, lens - , math-functions, numeric-prelude, tasty, tasty-hunit + ({ mkDerivation, array, base, combinat, containers, hspray + , hypergeomatrix, ilist, lens, numeric-prelude, tasty, tasty-hunit }: mkDerivation { pname = "jackpolynomials"; - version = "1.1.1.0"; - sha256 = "00grr7r2f0jh8vmkv87vhl0h39rbakz8pgbh0s6mmj1k6fi3bkds"; + version = "1.2.0.0"; + sha256 = "159hipi5xqshxlys5rsv1v116njnbbhgfkxhn9s4m4rjd2ng149g"; libraryHaskellDepends = [ - array base hspray ilist lens math-functions numeric-prelude + array base combinat containers hspray ilist lens numeric-prelude ]; testHaskellDepends = [ base hspray hypergeomatrix tasty tasty-hunit ]; - description = "Jack, zonal, and Schur polynomials"; + description = "Jack, zonal, Schur and skew Schur polynomials"; license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; }) {}; "jacobi-elliptic" = callPackage @@ -176224,14 +176320,36 @@ self: { license = lib.licenses.mit; }) {}; + "jsaddle_0_9_9_0" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base-compat + , base64-bytestring, bytestring, containers, deepseq, exceptions + , filepath, ghc-prim, http-types, lens, primitive, process, random + , ref-tf, scientific, stm, text, time, transformers, unliftio-core + , unordered-containers, vector + }: + mkDerivation { + pname = "jsaddle"; + version = "0.9.9.0"; + sha256 = "0vpd76wicdvybbvrj1v28mxkyagrisijfl0821wkv35k0lls4m9a"; + libraryHaskellDepends = [ + aeson attoparsec base base-compat base64-bytestring bytestring + containers deepseq exceptions filepath ghc-prim http-types lens + primitive process random ref-tf scientific stm text time + transformers unliftio-core unordered-containers vector + ]; + description = "Interface for JavaScript that works with GHCJS and GHC"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "jsaddle-clib" = callPackage ({ mkDerivation, aeson, base, base-compat, bytestring, data-default , jsaddle, text }: mkDerivation { pname = "jsaddle-clib"; - version = "0.9.8.3"; - sha256 = "1ss1f7nlmkpby4xfcviq1lmw5x8mvqq5zs406lyp3bksxgkvs6vj"; + version = "0.9.9.0"; + sha256 = "0i2abhhfcg9dy767hx9h6si83syhxpnk7cgihadh2l3l7p4ykbgr"; libraryHaskellDepends = [ aeson base base-compat bytestring data-default jsaddle text ]; @@ -176257,6 +176375,22 @@ self: { license = lib.licenses.mit; }) {}; + "jsaddle-dom_0_9_9_0" = callPackage + ({ mkDerivation, base, base-compat, exceptions, jsaddle, lens, text + , transformers + }: + mkDerivation { + pname = "jsaddle-dom"; + version = "0.9.9.0"; + sha256 = "0jvvxwr7984aizh1n59q2m12y5x3ahy5nwfir47s6q48n4pi0l9z"; + libraryHaskellDepends = [ + base base-compat exceptions jsaddle lens text transformers + ]; + description = "DOM library that uses jsaddle to support both GHCJS and GHC"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "jsaddle-hello" = callPackage ({ mkDerivation, base, Cabal, cabal-macosx, jsaddle, jsaddle-warp , jsaddle-webkit2gtk, lens, text @@ -176286,8 +176420,8 @@ self: { }: mkDerivation { pname = "jsaddle-warp"; - version = "0.9.8.3"; - sha256 = "1hdcaxspazd8yxk6f6a0jcdr3hwwr2xwrmp40qarbklx33b9ajqa"; + version = "0.9.9.0"; + sha256 = "0kl296fw3f1fis4fzq9i4q23r0lgxil9bil2alfwnkv6yixj0mhs"; libraryHaskellDepends = [ aeson base bytestring containers foreign-store http-types jsaddle stm text time transformers wai wai-websockets warp websockets @@ -176322,6 +176456,27 @@ self: { badPlatforms = lib.platforms.darwin; }) {}; + "jsaddle-webkit2gtk_0_9_9_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, directory, gi-gio + , gi-glib, gi-gtk, gi-javascriptcore, gi-webkit2, haskell-gi-base + , haskell-gi-overloading, jsaddle, text, unix + , webkit2gtk3-javascriptcore + }: + mkDerivation { + pname = "jsaddle-webkit2gtk"; + version = "0.9.9.0"; + sha256 = "0b3kl5hm4ssbiga8cjcb30fli15z8sx4x8p5qvpxzlwmzx9zsk9p"; + libraryHaskellDepends = [ + aeson base bytestring directory gi-gio gi-glib gi-gtk + gi-javascriptcore gi-webkit2 haskell-gi-base haskell-gi-overloading + jsaddle text unix webkit2gtk3-javascriptcore + ]; + description = "Interface for JavaScript that works with GHCJS and GHC"; + license = lib.licenses.mit; + badPlatforms = lib.platforms.darwin; + hydraPlatforms = lib.platforms.none; + }) {}; + "jsaddle-webkitgtk" = callPackage ({ mkDerivation, aeson, base, bytestring, directory, gi-glib , gi-gtk, gi-javascriptcore, gi-webkit, haskell-gi-base, jsaddle @@ -176345,8 +176500,8 @@ self: { ({ mkDerivation }: mkDerivation { pname = "jsaddle-wkwebview"; - version = "0.9.8.3"; - sha256 = "0lh613ws0lgrw298p1sbq1jdj1ka5nzn1ijpg2zwwr5wc2g5ha4w"; + version = "0.9.9.0"; + sha256 = "0r8payj72akz951jmv7frllj8cxpwgjyci7gad7250s7nmnd9f1s"; description = "Interface for JavaScript that works with GHCJS and GHC"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; @@ -177111,8 +177266,8 @@ self: { }: mkDerivation { pname = "json-spec"; - version = "0.3.0.0"; - sha256 = "16q6jdv42ayh2j8xvmcc2h7jvi1xgxiyp1ccii2c08a1wv2a262f"; + version = "0.3.0.1"; + sha256 = "1gyg378y7s9yc6vkjgl8zydjpkl86qlywwbs6kvrfip9a3hvj3p7"; libraryHaskellDepends = [ aeson base containers scientific text time vector ]; @@ -177127,21 +177282,17 @@ self: { }) {}; "json-spec-elm" = callPackage - ({ mkDerivation, base, bound, containers, directory, elm-syntax - , hspec, json-spec, mtl, prettyprinter, process, text - , unordered-containers + ({ mkDerivation, base, bound, containers, elm-syntax, json-spec + , mtl, text }: mkDerivation { pname = "json-spec-elm"; - version = "0.4.0.0"; - sha256 = "0kybrnri951ql6vlrv09hzi63gc6yb27a62p62243y2pj131hbjy"; + version = "0.4.0.1"; + sha256 = "0gqlkb3zbkb46lf2bqa65ikj231qyi7kq59hys6vv3y13w3yq2ck"; libraryHaskellDepends = [ base bound containers elm-syntax json-spec mtl text ]; - testHaskellDepends = [ - base containers directory elm-syntax hspec json-spec prettyprinter - process text unordered-containers - ]; + testHaskellDepends = [ base containers elm-syntax json-spec text ]; description = "Elm code generate for `json-spec`"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; @@ -177155,8 +177306,8 @@ self: { }: mkDerivation { pname = "json-spec-elm-servant"; - version = "0.4.0.0"; - sha256 = "1lg9wm3b148i8rdkv5ypd0wm6vvjkcvxw1cy7m7wfbm5vdjns0qm"; + version = "0.4.0.1"; + sha256 = "0smg0sx4mybfqycz99xpax3ia5qiwa17p14k87xmp793m6yyj2iq"; libraryHaskellDepends = [ base bound containers elm-syntax http-types json-spec json-spec-elm mtl servant text @@ -178505,6 +178656,8 @@ self: { ]; description = "Serialization for kafka wire protocol"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "kaleidoscope" = callPackage @@ -180849,6 +181002,7 @@ self: { description = "Advanced keyboard remapping utility"; license = lib.licenses.mit; mainProgram = "kmonad"; + maintainers = [ lib.maintainers.slotThe ]; }) {}; "kmp-dfa" = callPackage @@ -184190,21 +184344,22 @@ self: { }) {}; "language-thrift" = callPackage - ({ mkDerivation, ansi-wl-pprint, base, containers, hspec - , hspec-discover, megaparsec, QuickCheck, scientific, semigroups - , text, transformers + ({ mkDerivation, base, containers, hspec, hspec-discover + , megaparsec, prettyprinter-compat-ansi-wl-pprint, QuickCheck + , scientific, semigroups, text, transformers }: mkDerivation { pname = "language-thrift"; - version = "0.12.0.1"; - sha256 = "1cn92cf60j34ybchgg0zyc3nzy1iw6mz69cn16y28pkaymaz5lrn"; + version = "0.13.0.0"; + sha256 = "0v34xzd73mmvzjxq7vhdz79wrp6q082f7klyc9gr6p3g0ny7jl4m"; libraryHaskellDepends = [ - ansi-wl-pprint base containers megaparsec scientific semigroups - text transformers + base containers megaparsec prettyprinter-compat-ansi-wl-pprint + scientific semigroups text transformers ]; testHaskellDepends = [ - ansi-wl-pprint base containers hspec megaparsec QuickCheck - scientific semigroups text transformers + base containers hspec megaparsec + prettyprinter-compat-ansi-wl-pprint QuickCheck scientific + semigroups text transformers ]; testToolDepends = [ hspec-discover ]; description = "Parser and pretty printer for the Thrift IDL format"; @@ -186194,8 +186349,8 @@ self: { pname = "lens"; version = "5.2.3"; sha256 = "0kcr1dqvnjmi05yd9m9ylipk5210jwd7d00c9scq9n49vnl8q7nz"; - revision = "3"; - editedCabalFile = "18mz3d7m8yb1fpxvkkwm1vwf2q67as5pz348i56c4xxfzhqhxdrj"; + revision = "4"; + editedCabalFile = "0j0ga11zqgj19nsk9nyd6l23chdixc5cd2v7vgjj7flwy5vc97kn"; libraryHaskellDepends = [ array assoc base base-orphans bifunctors bytestring call-stack comonad containers contravariant distributive exceptions filepath @@ -190167,10 +190322,12 @@ self: { pname = "liquid-base"; version = "4.15.1.0"; sha256 = "0mzv7l1w54wvwcqzy94kwlf6srh4vg1fi4lddm19ysrvfrw7r0pc"; + revision = "1"; + editedCabalFile = "0n6xdqmq9x8r63yj05f7g7rcm8k0z6kj5p7y9kpxy7yfm28ndm9d"; enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal liquidhaskell ]; libraryHaskellDepends = [ base liquid-ghc-prim liquidhaskell ]; - description = "Drop-in base replacement for LiquidHaskell"; + description = "base specs for LiquidHaskell"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; }) {}; @@ -190183,10 +190340,12 @@ self: { pname = "liquid-bytestring"; version = "0.10.12.1"; sha256 = "0zzcbpsli9bcf94z42lg1yg1bkaa09vgpcbak0fq4fm9ws12yisf"; + revision = "1"; + editedCabalFile = "02gagira72jhx1nbs3k4wlwmgigc1s05f9v540134fr83rd9i3rm"; enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal liquidhaskell ]; libraryHaskellDepends = [ bytestring liquid-base liquidhaskell ]; - description = "LiquidHaskell specs for the bytestring package"; + description = "Old specs for the bytestring package"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; }) {}; @@ -190199,10 +190358,12 @@ self: { pname = "liquid-containers"; version = "0.6.4.1"; sha256 = "0529qxvmipw6yd6v1p9vgkbk9al9cqcbwp71zzaxg9y22kkxly6a"; + revision = "2"; + editedCabalFile = "0bb3cbh6gp51d2fnaxn9lyirymqg6c3rj49c9532zw6bbsj8nx0b"; enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal liquidhaskell ]; libraryHaskellDepends = [ containers liquid-base liquidhaskell ]; - description = "LiquidHaskell specs for the containers package"; + description = "Old specs for containers"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; }) {}; @@ -190256,10 +190417,12 @@ self: { pname = "liquid-ghc-prim"; version = "0.7.0.1"; sha256 = "1a9k21krk2b32cmw6b193794wsh5kmpb3d0bvrrkyl0pbvz5jrg2"; + revision = "1"; + editedCabalFile = "0kmjrdh62cs1lhpvjv4w3a2adll04rlfrvvdgya6kwdgmj513jcw"; enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal liquidhaskell ]; libraryHaskellDepends = [ ghc-prim liquidhaskell ]; - description = "Drop-in ghc-prim replacement for LiquidHaskell"; + description = "Drop-in ghc-prim replacement for LH"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; }) {}; @@ -191237,21 +191400,22 @@ self: { }) {}; "llvm-dsl" = callPackage - ({ mkDerivation, base, bool8, llvm-extra, llvm-tf, numeric-prelude - , prelude-compat, storable-enum, storable-record, tfp, transformers - , unsafe, utility-ht, vault + ({ mkDerivation, base, bool8, doctest-exitcode-stdio, llvm-extra + , llvm-tf, numeric-prelude, prelude-compat, storable-enum + , storable-record, tfp, transformers, unsafe, utility-ht, vault }: mkDerivation { pname = "llvm-dsl"; - version = "0.1.1"; - sha256 = "15ad2kv7d4hr732zlxk6f2faw76xavaynpi2d18kch41x1giivxv"; - revision = "1"; - editedCabalFile = "0iq6v0z6g7lzg8pnijanphcj51fhbvishs5vzylhjvhjikfcv9lc"; + version = "0.1.2"; + sha256 = "1ynldbzdlr5i08174s85nzi8iwaic0zr10x8zccvl127d9d3264q"; libraryHaskellDepends = [ base bool8 llvm-extra llvm-tf numeric-prelude prelude-compat storable-enum storable-record tfp transformers unsafe utility-ht vault ]; + testHaskellDepends = [ + base doctest-exitcode-stdio llvm-extra llvm-tf tfp transformers + ]; description = "Support for writing an EDSL with LLVM-JIT as target"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -191284,8 +191448,8 @@ self: { }: mkDerivation { pname = "llvm-extra"; - version = "0.12"; - sha256 = "0syd18037lg1g1yg4nk5pmmwwzgxzrlgg9jzli47q5v346dk0mv6"; + version = "0.12.0.1"; + sha256 = "1sx5nrf2mpq27cjja81i8fgp487j4pn4wxdhp1y4gksk736nza5i"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -192744,6 +192908,8 @@ self: { pname = "logict"; version = "0.8.1.0"; sha256 = "04xqwfbvh5gfjwbvmadbakq0932gskh2gy68aw7251443ic4gp6k"; + revision = "1"; + editedCabalFile = "0ckbljn4rcvbnni6ldn6wd5p4c6y6dx5ixc8hg2i9a7irllgifr9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base mtl transformers ]; @@ -193828,8 +193994,8 @@ self: { }: mkDerivation { pname = "lsp-client"; - version = "0.2.0.0"; - sha256 = "0wh9qjcck2pdya5dpz8k6k9x49a543j4p3vjvscd4bk0vzk76rc0"; + version = "0.3.0.0"; + sha256 = "0d5d0rzscq9gc4jnl02584908g50mrqgxs3b6nly6wfpjaprklsd"; libraryHaskellDepends = [ aeson aeson-pretty base bytestring co-log-core containers data-default dependent-map Diff directory extra filepath @@ -194018,7 +194184,9 @@ self: { ]; description = "Parameterized file evaluator"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "ltext"; + broken = true; }) {}; "lti13" = callPackage @@ -197680,29 +197848,6 @@ self: { }: mkDerivation { pname = "math-functions"; - version = "0.3.4.3"; - sha256 = "0ri9vf9bcs4q8bj9451sjc4q5cfxc8bcjjx6wqgsdk3yx2sxb1jd"; - libraryHaskellDepends = [ - base data-default-class deepseq primitive vector - ]; - testHaskellDepends = [ - base data-default-class deepseq erf primitive QuickCheck tasty - tasty-hunit tasty-quickcheck vector vector-th-unbox - ]; - benchmarkHaskellDepends = [ - base data-default-class random tasty-bench vector - ]; - description = "Collection of tools for numeric computations"; - license = lib.licenses.bsd2; - }) {}; - - "math-functions_0_3_4_4" = callPackage - ({ mkDerivation, base, data-default-class, deepseq, erf, primitive - , QuickCheck, random, tasty, tasty-bench, tasty-hunit - , tasty-quickcheck, vector, vector-th-unbox - }: - mkDerivation { - pname = "math-functions"; version = "0.3.4.4"; sha256 = "1ypqza0v1qbm94yjj536ynh7njlcz36s1cj8c0slbx7ga3fxhh94"; libraryHaskellDepends = [ @@ -197717,7 +197862,6 @@ self: { ]; description = "Collection of tools for numeric computations"; license = lib.licenses.bsd2; - hydraPlatforms = lib.platforms.none; }) {}; "math-grads" = callPackage @@ -199176,25 +199320,6 @@ self: { }: mkDerivation { pname = "mega-sdist"; - version = "0.4.3.0"; - sha256 = "0bv490zs2a25r0kwb7kqmami3xfxmjg9fqb1j4azn7jyf14jg367"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - aeson base bytestring optparse-simple pantry path path-io rio - rio-orphans yaml - ]; - description = "Handles uploading to Hackage from mega repos"; - license = lib.licenses.mit; - mainProgram = "mega-sdist"; - }) {}; - - "mega-sdist_0_4_3_1" = callPackage - ({ mkDerivation, aeson, base, bytestring, optparse-simple, pantry - , path, path-io, rio, rio-orphans, yaml - }: - mkDerivation { - pname = "mega-sdist"; version = "0.4.3.1"; sha256 = "0rdwdig9wx5jwz5w0v5gg60fhcfgnhfzllcamfp63sfqkhz6awd6"; isLibrary = false; @@ -199205,7 +199330,6 @@ self: { ]; description = "Handles uploading to Hackage from mega repos"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; mainProgram = "mega-sdist"; }) {}; @@ -199548,27 +199672,6 @@ self: { }: mkDerivation { pname = "memcache"; - version = "0.3.0.1"; - sha256 = "0sbfzmdq0rqzrvrjk7yzkn0mfadbz3dxj1d9n8f3s9mz3s8bv328"; - libraryHaskellDepends = [ - base binary blaze-builder bytestring data-default-class hashable - network resource-pool time vector - ]; - testHaskellDepends = [ - base binary blaze-builder bytestring network - ]; - benchmarkHaskellDepends = [ base bytestring criterion ]; - description = "A memcached client library"; - license = lib.licenses.bsd3; - }) {}; - - "memcache_0_3_0_2" = callPackage - ({ mkDerivation, base, binary, blaze-builder, bytestring, criterion - , data-default-class, hashable, network, resource-pool, time - , vector - }: - mkDerivation { - pname = "memcache"; version = "0.3.0.2"; sha256 = "1gzjcl6hy2kj9rh97vasbfjc7j1vwrfhpr3r8p3wzbxd13rfbw46"; libraryHaskellDepends = [ @@ -199581,7 +199684,6 @@ self: { benchmarkHaskellDepends = [ base bytestring criterion ]; description = "A memcached client library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "memcache-conduit" = callPackage @@ -201490,8 +201592,8 @@ self: { }: mkDerivation { pname = "mighttpd2"; - version = "4.0.5"; - sha256 = "0zi3d2af31h6mvymmh7fwa2d2lwir642jzdisvgnm9yfhsavd39v"; + version = "4.0.6"; + sha256 = "1viyk6rwlswsj8rky8i9mnh1qh0fw2q1r4mzlbs96608xm2p460k"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -202281,19 +202383,19 @@ self: { }) {}; "minizinc-process" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bytestring, containers - , directory, hashable, hedgehog, hspec, hspec-hedgehog, process - , process-extras, template-haskell, text + ({ mkDerivation, aeson, attoparsec, attoparsec-aeson, base + , bytestring, containers, directory, hashable, hedgehog, hspec + , hspec-hedgehog, process, process-extras, template-haskell, text }: mkDerivation { pname = "minizinc-process"; - version = "0.1.4.1"; - sha256 = "0sihpmjzda7kph8mds4p4fn4pgbiay6v680pcqv2d116a5di2c5g"; + version = "0.1.5.0"; + sha256 = "02xmmpkhhcvmns2l8rgbmp0qr2p8fyps2zkfx74v62r5bcv5g6ac"; revision = "1"; - editedCabalFile = "09h0brd6zhfdz8y780xiqxzs78fcclwljh9r2xiw60wcigasa15j"; + editedCabalFile = "1pq4mkckfb14m8dyl4vfyifdn9diq3n6v34c234w7jfp843cp006"; libraryHaskellDepends = [ - aeson attoparsec base bytestring containers directory hashable - process process-extras template-haskell text + aeson attoparsec attoparsec-aeson base bytestring containers + directory hashable process process-extras template-haskell text ]; testHaskellDepends = [ aeson base hashable hedgehog hspec hspec-hedgehog @@ -213990,6 +214092,22 @@ self: { license = lib.licenses.bsd3; }) {}; + "network-control_0_1_0" = callPackage + ({ mkDerivation, base, hspec, hspec-discover, pretty-simple + , psqueues, QuickCheck, text, unix-time + }: + mkDerivation { + pname = "network-control"; + version = "0.1.0"; + sha256 = "0bvkjid0nqhc15f5nn4za6xwvcc5x8hxfbwky0m2zqdyzwd9bmlp"; + libraryHaskellDepends = [ base psqueues unix-time ]; + testHaskellDepends = [ base hspec pretty-simple QuickCheck text ]; + testToolDepends = [ hspec-discover ]; + description = "Library to control network protocols"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "network-data" = callPackage ({ mkDerivation, base, bytestring, cereal, pretty }: mkDerivation { @@ -215412,8 +215530,8 @@ self: { }: mkDerivation { pname = "ngx-export-distribution"; - version = "0.5.1.3"; - sha256 = "008i34viq8cw36r46qvnwvhn13y2srpxia7r3n9bk0sjxfz6ia7a"; + version = "0.5.3.0"; + sha256 = "1dfjvzw65q6fjzdwisr6rbwfwcp4d36k56pn3vp7i86z9vn2syqx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base Cabal directory filepath ]; @@ -215421,7 +215539,7 @@ self: { ansi-terminal base Cabal cabal-plan containers directory filepath parsec text ]; - description = "Build custom libraries for Nginx haskell module"; + description = "Build custom libraries for Nginx Haskell module"; license = lib.licenses.bsd3; mainProgram = "nhm-tool"; }) {}; @@ -216067,8 +216185,8 @@ self: { }: mkDerivation { pname = "nix-tree"; - version = "0.4.0"; - sha256 = "01dfrny4y51gilysj3k46fi1zpxjal2ygr7d5zf6bvc4rw0awk6d"; + version = "0.4.1"; + sha256 = "1w8fg872fw40r346vkkqffahplmyly792ygcbqq0czapwhl0wbvv"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -216227,6 +216345,27 @@ self: { broken = true; }) {}; + "nkeys" = callPackage + ({ mkDerivation, base, base32, binary, bytestring, ed25519, HUnit + , text, vector + }: + mkDerivation { + pname = "nkeys"; + version = "0.0.1.1"; + sha256 = "0m13xgm6303sqh2r12h630r4lhb0ndd2171091hpd94b06sqgcl0"; + isLibrary = false; + isExecutable = false; + libraryHaskellDepends = [ + base base32 binary bytestring ed25519 text vector + ]; + testHaskellDepends = [ base base32 bytestring ed25519 HUnit text ]; + doHaddock = false; + description = "Nkeys ed25519 encoding for use with NATS"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "nkjp" = callPackage ({ mkDerivation, base, bytestring, containers, data-named, filepath , polysoup, tar, text, zlib @@ -219753,6 +219892,8 @@ self: { ]; description = "Ogma: Runtime Monitor translator: JSON Frontend"; license = "unknown"; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "ogma-language-smv" = callPackage @@ -220163,10 +220304,8 @@ self: { ({ mkDerivation, base, containers, ghc, safe }: mkDerivation { pname = "om-plugin-imports"; - version = "0.2.0.0"; - sha256 = "0slklr71ydis12mdjrs8p8s2aff2xgr6xjf78ddw4zj5fisg4s92"; - revision = "1"; - editedCabalFile = "0rvllrq6bm08kpn641b4fh33y3ybbhpii96z5y23jykzw1xjlsbv"; + version = "0.2.0.0.9.6"; + sha256 = "1whwipj1dqka4dhjigcmq4c74gv0r6y5y5px8m3fp08v62dbvbf2"; libraryHaskellDepends = [ base containers ghc safe ]; description = "Plugin-based import warnings"; license = lib.licenses.mit; @@ -220379,8 +220518,8 @@ self: { ({ mkDerivation, base, containers, parsec, tagsoup }: mkDerivation { pname = "onama"; - version = "0.2.2.0"; - sha256 = "09knyhswd0jgiwx1p1qra1hppnkny7yqjrzmqspxdxjhl0zs91fz"; + version = "0.2.3.0"; + sha256 = "1gmyh7hh5021kb1dzs6a4r2rzgyanbar4svx311ixnh02pajqjjx"; libraryHaskellDepends = [ base containers parsec tagsoup ]; description = "HTML-parsing primitives for Parsec"; license = lib.licenses.bsd3; @@ -220654,6 +220793,8 @@ self: { ]; description = "Functions of the type `a -> a -> b`"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "opaleye" = callPackage @@ -220666,35 +220807,6 @@ self: { }: mkDerivation { pname = "opaleye"; - version = "0.10.2.1"; - sha256 = "0n6z93a9j5qcr39m1y4fdff3mfnc7bxcx74xw7cnb228b23a6gx1"; - libraryHaskellDepends = [ - aeson base base16-bytestring bytestring case-insensitive - contravariant postgresql-simple pretty product-profunctors - profunctors scientific semigroups text time-compat - time-locale-compat transformers uuid void - ]; - testHaskellDepends = [ - aeson base bytestring containers contravariant dotenv hspec - hspec-discover multiset postgresql-simple product-profunctors - profunctors QuickCheck semigroups text time time-compat - transformers uuid - ]; - testToolDepends = [ hspec-discover ]; - description = "An SQL-generating DSL targeting PostgreSQL"; - license = lib.licenses.bsd3; - }) {}; - - "opaleye_0_10_2_3" = callPackage - ({ mkDerivation, aeson, base, base16-bytestring, bytestring - , case-insensitive, containers, contravariant, dotenv, hspec - , hspec-discover, multiset, postgresql-simple, pretty - , product-profunctors, profunctors, QuickCheck, scientific - , semigroups, text, time, time-compat, time-locale-compat - , transformers, uuid, void - }: - mkDerivation { - pname = "opaleye"; version = "0.10.2.3"; sha256 = "1cbd6d5gp438bi3w2ml7lba6rjjykyxpc5dp5ph0n67pbvbzd66d"; libraryHaskellDepends = [ @@ -220712,7 +220824,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "An SQL-generating DSL targeting PostgreSQL"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "opaleye-classy" = callPackage @@ -224724,8 +224835,8 @@ self: { }: mkDerivation { pname = "pagerduty-hs"; - version = "0.2.0.0"; - sha256 = "0znjxcf4a6x71sfykmgdx4zlmdghc864yis6rl5q7y85qq9s324i"; + version = "0.3.0.0"; + sha256 = "14f359mrxay1kh0gfv7j628srqbn9na6rlzdbbx0mzv116n2v16d"; libraryHaskellDepends = [ aeson base exceptions lens text wreq ]; testHaskellDepends = [ aeson base exceptions HUnit lens tasty tasty-hunit tasty-quickcheck @@ -224978,7 +225089,7 @@ self: { ]; }) {}; - "pandoc_3_1_12_3" = callPackage + "pandoc_3_1_13" = callPackage ({ mkDerivation, aeson, aeson-pretty, array, attoparsec, base , base64-bytestring, binary, blaze-html, blaze-markup, bytestring , case-insensitive, citeproc, commonmark, commonmark-extensions @@ -224997,8 +225108,8 @@ self: { }: mkDerivation { pname = "pandoc"; - version = "3.1.12.3"; - sha256 = "0qfgfjvrk4y6yvh8yv4kl9w81xvrlcz4prz8vr17rasnli7k561r"; + version = "3.1.13"; + sha256 = "1l3mlqhwvma6q3dam41xik8waw6ri578q5lc8n9js2yg3kpnq5sr"; configureFlags = [ "-f-trypandoc" ]; enableSeparateDataOutput = true; libraryHaskellDepends = [ @@ -225120,14 +225231,14 @@ self: { maintainers = [ lib.maintainers.maralorn ]; }) {}; - "pandoc-cli_3_1_12_3" = callPackage + "pandoc-cli_3_1_13" = callPackage ({ mkDerivation, base, hslua-cli, pandoc, pandoc-lua-engine , pandoc-server, safe, temporary, text, wai-extra, warp }: mkDerivation { pname = "pandoc-cli"; - version = "3.1.12.3"; - sha256 = "19b0ybqmwffimyyx9amvcyv71myv09z4lja3g5qlna42bd6wfqfn"; + version = "3.1.13"; + sha256 = "0809x6338hcm5lih3y7rjq9pzx4pp567qdhp4w6nx9lyxg56i65g"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -225508,7 +225619,7 @@ self: { license = lib.licenses.gpl2Plus; }) {}; - "pandoc-lua-engine_0_2_1_3" = callPackage + "pandoc-lua-engine_0_2_1_4" = callPackage ({ mkDerivation, aeson, base, bytestring, citeproc, containers , data-default, directory, doclayout, doctemplates, exceptions , filepath, hslua, hslua-module-doclayout, hslua-module-path @@ -225519,8 +225630,8 @@ self: { }: mkDerivation { pname = "pandoc-lua-engine"; - version = "0.2.1.3"; - sha256 = "1hmqjz4if85pl7fsg224mf01131ddl0zkgmhq9inm782pajzhdmg"; + version = "0.2.1.4"; + sha256 = "1r288fyqqqcfz3qam3rii2pjyy37ny1bfcpd1c31gp06mhy8yiwx"; libraryHaskellDepends = [ aeson base bytestring citeproc containers data-default doclayout doctemplates exceptions hslua hslua-module-doclayout @@ -225544,28 +225655,6 @@ self: { }: mkDerivation { pname = "pandoc-lua-marshal"; - version = "0.2.5"; - sha256 = "0wzbxwy7wzrlq45agxwd0ifihqwjpz6307ij4s4zqplh7y16n9mi"; - libraryHaskellDepends = [ - aeson base bytestring containers exceptions hslua hslua-list - hslua-marshalling pandoc-types safe text - ]; - testHaskellDepends = [ - aeson base bytestring containers exceptions hslua hslua-list - hslua-marshalling pandoc-types QuickCheck safe tasty tasty-hunit - tasty-lua tasty-quickcheck text - ]; - description = "Use pandoc types in Lua"; - license = lib.licenses.mit; - }) {}; - - "pandoc-lua-marshal_0_2_6" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, exceptions - , hslua, hslua-list, hslua-marshalling, pandoc-types, QuickCheck - , safe, tasty, tasty-hunit, tasty-lua, tasty-quickcheck, text - }: - mkDerivation { - pname = "pandoc-lua-marshal"; version = "0.2.6"; sha256 = "029wqihgkcdfyy21pdc4gj8hh2av9c29nypcabxch8bfkz6lq0lw"; libraryHaskellDepends = [ @@ -225579,7 +225668,6 @@ self: { ]; description = "Use pandoc types in Lua"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "pandoc-markdown-ghci-filter" = callPackage @@ -226791,8 +226879,8 @@ self: { pname = "parallel"; version = "3.2.2.0"; sha256 = "1xkfi96w6yfpppd0nw1rnszdxmvifwzm699ilv6332ra3akm610p"; - revision = "7"; - editedCabalFile = "192gkkmr47vfqbb9yal9q38ps0v1wgkji7d6ykpjd4gyk1p414xr"; + revision = "8"; + editedCabalFile = "0c9ychx28pzxdmfz3d3l170zdwd180galkbs901za5pzzl3hpkxr"; libraryHaskellDepends = [ array base containers deepseq ghc-prim ]; description = "Parallel programming library"; license = lib.licenses.bsd3; @@ -227246,6 +227334,8 @@ self: { pname = "parsec"; version = "3.1.17.0"; sha256 = "0dlx2ypfbbddlv75m9axirxb30srb9kzvpa3haf88g7cq6z01iaq"; + revision = "1"; + editedCabalFile = "0mlbcjdfrazqar46aphawzmkr8dcyz91p2gqzyh41xnp53acn1w4"; libraryHaskellDepends = [ base bytestring mtl text ]; testHaskellDepends = [ base deepseq mtl tasty tasty-hunit ]; description = "Monadic parser combinators"; @@ -230731,6 +230821,7 @@ self: { ]; description = "Persistent based event sourcing"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "persistent-eventsource" = callPackage @@ -230752,6 +230843,7 @@ self: { ]; description = "Persistent based event sourcing"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "persistent-generic" = callPackage @@ -230917,6 +231009,8 @@ self: { testToolDepends = [ tasty-autocollect ]; description = "Monad transformer for the persistent API"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "persistent-mysql" = callPackage @@ -231996,15 +232090,17 @@ self: { ]; description = "Toolkit for self-documenting password hash and key derivation functions"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "phladiprelio-general-datatype" = callPackage - ({ mkDerivation, base, containers }: + ({ mkDerivation, base, containers, quantizer }: mkDerivation { pname = "phladiprelio-general-datatype"; - version = "0.7.0.0"; - sha256 = "0m67xx2kd0fala287qvqr8hbkiarcs04ayvw9jdlby18za8abh2g"; - libraryHaskellDepends = [ base containers ]; + version = "0.10.1.0"; + sha256 = "1nll9p9bczqyrkppxfnjn0lvn215i48xi2555ibnks0hp0mkky10"; + libraryHaskellDepends = [ base containers quantizer ]; description = "Extended functionality of PhLADiPreLiO"; license = lib.licenses.mit; }) {}; @@ -232023,8 +232119,8 @@ self: { }) {}; "phladiprelio-general-simple" = callPackage - ({ mkDerivation, async, base, cli-arguments, directory, halfsplit - , minmax, phladiprelio-general-datatype + ({ mkDerivation, async, base, cli-arguments, deepseq, directory + , halfsplit, minmax, phladiprelio-general-datatype , phladiprelio-general-shared, phladiprelio-tests , phonetic-languages-basis, phonetic-languages-constraints-array , phonetic-languages-permutations-array @@ -232034,10 +232130,10 @@ self: { }: mkDerivation { pname = "phladiprelio-general-simple"; - version = "0.15.0.0"; - sha256 = "1d4zsa1lhxwhsl8kns8d0r13pd1v9z9516h74a317j6vb26zqx1q"; + version = "0.20.0.1"; + sha256 = "0rc7di62zcbssl21pa109k9klxkc44ihz12sdlzwq3hg3hrmnrsv"; libraryHaskellDepends = [ - async base cli-arguments directory halfsplit minmax + async base cli-arguments deepseq directory halfsplit minmax phladiprelio-general-datatype phladiprelio-general-shared phladiprelio-tests phonetic-languages-basis phonetic-languages-constraints-array @@ -232074,22 +232170,23 @@ self: { "phladiprelio-ukrainian-shared" = callPackage ({ mkDerivation, base, directory, mmsyn2-array - , ukrainian-phonetics-basic-array + , phladiprelio-general-datatype, ukrainian-phonetics-basic-array }: mkDerivation { pname = "phladiprelio-ukrainian-shared"; - version = "0.1.1.0"; - sha256 = "05jgydwz0mc8n1h04dzk8azcc3clyyw2akjgxjh43l6dia33r4xm"; + version = "0.5.0.2"; + sha256 = "16jrf8m96sn8897rwm7q2iln7i3kvqadznin9yn9adsr6mfhb2fi"; libraryHaskellDepends = [ - base directory mmsyn2-array ukrainian-phonetics-basic-array + base directory mmsyn2-array phladiprelio-general-datatype + ukrainian-phonetics-basic-array ]; description = "A shared by different Ukrainian implementations of the PhLADiPreLiO functionality"; license = lib.licenses.mit; }) {}; "phladiprelio-ukrainian-simple" = callPackage - ({ mkDerivation, async, base, cli-arguments, directory, halfsplit - , minmax, mmsyn2-array, phladiprelio-general-datatype + ({ mkDerivation, async, base, cli-arguments, deepseq, directory + , halfsplit, minmax, mmsyn2-array, phladiprelio-general-datatype , phladiprelio-tests, phladiprelio-ukrainian-shared , phonetic-languages-basis, phonetic-languages-constraints-array , phonetic-languages-permutations-array @@ -232099,13 +232196,13 @@ self: { }: mkDerivation { pname = "phladiprelio-ukrainian-simple"; - version = "0.16.0.0"; - sha256 = "0h629wlm10rjprdnhwdl42dw74g4a5wn5c49md0p8iwkjk8qmn22"; + version = "0.20.2.1"; + sha256 = "1jlx3dffra7cs263bg1mgvbi1kzw15dy98jiysxb906ivwd5vnfd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - async base cli-arguments directory halfsplit minmax mmsyn2-array - phladiprelio-general-datatype phladiprelio-tests + async base cli-arguments deepseq directory halfsplit minmax + mmsyn2-array phladiprelio-general-datatype phladiprelio-tests phladiprelio-ukrainian-shared phonetic-languages-basis phonetic-languages-constraints-array phonetic-languages-permutations-array @@ -232114,8 +232211,8 @@ self: { rhythmic-sequences ukrainian-phonetics-basic-array ]; executableHaskellDepends = [ - async base cli-arguments directory halfsplit minmax mmsyn2-array - phladiprelio-general-datatype phladiprelio-tests + async base cli-arguments deepseq directory halfsplit minmax + mmsyn2-array phladiprelio-general-datatype phladiprelio-tests phladiprelio-ukrainian-shared phonetic-languages-basis phonetic-languages-constraints-array phonetic-languages-permutations-array @@ -235465,6 +235562,8 @@ self: { libraryHaskellDepends = [ base ]; description = "A semi-cross-platform interface for pledge(2) and unveil(2)"; license = lib.licenses.unlicense; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "plex" = callPackage @@ -237654,6 +237753,8 @@ self: { testToolDepends = [ hspec-discover ]; description = "Experimental, user-contributed effects and interpreters for polysemy"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "polyseq" = callPackage @@ -238864,8 +238965,8 @@ self: { }: mkDerivation { pname = "postgres-options"; - version = "0.2.1.0"; - sha256 = "0vck8hv2yry7yvvyg4gps17b0h1dfgjiv9zzl2fc9gks8ksarcha"; + version = "0.2.2.0"; + sha256 = "0fmzpx464a04s2ylsg8yq0psfiapgg4bh708kxjrb1mjywi05mv5"; libraryHaskellDepends = [ base bytestring generic-monoid split uri-bytestring ]; @@ -243643,8 +243744,8 @@ self: { }: mkDerivation { pname = "prometheus-proc"; - version = "0.1.5.0"; - sha256 = "0kk96ph9xrr9gqd83rbmgsy6dpx05gg9jz145iv90d225rqb23qf"; + version = "0.1.6.0"; + sha256 = "0rpbpyl1gy08cbcb3d1sdkpvva7jmr8pwbcp0xmdm9k3xh1pj2ng"; libraryHaskellDepends = [ base directory filepath prometheus-client regex-applicative text unix unix-memory @@ -244096,6 +244197,28 @@ self: { license = lib.licenses.bsd3; }) {}; + "proto-lens_0_7_1_5" = callPackage + ({ mkDerivation, base, bytestring, containers, deepseq, ghc-prim + , lens-family, parsec, pretty, primitive, profunctors, QuickCheck + , tagged, tasty, tasty-quickcheck, text, transformers, vector + }: + mkDerivation { + pname = "proto-lens"; + version = "0.7.1.5"; + sha256 = "042wn6dw4jg0j9gfp4pgzm86j3hq0vkv02rlnp77v13b87q75lfs"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base bytestring containers deepseq ghc-prim lens-family parsec + pretty primitive profunctors tagged text transformers vector + ]; + testHaskellDepends = [ + base bytestring QuickCheck tasty tasty-quickcheck vector + ]; + description = "A lens-based implementation of protocol buffers in Haskell"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "proto-lens-arbitrary" = callPackage ({ mkDerivation, base, bytestring, containers, lens-family , proto-lens, QuickCheck, text @@ -244113,6 +244236,23 @@ self: { broken = true; }) {}; + "proto-lens-arbitrary_0_1_2_13" = callPackage + ({ mkDerivation, base, bytestring, containers, lens-family + , proto-lens, QuickCheck, text + }: + mkDerivation { + pname = "proto-lens-arbitrary"; + version = "0.1.2.13"; + sha256 = "015zdynzvlnix6ac6cr3yf8dyn6makv5iachc8djdghgcj5lmdr5"; + libraryHaskellDepends = [ + base bytestring containers lens-family proto-lens QuickCheck text + ]; + description = "Arbitrary instances for proto-lens"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "proto-lens-combinators" = callPackage ({ mkDerivation, base, Cabal, HUnit, lens-family, lens-family-core , proto-lens, proto-lens-runtime, proto-lens-setup, test-framework @@ -244182,6 +244322,20 @@ self: { license = lib.licenses.bsd3; }) {}; + "proto-lens-optparse_0_1_1_12" = callPackage + ({ mkDerivation, base, optparse-applicative, proto-lens, text }: + mkDerivation { + pname = "proto-lens-optparse"; + version = "0.1.1.12"; + sha256 = "09j01nafh03942v1n6y1lw2vp7s1zdqyy7rz9xrbv6klv95ixhkl"; + libraryHaskellDepends = [ + base optparse-applicative proto-lens text + ]; + description = "Adapting proto-lens to optparse-applicative ReadMs"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "proto-lens-protobuf-types" = callPackage ({ mkDerivation, base, Cabal, lens-family, proto-lens , proto-lens-protoc, proto-lens-runtime, proto-lens-setup, protobuf @@ -244189,8 +244343,8 @@ self: { }: mkDerivation { pname = "proto-lens-protobuf-types"; - version = "0.7.2.0"; - sha256 = "0500rwh5rmxyd49ah6nca5d7m9vbib9vmggyi1ybd0n36fcm7wzy"; + version = "0.7.2.1"; + sha256 = "0622dfxc7s260fhb2hcjis5p0k7cidr7vvxicmhhk2n3zamngvrb"; setupHaskellDepends = [ base Cabal proto-lens-setup ]; libraryHaskellDepends = [ base lens-family proto-lens proto-lens-runtime text @@ -244207,8 +244361,8 @@ self: { }: mkDerivation { pname = "proto-lens-protoc"; - version = "0.8.0.0"; - sha256 = "09cx1q6p9phg2gk2hh4wb54cl1h1vn7z34h1n62bpixj87954flj"; + version = "0.8.0.1"; + sha256 = "0kyvcmvsjrj6mwi71k1rfpzvxjy379yb981fj8nacgv5ka1xmja6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base filepath ]; @@ -244238,14 +244392,31 @@ self: { license = lib.licenses.bsd3; }) {}; + "proto-lens-runtime_0_7_0_6" = callPackage + ({ mkDerivation, base, bytestring, containers, deepseq, filepath + , lens-family, proto-lens, text, vector + }: + mkDerivation { + pname = "proto-lens-runtime"; + version = "0.7.0.6"; + sha256 = "0qq1hdjq5y0r9gprlwwqvvvsyb0w4wm1q7acqc1mxywiyb7nvr18"; + libraryHaskellDepends = [ + base bytestring containers deepseq filepath lens-family proto-lens + text vector + ]; + doHaddock = false; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "proto-lens-setup" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, deepseq , directory, filepath, process, proto-lens-protoc, temporary, text }: mkDerivation { pname = "proto-lens-setup"; - version = "0.4.0.7"; - sha256 = "0d3j1pxyj0sy65y3ydxc0s8dz5kl9qw2n83pkmy8zzxa171h8lgm"; + version = "0.4.0.8"; + sha256 = "1g7fsmxfqpfnyaldxmhiq8i2vndnz5br70c1zplp0dvxp3kfynna"; libraryHaskellDepends = [ base bytestring Cabal containers deepseq directory filepath process proto-lens-protoc temporary text @@ -247167,13 +247338,15 @@ self: { }) {}; "quantizer" = callPackage - ({ mkDerivation, base, subG, uniqueness-periods-vector-stats }: + ({ mkDerivation, base, minmax, monoid-insertleft + , uniqueness-periods-vector-stats + }: mkDerivation { pname = "quantizer"; - version = "0.3.0.2"; - sha256 = "0b28vc3ckwf7140pkzqrfay0djpiz1wfac653i9nfwn2cyrhiwpg"; + version = "0.3.1.0"; + sha256 = "1pd3cqz73nvdf9i7fg11q1yjm699n11shxan60iv2v57q6kryjw4"; libraryHaskellDepends = [ - base subG uniqueness-periods-vector-stats + base minmax monoid-insertleft uniqueness-periods-vector-stats ]; description = "Library to provide the behaviour similar to quantum states superposition"; license = lib.licenses.mit; @@ -247515,8 +247688,8 @@ self: { }: mkDerivation { pname = "quic"; - version = "0.1.18"; - sha256 = "18j2fn7qwzvbn4931bls78pwh1dn3gic8sk1vg44l5b2mhfgr43b"; + version = "0.1.19"; + sha256 = "0kxdiah415lsj06pdi14bcs3i7gqyyx9x093rxss8l48w1820zwr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -250899,6 +251072,18 @@ self: { broken = true; }) {}; + "rdf4h-vocab-activitystreams" = callPackage + ({ mkDerivation, base, rdf4h, text }: + mkDerivation { + pname = "rdf4h-vocab-activitystreams"; + version = "1.0.0"; + sha256 = "1lq47v42ajhgs1r3bqhmf4iy6yn3v5a6rahs91khrbpkgf453f0k"; + libraryHaskellDepends = [ base rdf4h text ]; + description = "The ActivityStreams 2 RDF vocabulary for rdf4h"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "rdioh" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, hoauth, hspec , json, MissingH, mtl, transformers, urlencoded @@ -258290,8 +258475,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "rhythmic-sequences"; - version = "0.4.1.0"; - sha256 = "0giigbk8wsai1w32db3lakgbh8h60fa83mzq2h3mr4i3gr1syxii"; + version = "0.8.0.0"; + sha256 = "15fqa0aqv0hkcgfmv2g5ymbh693csxwsdjb4g3rqhyxhbsgxh9lc"; libraryHaskellDepends = [ base ]; description = "Improved library to deal with rhythmicity of short sequences"; license = lib.licenses.mit; @@ -260913,6 +261098,17 @@ self: { broken = true; }) {}; + "rt" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "rt"; + version = "0.1.0.0"; + sha256 = "18kpashzq6wnf1yc2xvz7l6c53v45yimzsahaavdf60pvw4zfhrx"; + libraryHaskellDepends = [ base ]; + description = "A more fine-grained version of state threads (ST)"; + license = lib.licenses.bsd3; + }) {}; + "rtcm" = callPackage ({ mkDerivation, aeson, array, base, base64-bytestring , basic-prelude, binary, binary-bits, binary-conduit, bytestring @@ -261339,17 +261535,16 @@ self: { "rustls" = callPackage ({ mkDerivation, async, base, bytestring, containers - , derive-storable, derive-storable-plugin, directory, filepath - , hedgehog, network, process, resourcet, rustls, stm, tasty - , tasty-hedgehog, tasty-hunit, temporary, text, transformers + , derive-storable, directory, filepath, hedgehog, network, process + , resourcet, rustls, stm, tasty, tasty-hedgehog, tasty-hunit + , temporary, text, transformers }: mkDerivation { pname = "rustls"; - version = "0.0.1.0"; - sha256 = "0dx5swy6s2rsgb3ahpzwscmw9i50mnvmch0vxvirbi70inalvnj5"; + version = "0.1.0.0"; + sha256 = "19gv5cc0c3mnl40h5z1qnxrdhshiikmpmlyljv27jx2vk4i4vqib"; libraryHaskellDepends = [ - base bytestring derive-storable derive-storable-plugin network - resourcet text transformers + base bytestring derive-storable network resourcet text transformers ]; librarySystemDepends = [ rustls ]; testHaskellDepends = [ @@ -261460,8 +261655,8 @@ self: { }: mkDerivation { pname = "rzk"; - version = "0.7.3"; - sha256 = "0nkhw8nbzqpsl41skwly86pbp75c5mpvppn5vcqj6mmni7bj2i8q"; + version = "0.7.4"; + sha256 = "1n7dk24pbllr1xxr3klqxh5nq2pcjchygdr0xvhd2yla7w5hjhv5"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal process ]; @@ -261658,6 +261853,8 @@ self: { ]; testToolDepends = [ sydtest-discover ]; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "safe-coloured-text-gen_0_0_0_3" = callPackage @@ -261679,6 +261876,7 @@ self: { testToolDepends = [ sydtest-discover ]; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "safe-coloured-text-layout" = callPackage @@ -263524,7 +263722,7 @@ self: { broken = true; }) {inherit (pkgs) z3;}; - "sbv_10_7" = callPackage + "sbv_10_9" = callPackage ({ mkDerivation, array, async, base, bytestring, containers , deepseq, directory, filepath, libBF, mtl, pretty, process , QuickCheck, random, syb, tasty, tasty-bench, tasty-golden @@ -263533,8 +263731,8 @@ self: { }: mkDerivation { pname = "sbv"; - version = "10.7"; - sha256 = "02j3rsj0f5ggp5nzbxw3pq0jqmkw8ik8jgnwi6fgnkm2gjwjwm3l"; + version = "10.9"; + sha256 = "043l5akpdqrz5lzgs7m5dscy64cidgkpijf82wd4qwhs838qp8m0"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array async base containers deepseq directory filepath libBF mtl @@ -266276,6 +266474,27 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "sel" = callPackage + ({ mkDerivation, base, base16, bytestring, hedgehog + , libsodium-bindings, tasty, tasty-hunit, text, text-display + }: + mkDerivation { + pname = "sel"; + version = "0.0.1.0"; + sha256 = "0md8xdd7jci3jdq1l5acjfxgaz2ahiwz6c7cwam06x5kp0h1nik1"; + libraryHaskellDepends = [ + base base16 bytestring libsodium-bindings text text-display + ]; + testHaskellDepends = [ + base base16 bytestring hedgehog libsodium-bindings tasty + tasty-hunit text text-display + ]; + description = "Cryptography for the casual user"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "selda" = callPackage ({ mkDerivation, base, bytestring, containers, exceptions, mtl , random, text, time, uuid-types @@ -282138,6 +282357,8 @@ self: { pname = "splitmix"; version = "0.1.0.5"; sha256 = "00ihw7vji8ydik7f5lk9iwj21j829lpl22wa4nqz2igg26b7mw4x"; + revision = "1"; + editedCabalFile = "0yxp6jhbza30w829zjvp02458sj2aziz9h53yv3rc55z5alv9afa"; libraryHaskellDepends = [ base deepseq ]; testHaskellDepends = [ async base base-compat base-compat-batteries bytestring containers @@ -283567,6 +283788,8 @@ self: { pname = "stack"; version = "2.15.5"; sha256 = "0q4jyaj8gn74i5sm5dqnwz9ppbih33jd2axbz3yijvv8m1dbn1cd"; + revision = "1"; + editedCabalFile = "01bfnvsn079hl6cmc6ccmwc3ash45g556jkr1i0mkkc8ij42zny1"; configureFlags = [ "-fdisable-git-info" "-fhide-dependency-versions" "-fsupported-build" @@ -284440,16 +284663,17 @@ self: { , amazonka-cloudformation, amazonka-core, amazonka-ec2 , amazonka-lambda, amazonka-mtl, amazonka-sso, amazonka-sts, base , Blammo, bytestring, cfn-flip, conduit, containers, envparse - , errors, exceptions, extra, filepath, Glob, hspec, hspec-golden - , lens, lens-aeson, monad-logger, mtl, optparse-applicative - , QuickCheck, resourcet, rio, semigroups, text, text-metrics, time + , errors, exceptions, extra, filepath, Glob, hspec + , hspec-expectations-lifted, hspec-golden, http-types, lens + , lens-aeson, monad-logger, mtl, optparse-applicative, QuickCheck + , resourcet, rio, semigroups, text, text-metrics, time , transformers, typed-process, unliftio, unordered-containers, uuid , yaml }: mkDerivation { pname = "stackctl"; - version = "1.6.0.0"; - sha256 = "0pb7w53zyq8kkczg6q29nkic8i5w2ma2hsvn0x0g8iq4i016c23c"; + version = "1.6.1.1"; + sha256 = "01q5zmgb6z85v9agbi1q3gwqygbljmf0rw09r2hw099340vyfklb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -284463,8 +284687,10 @@ self: { ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ - aeson base bytestring filepath Glob hspec hspec-golden mtl - QuickCheck yaml + aeson amazonka amazonka-cloudformation amazonka-ec2 amazonka-lambda + amazonka-mtl base Blammo bytestring filepath Glob hspec + hspec-expectations-lifted hspec-golden http-types lens mtl + QuickCheck text time unliftio yaml ]; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; @@ -288803,8 +289029,8 @@ self: { }: mkDerivation { pname = "strongweak"; - version = "0.6.0"; - sha256 = "1zys6zi222d7rldjyh3i95774zkairz99dc4fvm2xvhl38n3860m"; + version = "0.6.1"; + sha256 = "0pyfxq7p5viq7agka8pw67br08czg3xs4d2wh5zkf7zahamy4kic"; libraryHaskellDepends = [ acc base either prettyprinter refined1 text vector vector-sized ]; @@ -296280,6 +296506,7 @@ self: { testSystemDepends = [ tdlib ]; description = "complete binding to the Telegram Database Library"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) tdlib;}; "tdlib-gen" = callPackage @@ -296329,6 +296556,8 @@ self: { ]; description = "Types and Functions generated from tdlib api spec"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "tdoc" = callPackage @@ -298055,8 +298284,8 @@ self: { }: mkDerivation { pname = "test-certs"; - version = "0.1.0.2"; - sha256 = "09n7893q67wy266mpwp5nkywjxb1jz46cm996qvy62bdc6gi17a9"; + version = "0.1.0.3"; + sha256 = "0ayvf1by5hp7xxn78j6d2ajiiz3f6gngjvijps8dgibwcawjvc79"; libraryHaskellDepends = [ base bytestring filepath HsOpenSSL temporary text time ]; @@ -298839,6 +299068,30 @@ self: { license = lib.licenses.gpl2Only; }) {}; + "texmath_0_12_8_8" = callPackage + ({ mkDerivation, base, bytestring, containers, directory, filepath + , mtl, pandoc-types, parsec, pretty-show, split, syb, tagged, tasty + , tasty-golden, text, typst-symbols, xml + }: + mkDerivation { + pname = "texmath"; + version = "0.12.8.8"; + sha256 = "0wh98gfsh70v7lzrig3v9fhjhgd25yiqsh45b0qnpz6mbwd7pibc"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers mtl pandoc-types parsec split syb text + typst-symbols xml + ]; + testHaskellDepends = [ + base bytestring directory filepath pretty-show tagged tasty + tasty-golden text xml + ]; + description = "Conversion between math formats"; + license = lib.licenses.gpl2Only; + hydraPlatforms = lib.platforms.none; + }) {}; + "texrunner" = callPackage ({ mkDerivation, attoparsec, base, bytestring, directory, filepath , HUnit, io-streams, lens, mtl, process, semigroups, temporary @@ -299134,8 +299387,8 @@ self: { }: mkDerivation { pname = "text-display"; - version = "0.0.5.1"; - sha256 = "13r2fwr8q5glajc9gwrxd59kx945cqhxqml3dcwzfrmc6a7gr18q"; + version = "0.0.5.2"; + sha256 = "14wqc8wj0jdmd6nryc1yvmr9crhp5yyxpzdayx1j3b2vldib1p3s"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring text ]; @@ -299229,8 +299482,8 @@ self: { }: mkDerivation { pname = "text-icu"; - version = "0.8.0.4"; - sha256 = "1yj0jdjrsx12sy6lj1gizb2ys5likp9rcv8ryc6sjf2dw74097rd"; + version = "0.8.0.5"; + sha256 = "1nzd7al2vpm07xa19w9vy6f696bm4z48h0m4fljsxjg4v0wblbj4"; libraryHaskellDepends = [ base bytestring deepseq text time ]; librarySystemDepends = [ icu ]; libraryPkgconfigDepends = [ icu ]; @@ -300292,6 +300545,8 @@ self: { ]; description = "Check that datatypes are deep strict using Template Haskell"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "th-desugar" = callPackage @@ -301842,10 +302097,8 @@ self: { }: mkDerivation { pname = "tidal"; - version = "1.9.4"; - sha256 = "126p05lqlq8q03gdhqq378dirs5imfkk9csaf797jz1j6lcwbnv1"; - revision = "3"; - editedCabalFile = "0sxx6cnlhjmiccmfpjkfrisxxbghbacip0q372i66a32wwkg9i0h"; + version = "1.9.5"; + sha256 = "1skm8x9gh60c0i1rr0a18jxi6y4mpi83fvzjcadlziwjna5x6a3w"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring clock colour containers deepseq exceptions hosc mtl @@ -301863,8 +302116,8 @@ self: { ({ mkDerivation, base, system-cxx-std-lib }: mkDerivation { pname = "tidal-link"; - version = "1.0.2"; - sha256 = "1lvyfnj2mazzrh0clzxxixmvdhyy7dmfcqm9hnmikizinrh6fprp"; + version = "1.0.3"; + sha256 = "1yqxwjs2y8n01j3x6mc4cg2ka4kl0k3yi0wmcxcs5v257g8f8dg7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base system-cxx-std-lib ]; @@ -304382,8 +304635,8 @@ self: { }: mkDerivation { pname = "tokenize"; - version = "0.3.0"; - sha256 = "1dcimgwy6ik5l6f98b0w6sc7pf06qazckfwf2cbmrd7g0q7lk20f"; + version = "0.3.0.1"; + sha256 = "02zl34jf19s6sv8jwjgp17vn6j059zk6hs9sf4gvbjj559db1jwh"; libraryHaskellDepends = [ base split text ]; benchmarkHaskellDepends = [ base bytestring criterion deepseq filepath split text @@ -310679,7 +310932,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "typst_0_5_0_2" = callPackage + "typst_0_5_0_3" = callPackage ({ mkDerivation, aeson, array, base, bytestring, cassava , containers, directory, filepath, mtl, ordered-containers, parsec , pretty, pretty-show, regex-tdfa, scientific, tasty, tasty-golden @@ -310687,8 +310940,8 @@ self: { }: mkDerivation { pname = "typst"; - version = "0.5.0.2"; - sha256 = "1myglayx9wdjzr33hp9faqg37brvw5s8ic31xw5alf3n444g6i0j"; + version = "0.5.0.3"; + sha256 = "0g290vpw9yqi888a2pcw87gc6nbh41x0gp2l6g5hmrg509x1yhg3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -311305,8 +311558,8 @@ self: { }: mkDerivation { pname = "ukrainian-phonetics-basic-array"; - version = "0.7.1.1"; - sha256 = "0qazbvkl6rsw08a4xh54yli4pwww0g1psn051bggs1ppscc31fd4"; + version = "0.10.0.0"; + sha256 = "0lrz00z2a2l2rlqv1d564g5adzbswnjzidyi1dvd8734fig2hb4p"; libraryHaskellDepends = [ base intermediate-structures mmsyn2-array ukrainian-phonetics-common @@ -313365,16 +313618,14 @@ self: { license = lib.licenses.mit; }) {}; - "unix_2_8_5_0" = callPackage + "unix_2_8_5_1" = callPackage ({ mkDerivation, base, bytestring, filepath, tasty, tasty-hunit , tasty-quickcheck, time }: mkDerivation { pname = "unix"; - version = "2.8.5.0"; - sha256 = "0zc5jbdkhnh8m8dxbgvbwx3r1jmgjxdnqq8qc632wzpf8bi822yp"; - revision = "1"; - editedCabalFile = "0n8j03w0wyga4qgv3q5drj9kv27hl4242gzas09yzmyz6bq44vi5"; + version = "2.8.5.1"; + sha256 = "0974ajqri7was72gnsgxa8zc4gq649zclaad1gw9pszjmr3c7djs"; libraryHaskellDepends = [ base bytestring filepath time ]; testHaskellDepends = [ base bytestring filepath tasty tasty-hunit tasty-quickcheck @@ -323089,8 +323340,8 @@ self: { }: mkDerivation { pname = "webauthn"; - version = "0.9.0.0"; - sha256 = "0rjd4hwap4vhbp7isfb2spyp1kc062x7q9vd5jfdfrvcqmgklav5"; + version = "0.10.0.0"; + sha256 = "0ndgwv8d7yndl9kb4fzvfp5wrz1pfshsp2xwhwnynd2a9mz3yqwp"; libraryHaskellDepends = [ aeson asn1-encoding asn1-parse asn1-types base base16-bytestring base64-bytestring binary bytestring cborg containers crypton @@ -327532,6 +327783,7 @@ self: { ]; description = "XDG Basedir"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "xdg-desktop-entry" = callPackage @@ -328972,7 +329224,7 @@ self: { "xmobar" = callPackage ({ mkDerivation, aeson, alsa-core, alsa-mixer, async, base , bytestring, cairo, colour, containers, dbus, directory - , extensible-exceptions, filepath, gauge, hinotify, hspec + , extensible-exceptions, extra, filepath, gauge, hinotify, hspec , http-client-tls, http-conduit, http-types, iwlib, libmpd, libXpm , libXrandr, libXrender, mtl, old-locale, pango, parsec , parsec-numbers, process, regex-compat, stm, temporary, time @@ -328981,8 +329233,8 @@ self: { }: mkDerivation { pname = "xmobar"; - version = "0.47.4"; - sha256 = "1vbi6psaljnqsvv397vqsla23azq1pcmmzlxm88n9qiqb85a52h7"; + version = "0.48"; + sha256 = "0k0vzfvz46lx4lpq2yi3jpr7l5mpl50rvqlnvsx9gqnm0dsac14s"; configureFlags = [ "-fwith_alsa" "-fwith_conduit" "-fwith_datezone" "-fwith_dbus" "-fwith_inotify" "-fwith_iwlib" "-fwith_mpd" "-fwith_mpris" @@ -328993,11 +329245,11 @@ self: { isExecutable = true; libraryHaskellDepends = [ aeson alsa-core alsa-mixer async base bytestring cairo colour - containers dbus directory extensible-exceptions filepath hinotify - http-client-tls http-conduit http-types iwlib libmpd mtl old-locale - pango parsec parsec-numbers process regex-compat stm time - timezone-olson timezone-series transformers unix utf8-string X11 - X11-xft + containers dbus directory extensible-exceptions extra filepath + hinotify http-client-tls http-conduit http-types iwlib libmpd mtl + old-locale pango parsec parsec-numbers process regex-compat stm + time timezone-olson timezone-series transformers unix utf8-string + X11 X11-xft ]; librarySystemDepends = [ libXpm libXrandr libXrender wirelesstools @@ -330683,8 +330935,8 @@ self: { }: mkDerivation { pname = "yampa-test"; - version = "0.14.7"; - sha256 = "0h9f6ps4jnq88dadhwgsifw1r1jhqsw5cc1shplbwr0pva00s91x"; + version = "0.14.8"; + sha256 = "0bsah360hxb1w9b1ypmgcdr1lb2wi4pzlbvgd106kqslkfyk942x"; libraryHaskellDepends = [ base normaldistribution QuickCheck Yampa ]; @@ -330964,8 +331216,8 @@ self: { }: mkDerivation { pname = "yaya"; - version = "0.6.0.0"; - sha256 = "0id4h41rpjm668fhwvv9dcw1733rrnqs0v00vg6m7h11r8nylzs1"; + version = "0.6.2.0"; + sha256 = "1k6w1c89s7c416xjxm23mllcm68l8ya6m7jw2ml9axwsns27kx98"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base comonad either foldable1-classes-compat free kan-extensions @@ -330975,6 +331227,8 @@ self: { testHaskellDepends = [ base doctest ]; description = "Total recursion schemes"; license = lib.licenses.agpl3Plus; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "yaya-containers" = callPackage @@ -330983,13 +331237,14 @@ self: { }: mkDerivation { pname = "yaya-containers"; - version = "0.1.1.0"; - sha256 = "14knwk5sk6h76iy97kxa3s95px3bv2ns9xmcwmhbcrsaf338dyrz"; + version = "0.1.2.0"; + sha256 = "03rfpzsrjimlp40s5pbn2fd5v4cby529nhmsh9xna7n8xf6jmm05"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base containers yaya ]; testHaskellDepends = [ base doctest ]; description = "Pattern functors and instances for types in the containers package"; license = lib.licenses.agpl3Plus; + hydraPlatforms = lib.platforms.none; }) {}; "yaya-hedgehog" = callPackage @@ -330998,8 +331253,8 @@ self: { }: mkDerivation { pname = "yaya-hedgehog"; - version = "0.3.0.0"; - sha256 = "08gyij5hlgmcv77gzzcsjak8aw7c7vmnfkrl8f0m6isfdb0lq1gr"; + version = "0.3.0.2"; + sha256 = "1kyqbqp84whi9jsygk7x2vhja76h45fk75k7bgh9jwjqfj83zy7s"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base deriving-compat hedgehog yaya ]; testHaskellDepends = [ @@ -331007,6 +331262,7 @@ self: { ]; description = "Hedgehog testing support for the Yaya recursion scheme library"; license = lib.licenses.agpl3Plus; + hydraPlatforms = lib.platforms.none; }) {}; "yaya-quickcheck" = callPackage @@ -331015,13 +331271,14 @@ self: { }: mkDerivation { pname = "yaya-quickcheck"; - version = "0.2.0.0"; - sha256 = "0ihxrf8n2jyiz4v82pnjscii8vm8zsj3n9sbyjrdcn5kx66myaq3"; + version = "0.2.0.1"; + sha256 = "0ncnp0m93fyjn9vqp8s0vbvra3v6nin8sh5jr58rv1r5538hkyr5"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base QuickCheck splitmix yaya ]; testHaskellDepends = [ base doctest ]; description = "QuickCheck testing support for the Yaya recursion scheme library"; license = lib.licenses.agpl3Plus; + hydraPlatforms = lib.platforms.none; }) {}; "yaya-test" = callPackage @@ -331049,13 +331306,14 @@ self: { }: mkDerivation { pname = "yaya-unsafe"; - version = "0.4.0.0"; - sha256 = "11g00zsjzrcm4g5b1q8xz5vhzakxqjgl1yz0z0cfnndqmh720s3n"; + version = "0.4.1.1"; + sha256 = "0s3fna5b0g5jxbndzmqsy9bqz8b4ry7p88kspnzv8shrq271mmmk"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base bifunctors comonad free lens yaya ]; testHaskellDepends = [ base doctest hedgehog yaya yaya-hedgehog ]; description = "Non-total extensions to the Yaya recursion scheme library"; license = lib.licenses.agpl3Plus; + hydraPlatforms = lib.platforms.none; }) {}; "yaya-unsafe-test" = callPackage @@ -331901,6 +332159,8 @@ self: { pname = "yesod-bin"; version = "1.6.2.3"; sha256 = "15lsiw4g0zf1wk13fvqw4kngqhg3c2fi9jh65blhdw8kzbznf8xg"; + revision = "1"; + editedCabalFile = "01mwlxikp618dqgvnirhyy3x7yy5fy7n58ppplnrsvbg3g202h6d"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -335428,6 +335688,31 @@ self: { license = lib.licenses.bsd3; }) {inherit (pkgs) which;}; + "zip-archive_0_4_3_2" = callPackage + ({ mkDerivation, array, base, binary, bytestring, containers + , digest, directory, filepath, HUnit, mtl, pretty, process + , temporary, text, time, unix, which, zlib + }: + mkDerivation { + pname = "zip-archive"; + version = "0.4.3.2"; + sha256 = "0p6b4n4z3qa9f5vh25lqf7b8gdf5qcfs4zsnlzr12m0xgysfdnk1"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array base binary bytestring containers digest directory filepath + mtl pretty text time unix zlib + ]; + testHaskellDepends = [ + base bytestring directory filepath HUnit process temporary time + unix + ]; + testToolDepends = [ which ]; + description = "Library for creating and modifying zip archives"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {inherit (pkgs) which;}; + "zip-cmd" = callPackage ({ mkDerivation, base, bytestring, filepath, optparse-applicative , shellwords, text, time, zip diff --git a/pkgs/development/interpreters/erlang/25.nix b/pkgs/development/interpreters/erlang/25.nix index 5f94c27dbd4a4..441d12d747c59 100644 --- a/pkgs/development/interpreters/erlang/25.nix +++ b/pkgs/development/interpreters/erlang/25.nix @@ -1,6 +1,6 @@ { mkDerivation }: mkDerivation { - version = "25.3.2.10"; - sha256 = "sha256-CibLQnzQxvFDMNiX26n0b725o8BV4FJXBXmwW1sEpkk="; + version = "25.3.2.11"; + sha256 = "sha256-GeYDTgUcU//KjEw8jX/zR5OagHQLqpYLitn1PVmcIi0="; } diff --git a/pkgs/development/interpreters/erlang/27-rc2.nix b/pkgs/development/interpreters/erlang/27-rc2.nix new file mode 100644 index 0000000000000..a9b6fa05e5186 --- /dev/null +++ b/pkgs/development/interpreters/erlang/27-rc2.nix @@ -0,0 +1,6 @@ +{ mkDerivation }: + +mkDerivation { + version = "27.0-rc2"; + sha256 = "sha256-o+uqQMlrh7wJQbiecMnn3/tv6nqSJh7unOj0A95mMb0="; +} diff --git a/pkgs/development/interpreters/erlang/generic-builder.nix b/pkgs/development/interpreters/erlang/generic-builder.nix index 6e9373b4a5636..32d1466f326e4 100644 --- a/pkgs/development/interpreters/erlang/generic-builder.nix +++ b/pkgs/development/interpreters/erlang/generic-builder.nix @@ -18,9 +18,11 @@ , libGLU ? null , wxGTK ? null , xorg ? null +, exdoc ? null , parallelBuild ? false , systemd , wxSupport ? true +, exdocSupport ? false , systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd # systemd support in epmd # updateScript deps , writeScript @@ -77,6 +79,7 @@ else libGL != null && libGLU != null && wxGTK != null && xorg != null); assert odbcSupport -> unixODBC != null; assert javacSupport -> openjdk11 != null; +assert exdocSupport -> exdoc != null; let inherit (lib) optional optionals optionalAttrs optionalString; @@ -114,8 +117,21 @@ stdenv.mkDerivation ({ ${postPatch} ''; + # For OTP 27+ we need ex_doc to build the documentation + # When exdocSupport is enabled, grab the raw ex_doc executable from the exdoc + # derivation. Next, patch the first line to use the escript that will be + # built during the build phase of this derivation. Finally, building the + # documentation requires the erlang-logo.png asset. preConfigure = '' ./otp_build autoconf + '' + optionalString exdocSupport '' + mkdir -p $out/bin + cp ${exdoc}/bin/.ex_doc-wrapped $out/bin/ex_doc + sed -i "1 s:^.*$:#!$out/bin/escript:" $out/bin/ex_doc + export EX_DOC=$out/bin/ex_doc + + mkdir -p $out/lib/erlang/system/doc/assets + cp $src/system/doc/assets/erlang-logo.png $out/lib/erlang/system/doc/assets ''; configureFlags = [ "--with-ssl=${lib.getOutput "out" opensslPackage}" ] diff --git a/pkgs/development/interpreters/luau/default.nix b/pkgs/development/interpreters/luau/default.nix index 28e34f885608e..4d17e1f73561e 100644 --- a/pkgs/development/interpreters/luau/default.nix +++ b/pkgs/development/interpreters/luau/default.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, fetchFromGitHub, cmake, llvmPackages }: +{ lib, stdenv, fetchFromGitHub, cmake, gitUpdater, llvmPackages }: stdenv.mkDerivation rec { pname = "luau"; - version = "0.620"; + version = "0.621"; src = fetchFromGitHub { owner = "luau-lang"; repo = "luau"; rev = version; - hash = "sha256-J1tVZ3HDcH+DiVsHDWl8A6X/4Fi4s0Fxkb0KzSYP1Pk="; + hash = "sha256-bkuYYGYcnMwQDK81ZH+74hA4XaQfVFMWvAKpy+ODCak="; }; nativeBuildInputs = [ cmake ]; @@ -36,6 +36,8 @@ stdenv.mkDerivation rec { runHook postCheck ''; + passthru.updateScript = gitUpdater { }; + meta = with lib; { description = "A fast, small, safe, gradually typed embeddable scripting language derived from Lua"; homepage = "https://luau-lang.org/"; diff --git a/pkgs/development/interpreters/php/8.1.nix b/pkgs/development/interpreters/php/8.1.nix index a8141d2786004..b31d08fbda3a5 100644 --- a/pkgs/development/interpreters/php/8.1.nix +++ b/pkgs/development/interpreters/php/8.1.nix @@ -1,9 +1,17 @@ -{ callPackage, ... }@_args: +{ callPackage, fetchpatch, ... }@_args: let base = callPackage ./generic.nix ((removeAttrs _args [ "fetchpatch" ]) // { version = "8.1.28"; hash = "sha256-i+RQCW4BU8R9dThOfdWVzIl/HVPOAGBwjOlYm8wxQe4="; + extraPatches = [ + # Fix build with libxml 2.12+. + # Patch from https://github.com/php/php-src/commit/0a39890c967aa57225bb6bdf4821aff7a3a3c082 + (fetchpatch { + url = "https://github.com/php/php-src/commit/0a39890c967aa57225bb6bdf4821aff7a3a3c082.patch"; + hash = "sha256-HvpTL7aXO9gr4glFdhqUWQPrG8TYTlvbNINq33M3zS0="; + }) + ]; }); in base.withExtensions ({ all, ... }: with all; ([ diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index 03147bc4c5f3b..0edf4dcc027bc 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -93,9 +93,9 @@ in { major = "3"; minor = "13"; patch = "0"; - suffix = "a5"; + suffix = "a6"; }; - hash = "sha256-Hom1NVGD58iYpaAbL2AXKP5J/bidnJeB8TNghHqu+mI="; + hash = "sha256-S+85PXKygaz4HTnXRV8AA26GYZPfohpO05cP0PTLoEg="; inherit (darwin) configd; inherit passthruFun; }; diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index 9ec7a448b59f7..8aed134441985 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -125,7 +125,7 @@ let cargoDeps = if yjitSupport then rustPlatform.fetchCargoTarball { inherit (finalAttrs) src; sourceRoot = "${finalAttrs.pname}-${version}/${finalAttrs.cargoRoot}"; - hash = cargoHash; + hash = assert cargoHash != null; cargoHash; } else null; postUnpack = opString rubygemsSupport '' diff --git a/pkgs/development/interpreters/wasmtime/default.nix b/pkgs/development/interpreters/wasmtime/default.nix index d2b260e3a65bb..0f56582c05c3a 100644 --- a/pkgs/development/interpreters/wasmtime/default.nix +++ b/pkgs/development/interpreters/wasmtime/default.nix @@ -2,19 +2,19 @@ rustPlatform.buildRustPackage rec { pname = "wasmtime"; - version = "19.0.1"; + version = "19.0.2"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = pname; rev = "v${version}"; - hash = "sha256-MHoIVJ+x8GFzbO2YaknnzS/qSMyODvel88IHif9L97A="; + hash = "sha256-t+2bkJ1SFN7Bi1Mj74CKGhnL2vWpruQKf8lYJWLOqB8="; fetchSubmodules = true; }; # Disable cargo-auditable until https://github.com/rust-secure-code/cargo-auditable/issues/124 is solved. auditable = false; - cargoHash = "sha256-r07neWK7d4407U941XtyUOlRcjQVNUsXJKavSNHvYZM="; + cargoHash = "sha256-Jr02AQWz4ILYZWlGtcVYWTcBojHWZk871bWuEyG5QxE="; cargoBuildFlags = [ "--package" "wasmtime-cli" "--package" "wasmtime-c-api" ]; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/interpreters/wazero/default.nix b/pkgs/development/interpreters/wazero/default.nix index c494499d61f48..0da909441dad9 100644 --- a/pkgs/development/interpreters/wazero/default.nix +++ b/pkgs/development/interpreters/wazero/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "wazero"; - version = "1.7.0"; + version = "1.7.1"; src = fetchFromGitHub { owner = "tetratelabs"; repo = "wazero"; rev = "v${version}"; - hash = "sha256-TBGRO+5PHPna2dNSeNktxALEc6TvJzV+kEiynYqvhgY="; + hash = "sha256-xMI/6zhXxoD5rq+MZBiMzdmxlHS1gel1IChZe1iENyE="; }; vendorHash = null; diff --git a/pkgs/development/libraries/boringssl/default.nix b/pkgs/development/libraries/boringssl/default.nix index fadf478e037f5..9bb0967bd5c6e 100644 --- a/pkgs/development/libraries/boringssl/default.nix +++ b/pkgs/development/libraries/boringssl/default.nix @@ -20,7 +20,7 @@ buildGoModule { nativeBuildInputs = [ cmake ninja perl ]; - vendorHash = "sha256-McSmG+fMO8/T/bJR6YAJDYw9pxsWJoj1hcSTPv/wMsI="; + vendorHash = "sha256-074bgtoBRS3SOxLrwZbBdK1jFpdCvF6tRtU1CkrhoDY="; proxyVendor = true; # hack to get both go and cmake configure phase diff --git a/pkgs/development/libraries/botan/3.0.nix b/pkgs/development/libraries/botan/3.0.nix index 68cde850f1e80..d55d7edfb74cc 100644 --- a/pkgs/development/libraries/botan/3.0.nix +++ b/pkgs/development/libraries/botan/3.0.nix @@ -1,7 +1,7 @@ { callPackage, ... } @ args: callPackage ./generic.nix (args // { - baseVersion = "3.3"; + baseVersion = "3.4"; revision = "0"; - hash = "sha256-No8R9CbxIFrtuenjI2ihZTXcEb1gNRBm5vZmTsNrhbk="; + hash = "sha256-cYQ6/MCixYX48z+jBPC1iuS5xdgwb4lGZ7N0YEQndVc="; }) diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index 85214a79e2d3c..a15c41f100b59 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -48,6 +48,8 @@ , withDav1d ? withHeadlessDeps # AV1 decoder (focused on speed and correctness) , withDc1394 ? withFullDeps && !stdenv.isDarwin # IIDC-1394 grabbing (ieee 1394) , withDrm ? withHeadlessDeps && (with stdenv; isLinux || isFreeBSD) # libdrm support +, withDvdnav ? withFullDeps && withGPL && lib.versionAtLeast version "7" # needed for DVD demuxing +, withDvdread ? withFullDeps && withGPL && lib.versionAtLeast version "7" # needed for DVD demuxing , withFdkAac ? withFullDeps && (!withGPL || withUnfree) # Fraunhofer FDK AAC de/encoder , withFlite ? withFullDeps # Voice Synthesis , withFontconfig ? withHeadlessDeps # Needed for drawtext filter @@ -228,6 +230,8 @@ , libcaca , libdc1394 , libdrm +, libdvdnav +, libdvdread , libGL , libGLU , libiconv @@ -522,6 +526,10 @@ stdenv.mkDerivation (finalAttrs: { (enableFeature withDav1d "libdav1d") (enableFeature withDc1394 "libdc1394") (enableFeature withDrm "libdrm") + ] ++ optionals (versionAtLeast version "7") [ + (enableFeature withDvdnav "libdvdnav") + (enableFeature withDvdread "libdvdread") + ] ++ [ (enableFeature withFdkAac "libfdk-aac") (enableFeature withFlite "libflite") (enableFeature withFontconfig "fontconfig") @@ -654,6 +662,8 @@ stdenv.mkDerivation (finalAttrs: { ++ optionals withDav1d [ dav1d ] ++ optionals withDc1394 [ libdc1394 libraw1394 ] ++ optionals withDrm [ libdrm ] + ++ optionals withDvdnav [ libdvdnav ] + ++ optionals withDvdread [ libdvdread ] ++ optionals withFdkAac [ fdk_aac ] ++ optionals withFlite [ flite ] ++ optionals withFontconfig [ fontconfig ] diff --git a/pkgs/development/libraries/geos/default.nix b/pkgs/development/libraries/geos/default.nix index fc3cff98d7e86..e24f519d1cc3e 100644 --- a/pkgs/development/libraries/geos/default.nix +++ b/pkgs/development/libraries/geos/default.nix @@ -18,6 +18,11 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake ]; + # https://github.com/libgeos/geos/issues/930 + cmakeFlags = lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ + "-DCMAKE_CTEST_ARGUMENTS=--exclude-regex;unit-geom-Envelope" + ]; + doCheck = true; passthru.tests = { diff --git a/pkgs/development/libraries/gvm-libs/default.nix b/pkgs/development/libraries/gvm-libs/default.nix index 651dc26ca1aee..e8cae3fa727bf 100644 --- a/pkgs/development/libraries/gvm-libs/default.nix +++ b/pkgs/development/libraries/gvm-libs/default.nix @@ -1,24 +1,26 @@ -{ lib -, stdenv -, cmake -, doxygen -, fetchFromGitHub -, glib -, glib-networking -, gnutls -, gpgme -, hiredis -, libgcrypt -, libnet -, libpcap -, libssh -, libuuid -, libxcrypt -, libxml2 -, paho-mqtt-c -, pkg-config -, zlib -, freeradius +{ + lib, + stdenv, + cmake, + doxygen, + fetchFromGitHub, + glib, + glib-networking, + gnutls, + gpgme, + hiredis, + libgcrypt, + libnet, + libpcap, + libssh, + libuuid, + libxcrypt, + libxml2, + openldap, + paho-mqtt-c, + pkg-config, + radcli, + zlib, }: stdenv.mkDerivation rec { @@ -27,7 +29,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "greenbone"; - repo = pname; + repo = "gvm-libs"; rev = "refs/tags/v${version}"; hash = "sha256-nFqYpt9OWEPgSbaNsHLhs9mg7ChQcmfcgHh7nFfQh18="; }; @@ -45,20 +47,19 @@ stdenv.mkDerivation rec { gpgme hiredis libgcrypt - freeradius libnet libpcap libssh libuuid libxcrypt libxml2 + openldap paho-mqtt-c + radcli zlib ]; - cmakeFlags = [ - "-DGVM_RUN_DIR=${placeholder "out"}/run/gvm" - ]; + cmakeFlags = [ "-DGVM_RUN_DIR=${placeholder "out"}/run/gvm" ]; # causes redefinition of _FORTIFY_SOURCE hardeningDisable = [ "fortify3" ]; diff --git a/pkgs/development/libraries/libfilezilla/default.nix b/pkgs/development/libraries/libfilezilla/default.nix index 7e90a05fb5b0d..9024be0f259ce 100644 --- a/pkgs/development/libraries/libfilezilla/default.nix +++ b/pkgs/development/libraries/libfilezilla/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { pname = "libfilezilla"; - version = "0.46.0"; + version = "0.47.0"; src = fetchurl { url = "https://download.filezilla-project.org/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-OHr1xNSENIKl+/GD0B3ZYZtLha+g1olcXuyzpgEvrCE="; + hash = "sha256-YYpYa2E773EKYzxCv92mFmbLsPyKkq1JA2HQvJHFg0E="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/pkgs/development/libraries/libquotient/default.nix b/pkgs/development/libraries/libquotient/default.nix index b461a3c078642..e388f2fbacb66 100644 --- a/pkgs/development/libraries/libquotient/default.nix +++ b/pkgs/development/libraries/libquotient/default.nix @@ -4,7 +4,7 @@ let isQt6 = lib.versions.major qtbase.version == "6"; in stdenv.mkDerivation rec { pname = "libquotient"; - version = "0.8.1.2"; + version = "0.8.2"; outputs = [ "out" "dev" ]; @@ -12,7 +12,7 @@ in stdenv.mkDerivation rec { owner = "quotient-im"; repo = "libQuotient"; rev = version; - hash = "sha256-qJTikc42sFUlb4g0sAEg6v9d4k1lhbn3MZPvghm56E8="; + hash = "sha256-6sR/80r9qW9kMYqIi2FeXgb6M795XKzpvyE6eTaBsjA="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/lightgbm/default.nix b/pkgs/development/libraries/lightgbm/default.nix index 5f8e6ceaecd02..57d3407aef91f 100644 --- a/pkgs/development/libraries/lightgbm/default.nix +++ b/pkgs/development/libraries/lightgbm/default.nix @@ -77,7 +77,7 @@ stdenv.mkDerivation rec { ''; cmakeFlags = lib.optionals doCheck [ "-DBUILD_CPP_TEST=ON" ] - ++ lib.optionals cudaSupport [ "-DUSE_CUDA=1" "-DCMAKE_CXX_COMPILER=${cudaPackages.cudatoolkit.cc}/bin/cc" ] + ++ lib.optionals cudaSupport [ "-DUSE_CUDA=1" "-DCMAKE_CXX_COMPILER=${cudaPackages.backendStdenv.cc}/bin/cc" ] ++ lib.optionals openclSupport [ "-DUSE_GPU=ON" ] ++ lib.optionals mpiSupport [ "-DUSE_MPI=ON" ] ++ lib.optionals hdfsSupport [ diff --git a/pkgs/development/libraries/nghttp3/default.nix b/pkgs/development/libraries/nghttp3/default.nix index d2bd0900dd3c4..849a464b1c0dc 100644 --- a/pkgs/development/libraries/nghttp3/default.nix +++ b/pkgs/development/libraries/nghttp3/default.nix @@ -1,5 +1,6 @@ { lib, stdenv, fetchFromGitHub , cmake +, CoreServices , curlHTTP3 }: @@ -18,6 +19,9 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "doc" ]; nativeBuildInputs = [ cmake ]; + buildInputs = lib.optionals stdenv.isDarwin [ + CoreServices + ]; cmakeFlags = [ (lib.cmakeBool "ENABLE_STATIC_LIB" false) diff --git a/pkgs/development/libraries/ngtcp2/default.nix b/pkgs/development/libraries/ngtcp2/default.nix index 344d85591eef0..6a0e15dfcd9c2 100644 --- a/pkgs/development/libraries/ngtcp2/default.nix +++ b/pkgs/development/libraries/ngtcp2/default.nix @@ -1,6 +1,7 @@ { lib, stdenv, fetchFromGitHub , cmake , brotli, libev, nghttp3, quictls +, CoreServices , withJemalloc ? false, jemalloc , curlHTTP3 }: @@ -20,7 +21,14 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "doc" ]; nativeBuildInputs = [ cmake ]; - buildInputs = [ brotli libev nghttp3 quictls ] ++ lib.optional withJemalloc jemalloc; + buildInputs = [ + brotli + libev + nghttp3 + quictls + ] ++ lib.optionals stdenv.isDarwin [ + CoreServices + ] ++ lib.optional withJemalloc jemalloc; cmakeFlags = [ (lib.cmakeBool "ENABLE_STATIC_LIB" false) diff --git a/pkgs/development/libraries/onnxruntime/default.nix b/pkgs/development/libraries/onnxruntime/default.nix index 4ece5feea3655..43a7f79504739 100644 --- a/pkgs/development/libraries/onnxruntime/default.nix +++ b/pkgs/development/libraries/onnxruntime/default.nix @@ -133,7 +133,6 @@ effectiveStdenv.mkDerivation rec { nlohmann_json microsoft-gsl ] ++ lib.optionals pythonSupport (with python3Packages; [ - gtest numpy pybind11 packaging @@ -150,7 +149,9 @@ effectiveStdenv.mkDerivation rec { cuda_cudart ]); - nativeCheckInputs = lib.optionals pythonSupport (with python3Packages; [ + nativeCheckInputs = [ + gtest + ] ++ lib.optionals pythonSupport (with python3Packages; [ pytest sympy onnx @@ -179,7 +180,7 @@ effectiveStdenv.mkDerivation rec { "-DFETCHCONTENT_SOURCE_DIR_SAFEINT=${safeint}" "-DFETCHCONTENT_TRY_FIND_PACKAGE_MODE=ALWAYS" "-Donnxruntime_BUILD_SHARED_LIB=ON" - "-Donnxruntime_BUILD_UNIT_TESTS=ON" + (lib.cmakeBool "onnxruntime_BUILD_UNIT_TESTS" doCheck) "-Donnxruntime_ENABLE_LTO=ON" "-Donnxruntime_USE_FULL_PROTOBUF=OFF" (lib.cmakeBool "onnxruntime_USE_CUDA" cudaSupport) @@ -190,6 +191,7 @@ effectiveStdenv.mkDerivation rec { (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_CUTLASS" "${cutlass}") (lib.cmakeFeature "onnxruntime_CUDNN_HOME" "${cudaPackages.cudnn}") (lib.cmakeFeature "CMAKE_CUDA_ARCHITECTURES" cudaArchitecturesString) + (lib.cmakeFeature "onnxruntime_NVCC_THREADS" "1") ]; env = lib.optionalAttrs effectiveStdenv.cc.isClang { @@ -224,6 +226,7 @@ effectiveStdenv.mkDerivation rec { ''; passthru = { + inherit cudaSupport cudaPackages; # for the python module protobuf = protobuf_21; tests = lib.optionalAttrs pythonSupport { python = python3Packages.onnxruntime; diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix index 377ebb3acdb5f..5e9409368cc70 100644 --- a/pkgs/development/libraries/opencv/3.x.nix +++ b/pkgs/development/libraries/opencv/3.x.nix @@ -39,7 +39,7 @@ assert blas.implementation == "openblas" && lapack.implementation == "openblas"; assert enablePython -> pythonPackages != null; let - inherit (cudaPackages) cudatoolkit; + inherit (cudaPackages) backendStdenv cudatoolkit; inherit (cudaPackages.cudaFlags) cudaCapabilities; version = "3.4.18"; @@ -241,7 +241,7 @@ stdenv.mkDerivation { (opencvFlag "TBB" enableTbb) ] ++ lib.optionals enableCuda [ "-DCUDA_FAST_MATH=ON" - "-DCUDA_HOST_COMPILER=${cudatoolkit.cc}/bin/cc" + "-DCUDA_HOST_COMPILER=${backendStdenv.cc}/bin/cc" "-DCUDA_NVCC_FLAGS=--expt-relaxed-constexpr" "-DCUDA_ARCH_BIN=${lib.concatStringsSep ";" cudaCapabilities}" "-DCUDA_ARCH_PTX=${lib.last cudaCapabilities}" diff --git a/pkgs/development/libraries/qt-6/default.nix b/pkgs/development/libraries/qt-6/default.nix index 96741ee8ae674..6604596fe4684 100644 --- a/pkgs/development/libraries/qt-6/default.nix +++ b/pkgs/development/libraries/qt-6/default.nix @@ -203,10 +203,8 @@ let } ./hooks/qmake-hook.sh) { }; } // lib.optionalAttrs config.allowAliases { - # Convert to a throw on 03-01-2023 and backport the change. - # Warnings show up in various cli tool outputs, throws do not. - # Remove completely before 24.05 - overrideScope' = lib.warnIf (lib.isInOldestRelease 2311) "qt6 now uses makeScopeWithSplicing which does not have \"overrideScope'\", use \"overrideScope\"." self.overrideScope; + # Remove completely before 24.11 + overrideScope' = builtins.throw "qt6 now uses makeScopeWithSplicing which does not have \"overrideScope'\", use \"overrideScope\"."; }; baseScope = makeScopeWithSplicing' { diff --git a/pkgs/development/libraries/xed/default.nix b/pkgs/development/libraries/xed/default.nix index dc6495d0cf386..1fb634a80b90e 100644 --- a/pkgs/development/libraries/xed/default.nix +++ b/pkgs/development/libraries/xed/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages }: +{ lib, stdenv, fetchFromGitHub, python3Packages, llvmPackages }: let # mbuild is a custom build system used only to build xed @@ -10,34 +10,37 @@ let owner = "intelxed"; repo = "mbuild"; rev = "v${version}"; - sha256 = "sha256-eOAqmoPotdXGcBmrD9prXph4XOL6noJU6GYT/ud/VXk="; + sha256 = "sha256-nVHHiaPbf+b+RntjUGjLLGS53e6c+seXIBx7AcTtiWU="; }; }; in stdenv.mkDerivation rec { pname = "xed"; - version = "2022.08.11"; + version = "2024.02.22"; src = fetchFromGitHub { owner = "intelxed"; repo = "xed"; rev = "v${version}"; - sha256 = "sha256-Iil+dfjuWYPbzmSjgwKTKScSE/IsWuHEKQ5HsBJDqWM="; + sha256 = "sha256-LF4iJ1/Z3OifCiir/kU3ufZqtiRLeaJeAwuBqP2BCF4="; }; - nativeBuildInputs = [ mbuild ]; + nativeBuildInputs = [ mbuild ] ++ lib.optionals stdenv.isDarwin [ llvmPackages.bintools ]; buildPhase = '' patchShebangs mfile.py # this will build, test and install ./mfile.py test --prefix $out + ./mfile.py examples + mkdir -p $out/bin + cp ./obj/wkit/examples/obj/xed $out/bin/ ''; dontInstall = true; # already installed during buildPhase meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64); + broken = stdenv.isAarch64; description = "Intel X86 Encoder Decoder (Intel XED)"; homepage = "https://intelxed.github.io/"; license = licenses.asl20; diff --git a/pkgs/development/libraries/xgboost/default.nix b/pkgs/development/libraries/xgboost/default.nix index a1ae57f8824f3..0018a73341e31 100644 --- a/pkgs/development/libraries/xgboost/default.nix +++ b/pkgs/development/libraries/xgboost/default.nix @@ -75,8 +75,8 @@ stdenv.mkDerivation rec { "-DUSE_CUDA=ON" # Their CMakeLists.txt does not respect CUDA_HOST_COMPILER, instead using the CXX compiler. # https://github.com/dmlc/xgboost/blob/ccf43d4ba0a94e2f0a3cc5a526197539ae46f410/CMakeLists.txt#L145 - "-DCMAKE_C_COMPILER=${cudaPackages.cudatoolkit.cc}/bin/gcc" - "-DCMAKE_CXX_COMPILER=${cudaPackages.cudatoolkit.cc}/bin/g++" + "-DCMAKE_C_COMPILER=${cudaPackages.backendStdenv.cc}/bin/gcc" + "-DCMAKE_CXX_COMPILER=${cudaPackages.backendStdenv.cc}/bin/g++" ] ++ lib.optionals (cudaSupport && lib.versionAtLeast cudaPackages.cudatoolkit.version "11.4.0") diff --git a/pkgs/development/ocaml-modules/miou/default.nix b/pkgs/development/ocaml-modules/miou/default.nix new file mode 100644 index 0000000000000..fff2d16aaf589 --- /dev/null +++ b/pkgs/development/ocaml-modules/miou/default.nix @@ -0,0 +1,21 @@ +{ lib, buildDunePackage, fetchurl }: + +buildDunePackage rec { + pname = "miou"; + version = "0.1.0"; + + minimalOCamlVersion = "5.0.0"; + + src = fetchurl { + url = "https://github.com/robur-coop/miou/releases/download/v${version}/miou-${version}.tbz"; + hash = "sha256-WTs6L9j4z1/0wKcGIZVwaNrATRGCTN5A6RwO7tY2phE="; + }; + + meta = { + description = "Composable concurrency primitives for OCaml"; + homepage = "https://git.robur.coop/robur/miou"; + changelog = "https://git.robur.coop/robur/miou/src/tag/v${version}/CHANGES.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ marsam ]; + }; +} diff --git a/pkgs/development/ocaml-modules/otoml/default.nix b/pkgs/development/ocaml-modules/otoml/default.nix index 18a0c6412886d..0a25ac52148b1 100644 --- a/pkgs/development/ocaml-modules/otoml/default.nix +++ b/pkgs/development/ocaml-modules/otoml/default.nix @@ -8,7 +8,7 @@ buildDunePackage rec { pname = "otoml"; - version = "1.0.4"; + version = "1.0.5"; minimalOCamlVersion = "4.08"; @@ -16,7 +16,7 @@ buildDunePackage rec { owner = "dmbaturin"; repo = pname; rev = version; - sha256 = "sha256-3bgeiwa0elisxZaWpwLqoKmeyTBKMW1IWdm6YdSIhSw="; + sha256 = "sha256-e9Bqd6KHorglLMzvsjakyYt/CLZR3yI/yZPl/rnbkDE="; }; nativeBuildInputs = [ menhir ]; diff --git a/pkgs/development/ocaml-modules/owee/default.nix b/pkgs/development/ocaml-modules/owee/default.nix index 3b8e6f58cfb2d..d6886c49ca5a0 100644 --- a/pkgs/development/ocaml-modules/owee/default.nix +++ b/pkgs/development/ocaml-modules/owee/default.nix @@ -2,14 +2,13 @@ buildDunePackage rec { minimalOCamlVersion = "4.06"; - duneVersion = "2"; pname = "owee"; - version = "0.6"; + version = "0.7"; src = fetchurl { url = "https://github.com/let-def/owee/releases/download/v${version}/owee-${version}.tbz"; - sha256 = "sha256-GwXV5t4GYbDiGwyvQyW8NZoYvn4qXlLnjX331Bj1wjM="; + hash = "sha256-9FXcmddHg5mk5UWgYd4kTPOLOY/p6A/OBuvfas4elUA="; }; meta = with lib; { diff --git a/pkgs/development/ocaml-modules/ppx_blob/default.nix b/pkgs/development/ocaml-modules/ppx_blob/default.nix index e13bc477e2682..3de1013838912 100644 --- a/pkgs/development/ocaml-modules/ppx_blob/default.nix +++ b/pkgs/development/ocaml-modules/ppx_blob/default.nix @@ -2,13 +2,13 @@ buildDunePackage rec { pname = "ppx_blob"; - version = "0.7.2"; + version = "0.8.0"; duneVersion = "3"; src = fetchurl { url = "https://github.com/johnwhitington/${pname}/releases/download/${version}/ppx_blob-${version}.tbz"; - sha256 = "00haz1cmplk3j9ysh6j656zrldy60585fmlndmfhpd5332mxrfdw"; + sha256 = "sha256-drobFwMTKd/a3aP5CX/08WhvgS1CkARH6zo+nSiwl08="; }; checkInputs = [ alcotest ]; diff --git a/pkgs/development/ocaml-modules/spacetime_lib/default.nix b/pkgs/development/ocaml-modules/spacetime_lib/default.nix deleted file mode 100644 index 7e2e4002c1ea9..0000000000000 --- a/pkgs/development/ocaml-modules/spacetime_lib/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib, fetchFromGitHub, buildDunePackage, ocaml, owee }: - -lib.throwIfNot (lib.versionAtLeast "4.12" ocaml.version) - "spacetime_lib is not available for OCaml ${ocaml.version}" - -buildDunePackage rec { - pname = "spacetime_lib"; - version = "0.3.0"; - duneVersion = "2"; - - src = fetchFromGitHub { - owner = "lpw25"; - repo = "spacetime_lib"; - rev = version; - sha256 = "0biisgbycr5v3nm5jp8i0h6vq76vzasdjkcgh8yr7fhxc81jgv3p"; - }; - - patches = [ ./spacetime.diff ]; - - propagatedBuildInputs = [ owee ]; - - preConfigure = '' - bash ./configure.sh - ''; - - meta = { - description = "An OCaml library providing some simple operations for handling OCaml “spacetime” profiles"; - inherit (src.meta) homepage; - license = lib.licenses.mit; - maintainers = [ lib.maintainers.vbgl ]; - }; -} diff --git a/pkgs/development/php-packages/xdebug/default.nix b/pkgs/development/php-packages/xdebug/default.nix index 9ff9b771401c1..3b5caffb963d3 100644 --- a/pkgs/development/php-packages/xdebug/default.nix +++ b/pkgs/development/php-packages/xdebug/default.nix @@ -1,7 +1,7 @@ { buildPecl, lib, fetchFromGitHub }: let - version = "3.3.1"; + version = "3.3.2"; in buildPecl { inherit version; @@ -11,7 +11,7 @@ in buildPecl { owner = "xdebug"; repo = "xdebug"; rev = version; - hash = "sha256-Zt1BIqNKsTHtIXy0Dar52sZxLi5k12LQAbxOLKQPMN8="; + hash = "sha256-3Hj/6pFLwJkVfsUIkX9lP8cOa1cVjobqHZd/cnH0TaU="; }; doCheck = true; diff --git a/pkgs/development/python-modules/aiooss2/default.nix b/pkgs/development/python-modules/aiooss2/default.nix index 0c1abce558a84..7bdd692ac2d6e 100644 --- a/pkgs/development/python-modules/aiooss2/default.nix +++ b/pkgs/development/python-modules/aiooss2/default.nix @@ -1,21 +1,22 @@ -{ lib -, aiohttp -, buildPythonPackage -, fetchFromGitHub -, oss2 -, pytest-asyncio -, pytest-mock -, pytestCheckHook -, pythonOlder -, pythonRelaxDepsHook -, requests -, setuptools -, setuptools-scm +{ + lib, + aiohttp, + buildPythonPackage, + fetchFromGitHub, + oss2, + pytest-asyncio, + pytest-mock, + pytestCheckHook, + pythonOlder, + pythonRelaxDepsHook, + requests, + setuptools, + setuptools-scm, }: buildPythonPackage rec { pname = "aiooss2"; - version = "0.2.10"; + version = "0.2.11"; pyproject = true; disabled = pythonOlder "3.8"; @@ -24,7 +25,7 @@ buildPythonPackage rec { owner = "karajan1001"; repo = "aiooss2"; rev = "refs/tags/${version}"; - hash = "sha256-xlbOLqillSpN6DHYn7bqTL7qMlicYCXGxO30Z/tiKJY="; + hash = "sha256-6tkJG6Jjvo2OaN9cRbs/7ApcrKiZ5tGSPUfugAx7iJU="; }; pythonRelaxDeps = [ @@ -33,11 +34,12 @@ buildPythonPackage rec { ]; build-system = [ - pythonRelaxDepsHook setuptools setuptools-scm ]; + nativeBuildInputs = [ pythonRelaxDepsHook ]; + dependencies = [ aiohttp oss2 @@ -50,9 +52,7 @@ buildPythonPackage rec { requests ]; - pythonImportsCheck = [ - "aiooss2" - ]; + pythonImportsCheck = [ "aiooss2" ]; disabledTestPaths = [ # Tests require network access diff --git a/pkgs/development/python-modules/aliyun-python-sdk-core/default.nix b/pkgs/development/python-modules/aliyun-python-sdk-core/default.nix index 1ead4ce1427cf..57323e4b189d5 100644 --- a/pkgs/development/python-modules/aliyun-python-sdk-core/default.nix +++ b/pkgs/development/python-modules/aliyun-python-sdk-core/default.nix @@ -1,29 +1,33 @@ -{ lib -, buildPythonPackage -, cryptography -, fetchPypi -, jmespath -, pythonOlder -, pythonRelaxDepsHook +{ + lib, + buildPythonPackage, + cryptography, + fetchPypi, + jmespath, + pythonOlder, + pythonRelaxDepsHook, + setuptools, }: buildPythonPackage rec { pname = "aliyun-python-sdk-core"; - version = "2.15.0"; - format = "setuptools"; + version = "2.15.1"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-7cRVVIjYqfHGG9QZx74nsjl0sqBSlxtGFPzSKerus4I="; + hash = "sha256-UYVQ0H9TfNOvrDtsk7XJl840QOTQwFTjrL2qgmHpCt8="; }; - nativeBuildInputs = [ - pythonRelaxDepsHook - ]; + pythonRelaxDeps = true; + + build-system = [ setuptools ]; + + nativeBuildInputs = [ pythonRelaxDepsHook ]; - propagatedBuildInputs = [ + dependencies = [ cryptography jmespath ]; @@ -31,11 +35,7 @@ buildPythonPackage rec { # All components are stored in a mono repo doCheck = false; - pythonRelaxDeps = true; - - pythonImportsCheck = [ - "aliyunsdkcore" - ]; + pythonImportsCheck = [ "aliyunsdkcore" ]; meta = with lib; { description = "Core module of Aliyun Python SDK"; diff --git a/pkgs/development/python-modules/ansicolor/default.nix b/pkgs/development/python-modules/ansicolor/default.nix index 697ded7ac4e20..8ec12d37f5989 100644 --- a/pkgs/development/python-modules/ansicolor/default.nix +++ b/pkgs/development/python-modules/ansicolor/default.nix @@ -1,18 +1,35 @@ -{ lib, buildPythonPackage, fetchPypi }: +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pytestCheckHook, + pythonOlder, + setuptools, +}: buildPythonPackage rec { pname = "ansicolor"; version = "0.3.2"; - format = "setuptools"; + pyproject = true; - src = fetchPypi { - inherit pname version; - sha256 = "3b840a6b1184b5f1568635b1adab28147947522707d41ceba02d5ed0a0877279"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "numerodix"; + repo = "ansicolor"; + rev = "refs/tags/${version}"; + hash = "sha256-a/BAU42AfMR8C94GwmrLkvSvolFEjV0LbDypvS9UuOA="; }; + build-system = [ setuptools ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "ansicolor" ]; + meta = with lib; { - homepage = "https://github.com/numerodix/ansicolor/"; description = "A library to produce ansi color output and colored highlighting and diffing"; + homepage = "https://github.com/numerodix/ansicolor/"; license = licenses.asl20; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/apprise/default.nix b/pkgs/development/python-modules/apprise/default.nix index 9f71aac25354a..929280a61b055 100644 --- a/pkgs/development/python-modules/apprise/default.nix +++ b/pkgs/development/python-modules/apprise/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "apprise"; - version = "1.7.5"; + version = "1.7.6"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-CsNLJwCdXGJeh9M+yF+ldwYrV/O87W1yI+F8Wvu0Dmg="; + hash = "sha256-B38JMJzIpskGPb1hSzQ4B9Un1UZpO3/o/FpEM1Av6mw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/asyncstdlib/default.nix b/pkgs/development/python-modules/asyncstdlib/default.nix index c31beceb1496d..d44de866d323f 100644 --- a/pkgs/development/python-modules/asyncstdlib/default.nix +++ b/pkgs/development/python-modules/asyncstdlib/default.nix @@ -1,14 +1,15 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, flit-core -, pytestCheckHook -, pythonOlder +{ + lib, + buildPythonPackage, + fetchFromGitHub, + flit-core, + pytestCheckHook, + pythonOlder, }: buildPythonPackage rec { pname = "asyncstdlib"; - version = "3.12.2"; + version = "3.12.3"; pyproject = true; disabled = pythonOlder "3.9"; @@ -17,20 +18,14 @@ buildPythonPackage rec { owner = "maxfischer2781"; repo = "asyncstdlib"; rev = "refs/tags/v${version}"; - hash = "sha256-5DQM8m3aeCZAXOi+Rm+iM409juBBYdZDNqBAbhyTm/M="; + hash = "sha256-OLb4+7FFeVDW0ePyVJW8aaosouxlU/4Uq2ktvVLpDFY="; }; - build-system = [ - flit-core - ]; + build-system = [ flit-core ]; - nativeCheckInputs = [ - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ - "asyncstdlib" - ]; + pythonImportsCheck = [ "asyncstdlib" ]; meta = with lib; { description = "Python library that extends the Python asyncio standard library"; diff --git a/pkgs/development/python-modules/attrdict/default.nix b/pkgs/development/python-modules/attrdict/default.nix index 4054fbd78b687..fb7bc91ad1324 100644 --- a/pkgs/development/python-modules/attrdict/default.nix +++ b/pkgs/development/python-modules/attrdict/default.nix @@ -1,17 +1,17 @@ -{ lib -, buildPythonPackage -, fetchPypi -, coverage -, pythonOlder -, nose -, pytestCheckHook -, six +{ + lib, + buildPythonPackage, + fetchPypi, + pytestCheckHook, + pythonOlder, + setuptools, + six, }: buildPythonPackage rec { pname = "attrdict"; version = "2.0.1"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -20,36 +20,30 @@ buildPythonPackage rec { hash = "sha256-NckGmLVcaDlGCRF3F3qenAcToIYPDgSf69cmSczXe3A="; }; - propagatedBuildInputs = [ - six - ]; - - nativeCheckInputs = [ - coverage - nose - ]; - postPatch = '' substituteInPlace attrdict/merge.py \ - --replace "from collections" "from collections.abc" + --replace-fail "from collections" "from collections.abc" substituteInPlace attrdict/mapping.py \ - --replace "from collections" "from collections.abc" + --replace-fail "from collections" "from collections.abc" substituteInPlace attrdict/default.py \ - --replace "from collections" "from collections.abc" + --replace-fail "from collections" "from collections.abc" substituteInPlace attrdict/mixins.py \ - --replace "from collections" "from collections.abc" + --replace-fail "from collections" "from collections.abc" ''; + build-system = [ setuptools ]; + + dependencies = [ six ]; + # Tests are not shipped and source is not tagged doCheck = false; - pythonImportsCheck = [ - "attrdict" - ]; + pythonImportsCheck = [ "attrdict" ]; meta = with lib; { description = "A dict with attribute-style access"; homepage = "https://github.com/bcj/AttrDict"; + changelog = "https://github.com/bcj/AttrDict/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/azure-appconfiguration/default.nix b/pkgs/development/python-modules/azure-appconfiguration/default.nix index 40726506f72b5..7beb170dd22c4 100644 --- a/pkgs/development/python-modules/azure-appconfiguration/default.nix +++ b/pkgs/development/python-modules/azure-appconfiguration/default.nix @@ -1,24 +1,28 @@ -{ lib -, pythonOlder -, isodate -, fetchPypi -, buildPythonPackage -, azure-core +{ + lib, + azure-core, + buildPythonPackage, + fetchPypi, + isodate, + pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "azure-appconfiguration"; - version = "1.5.0"; - format = "setuptools"; + version = "1.6.0"; + pyporject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-cJIRe68GzY6T7ukhN+coF2m0AD/EFtSh7aZGuyVkAnw="; + hash = "sha256-z2KKPh6mZDR5ZDzSRt2kZO3Eq3hXQzOaao/oCbwTf+w="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ azure-core isodate ]; @@ -26,9 +30,7 @@ buildPythonPackage rec { # Tests are not shipped doCheck = false; - pythonImportsCheck = [ - "azure.appconfiguration" - ]; + pythonImportsCheck = [ "azure.appconfiguration" ]; meta = with lib; { description = "Microsoft App Configuration Data Library for Python"; diff --git a/pkgs/development/python-modules/bip-utils/default.nix b/pkgs/development/python-modules/bip-utils/default.nix index 079653a2aec17..c4709e80845d4 100644 --- a/pkgs/development/python-modules/bip-utils/default.nix +++ b/pkgs/development/python-modules/bip-utils/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "bip-utils"; - version = "2.9.2"; + version = "2.9.3"; pyproject = true; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "ebellocchia"; repo = "bip_utils"; rev = "refs/tags/v${version}"; - hash = "sha256-qK1jSVfkebB9JM0sZjOu7ABc7xMrcybu1r7oQOw3bJo="; + hash = "sha256-3G37n/mfI+3JVIkmJWzbB1qPPTE6NJJlFZWdE0fIIWA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/blinkpy/default.nix b/pkgs/development/python-modules/blinkpy/default.nix index f245b50d13433..4df10e61970c6 100644 --- a/pkgs/development/python-modules/blinkpy/default.nix +++ b/pkgs/development/python-modules/blinkpy/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "blinkpy"; - version = "0.22.6"; + version = "0.22.7"; pyproject = true; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "fronzbot"; repo = "blinkpy"; rev = "refs/tags/v${version}"; - hash = "sha256-46REi+3dUY9dJrhXgKkQ1OfN6XCy1fV9cW6wk82ClOA="; + hash = "sha256-FfjvF6PBM+18JgQBP6vyElQYWMVizAEGk92ILwxpFSk="; }; postPatch = '' diff --git a/pkgs/development/python-modules/botocore-stubs/default.nix b/pkgs/development/python-modules/botocore-stubs/default.nix index 5b2d19b7e4634..0450626be845f 100644 --- a/pkgs/development/python-modules/botocore-stubs/default.nix +++ b/pkgs/development/python-modules/botocore-stubs/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "botocore-stubs"; - version = "1.34.69"; + version = "1.34.84"; pyproject = true; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "botocore_stubs"; inherit version; - hash = "sha256-RjJI/R1ue2igxXvddY0Exr0MXCw7+oGv351k8JMLWbw="; + hash = "sha256-t+D++dPLD7Yw+GvBYB3GLjkvMer9WdtB4y0PIqUpwcc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/bring-api/default.nix b/pkgs/development/python-modules/bring-api/default.nix index 720d06e55560e..8f7751dd912b0 100644 --- a/pkgs/development/python-modules/bring-api/default.nix +++ b/pkgs/development/python-modules/bring-api/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "bring-api"; - version = "0.7.0"; + version = "0.7.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "miaucl"; repo = "bring-api"; rev = "refs/tags/${version}"; - hash = "sha256-fhZMn0v908VzV+JLuS8tM+BPKJBoj77vEh1pINL4Cco="; + hash = "sha256-ca6VNC1AG+BAzEhH+N3cwXL9pIBwAX6qLWMpgkEjn98="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/crc/default.nix b/pkgs/development/python-modules/crc/default.nix index c8abe86e5ebf1..9540e9d315da9 100644 --- a/pkgs/development/python-modules/crc/default.nix +++ b/pkgs/development/python-modules/crc/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "crc"; - version = "6.1.1"; + version = "6.1.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "Nicoretti"; repo = "crc"; rev = "refs/tags/${version}"; - hash = "sha256-GlXDDG8NZ3Lp0IwYKS0+fZG85uVdo4V8mZnCa+za02U="; + hash = "sha256-d946yBMrOIgMXGOr2ej5bvn59D5iAGMese24qdv8l/Y="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/diff-cover/default.nix b/pkgs/development/python-modules/diff-cover/default.nix index b198097ebdb05..9ca63fd2b533e 100644 --- a/pkgs/development/python-modules/diff-cover/default.nix +++ b/pkgs/development/python-modules/diff-cover/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "diff-cover"; - version = "8.0.3"; + version = "9.0.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "diff_cover"; inherit version; - hash = "sha256-OTVlyoZorh4OOOThMrUc8CgIb7Bqen2Ued61Aj4vaNQ="; + hash = "sha256-HchR0/PzIMBI0DYY5MDZhh+koVBrQl0tCaVksgyVZ0o="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/dirigera/default.nix b/pkgs/development/python-modules/dirigera/default.nix index 705d03cbe6d8c..f8618c1e5a894 100644 --- a/pkgs/development/python-modules/dirigera/default.nix +++ b/pkgs/development/python-modules/dirigera/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "dirigera"; - version = "1.1.1"; + version = "1.1.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Leggin"; repo = "dirigera"; rev = "refs/tags/v${version}"; - hash = "sha256-k5xChz3qfClWU131WH0CqaY8qrJXh85NQ0y1iPfnX5Y="; + hash = "sha256-EOnhkfU6DC0IfroHR8O45eNxIyyNS81Z/ptSViqyThU="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/django-ipware/default.nix b/pkgs/development/python-modules/django-ipware/default.nix index 34f17a8d7304f..26b4cc7308b82 100644 --- a/pkgs/development/python-modules/django-ipware/default.nix +++ b/pkgs/development/python-modules/django-ipware/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "django-ipware"; - version = "6.0.4"; + version = "6.0.5"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-YU0PCpEfinZeVbbTWLFxW7he62PR67d0R9CdZF8TQ+g="; + hash = "sha256-s54nQDKH1r6wUT5pQCQBfbpY0Sn9QQoQFKyKFYTnP84="; }; propagatedBuildInputs = [ django ]; diff --git a/pkgs/development/python-modules/eigenpy/default.nix b/pkgs/development/python-modules/eigenpy/default.nix index e3ec6adf2f72b..ccc0254c99970 100644 --- a/pkgs/development/python-modules/eigenpy/default.nix +++ b/pkgs/development/python-modules/eigenpy/default.nix @@ -1,26 +1,32 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, doxygen -, boost -, eigen -, numpy -, scipy +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + doxygen, + boost, + eigen, + jrl-cmakemodules, + numpy, + scipy, }: stdenv.mkDerivation (finalAttrs: { pname = "eigenpy"; - version = "3.4.0"; + version = "3.5.0"; src = fetchFromGitHub { owner = "stack-of-tasks"; - repo = finalAttrs.pname; + repo = "eigenpy"; rev = "v${finalAttrs.version}"; - fetchSubmodules = true; hash = "sha256-/k5eltoeUW05FTjvStAOw+tguWLUaUced8TArrk4UDI="; }; + outputs = [ + "dev" + "out" + ]; + cmakeFlags = [ "-DINSTALL_DOCUMENTATION=ON" "-DBUILD_TESTING_SCIPY=ON" @@ -34,26 +40,26 @@ stdenv.mkDerivation (finalAttrs: { scipy ]; - buildInputs = [ - boost - ]; + buildInputs = [ boost ]; propagatedBuildInputs = [ eigen + jrl-cmakemodules numpy ]; doCheck = true; - pythonImportsCheck = [ - "eigenpy" - ]; + pythonImportsCheck = [ "eigenpy" ]; meta = with lib; { description = "Bindings between Numpy and Eigen using Boost.Python"; homepage = "https://github.com/stack-of-tasks/eigenpy"; changelog = "https://github.com/stack-of-tasks/eigenpy/releases/tag/v${version}"; license = licenses.bsd2; - maintainers = with maintainers; [ nim65s wegank ]; + maintainers = with maintainers; [ + nim65s + wegank + ]; platforms = platforms.unix; }; }) diff --git a/pkgs/development/python-modules/equinox/default.nix b/pkgs/development/python-modules/equinox/default.nix index e679e15d9704a..976406b399b1e 100644 --- a/pkgs/development/python-modules/equinox/default.nix +++ b/pkgs/development/python-modules/equinox/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "equinox"; - version = "0.11.3"; + version = "0.11.4"; pyproject = true; disabled = pythonOlder "3.9"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "patrick-kidger"; repo = "equinox"; rev = "refs/tags/v${version}"; - hash = "sha256-la3gPfwQ2pxfZoEikn9uG+Pc3PKafgEgxZ8oVQEm9YM="; + hash = "sha256-3OwHND1YEdg/SppqiB7pCdp6v+lYwTbtX07tmyEMWDo="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/frozendict/default.nix b/pkgs/development/python-modules/frozendict/default.nix index 3742c9ef9a44d..e1ded2da5f9b5 100644 --- a/pkgs/development/python-modules/frozendict/default.nix +++ b/pkgs/development/python-modules/frozendict/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "frozendict"; - version = "2.4.1"; + version = "2.4.2"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "Marco-Sulla"; repo = "python-frozendict"; rev = "refs/tags/v${version}"; - hash = "sha256-cPDuJ6AzMxOmJztSf6IZ04acJhjJCphQSl0DaN9cChI="; + hash = "sha256-SXUPzFDVw8+CmD/Jxm/EB70UBdOmauQs69hNr0l3l90="; }; # build C version if it exists diff --git a/pkgs/development/python-modules/goodwe/default.nix b/pkgs/development/python-modules/goodwe/default.nix index 7ad1ad90b9eed..8e4eb71a97dc3 100644 --- a/pkgs/development/python-modules/goodwe/default.nix +++ b/pkgs/development/python-modules/goodwe/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "goodwe"; - version = "0.3.2"; + version = "0.3.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "marcelblijleven"; repo = "goodwe"; rev = "refs/tags/v${version}"; - hash = "sha256-0N2aimDj9HF0y1pitg7E2OzGk4o4kopSlvXy9x6jplk="; + hash = "sha256-CIEv3srjyVWQ1UGKVRwPXpzrND/8hTbw6HSlko9+AIk="; }; postPatch = '' diff --git a/pkgs/development/python-modules/google-ai-generativelanguage/default.nix b/pkgs/development/python-modules/google-ai-generativelanguage/default.nix index 888f307938224..f19df6658fd22 100644 --- a/pkgs/development/python-modules/google-ai-generativelanguage/default.nix +++ b/pkgs/development/python-modules/google-ai-generativelanguage/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "google-ai-generativelanguage"; - version = "0.6.1"; + version = "0.6.2"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Sr83AAcYsgxD9LkGcrOriFBziwJFfv/9EfMYTgMnLtI="; + hash = "sha256-MIeRrDudrQFbNZFylwc5qjdT3VQhQqQW0H+foEfiI4Y="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/google-cloud-bigtable/default.nix b/pkgs/development/python-modules/google-cloud-bigtable/default.nix index 1bdec9f84b157..dd6485aa5d24a 100644 --- a/pkgs/development/python-modules/google-cloud-bigtable/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigtable/default.nix @@ -1,36 +1,35 @@ -{ lib -, buildPythonPackage -, fetchPypi -, google-api-core -, google-cloud-core -, grpcio -, grpc-google-iam-v1 -, libcst -, mock -, proto-plus -, protobuf -, pytestCheckHook -, pythonOlder -, setuptools +{ + lib, + buildPythonPackage, + fetchPypi, + google-api-core, + google-cloud-core, + grpcio, + grpc-google-iam-v1, + libcst, + mock, + proto-plus, + protobuf, + pytestCheckHook, + pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "google-cloud-bigtable"; - version = "2.23.0"; + version = "2.23.1"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-w8q7Zhn18u6hGz23JzHoTSixaAVcnMF8LS2v8Vy4I3k="; + hash = "sha256-FHWiK/zhY7XELN9O717AUyPuozWFUpT5zk4j+qIk8Cg="; }; - nativeBuildInputs = [ - setuptools - ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ google-api-core google-cloud-core grpc-google-iam-v1 @@ -39,9 +38,7 @@ buildPythonPackage rec { ] ++ google-api-core.optional-dependencies.grpc; passthru.optional-dependencies = { - libcst = [ - libcst - ]; + libcst = [ libcst ]; }; nativeCheckInputs = [ @@ -55,9 +52,7 @@ buildPythonPackage rec { rm -r google ''; - disabledTests = [ - "policy" - ]; + disabledTests = [ "policy" ]; pythonImportsCheck = [ "google.cloud.bigtable_admin_v2" diff --git a/pkgs/development/python-modules/griffe/default.nix b/pkgs/development/python-modules/griffe/default.nix index 0ae203f6331f3..8f6acc289d6a7 100644 --- a/pkgs/development/python-modules/griffe/default.nix +++ b/pkgs/development/python-modules/griffe/default.nix @@ -1,18 +1,19 @@ -{ lib -, aiofiles -, buildPythonPackage -, colorama -, fetchFromGitHub -, git -, jsonschema -, pdm-backend -, pytestCheckHook -, pythonOlder +{ + lib, + aiofiles, + buildPythonPackage, + colorama, + fetchFromGitHub, + git, + jsonschema, + pdm-backend, + pytestCheckHook, + pythonOlder, }: buildPythonPackage rec { pname = "griffe"; - version = "0.42.1"; + version = "0.42.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,16 +22,12 @@ buildPythonPackage rec { owner = "mkdocstrings"; repo = "griffe"; rev = "refs/tags/${version}"; - hash = "sha256-KaD3j96FJJx43m/nfHa4kAft4FcDOdq+2dsiaMY7PPY="; + hash = "sha256-W6aOhz8UxJUc2kNRc4JaCqFgIOXsY8ctyQ3xZ+YaD9k="; }; - nativeBuildInputs = [ - pdm-backend - ]; + build-system = [ pdm-backend ]; - propagatedBuildInputs = [ - colorama - ]; + dependencies = [ colorama ]; nativeCheckInputs = [ git @@ -39,21 +36,17 @@ buildPythonPackage rec { ]; passthru.optional-dependencies = { - async = [ - aiofiles - ]; + async = [ aiofiles ]; }; - pythonImportsCheck = [ - "griffe" - ]; + pythonImportsCheck = [ "griffe" ]; meta = with lib; { description = "Signatures for entire Python programs"; - mainProgram = "griffe"; homepage = "https://github.com/mkdocstrings/griffe"; changelog = "https://github.com/mkdocstrings/griffe/blob/${version}/CHANGELOG.md"; license = licenses.isc; maintainers = with maintainers; [ fab ]; + mainProgram = "griffe"; }; } diff --git a/pkgs/development/python-modules/hishel/default.nix b/pkgs/development/python-modules/hishel/default.nix index 112d8759c62c3..a4ab7b504a91a 100644 --- a/pkgs/development/python-modules/hishel/default.nix +++ b/pkgs/development/python-modules/hishel/default.nix @@ -1,18 +1,19 @@ -{ lib -, anysqlite -, boto3 -, buildPythonPackage -, fetchFromGitHub -, hatch-fancy-pypi-readme -, hatchling -, httpx -, moto -, pytest-asyncio -, pytestCheckHook -, pythonOlder -, pyyaml -, redis -, trio +{ + lib, + anysqlite, + boto3, + buildPythonPackage, + fetchFromGitHub, + hatch-fancy-pypi-readme, + hatchling, + httpx, + moto, + pytest-asyncio, + pytestCheckHook, + pythonOlder, + pyyaml, + redis, + trio, }: buildPythonPackage rec { @@ -34,23 +35,13 @@ buildPythonPackage rec { hatchling ]; - dependencies = [ - httpx - ]; + dependencies = [ httpx ]; passthru.optional-dependencies = { - redis = [ - redis - ]; - s3 = [ - boto3 - ]; - sqlite = [ - anysqlite - ]; - yaml = [ - pyyaml - ]; + redis = [ redis ]; + s3 = [ boto3 ]; + sqlite = [ anysqlite ]; + yaml = [ pyyaml ]; }; nativeCheckInputs = [ @@ -60,9 +51,7 @@ buildPythonPackage rec { trio ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); - pythonImportsCheck = [ - "hishel" - ]; + pythonImportsCheck = [ "hishel" ]; disabledTests = [ # Tests require a running Redis instance @@ -83,4 +72,3 @@ buildPythonPackage rec { maintainers = with maintainers; [ fab ]; }; } - diff --git a/pkgs/development/python-modules/holidays/default.nix b/pkgs/development/python-modules/holidays/default.nix index d194a28123f84..82dc5a9882cfe 100644 --- a/pkgs/development/python-modules/holidays/default.nix +++ b/pkgs/development/python-modules/holidays/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "holidays"; - version = "0.46"; + version = "0.47"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "vacanza"; repo = "python-holidays"; rev = "refs/tags/v${version}"; - hash = "sha256-v0tufmOtxUP5pTsNNJJ9fevCPnsa68e0mdDtKGXEgVs="; + hash = "sha256-A4viSzUia4QBdD0svkqYtsCq/la7Nrf2xu/fVDZHb00="; }; build-system = [ diff --git a/pkgs/development/python-modules/ifconfig-parser/default.nix b/pkgs/development/python-modules/ifconfig-parser/default.nix index 0a7013066b603..29241983c4c71 100644 --- a/pkgs/development/python-modules/ifconfig-parser/default.nix +++ b/pkgs/development/python-modules/ifconfig-parser/default.nix @@ -1,24 +1,36 @@ -{ lib, buildPythonPackage, fetchFromGitHub }: +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + pythonOlder, +}: buildPythonPackage rec { pname = "ifconfig-parser"; version = "0.0.5"; - format = "setuptools"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "KnightWhoSayNi"; - repo = pname; + repo = "ifconfig-parser"; rev = "4921ac9d6be6244b062d082c164f5a5e69522478"; - sha256 = "07hbkbr1qspr7qgzldkaslzc6ripj5zlif12d4fk5j801yhvnxjd"; + hash = "sha256-TXa7oQ8AyTIdaSK4SH+RN2bDPtVqNvofPvlqHPKaCx4="; }; + build-system = [ setuptools ]; + checkPhase = '' export PYTHONPATH=$PYTHONPATH:$(pwd)/ifconfigparser:$(pwd)/ifconfigparser/tests python -m unittest -v test_ifconfig_parser.TestIfconfigParser ''; + pythonImportsCheck = [ "ifconfigparser" ]; + meta = with lib; { - description = "Unsophisticated python package for parsing raw output of ifconfig."; + description = "Module for parsing raw output of ifconfig"; homepage = "https://github.com/KnightWhoSayNi/ifconfig-parser"; license = licenses.mit; maintainers = with maintainers; [ atemu ]; diff --git a/pkgs/development/python-modules/influxdb3-python/default.nix b/pkgs/development/python-modules/influxdb3-python/default.nix new file mode 100644 index 0000000000000..f023b498c05a1 --- /dev/null +++ b/pkgs/development/python-modules/influxdb3-python/default.nix @@ -0,0 +1,57 @@ +{ lib +, buildPythonPackage +, certifi +, fetchFromGitHub +, pyarrow +, pytestCheckHook +, python-dateutil +, pythonOlder +, reactivex +, setuptools +, urllib3 +}: + +buildPythonPackage rec { + pname = "influxdb3-python"; + version = "0.3.6"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "InfluxCommunity"; + repo = "influxdb3-python"; + rev = "refs/tags/v${version}"; + hash = "sha256-ZKN3chJvtOenk2jp02rvw+HooJcee0hwxWoLvEYjfcg="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + certifi + pyarrow + python-dateutil + reactivex + urllib3 + ]; + + # Missing ORC support + # https://github.com/NixOS/nixpkgs/issues/212863 + # nativeCheckInputs = [ + # pytestCheckHook + # ]; + # + # pythonImportsCheck = [ + # "influxdb_client_3" + # ]; + + meta = with lib; { + description = "Python module that provides a simple and convenient way to interact with InfluxDB 3.0"; + homepage = "https://github.com/InfluxCommunity/influxdb3-python"; + changelog = "https://github.com/InfluxCommunity/influxdb3-python/releases/tag/v${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/internetarchive/default.nix b/pkgs/development/python-modules/internetarchive/default.nix index 6df7a76dadd53..40f97138bb109 100644 --- a/pkgs/development/python-modules/internetarchive/default.nix +++ b/pkgs/development/python-modules/internetarchive/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "internetarchive"; - version = "3.7.0"; + version = "4.0.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "jjjake"; repo = "internetarchive"; rev = "refs/tags/v${version}"; - hash = "sha256-krMOjXzI9tmLGLEswXLLqc8J68Gwnl1VrRO2fLbDv0o="; + hash = "sha256-U6idxc5U2Bt581c/vnGgIou5+hoEJJZSPCo97MEDaW4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/json5/default.nix b/pkgs/development/python-modules/json5/default.nix index b244a79114c08..1b071aadb59c6 100644 --- a/pkgs/development/python-modules/json5/default.nix +++ b/pkgs/development/python-modules/json5/default.nix @@ -1,6 +1,5 @@ { buildPythonPackage , fetchFromGitHub -, hypothesis , lib , pytestCheckHook }: @@ -18,7 +17,6 @@ buildPythonPackage rec { }; nativeCheckInputs = [ - hypothesis pytestCheckHook ]; diff --git a/pkgs/development/python-modules/jsonfeed/default.nix b/pkgs/development/python-modules/jsonfeed/default.nix new file mode 100644 index 0000000000000..8cde64656acce --- /dev/null +++ b/pkgs/development/python-modules/jsonfeed/default.nix @@ -0,0 +1,43 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + setuptools, + pythonOlder, + requests, +}: + +buildPythonPackage rec { + pname = "jsonfeed"; + version = "0.0.1"; + pyproject = true; + + disabled = pythonOlder "3.9"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-Etfi59oOCrLHavLRMQo3HASFnydrBnsyEtGUgcsv1aQ="; + }; + + postPatch = '' + # Mixing of dev and runtime requirements + substituteInPlace setup.py \ + --replace-fail "install_requires=install_requires," "install_requires=[]," + ''; + + build-system = [ setuptools ]; + + dependencies = [ requests ]; + + # Module has no tests, only a placeholder + doCheck = false; + + pythonImportsCheck = [ "jsonfeed" ]; + + meta = with lib; { + description = "Module to process json feed"; + homepage = "https://pypi.org/project/jsonfeed/"; + license = licenses.bsd2; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/litellm/default.nix b/pkgs/development/python-modules/litellm/default.nix index 6fc8f23d754fe..3c4c70bc40953 100644 --- a/pkgs/development/python-modules/litellm/default.nix +++ b/pkgs/development/python-modules/litellm/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { pname = "litellm"; - version = "1.35.1"; + version = "1.35.4"; pyproject = true; disabled = pythonOlder "3.8"; @@ -42,7 +42,7 @@ buildPythonPackage rec { owner = "BerriAI"; repo = "litellm"; rev = "refs/tags/v${version}"; - hash = "sha256-bFAoaKH1y+Q5JE7OEY8w5hX3+6LAgswaCx1bKYmLZX0="; + hash = "sha256-5z2qyzDMfksxlj2KxAGw5TYn3aXbeUHZvwHiNjeWmLA="; }; postPatch = '' diff --git a/pkgs/development/python-modules/llama-index-core/default.nix b/pkgs/development/python-modules/llama-index-core/default.nix index c31ec174efa80..3aae1bc641ff1 100644 --- a/pkgs/development/python-modules/llama-index-core/default.nix +++ b/pkgs/development/python-modules/llama-index-core/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pname = "llama-index-core"; - version = "0.10.28.post1"; + version = "0.10.29"; pyproject = true; disabled = pythonOlder "3.8"; @@ -40,7 +40,7 @@ buildPythonPackage rec { owner = "run-llama"; repo = "llama_index"; rev = "refs/tags/v${version}"; - hash = "sha256-BOpKaOP0DdBdVB0bMrAwXG5xaZ3AXnHX3/sHt1GRWJs="; + hash = "sha256-4Tamo5r7EKmLIVymFX9UbFY6vxhgl3dY7xntmDeGn4M="; }; sourceRoot = "${src.name}/${pname}"; diff --git a/pkgs/development/python-modules/llama-index-readers-file/default.nix b/pkgs/development/python-modules/llama-index-readers-file/default.nix index f62da3ce969fb..3b4b0d6250ee3 100644 --- a/pkgs/development/python-modules/llama-index-readers-file/default.nix +++ b/pkgs/development/python-modules/llama-index-readers-file/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "llama-index-readers-file"; - version = "0.1.16"; + version = "0.1.18"; pyproject = true; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_readers_file"; inherit version; - hash = "sha256-fyW4/drxqRusBsZnJ7kTtI4m72hxT81RlwUbP3EPTPo="; + hash = "sha256-kcmHHoDXyRGk4rsmXuRsPbapPWgbpt33MXUs13ZLNos="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/llama-parse/default.nix b/pkgs/development/python-modules/llama-parse/default.nix index 5d63c234fa077..05a80dcd08c10 100644 --- a/pkgs/development/python-modules/llama-parse/default.nix +++ b/pkgs/development/python-modules/llama-parse/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "llama-parse"; - version = "0.4.0"; + version = "0.4.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_parse"; inherit version; - hash = "sha256-7lIelCLbSNvfADA8tukPEGYTGWC1yk4U9bWm22t5F+I="; + hash = "sha256-1yOvhNah/JnrQxkV0hhl0gt22KJG26oSTR+WyVamRPc="; }; build-system = [ diff --git a/pkgs/development/python-modules/lmcloud/default.nix b/pkgs/development/python-modules/lmcloud/default.nix index 13fc93d3c7070..cf98928e32acc 100644 --- a/pkgs/development/python-modules/lmcloud/default.nix +++ b/pkgs/development/python-modules/lmcloud/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "lmcloud"; - version = "1.1.9"; + version = "1.1.10"; pyproject = true; disabled = pythonOlder "3.11"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "zweckj"; repo = "lmcloud"; rev = "refs/tags/v${version}"; - hash = "sha256-0+UDSg57E/VvAU9pDZJ4LZYRY5TUlCgdPwVh5Nhohl4="; + hash = "sha256-oPUZ5EAvFhzMfAK5rbiy8O10FTSseWj7JHCZvZ/7PG4="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/lxml-html-clean/default.nix b/pkgs/development/python-modules/lxml-html-clean/default.nix new file mode 100644 index 0000000000000..7c9b1b9de985d --- /dev/null +++ b/pkgs/development/python-modules/lxml-html-clean/default.nix @@ -0,0 +1,40 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + lxml, + unittestCheckHook, + pythonOlder, + setuptools, +}: + +buildPythonPackage rec { + pname = "lxml-html-clean"; + version = "0.1.1"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "fedora-python"; + repo = "lxml_html_clean"; + rev = "refs/tags/${version}"; + hash = "sha256-vnRsSkhjeDxZ2bYbIe+2D4GjymZWcIVo2LAPuCaYIZo="; + }; + + build-system = [ setuptools ]; + + dependencies = [ lxml ]; + + nativeCheckInputs = [ unittestCheckHook ]; + + pythonImportsCheck = [ "lxml_html_clean" ]; + + meta = with lib; { + description = "Separate project for HTML cleaning functionalities copied from lxml.html.clean"; + homepage = "https://github.com/fedora-python/lxml_html_clean/"; + changelog = "https://github.com/fedora-python/lxml_html_clean/blob/${version}/CHANGES.rst"; + license = licenses.bsd3; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/mdformat-mkdocs/default.nix b/pkgs/development/python-modules/mdformat-mkdocs/default.nix index a7740111324f3..8bca9230d9144 100644 --- a/pkgs/development/python-modules/mdformat-mkdocs/default.nix +++ b/pkgs/development/python-modules/mdformat-mkdocs/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "mdformat-mkdocs"; - version = "2.0.7"; + version = "2.0.8"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "KyleKing"; repo = "mdformat-mkdocs"; rev = "refs/tags/v${version}"; - hash = "sha256-8fatoXZTi7yQhbs95AN8japcPfbqcpjsDiLlqsG0QWI="; + hash = "sha256-HBRhmCqi13D+y+Vp2F27twU2eaRmJTcAzGOPCWMDtZU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/microsoft-kiota-serialization-json/default.nix b/pkgs/development/python-modules/microsoft-kiota-serialization-json/default.nix index a9bf517e06baa..56bb4f5f8670e 100644 --- a/pkgs/development/python-modules/microsoft-kiota-serialization-json/default.nix +++ b/pkgs/development/python-modules/microsoft-kiota-serialization-json/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "microsoft-kiota-serialization-json"; - version = "1.1.0"; + version = "1.2.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "microsoft"; repo = "kiota-serialization-json-python"; rev = "refs/tags/v${version}"; - hash = "sha256-igMqwoKArfQ37pzdjUICgXY795dfg/MX65iwTVe0sLM="; + hash = "sha256-/Bar1tQ3w8kfC53OuKxTlS+Dq4sX47lev7fjJeo6JJ0="; }; build-system = [ flit-core ]; diff --git a/pkgs/development/python-modules/mkdocs-material/default.nix b/pkgs/development/python-modules/mkdocs-material/default.nix index 3b4e459669e41..f344a92445ab6 100644 --- a/pkgs/development/python-modules/mkdocs-material/default.nix +++ b/pkgs/development/python-modules/mkdocs-material/default.nix @@ -1,38 +1,34 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub - -# build-system -, hatch-requirements-txt -, hatch-nodejs-version -, hatchling -, trove-classifiers - -# dependencies -, babel -, colorama -, jinja2 -, markdown -, mkdocs -, mkdocs-material-extensions -, paginate -, pygments -, pymdown-extensions -, pythonOlder -, regex -, requests - -# optional-dependencies -, mkdocs-minify-plugin -, mkdocs-redirects -, mkdocs-git-revision-date-localized-plugin -, pillow -, cairosvg +{ + lib, + babel, + buildPythonPackage, + cairosvg, + colorama, + fetchFromGitHub, + hatch-nodejs-version, + hatch-requirements-txt, + hatchling, + jinja2, + markdown, + mkdocs, + mkdocs-git-revision-date-localized-plugin, + mkdocs-material-extensions, + mkdocs-minify-plugin, + mkdocs-redirects, + mkdocs-rss-plugin, + paginate, + pillow, + pygments, + pymdown-extensions, + pythonOlder, + regex, + requests, + trove-classifiers, }: buildPythonPackage rec { pname = "mkdocs-material"; - version = "9.5.17"; + version = "9.5.18"; pyproject = true; disabled = pythonOlder "3.7"; @@ -41,7 +37,7 @@ buildPythonPackage rec { owner = "squidfunk"; repo = "mkdocs-material"; rev = "refs/tags/${version}"; - hash = "sha256-r+w3Nf7mAfWiDUeOelO+ykizeqxRiKWBnbUjakXov3U="; + hash = "sha256-5FCIDAWRY6YfZi4QbcEpJMFfbJ17vudxlUYx4czDxrY="; }; nativeBuildInputs = [ @@ -69,7 +65,7 @@ buildPythonPackage rec { recommended = [ mkdocs-minify-plugin mkdocs-redirects - # TODO: mkdocs-rss-plugin + mkdocs-rss-plugin ]; git = [ # TODO: gmkdocs-git-committers-plugin @@ -84,9 +80,7 @@ buildPythonPackage rec { # No tests for python doCheck = false; - pythonImportsCheck = [ - "mkdocs" - ]; + pythonImportsCheck = [ "mkdocs" ]; meta = with lib; { changelog = "https://github.com/squidfunk/mkdocs-material/blob/${src.rev}/CHANGELOG"; diff --git a/pkgs/development/python-modules/mkdocs-rss-plugin/default.nix b/pkgs/development/python-modules/mkdocs-rss-plugin/default.nix new file mode 100644 index 0000000000000..5328c196c31e3 --- /dev/null +++ b/pkgs/development/python-modules/mkdocs-rss-plugin/default.nix @@ -0,0 +1,69 @@ +{ + lib, + buildPythonPackage, + feedparser, + fetchFromGitHub, + gitpython, + jsonfeed, + mkdocs, + pytestCheckHook, + pythonOlder, + setuptools, + validator-collection, +}: + +buildPythonPackage rec { + pname = "mkdocs-rss-plugin"; + version = "1.12.1"; + pyproject = true; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "Guts"; + repo = "mkdocs-rss-plugin"; + rev = "refs/tags/${version}"; + hash = "sha256-cLQfhMYW/9Eb+IamQIC7fZRTm/ORD8xbcrmKkSkUrMs="; + }; + + postPatch = '' + sed -i "/--cov/d" setup.cfg + ''; + + build-system = [ setuptools ]; + + dependencies = [ + gitpython + mkdocs + ]; + + nativeCheckInputs = [ + feedparser + jsonfeed + pytestCheckHook + validator-collection + ]; + + pythonImportsCheck = [ "mkdocs_rss_plugin" ]; + + disabledTests = [ + # Tests require network access + "test_plugin_config_through_mkdocs" + "test_remote_image_ok" + ]; + + disabledTestPaths = [ + # Tests require network access + "tests/test_integrations_material_social_cards.py" + "tests/test_build_no_git.py" + "tests/test_build.py" + ]; + + meta = with lib; { + description = "MkDocs plugin to generate a RSS feeds for created and updated pages, using git log and YAML frontmatter"; + homepage = "https://github.com/Guts/mkdocs-rss-plugin"; + changelog = "https://github.com/Guts/mkdocs-rss-plugin/blob/${src.rev}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/myst-nb/default.nix b/pkgs/development/python-modules/myst-nb/default.nix index cf3d309420eb7..644724c4126f6 100644 --- a/pkgs/development/python-modules/myst-nb/default.nix +++ b/pkgs/development/python-modules/myst-nb/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "myst-nb"; - version = "1.0.0"; + version = "1.1.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -26,7 +26,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "myst_nb"; - hash = "sha256-kHfkKhxrRB6lUHhQb4NVXdpdbIFu9JMIQdcdI54+DF4="; + hash = "sha256-kniEDoRPXXgLWsxUAMv2PZfKrM+OtEKlXr2aA+JSLV4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/napalm/default.nix b/pkgs/development/python-modules/napalm/default.nix index 9b835d52737a2..2c3f2b76f0ae7 100644 --- a/pkgs/development/python-modules/napalm/default.nix +++ b/pkgs/development/python-modules/napalm/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { pname = "napalm"; - version = "4.1.0"; + version = "5.0.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -43,7 +43,7 @@ buildPythonPackage rec { owner = "napalm-automation"; repo = "napalm"; rev = "refs/tags/${version}"; - hash = "sha256-JqjuYMJcP58UMn1pPYg7x8KpqCKQUs19Ng9HbI2iX38="; + hash = "sha256-Abw3h69qTFwOOFeAfivqAIWLozErJ1yZZfx7CbMy1AI="; }; nativeBuildInputs = [ @@ -52,7 +52,6 @@ buildPythonPackage rec { propagatedBuildInputs = [ cffi - future jinja2 junos-eznc lxml diff --git a/pkgs/development/python-modules/nox/default.nix b/pkgs/development/python-modules/nox/default.nix index 6fee91c77fced..a006c0cbd2d6f 100644 --- a/pkgs/development/python-modules/nox/default.nix +++ b/pkgs/development/python-modules/nox/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "nox"; - version = "2024.03.02"; + version = "2024.04.15"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "wntrblm"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-P86Jy/5MQnuWHelJFQ4kUCFg86Dwzx0Sm/sRonf0pZk="; + hash = "sha256-PagZR2IdS1gS/ukl4b0Al9sdEsFnFwP8oy0eOGKJHMs="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/oca-port/default.nix b/pkgs/development/python-modules/oca-port/default.nix index 13a146b1dce67..c6429d3582bc5 100644 --- a/pkgs/development/python-modules/oca-port/default.nix +++ b/pkgs/development/python-modules/oca-port/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "oca-port"; - version = "0.14"; + version = "0.15"; format = "pyproject"; src = fetchPypi { inherit version; pname = "oca_port"; - hash = "sha256-P+uCoC2u5lR4oTtloNFd4N+CjssUa5PbzbnhEulaRoc="; + hash = "sha256-DqoIzZj++XF2ZYECpLQX1RD97Y3I2uvs1OI7QyfB7dE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/onnxruntime/default.nix b/pkgs/development/python-modules/onnxruntime/default.nix index 8fea2e6d9117e..0982a12c4572d 100644 --- a/pkgs/development/python-modules/onnxruntime/default.nix +++ b/pkgs/development/python-modules/onnxruntime/default.nix @@ -53,7 +53,13 @@ buildPythonPackage { oneDNN re2 onnxruntime.protobuf - ]; + ] ++ lib.optionals onnxruntime.passthru.cudaSupport (with onnxruntime.passthru.cudaPackages; [ + libcublas # libcublasLt.so.XX libcublas.so.XX + libcurand # libcurand.so.XX + libcufft # libcufft.so.XX + cudnn # libcudnn.soXX + cuda_cudart # libcudart.so.XX + ]); propagatedBuildInputs = [ coloredlogs diff --git a/pkgs/development/python-modules/openusd/default.nix b/pkgs/development/python-modules/openusd/default.nix index 4b323b25669d1..52a4bdc40573b 100644 --- a/pkgs/development/python-modules/openusd/default.nix +++ b/pkgs/development/python-modules/openusd/default.nix @@ -48,13 +48,13 @@ in buildPythonPackage rec { pname = "openusd"; - version = "23.11"; + version = "24.03"; src = fetchFromGitHub { owner = "PixarAnimationStudios"; repo = "OpenUSD"; rev = "refs/tags/v${version}"; - hash = "sha256-5zQrfB14kXs75WbL3s4eyhxELglhLNxU2L2aVXiyVjg="; + hash = "sha256-EYf8GhXhsAx0Wxz9ibDZEV4E5scL3GPiu3Nje7N5C/I="; }; stdenv = if python.stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else python.stdenv; @@ -147,9 +147,6 @@ buildPythonPackage rec { '' + lib.optionalString withDocs '' mv $out/docs $doc - '' - + '' - rm $out/share -r # only examples ''; meta = { diff --git a/pkgs/development/python-modules/oracledb/default.nix b/pkgs/development/python-modules/oracledb/default.nix index da45e616b42c4..6bba7f7191ea7 100644 --- a/pkgs/development/python-modules/oracledb/default.nix +++ b/pkgs/development/python-modules/oracledb/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "oracledb"; - version = "2.1.1"; + version = "2.1.2"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-4ugXz6bf82xxMXNvNOKq7HXXJv040ZENgxgGGieCKPo="; + hash = "sha256-MFS8wpXXN4g0unpazrhlmF6VSRX5sHqEPqhMOCTGoLI="; }; build-system = [ diff --git a/pkgs/development/python-modules/playwrightcapture/default.nix b/pkgs/development/python-modules/playwrightcapture/default.nix index 283a9ae38f312..367ccb2e669d3 100644 --- a/pkgs/development/python-modules/playwrightcapture/default.nix +++ b/pkgs/development/python-modules/playwrightcapture/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "playwrightcapture"; - version = "1.24.3"; + version = "1.24.4"; pyproject = true; disabled = pythonOlder "3.8"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "Lookyloo"; repo = "PlaywrightCapture"; rev = "refs/tags/v${version}"; - hash = "sha256-T/6WfDFW4m9bB09mBwKw1I0iQ0HF0I2Pzf2MXExJVGY="; + hash = "sha256-/6Sdn4SdJ7e2Lm6Gl0oaLNWeb6XouLgtjNJbVYstL4w="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/publicsuffixlist/default.nix b/pkgs/development/python-modules/publicsuffixlist/default.nix index eb9b8e6a34639..e80b04011e94c 100644 --- a/pkgs/development/python-modules/publicsuffixlist/default.nix +++ b/pkgs/development/python-modules/publicsuffixlist/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "publicsuffixlist"; - version = "0.10.0.20240412"; + version = "0.10.0.20240416"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-G2hdl029MlirHH9HNEnPKlUnWnSplbYKhBDw8H1/W3g="; + hash = "sha256-Y0QP9SNJQOMGEKAEeDwKNTRQtFiwUOWGLbkGJx66SBk="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pulsar/default.nix b/pkgs/development/python-modules/pulsar/default.nix index 472b9cb0527a0..b6dfde67706b5 100644 --- a/pkgs/development/python-modules/pulsar/default.nix +++ b/pkgs/development/python-modules/pulsar/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "pulsar"; - version = "3.4.0"; + version = "3.5.0"; format = "setuptools"; src = fetchFromGitHub { owner = "apache"; repo = "pulsar-client-python"; - rev = "v${version}"; - hash = "sha256-WcD88s8V4AT/juW0qmYHdtYzrS3hWeom/4r8TETlmFE="; + rev = "refs/tags/v${version}"; + hash = "sha256-2Ahv0lfeHuBhGIYhiTjKegEKsJqHkpK3Qu6xBnjsanI="; }; disabled = pythonOlder "3.7"; diff --git a/pkgs/development/python-modules/py-synologydsm-api/default.nix b/pkgs/development/python-modules/py-synologydsm-api/default.nix index 26a101389eb77..3bf3e8c67d1d9 100644 --- a/pkgs/development/python-modules/py-synologydsm-api/default.nix +++ b/pkgs/development/python-modules/py-synologydsm-api/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "py-synologydsm-api"; - version = "2.3.0"; + version = "2.4.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "mib1185"; repo = "py-synologydsm-api"; rev = "refs/tags/v${version}"; - hash = "sha256-lSNdwM+b91XWILKjGsi73Tu29spOdnFznuE7ELg+mhw="; + hash = "sha256-EeUJOdGmYGy75/3RR5AeTu4oImnZGesve5pE+5YsTCI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pyemvue/default.nix b/pkgs/development/python-modules/pyemvue/default.nix index 22e7e667929db..b6f42daac6208 100644 --- a/pkgs/development/python-modules/pyemvue/default.nix +++ b/pkgs/development/python-modules/pyemvue/default.nix @@ -14,12 +14,12 @@ buildPythonPackage rec { pname = "pyemvue"; - version = "0.18.4"; + version = "0.18.5"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-PTRVabYbT7Xwjkm+Oz56YjNb5Xwcgxn+IvXeazKsHyY="; + hash = "sha256-cgQARaGM6Jb2kEcG7HqPStRPkhHldJ7UbxQpxN6JbZE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pygccxml/default.nix b/pkgs/development/python-modules/pygccxml/default.nix index 10336a27549f3..0d9b12edec7dc 100644 --- a/pkgs/development/python-modules/pygccxml/default.nix +++ b/pkgs/development/python-modules/pygccxml/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pygccxml"; - version = "2.4.0"; + version = "2.5.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "gccxml"; repo = "pygccxml"; rev = "refs/tags/v${version}"; - hash = "sha256-rw99afv68c92LWmKUErB1y0Cts69UEpI0GCxSMvD+B8="; + hash = "sha256-wHZy2BG3h+OMTvIAPtLlq1vsW5V/TqZdnzBJ9VipMiQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pylitterbot/default.nix b/pkgs/development/python-modules/pylitterbot/default.nix index 0c33c0b2cdf58..ecf1ca2e4ef61 100644 --- a/pkgs/development/python-modules/pylitterbot/default.nix +++ b/pkgs/development/python-modules/pylitterbot/default.nix @@ -1,38 +1,39 @@ -{ lib -, aiohttp -, aioresponses -, buildPythonPackage -, fetchFromGitHub -, poetry-core -, poetry-dynamic-versioning -, pyjwt -, pytest-aiohttp -, pytest-freezegun -, pytestCheckHook -, pythonOlder -, deepdiff +{ + lib, + aiohttp, + aioresponses, + buildPythonPackage, + fetchFromGitHub, + poetry-core, + poetry-dynamic-versioning, + pyjwt, + pytest-aiohttp, + pytest-freezegun, + pytestCheckHook, + pythonOlder, + deepdiff, }: buildPythonPackage rec { pname = "pylitterbot"; version = "2023.4.11"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "natekspencer"; - repo = pname; + repo = "pylitterbot"; rev = "refs/tags/v${version}"; hash = "sha256-OTyQgcGGNktCgYJN33SZn7La7ec+gwR/yVDuH7kcEh4="; }; - nativeBuildInputs = [ + build-system = [ poetry-core poetry-dynamic-versioning ]; - propagatedBuildInputs = [ + dependencies = [ aiohttp deepdiff pyjwt @@ -45,9 +46,7 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ - "pylitterbot" - ]; + pythonImportsCheck = [ "pylitterbot" ]; meta = with lib; { description = "Modulefor controlling a Litter-Robot"; diff --git a/pkgs/development/python-modules/pymodbus/default.nix b/pkgs/development/python-modules/pymodbus/default.nix index f85b893c24bbd..d3c34f4c052da 100644 --- a/pkgs/development/python-modules/pymodbus/default.nix +++ b/pkgs/development/python-modules/pymodbus/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "pymodbus"; - version = "3.6.7"; + version = "3.6.8"; pyproject = true; disabled = pythonOlder "3.9"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "pymodbus-dev"; repo = "pymodbus"; rev = "refs/tags/v${version}"; - hash = "sha256-SbfvVaIpTz4Mzojx9y13lYei4dEz+1NQEE/7bwz29tQ="; + hash = "sha256-6Rt5fbuaeAgbW5KKse1zZIJyq/p2P2MjXGwA7q0C7wA="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pynmeagps/default.nix b/pkgs/development/python-modules/pynmeagps/default.nix new file mode 100644 index 0000000000000..7791bb13f315e --- /dev/null +++ b/pkgs/development/python-modules/pynmeagps/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, setuptools +, pytest-cov +}: + +buildPythonPackage rec { + pname = "pynmeagps"; + version = "1.0.35"; + pyproject = true; + + src = fetchFromGitHub { + owner = "semuconsulting"; + repo = "pynmeagps"; + rev = "v${version}"; + hash = "sha256-ULGBfTHCFGUSF3cmJ4GEUrgGDo4uJwstBj8nZ7tj0AA="; + }; + + nativeBuildInputs = [ setuptools ]; + + nativeCheckInputs = [ + pytestCheckHook + pytest-cov + ]; + + pythonImportsCheck = [ + "pynmeagps" + ]; + + meta = { + homepage = "https://github.com/semuconsulting/pynmeagps"; + description = "NMEA protocol parser and generator"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ dylan-gonzalez ]; + }; +} diff --git a/pkgs/development/python-modules/pyprecice/default.nix b/pkgs/development/python-modules/pyprecice/default.nix index f6c5d8fc2387f..b390314dd9816 100644 --- a/pkgs/development/python-modules/pyprecice/default.nix +++ b/pkgs/development/python-modules/pyprecice/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pyprecice"; - version = "3.0.0.0"; + version = "3.1.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "precice"; repo = "python-bindings"; rev = "refs/tags/v${version}"; - hash = "sha256-iW3Mll28Z3Ew+eIJxeF1HR7JhVhXs9FiYaAb5TwYSpg="; + hash = "sha256-5K6oVBhR6mBdkyOb/Ec0qg9x63tkoTnLIrE8dz8oCtc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pyscard/default.nix b/pkgs/development/python-modules/pyscard/default.nix index b2a0256415d1e..5fa9e60ae5c6c 100644 --- a/pkgs/development/python-modules/pyscard/default.nix +++ b/pkgs/development/python-modules/pyscard/default.nix @@ -16,7 +16,7 @@ let in buildPythonPackage rec { - version = "2.0.8"; + version = "2.0.9"; pname = "pyscard"; pyproject = true; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "LudovicRousseau"; repo = "pyscard"; rev = "refs/tags/${version}"; - hash = "sha256-UpTSbq4mf42tcSWL8wR54MQDZ+z2YjrTW0Ud2F5/J2E="; + hash = "sha256-DO4Ea+mlrWPpOLI8Eki+03UnsOXEhN2PAl0+gdN5sTo="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/qdldl/default.nix b/pkgs/development/python-modules/qdldl/default.nix index 1a988afce4288..a5af403d4d7a6 100644 --- a/pkgs/development/python-modules/qdldl/default.nix +++ b/pkgs/development/python-modules/qdldl/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "qdldl"; - version = "0.1.7.post0"; + version = "0.1.7.post1"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-80ahFMg0LubU29ZHHu8xQZn7Jo0797lYhco1H94rAj8="; + hash = "sha256-eY2IwW4CU2rmXHHwa2Tj+/MbdNfke8EP+YFnaGMrOmQ="; }; dontUseCmakeConfigure = true; diff --git a/pkgs/development/python-modules/simplekv/default.nix b/pkgs/development/python-modules/simplekv/default.nix index 12e2449b04c56..22851e6da57b4 100644 --- a/pkgs/development/python-modules/simplekv/default.nix +++ b/pkgs/development/python-modules/simplekv/default.nix @@ -1,17 +1,19 @@ -{ lib -, buildPythonPackage -, dulwich -, fetchFromGitHub -, mock -, pytestCheckHook -, pythonOlder -, six +{ + lib, + buildPythonPackage, + dulwich, + fetchFromGitHub, + mock, + pytestCheckHook, + pythonOlder, + setuptools, + six, }: buildPythonPackage rec { pname = "simplekv"; version = "0.14.1"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -22,16 +24,16 @@ buildPythonPackage rec { hash = "sha256-seUGDj2q84+AjDFM1pxMLlHbe9uBgEhmqA96UHjnCmo="; }; - nativeCheckInputs = [ + build-system = [ setuptools ]; + + dependencies = [ dulwich mock pytestCheckHook six ]; - pythonImportsCheck = [ - "simplekv" - ]; + pythonImportsCheck = [ "simplekv" ]; disabledTests = [ # Issue with fixture diff --git a/pkgs/development/python-modules/snakemake-interface-storage-plugins/default.nix b/pkgs/development/python-modules/snakemake-interface-storage-plugins/default.nix index b39139f848ca5..8831dd8c17b95 100644 --- a/pkgs/development/python-modules/snakemake-interface-storage-plugins/default.nix +++ b/pkgs/development/python-modules/snakemake-interface-storage-plugins/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "snakemake-interface-storage-plugins"; - version = "3.1.1"; + version = "3.2.0"; format = "pyproject"; src = fetchFromGitHub { owner = "snakemake"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-5EWpfKpEATlEsw2VZGrGqS+WddVdtEKSgelBGud8kmI="; + hash = "sha256-IxsD8+arv6jLyFxzZJgeRXadsjSKH14KIEdd89/bo1w="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/soco/default.nix b/pkgs/development/python-modules/soco/default.nix index 41774ec79ee11..347273e453e61 100644 --- a/pkgs/development/python-modules/soco/default.nix +++ b/pkgs/development/python-modules/soco/default.nix @@ -1,23 +1,25 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, graphviz -, appdirs -, ifaddr -, pythonOlder -, lxml -, mock -, nix-update-script -, pytestCheckHook -, requests -, requests-mock -, xmltodict +{ + lib, + appdirs, + buildPythonPackage, + fetchFromGitHub, + graphviz, + ifaddr, + lxml, + mock, + nix-update-script, + pytestCheckHook, + pythonOlder, + requests, + requests-mock, + setuptools, + xmltodict, }: buildPythonPackage rec { pname = "soco"; - version = "0.30.2"; - format = "setuptools"; + version = "0.30.3"; + pyproject = true; disabled = pythonOlder "3.6"; @@ -25,10 +27,12 @@ buildPythonPackage rec { owner = "SoCo"; repo = "SoCo"; rev = "refs/tags/v${version}"; - hash = "sha256-T5kZxwLtqdECuYNfI0z2kLuTPp8yuPsx+MQG27WUJYU="; + hash = "sha256-QAF3f1JMGFFsgdZzoyo+RwKKMaLG+hy+lvZwCzceU/g="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ appdirs ifaddr lxml @@ -43,9 +47,7 @@ buildPythonPackage rec { requests-mock ]; - pythonImportsCheck = [ - "soco" - ]; + pythonImportsCheck = [ "soco" ]; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix index e90cae8f248a7..b3235c70eee55 100644 --- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix +++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "tencentcloud-sdk-python"; - version = "3.0.1128"; + version = "3.0.1130"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "TencentCloud"; repo = "tencentcloud-sdk-python"; rev = "refs/tags/${version}"; - hash = "sha256-SYR9vkeaVBPwke7FzjcDGSvsZE0vznNf/7zCKizaW+4="; + hash = "sha256-NstigWCYGfsycosREvaupJ/oIEWfli38lYAq2jClvw4="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/toggl-cli/default.nix b/pkgs/development/python-modules/toggl-cli/default.nix index 92481399143de..8e221c312bae0 100644 --- a/pkgs/development/python-modules/toggl-cli/default.nix +++ b/pkgs/development/python-modules/toggl-cli/default.nix @@ -1,49 +1,59 @@ -{ lib -, buildPythonPackage -, click -, click-completion -, factory-boy -, faker -, fetchPypi -, inquirer -, notify-py -, pbr -, pendulum -, ptable -, pytest-mock -, pytestCheckHook -, pythonOlder -, requests -, twine -, validate-email +{ + lib, + buildPythonPackage, + click, + click-completion, + factory-boy, + faker, + fetchPypi, + inquirer, + notify-py, + pbr, + pendulum, + prettytable, + pytest-mock, + pytestCheckHook, + pythonOlder, + requests, + setuptools, + twine, + validate-email, }: buildPythonPackage rec { pname = "toggl-cli"; - version = "2.4.3"; - format = "setuptools"; + version = "2.4.4"; + pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchPypi { pname = "togglCli"; inherit version; - hash = "sha256-ncMwiMwYivaFu5jrAsm1oCuXP/PZ2ALT+M+CmV6dtFo="; + hash = "sha256-P4pv6LMPIWXD04IQw01yo3z3voeV4OmsBOCSJgcrZ6g="; }; - nativeBuildInputs = [ + postPatch = '' + substituteInPlace requirements.txt \ + --replace-fail "==" ">=" + substituteInPlace pytest.ini \ + --replace ' --cov toggl -m "not premium"' "" + ''; + + build-system = [ pbr + setuptools twine ]; - propagatedBuildInputs = [ + dependencies = [ click click-completion inquirer notify-py pbr pendulum - ptable + prettytable requests validate-email ]; @@ -55,16 +65,6 @@ buildPythonPackage rec { factory-boy ]; - postPatch = '' - substituteInPlace requirements.txt \ - --replace "notify-py==0.3.3" "notify-py>=0.3.3" \ - --replace "click==8.0.3" "click>=8.0.3" \ - --replace "pbr==5.8.0" "pbr>=5.8.0" \ - --replace "inquirer==2.9.1" "inquirer>=2.9.1" - substituteInPlace pytest.ini \ - --replace ' --cov toggl -m "not premium"' "" - ''; - preCheck = '' export TOGGL_API_TOKEN=your_api_token export TOGGL_PASSWORD=toggl_password @@ -74,23 +74,22 @@ buildPythonPackage rec { disabledTests = [ "integration" "premium" + "test_basic_usage" + "test_now" "test_parsing" "test_type_check" - "test_now" ]; - pythonImportsCheck = [ - "toggl" - ]; + pythonImportsCheck = [ "toggl" ]; # updates to a bogus tag passthru.skipBulkUpdate = true; meta = with lib; { description = "Command line tool and set of Python wrapper classes for interacting with toggl's API"; - mainProgram = "toggl"; homepage = "https://toggl.uhlir.dev/"; license = licenses.mit; maintainers = with maintainers; [ mmahut ]; + mainProgram = "toggl"; }; } diff --git a/pkgs/development/python-modules/tpm2-pytss/cross.patch b/pkgs/development/python-modules/tpm2-pytss/cross.patch new file mode 100644 index 0000000000000..8fa2956c11d04 --- /dev/null +++ b/pkgs/development/python-modules/tpm2-pytss/cross.patch @@ -0,0 +1,22 @@ +diff --git a/setup.py b/setup.py +index 1b5f513..d660b9a 100644 +--- a/setup.py ++++ b/setup.py +@@ -184,7 +184,8 @@ class type_generator(build_ext): + f"unable to find tss2_tpm2_types.h in {pk['include_dirs']}" + ) + pdata = preprocess_file( +- header_path, cpp_args=["-D__extension__=", "-D__attribute__(x)="] ++ header_path, cpp_args=["-D__extension__=", "-D__attribute__(x)="], ++ cpp_path="@crossPrefix@-cpp", + ) + parser = c_parser.CParser() + ast = parser.parse(pdata, "tss2_tpm2_types.h") +@@ -210,6 +211,7 @@ class type_generator(build_ext): + "-D__float128=long double", + "-D_FORTIFY_SOURCE=0", + ], ++ cpp_path="@crossPrefix@-cpp", + ) + parser = c_parser.CParser() + past = parser.parse(pdata, "tss2_policy.h") diff --git a/pkgs/development/python-modules/tpm2-pytss/default.nix b/pkgs/development/python-modules/tpm2-pytss/default.nix index 484f3dc2d16e3..7b5fd56b0a109 100644 --- a/pkgs/development/python-modules/tpm2-pytss/default.nix +++ b/pkgs/development/python-modules/tpm2-pytss/default.nix @@ -1,4 +1,6 @@ { lib +, stdenv +, substituteAll , buildPythonPackage , fetchPypi , pythonOlder @@ -17,6 +19,9 @@ , swtpm }: +let + isCross = (stdenv.buildPlatform != stdenv.hostPlatform); +in buildPythonPackage rec { pname = "tpm2-pytss"; version = "2.2.1"; @@ -32,6 +37,18 @@ buildPythonPackage rec { patches = [ # Fix hardcoded `fapi-config.json` configuration path ./fapi-config.patch + ] ++ lib.optionals isCross [ + # pytss will regenerate files from headers of tpm2-tss. + # Those headers are fed through a compiler via pycparser. pycparser expects `cpp` + # to be in the path. + # This is put in the path via stdenv when not cross-compiling, but this is absent + # when cross-compiling is turned on. + # This patch changes the call to pycparser.preprocess_file to provide the name + # of the cross-compiling cpp + (substituteAll { + src = ./cross.patch; + crossPrefix = stdenv.hostPlatform.config; + }) ]; postPatch = '' diff --git a/pkgs/development/python-modules/validate-email/default.nix b/pkgs/development/python-modules/validate-email/default.nix index 1c8e8d3c384a0..441a0671461c9 100644 --- a/pkgs/development/python-modules/validate-email/default.nix +++ b/pkgs/development/python-modules/validate-email/default.nix @@ -1,23 +1,35 @@ -{ lib, buildPythonPackage, fetchPypi }: +{ + lib, + buildPythonPackage, + fetchPypi, + pythonOlder, + setuptools, +}: buildPythonPackage rec { pname = "validate-email"; version = "1.3"; - format = "setuptools"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit version; pname = "validate_email"; - sha256 = "1bxffaf5yz2cph8ki55vdvdypbwkvn2xr1firlcy62vqbzf1jivq"; + hash = "sha256-eEcZ3F94C+MZzdGF3IXdk6/r2267lDgRvEx8X5xyrq8="; }; + build-system = [ setuptools ]; + # No tests doCheck = false; + pythonImportsCheck = [ "validate_email" ]; + meta = with lib; { - homepage = "https://github.com/syrusakbary/validate_email"; description = "Verify if an email address is valid and really exists"; + homepage = "https://github.com/syrusakbary/validate_email"; license = licenses.lgpl3Plus; - maintainers = [ maintainers.mmahut ]; + maintainers = with maintainers; [ mmahut ]; }; } diff --git a/pkgs/development/python-modules/validator-collection/default.nix b/pkgs/development/python-modules/validator-collection/default.nix new file mode 100644 index 0000000000000..8625956d77546 --- /dev/null +++ b/pkgs/development/python-modules/validator-collection/default.nix @@ -0,0 +1,145 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + wheel, + alabaster, + attrs, + babel, + certifi, + cffi, + chardet, + codecov, + colorama, + coverage, + docutils, + filelock, + html5lib, + idna, + imagesize, + isort, + jinja2, + jsonschema, + lazy-object-proxy, + markupsafe, + mccabe, + more-itertools, + packaging, + pkginfo, + pluggy, + py, + py-cpuinfo, + pycparser, + pyfakefs, + pygments, + pyparsing, + pytest, + pytest-benchmark, + pytest-cov, + pytz, + readme-renderer, + requests, + requests-toolbelt, + restview, + six, + snowballstemmer, + sphinx, + sphinx-rtd-theme, + sphinx-tabs, + sphinxcontrib-websupport, + toml, + pytestCheckHook, + tox, + tqdm, + twine, + urllib3, + virtualenv, + webencodings, + wrapt, + pythonOlder, +}: + +buildPythonPackage rec { + pname = "validator-collection"; + version = "1.5.0"; + pyproject = true; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "insightindustry"; + repo = "validator-collection"; + rev = "refs/tags/v.${version}"; + hash = "sha256-CDPfIkZZRpl1rAzNpLKJfaBEGWUl71coic2jOHIgi6o="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + alabaster + attrs + babel + certifi + cffi + chardet + codecov + colorama + coverage + docutils + filelock + html5lib + idna + imagesize + isort + jinja2 + jsonschema + lazy-object-proxy + markupsafe + mccabe + more-itertools + packaging + pkginfo + pluggy + py + py-cpuinfo + pycparser + pyfakefs + pygments + pyparsing + pytest + pytest-benchmark + pytest-cov + pytz + readme-renderer + requests + requests-toolbelt + restview + six + snowballstemmer + sphinx + sphinx-rtd-theme + sphinx-tabs + sphinxcontrib-websupport + toml + tox + tqdm + twine + urllib3 + virtualenv + webencodings + wrapt + ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "validator_collection" ]; + + meta = with lib; { + description = "Python library of 60+ commonly-used validator functions"; + homepage = "https://github.com/insightindustry/validator-collection/"; + changelog = "https://github.com/insightindustry/validator-collection/blob/${src.rev}/CHANGES.rst"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/vallox-websocket-api/default.nix b/pkgs/development/python-modules/vallox-websocket-api/default.nix index 3d38c9a17ccb4..a27a512a448f3 100644 --- a/pkgs/development/python-modules/vallox-websocket-api/default.nix +++ b/pkgs/development/python-modules/vallox-websocket-api/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "vallox-websocket-api"; - version = "5.1.1"; + version = "5.2.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "yozik04"; repo = "vallox_websocket_api"; rev = "refs/tags/${version}"; - hash = "sha256-BhAI/bGzaSckyZJq7GYUldziotr2bMlA5cWgQEwiUcQ="; + hash = "sha256-qq58ZSrKVQ00rtXMe4L9xfz0QB+UpjGOhPo1srPYIY4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/xkbcommon/default.nix b/pkgs/development/python-modules/xkbcommon/default.nix index f5ac737d27441..4e1ef0ea0ef78 100644 --- a/pkgs/development/python-modules/xkbcommon/default.nix +++ b/pkgs/development/python-modules/xkbcommon/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "xkbcommon"; - version = "0.8"; + version = "1.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-W+WXO/W3UlaHpN9shHibQhWQ1/fPkq5W8qqxd7eV1RY="; + hash = "sha256-NTEafcAU/PU1/2n3pb3m8dbZptI9j9nnmVG4iFqHHe8="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/python-modules/xlsxwriter/default.nix b/pkgs/development/python-modules/xlsxwriter/default.nix index 9eb6c83716aab..115993e756bcf 100644 --- a/pkgs/development/python-modules/xlsxwriter/default.nix +++ b/pkgs/development/python-modules/xlsxwriter/default.nix @@ -3,12 +3,13 @@ , fetchFromGitHub , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "xlsxwriter"; - version = "3.1.9"; - format = "setuptools"; + version = "3.2.0"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -16,9 +17,13 @@ buildPythonPackage rec { owner = "jmcnamara"; repo = "XlsxWriter"; rev = "RELEASE_${version}"; - hash = "sha256-FkSInLinyn/eXBMSuivzFxCTZijOKdSG4l+gHyKENuY="; + hash = "sha256-HLSIKoGBSzU7N/lskVeVbfdOezTloMrwAahJbcnqJrw="; }; + build-system = [ + setuptools + ]; + nativeCheckInputs = [ pytestCheckHook ]; @@ -29,10 +34,10 @@ buildPythonPackage rec { meta = with lib; { description = "Module for creating Excel XLSX files"; - mainProgram = "vba_extract.py"; homepage = "https://xlsxwriter.readthedocs.io/"; changelog = "https://xlsxwriter.readthedocs.io/changes.html"; license = licenses.bsd2; maintainers = with maintainers; [ jluttine ]; + mainProgram = "vba_extract.py"; }; } diff --git a/pkgs/development/python-modules/yq/default.nix b/pkgs/development/python-modules/yq/default.nix index 16a5ea17c8e96..58ffc9a516c2e 100644 --- a/pkgs/development/python-modules/yq/default.nix +++ b/pkgs/development/python-modules/yq/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "yq"; - version = "3.2.3"; + version = "3.3.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-Kcj+HTa09kFj9NATFMauIXU5hw9hAhbe5gJd+16vr7E="; + hash = "sha256-0qtWLxGx4OW5ZUubBtQ/iiBSacx72izgdzJfWhI2Udw="; }; patches = [ diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 3aaffff2b41f1..e2b2e7feea004 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -343,6 +343,7 @@ let fftw = [ pkgs.fftw.dev ]; fftwtools = with pkgs; [ fftw.dev pkg-config ]; Formula = [ pkgs.gmp ]; + gdalraster = [ pkgs.pkg-config ]; gdtools = with pkgs; [ cairo.dev fontconfig.lib freetype.dev ]; GeneralizedWendland = [ pkgs.gsl ]; ggiraph = with pkgs; [ pkgs.libpng.dev ]; @@ -549,6 +550,7 @@ let coga = [ pkgs.gsl.dev ]; deepSNV = with pkgs; [ xz.dev bzip2.dev zlib.dev ]; epialleleR = with pkgs; [ xz.dev bzip2.dev zlib.dev ]; + gdalraster = with pkgs; [ gdal proj.dev sqlite.dev ]; gpg = [ pkgs.gpgme ]; webp = [ pkgs.libwebp ]; RMark = [ pkgs.which ]; @@ -583,6 +585,7 @@ let openssl = [ pkgs.pkg-config ]; pdftools = [ pkgs.pkg-config ]; qckitfastq = [ pkgs.zlib.dev ]; + raer = with pkgs; [ zlib.dev xz.dev bzip2.dev ]; RQuantLib = with pkgs; [ quantlib.dev boost.dev ]; sf = with pkgs; [ pkg-config sqlite.dev proj.dev ]; terra = with pkgs; [ pkg-config sqlite.dev proj.dev ]; @@ -595,6 +598,7 @@ let Cairo = [ pkgs.pkg-config ]; CLVTools = [ pkgs.gsl ]; excursions = [ pkgs.gsl ]; + gpuMagic = [ pkgs.ocl-icd ]; JMcmprsk = [ pkgs.gsl ]; KSgeneral = [ pkgs.fftw.dev ]; mashr = [ pkgs.gsl ]; @@ -639,7 +643,7 @@ let Rmmquant = [ pkgs.zlib.dev ]; SICtools = with pkgs; [ zlib.dev ncurses.dev ]; Signac = [ pkgs.zlib.dev ]; - TransView = [ pkgs.zlib.dev ]; + TransView = with pkgs; [ xz.dev bzip2.dev zlib.dev ]; bigsnpr = [ pkgs.zlib.dev ]; zlib = [ pkgs.zlib.dev ]; divest = [ pkgs.zlib.dev ]; @@ -651,7 +655,7 @@ let matchingMarkets = [ pkgs.zlib.dev ]; methylKit = with pkgs; [ zlib.dev bzip2.dev xz.dev ]; ndjson = [ pkgs.zlib.dev ]; - podkat = [ pkgs.zlib.dev ]; + podkat = with pkgs; [ zlib.dev xz.dev bzip2.dev ]; qrqc = [ pkgs.zlib.dev ]; rJPSGCS = [ pkgs.zlib.dev ]; rhdf5filters = with pkgs; [ zlib.dev bzip2.dev ]; @@ -678,6 +682,7 @@ let crandep = [ pkgs.gsl ]; catSurv = [ pkgs.gsl ]; ccfindR = [ pkgs.gsl ]; + screenCounter = [ pkgs.zlib.dev ]; SPARSEMODr = [ pkgs.gsl ]; RKHSMetaMod = [ pkgs.gsl ]; LCMCR = [ pkgs.gsl ]; @@ -913,6 +918,7 @@ let "MSnID" "OmnipathR" "precommit" + "protGear" "PSCBS" "iemisc" "repmis" @@ -957,12 +963,16 @@ let ]; packagesToSkipCheck = [ + "MsDataHub" # tries to connect to ExperimentHub "Rmpi" # tries to run MPI processes "ReactomeContentService4R" # tries to connect to Reactome "PhIPData" # tries to download something from a DB + "RBioFormats" # tries to download jar during load test "pbdMPI" # tries to run MPI processes "data_table" # fails to rename shared library before check + "coMethDMR" # tries to connect to ExperimentHub "multiMiR" # tries to connect to DB + "snapcount" # tries to connect to snaptron.cs.jhu.edu ]; # Packages which cannot be installed due to lack of dependencies or other reasons. diff --git a/pkgs/development/rocm-modules/5/default.nix b/pkgs/development/rocm-modules/5/default.nix index aaf000b79f138..7f48c4d034cef 100644 --- a/pkgs/development/rocm-modules/5/default.nix +++ b/pkgs/development/rocm-modules/5/default.nix @@ -318,6 +318,9 @@ in rec { rev = "640d7ee1917fcd3b6a5271aa6cf4576bccc7c5fb"; sha256 = "sha256-T52whJ7nZi8jerJaZtYInC2YDN0QM+9tUDqiNr6IsNY="; }; + + # overwrite all patches, since patches for newer version do not apply + patches = [ ../6/0001-Compile-transupp.c-as-part-of-the-library.patch ]; }; }; diff --git a/pkgs/development/rocm-modules/5/mivisionx/default.nix b/pkgs/development/rocm-modules/5/mivisionx/default.nix index 39fd4f5b76e30..b7d9762869793 100644 --- a/pkgs/development/rocm-modules/5/mivisionx/default.nix +++ b/pkgs/development/rocm-modules/5/mivisionx/default.nix @@ -47,6 +47,10 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-jmOgwESNALQt7ctmUY9JHgKq47tCwsW1ybynkX9236U="; }; + patches = [ + ../../6/mivisionx/0001-set-__STDC_CONSTANT_MACROS-to-make-rocAL-compile.patch + ]; + nativeBuildInputs = [ cmake rocm-cmake diff --git a/pkgs/development/rocm-modules/6/0001-Compile-transupp.c-as-part-of-the-library.patch b/pkgs/development/rocm-modules/6/0001-Compile-transupp.c-as-part-of-the-library.patch new file mode 100644 index 0000000000000..0a09a8845c133 --- /dev/null +++ b/pkgs/development/rocm-modules/6/0001-Compile-transupp.c-as-part-of-the-library.patch @@ -0,0 +1,104 @@ +From 4a0584f7c05641143151ebdc1be1163bebf9d35d Mon Sep 17 00:00:00 2001 +From: Las <las@protonmail.ch> +Date: Sun, 3 Jan 2021 18:35:37 +0000 +Subject: [PATCH] Compile transupp.c as part of the library + +The exported symbols are made weak to not conflict with users +of the library that already vendor this functionality. +--- + CMakeLists.txt | 4 ++-- + transupp.c | 14 +++++++------- + 2 files changed, 9 insertions(+), 9 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 0ca6f98..a9a0fae 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -533,7 +533,7 @@ set(JPEG_SOURCES jcapimin.c jcapistd.c jccoefct.c jccolor.c jcdctmgr.c jchuff.c + jdatasrc.c jdcoefct.c jdcolor.c jddctmgr.c jdhuff.c jdicc.c jdinput.c + jdmainct.c jdmarker.c jdmaster.c jdmerge.c jdphuff.c jdpostct.c jdsample.c + jdtrans.c jerror.c jfdctflt.c jfdctfst.c jfdctint.c jidctflt.c jidctfst.c +- jidctint.c jidctred.c jquant1.c jquant2.c jutils.c jmemmgr.c jmemnobs.c) ++ jidctint.c jidctred.c jquant1.c jquant2.c jutils.c jmemmgr.c jmemnobs.c transupp.c) + + if(WITH_ARITH_ENC OR WITH_ARITH_DEC) + set(JPEG_SOURCES ${JPEG_SOURCES} jaricom.c) +@@ -1489,7 +1489,7 @@ install(EXPORT ${CMAKE_PROJECT_NAME}Targets + + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/jconfig.h + ${CMAKE_CURRENT_SOURCE_DIR}/jerror.h ${CMAKE_CURRENT_SOURCE_DIR}/jmorecfg.h +- ${CMAKE_CURRENT_SOURCE_DIR}/jpeglib.h ++ ${CMAKE_CURRENT_SOURCE_DIR}/jpeglib.h ${CMAKE_CURRENT_SOURCE_DIR}/transupp.h + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) + + include(cmakescripts/BuildPackages.cmake) +diff --git a/transupp.c b/transupp.c +index 6e86077..2da49a7 100644 +--- a/transupp.c ++++ b/transupp.c +@@ -1386,7 +1386,7 @@ jt_read_integer(const char **strptr, JDIMENSION *result) + * This code is loosely based on XParseGeometry from the X11 distribution. + */ + +-GLOBAL(boolean) ++GLOBAL(boolean) __attribute__((weak)) + jtransform_parse_crop_spec(jpeg_transform_info *info, const char *spec) + { + info->crop = FALSE; +@@ -1486,7 +1486,7 @@ trim_bottom_edge(jpeg_transform_info *info, JDIMENSION full_height) + * and transformation is not perfect. Otherwise returns TRUE. + */ + +-GLOBAL(boolean) ++GLOBAL(boolean) __attribute__((weak)) + jtransform_request_workspace(j_decompress_ptr srcinfo, + jpeg_transform_info *info) + { +@@ -2033,7 +2033,7 @@ adjust_exif_parameters(JOCTET *data, unsigned int length, JDIMENSION new_width, + * to jpeg_write_coefficients(). + */ + +-GLOBAL(jvirt_barray_ptr *) ++GLOBAL(jvirt_barray_ptr *) __attribute__((weak)) + jtransform_adjust_parameters(j_decompress_ptr srcinfo, j_compress_ptr dstinfo, + jvirt_barray_ptr *src_coef_arrays, + jpeg_transform_info *info) +@@ -2152,7 +2152,7 @@ jtransform_adjust_parameters(j_decompress_ptr srcinfo, j_compress_ptr dstinfo, + * Note that some transformations will modify the source data arrays! + */ + +-GLOBAL(void) ++GLOBAL(void) __attribute__((weak)) + jtransform_execute_transform(j_decompress_ptr srcinfo, j_compress_ptr dstinfo, + jvirt_barray_ptr *src_coef_arrays, + jpeg_transform_info *info) +@@ -2264,7 +2264,7 @@ jtransform_execute_transform(j_decompress_ptr srcinfo, j_compress_ptr dstinfo, + * (may use custom action then) + */ + +-GLOBAL(boolean) ++GLOBAL(boolean) __attribute__((weak)) + jtransform_perfect_transform(JDIMENSION image_width, JDIMENSION image_height, + int MCU_width, int MCU_height, + JXFORM_CODE transform) +@@ -2303,7 +2303,7 @@ jtransform_perfect_transform(JDIMENSION image_width, JDIMENSION image_height, + * This must be called before jpeg_read_header() to have the desired effect. + */ + +-GLOBAL(void) ++GLOBAL(void) __attribute__((weak)) + jcopy_markers_setup(j_decompress_ptr srcinfo, JCOPY_OPTION option) + { + #ifdef SAVE_MARKERS_SUPPORTED +@@ -2331,7 +2331,7 @@ jcopy_markers_setup(j_decompress_ptr srcinfo, JCOPY_OPTION option) + * JFIF APP0 or Adobe APP14 markers if selected. + */ + +-GLOBAL(void) ++GLOBAL(void) __attribute__((weak)) + jcopy_markers_execute(j_decompress_ptr srcinfo, j_compress_ptr dstinfo, + JCOPY_OPTION option) + { +-- +2.29.2 + diff --git a/pkgs/development/rocm-modules/6/default.nix b/pkgs/development/rocm-modules/6/default.nix index 194ce9fd8ce1a..567b5bee4f728 100644 --- a/pkgs/development/rocm-modules/6/default.nix +++ b/pkgs/development/rocm-modules/6/default.nix @@ -316,6 +316,9 @@ in rec { rev = "640d7ee1917fcd3b6a5271aa6cf4576bccc7c5fb"; sha256 = "sha256-T52whJ7nZi8jerJaZtYInC2YDN0QM+9tUDqiNr6IsNY="; }; + + # overwrite all patches, since patches for newer version do not apply + patches = [ ./0001-Compile-transupp.c-as-part-of-the-library.patch ]; }; }; diff --git a/pkgs/development/rocm-modules/6/llvm/add-compression-to-clang-offload-bundler.patch b/pkgs/development/rocm-modules/6/llvm/add-compression-to-clang-offload-bundler.patch new file mode 100644 index 0000000000000..8589ac527dcb8 --- /dev/null +++ b/pkgs/development/rocm-modules/6/llvm/add-compression-to-clang-offload-bundler.patch @@ -0,0 +1,1191 @@ +From 058d9ba2f54a8c7c47b6522db808db87fed82e78 Mon Sep 17 00:00:00 2001 +From: "Yaxun (Sam) Liu" <yaxun.liu@amd.com> +Date: Thu, 4 Apr 2024 03:25:28 +0200 +Subject: [PATCH] backport 7e2823438e920d25364ff92b62ad90020c31bb59 + +Reland "[HIP] Support compressing device binary" + +Original PR: https://github.com/llvm/llvm-project/pull/67162 + +The commit was reverted due to UB detected by santizer: + +https://lab.llvm.org/buildbot/#/builders/238/builds/5955 + +clang/lib/Driver/OffloadBundler.cpp:1012:25: runtime error: + load of misaligned address 0xaaaae2d90e7c for type + 'const uint64_t' (aka 'const unsigned long'), which + requires 8 byte alignment + +It was fixed by using memcpy instead of dereferencing int* +casted from unaligned char*. + +Co-Authored-By: Martin Schwaighofer <mschwaig@users.noreply.github.com> +(only did the backport) +--- + clang/docs/ClangOffloadBundler.rst | 27 ++ + clang/include/clang/Driver/OffloadBundler.h | 37 ++ + clang/include/clang/Driver/Options.td | 5 + + clang/lib/Driver/OffloadBundler.cpp | 346 +++++++++++++++--- + clang/lib/Driver/ToolChains/Clang.cpp | 7 + + clang/lib/Driver/ToolChains/HIPUtility.cpp | 6 + + .../test/Driver/clang-offload-bundler-zlib.c | 75 ++++ + .../test/Driver/clang-offload-bundler-zstd.c | 72 ++++ + .../test/Driver/hip-offload-compress-zlib.hip | 45 +++ + .../test/Driver/hip-offload-compress-zstd.hip | 45 +++ + .../clang-offload-bundler/CMakeLists.txt | 1 + + .../ClangOffloadBundler.cpp | 10 + + llvm/include/llvm/BinaryFormat/Magic.h | 28 +- + llvm/lib/BinaryFormat/Magic.cpp | 11 + + llvm/lib/Object/Binary.cpp | 2 + + llvm/lib/Object/ObjectFile.cpp | 2 + + 16 files changed, 659 insertions(+), 60 deletions(-) + create mode 100644 clang/test/Driver/clang-offload-bundler-zlib.c + create mode 100644 clang/test/Driver/clang-offload-bundler-zstd.c + create mode 100644 clang/test/Driver/hip-offload-compress-zlib.hip + create mode 100644 clang/test/Driver/hip-offload-compress-zstd.hip + +diff --git a/clang/docs/ClangOffloadBundler.rst b/clang/docs/ClangOffloadBundler.rst +index 432da787249b..d47997bf718d 100644 +--- a/clang/docs/ClangOffloadBundler.rst ++++ b/clang/docs/ClangOffloadBundler.rst +@@ -498,3 +498,30 @@ target by comparing bundle ID's. Two bundle ID's are considered compatible if: + Verbose printing of matched/unmatched comparisons between bundle entry id of + a device binary from HDA and bundle entry ID of a given target processor + (see :ref:`compatibility-bundle-entry-id`). ++ ++Compression and Decompression ++============================= ++ ++``clang-offload-bundler`` provides features to compress and decompress the full ++bundle, leveraging inherent redundancies within the bundle entries. Use the ++`-compress` command-line option to enable this compression capability. ++ ++The compressed offload bundle begins with a header followed by the compressed binary data: ++ ++- **Magic Number (4 bytes)**: ++ This is a unique identifier to distinguish compressed offload bundles. The value is the string 'CCOB' (Compressed Clang Offload Bundle). ++ ++- **Version Number (16-bit unsigned int)**: ++ This denotes the version of the compressed offload bundle format. The current version is `1`. ++ ++- **Compression Method (16-bit unsigned int)**: ++ This field indicates the compression method used. The value corresponds to either `zlib` or `zstd`, represented as a 16-bit unsigned integer cast from the LLVM compression enumeration. ++ ++- **Uncompressed Binary Size (32-bit unsigned int)**: ++ This is the size (in bytes) of the binary data before it was compressed. ++ ++- **Hash (64-bit unsigned int)**: ++ This is a 64-bit truncated MD5 hash of the uncompressed binary data. It serves for verification and caching purposes. ++ ++- **Compressed Data**: ++ The actual compressed binary data follows the header. Its size can be inferred from the total size of the file minus the header size. +diff --git a/clang/include/clang/Driver/OffloadBundler.h b/clang/include/clang/Driver/OffloadBundler.h +index fe263f0540b9..fc96f200414d 100644 +--- a/clang/include/clang/Driver/OffloadBundler.h ++++ b/clang/include/clang/Driver/OffloadBundler.h +@@ -19,6 +19,7 @@ + + #include "llvm/Support/Error.h" + #include "llvm/TargetParser/Triple.h" ++#include <llvm/Support/MemoryBuffer.h> + #include <string> + #include <vector> + +@@ -26,11 +27,15 @@ namespace clang { + + class OffloadBundlerConfig { + public: ++ OffloadBundlerConfig(); ++ + bool AllowNoHost = false; + bool AllowMissingBundles = false; + bool CheckInputArchive = false; + bool PrintExternalCommands = false; + bool HipOpenmpCompatible = false; ++ bool Compress = false; ++ bool Verbose = false; + + unsigned BundleAlignment = 1; + unsigned HostInputIndex = ~0u; +@@ -82,6 +87,38 @@ struct OffloadTargetInfo { + std::string str() const; + }; + ++// CompressedOffloadBundle represents the format for the compressed offload ++// bundles. ++// ++// The format is as follows: ++// - Magic Number (4 bytes) - A constant "CCOB". ++// - Version (2 bytes) ++// - Compression Method (2 bytes) - Uses the values from ++// llvm::compression::Format. ++// - Uncompressed Size (4 bytes). ++// - Truncated MD5 Hash (8 bytes). ++// - Compressed Data (variable length). ++ ++class CompressedOffloadBundle { ++private: ++ static inline const size_t MagicSize = 4; ++ static inline const size_t VersionFieldSize = sizeof(uint16_t); ++ static inline const size_t MethodFieldSize = sizeof(uint16_t); ++ static inline const size_t SizeFieldSize = sizeof(uint32_t); ++ static inline const size_t HashFieldSize = 8; ++ static inline const size_t HeaderSize = MagicSize + VersionFieldSize + ++ MethodFieldSize + SizeFieldSize + ++ HashFieldSize; ++ static inline const llvm::StringRef MagicNumber = "CCOB"; ++ static inline const uint16_t Version = 1; ++ ++public: ++ static llvm::Expected<std::unique_ptr<llvm::MemoryBuffer>> ++ compress(const llvm::MemoryBuffer &Input, bool Verbose = false); ++ static llvm::Expected<std::unique_ptr<llvm::MemoryBuffer>> ++ decompress(const llvm::MemoryBuffer &Input, bool Verbose = false); ++}; ++ + } // namespace clang + + #endif // LLVM_CLANG_DRIVER_OFFLOADBUNDLER_H +diff --git a/clang/include/clang/Driver/Options.td b/clang/include/clang/Driver/Options.td +index c206ab84508f..f8df98678396 100644 +--- a/clang/include/clang/Driver/Options.td ++++ b/clang/include/clang/Driver/Options.td +@@ -984,6 +984,11 @@ def fconvergent_functions : Flag<["-"], "fconvergent-functions">, Group<f_Group> + def gpu_use_aux_triple_only : Flag<["--"], "gpu-use-aux-triple-only">, + InternalDriverOpt, HelpText<"Prepare '-aux-triple' only without populating " + "'-aux-target-cpu' and '-aux-target-feature'.">; ++ ++def offload_compress : Flag<["--"], "offload-compress">, ++ HelpText<"Compress offload device binaries (HIP only)">; ++def no_offload_compress : Flag<["--"], "no-offload-compress">; ++ + def cuda_include_ptx_EQ : Joined<["--"], "cuda-include-ptx=">, Flags<[NoXarchOption]>, + HelpText<"Include PTX for the following GPU architecture (e.g. sm_35) or 'all'. May be specified more than once.">; + def no_cuda_include_ptx_EQ : Joined<["--"], "no-cuda-include-ptx=">, Flags<[NoXarchOption]>, +diff --git a/clang/lib/Driver/OffloadBundler.cpp b/clang/lib/Driver/OffloadBundler.cpp +index 29250c49eb0c..69e14679da1c 100644 +--- a/clang/lib/Driver/OffloadBundler.cpp ++++ b/clang/lib/Driver/OffloadBundler.cpp +@@ -21,24 +21,29 @@ + #include "llvm/ADT/ArrayRef.h" + #include "llvm/ADT/SmallString.h" + #include "llvm/ADT/SmallVector.h" ++#include "llvm/ADT/StringExtras.h" + #include "llvm/ADT/StringMap.h" + #include "llvm/ADT/StringRef.h" ++#include "llvm/BinaryFormat/Magic.h" + #include "llvm/Object/Archive.h" + #include "llvm/Object/ArchiveWriter.h" + #include "llvm/Object/Binary.h" + #include "llvm/Object/ObjectFile.h" + #include "llvm/Support/Casting.h" ++#include "llvm/Support/Compression.h" + #include "llvm/Support/Debug.h" + #include "llvm/Support/EndianStream.h" + #include "llvm/Support/Errc.h" + #include "llvm/Support/Error.h" + #include "llvm/Support/ErrorOr.h" + #include "llvm/Support/FileSystem.h" ++#include "llvm/Support/MD5.h" + #include "llvm/Support/MemoryBuffer.h" + #include "llvm/Support/Path.h" + #include "llvm/Support/Program.h" + #include "llvm/Support/Signals.h" + #include "llvm/Support/StringSaver.h" ++#include "llvm/Support/Timer.h" + #include "llvm/Support/WithColor.h" + #include "llvm/Support/raw_ostream.h" + #include "llvm/TargetParser/Host.h" +@@ -48,6 +53,7 @@ + #include <cstddef> + #include <cstdint> + #include <forward_list> ++#include <llvm/Support/Process.h> + #include <memory> + #include <set> + #include <string> +@@ -58,6 +64,10 @@ using namespace llvm; + using namespace llvm::object; + using namespace clang; + ++static llvm::TimerGroup ++ ClangOffloadBundlerTimerGroup("Clang Offload Bundler Timer Group", ++ "Timer group for clang offload bundler"); ++ + /// Magic string that marks the existence of offloading data. + #define OFFLOAD_BUNDLER_MAGIC_STR "__CLANG_OFFLOAD_BUNDLE__" + +@@ -229,20 +239,22 @@ public: + + /// Write the header of the bundled file to \a OS based on the information + /// gathered from \a Inputs. +- virtual Error WriteHeader(raw_fd_ostream &OS, ++ virtual Error WriteHeader(raw_ostream &OS, + ArrayRef<std::unique_ptr<MemoryBuffer>> Inputs) = 0; + + /// Write the marker that initiates a bundle for the triple \a TargetTriple to + /// \a OS. +- virtual Error WriteBundleStart(raw_fd_ostream &OS, +- StringRef TargetTriple) = 0; ++ virtual Error WriteBundleStart(raw_ostream &OS, StringRef TargetTriple) = 0; + + /// Write the marker that closes a bundle for the triple \a TargetTriple to \a + /// OS. +- virtual Error WriteBundleEnd(raw_fd_ostream &OS, StringRef TargetTriple) = 0; ++ virtual Error WriteBundleEnd(raw_ostream &OS, StringRef TargetTriple) = 0; + + /// Write the bundle from \a Input into \a OS. +- virtual Error WriteBundle(raw_fd_ostream &OS, MemoryBuffer &Input) = 0; ++ virtual Error WriteBundle(raw_ostream &OS, MemoryBuffer &Input) = 0; ++ ++ /// Finalize output file. ++ virtual Error finalizeOutputFile() { return Error::success(); } + + /// List bundle IDs in \a Input. + virtual Error listBundleIDs(MemoryBuffer &Input) { +@@ -330,7 +342,7 @@ static uint64_t Read8byteIntegerFromBuffer(StringRef Buffer, size_t pos) { + } + + /// Write 8-byte integers to a buffer in little-endian format. +-static void Write8byteIntegerToBuffer(raw_fd_ostream &OS, uint64_t Val) { ++static void Write8byteIntegerToBuffer(raw_ostream &OS, uint64_t Val) { + llvm::support::endian::write(OS, Val, llvm::support::little); + } + +@@ -378,8 +390,7 @@ public: + return Error::success(); + + // Check if no magic was found. +- StringRef Magic(FC.data(), sizeof(OFFLOAD_BUNDLER_MAGIC_STR) - 1); +- if (!Magic.equals(OFFLOAD_BUNDLER_MAGIC_STR)) ++ if (llvm::identify_magic(FC) != llvm::file_magic::offload_bundle) + return Error::success(); + + // Read number of bundles. +@@ -454,7 +465,7 @@ public: + return Error::success(); + } + +- Error WriteHeader(raw_fd_ostream &OS, ++ Error WriteHeader(raw_ostream &OS, + ArrayRef<std::unique_ptr<MemoryBuffer>> Inputs) final { + + // Compute size of the header. +@@ -491,19 +502,27 @@ public: + return Error::success(); + } + +- Error WriteBundleStart(raw_fd_ostream &OS, StringRef TargetTriple) final { ++ Error WriteBundleStart(raw_ostream &OS, StringRef TargetTriple) final { + CurWriteBundleTarget = TargetTriple.str(); + return Error::success(); + } + +- Error WriteBundleEnd(raw_fd_ostream &OS, StringRef TargetTriple) final { ++ Error WriteBundleEnd(raw_ostream &OS, StringRef TargetTriple) final { + return Error::success(); + } + +- Error WriteBundle(raw_fd_ostream &OS, MemoryBuffer &Input) final { ++ Error WriteBundle(raw_ostream &OS, MemoryBuffer &Input) final { + auto BI = BundlesInfo[CurWriteBundleTarget]; +- OS.seek(BI.Offset); ++ ++ // Pad with 0 to reach specified offset. ++ size_t CurrentPos = OS.tell(); ++ size_t PaddingSize = BI.Offset > CurrentPos ? BI.Offset - CurrentPos : 0; ++ for (size_t I = 0; I < PaddingSize; ++I) ++ OS.write('\0'); ++ assert(OS.tell() == BI.Offset); ++ + OS.write(Input.getBufferStart(), Input.getBufferSize()); ++ + return Error::success(); + } + }; +@@ -560,7 +579,7 @@ class ObjectFileHandler final : public FileHandler { + return NameOrErr.takeError(); + + // If it does not start with the reserved suffix, just skip this section. +- if (!NameOrErr->startswith(OFFLOAD_BUNDLER_MAGIC_STR)) ++ if (llvm::identify_magic(*NameOrErr) != llvm::file_magic::offload_bundle) + return std::nullopt; + + // Return the triple that is right after the reserved prefix. +@@ -625,7 +644,7 @@ public: + return Error::success(); + } + +- Error WriteHeader(raw_fd_ostream &OS, ++ Error WriteHeader(raw_ostream &OS, + ArrayRef<std::unique_ptr<MemoryBuffer>> Inputs) final { + assert(BundlerConfig.HostInputIndex != ~0u && + "Host input index not defined."); +@@ -635,12 +654,16 @@ public: + return Error::success(); + } + +- Error WriteBundleStart(raw_fd_ostream &OS, StringRef TargetTriple) final { ++ Error WriteBundleStart(raw_ostream &OS, StringRef TargetTriple) final { + ++NumberOfProcessedInputs; + return Error::success(); + } + +- Error WriteBundleEnd(raw_fd_ostream &OS, StringRef TargetTriple) final { ++ Error WriteBundleEnd(raw_ostream &OS, StringRef TargetTriple) final { ++ return Error::success(); ++ } ++ ++ Error finalizeOutputFile() final { + assert(NumberOfProcessedInputs <= NumberOfInputs && + "Processing more inputs that actually exist!"); + assert(BundlerConfig.HostInputIndex != ~0u && +@@ -658,10 +681,6 @@ public: + assert(BundlerConfig.ObjcopyPath != "" && + "llvm-objcopy path not specified"); + +- // We write to the output file directly. So, we close it and use the name +- // to pass down to llvm-objcopy. +- OS.close(); +- + // Temporary files that need to be removed. + TempFileHandlerRAII TempFiles; + +@@ -702,7 +721,7 @@ public: + return Error::success(); + } + +- Error WriteBundle(raw_fd_ostream &OS, MemoryBuffer &Input) final { ++ Error WriteBundle(raw_ostream &OS, MemoryBuffer &Input) final { + return Error::success(); + } + +@@ -799,22 +818,22 @@ protected: + return Error::success(); + } + +- Error WriteHeader(raw_fd_ostream &OS, ++ Error WriteHeader(raw_ostream &OS, + ArrayRef<std::unique_ptr<MemoryBuffer>> Inputs) final { + return Error::success(); + } + +- Error WriteBundleStart(raw_fd_ostream &OS, StringRef TargetTriple) final { ++ Error WriteBundleStart(raw_ostream &OS, StringRef TargetTriple) final { + OS << BundleStartString << TargetTriple << "\n"; + return Error::success(); + } + +- Error WriteBundleEnd(raw_fd_ostream &OS, StringRef TargetTriple) final { ++ Error WriteBundleEnd(raw_ostream &OS, StringRef TargetTriple) final { + OS << BundleEndString << TargetTriple << "\n"; + return Error::success(); + } + +- Error WriteBundle(raw_fd_ostream &OS, MemoryBuffer &Input) final { ++ Error WriteBundle(raw_ostream &OS, MemoryBuffer &Input) final { + OS << Input.getBuffer(); + return Error::success(); + } +@@ -899,6 +918,187 @@ CreateFileHandler(MemoryBuffer &FirstInput, + "'" + FilesType + "': invalid file type specified"); + } + ++OffloadBundlerConfig::OffloadBundlerConfig() { ++ auto IgnoreEnvVarOpt = ++ llvm::sys::Process::GetEnv("OFFLOAD_BUNDLER_IGNORE_ENV_VAR"); ++ if (IgnoreEnvVarOpt.has_value() && IgnoreEnvVarOpt.value() == "1") ++ return; ++ ++ auto VerboseEnvVarOpt = llvm::sys::Process::GetEnv("OFFLOAD_BUNDLER_VERBOSE"); ++ if (VerboseEnvVarOpt.has_value()) ++ Verbose = VerboseEnvVarOpt.value() == "1"; ++ ++ auto CompressEnvVarOpt = ++ llvm::sys::Process::GetEnv("OFFLOAD_BUNDLER_COMPRESS"); ++ if (CompressEnvVarOpt.has_value()) ++ Compress = CompressEnvVarOpt.value() == "1"; ++} ++ ++llvm::Expected<std::unique_ptr<llvm::MemoryBuffer>> ++CompressedOffloadBundle::compress(const llvm::MemoryBuffer &Input, ++ bool Verbose) { ++ llvm::Timer HashTimer("Hash Calculation Timer", "Hash calculation time", ++ ClangOffloadBundlerTimerGroup); ++ if (Verbose) ++ HashTimer.startTimer(); ++ llvm::MD5 Hash; ++ llvm::MD5::MD5Result Result; ++ Hash.update(Input.getBuffer()); ++ Hash.final(Result); ++ uint64_t TruncatedHash = Result.low(); ++ if (Verbose) ++ HashTimer.stopTimer(); ++ ++ SmallVector<uint8_t, 0> CompressedBuffer; ++ auto BufferUint8 = llvm::ArrayRef<uint8_t>( ++ reinterpret_cast<const uint8_t *>(Input.getBuffer().data()), ++ Input.getBuffer().size()); ++ ++ llvm::compression::Format CompressionFormat; ++ ++ if (llvm::compression::zstd::isAvailable()) ++ CompressionFormat = llvm::compression::Format::Zstd; ++ else if (llvm::compression::zlib::isAvailable()) ++ CompressionFormat = llvm::compression::Format::Zlib; ++ else ++ return createStringError(llvm::inconvertibleErrorCode(), ++ "Compression not supported"); ++ ++ llvm::Timer CompressTimer("Compression Timer", "Compression time", ++ ClangOffloadBundlerTimerGroup); ++ if (Verbose) ++ CompressTimer.startTimer(); ++ llvm::compression::compress(CompressionFormat, BufferUint8, CompressedBuffer); ++ if (Verbose) ++ CompressTimer.stopTimer(); ++ ++ uint16_t CompressionMethod = static_cast<uint16_t>(CompressionFormat); ++ uint32_t UncompressedSize = Input.getBuffer().size(); ++ ++ SmallVector<char, 0> FinalBuffer; ++ llvm::raw_svector_ostream OS(FinalBuffer); ++ OS << MagicNumber; ++ OS.write(reinterpret_cast<const char *>(&Version), sizeof(Version)); ++ OS.write(reinterpret_cast<const char *>(&CompressionMethod), ++ sizeof(CompressionMethod)); ++ OS.write(reinterpret_cast<const char *>(&UncompressedSize), ++ sizeof(UncompressedSize)); ++ OS.write(reinterpret_cast<const char *>(&TruncatedHash), ++ sizeof(TruncatedHash)); ++ OS.write(reinterpret_cast<const char *>(CompressedBuffer.data()), ++ CompressedBuffer.size()); ++ ++ if (Verbose) { ++ auto MethodUsed = ++ CompressionFormat == llvm::compression::Format::Zstd ? "zstd" : "zlib"; ++ llvm::errs() << "Compressed bundle format version: " << Version << "\n" ++ << "Compression method used: " << MethodUsed << "\n" ++ << "Binary size before compression: " << UncompressedSize ++ << " bytes\n" ++ << "Binary size after compression: " << CompressedBuffer.size() ++ << " bytes\n" ++ << "Truncated MD5 hash: " ++ << llvm::format_hex(TruncatedHash, 16) << "\n"; ++ } ++ ++ return llvm::MemoryBuffer::getMemBufferCopy( ++ llvm::StringRef(FinalBuffer.data(), FinalBuffer.size())); ++} ++ ++llvm::Expected<std::unique_ptr<llvm::MemoryBuffer>> ++CompressedOffloadBundle::decompress(const llvm::MemoryBuffer &Input, ++ bool Verbose) { ++ ++ StringRef Blob = Input.getBuffer(); ++ ++ if (Blob.size() < HeaderSize) { ++ return llvm::MemoryBuffer::getMemBufferCopy(Blob); ++ } ++ if (llvm::identify_magic(Blob) != ++ llvm::file_magic::offload_bundle_compressed) { ++ if (Verbose) ++ llvm::errs() << "Uncompressed bundle.\n"; ++ return llvm::MemoryBuffer::getMemBufferCopy(Blob); ++ } ++ ++ uint16_t ThisVersion; ++ uint16_t CompressionMethod; ++ uint32_t UncompressedSize; ++ uint64_t StoredHash; ++ memcpy(&ThisVersion, Input.getBuffer().data() + MagicNumber.size(), ++ sizeof(uint16_t)); ++ memcpy(&CompressionMethod, Blob.data() + MagicSize + VersionFieldSize, ++ sizeof(uint16_t)); ++ memcpy(&UncompressedSize, ++ Blob.data() + MagicSize + VersionFieldSize + MethodFieldSize, ++ sizeof(uint32_t)); ++ memcpy(&StoredHash, ++ Blob.data() + MagicSize + VersionFieldSize + MethodFieldSize + ++ SizeFieldSize, ++ sizeof(uint64_t)); ++ ++ llvm::compression::Format CompressionFormat; ++ if (CompressionMethod == ++ static_cast<uint16_t>(llvm::compression::Format::Zlib)) ++ CompressionFormat = llvm::compression::Format::Zlib; ++ else if (CompressionMethod == ++ static_cast<uint16_t>(llvm::compression::Format::Zstd)) ++ CompressionFormat = llvm::compression::Format::Zstd; ++ else ++ return createStringError(inconvertibleErrorCode(), ++ "Unknown compressing method"); ++ ++ llvm::Timer DecompressTimer("Decompression Timer", "Decompression time", ++ ClangOffloadBundlerTimerGroup); ++ if (Verbose) ++ DecompressTimer.startTimer(); ++ ++ SmallVector<uint8_t, 0> DecompressedData; ++ StringRef CompressedData = Blob.substr(HeaderSize); ++ if (llvm::Error DecompressionError = llvm::compression::decompress( ++ CompressionFormat, llvm::arrayRefFromStringRef(CompressedData), ++ DecompressedData, UncompressedSize)) ++ return createStringError(inconvertibleErrorCode(), ++ "Could not decompress embedded file contents: " + ++ llvm::toString(std::move(DecompressionError))); ++ ++ if (Verbose) { ++ DecompressTimer.stopTimer(); ++ ++ // Recalculate MD5 hash ++ llvm::Timer HashRecalcTimer("Hash Recalculation Timer", ++ "Hash recalculation time", ++ ClangOffloadBundlerTimerGroup); ++ HashRecalcTimer.startTimer(); ++ llvm::MD5 Hash; ++ llvm::MD5::MD5Result Result; ++ Hash.update(llvm::ArrayRef<uint8_t>(DecompressedData.data(), ++ DecompressedData.size())); ++ Hash.final(Result); ++ uint64_t RecalculatedHash = Result.low(); ++ HashRecalcTimer.stopTimer(); ++ bool HashMatch = (StoredHash == RecalculatedHash); ++ ++ llvm::errs() << "Compressed bundle format version: " << ThisVersion << "\n" ++ << "Decompression method: " ++ << (CompressionFormat == llvm::compression::Format::Zlib ++ ? "zlib" ++ : "zstd") ++ << "\n" ++ << "Size before decompression: " << CompressedData.size() ++ << " bytes\n" ++ << "Size after decompression: " << UncompressedSize ++ << " bytes\n" ++ << "Stored hash: " << llvm::format_hex(StoredHash, 16) << "\n" ++ << "Recalculated hash: " ++ << llvm::format_hex(RecalculatedHash, 16) << "\n" ++ << "Hashes match: " << (HashMatch ? "Yes" : "No") << "\n"; ++ } ++ ++ return llvm::MemoryBuffer::getMemBufferCopy( ++ llvm::toStringRef(DecompressedData)); ++} ++ + // List bundle IDs. Return true if an error was found. + Error OffloadBundler::ListBundleIDsInFile( + StringRef InputFileName, const OffloadBundlerConfig &BundlerConfig) { +@@ -908,28 +1108,35 @@ Error OffloadBundler::ListBundleIDsInFile( + if (std::error_code EC = CodeOrErr.getError()) + return createFileError(InputFileName, EC); + +- MemoryBuffer &Input = **CodeOrErr; ++ // Decompress the input if necessary. ++ Expected<std::unique_ptr<MemoryBuffer>> DecompressedBufferOrErr = ++ CompressedOffloadBundle::decompress(**CodeOrErr, BundlerConfig.Verbose); ++ if (!DecompressedBufferOrErr) ++ return createStringError( ++ inconvertibleErrorCode(), ++ "Failed to decompress input: " + ++ llvm::toString(DecompressedBufferOrErr.takeError())); ++ ++ MemoryBuffer &DecompressedInput = **DecompressedBufferOrErr; + + // Select the right files handler. + Expected<std::unique_ptr<FileHandler>> FileHandlerOrErr = +- CreateFileHandler(Input, BundlerConfig); ++ CreateFileHandler(DecompressedInput, BundlerConfig); + if (!FileHandlerOrErr) + return FileHandlerOrErr.takeError(); + + std::unique_ptr<FileHandler> &FH = *FileHandlerOrErr; + assert(FH); +- return FH->listBundleIDs(Input); ++ return FH->listBundleIDs(DecompressedInput); + } + + /// Bundle the files. Return true if an error was found. + Error OffloadBundler::BundleFiles() { + std::error_code EC; + +- // Create output file. +- raw_fd_ostream OutputFile(BundlerConfig.OutputFileNames.front(), EC, +- sys::fs::OF_None); +- if (EC) +- return createFileError(BundlerConfig.OutputFileNames.front(), EC); ++ // Create a buffer to hold the content before compressing. ++ SmallVector<char, 0> Buffer; ++ llvm::raw_svector_ostream BufferStream(Buffer); + + // Open input files. + SmallVector<std::unique_ptr<MemoryBuffer>, 8u> InputBuffers; +@@ -956,22 +1163,46 @@ Error OffloadBundler::BundleFiles() { + assert(FH); + + // Write header. +- if (Error Err = FH->WriteHeader(OutputFile, InputBuffers)) ++ if (Error Err = FH->WriteHeader(BufferStream, InputBuffers)) + return Err; + + // Write all bundles along with the start/end markers. If an error was found + // writing the end of the bundle component, abort the bundle writing. + auto Input = InputBuffers.begin(); + for (auto &Triple : BundlerConfig.TargetNames) { +- if (Error Err = FH->WriteBundleStart(OutputFile, Triple)) ++ if (Error Err = FH->WriteBundleStart(BufferStream, Triple)) + return Err; +- if (Error Err = FH->WriteBundle(OutputFile, **Input)) ++ if (Error Err = FH->WriteBundle(BufferStream, **Input)) + return Err; +- if (Error Err = FH->WriteBundleEnd(OutputFile, Triple)) ++ if (Error Err = FH->WriteBundleEnd(BufferStream, Triple)) + return Err; + ++Input; + } +- return Error::success(); ++ ++ raw_fd_ostream OutputFile(BundlerConfig.OutputFileNames.front(), EC, ++ sys::fs::OF_None); ++ if (EC) ++ return createFileError(BundlerConfig.OutputFileNames.front(), EC); ++ ++ SmallVector<char, 0> CompressedBuffer; ++ if (BundlerConfig.Compress) { ++ std::unique_ptr<llvm::MemoryBuffer> BufferMemory = ++ llvm::MemoryBuffer::getMemBufferCopy( ++ llvm::StringRef(Buffer.data(), Buffer.size())); ++ auto CompressionResult = ++ CompressedOffloadBundle::compress(*BufferMemory, BundlerConfig.Verbose); ++ if (auto Error = CompressionResult.takeError()) ++ return Error; ++ ++ auto CompressedMemBuffer = std::move(CompressionResult.get()); ++ CompressedBuffer.assign(CompressedMemBuffer->getBufferStart(), ++ CompressedMemBuffer->getBufferEnd()); ++ } else ++ CompressedBuffer = Buffer; ++ ++ OutputFile.write(CompressedBuffer.data(), CompressedBuffer.size()); ++ ++ return FH->finalizeOutputFile(); + } + + // Unbundle the files. Return true if an error was found. +@@ -982,7 +1213,16 @@ Error OffloadBundler::UnbundleFiles() { + if (std::error_code EC = CodeOrErr.getError()) + return createFileError(BundlerConfig.InputFileNames.front(), EC); + +- MemoryBuffer &Input = **CodeOrErr; ++ // Decompress the input if necessary. ++ Expected<std::unique_ptr<MemoryBuffer>> DecompressedBufferOrErr = ++ CompressedOffloadBundle::decompress(**CodeOrErr, BundlerConfig.Verbose); ++ if (!DecompressedBufferOrErr) ++ return createStringError( ++ inconvertibleErrorCode(), ++ "Failed to decompress input: " + ++ llvm::toString(DecompressedBufferOrErr.takeError())); ++ ++ MemoryBuffer &Input = **DecompressedBufferOrErr; + + // Select the right files handler. + Expected<std::unique_ptr<FileHandler>> FileHandlerOrErr = +@@ -1357,22 +1597,34 @@ Error OffloadBundler::UnbundleArchive() { + if (!CodeObjectBufferRefOrErr) + return CodeObjectBufferRefOrErr.takeError(); + +- auto CodeObjectBuffer = ++ auto TempCodeObjectBuffer = + MemoryBuffer::getMemBuffer(*CodeObjectBufferRefOrErr, false); + ++ // Decompress the buffer if necessary. ++ Expected<std::unique_ptr<MemoryBuffer>> DecompressedBufferOrErr = ++ CompressedOffloadBundle::decompress(*TempCodeObjectBuffer, ++ BundlerConfig.Verbose); ++ if (!DecompressedBufferOrErr) ++ return createStringError( ++ inconvertibleErrorCode(), ++ "Failed to decompress code object: " + ++ llvm::toString(DecompressedBufferOrErr.takeError())); ++ ++ MemoryBuffer &CodeObjectBuffer = **DecompressedBufferOrErr; ++ + Expected<std::unique_ptr<FileHandler>> FileHandlerOrErr = +- CreateFileHandler(*CodeObjectBuffer, BundlerConfig); ++ CreateFileHandler(CodeObjectBuffer, BundlerConfig); + if (!FileHandlerOrErr) + return FileHandlerOrErr.takeError(); + + std::unique_ptr<FileHandler> &FileHandler = *FileHandlerOrErr; + assert(FileHandler); + +- if (Error ReadErr = FileHandler->ReadHeader(*CodeObjectBuffer)) ++ if (Error ReadErr = FileHandler->ReadHeader(CodeObjectBuffer)) + return ReadErr; + + Expected<std::optional<StringRef>> CurBundleIDOrErr = +- FileHandler->ReadBundleStart(*CodeObjectBuffer); ++ FileHandler->ReadBundleStart(CodeObjectBuffer); + if (!CurBundleIDOrErr) + return CurBundleIDOrErr.takeError(); + +@@ -1393,7 +1645,7 @@ Error OffloadBundler::UnbundleArchive() { + BundlerConfig)) { + std::string BundleData; + raw_string_ostream DataStream(BundleData); +- if (Error Err = FileHandler->ReadBundle(DataStream, *CodeObjectBuffer)) ++ if (Error Err = FileHandler->ReadBundle(DataStream, CodeObjectBuffer)) + return Err; + + for (auto &CompatibleTarget : CompatibleTargets) { +@@ -1431,11 +1683,11 @@ Error OffloadBundler::UnbundleArchive() { + } + } + +- if (Error Err = FileHandler->ReadBundleEnd(*CodeObjectBuffer)) ++ if (Error Err = FileHandler->ReadBundleEnd(CodeObjectBuffer)) + return Err; + + Expected<std::optional<StringRef>> NextTripleOrErr = +- FileHandler->ReadBundleStart(*CodeObjectBuffer); ++ FileHandler->ReadBundleStart(CodeObjectBuffer); + if (!NextTripleOrErr) + return NextTripleOrErr.takeError(); + +diff --git a/clang/lib/Driver/ToolChains/Clang.cpp b/clang/lib/Driver/ToolChains/Clang.cpp +index 9e1f07d78bf1..274875c631c5 100644 +--- a/clang/lib/Driver/ToolChains/Clang.cpp ++++ b/clang/lib/Driver/ToolChains/Clang.cpp +@@ -8400,6 +8400,11 @@ void OffloadBundler::ConstructJob(Compilation &C, const JobAction &JA, + } + CmdArgs.push_back(TCArgs.MakeArgString(UB)); + } ++ if (TCArgs.hasFlag(options::OPT_offload_compress, ++ options::OPT_no_offload_compress, false)) ++ CmdArgs.push_back("-compress"); ++ if (TCArgs.hasArg(options::OPT_v)) ++ CmdArgs.push_back("-verbose"); + // All the inputs are encoded as commands. + C.addCommand(std::make_unique<Command>( + JA, *this, ResponseFileSupport::None(), +@@ -8494,6 +8499,8 @@ void OffloadBundler::ConstructJobMultipleOutputs( + } + CmdArgs.push_back("-unbundle"); + CmdArgs.push_back("-allow-missing-bundles"); ++ if (TCArgs.hasArg(options::OPT_v)) ++ CmdArgs.push_back("-verbose"); + + // All the inputs are encoded as commands. + C.addCommand(std::make_unique<Command>( +diff --git a/clang/lib/Driver/ToolChains/HIPUtility.cpp b/clang/lib/Driver/ToolChains/HIPUtility.cpp +index 8b9d8db90ffa..04efdcba20ea 100644 +--- a/clang/lib/Driver/ToolChains/HIPUtility.cpp ++++ b/clang/lib/Driver/ToolChains/HIPUtility.cpp +@@ -84,6 +84,12 @@ void HIP::constructHIPFatbinCommand(Compilation &C, const JobAction &JA, + Args.MakeArgString(std::string("-output=").append(Output)); + BundlerArgs.push_back(BundlerOutputArg); + ++ if (Args.hasFlag(options::OPT_offload_compress, ++ options::OPT_no_offload_compress, false)) ++ BundlerArgs.push_back("-compress"); ++ if (Args.hasArg(options::OPT_v)) ++ BundlerArgs.push_back("-verbose"); ++ + const char *Bundler = Args.MakeArgString( + T.getToolChain().GetProgramPath("clang-offload-bundler")); + C.addCommand(std::make_unique<Command>( +diff --git a/clang/test/Driver/clang-offload-bundler-zlib.c b/clang/test/Driver/clang-offload-bundler-zlib.c +new file mode 100644 +index 000000000000..c46c32a4a053 +--- /dev/null ++++ b/clang/test/Driver/clang-offload-bundler-zlib.c +@@ -0,0 +1,75 @@ ++// REQUIRES: zlib ++// REQUIRES: x86-registered-target ++// UNSUPPORTED: target={{.*}}-darwin{{.*}}, target={{.*}}-aix{{.*}} ++ ++// ++// Generate the host binary to be bundled. ++// ++// RUN: %clang -O0 -target %itanium_abi_triple %s -c -emit-llvm -o %t.bc ++ ++// ++// Generate an empty file to help with the checks of empty files. ++// ++// RUN: touch %t.empty ++ ++// ++// Generate device binaries to be bundled. ++// ++// RUN: echo 'Content of device file 1' > %t.tgt1 ++// RUN: echo 'Content of device file 2' > %t.tgt2 ++ ++// ++// Check compression/decompression of offload bundle. ++// ++// RUN: env OFFLOAD_BUNDLER_COMPRESS=1 OFFLOAD_BUNDLER_VERBOSE=1 \ ++// RUN: clang-offload-bundler -type=bc -targets=hip-amdgcn-amd-amdhsa--gfx900,hip-amdgcn-amd-amdhsa--gfx906 \ ++// RUN: -input=%t.tgt1 -input=%t.tgt2 -output=%t.hip.bundle.bc 2>&1 | \ ++// RUN: FileCheck -check-prefix=COMPRESS %s ++// RUN: clang-offload-bundler -type=bc -list -input=%t.hip.bundle.bc | FileCheck -check-prefix=NOHOST %s ++// RUN: env OFFLOAD_BUNDLER_VERBOSE=1 \ ++// RUN: clang-offload-bundler -type=bc -targets=hip-amdgcn-amd-amdhsa--gfx900,hip-amdgcn-amd-amdhsa--gfx906 \ ++// RUN: -output=%t.res.tgt1 -output=%t.res.tgt2 -input=%t.hip.bundle.bc -unbundle 2>&1 | \ ++// RUN: FileCheck -check-prefix=DECOMPRESS %s ++// RUN: diff %t.tgt1 %t.res.tgt1 ++// RUN: diff %t.tgt2 %t.res.tgt2 ++ ++// ++// COMPRESS: Compression method used: ++// DECOMPRESS: Decompression method: ++// NOHOST-NOT: host- ++// NOHOST-DAG: hip-amdgcn-amd-amdhsa--gfx900 ++// NOHOST-DAG: hip-amdgcn-amd-amdhsa--gfx906 ++// ++ ++// ++// Check -bundle-align option. ++// ++ ++// RUN: clang-offload-bundler -bundle-align=4096 -type=bc -targets=host-%itanium_abi_triple,openmp-powerpc64le-ibm-linux-gnu,openmp-x86_64-pc-linux-gnu -input=%t.bc -input=%t.tgt1 -input=%t.tgt2 -output=%t.bundle3.bc -compress ++// RUN: clang-offload-bundler -type=bc -targets=host-%itanium_abi_triple,openmp-powerpc64le-ibm-linux-gnu,openmp-x86_64-pc-linux-gnu -output=%t.res.bc -output=%t.res.tgt1 -output=%t.res.tgt2 -input=%t.bundle3.bc -unbundle ++// RUN: diff %t.bc %t.res.bc ++// RUN: diff %t.tgt1 %t.res.tgt1 ++// RUN: diff %t.tgt2 %t.res.tgt2 ++ ++// ++// Check unbundling archive. ++// ++// RUN: clang-offload-bundler -type=bc -targets=hip-amdgcn-amd-amdhsa--gfx900,hip-amdgcn-amd-amdhsa--gfx906 \ ++// RUN: -input=%t.tgt1 -input=%t.tgt2 -output=%T/hip_bundle1.bc -compress ++// RUN: clang-offload-bundler -type=bc -targets=hip-amdgcn-amd-amdhsa--gfx900,hip-amdgcn-amd-amdhsa--gfx906 \ ++// RUN: -input=%t.tgt1 -input=%t.tgt2 -output=%T/hip_bundle2.bc -compress ++// RUN: llvm-ar cr %T/hip_archive.a %T/hip_bundle1.bc %T/hip_bundle2.bc ++// RUN: clang-offload-bundler -unbundle -type=a -targets=hip-amdgcn-amd-amdhsa--gfx900,hip-amdgcn-amd-amdhsa--gfx906 \ ++// RUN: -output=%T/hip_900.a -output=%T/hip_906.a -input=%T/hip_archive.a ++// RUN: llvm-ar t %T/hip_900.a | FileCheck -check-prefix=HIP-AR-900 %s ++// RUN: llvm-ar t %T/hip_906.a | FileCheck -check-prefix=HIP-AR-906 %s ++// HIP-AR-900-DAG: hip_bundle1-hip-amdgcn-amd-amdhsa--gfx900 ++// HIP-AR-900-DAG: hip_bundle2-hip-amdgcn-amd-amdhsa--gfx900 ++// HIP-AR-906-DAG: hip_bundle1-hip-amdgcn-amd-amdhsa--gfx906 ++// HIP-AR-906-DAG: hip_bundle2-hip-amdgcn-amd-amdhsa--gfx906 ++ ++// Some code so that we can create a binary out of this file. ++int A = 0; ++void test_func(void) { ++ ++A; ++} +diff --git a/clang/test/Driver/clang-offload-bundler-zstd.c b/clang/test/Driver/clang-offload-bundler-zstd.c +new file mode 100644 +index 000000000000..b2b588b72d4d +--- /dev/null ++++ b/clang/test/Driver/clang-offload-bundler-zstd.c +@@ -0,0 +1,72 @@ ++// REQUIRES: zstd ++// REQUIRES: x86-registered-target ++// UNSUPPORTED: target={{.*}}-darwin{{.*}}, target={{.*}}-aix{{.*}} ++ ++// ++// Generate the host binary to be bundled. ++// ++// RUN: %clang -O0 -target %itanium_abi_triple %s -c -emit-llvm -o %t.bc ++ ++// ++// Generate an empty file to help with the checks of empty files. ++// ++// RUN: touch %t.empty ++ ++// ++// Generate device binaries to be bundled. ++// ++// RUN: echo 'Content of device file 1' > %t.tgt1 ++// RUN: echo 'Content of device file 2' > %t.tgt2 ++ ++// ++// Check compression/decompression of offload bundle. ++// ++// RUN: clang-offload-bundler -type=bc -targets=hip-amdgcn-amd-amdhsa--gfx900,hip-amdgcn-amd-amdhsa--gfx906 \ ++// RUN: -input=%t.tgt1 -input=%t.tgt2 -output=%t.hip.bundle.bc -compress -verbose 2>&1 | \ ++// RUN: FileCheck -check-prefix=COMPRESS %s ++// RUN: clang-offload-bundler -type=bc -list -input=%t.hip.bundle.bc | FileCheck -check-prefix=NOHOST %s ++// RUN: clang-offload-bundler -type=bc -targets=hip-amdgcn-amd-amdhsa--gfx900,hip-amdgcn-amd-amdhsa--gfx906 \ ++// RUN: -output=%t.res.tgt1 -output=%t.res.tgt2 -input=%t.hip.bundle.bc -unbundle -verbose 2>&1 | \ ++// RUN: FileCheck -check-prefix=DECOMPRESS %s ++// RUN: diff %t.tgt1 %t.res.tgt1 ++// RUN: diff %t.tgt2 %t.res.tgt2 ++// ++// COMPRESS: Compression method used ++// DECOMPRESS: Decompression method ++// NOHOST-NOT: host- ++// NOHOST-DAG: hip-amdgcn-amd-amdhsa--gfx900 ++// NOHOST-DAG: hip-amdgcn-amd-amdhsa--gfx906 ++// ++ ++// ++// Check -bundle-align option. ++// ++ ++// RUN: clang-offload-bundler -bundle-align=4096 -type=bc -targets=host-%itanium_abi_triple,openmp-powerpc64le-ibm-linux-gnu,openmp-x86_64-pc-linux-gnu -input=%t.bc -input=%t.tgt1 -input=%t.tgt2 -output=%t.bundle3.bc -compress ++// RUN: clang-offload-bundler -type=bc -targets=host-%itanium_abi_triple,openmp-powerpc64le-ibm-linux-gnu,openmp-x86_64-pc-linux-gnu -output=%t.res.bc -output=%t.res.tgt1 -output=%t.res.tgt2 -input=%t.bundle3.bc -unbundle ++// RUN: diff %t.bc %t.res.bc ++// RUN: diff %t.tgt1 %t.res.tgt1 ++// RUN: diff %t.tgt2 %t.res.tgt2 ++ ++// ++// Check unbundling archive. ++// ++// RUN: clang-offload-bundler -type=bc -targets=hip-amdgcn-amd-amdhsa--gfx900,hip-amdgcn-amd-amdhsa--gfx906 \ ++// RUN: -input=%t.tgt1 -input=%t.tgt2 -output=%T/hip_bundle1.bc -compress ++// RUN: clang-offload-bundler -type=bc -targets=hip-amdgcn-amd-amdhsa--gfx900,hip-amdgcn-amd-amdhsa--gfx906 \ ++// RUN: -input=%t.tgt1 -input=%t.tgt2 -output=%T/hip_bundle2.bc -compress ++// RUN: llvm-ar cr %T/hip_archive.a %T/hip_bundle1.bc %T/hip_bundle2.bc ++// RUN: clang-offload-bundler -unbundle -type=a -targets=hip-amdgcn-amd-amdhsa--gfx900,hip-amdgcn-amd-amdhsa--gfx906 \ ++// RUN: -output=%T/hip_900.a -output=%T/hip_906.a -input=%T/hip_archive.a ++// RUN: llvm-ar t %T/hip_900.a | FileCheck -check-prefix=HIP-AR-900 %s ++// RUN: llvm-ar t %T/hip_906.a | FileCheck -check-prefix=HIP-AR-906 %s ++// HIP-AR-900-DAG: hip_bundle1-hip-amdgcn-amd-amdhsa--gfx900 ++// HIP-AR-900-DAG: hip_bundle2-hip-amdgcn-amd-amdhsa--gfx900 ++// HIP-AR-906-DAG: hip_bundle1-hip-amdgcn-amd-amdhsa--gfx906 ++// HIP-AR-906-DAG: hip_bundle2-hip-amdgcn-amd-amdhsa--gfx906 ++ ++// Some code so that we can create a binary out of this file. ++int A = 0; ++void test_func(void) { ++ ++A; ++} +diff --git a/clang/test/Driver/hip-offload-compress-zlib.hip b/clang/test/Driver/hip-offload-compress-zlib.hip +new file mode 100644 +index 000000000000..a29b6d037350 +--- /dev/null ++++ b/clang/test/Driver/hip-offload-compress-zlib.hip +@@ -0,0 +1,45 @@ ++// REQUIRES: zlib ++// REQUIRES: x86-registered-target ++// REQUIRES: amdgpu-registered-target ++ ++// Test compress bundled bitcode. ++ ++// RUN: rm -rf %T/a.bc ++// RUN: %clang -c -v --target=x86_64-linux-gnu \ ++// RUN: -x hip --offload-arch=gfx1100 --offload-arch=gfx1101 \ ++// RUN: -fgpu-rdc -nogpuinc -nogpulib \ ++// RUN: %S/Inputs/hip_multiple_inputs/a.cu \ ++// RUN: --offload-compress --offload-device-only --gpu-bundle-output \ ++// RUN: -o %T/a.bc \ ++// RUN: 2>&1 | FileCheck %s ++ ++// CHECK: clang-offload-bundler{{.*}} -type=bc ++// CHECK-SAME: -targets={{.*}}hip-amdgcn-amd-amdhsa-gfx1100,hip-amdgcn-amd-amdhsa-gfx1101 ++// CHECK-SAME: -compress -verbose ++// CHECK: Compressed bundle format ++ ++// Test uncompress of bundled bitcode. ++ ++// RUN: %clang --hip-link -### -v --target=x86_64-linux-gnu \ ++// RUN: --offload-arch=gfx1100 --offload-arch=gfx1101 \ ++// RUN: -fgpu-rdc -nogpulib \ ++// RUN: %T/a.bc --offload-device-only \ ++// RUN: 2>&1 | FileCheck -check-prefix=UNBUNDLE %s ++ ++// UNBUNDLE: clang-offload-bundler{{.*}} "-type=bc" ++// UNBUNDLE-SAME: -targets={{.*}}hip-amdgcn-amd-amdhsa-gfx1100,hip-amdgcn-amd-amdhsa-gfx1101 ++// UNBUNDLE-SAME: -unbundle ++// UNBUNDLE-SAME: -verbose ++ ++// Test compress bundled code objects. ++ ++// RUN: %clang -c -### -v --target=x86_64-linux-gnu \ ++// RUN: -x hip --offload-arch=gfx1100 --offload-arch=gfx1101 \ ++// RUN: -nogpuinc -nogpulib \ ++// RUN: %S/Inputs/hip_multiple_inputs/a.cu \ ++// RUN: --offload-compress \ ++// RUN: 2>&1 | FileCheck -check-prefix=CO %s ++ ++// CO: clang-offload-bundler{{.*}} "-type=o" ++// CO-SAME: -targets={{.*}}hipv4-amdgcn-amd-amdhsa--gfx1100,hipv4-amdgcn-amd-amdhsa--gfx1101 ++// CO-SAME: "-compress" "-verbose" +diff --git a/clang/test/Driver/hip-offload-compress-zstd.hip b/clang/test/Driver/hip-offload-compress-zstd.hip +new file mode 100644 +index 000000000000..688c2c85329c +--- /dev/null ++++ b/clang/test/Driver/hip-offload-compress-zstd.hip +@@ -0,0 +1,45 @@ ++// REQUIRES: zstd ++// REQUIRES: x86-registered-target ++// REQUIRES: amdgpu-registered-target ++ ++// Test compress bundled bitcode. ++ ++// RUN: rm -rf %T/a.bc ++// RUN: %clang -c -v --target=x86_64-linux-gnu \ ++// RUN: -x hip --offload-arch=gfx1100 --offload-arch=gfx1101 \ ++// RUN: -fgpu-rdc -nogpuinc -nogpulib \ ++// RUN: %S/Inputs/hip_multiple_inputs/a.cu \ ++// RUN: --offload-compress --offload-device-only --gpu-bundle-output \ ++// RUN: -o %T/a.bc \ ++// RUN: 2>&1 | FileCheck %s ++ ++// CHECK: clang-offload-bundler{{.*}} -type=bc ++// CHECK-SAME: -targets={{.*}}hip-amdgcn-amd-amdhsa-gfx1100,hip-amdgcn-amd-amdhsa-gfx1101 ++// CHECK-SAME: -compress -verbose ++// CHECK: Compressed bundle format ++ ++// Test uncompress of bundled bitcode. ++ ++// RUN: %clang --hip-link -### -v --target=x86_64-linux-gnu \ ++// RUN: --offload-arch=gfx1100 --offload-arch=gfx1101 \ ++// RUN: -fgpu-rdc -nogpulib \ ++// RUN: %T/a.bc --offload-device-only \ ++// RUN: 2>&1 | FileCheck -check-prefix=UNBUNDLE %s ++ ++// UNBUNDLE: clang-offload-bundler{{.*}} "-type=bc" ++// UNBUNDLE-SAME: -targets={{.*}}hip-amdgcn-amd-amdhsa-gfx1100,hip-amdgcn-amd-amdhsa-gfx1101 ++// UNBUNDLE-SAME: -unbundle ++// UNBUNDLE-SAME: -verbose ++ ++// Test compress bundled code objects. ++ ++// RUN: %clang -c -### -v --target=x86_64-linux-gnu \ ++// RUN: -x hip --offload-arch=gfx1100 --offload-arch=gfx1101 \ ++// RUN: -nogpuinc -nogpulib \ ++// RUN: %S/Inputs/hip_multiple_inputs/a.cu \ ++// RUN: --offload-compress \ ++// RUN: 2>&1 | FileCheck -check-prefix=CO %s ++ ++// CO: clang-offload-bundler{{.*}} "-type=o" ++// CO-SAME: -targets={{.*}}hipv4-amdgcn-amd-amdhsa--gfx1100,hipv4-amdgcn-amd-amdhsa--gfx1101 ++// CO-SAME: "-compress" "-verbose" +diff --git a/clang/tools/clang-offload-bundler/CMakeLists.txt b/clang/tools/clang-offload-bundler/CMakeLists.txt +index dabd82382cdf..dec2881589a5 100644 +--- a/clang/tools/clang-offload-bundler/CMakeLists.txt ++++ b/clang/tools/clang-offload-bundler/CMakeLists.txt +@@ -1,4 +1,5 @@ + set(LLVM_LINK_COMPONENTS ++ BinaryFormat + Object + Support + TargetParser +diff --git a/clang/tools/clang-offload-bundler/ClangOffloadBundler.cpp b/clang/tools/clang-offload-bundler/ClangOffloadBundler.cpp +index c02b5854bded..68f29807b219 100644 +--- a/clang/tools/clang-offload-bundler/ClangOffloadBundler.cpp ++++ b/clang/tools/clang-offload-bundler/ClangOffloadBundler.cpp +@@ -141,6 +141,11 @@ int main(int argc, const char **argv) { + cl::desc("Treat hip and hipv4 offload kinds as " + "compatible with openmp kind, and vice versa.\n"), + cl::init(false), cl::cat(ClangOffloadBundlerCategory)); ++ cl::opt<bool> Compress("compress", ++ cl::desc("Compress output file when bundling.\n"), ++ cl::init(false), cl::cat(ClangOffloadBundlerCategory)); ++ cl::opt<bool> Verbose("verbose", cl::desc("Print debug information.\n"), ++ cl::init(false), cl::cat(ClangOffloadBundlerCategory)); + + // Process commandline options and report errors + sys::PrintStackTraceOnErrorSignal(argv[0]); +@@ -169,6 +174,11 @@ int main(int argc, const char **argv) { + BundlerConfig.BundleAlignment = BundleAlignment; + BundlerConfig.FilesType = FilesType; + BundlerConfig.ObjcopyPath = ""; ++ // Do not override the default value Compress and Verbose in BundlerConfig. ++ if (Compress.getNumOccurrences() > 0) ++ BundlerConfig.Compress = Compress; ++ if (Verbose.getNumOccurrences() > 0) ++ BundlerConfig.Verbose = Verbose; + + BundlerConfig.TargetNames = TargetNames; + BundlerConfig.InputFileNames = InputFileNames; +diff --git a/llvm/include/llvm/BinaryFormat/Magic.h b/llvm/include/llvm/BinaryFormat/Magic.h +index 329c96f5c14c..a28710dcdfaf 100644 +--- a/llvm/include/llvm/BinaryFormat/Magic.h ++++ b/llvm/include/llvm/BinaryFormat/Magic.h +@@ -42,19 +42,21 @@ struct file_magic { + macho_universal_binary, ///< Mach-O universal binary + macho_file_set, ///< Mach-O file set binary + minidump, ///< Windows minidump file +- coff_cl_gl_object, ///< Microsoft cl.exe's intermediate code file +- coff_object, ///< COFF object file +- coff_import_library, ///< COFF import library +- pecoff_executable, ///< PECOFF executable file +- windows_resource, ///< Windows compiled resource file (.res) +- xcoff_object_32, ///< 32-bit XCOFF object file +- xcoff_object_64, ///< 64-bit XCOFF object file +- wasm_object, ///< WebAssembly Object file +- pdb, ///< Windows PDB debug info file +- tapi_file, ///< Text-based Dynamic Library Stub file +- cuda_fatbinary, ///< CUDA Fatbinary object file +- offload_binary, ///< LLVM offload object file +- dxcontainer_object, ///< DirectX container file ++ coff_cl_gl_object, ///< Microsoft cl.exe's intermediate code file ++ coff_object, ///< COFF object file ++ coff_import_library, ///< COFF import library ++ pecoff_executable, ///< PECOFF executable file ++ windows_resource, ///< Windows compiled resource file (.res) ++ xcoff_object_32, ///< 32-bit XCOFF object file ++ xcoff_object_64, ///< 64-bit XCOFF object file ++ wasm_object, ///< WebAssembly Object file ++ pdb, ///< Windows PDB debug info file ++ tapi_file, ///< Text-based Dynamic Library Stub file ++ cuda_fatbinary, ///< CUDA Fatbinary object file ++ offload_binary, ///< LLVM offload object file ++ dxcontainer_object, ///< DirectX container file ++ offload_bundle, ///< Clang offload bundle file ++ offload_bundle_compressed, ///< Compressed clang offload bundle file + }; + + bool is_object() const { return V != unknown; } +diff --git a/llvm/lib/BinaryFormat/Magic.cpp b/llvm/lib/BinaryFormat/Magic.cpp +index aa84bc36bfde..76aa1a602aa8 100644 +--- a/llvm/lib/BinaryFormat/Magic.cpp ++++ b/llvm/lib/BinaryFormat/Magic.cpp +@@ -87,6 +87,10 @@ file_magic llvm::identify_magic(StringRef Magic) { + if (startswith(Magic, "BC\xC0\xDE")) + return file_magic::bitcode; + break; ++ case 'C': ++ if (startswith(Magic, "CCOB")) ++ return file_magic::offload_bundle_compressed; ++ break; + case '!': + if (startswith(Magic, "!<arch>\n") || startswith(Magic, "!<thin>\n")) + return file_magic::archive; +@@ -246,6 +250,13 @@ file_magic llvm::identify_magic(StringRef Magic) { + return file_magic::coff_object; + break; + ++ case '_': { ++ const char OBMagic[] = "__CLANG_OFFLOAD_BUNDLE__"; ++ if (Magic.size() >= sizeof(OBMagic) && startswith(Magic, OBMagic)) ++ return file_magic::offload_bundle; ++ break; ++ } ++ + default: + break; + } +diff --git a/llvm/lib/Object/Binary.cpp b/llvm/lib/Object/Binary.cpp +index d18aed8b3b8c..0ee9f7fac448 100644 +--- a/llvm/lib/Object/Binary.cpp ++++ b/llvm/lib/Object/Binary.cpp +@@ -87,6 +87,8 @@ Expected<std::unique_ptr<Binary>> object::createBinary(MemoryBufferRef Buffer, + case file_magic::cuda_fatbinary: + case file_magic::coff_cl_gl_object: + case file_magic::dxcontainer_object: ++ case file_magic::offload_bundle: ++ case file_magic::offload_bundle_compressed: + // Unrecognized object file format. + return errorCodeToError(object_error::invalid_file_type); + case file_magic::offload_binary: +diff --git a/llvm/lib/Object/ObjectFile.cpp b/llvm/lib/Object/ObjectFile.cpp +index 56a1d09097d4..4cc95ea32f60 100644 +--- a/llvm/lib/Object/ObjectFile.cpp ++++ b/llvm/lib/Object/ObjectFile.cpp +@@ -154,6 +154,8 @@ ObjectFile::createObjectFile(MemoryBufferRef Object, file_magic Type, + case file_magic::cuda_fatbinary: + case file_magic::offload_binary: + case file_magic::dxcontainer_object: ++ case file_magic::offload_bundle: ++ case file_magic::offload_bundle_compressed: + return errorCodeToError(object_error::invalid_file_type); + case file_magic::tapi_file: + return errorCodeToError(object_error::invalid_file_type); +-- +2.43.0 + diff --git a/pkgs/development/rocm-modules/6/llvm/base.nix b/pkgs/development/rocm-modules/6/llvm/base.nix index 95f57b052045e..88b384b43d8e6 100644 --- a/pkgs/development/rocm-modules/6/llvm/base.nix +++ b/pkgs/development/rocm-modules/6/llvm/base.nix @@ -72,7 +72,9 @@ in stdenv.mkDerivation (finalAttrs: { "info" # Avoid `attribute 'info' missing` when using with wrapCC ]; - patches = extraPatches; + patches = [ + ./add-compression-to-clang-offload-bundler.patch + ] ++ extraPatches; src = fetchFromGitHub { owner = "ROCm"; @@ -133,7 +135,14 @@ in stdenv.mkDerivation (finalAttrs: { "-DLLVM_EXTERNAL_LIT=${lit}/bin/.lit-wrapped" ] ++ extraCMakeFlags; - postPatch = lib.optionalString finalAttrs.passthru.isLLVM '' + prePatch = '' + cd ../ + chmod -R u+w . + ''; + + postPatch = '' + cd ${targetDir} + '' + lib.optionalString finalAttrs.passthru.isLLVM '' patchShebangs lib/OffloadArch/make_generated_offload_arch_h.sh '' + lib.optionalString (buildTests && finalAttrs.passthru.isLLVM) '' # FileSystem permissions tests fail with various special bits @@ -141,7 +150,7 @@ in stdenv.mkDerivation (finalAttrs: { rm unittests/Support/Path.cpp substituteInPlace unittests/Support/CMakeLists.txt \ - --replace "Path.cpp" "" + --replace-fail "Path.cpp" "" '' + extraPostPatch; doCheck = buildTests; diff --git a/pkgs/development/rocm-modules/6/llvm/stage-1/clang-unwrapped.nix b/pkgs/development/rocm-modules/6/llvm/stage-1/clang-unwrapped.nix index 5a61732ffd2d4..0d982299ec6ee 100644 --- a/pkgs/development/rocm-modules/6/llvm/stage-1/clang-unwrapped.nix +++ b/pkgs/development/rocm-modules/6/llvm/stage-1/clang-unwrapped.nix @@ -2,13 +2,14 @@ , callPackage , rocmUpdateScript , llvm +, makeWrapper }: callPackage ../base.nix rec { inherit stdenv rocmUpdateScript; targetName = "clang-unwrapped"; targetDir = "clang"; - extraBuildInputs = [ llvm ]; + extraBuildInputs = [ llvm makeWrapper ]; extraCMakeFlags = [ "-DCLANG_INCLUDE_DOCS=ON" @@ -20,7 +21,7 @@ callPackage ../base.nix rec { ln -s ../cmake/Modules/FindLibEdit.cmake cmake/modules substituteInPlace CMakeLists.txt \ - --replace "include(CheckIncludeFile)" "include(CheckIncludeFile)''\nfind_package(LibEdit)" + --replace-fail "include(CheckIncludeFile)" "include(CheckIncludeFile)''\nfind_package(LibEdit)" # `No such file or directory: '/build/source/clang/tools/scan-build/bin/scan-build'` rm test/Analysis/scan-build/*.test @@ -41,6 +42,12 @@ callPackage ../base.nix rec { extraPostInstall = '' mv bin/clang-tblgen $out/bin + # add wrapper to compress embedded accelerator-specific code + # this makes the output of composable_kernel significantly smaller right now + # TODO: remove this once ROCm does it out of the box + mv $out/bin/clang-offload-bundler $out/bin/clang-offload-bundler-unwrapped + makeWrapper $out/bin/clang-offload-bundler-unwrapped $out/bin/clang-offload-bundler \ + --add-flags '-compress' ''; requiredSystemFeatures = [ "big-parallel" ]; diff --git a/pkgs/development/rocm-modules/6/llvm/stage-2/libc.nix b/pkgs/development/rocm-modules/6/llvm/stage-2/libc.nix index 7e7cf9c2a6088..2446723ef5fea 100644 --- a/pkgs/development/rocm-modules/6/llvm/stage-2/libc.nix +++ b/pkgs/development/rocm-modules/6/llvm/stage-2/libc.nix @@ -14,11 +14,11 @@ callPackage ../base.nix rec { # `Failed to match ... against ...` `Match value not within tolerance value of MPFR result:` # We need a better way, but I don't know enough sed magic and patching `CMakeLists.txt` isn't working... substituteInPlace ../libc/test/src/math/log10_test.cpp \ - --replace "i < N" "i < 0" \ - --replace "test(mpfr::RoundingMode::Nearest);" "" \ - --replace "test(mpfr::RoundingMode::Downward);" "" \ - --replace "test(mpfr::RoundingMode::Upward);" "" \ - --replace "test(mpfr::RoundingMode::TowardZero);" "" + --replace-fail "i < N" "i < 0" \ + --replace-fail "test(mpfr::RoundingMode::Nearest);" "" \ + --replace-fail "test(mpfr::RoundingMode::Downward);" "" \ + --replace-fail "test(mpfr::RoundingMode::Upward);" "" \ + --replace-fail "test(mpfr::RoundingMode::TowardZero);" "" ''; checkTargets = [ "check-${targetName}" ]; diff --git a/pkgs/development/rocm-modules/6/llvm/stage-3/0000-mlir-fix-debugtranslation.patch b/pkgs/development/rocm-modules/6/llvm/stage-3/0000-mlir-fix-debugtranslation.patch deleted file mode 100644 index f4221a088136f..0000000000000 --- a/pkgs/development/rocm-modules/6/llvm/stage-3/0000-mlir-fix-debugtranslation.patch +++ /dev/null @@ -1,36 +0,0 @@ -From f1d1e10ec7e1061bf0b90abbc1e298d9438a5e74 Mon Sep 17 00:00:00 2001 -From: Scott Linder <Scott.Linder@amd.com> -Date: Mon, 11 Sep 2023 18:37:37 +0000 -Subject: [PATCH] [HeterogeneousDWARF] Update MLIR DI Metadata handling - -Pass a default DW_MSPACE_LLVM_none to satisfy new API - -Change-Id: I50df461f00b5510a715f55f61107122318102d22 ---- - lib/Target/LLVMIR/DebugTranslation.cpp | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/lib/Target/LLVMIR/DebugTranslation.cpp b/lib/Target/LLVMIR/DebugTranslation.cpp -index 2053f5bcef06aa6..635ee5d7e5fefdc 100644 ---- a/lib/Target/LLVMIR/DebugTranslation.cpp -+++ b/lib/Target/LLVMIR/DebugTranslation.cpp -@@ -148,7 +148,8 @@ llvm::DIDerivedType *DebugTranslation::translateImpl(DIDerivedTypeAttr attr) { - /*File=*/nullptr, /*Line=*/0, - /*Scope=*/nullptr, translate(attr.getBaseType()), attr.getSizeInBits(), - attr.getAlignInBits(), attr.getOffsetInBits(), -- /*DWARFAddressSpace=*/std::nullopt, /*Flags=*/llvm::DINode::FlagZero); -+ /*DWARFAddressSpace=*/std::nullopt, llvm::dwarf::DW_MSPACE_LLVM_none, -+ /*Flags=*/llvm::DINode::FlagZero); - } - - llvm::DIFile *DebugTranslation::translateImpl(DIFileAttr attr) { -@@ -185,7 +186,8 @@ DebugTranslation::translateImpl(DILocalVariableAttr attr) { - llvmCtx, translate(attr.getScope()), getMDStringOrNull(attr.getName()), - translate(attr.getFile()), attr.getLine(), translate(attr.getType()), - attr.getArg(), -- /*Flags=*/llvm::DINode::FlagZero, attr.getAlignInBits(), -+ /*Flags=*/llvm::DINode::FlagZero, llvm::dwarf::DW_MSPACE_LLVM_none, -+ attr.getAlignInBits(), - /*Annotations=*/nullptr); - } - diff --git a/pkgs/development/rocm-modules/6/llvm/stage-3/clang.nix b/pkgs/development/rocm-modules/6/llvm/stage-3/clang.nix index 91f34265f85fa..a0e1935d3c5fe 100644 --- a/pkgs/development/rocm-modules/6/llvm/stage-3/clang.nix +++ b/pkgs/development/rocm-modules/6/llvm/stage-3/clang.nix @@ -68,6 +68,6 @@ wrapCCWith rec { # GPU compilation uses builtin `lld` substituteInPlace $out/bin/{clang,clang++} \ - --replace "-MM) dontLink=1 ;;" "-MM | --cuda-device-only) dontLink=1 ;;''\n--cuda-host-only | --cuda-compile-host-device) dontLink=0 ;;" + --replace-fail "-MM) dontLink=1 ;;" "-MM | --cuda-device-only) dontLink=1 ;;''\n--cuda-host-only | --cuda-compile-host-device) dontLink=0 ;;" ''; } diff --git a/pkgs/development/rocm-modules/6/llvm/stage-3/libclc.nix b/pkgs/development/rocm-modules/6/llvm/stage-3/libclc.nix index 1fd72ee67188f..c395dd792db01 100644 --- a/pkgs/development/rocm-modules/6/llvm/stage-3/libclc.nix +++ b/pkgs/development/rocm-modules/6/llvm/stage-3/libclc.nix @@ -21,13 +21,13 @@ in callPackage ../base.nix rec { # `clspv` tests fail, unresolved calls extraPostPatch = '' substituteInPlace CMakeLists.txt \ - --replace "find_program( LLVM_CLANG clang PATHS \''${LLVM_BINDIR} NO_DEFAULT_PATH )" \ + --replace-fail "find_program( LLVM_CLANG clang PATHS \''${LLVM_BINDIR} NO_DEFAULT_PATH )" \ "find_program( LLVM_CLANG clang PATHS \"${clang}/bin\" NO_DEFAULT_PATH )" \ - --replace "find_program( LLVM_SPIRV llvm-spirv PATHS \''${LLVM_BINDIR} NO_DEFAULT_PATH )" \ + --replace-fail "find_program( LLVM_SPIRV llvm-spirv PATHS \''${LLVM_BINDIR} NO_DEFAULT_PATH )" \ "find_program( LLVM_SPIRV llvm-spirv PATHS \"${spirv}/bin\" NO_DEFAULT_PATH )" \ - --replace " spirv-mesa3d-" "" \ - --replace " spirv64-mesa3d-" "" \ - --replace "NOT \''${t} MATCHES" \ + --replace-fail " spirv-mesa3d-" "" \ + --replace-fail " spirv64-mesa3d-" "" \ + --replace-fail "NOT \''${t} MATCHES" \ "NOT \''${ARCH} STREQUAL \"clspv\" AND NOT \''${ARCH} STREQUAL \"clspv64\" AND NOT \''${t} MATCHES" ''; diff --git a/pkgs/development/rocm-modules/6/llvm/stage-3/mlir.nix b/pkgs/development/rocm-modules/6/llvm/stage-3/mlir.nix index 6de685ea27718..8b71b3fb29778 100644 --- a/pkgs/development/rocm-modules/6/llvm/stage-3/mlir.nix +++ b/pkgs/development/rocm-modules/6/llvm/stage-3/mlir.nix @@ -7,6 +7,7 @@ , glslang , shaderc , lit +, fetchpatch }: callPackage ../base.nix rec { @@ -17,9 +18,12 @@ callPackage ../base.nix rec { targetDir = targetName; # Fix `DebugTranslation.cpp:139:10: error: no matching function for call to 'get'` - # We patch at a different source root, so we modify the patch and include it locally - # https://github.com/ROCm/llvm-project/commit/f1d1e10ec7e1061bf0b90abbc1e298d9438a5e74.patch - extraPatches = [ ./0000-mlir-fix-debugtranslation.patch ]; + extraPatches = [ + (fetchpatch { + url = "https://github.com/ROCm/llvm-project/commit/f1d1e10ec7e1061bf0b90abbc1e298d9438a5e74.patch"; + hash = "sha256-3c91A9InMKxm+JcnWxoUeOU68y5I6w1AAXx6T9UByqI="; + }) + ]; extraNativeBuildInputs = [ clr ]; extraBuildInputs = [ @@ -41,7 +45,7 @@ callPackage ../base.nix rec { extraPostPatch = '' # `add_library cannot create target "llvm_gtest" because an imported target with the same name already exists` substituteInPlace CMakeLists.txt \ - --replace "EXISTS \''${UNITTEST_DIR}/googletest/include/gtest/gtest.h" "FALSE" + --replace-fail "EXISTS \''${UNITTEST_DIR}/googletest/include/gtest/gtest.h" "FALSE" # Mainly `No such file or directory` cat ${./1001-mlir-failing-tests.list} | xargs -d \\n rm diff --git a/pkgs/development/rocm-modules/6/llvm/stage-3/polly.nix b/pkgs/development/rocm-modules/6/llvm/stage-3/polly.nix index e001f33dfd433..da5c2e16f5d3b 100644 --- a/pkgs/development/rocm-modules/6/llvm/stage-3/polly.nix +++ b/pkgs/development/rocm-modules/6/llvm/stage-3/polly.nix @@ -11,7 +11,7 @@ callPackage ../base.nix rec { extraPostPatch = '' # `add_library cannot create target "llvm_gtest" because an imported target with the same name already exists` substituteInPlace CMakeLists.txt \ - --replace "NOT TARGET gtest" "FALSE" + --replace-fail "NOT TARGET gtest" "FALSE" ''; checkTargets = [ "check-${targetName}" ]; diff --git a/pkgs/development/rocm-modules/6/mivisionx/0001-set-__STDC_CONSTANT_MACROS-to-make-rocAL-compile.patch b/pkgs/development/rocm-modules/6/mivisionx/0001-set-__STDC_CONSTANT_MACROS-to-make-rocAL-compile.patch new file mode 100644 index 0000000000000..18946835e12e5 --- /dev/null +++ b/pkgs/development/rocm-modules/6/mivisionx/0001-set-__STDC_CONSTANT_MACROS-to-make-rocAL-compile.patch @@ -0,0 +1,25 @@ +From f0e66bd446d44df1d30faaad520613f5fb7f5916 Mon Sep 17 00:00:00 2001 +From: Martin Schwaighofer <mschwaig@users.noreply.github.com> +Date: Sat, 30 Mar 2024 15:36:52 +0100 +Subject: [PATCH] set __STDC_CONSTANT_MACROS to make rocAL compile + +--- + CMakeLists.txt | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 42b139b6..509915f1 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -149,6 +149,8 @@ message("-- ${Cyan} -D MIGRAPHX=${MIGRAPHX} [Turn ON/OFF MIGraphX Module (de + message("-- ${Cyan} -D BACKEND=${BACKEND} [Select MIVisionX Backend [options:CPU/OPENCL/HIP](default:HIP)]${ColourReset}") + message("-- ${Cyan} -D BUILD_WITH_AMD_ADVANCE=${BUILD_WITH_AMD_ADVANCE} [Turn ON/OFF Build for AMD advanced GPUs(default:OFF)]${ColourReset}") + ++add_definitions(-D__STDC_CONSTANT_MACROS) ++ + add_subdirectory(amd_openvx) + add_subdirectory(amd_openvx_extensions) + add_subdirectory(utilities) +-- +2.43.0 + diff --git a/pkgs/development/rocm-modules/6/mivisionx/default.nix b/pkgs/development/rocm-modules/6/mivisionx/default.nix index e3e6172709fe6..8459dff1c8922 100644 --- a/pkgs/development/rocm-modules/6/mivisionx/default.nix +++ b/pkgs/development/rocm-modules/6/mivisionx/default.nix @@ -46,6 +46,10 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-d32lcJq24MXeIWbNbo6putWaol5kF2io6cz4ZuL+DbE="; }; + patches = [ + ./0001-set-__STDC_CONSTANT_MACROS-to-make-rocAL-compile.patch + ]; + nativeBuildInputs = [ cmake rocm-cmake diff --git a/pkgs/development/skaware-packages/s6-linux-init/default.nix b/pkgs/development/skaware-packages/s6-linux-init/default.nix index fdb92aa3e2c69..0de3673717026 100644 --- a/pkgs/development/skaware-packages/s6-linux-init/default.nix +++ b/pkgs/development/skaware-packages/s6-linux-init/default.nix @@ -1,4 +1,11 @@ -{ lib, skawarePackages, skalibs, execline, s6 }: +{ lib +, stdenv +, skawarePackages +, skalibs +, execline +, s6 +, targetPackages +}: skawarePackages.buildPackage { pname = "s6-linux-init"; @@ -25,6 +32,14 @@ skawarePackages.buildPackage { "--with-dynlib=${s6.out}/lib" ]; + # See ../s6-rc/default.nix for an explanation + postConfigure = lib.optionalString (stdenv.hostPlatform != stdenv.targetPlatform) '' + substituteInPlace src/init/s6-linux-init-maker.c \ + --replace-fail '<execline/config.h>' '"${targetPackages.execline.dev}/include/execline/config.h"' \ + --replace-fail '<s6/config.h>' '"${targetPackages.s6.dev}/include/s6/config.h"' \ + --replace-fail '<s6-linux-init/config.h>' '"${targetPackages.s6-linux-init.dev}/include/s6-linux-init/config.h"' + ''; + postInstall = '' # remove all s6 executables from build directory rm $(find -name "s6-*" -type f -mindepth 1 -maxdepth 1 -executable) diff --git a/pkgs/development/skaware-packages/s6-rc/default.nix b/pkgs/development/skaware-packages/s6-rc/default.nix index edfc12f23271c..8ccdd867688f5 100644 --- a/pkgs/development/skaware-packages/s6-rc/default.nix +++ b/pkgs/development/skaware-packages/s6-rc/default.nix @@ -50,9 +50,9 @@ skawarePackages.buildPackage { # system we're cross-compiling for. postConfigure = lib.optionalString (stdenv.hostPlatform != stdenv.targetPlatform) '' substituteInPlace src/s6-rc/s6-rc-compile.c \ - --replace '<execline/config.h>' '"${targetPackages.execline.dev}/include/execline/config.h"' \ - --replace '<s6/config.h>' '"${targetPackages.s6.dev}/include/s6/config.h"' \ - --replace '<s6-rc/config.h>' '"${targetPackages.s6-rc.dev}/include/s6-rc/config.h"' + --replace-fail '<execline/config.h>' '"${targetPackages.execline.dev}/include/execline/config.h"' \ + --replace-fail '<s6/config.h>' '"${targetPackages.s6.dev}/include/s6/config.h"' \ + --replace-fail '<s6-rc/config.h>' '"${targetPackages.s6-rc.dev}/include/s6-rc/config.h"' ''; postInstall = '' diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index 5adeefc36d32b..702fdeb47e89f 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "checkov"; - version = "3.2.60"; + version = "3.2.66"; pyproject = true; src = fetchFromGitHub { owner = "bridgecrewio"; repo = "checkov"; rev = "refs/tags/${version}"; - hash = "sha256-uHHNbfapnMDhIsOHRAsxNuRCvf6N3Wui/lU5lQpr+7Y="; + hash = "sha256-Wtpg3Fk3hxmbZ2Tz5XIjM2mdh8jq4O67nD2rxAGlcaY="; }; patches = [ ./flake8-compat-5.x.patch ]; diff --git a/pkgs/development/tools/analysis/rizin/default.nix b/pkgs/development/tools/analysis/rizin/default.nix index e298b16904053..c3f85d1940067 100644 --- a/pkgs/development/tools/analysis/rizin/default.nix +++ b/pkgs/development/tools/analysis/rizin/default.nix @@ -27,11 +27,11 @@ let rizin = stdenv.mkDerivation rec { pname = "rizin"; - version = "0.7.2"; + version = "0.7.3"; src = fetchurl { url = "https://github.com/rizinorg/rizin/releases/download/v${version}/rizin-src-v${version}.tar.xz"; - hash = "sha256-/P8/tFrit14/YEvHoIB24yLm4U3veQmBhjeAZcyzWCo="; + hash = "sha256-4O0lraa+QgmNONqczvS++9VJ5HfoD43/pcobj/n72nQ="; }; mesonFlags = [ diff --git a/pkgs/development/tools/benthos/default.nix b/pkgs/development/tools/benthos/default.nix index 59e475fba2091..850adc445bad2 100644 --- a/pkgs/development/tools/benthos/default.nix +++ b/pkgs/development/tools/benthos/default.nix @@ -16,7 +16,7 @@ buildGoModule rec { proxyVendor = true; - vendorHash = "sha256-bnQn6gdHhbUJUPWU3CKrw1sq5CL0Tkss4DINPwlsiPU="; + vendorHash = "sha256-Ce2vXPKbyj517N3uJEGc00hCVZhcRrPvXUSuK+jjK3U="; doCheck = false; diff --git a/pkgs/development/tools/coder/update.sh b/pkgs/development/tools/coder/update.sh index a7ce3da93256a..cf6febe7d8230 100755 --- a/pkgs/development/tools/coder/update.sh +++ b/pkgs/development/tools/coder/update.sh @@ -25,7 +25,8 @@ for ARCH in "${!ARCHS[@]}"; do # Fetch the new hash using nix-prefetch-url NEW_HASH=$(nix-prefetch-url --type sha256 $URL) + SRI_HASH=$(nix hash to-sri --type sha256 $NEW_HASH) # Update the Nix file with the new hash - sed -i "s|${ARCH} = \"sha256-.*\";|${ARCH} = \"sha256-${NEW_HASH}\";|" ./default.nix + sed -i "s|${ARCH} = \"sha256-.*\";|${ARCH} = \"${SRI_HASH}\";|" ./default.nix done diff --git a/pkgs/development/tools/dapr/cli/default.nix b/pkgs/development/tools/dapr/cli/default.nix index c1d06b45982d9..a672b9637e33b 100644 --- a/pkgs/development/tools/dapr/cli/default.nix +++ b/pkgs/development/tools/dapr/cli/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-nR9+6glX0oUJZq32XxyV4aVjfjVlNycZvMNaVHy+Q1s="; }; - vendorHash = "sha256-iqoxlqSdHDfLlb1bcHLPAO2/wiwRpqFBIuoVi7lecKs="; + vendorHash = "sha256-kFmoNd40YxUXVXk0F1Bf77KS5AM0jjOTwTjM5pYKkv4="; proxyVendor = true; diff --git a/pkgs/development/tools/database/sqlcmd/default.nix b/pkgs/development/tools/database/sqlcmd/default.nix index c11475a3caa48..7e23d5e624bdd 100644 --- a/pkgs/development/tools/database/sqlcmd/default.nix +++ b/pkgs/development/tools/database/sqlcmd/default.nix @@ -17,7 +17,7 @@ buildGoModule rec { sha256 = "sha256-LLRNaY6ArUNoKSWSauCh2RKEGO5+G1OnoCAqMaAfOkY="; }; - vendorHash = "sha256-G6Patjrafg9VXXbisBDs/JVvy0SA6moTquKj66z9lzw="; + vendorHash = "sha256-NVmgAlNQvRj/7poIEWjMyKw2qWMd/HwbdSFHpumnRlo="; proxyVendor = true; ldflags = [ "-s" "-w" "-X main.version=${version}" ]; diff --git a/pkgs/development/tools/devbox/default.nix b/pkgs/development/tools/devbox/default.nix index 63adb92c6ee52..fad90ae480f8b 100644 --- a/pkgs/development/tools/devbox/default.nix +++ b/pkgs/development/tools/devbox/default.nix @@ -5,13 +5,13 @@ }: buildGoModule rec { pname = "devbox"; - version = "0.10.4"; + version = "0.10.5"; src = fetchFromGitHub { owner = "jetpack-io"; repo = pname; rev = version; - hash = "sha256-HLoTQrC8LVI2LZFJPRaobFX0TgT8mwVkmzyuii5bGA8="; + hash = "sha256-0Dk3f38kj4bSTffFVhMNwuQXmty7vZMAieKDmkH945Y="; }; ldflags = [ @@ -23,7 +23,7 @@ buildGoModule rec { # integration tests want file system access doCheck = false; - vendorHash = "sha256-L7LDOfJ2v4FIdF8Ttpy7qOhMMLFFuhVxjuy5znn9Yb4="; + vendorHash = "sha256-WT30up/1Y2ar0pkHOq1s0Sz7qc4b+Yr6gILzDYDo0Uk="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/tools/electron/binary/default.nix b/pkgs/development/tools/electron/binary/default.nix index 8405bb930eef8..4386c7fdf5bcf 100644 --- a/pkgs/development/tools/electron/binary/default.nix +++ b/pkgs/development/tools/electron/binary/default.nix @@ -15,30 +15,30 @@ rec { headers = "009p1ffh2cyn98fcmprrjzq79jysp7h565v4f54wvjxjsq2nkr97"; }; - electron_27-bin = mkElectron "27.3.9" { - armv7l-linux = "662bbf0e7070c755bfa548560f7117c7f83e1dc716395fd498a5e57fb7238482"; - aarch64-linux = "ab084338fe645c24fef0c4abf5c637d7c9cf621e75ebb75141761213811ee92d"; - x86_64-linux = "c0fcefdf8e38d6bbbe94a488a388f4dc4e72a52126a892e721c2ddefe2d63e59"; - x86_64-darwin = "49597974b9cb8634e5c892701ab27f8d735eda6ee197a478cf84e5fa4ed1d2e9"; - aarch64-darwin = "ac9f14ab54d7d39fe6e7c35a26ad09b5e0a0fb0c6a87ee4b25816515c51db807"; - headers = "0mkssv830h7jbjb984jdp40zxs8zirb8m3ja35gw6rfblc8p0icb"; + electron_27-bin = mkElectron "27.3.10" { + armv7l-linux = "bb739ce18a9e09225e8e0e1889cf1ab35fefda4ec7c2b60bdda271e58c921271"; + aarch64-linux = "f1783e222074de33fea2188a86499d6a9d8b1aceec3bbd85a17913817a5bd356"; + x86_64-linux = "dcfe17763071f1ec694155176f9156d625e6a69ccc32253b6576ca65111783c0"; + x86_64-darwin = "5f469975f5ed68001dedc0383b94562c0a29e05b885427f20187625251cb83cb"; + aarch64-darwin = "cb0e524b14f0f882a61cdcc46d7f3563ce115158501caaf2e8642f647c1eed6d"; + headers = "12in54rg4dr8lh5dm9xx00w6cvbzgnylq7hjp2jwbj339xsgnqjz"; }; - electron_28-bin = mkElectron "28.2.10" { - armv7l-linux = "b6026a7aed2d43447ac9e8fa44f655c1ef0181f11d52bece839cbdbdaa237180"; - aarch64-linux = "509ab6601e083c67e0dd6926b67ae1ca04dd2a2cafec2a41a0847bac86975b41"; - x86_64-linux = "4bf72ce27cb3098024395462c40ebe88c8a105d1db36861c443a0495703fa4ab"; - x86_64-darwin = "4c323bfdc22bf21ced3b42ec05ea685bba647ff8cc00160da70a63d31a18c0eb"; - aarch64-darwin = "ba693449ccafce08d832e9d5661839bdf2f40dfc0b5d7457a04517783f44cbf9"; - headers = "0dgvzly8k149ivcbc5c58alvnzz51lvvi6kc889lcqdkck8wdvbc"; + electron_28-bin = mkElectron "28.3.0" { + armv7l-linux = "aa74e7240929ebfa817d03e025e117f7a0600c99e6ad9bc339eaf22b0144a71c"; + aarch64-linux = "9ec29245bcbbd0007029b4a3f7976b209968dbaa6443406afbf208b1a5abf094"; + x86_64-linux = "e5003391ffc5161f6d9987ed29fa97532142544326f15fbf90ee43daabeba639"; + x86_64-darwin = "7d6a0f6a7ec606d1caa0e63a99e4c6103a3fedb6e05735f81a03aa8da099a420"; + aarch64-darwin = "a0eb07c006b593be8f76f7f6ad7cb8ac619ec173d341ad4c3ca5e52b38dab8b8"; + headers = "12z94fz4zyypjkjx5l8n0qxd7r5jsny19i4ray60mn5cd7j019z8"; }; - electron_29-bin = mkElectron "29.2.0" { - armv7l-linux = "270e822c580d3caddb8efd42b6c99dbaf5a00e88e61992eef1902a975ceb7efb"; - aarch64-linux = "a1367ef7dda8b262e4cebeeb7e3ea155d53e707e56de93a0cd125c501623db6c"; - x86_64-linux = "4f23a3c3a6db796f29057c72f5aca45e94af6dce950da85e72e3d23dc374dc2a"; - x86_64-darwin = "17b37f38369458e5b558d38b66658e6295ab5975ab87b46720c6bed94ce9e07b"; - aarch64-darwin = "3ff37e2eb71abc187ed0f55570f141326a126a4faed1bd04efbb2ff3f4cf2582"; - headers = "0g5zc0ric20wgvska4yva12358csxi647dbx484ilmabciq6b9vd"; + electron_29-bin = mkElectron "29.3.0" { + armv7l-linux = "51a8b2d67ae58b01919d6eb9e8eef255cd4bb3475b3acaf58ed1b8dc2448f206"; + aarch64-linux = "bd74743eb03a77f40b65739b9ca751af264c6f428e16728d7e0332a4c94789a9"; + x86_64-linux = "7274fe2bbb2e3b71f8fc084921e22d10e529220d380a354827b274f9567261da"; + x86_64-darwin = "88873a315ddd2a70b82e83f2cb7495c0d9d7c7fb5c9ad14fcfee16af4ab89d5e"; + aarch64-darwin = "b3145bbd45007918c2365b1df59a35b4d0636222cd43eea4803580de36b9a17d"; + headers = "1smvjlgdp3ailmh0fvxj96p7cnvls19w7kdwn62v1s3xpl84b915"; }; } diff --git a/pkgs/development/tools/f2c/default.nix b/pkgs/development/tools/f2c/default.nix index da68b27ddeb9f..4b263a907b052 100644 --- a/pkgs/development/tools/f2c/default.nix +++ b/pkgs/development/tools/f2c/default.nix @@ -2,15 +2,18 @@ stdenv.mkDerivation { pname = "f2c"; - version = "20240130"; + version = "20240312"; src = fetchurl { url = "https://www.netlib.org/f2c/src.tgz"; - sha256 = "sha256-YciR1CbtsFvGR9b3/DRcLn9NzlXQksVKj8Xhr0g6MjU="; + sha256 = "sha256-TTPve2fe31/Ad+xFAWy6NUIes2QyUi6NjFucN0pdb5k="; }; makeFlags = [ "-f" "makefile.u" ]; + # Ensure xsum binary is built from scratch + preBuild = "rm xsum"; + installPhase = '' runHook preInstall diff --git a/pkgs/development/tools/firebase-tools/default.nix b/pkgs/development/tools/firebase-tools/default.nix index 25110f322adbe..ef1a6e3b25385 100644 --- a/pkgs/development/tools/firebase-tools/default.nix +++ b/pkgs/development/tools/firebase-tools/default.nix @@ -8,16 +8,16 @@ buildNpmPackage rec { pname = "firebase-tools"; - version = "13.7.1"; + version = "13.7.2"; src = fetchFromGitHub { owner = "firebase"; repo = "firebase-tools"; rev = "v${version}"; - hash = "sha256-NTO4DhRwdCeufkeec6kMw1CEj/cZqk3S+vy9R7TArXU="; + hash = "sha256-KzckVI6eSojnUh+jV1xtKZrwmYfngKk8Ch0cGdTLxMA="; }; - npmDepsHash = "sha256-MgICHHZBgD80vZLfS9WUwvotorc0OAHzGaw+S0tjyQo="; + npmDepsHash = "sha256-X7OScxmDsWnvYTP/GOKZRuq3Bu0ReDDqlIFhEWCeQmY="; postPatch = '' ln -s npm-shrinkwrap.json package-lock.json diff --git a/pkgs/development/tools/fq/default.nix b/pkgs/development/tools/fq/default.nix index 661757d1513db..f36d2a213b0fc 100644 --- a/pkgs/development/tools/fq/default.nix +++ b/pkgs/development/tools/fq/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "fq"; - version = "0.10.0"; + version = "0.11.0"; src = fetchFromGitHub { owner = "wader"; repo = "fq"; rev = "v${version}"; - hash = "sha256-7Zprw1UgKEE8pEbmvR6LcT6Ng9oMRVDCy4HkgDNNYcU="; + hash = "sha256-C9YvAHzpNwOVbFWxmdT5BUwsLug7k6ZLYboYJTgp82I="; }; - vendorHash = "sha256-DodVm3Ga7+PD5ZORjVJcPruP8brT/aCGxCRlw3gVsJo="; + vendorHash = "sha256-liNRrmcTbN9mLWvgcEFZbgBPAHFGCF/KMV6KwRBWgoU="; ldflags = [ "-s" diff --git a/pkgs/development/tools/frugal/default.nix b/pkgs/development/tools/frugal/default.nix index 3cd3d4a7788f8..3dfd54b9220a4 100644 --- a/pkgs/development/tools/frugal/default.nix +++ b/pkgs/development/tools/frugal/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "frugal"; - version = "3.17.10"; + version = "3.17.11"; src = fetchFromGitHub { owner = "Workiva"; repo = pname; rev = "v${version}"; - sha256 = "sha256-FAxvpP2js0bTb5hwFTCGKxIbunM8htEaf17gbM60WWM="; + sha256 = "sha256-SCbnLIoHYvbiY2Irx1ufMZTjmUJIucPMgEFobJNor/c="; }; subPackages = [ "." ]; diff --git a/pkgs/development/tools/go-migrate/default.nix b/pkgs/development/tools/go-migrate/default.nix index da20ec45c20b7..7044262373de2 100644 --- a/pkgs/development/tools/go-migrate/default.nix +++ b/pkgs/development/tools/go-migrate/default.nix @@ -12,7 +12,7 @@ buildGoModule rec { }; proxyVendor = true; # darwin/linux hash mismatch - vendorHash = "sha256-3otiRbswhENs/YvKKr+ZeodLWtK7fhCjEtlMDlkLOlY="; + vendorHash = "sha256-q8wShIcVHZtpnhvZfsxiI5FLq0xneA8IBMDWd/vpz/0="; subPackages = [ "cmd/migrate" ]; diff --git a/pkgs/development/tools/go-task/default.nix b/pkgs/development/tools/go-task/default.nix index 67a6ad2c08638..510acbbdf0455 100644 --- a/pkgs/development/tools/go-task/default.nix +++ b/pkgs/development/tools/go-task/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "go-task"; - version = "3.35.1"; + version = "3.36.0"; src = fetchFromGitHub { owner = pname; repo = "task"; rev = "refs/tags/v${version}"; - hash = "sha256-HFjoLzGF62noA9NQk1Delq6vOcuTZzsyq6kH6QtR7zI="; + hash = "sha256-09dw6bDEKbgajH+/estVYDkbUdUiUUuqXYQqeOBTeQ0="; }; - vendorHash = "sha256-HhnherRx5YQn4ArcavVZutze9usYP+PRI07lEXyw8a0="; + vendorHash = "sha256-ahBpIPTHByZ5Qnl6PaOeTLNBq2hQ78+dUmaHvkJxkWg="; doCheck = false; diff --git a/pkgs/development/tools/go-toml/default.nix b/pkgs/development/tools/go-toml/default.nix index a6f75db9426e5..22e6f3a015dfc 100644 --- a/pkgs/development/tools/go-toml/default.nix +++ b/pkgs/development/tools/go-toml/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "go-toml"; - version = "2.2.0"; + version = "2.2.1"; src = fetchFromGitHub { owner = "pelletier"; repo = pname; rev = "v${version}"; - sha256 = "sha256-oXFZoGAlHRGGqbjjyI0pz1fIg8h6GN0SKOyRQyS4UA0="; + sha256 = "sha256-DAtp9ovl6cny0rom80aK+bGe9U/p6zmTQo1Z3MscCjg="; }; vendorHash = "sha256-4t/ft3XTfc7yrsFVMSfjdCur8QULho3NI2ym6gqjexI="; diff --git a/pkgs/development/tools/goa/default.nix b/pkgs/development/tools/goa/default.nix index 48dfe14be08c2..79e597f9788e2 100644 --- a/pkgs/development/tools/goa/default.nix +++ b/pkgs/development/tools/goa/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "goa"; - version = "3.16.0"; + version = "3.16.1"; src = fetchFromGitHub { owner = "goadesign"; repo = "goa"; rev = "v${version}"; - hash = "sha256-UumeyuFElb+MPd9GYaT8U1GtDi21tChGKKqXBqQ/ZOk="; + hash = "sha256-1j7qgMTb9uz261mI8adY9aM8BkCFQHCCjuc8RIDcqCg="; }; vendorHash = "sha256-A7FsCfZQKFFrk0KXvgyJjfGjyHQ3Ruoq/+RxC+zSa04="; diff --git a/pkgs/development/tools/goresym/default.nix b/pkgs/development/tools/goresym/default.nix index 7eb473ad77917..e6a964fa663d6 100644 --- a/pkgs/development/tools/goresym/default.nix +++ b/pkgs/development/tools/goresym/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "goresym"; - version = "2.7.2"; + version = "2.7.3"; src = fetchFromGitHub { owner = "mandiant"; repo = pname; rev = "v${version}"; - sha256 = "sha256-bZOq3GvGRyeIyN/CEuMA6mQjjrRvoVU9fUEUptd6NH0="; + sha256 = "sha256-U3AjEKQKPS5ghrmEJTsGRIC2BoPYAWL6RDPhA+eN2hg="; }; subPackages = [ "." ]; diff --git a/pkgs/development/tools/gqlgenc/default.nix b/pkgs/development/tools/gqlgenc/default.nix index fff705c4051a5..6b3b8b940ef6d 100644 --- a/pkgs/development/tools/gqlgenc/default.nix +++ b/pkgs/development/tools/gqlgenc/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "gqlgenc"; - version = "0.19.3"; + version = "0.20.0"; src = fetchFromGitHub { owner = "yamashou"; repo = "gqlgenc"; rev = "v${version}"; - sha256 = "sha256-deaJFw1w5TiJIdbTlgEBhpAyDbkjUzqT3vVl+xDUXm4="; + sha256 = "sha256-RniriePoHo608PlT3XrxogWI2oXq0Q48+Jaxz/2xIVo="; }; excludedPackages = [ "example" ]; diff --git a/pkgs/development/tools/ijq/default.nix b/pkgs/development/tools/ijq/default.nix index aa7d7724acba3..bdca841eeccb0 100644 --- a/pkgs/development/tools/ijq/default.nix +++ b/pkgs/development/tools/ijq/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "ijq"; - version = "1.0.1"; + version = "1.1.0"; src = fetchFromSourcehut { owner = "~gpanders"; repo = pname; rev = "v${version}"; - sha256 = "sha256-su/PHUt4GpJxt9nm/oYnP1F8EDSl0fUgamWJj1TxuZA="; + sha256 = "sha256-KtWJwIofMKW+03DFY4UWf3ni1DKuH289svh8iOPo1so="; }; - vendorHash = "sha256-X91kW+dpcxd1+vTV1G1al5cdlwWpbUS85Xxf3yeVg1I="; + vendorHash = "sha256-oMkL4qZUS47h9izDad7Ar0Npd6toIZQuy1YIdEoJ2AM="; nativeBuildInputs = [ installShellFiles makeWrapper scdoc ]; diff --git a/pkgs/development/tools/kustomize/default.nix b/pkgs/development/tools/kustomize/default.nix index 153b211d95abc..ad1ea3f61ab49 100644 --- a/pkgs/development/tools/kustomize/default.nix +++ b/pkgs/development/tools/kustomize/default.nix @@ -21,7 +21,7 @@ buildGoModule rec { # avoid finding test and development commands modRoot = "kustomize"; proxyVendor = true; - vendorHash = "sha256-6+8cwRH37lkQvnHBUlSqyNrZMfDpKbeUNJS4YMflBq0="; + vendorHash = "sha256-inCBDIVdvkEdDJEwX7vdoWANk+f01VxhBGPKxrjR6Ao="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/tools/language-servers/gopls/default.nix b/pkgs/development/tools/language-servers/gopls/default.nix index 509eb290c2e87..b489f0ba8f6f6 100644 --- a/pkgs/development/tools/language-servers/gopls/default.nix +++ b/pkgs/development/tools/language-servers/gopls/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "gopls"; - version = "0.15.2"; + version = "0.15.3"; src = fetchFromGitHub { owner = "golang"; repo = "tools"; rev = "gopls/v${version}"; - hash = "sha256-GgJ92nj94jRX3GnrOozG43wl8K/+UPOCbmp7Wt5E96U="; + hash = "sha256-JUqw2qJFxiuZyXgrmirrOuwG9mtcW1e1+SS0CaZY8VA="; }; modRoot = "gopls"; - vendorHash = "sha256-q7vWiXJAX4u8B4RyFc7kg1BvMCPaTBFOVkWXeE78Emo="; + vendorHash = "sha256-j2jMkVvsZ6UjcziSKtxGfwr7eRiTlEPW7LQCaEIa3I0="; # https://github.com/golang/tools/blob/9ed98faa/gopls/main.go#L27-L30 ldflags = [ "-X main.version=v${version}" ]; diff --git a/pkgs/development/tools/misc/reviewdog/default.nix b/pkgs/development/tools/misc/reviewdog/default.nix index 8339c06251009..90a9505980316 100644 --- a/pkgs/development/tools/misc/reviewdog/default.nix +++ b/pkgs/development/tools/misc/reviewdog/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "reviewdog"; - version = "0.17.2"; + version = "0.17.3"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-NjVw+GU27ARqytpupJETAGGh0DfyuFsP637Mv+P4+zs="; + hash = "sha256-9iXQKwzcWATnqsKrDAyLAkuRHUsfxfEpyeCxZ1JUpV8="; }; - vendorHash = "sha256-HZpRHFmEaE+MBvKJ8f5IEMmg2eIIrVGxM/jxhIgEqi0="; + vendorHash = "sha256-cq8KD2STIpPSB3RXv9sl8Bty1noUQak5FZfrfq1rj10="; doCheck = false; diff --git a/pkgs/development/tools/ocaml/dune/3.nix b/pkgs/development/tools/ocaml/dune/3.nix index b168e7e13c3c5..42d13fcbb320d 100644 --- a/pkgs/development/tools/ocaml/dune/3.nix +++ b/pkgs/development/tools/ocaml/dune/3.nix @@ -6,11 +6,11 @@ else stdenv.mkDerivation rec { pname = "dune"; - version = "3.14.2"; + version = "3.15.0"; src = fetchurl { url = "https://github.com/ocaml/dune/releases/download/${version}/dune-${version}.tbz"; - hash = "sha256-6AhnyzYrJ0nZ2eDLqymC+Yrx2vRFm4EWTKCqxrTmrOE="; + hash = "sha256-tcPRD29gSL+vVvxPCULVY4G1WvQofK+CUUh9TE55INc="; }; nativeBuildInputs = [ ocaml findlib ]; diff --git a/pkgs/development/tools/ols/default.nix b/pkgs/development/tools/ols/default.nix index 05839dcdcba78..963fbaef560e7 100644 --- a/pkgs/development/tools/ols/default.nix +++ b/pkgs/development/tools/ols/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation { pname = "ols"; - version = "0-unstable-2024-02-09"; + version = "0-unstable-2024-04-15"; src = fetchFromGitHub { owner = "DanielGavin"; repo = "ols"; - rev = "3eb1e0e60a66a4fc7347fb77837ff45ccbe1cabb"; - hash = "sha256-qPcSZjvlBmFf3M98GrwIu8SGO2VbgdqBKzyFpGSEtrI="; + rev = "aa1aabda1cce68a6038c48429cc759f09ad2ebab"; + hash = "sha256-yM+Syx8hWiSZatWfFFGz8lUJTOCozkZWPdPUhRW0/Ow="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/opcr-policy/default.nix b/pkgs/development/tools/opcr-policy/default.nix index e1900a1f84f35..e8d4e9a599ab0 100644 --- a/pkgs/development/tools/opcr-policy/default.nix +++ b/pkgs/development/tools/opcr-policy/default.nix @@ -19,7 +19,7 @@ buildGoModule rec { subPackages = [ "cmd/policy" ]; # disable go workspaces - GOWORK = "off"; + env.GOWORK = "off"; doCheck = false; diff --git a/pkgs/development/tools/protolint/default.nix b/pkgs/development/tools/protolint/default.nix index ab1290def1954..36338a6658519 100644 --- a/pkgs/development/tools/protolint/default.nix +++ b/pkgs/development/tools/protolint/default.nix @@ -1,16 +1,16 @@ { lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "protolint"; - version = "0.49.4"; + version = "0.49.6"; src = fetchFromGitHub { owner = "yoheimuta"; repo = pname; rev = "v${version}"; - hash = "sha256-5z9R2LHwwb7aFMvJDYmMRny7lHG4JUSNhU1Hfm0Z1Mc="; + hash = "sha256-wGAHc0I2ewXJeHPH2qO6V3ScixUAMIX5U7zCBi4fqew="; }; - vendorHash = "sha256-8yV/YyNSn6O2UjAQlzM90fOoi3TdxO+v4YPtmSQMFC0="; + vendorHash = "sha256-0+GaTE/qKfPfZpkzUBglIXQoZD6fYkX6Z3QabkZ+IcE="; # Something about the way we run tests causes issues. It doesn't happen # when using "go test" directly: diff --git a/pkgs/development/tools/puppet/puppet-lint/Gemfile b/pkgs/development/tools/puppet/puppet-lint/Gemfile deleted file mode 100644 index 1050498191299..0000000000000 --- a/pkgs/development/tools/puppet/puppet-lint/Gemfile +++ /dev/null @@ -1,5 +0,0 @@ -# frozen_string_literal: true - -source "https://rubygems.org" - -gem "puppet-lint" diff --git a/pkgs/development/tools/puppet/puppet-lint/Gemfile.lock b/pkgs/development/tools/puppet/puppet-lint/Gemfile.lock deleted file mode 100644 index 7569b5e2d13c1..0000000000000 --- a/pkgs/development/tools/puppet/puppet-lint/Gemfile.lock +++ /dev/null @@ -1,13 +0,0 @@ -GEM - remote: https://rubygems.org/ - specs: - puppet-lint (2.5.2) - -PLATFORMS - ruby - -DEPENDENCIES - puppet-lint - -BUNDLED WITH - 2.2.24 diff --git a/pkgs/development/tools/puppet/puppet-lint/default.nix b/pkgs/development/tools/puppet/puppet-lint/default.nix deleted file mode 100644 index 2940605b1b082..0000000000000 --- a/pkgs/development/tools/puppet/puppet-lint/default.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ bundlerApp }: - -bundlerApp { - pname = "puppet-lint"; - gemdir = ./.; - exes = [ "puppet-lint" ]; -} diff --git a/pkgs/development/tools/puppet/puppet-lint/gemset.nix b/pkgs/development/tools/puppet/puppet-lint/gemset.nix deleted file mode 100644 index e3911e63536a6..0000000000000 --- a/pkgs/development/tools/puppet/puppet-lint/gemset.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ - puppet-lint = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1rcj3cb6lf90g6vvhh3c9p8yn7pgibglf9k5878bzd6pn5ag0h9v"; - type = "gem"; - }; - version = "2.5.2"; - }; -} diff --git a/pkgs/development/tools/rain/default.nix b/pkgs/development/tools/rain/default.nix index d520a9489174e..340dc3085a8a6 100644 --- a/pkgs/development/tools/rain/default.nix +++ b/pkgs/development/tools/rain/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "rain"; - version = "1.8.4"; + version = "1.8.5"; src = fetchFromGitHub { owner = "aws-cloudformation"; repo = pname; rev = "v${version}"; - sha256 = "sha256-jn2DeVs9orJZOJjHUwNV1qDL1bVjQ0etlCYlcZE9cqY="; + sha256 = "sha256-AI7P5X9LNjXUQBkYTE0PCQ0xvK1CscVjnauoNVYp3GY="; }; - vendorHash = "sha256-jMgM6ZjQpK8rmDZUzVxDPoJWyWNkvNnvXwKNTHzc080="; + vendorHash = "sha256-CD7W+y/vQwWe7JFTl8+Zl7IKE88+Mu+Vvdr7Q1S+90w="; subPackages = [ "cmd/rain" ]; diff --git a/pkgs/development/tools/rust/cargo-component/default.nix b/pkgs/development/tools/rust/cargo-component/default.nix index 2fb1cfa5244ae..7a791f75936e9 100644 --- a/pkgs/development/tools/rust/cargo-component/default.nix +++ b/pkgs/development/tools/rust/cargo-component/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-component"; - version = "0.10.1"; + version = "0.11.0"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = "cargo-component"; rev = "v${version}"; - hash = "sha256-1mq6tH3jFzyzQ0nsen9r08RrXMn16O7gOz7GS3nr10I="; + hash = "sha256-XUzXqzgAIZKWNpfyBvkYX/g1R8JcIJlVTUb2N4zL96w="; }; - cargoHash = "sha256-BtdMsJqAU9Y1QntUBymlYLJdfx9aP7hf/Za8G8D6w54="; + cargoHash = "sha256-U2ocN9UENms0KZQuEu75jmxphyNGz5OYCLrh6vhvKiI="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/development/tools/rust/cargo-dist/default.nix b/pkgs/development/tools/rust/cargo-dist/default.nix index 87026163fb906..bd87644a7d38e 100644 --- a/pkgs/development/tools/rust/cargo-dist/default.nix +++ b/pkgs/development/tools/rust/cargo-dist/default.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-dist"; - version = "0.11.1"; + version = "0.13.1"; src = fetchFromGitHub { owner = "axodotdev"; repo = "cargo-dist"; rev = "v${version}"; - hash = "sha256-SnwTfRHa/1iVG5tcypFQXUTHEOTiXkICzyjdKNYXQcM="; + hash = "sha256-uav2Q6NG7JW3ZrYkDWXNxR816bI3nxs71KoOdNr/unQ="; }; - cargoHash = "sha256-Z3usfwxUQzrxAoINUZnM6Gffj1GEVaRNOg+XW5g8PH8="; + cargoHash = "sha256-Kd7roUUfXfWlV6IHpu20f0VPoZWmGOPAJjELNqVS3b8="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/development/tools/rust/cargo-tally/default.nix b/pkgs/development/tools/rust/cargo-tally/default.nix index 955e03247b76d..d9db7c536990b 100644 --- a/pkgs/development/tools/rust/cargo-tally/default.nix +++ b/pkgs/development/tools/rust/cargo-tally/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-tally"; - version = "1.0.42"; + version = "1.0.43"; src = fetchCrate { inherit pname version; - hash = "sha256-xtnWk5+08fc/NR0kGIhdpvMLAjXKUwH0tCtUIMMRb5s="; + hash = "sha256-LPqoq9iry8nNXphFdmjwepNB1bK8/myOEoT4UM0xF70="; }; - cargoHash = "sha256-fsKGd8W0Kdbjij8+44oxE6QiixUkwk0Mx3CefXMLSwg="; + cargoHash = "sha256-FU4NYa2S9x0IXhPtWM0PyOBCGCGHj80QR7DRuDgDYJY="; buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk_11_0.frameworks; [ DiskArbitration diff --git a/pkgs/development/tools/rust/cargo-temp/default.nix b/pkgs/development/tools/rust/cargo-temp/default.nix index d5a0e2bba146b..7c4a84401095d 100644 --- a/pkgs/development/tools/rust/cargo-temp/default.nix +++ b/pkgs/development/tools/rust/cargo-temp/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-temp"; - version = "0.2.19"; + version = "0.2.20"; src = fetchFromGitHub { owner = "yozhgoor"; repo = "cargo-temp"; rev = "v${version}"; - hash = "sha256-vLD7M+Pg0BHJq9zDPeJLY+v/Vri/XtV3pQu0+ZE84Ew="; + hash = "sha256-zyzzYftoMNPHvCtGYsxEiiWXd3vjWTfmiIpEJ86ac9c="; }; - cargoHash = "sha256-NKT5AijwNm/BVhHGVAXq6sWBJYjSpq90TXHjlrihldo="; + cargoHash = "sha256-qkYvgKTT4wdYBRTwtDiHYCEBtbNjr6CWQB2y/kL0f8Y="; meta = with lib; { description = "A CLI tool that allow you to create a temporary new Rust project using cargo with already installed dependencies"; diff --git a/pkgs/development/tools/subxt/default.nix b/pkgs/development/tools/subxt/default.nix index 0416bfdde9d87..6fd920e8b00c2 100644 --- a/pkgs/development/tools/subxt/default.nix +++ b/pkgs/development/tools/subxt/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "subxt"; - version = "0.35.2"; + version = "0.35.3"; src = fetchFromGitHub { owner = "paritytech"; repo = "subxt"; rev = "v${version}"; - hash = "sha256-nMdpMvNoynioCzD7wXbF1W3mwCfOClAZyjbF/3eworw="; + hash = "sha256-5G5gFxr7CIvZ1RfkLIEF/z4t+wTj09fJXTNr2v0vuyg="; }; - cargoHash = "sha256-sXiMgooOSGDl0L0i5VncCYuoSzjRSogRGqteE+b6jkc="; + cargoHash = "sha256-5lAs2J5hkPhBN3tORt6N7834brS/dAkKsXvZ6C1K+OY="; # Only build the command line client cargoBuildFlags = [ "--bin" "subxt" ]; diff --git a/pkgs/development/tools/templ/default.nix b/pkgs/development/tools/templ/default.nix deleted file mode 100644 index d4380a9596097..0000000000000 --- a/pkgs/development/tools/templ/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -}: - -buildGoModule rec { - pname = "templ"; - version = "0.2.663"; - - subPackages = [ "cmd/templ" ]; - - CGO_ENABLED = 0; - - ldflags = [ - "-s" - "-w" - "-extldflags -static" - ]; - - src = fetchFromGitHub { - owner = "a-h"; - repo = "templ"; - rev = "refs/tags/v${version}"; - hash = "sha256-TU8QG6OmUzSNDAX9W0Ntmz5cucLqVQeTskfnJbm/YM0="; - }; - - vendorHash = "sha256-Upd5Wq4ajsyOMDiAWS2g2iNO1sm1XJc43AFQLIo5eDM="; - - meta = with lib; { - description = "A language for writing HTML user interfaces in Go"; - homepage = "https://templ.guide/"; - license = licenses.mit; - maintainers = with maintainers; [ luleyleo ]; - mainProgram = "templ"; - }; -} diff --git a/pkgs/development/tools/vsce/default.nix b/pkgs/development/tools/vsce/default.nix index 065821afbf108..ea3fc3bfa5fc7 100644 --- a/pkgs/development/tools/vsce/default.nix +++ b/pkgs/development/tools/vsce/default.nix @@ -12,16 +12,16 @@ buildNpmPackage rec { pname = "vsce"; - version = "2.24.0"; + version = "2.25.0"; src = fetchFromGitHub { owner = "microsoft"; repo = "vscode-vsce"; rev = "v${version}"; - hash = "sha256-MX+tGjz/Nn18ivfjQeOlQtQiyRkB1cGnLl2jlz5Str8="; + hash = "sha256-HPNKxplSJpo/30vpXu176JMzY3fAzTX/9XPRsYj9x+U="; }; - npmDepsHash = "sha256-Difk9a9TYmfwzP9SawEuaxm7iHVjdfO+FxFCE7aEMzM="; + npmDepsHash = "sha256-wfgvGWSxV+N9Uh+jEEZCwPEN0yYNmooWXAV9PwWONkM="; postPatch = '' substituteInPlace package.json --replace '"version": "0.0.0"' '"version": "${version}"' diff --git a/pkgs/development/tools/wails/default.nix b/pkgs/development/tools/wails/default.nix index 660944b5bde2f..174f165fea815 100644 --- a/pkgs/development/tools/wails/default.nix +++ b/pkgs/development/tools/wails/default.nix @@ -23,7 +23,7 @@ buildGoModule rec { hash = "sha256-MHwIRanmgpjTKM+ILSQheCd9+XUwVTCVrREqntxpv7Q="; } + "/v2"; - vendorHash = "sha256-0cGmJEi7OfMZS7ObPBLHOVqKfvnlpHBiGRjSdV6wxE4="; + vendorHash = "sha256-6QFnLuRnSzIqkQkK1qg7VBYxwjK8fSQWz5RxpuyutoY="; proxyVendor = true; diff --git a/pkgs/development/tools/wizer/default.nix b/pkgs/development/tools/wizer/default.nix index 0f8e25e54bd6c..7a46d673af9c9 100644 --- a/pkgs/development/tools/wizer/default.nix +++ b/pkgs/development/tools/wizer/default.nix @@ -8,7 +8,7 @@ rustPlatform.buildRustPackage rec { pname = "wizer"; - version = "5.0.0"; + version = "6.0.0"; # the crate does not contain files which are necessary for the tests # see https://github.com/bytecodealliance/wizer/commit/3a95e27ce42f1fdaef07b52988e4699eaa221e04 @@ -16,10 +16,10 @@ rustPlatform.buildRustPackage rec { owner = "bytecodealliance"; repo = "wizer"; rev = "refs/tags/v${version}"; - hash = "sha256-VkWnmwOnlNkfgUyFXV+iwsUdJcJgzUCNus+FiV9sg0Y="; + hash = "sha256-JQrZysQJOM4G5EwyBlXXd7NTCCoGkOLDahwH0I1b0TY="; }; - cargoHash = "sha256-KSdQqt9szk8qmg3DxBatkJvv//KbSx/MEulJx1gNmB8="; + cargoHash = "sha256-qMBsk8dLmneAYx8FJ9QqW0kLKFTn11EvV9VeVJkr5FU="; cargoBuildFlags = [ "--bin" pname ]; diff --git a/pkgs/development/tools/ytt/default.nix b/pkgs/development/tools/ytt/default.nix index ea1cd39a6ccfc..1b38498f2cfcd 100644 --- a/pkgs/development/tools/ytt/default.nix +++ b/pkgs/development/tools/ytt/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "ytt"; - version = "0.48.0"; + version = "0.49.0"; src = fetchFromGitHub { owner = "vmware-tanzu"; repo = "carvel-ytt"; rev = "v${version}"; - sha256 = "sha256-jHSSccD9jQGR2bblp1J9LQNPiTI47hsjPBmtPVmIRtI="; + sha256 = "sha256-7eG9ATZTqA48KFdPW/XVYNdq+giYVx0v1GDtabiTpQI="; }; vendorHash = null; diff --git a/pkgs/development/web/nodejs/v18.nix b/pkgs/development/web/nodejs/v18.nix index a003c0e9bfb9b..c4a97a47a4b62 100644 --- a/pkgs/development/web/nodejs/v18.nix +++ b/pkgs/development/web/nodejs/v18.nix @@ -19,8 +19,8 @@ let in buildNodejs { inherit enableNpm; - version = "18.20.1"; - sha256 = "sha256-xthnqfJeY1SBDv+4IB+BR6FbKAAOUHkP2gDRyhX0m4o="; + version = "18.20.2"; + sha256 = "sha256-iq6nycfpJ/sJ2RSY2jEbbk0YIzOQ4jxyOlO4kfrUxz8="; patches = [ ./disable-darwin-v8-system-instrumentation.patch ./bypass-darwin-xcrun-node16.patch diff --git a/pkgs/development/web/nodejs/v21.nix b/pkgs/development/web/nodejs/v21.nix index f7882c4526722..dedda892a9180 100644 --- a/pkgs/development/web/nodejs/v21.nix +++ b/pkgs/development/web/nodejs/v21.nix @@ -8,8 +8,8 @@ let in buildNodejs { inherit enableNpm; - version = "21.7.2"; - sha256 = "sha256-tLHioH6W+F9s40ovv+o0hpGu/lyyGappUeI8zJkfni8="; + version = "21.7.3"; + sha256 = "08csswa1h55l9zvfjc4g1ksicgl42pbz7g1bc9hgy77w3gxjd2v6"; patches = [ ./disable-darwin-v8-system-instrumentation-node19.patch ./bypass-darwin-xcrun-node16.patch |