From 4e4e8b529502bc1d72b2ced55529571d07703d5d Mon Sep 17 00:00:00 2001 From: misuzu Date: Mon, 5 Sep 2022 23:23:57 +0300 Subject: [PATCH 01/27] alfis: 0.7.7 -> 0.8.2 https://github.com/Revertron/Alfis/releases/tag/v0.8.2 https://github.com/Revertron/Alfis/compare/v0.7.7...v0.8.2 --- pkgs/applications/blockchains/alfis/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/blockchains/alfis/default.nix b/pkgs/applications/blockchains/alfis/default.nix index 0fd55594f2ef..62f21dff30f3 100644 --- a/pkgs/applications/blockchains/alfis/default.nix +++ b/pkgs/applications/blockchains/alfis/default.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage rec { pname = "alfis"; - version = "0.7.7"; + version = "0.8.2"; src = fetchFromGitHub { owner = "Revertron"; repo = "Alfis"; rev = "v${version}"; - sha256 = "sha256-I9vJc3J3OoUA6GOc8NkWBKSCkjHC4KOztglJOg9S0Eo="; + sha256 = "sha256-E0n1keNk5jNnErNvYhb8oe26kK9Opl+IJ5zpsvrqS84="; }; - cargoSha256 = "sha256-VVBO2w6iwZ+K4gnN6+TckgBXCCc/dGO6/yZEunWGK8g="; + cargoSha256 = "sha256-kbo3OMLYA/5xctz/YhQNd8IYlyCQB7D/8rCHZwjvlMI="; checkFlags = [ # these want internet access, disable them From 033ae6bee8b831a3a93133cf3cfd4081871a198d Mon Sep 17 00:00:00 2001 From: Abin Simon Date: Fri, 9 Sep 2022 10:43:52 +0530 Subject: [PATCH 02/27] mpvc: 2017-03-18 -> 1.3 --- pkgs/applications/misc/mpvc/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/misc/mpvc/default.nix b/pkgs/applications/misc/mpvc/default.nix index bfdfeebae271..58f6962f4c3a 100644 --- a/pkgs/applications/misc/mpvc/default.nix +++ b/pkgs/applications/misc/mpvc/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, socat, fetchFromGitHub, makeWrapper }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "mpvc"; - version = "unstable-2017-03-18"; + version = "1.3"; src = fetchFromGitHub { - owner = "wildefyr"; + owner = "lwilletts"; repo = "mpvc"; - rev = "aea5c661455248cde7ac9ddba5f63cc790d26512"; - sha256 = "0qiyvb3ck1wyd3izajwvlq4bwgsbq7x8ya3fgi5i0g2qr39a1qml"; + rev = version; + sha256 = "sha256-wPETEG0BtNBEj3ZyP70byLzIP+NMUKbnjQ+kdvrvK3s="; }; makeFlags = [ "PREFIX=$(out)" ]; @@ -23,7 +23,7 @@ stdenv.mkDerivation { meta = with lib; { description = "A mpc-like control interface for mpv"; - homepage = "https://github.com/wildefyr/mpvc"; + homepage = "https://github.com/lwilletts/mpvc"; license = licenses.mit; maintainers = [ maintainers.neeasade ]; platforms = platforms.linux; From 288b886396efd7ae461477485cd8b014557adb34 Mon Sep 17 00:00:00 2001 From: Raphael Robatsch Date: Fri, 2 Sep 2022 09:30:55 +0200 Subject: [PATCH 03/27] jetbrains.rider: fix startup Rider 2022.2 changed the way it invokes Rider.Backend, this adds the required patching so that startup succeeds again. --- pkgs/applications/editors/jetbrains/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 3ec39fa071fd..f8f93a1fec8f 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, callPackage, fetchurl -, jdk, cmake, gdb, zlib, python3 +, jdk, cmake, gdb, zlib, python3, icu , lldb , dotnet-sdk_6 , maven @@ -211,6 +211,8 @@ let (mkJetBrainsProduct { inherit pname version src wmClass jdk; product = "Rider"; + # icu is required by Rider.Backend + extraLdPath = [ icu ]; meta = with lib; { homepage = "https://www.jetbrains.com/rider/"; inherit description license platforms; @@ -226,9 +228,11 @@ let }; }).overrideAttrs (attrs: { postPatch = lib.optionalString (!stdenv.isDarwin) (attrs.postPatch + '' + interp="$(cat $NIX_CC/nix-support/dynamic-linker)" + patchelf --set-interpreter $interp lib/ReSharperHost/linux-x64/Rider.Backend + rm -rf lib/ReSharperHost/linux-x64/dotnet - mkdir -p lib/ReSharperHost/linux-x64/dotnet/ - ln -s ${dotnet-sdk_6}/bin/dotnet lib/ReSharperHost/linux-x64/dotnet/dotnet + ln -s ${dotnet-sdk_6} lib/ReSharperHost/linux-x64/dotnet ''); }); From c1ad7b9056598690422dd13e245350dc1702fb74 Mon Sep 17 00:00:00 2001 From: Raphael Robatsch Date: Mon, 5 Sep 2022 00:19:39 +0200 Subject: [PATCH 04/27] jetbrains.rider: add raphaelr to maintainers --- maintainers/maintainer-list.nix | 7 +++++++ pkgs/applications/editors/jetbrains/default.nix | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index c429c50b9853..e7ae43fc8a6f 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -10934,6 +10934,13 @@ githubId = 314564; name = "Ryan Lahfa"; }; + raphaelr = { + email = "raphael-git@tapesoftware.net"; + matrix = "@raphi:tapesoftware.net"; + github = "raphaelr"; + githubId = 121178; + name = "Raphael Robatsch"; + }; raquelgb = { email = "raquel.garcia.bautista@gmail.com"; github = "raquelgb"; diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index f8f93a1fec8f..47dabbf0cbb9 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -224,7 +224,7 @@ let apps, services and libraries, Unity games, ASP.NET and ASP.NET Core web applications. ''; - maintainers = [ ]; + maintainers = with maintainers; [ raphaelr ]; }; }).overrideAttrs (attrs: { postPatch = lib.optionalString (!stdenv.isDarwin) (attrs.postPatch + '' From 03870e938a90ce9df600f2442fc576f51227bda6 Mon Sep 17 00:00:00 2001 From: "\"Viacheslav Lotsmanov\"" <"lotsmanov89@gmail.com"> Date: Sun, 11 Sep 2022 17:23:34 +0300 Subject: [PATCH 05/27] vimPlugins.haskell-with-unicode-vim: init at 2022-09-11 --- pkgs/applications/editors/vim/plugins/generated.nix | 12 ++++++++++++ .../editors/vim/plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 19fd08a4d59f..9ed7903e2826 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -3392,6 +3392,18 @@ final: prev: meta.homepage = "https://github.com/neovimhaskell/haskell-vim/"; }; + haskell-with-unicode-vim = buildVimPluginFrom2Nix { + pname = "haskell-with-unicode.vim"; + version = "2022-09-11"; + src = fetchFromGitHub { + owner = "wenzel-hoffman"; + repo = "haskell-with-unicode.vim"; + rev = "28899d6795efe2feaca6b53c20ec5ef3b5a1b761"; + sha256 = "11a3a981x4av2lvknq1xbxbr8ybgazxfikr45qdm1mby6533kx69"; + }; + meta.homepage = "https://github.com/wenzel-hoffman/haskell-with-unicode.vim/"; + }; + hasksyn = buildVimPluginFrom2Nix { pname = "hasksyn"; version = "2014-09-04"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index c900a9865dca..4708e3c2c9bd 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -284,6 +284,7 @@ https://github.com/junegunn/gv.vim/,, https://git.sr.ht/~sircmpwn/hare.vim,HEAD, https://github.com/ThePrimeagen/harpoon/,, https://github.com/neovimhaskell/haskell-vim/,, +https://github.com/wenzel-hoffman/haskell-with-unicode.vim/,HEAD, https://github.com/travitch/hasksyn/,, https://github.com/Yggdroot/hiPairs/,, https://github.com/mpickering/hlint-refactor-vim/,, From dca7412a8b050ecf5b7a0fa7efe299c57ae6418a Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Sun, 11 Sep 2022 20:11:35 +0200 Subject: [PATCH 06/27] borgmatic: Add bash completion (no other supported shell) --- pkgs/tools/backup/borgmatic/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/backup/borgmatic/default.nix b/pkgs/tools/backup/borgmatic/default.nix index 136be31d8b81..fbafa92c7196 100644 --- a/pkgs/tools/backup/borgmatic/default.nix +++ b/pkgs/tools/backup/borgmatic/default.nix @@ -1,4 +1,4 @@ -{ borgbackup, coreutils, lib, python3Packages, systemd }: +{ borgbackup, coreutils, lib, python3Packages, systemd, installShellFiles }: python3Packages.buildPythonApplication rec { pname = "borgmatic"; @@ -17,6 +17,8 @@ python3Packages.buildPythonApplication rec { "test_borgmatic_version_matches_news_version" ]; + nativeBuildInputs = [ installShellFiles ]; + propagatedBuildInputs = with python3Packages; [ borgbackup colorama @@ -27,6 +29,9 @@ python3Packages.buildPythonApplication rec { ]; postInstall = '' + installShellCompletion --cmd borgmatic \ + --bash <($out/bin/borgmatic --bash-completion) + mkdir -p $out/lib/systemd/system cp sample/systemd/borgmatic.timer $out/lib/systemd/system/ substitute sample/systemd/borgmatic.service \ From 31d2aff2430b978a888c47ea2630e6914078963f Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Sun, 11 Sep 2022 20:16:48 +0200 Subject: [PATCH 07/27] borgmatic: Add passthru.tests.version --- pkgs/tools/backup/borgmatic/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/backup/borgmatic/default.nix b/pkgs/tools/backup/borgmatic/default.nix index fbafa92c7196..bd41dd4854cb 100644 --- a/pkgs/tools/backup/borgmatic/default.nix +++ b/pkgs/tools/backup/borgmatic/default.nix @@ -1,4 +1,4 @@ -{ borgbackup, coreutils, lib, python3Packages, systemd, installShellFiles }: +{ borgbackup, coreutils, lib, python3Packages, systemd, installShellFiles, borgmatic, testers }: python3Packages.buildPythonApplication rec { pname = "borgmatic"; @@ -41,6 +41,8 @@ python3Packages.buildPythonApplication rec { --replace sleep ${coreutils}/bin/sleep ''; + passthru.tests.version = testers.testVersion { package = borgmatic; }; + meta = with lib; { description = "Simple, configuration-driven backup software for servers and workstations"; homepage = "https://torsion.org/borgmatic/"; From 1f5aa244353e6e2d4bc23c48c5f7d054fa332e0f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 11 Sep 2022 19:04:22 +0000 Subject: [PATCH 08/27] jql: 5.0.1 -> 5.0.2 --- pkgs/development/tools/jql/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/jql/default.nix b/pkgs/development/tools/jql/default.nix index e19bd18b68c1..b91777a8e56c 100644 --- a/pkgs/development/tools/jql/default.nix +++ b/pkgs/development/tools/jql/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "jql"; - version = "5.0.1"; + version = "5.0.2"; src = fetchFromGitHub { owner = "yamafaktory"; repo = pname; rev = "v${version}"; - sha256 = "sha256-UfVhkwb89OU7yENcCXM7JfYNsO//des0gsEnvnJGMjA="; + sha256 = "sha256-bCq8EUczhBx/txafdJvTKqbJoZaGZlrdl87TQt8iMDM="; }; - cargoSha256 = "sha256-kkWslFEdjsWGIrRWylGyTDZnNXcfCVrWT+dVnyvTRqk="; + cargoSha256 = "sha256-V+fzGg0MOCG8ikuiFtN3k6825QXRfBRpUKfdTjQVChM="; meta = with lib; { description = "A JSON Query Language CLI tool built with Rust"; From 7135794653b3093b5c90c3926acc693a0613e585 Mon Sep 17 00:00:00 2001 From: Alexis Hildebrandt Date: Sun, 11 Sep 2022 21:09:58 +0200 Subject: [PATCH 09/27] got: 0.74 -> 0.75 --- .../version-management/got/default.nix | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/version-management/got/default.nix b/pkgs/applications/version-management/got/default.nix index 75473ddb113e..14827119f237 100644 --- a/pkgs/applications/version-management/got/default.nix +++ b/pkgs/applications/version-management/got/default.nix @@ -1,19 +1,28 @@ -{ lib, stdenv, fetchurl, pkg-config, openssl, libbsd, libuuid, libossp_uuid, libmd, zlib, ncurses }: +{ lib, stdenv, fetchurl +, pkg-config, openssl, libbsd, libevent, libuuid, libossp_uuid, libmd, zlib, ncurses, bison +}: stdenv.mkDerivation rec { pname = "got"; - version = "0.74"; + version = "0.75"; src = fetchurl { url = "https://gameoftrees.org/releases/portable/got-portable-${version}.tar.gz"; - sha256 = "sha256-XElSCdFh24rf2gosjS0BG+VNqLZNLYeYkUy4t5RIdv4="; + sha256 = "sha256-s1MkiTya771r9JYCpsm7nW4gZwr/PJc0/v6tAgW7nLI="; }; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config bison ]; - buildInputs = [ openssl libbsd libuuid libmd zlib ncurses ] + buildInputs = [ openssl libbsd libevent libuuid libmd zlib ncurses ] ++ lib.optionals stdenv.isDarwin [ libossp_uuid ]; + preConfigure = lib.optionals stdenv.isDarwin '' + # The configure script assumes dependencies on Darwin are install via + # Homebrew or MacPorts and hardcodes assumptions about the paths of + # dependencies which fails the nixpkgs configurePhase. + substituteInPlace configure --replace 'xdarwin' 'xhomebrew' + ''; + doInstallCheck = true; installCheckPhase = '' From 3c3f3a160c2aef45d4bae87e6cd2947af3254a97 Mon Sep 17 00:00:00 2001 From: Alex Martens Date: Sun, 11 Sep 2022 12:29:15 -0700 Subject: [PATCH 10/27] flake8-bugbear: 22.8.23 -> 22.9.11 --- pkgs/development/python-modules/flake8-bugbear/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/flake8-bugbear/default.nix b/pkgs/development/python-modules/flake8-bugbear/default.nix index 8631457ab85a..a3db5f41feb6 100644 --- a/pkgs/development/python-modules/flake8-bugbear/default.nix +++ b/pkgs/development/python-modules/flake8-bugbear/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "flake8-bugbear"; - version = "22.8.23"; + version = "22.9.11"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "PyCQA"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-5SBG/lrbe25kcABngDpOdjA/JJQ0DKcCYi6JBxTurPg="; + hash = "sha256-f95mwHjWoCRjAc8djrHm57q32hyp8Ukg7d2hSNlLvXs="; }; propagatedBuildInputs = [ From e3be4ad2f06450b43ee723250cb96bb39a1b50a7 Mon Sep 17 00:00:00 2001 From: Erik Arvstedt Date: Sun, 11 Sep 2022 21:55:12 +0200 Subject: [PATCH 11/27] paperless: fix array formatting --- pkgs/applications/office/paperless-ngx/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/office/paperless-ngx/default.nix b/pkgs/applications/office/paperless-ngx/default.nix index 1deb8e7efe6e..d9a9cef77552 100644 --- a/pkgs/applications/office/paperless-ngx/default.nix +++ b/pkgs/applications/office/paperless-ngx/default.nix @@ -49,7 +49,16 @@ let }; }; - path = lib.makeBinPath [ ghostscript imagemagick jbig2enc optipng pngquant qpdf tesseract4 unpaper ]; + path = lib.makeBinPath [ + ghostscript + imagemagick + jbig2enc + optipng + pngquant + qpdf + tesseract4 + unpaper + ]; in python.pkgs.pythonPackages.buildPythonApplication rec { pname = "paperless-ngx"; From a611c674c211fe776588dda9a9df88cb914046da Mon Sep 17 00:00:00 2001 From: Erik Arvstedt Date: Sun, 11 Sep 2022 21:55:13 +0200 Subject: [PATCH 12/27] paperless: use `imagemagickBig` `imagemagickBig` has `gs` support. This fixes a warning during thumbnail generation (`convert: no images defined`). The type of thumbnails that are generated is unchanged. --- pkgs/applications/office/paperless-ngx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/paperless-ngx/default.nix b/pkgs/applications/office/paperless-ngx/default.nix index d9a9cef77552..e85f13b892f7 100644 --- a/pkgs/applications/office/paperless-ngx/default.nix +++ b/pkgs/applications/office/paperless-ngx/default.nix @@ -3,7 +3,7 @@ , nixosTests , python3 , ghostscript -, imagemagick +, imagemagickBig , jbig2enc , optipng , pngquant @@ -51,7 +51,7 @@ let path = lib.makeBinPath [ ghostscript - imagemagick + imagemagickBig jbig2enc optipng pngquant From 1778eb5fdc44e1cbcb1620f574d368daa16fa2bd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 11 Sep 2022 20:26:36 +0000 Subject: [PATCH 13/27] mani: 0.21.0 -> 0.22.0 --- pkgs/development/tools/mani/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/mani/default.nix b/pkgs/development/tools/mani/default.nix index 6ff38f02fef1..e9261c062589 100644 --- a/pkgs/development/tools/mani/default.nix +++ b/pkgs/development/tools/mani/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "mani"; - version = "0.21.0"; + version = "0.22.0"; src = fetchFromGitHub { owner = "alajmo"; repo = "mani"; rev = "v${version}"; - sha256 = "sha256-eH6V7J0KHGyR//kVr0dOdBYuoR3FDbW/pSh0RhHd4A8="; + sha256 = "sha256-2WuUQt9q19JYlfAyoGFRVpiLmsMbN45cYdF16j+jhhk="; }; - vendorSha256 = "sha256-g336is8Jjbbzmtsu3suhO9SNq3IJyy1MQ3s8P39MhvU="; + vendorSha256 = "sha256-9DP6SRcvHtZhkk2XoYesC1mhfq06KsLs0X02AG9vwJ8="; nativeBuildInputs = [ installShellFiles makeWrapper ]; From e3d748a92bec86330d1ab86a1836bbf4386cff06 Mon Sep 17 00:00:00 2001 From: Robin Voetter Date: Sun, 11 Sep 2022 22:51:09 +0200 Subject: [PATCH 14/27] hip: fix hip cmake config Update paths in cmake config files provided by HIP and hipamd to the proper location in the Nix store. Previously these files were trying to find headers in a way that assumes the typical ROCm installation (where everything is in /opt/rocm). This resulted in a bunch of errors when trying to compile HIP projects that are configured with cmake, like include paths that were set incorrectly or header paths that were not found. --- pkgs/development/compilers/hip/default.nix | 17 +++++++ .../compilers/hip/hip-config-paths.patch | 36 ++++++++++++++ .../compilers/hip/hipamd-config-paths.patch | 47 +++++++++++++++++++ 3 files changed, 100 insertions(+) create mode 100644 pkgs/development/compilers/hip/hip-config-paths.patch create mode 100644 pkgs/development/compilers/hip/hipamd-config-paths.patch diff --git a/pkgs/development/compilers/hip/default.nix b/pkgs/development/compilers/hip/default.nix index a459d30dbc95..329d523ddc23 100644 --- a/pkgs/development/compilers/hip/default.nix +++ b/pkgs/development/compilers/hip/default.nix @@ -21,6 +21,7 @@ , rocm-runtime , rocm-thunk , rocminfo +, substituteAll , writeScript , writeText }: @@ -37,6 +38,14 @@ let hash = "sha256-QaN666Rku2Tkio2Gm5/3RD8D5JgmCZLe0Yun1fGxa8U="; }; + patches = [ + (substituteAll { + src = ./hip-config-paths.patch; + inherit llvm; + rocm_runtime = rocm-runtime; + }) + ]; + # - fix bash paths # - fix path to rocm_agent_enumerator # - fix hcc path @@ -121,6 +130,14 @@ stdenv.mkDerivation rec { rocminfo ]; + patches = [ + (substituteAll { + src = ./hipamd-config-paths.patch; + inherit llvm hip; + rocm_runtime = rocm-runtime; + }) + ]; + preConfigure = '' export HIP_CLANG_PATH=${clang}/bin export DEVICE_LIB_PATH=${rocm-device-libs}/lib diff --git a/pkgs/development/compilers/hip/hip-config-paths.patch b/pkgs/development/compilers/hip/hip-config-paths.patch new file mode 100644 index 000000000000..71e804c74482 --- /dev/null +++ b/pkgs/development/compilers/hip/hip-config-paths.patch @@ -0,0 +1,36 @@ +diff --git a/hip-lang-config.cmake.in b/hip-lang-config.cmake.in +index 1a72643a..7f35031f 100644 +--- a/hip-lang-config.cmake.in ++++ b/hip-lang-config.cmake.in +@@ -72,8 +72,8 @@ get_filename_component(_IMPORT_PREFIX "${_DIR}/../../../" REALPATH) + + + #need _IMPORT_PREFIX to be set #FILE_REORG_BACKWARD_COMPATIBILITY +-file(GLOB HIP_CLANG_INCLUDE_SEARCH_PATHS "${_IMPORT_PREFIX}/../llvm/lib/clang/*/include") +-file(GLOB HIP_CLANG_INCLUDE_SEARCH_PATHS_REORG "${_IMPORT_PREFIX}/llvm/lib/clang/*/include") ++file(GLOB HIP_CLANG_INCLUDE_SEARCH_PATHS "@llvm@/lib/clang/*/include") ++file(GLOB HIP_CLANG_INCLUDE_SEARCH_PATHS_REORG "@llvm@/lib/clang/*/include") + find_path(HIP_CLANG_INCLUDE_PATH __clang_cuda_math.h + HINTS ${HIP_CLANG_INCLUDE_SEARCH_PATHS} + ${HIP_CLANG_INCLUDE_SEARCH_PATHS_REORG} +@@ -88,10 +88,7 @@ endif() + #if HSA is not under ROCm then provide CMAKE_PREFIX_PATH= + find_path(HSA_HEADER hsa/hsa.h + PATHS +- "${_IMPORT_PREFIX}/../include" #FILE_REORG_BACKWARD_COMPATIBILITY +- "${_IMPORT_PREFIX}/include" +- "${ROCM_PATH}/include" +- /opt/rocm/include ++ "@rocm_runtime@/include" + ) + + if (HSA_HEADER-NOTFOUND) +@@ -99,7 +96,7 @@ if (HSA_HEADER-NOTFOUND) + endif() + + get_filename_component(HIP_COMPILER_INSTALL_PATH ${CMAKE_HIP_COMPILER} DIRECTORY) +-file(GLOB HIP_CLANGRT_LIB_SEARCH_PATHS "${HIP_COMPILER_INSTALL_PATH}/../lib/clang/*/lib/*") ++file(GLOB HIP_CLANGRT_LIB_SEARCH_PATHS "@llvm@/lib/clang/*/lib/*") + find_library(CLANGRT_BUILTINS + NAMES + clang_rt.builtins diff --git a/pkgs/development/compilers/hip/hipamd-config-paths.patch b/pkgs/development/compilers/hip/hipamd-config-paths.patch new file mode 100644 index 000000000000..605b73f75c7a --- /dev/null +++ b/pkgs/development/compilers/hip/hipamd-config-paths.patch @@ -0,0 +1,47 @@ +diff --git a/hip-config.cmake.in b/hip-config.cmake.in +index 89d1224e..120b68c6 100755 +--- a/hip-config.cmake.in ++++ b/hip-config.cmake.in +@@ -142,7 +142,7 @@ if(HIP_COMPILER STREQUAL "clang") + file(TO_CMAKE_PATH "${HIP_PATH}/../lc" HIP_CLANG_ROOT) + endif() + else() +- set(HIP_CLANG_ROOT "${ROCM_PATH}/llvm") ++ set(HIP_CLANG_ROOT "@llvm@") + endif() + if(NOT HIP_CXX_COMPILER) + set(HIP_CXX_COMPILER ${CMAKE_CXX_COMPILER}) +@@ -206,10 +206,7 @@ if(NOT WIN32) + #if HSA is not under ROCm then provide CMAKE_PREFIX_PATH= + find_path(HSA_HEADER hsa/hsa.h + PATHS +- "${_IMPORT_PREFIX}/include" +- #FILE_REORG_BACKWARD_COMPATIBILITY ${_IMPORT_PREFIX}/../include is for Backward compatibility +- "${_IMPORT_PREFIX}/../include" +- ${ROCM_PATH}/include ++ "@rocm_runtime@/include" + ) + + if (NOT HSA_HEADER) +@@ -224,8 +221,8 @@ set_target_properties(hip::host PROPERTIES + + if(HIP_RUNTIME MATCHES "rocclr") + set_target_properties(hip::amdhip64 PROPERTIES +- INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include;${HSA_HEADER}" +- INTERFACE_SYSTEM_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include;${HSA_HEADER}" ++ INTERFACE_INCLUDE_DIRECTORIES "@hip@/include;${HSA_HEADER}" ++ INTERFACE_SYSTEM_INCLUDE_DIRECTORIES "@hip@/include;${HSA_HEADER}" + ) + + get_target_property(amdhip64_type hip::amdhip64 TYPE) +@@ -233,8 +230,8 @@ if(HIP_RUNTIME MATCHES "rocclr") + + if(NOT WIN32) + set_target_properties(hip::device PROPERTIES +- INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include" +- INTERFACE_SYSTEM_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include" ++ INTERFACE_INCLUDE_DIRECTORIES "@hip@/include" ++ INTERFACE_SYSTEM_INCLUDE_DIRECTORIES "@hip@/include" + ) + endif() + endif() From 01d0040bac5d9845ff0d842de517bf4254753d2e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 12 Sep 2022 01:59:33 +0000 Subject: [PATCH 15/27] pure-prompt: 1.20.1 -> 1.20.3 --- pkgs/shells/zsh/pure-prompt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/zsh/pure-prompt/default.nix b/pkgs/shells/zsh/pure-prompt/default.nix index 994f223b58da..d8bd689d31a4 100644 --- a/pkgs/shells/zsh/pure-prompt/default.nix +++ b/pkgs/shells/zsh/pure-prompt/default.nix @@ -4,13 +4,13 @@ with lib; stdenv.mkDerivation rec { pname = "pure-prompt"; - version = "1.20.1"; + version = "1.20.3"; src = fetchFromGitHub { owner = "sindresorhus"; repo = "pure"; rev = "v${version}"; - sha256 = "sha256-iuLi0o++e0PqK81AKWfIbCV0CTIxq2Oki6U2oEYsr68="; + sha256 = "sha256-vFms0MaSiLEzlYdgmUPGXaApTHVSVhwbw11N4GucgLg="; }; strictDeps = true; From eebe8d3655a72783d860de78258717fed38c4491 Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Sun, 11 Sep 2022 20:49:37 -0700 Subject: [PATCH 16/27] just: 1.4.0 -> 1.5.0 --- pkgs/development/tools/just/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/just/default.nix b/pkgs/development/tools/just/default.nix index 8853b2208c8c..e5b9aa90f002 100644 --- a/pkgs/development/tools/just/default.nix +++ b/pkgs/development/tools/just/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "just"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "casey"; repo = pname; rev = version; - sha256 = "sha256-LDLxPNLUyDmJgnoFMMt82pt7J2qf/cBQilcCLk7xNUI="; + hash = "sha256-x/4+5m/FiqH68xTHP/cyPDbQ1DtpBXJr32iTq/9GWwI="; }; - cargoSha256 = "sha256-Gg0KaFTTsBH55VyYnIA0ZHy5l55tp9xodv0zBgHdLic="; + cargoSha256 = "sha256-EjX2U+H8sw+v+NEa5uCxIqG8HDl2P6PjpvWrhuF9Jr0="; nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; From d103a9186b98ac92ae601703b7cd3b713d98f772 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 12 Sep 2022 04:07:11 +0000 Subject: [PATCH 17/27] tere: 1.1.0 -> 1.2.0 --- pkgs/tools/misc/tere/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/tere/default.nix b/pkgs/tools/misc/tere/default.nix index e1dac5a6bf2a..97b1506e93d3 100644 --- a/pkgs/tools/misc/tere/default.nix +++ b/pkgs/tools/misc/tere/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "tere"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "mgunyho"; repo = "tere"; rev = "v${version}"; - sha256 = "BD7onBkFyo/JAw/neqL9N9nBYSxoMrmaG6egeznV9Xs="; + sha256 = "sha256-2DpJYOzswT7dHEIj+qaTx1Jm28NE+61opoxuMChNwbM="; }; - cargoSha256 = "gAq9ULQ2YFPmn4IsHaYrC0L7NqbPUWqXSb45ZjlMXEs="; + cargoSha256 = "sha256-8qSikfsHX8xwBqSSxWwNbiOpXmfzwGTAOALPjxVHadc="; # This test confirmed not working. # https://github.com/mgunyho/tere/issues/44 From 55e1e9a10419922d2be9bf33730f5108f73c9bbd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 12 Sep 2022 07:15:47 +0000 Subject: [PATCH 18/27] jmol: 14.32.73 -> 14.32.74 --- pkgs/applications/science/chemistry/jmol/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/chemistry/jmol/default.nix b/pkgs/applications/science/chemistry/jmol/default.nix index 67a6f150efad..3ff22bad3cee 100644 --- a/pkgs/applications/science/chemistry/jmol/default.nix +++ b/pkgs/applications/science/chemistry/jmol/default.nix @@ -25,14 +25,14 @@ let }; in stdenv.mkDerivation rec { - version = "14.32.73"; + version = "14.32.74"; pname = "jmol"; src = let baseVersion = "${lib.versions.major version}.${lib.versions.minor version}"; in fetchurl { url = "mirror://sourceforge/jmol/Jmol/Version%20${baseVersion}/Jmol%20${version}/Jmol-${version}-binary.tar.gz"; - sha256 = "sha256-95bZ6SYPKH+CGHETfdt/0YcUiZaP1gBiNf70GfUd4+M="; + sha256 = "sha256-wqZJn/kp3nd94AVe1kJpIa6VU1HYhiM4WoY6fRaJoNg="; }; patchPhase = '' From fdead18e9e7c5f157c572858494b1c292430eede Mon Sep 17 00:00:00 2001 From: Erik Arvstedt Date: Mon, 12 Sep 2022 09:20:53 +0200 Subject: [PATCH 19/27] nixos/paperless: use python from pkg for gunicorn This ensures that a compatible `gunicorn` is used when `pkg` is overridden. --- nixos/modules/services/misc/paperless.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/paperless.nix b/nixos/modules/services/misc/paperless.nix index b3b1d265c19e..e11158f8a12b 100644 --- a/nixos/modules/services/misc/paperless.nix +++ b/nixos/modules/services/misc/paperless.nix @@ -282,7 +282,7 @@ in serviceConfig = defaultServiceConfig // { User = cfg.user; ExecStart = '' - ${pkgs.python3Packages.gunicorn}/bin/gunicorn \ + ${pkg.python.pkgs.gunicorn}/bin/gunicorn \ -c ${pkg}/lib/paperless-ngx/gunicorn.conf.py paperless.asgi:application ''; Restart = "on-failure"; From 5b79100cadb9c802d65a84a278a901343a1c53e7 Mon Sep 17 00:00:00 2001 From: Marek Generowicz Date: Mon, 12 Sep 2022 13:29:44 +0300 Subject: [PATCH 20/27] ledger-live-desktop: 2.46.2 -> 2.47.0 ledger-live-desktop: 2.46.2 -> 2.47.0 --- pkgs/applications/blockchains/ledger-live-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/ledger-live-desktop/default.nix b/pkgs/applications/blockchains/ledger-live-desktop/default.nix index 10c95a91eda2..e85cb9d28dab 100644 --- a/pkgs/applications/blockchains/ledger-live-desktop/default.nix +++ b/pkgs/applications/blockchains/ledger-live-desktop/default.nix @@ -2,11 +2,11 @@ let pname = "ledger-live-desktop"; - version = "2.46.2"; + version = "2.47.0"; src = fetchurl { url = "https://download.live.ledger.com/${pname}-${version}-linux-x86_64.AppImage"; - hash = "sha256-fSfES+6+LCRTLdOy3RJaHzv0zRXkqT+0Rsdt2kSeU18="; + hash = "sha256-KmNiyWF74hHLLu+uQDiFAMJJvyU/rgyrBhh6O6iMVIg="; }; appimageContents = appimageTools.extractType2 { From f940383130e605332052abd23c9cfe153d63e90d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 11 Sep 2022 15:14:53 +0000 Subject: [PATCH 21/27] cocogitto: 5.1.0 -> 5.2.0 --- pkgs/development/tools/cocogitto/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/cocogitto/default.nix b/pkgs/development/tools/cocogitto/default.nix index 793beb43b990..b07946e70bb7 100644 --- a/pkgs/development/tools/cocogitto/default.nix +++ b/pkgs/development/tools/cocogitto/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cocogitto"; - version = "5.1.0"; + version = "5.2.0"; src = fetchFromGitHub { owner = "oknozor"; repo = pname; rev = version; - sha256 = "sha256-q2WJKAXpIO+VsOFrjdyEx06yis8f2SkCuB0blUgqq0M="; + sha256 = "sha256-ZjDZMI84z8riRtidZVeCktwJUMkZU28E23MveJSD7xY="; }; - cargoSha256 = "sha256-UArYBcUkXPYlNRLQBMwNhsd3bNgLeEwtJdzepMTt2no="; + cargoSha256 = "sha256-oaWWAVTKxrshfvqE+HMQ1WeeEz8lOE7qc6RrgSjDtdU="; # Test depend on git configuration that would likly exist in a normal user enviroment # and might be failing to create the test repository it works in. From dd22a79c0aef00fd6f7c7257b1f785fe91e19480 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 12 Sep 2022 05:35:38 +0000 Subject: [PATCH 22/27] xplr: 0.19.0 -> 0.19.3 --- pkgs/applications/misc/xplr/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/xplr/default.nix b/pkgs/applications/misc/xplr/default.nix index d24345389cab..5fca27915f0a 100644 --- a/pkgs/applications/misc/xplr/default.nix +++ b/pkgs/applications/misc/xplr/default.nix @@ -2,18 +2,18 @@ rustPlatform.buildRustPackage rec { pname = "xplr"; - version = "0.19.0"; + version = "0.19.3"; src = fetchFromGitHub { owner = "sayanarijit"; repo = pname; rev = "v${version}"; - sha256 = "sha256-rvqx0s56VozG8M0m3uZsHuugx0BXucSFqLbq0L1KhAM="; + sha256 = "sha256-0aNtBf3np9cq9JTgHRWy73i4AKaVEOluhSMSUyobduI="; }; buildInputs = lib.optional stdenv.isDarwin libiconv; - cargoSha256 = "sha256-CyHkjXZVISkQJEQx5vNBGBf6zZrVv/cLWIYeOq9Ac5k="; + cargoSha256 = "sha256-DXPpW7vls4yDEMiRrqDndxEKSA7Uncrt6n8nmsBXHcU="; meta = with lib; { description = "A hackable, minimal, fast TUI file explorer"; From bc7d278ac67666ce98c03152a87062b8f9e17f3c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 12 Sep 2022 08:15:45 +0000 Subject: [PATCH 23/27] libjcat: 0.1.11 -> 0.1.12 --- pkgs/development/libraries/libjcat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libjcat/default.nix b/pkgs/development/libraries/libjcat/default.nix index ca4509ff3cc2..99de3acb38c7 100644 --- a/pkgs/development/libraries/libjcat/default.nix +++ b/pkgs/development/libraries/libjcat/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { pname = "libjcat"; - version = "0.1.11"; + version = "0.1.12"; outputs = [ "bin" "out" "dev" "devdoc" "man" "installedTests" ]; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { owner = "hughsie"; repo = "libjcat"; rev = version; - sha256 = "2kdoOwgaLpo/Cp3wkCMgdyQ++BC3Cn7CRhXhVCHn/iM="; + sha256 = "sha256-9+wtCJzvT9uAXRXj/koFG7asxm5JIDw0Ffp4wK6tbDk="; }; patches = [ From e449f76a1f333c96f9494bd28a7fcd3b40b563c6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 12 Sep 2022 09:17:09 +0000 Subject: [PATCH 24/27] libxmlb: 0.3.9 -> 0.3.10 --- pkgs/development/libraries/libxmlb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libxmlb/default.nix b/pkgs/development/libraries/libxmlb/default.nix index 4e44ced6cb28..09dbcc3a0f51 100644 --- a/pkgs/development/libraries/libxmlb/default.nix +++ b/pkgs/development/libraries/libxmlb/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { pname = "libxmlb"; - version = "0.3.9"; + version = "0.3.10"; outputs = [ "out" "lib" "dev" "devdoc" "installedTests" ]; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { owner = "hughsie"; repo = "libxmlb"; rev = version; - sha256 = "sha256-4WTuwxpIsE7gHXFiuWuZeu2JMGzPLpsmS1KTEdR3ztg="; + sha256 = "sha256-uitnVqR2VVNAf8H1Q/u6LezhvfQJ/G2bE0Dv9dyP8+A="; }; patches = [ From 31f69654820318de1d0cde6c640f82282c56b0ae Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 5 Sep 2022 22:35:58 +0000 Subject: [PATCH 25/27] ibus-engines.m17n: 1.4.10 -> 1.4.11 --- pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix index 798e6fa16516..4636eedc56cd 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "ibus-m17n"; - version = "1.4.10"; + version = "1.4.11"; src = fetchFromGitHub { owner = "ibus"; repo = "ibus-m17n"; rev = version; - sha256 = "sha256-OYWEYi2KVzGR+DS1cWMJFexuEwBQfqC+T3cVJF+glXg="; + sha256 = "sha256-y9cWQ6Z7sxGCdRgWRoKPGH3TDWyrzCwXDEx0pfTjgyM="; }; nativeBuildInputs = [ From be9e813d762cc138e499ae49a2d43ff27fbfb20d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 5 Sep 2022 20:45:40 +0000 Subject: [PATCH 26/27] sierra-breeze-enhanced: 1.2.0 -> 1.3.1 --- .../kwin-decorations/sierra-breeze-enhanced/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/themes/kwin-decorations/sierra-breeze-enhanced/default.nix b/pkgs/data/themes/kwin-decorations/sierra-breeze-enhanced/default.nix index b799124a7831..605157458bde 100644 --- a/pkgs/data/themes/kwin-decorations/sierra-breeze-enhanced/default.nix +++ b/pkgs/data/themes/kwin-decorations/sierra-breeze-enhanced/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "sierra-breeze-enhanced"; - version = "1.2.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "kupiqu"; repo = "SierraBreezeEnhanced"; rev = "V${version}"; - sha256 = "sha256-Tzd8ATdmOjVe8OCSdcB9h7r6sqtb+24Fq80t/hmGJcE="; + sha256 = "sha256-x3OTLH8gcWrqpFGQPZHwvyPFwLhEGeHhU4cRqvtPupQ="; }; nativeBuildInputs = [ cmake extra-cmake-modules wrapQtAppsHook ]; From 446f8cc58969c063c03670234f294626e16871be Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 12 Sep 2022 14:44:29 +0000 Subject: [PATCH 27/27] fluxcd: 0.33.0 -> 0.34.0 --- pkgs/applications/networking/cluster/fluxcd/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/cluster/fluxcd/default.nix b/pkgs/applications/networking/cluster/fluxcd/default.nix index f4afc5d17127..8a837399048f 100644 --- a/pkgs/applications/networking/cluster/fluxcd/default.nix +++ b/pkgs/applications/networking/cluster/fluxcd/default.nix @@ -1,9 +1,9 @@ { lib, buildGoModule, fetchFromGitHub, fetchzip, installShellFiles, stdenv }: let - version = "0.33.0"; - sha256 = "1rrx2sq9wap7xzvqa6dw54kmmlnj4d45y8ziaxkyibz7hsqvzyqk"; - manifestsSha256 = "0zzv5mkcnxcrd6yq330bm4b1bvlp93qv80n4yb4y7g16d0a2xp9a"; + version = "0.34.0"; + sha256 = "1znxhjqvch0z0s98v3hvvh1pa3nlv0l6qhlm0f61z64srz3i5d1k"; + manifestsSha256 = "1fchzr7fb894hdya9bbh59avqsa66wcz06fck60wmwpc93m64cqs"; manifests = fetchzip { url = @@ -23,7 +23,7 @@ in buildGoModule rec { inherit sha256; }; - vendorSha256 = "sha256-jKluPTBg7wVbbApKul/68qC1xoMyp86/ok2UZLAoRUY="; + vendorSha256 = "sha256-0oHcitczG+sW9mkwxY6hCdR2ASpat2XQ+IsLAiqCUb8="; postUnpack = '' cp -r ${manifests} source/cmd/flux/manifests