diff options
Diffstat (limited to 'pkgs')
36 files changed, 259 insertions, 103 deletions
diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index e3a13731541b8..e3bf7d7c09444 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -27,11 +27,11 @@ version = "2024-04-10"; }; ungoogled-patches = { - hash = "sha256-I3RQBa4LLuOdZQFKHIqePj9Ozw61dsuAOctqN1abij0="; - rev = "125.0.6422.60-1"; + hash = "sha256-bGc8hQnuiGot0kThSAi4AFAwmvrNPs1bR7oZx2XoAGo="; + rev = "125.0.6422.76-1"; }; }; - hash = "sha256-ewX7oRna7IYCXhAe98HS5HbS1psIEAguhZJ1ymK+dPE="; - version = "125.0.6422.60"; + hash = "sha256-m7WeRloS6tGH2AwhkNicpqThUQmS+9w2xFS2dbmu1vw="; + version = "125.0.6422.76"; }; } diff --git a/pkgs/applications/networking/cluster/cni/plugins.nix b/pkgs/applications/networking/cluster/cni/plugins.nix index 438d51518dff9..b0cd31e9de019 100644 --- a/pkgs/applications/networking/cluster/cni/plugins.nix +++ b/pkgs/applications/networking/cluster/cni/plugins.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cni-plugins"; - version = "1.4.1"; + version = "1.5.0"; src = fetchFromGitHub { owner = "containernetworking"; repo = "plugins"; rev = "v${version}"; - hash = "sha256-co4jThsUR070aJh1hgXHT6QKW22d8UCmogtZYc4nzlA="; + hash = "sha256-gJp1w2H+hPSSu1Y4BY9Sa8lLnhpiZJu2Dz9OenYlQFo="; }; vendorHash = null; diff --git a/pkgs/applications/networking/instant-messengers/qq/sources.nix b/pkgs/applications/networking/instant-messengers/qq/sources.nix index 590dbb3605e0e..b8f1b2effdf34 100644 --- a/pkgs/applications/networking/instant-messengers/qq/sources.nix +++ b/pkgs/applications/networking/instant-messengers/qq/sources.nix @@ -1,9 +1,9 @@ # Generated by ./update.sh - do not update manually! -# Last updated: 2024-04-27 +# Last updated: 2024-05-21 { - version = "3.2.7"; - amd64_url = "https://dldir1.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.7_240422_amd64_01.deb"; - arm64_url = "https://dldir1.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.7_240422_arm64_01.deb"; - arm64_hash = "sha256-MrLkPHri3ifVy3+WNNs/CKK4Myztw8ZjWFEZDr27mpM="; - amd64_hash = "sha256-eZMzMaqCF514Wij8BZ0sLoyzjKNArLSFe92tN9WAiu0="; + version = "3.2.8"; + amd64_url = "https://dldir1.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.8_240520_amd64_01.deb"; + arm64_url = "https://dldir1.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.8_240520_arm64_01.deb"; + arm64_hash = "sha256-qSv7GqnXvp8IFh3krcJlKheRn4sF4cr4+ZItd2y8JUg="; + amd64_hash = "sha256-0j4hLSbPgKQOPqtESZqnZYbq3j/CYNG58XEpT7UHOT8="; } diff --git a/pkgs/applications/radio/cloudlog/default.nix b/pkgs/applications/radio/cloudlog/default.nix index b9d17927776d1..162c9cac96589 100644 --- a/pkgs/applications/radio/cloudlog/default.nix +++ b/pkgs/applications/radio/cloudlog/default.nix @@ -8,13 +8,13 @@ stdenvNoCC.mkDerivation rec { pname = "cloudlog"; - version = "2.6.11"; + version = "2.6.12"; src = fetchFromGitHub { owner = "magicbug"; repo = "Cloudlog"; rev = version; - hash = "sha256-9JGhMCypoKOh1Gy1DdK7nrma+L4sJsYN/iuNhBPmHPA="; + hash = "sha256-djY+TqkA+YFCmUwZd1x4YeJDOS6ZtxDb4EhBmyftSzI="; }; postPatch = '' diff --git a/pkgs/applications/virtualization/cri-o/default.nix b/pkgs/applications/virtualization/cri-o/default.nix index d932daa41f3a2..8b13c01852bae 100644 --- a/pkgs/applications/virtualization/cri-o/default.nix +++ b/pkgs/applications/virtualization/cri-o/default.nix @@ -15,13 +15,13 @@ buildGoModule rec { pname = "cri-o"; - version = "1.30.0"; + version = "1.30.1"; src = fetchFromGitHub { owner = "cri-o"; repo = "cri-o"; rev = "v${version}"; - hash = "sha256-gsC6e0wQowgskUazuqQRtO7ra5Wg9RU8+k3LFqIReJk="; + hash = "sha256-3TO7pPDIYxlWXWNIAqCMWPCFPRxG6k6ilL2wDiAXFVY="; }; vendorHash = null; diff --git a/pkgs/applications/virtualization/qemu/canokey-qemu-memcpy.patch b/pkgs/applications/virtualization/qemu/canokey-qemu-memcpy.patch new file mode 100644 index 0000000000000..578c687f54cff --- /dev/null +++ b/pkgs/applications/virtualization/qemu/canokey-qemu-memcpy.patch @@ -0,0 +1,41 @@ +From 9e59480d941c40b868ebafa5138bbc71ca87f08e Mon Sep 17 00:00:00 2001 +From: Alyssa Ross <hi@alyssa.is> +Date: Sat, 18 May 2024 09:55:17 +0200 +Subject: [PATCH] Fix build where memcpy is a macro + +I got the following compiler error with Clang 16 building for +x86_64-apple-darwin: + + /tmp/nix-build-canokey-qemu-0-unstable-2023-06-06.drv-0/source/canokey-core/applets/oath/oath.c:44:50: error: too many arguments provided to function-like macro invocation + memcpy(RDATA, (uint8_t[]){OATH_TAG_VERSION, 3, 0x05, 0x05, 0x05, OATH_TAG_NAME, HANDLE_LEN}, 7); + ^ + /nix/store/vw8y07yai2pjv02s1piw3r5cyhmjbddf-Libsystem-1238.60.2/include/secure/_string.h:64:9: note: macro 'memcpy' defined here + #define memcpy(dest, src, len) \ + ^ + /tmp/nix-build-canokey-qemu-0-unstable-2023-06-06.drv-0/source/canokey-core/applets/oath/oath.c:44:3: note: parentheses are required around macro argument containing braced initializer list + memcpy(RDATA, (uint8_t[]){OATH_TAG_VERSION, 3, 0x05, 0x05, 0x05, OATH_TAG_NAME, HANDLE_LEN}, 7); + ^ + ( ) + 1 error generated. + +Link: https://github.com/canokeys/canokey-core/pull/85 +--- + canokey-core/applets/oath/oath.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/canokey-core/applets/oath/oath.c b/canokey-core/applets/oath/oath.c +index bd8361a..2d2c0ef 100644 +--- a/canokey-core/applets/oath/oath.c ++++ b/canokey-core/applets/oath/oath.c +@@ -41,7 +41,7 @@ int oath_install(uint8_t reset) { + static int oath_select(const CAPDU *capdu, RAPDU *rapdu) { + if (P2 != 0x00) EXCEPT(SW_WRONG_P1P2); + +- memcpy(RDATA, (uint8_t[]){OATH_TAG_VERSION, 3, 0x05, 0x05, 0x05, OATH_TAG_NAME, HANDLE_LEN}, 7); ++ memcpy(RDATA, ((uint8_t[]){OATH_TAG_VERSION, 3, 0x05, 0x05, 0x05, OATH_TAG_NAME, HANDLE_LEN}), 7); + if (read_attr(OATH_FILE, ATTR_HANDLE, RDATA + 7, HANDLE_LEN) < 0) return -1; + LL = 7 + HANDLE_LEN; + +-- +2.44.0 + diff --git a/pkgs/applications/virtualization/qemu/canokey-qemu.nix b/pkgs/applications/virtualization/qemu/canokey-qemu.nix index 9536b91ba5403..b94ba0c1adbe4 100644 --- a/pkgs/applications/virtualization/qemu/canokey-qemu.nix +++ b/pkgs/applications/virtualization/qemu/canokey-qemu.nix @@ -3,29 +3,47 @@ stdenv, fetchFromGitHub, cmake, + unstableGitUpdater, }: stdenv.mkDerivation rec { pname = "canokey-qemu"; - version = "unstable-2022-06-23"; - rev = "b70af31229f1858089c3366f71b8d771de4a1e84"; + version = "0-unstable-2023-06-06"; + rev = "151568c34f5e92b086b7a3a62a11c43dd39f628b"; src = fetchFromGitHub { owner = "canokeys"; repo = "canokey-qemu"; inherit rev; fetchSubmodules = true; - hash = "sha256-VJb59K/skx+DhoJs5qGUu070hAjQZC2Z6hAMXuX0bMw="; + hash = "sha256-4V/2UOgGWgL+tFJO/k90bCDjWSVyIpxw3nYi9NU/OxA="; }; + patches = [ + ./canokey-qemu-memcpy.patch + ]; + postPatch = '' substituteInPlace canokey-core/CMakeLists.txt \ --replace "COMMAND git describe --always --tags --long --abbrev=8 --dirty >>" "COMMAND echo '$rev' >>" ''; + preConfigure = '' + cmakeFlagsArray+=( + -DCMAKE_C_FLAGS=${lib.escapeShellArg ([ + "-Wno-error=unused-but-set-parameter" + "-Wno-error=unused-but-set-variable" + ] ++ lib.optionals stdenv.cc.isClang [ + "-Wno-error=documentation" + ])} + ) + ''; + outputs = [ "out" "dev" ]; nativeBuildInputs = [ cmake ]; + passthru.updateScript = unstableGitUpdater { }; + meta = with lib; { homepage = "https://github.com/canokeys/canokey-qemu"; description = "CanoKey QEMU Virt Card"; diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 3e6a905fe8843..c5d3a6fd75685 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -29,7 +29,7 @@ , smbdSupport ? false, samba , tpmSupport ? !toolsOnly , uringSupport ? stdenv.isLinux, liburing -, canokeySupport ? false, canokey-qemu +, canokeySupport ? !toolsOnly, canokey-qemu , capstoneSupport ? !toolsOnly, capstone , enableDocs ? true , hostCpuOnly ? false diff --git a/pkgs/by-name/im/immich-go/package.nix b/pkgs/by-name/im/immich-go/package.nix index cfa5a04bf2465..439c4768ea15e 100644 --- a/pkgs/by-name/im/immich-go/package.nix +++ b/pkgs/by-name/im/immich-go/package.nix @@ -1,16 +1,30 @@ { lib, buildGoModule, fetchFromGitHub, nix-update-script, testers, immich-go }: buildGoModule rec { pname = "immich-go"; - version = "0.13.2"; + version = "0.14.1"; src = fetchFromGitHub { owner = "simulot"; repo = "immich-go"; rev = "${version}"; - hash = "sha256-zYqPPLDfBx4FLvZIo5E6nAeIiFfBCLI00xLieXFkMxs="; + hash = "sha256-5dgEyg55ffJLH8zxp6mFVsUqAzyPnY18XnX+jMethUc="; + + # Inspired by: https://github.com/NixOS/nixpkgs/blob/f2d7a289c5a5ece8521dd082b81ac7e4a57c2c5c/pkgs/applications/graphics/pdfcpu/default.nix#L20-L32 + # The intention here is to write the information into files in the `src`'s + # `$out`, and use them later in other phases (in this case `preBuild`). + # In order to keep determinism, we also delete the `.git` directory + # afterwards, imitating the default behavior of `leaveDotGit = false`. + # More info about git log format can be found at `git-log(1)` manpage. + leaveDotGit = true; + postFetch = '' + cd "$out" + git log -1 --pretty=%H > "COMMIT" + git log -1 --pretty=%cd --date=format:'%Y-%m-%dT%H:%M:%SZ' > "SOURCE_DATE" + rm -rf ".git" + ''; }; - vendorHash = "sha256-Y5BujN2mk662oKxQpenjFlxazST2GqWr9ug0sOsxKbY="; + vendorHash = "sha256-nOJJz5KEXqxl3tP1Q12Cb/fugtxR67RjzH6khKg3ppE="; # options used by upstream: # https://github.com/simulot/immich-go/blob/0.13.2/.goreleaser.yaml @@ -19,10 +33,13 @@ buildGoModule rec { "-w" "-extldflags=-static" "-X main.version=${version}" - "-X main.commit=${version}" - "-X main.date=unknown" ]; + preBuild = '' + ldflags+=" -X main.commit=$(cat COMMIT)" + ldflags+=" -X main.date=$(cat SOURCE_DATE)" + ''; + passthru = { updateScript = nix-update-script { }; tests.versionTest = testers.testVersion { diff --git a/pkgs/by-name/mi/mihomo/package.nix b/pkgs/by-name/mi/mihomo/package.nix index b397c9a3e2b0d..3d1805687e2ad 100644 --- a/pkgs/by-name/mi/mihomo/package.nix +++ b/pkgs/by-name/mi/mihomo/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "mihomo"; - version = "1.18.4"; + version = "1.18.5"; src = fetchFromGitHub { owner = "MetaCubeX"; repo = "mihomo"; rev = "v${version}"; - hash = "sha256-mqNcMB2nb8+e9XEGKqwaBE/nC4+jRaEFxE17e0JTo8Y="; + hash = "sha256-YNnZ/wlOzmTAD76py4CRlClPi2S1b4PaanCfT/Q426A="; }; - vendorHash = "sha256-9Ey4roUm/Y6GfFmLD6ij/A+YIgetStawWmhD+Iq3qc8="; + vendorHash = "sha256-yBQ4Nt03VS2em6vkzMa1WH9jHc6pwdlW0tt9cth55oQ="; excludedPackages = [ "./test" ]; diff --git a/pkgs/by-name/pg/pgroll/package.nix b/pkgs/by-name/pg/pgroll/package.nix index d3670ef96d131..bc28bfb74ad73 100644 --- a/pkgs/by-name/pg/pgroll/package.nix +++ b/pkgs/by-name/pg/pgroll/package.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "pgroll"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "xataio"; repo = "pgroll"; rev = "v${version}"; - hash = "sha256-VYGwIJsPVilFxvglj+E7H9NpqUV1CV/ggBP3gFleWIA="; + hash = "sha256-XZrgJZR6CWdQWgGMXlEyZ5De6bu/u7+YvYvq6id9YzM="; }; - vendorHash = "sha256-Fz+o1jSoMfqKYo1I7VUFqbhBEgcoQEx7aYsmzCLsbnI="; + vendorHash = "sha256-+6HpxqQxGpIAyfn+38UeW2ksv5WyX67AT5e9JgQBI+k="; # Tests require a running docker daemon doCheck = false; diff --git a/pkgs/applications/editors/pulsar/001-patch-wrapper.patch b/pkgs/by-name/pu/pulsar/001-patch-wrapper.patch index 2270ad3c8aea8..2270ad3c8aea8 100644 --- a/pkgs/applications/editors/pulsar/001-patch-wrapper.patch +++ b/pkgs/by-name/pu/pulsar/001-patch-wrapper.patch diff --git a/pkgs/applications/editors/pulsar/default.nix b/pkgs/by-name/pu/pulsar/package.nix index 6cd8e423ad529..443ac74c32db2 100644 --- a/pkgs/applications/editors/pulsar/default.nix +++ b/pkgs/by-name/pu/pulsar/package.nix @@ -34,13 +34,13 @@ let pname = "pulsar"; - version = "1.114.0"; + version = "1.117.0"; sourcesPath = { x86_64-linux.tarname = "Linux.${pname}-${version}.tar.gz"; - x86_64-linux.hash = "sha256-O//dowoMgQfS3hq088IKr5aJd5St9zpT/ypfuswnyv0="; + x86_64-linux.hash = "sha256-iDQV4wcb+TY5qv8X6UW6PumK9+i5cn705ZzCSx5VgMs="; aarch64-linux.tarname = "ARM.Linux.${pname}-${version}-arm64.tar.gz"; - aarch64-linux.hash = "sha256-EzCTB1Ib9cTbslEdXPsS5gehHr1qd5v4iZgOqpxhUmA="; + aarch64-linux.hash = "sha256-NJc6CQA7ZCX70ui+QcVcLW2qxM05A93yqpiiW+YosGc="; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); newLibpath = lib.makeLibraryPath [ @@ -219,17 +219,17 @@ stdenv.mkDerivation rec { passthru.updateScript = ./update.mjs; - meta = with lib; { + meta = { description = "A Community-led Hyper-Hackable Text Editor"; longDescription = '' A Community-led Hyper-Hackable Text Editor, Forked from Atom, built on Electron. Designed to be deeply customizable, but still approachable using the default configuration. ''; homepage = "https://github.com/pulsar-edit/pulsar"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.mit; - platforms = platforms.linux; - maintainers = with maintainers; [ bryango ]; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + license = lib.licenses.mit; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ bryango ]; knownVulnerabilities = [ "CVE-2023-5217" "CVE-2022-21718" diff --git a/pkgs/applications/editors/pulsar/pulsar.nemo_action b/pkgs/by-name/pu/pulsar/pulsar.nemo_action index a74d7324ecce3..a74d7324ecce3 100644 --- a/pkgs/applications/editors/pulsar/pulsar.nemo_action +++ b/pkgs/by-name/pu/pulsar/pulsar.nemo_action diff --git a/pkgs/applications/editors/pulsar/update.mjs b/pkgs/by-name/pu/pulsar/update.mjs index 4f3d2993e9730..4f3d2993e9730 100755 --- a/pkgs/applications/editors/pulsar/update.mjs +++ b/pkgs/by-name/pu/pulsar/update.mjs diff --git a/pkgs/development/compilers/unison/default.nix b/pkgs/development/compilers/unison/default.nix index 2ba6a65c7afcb..f685ab2405f64 100644 --- a/pkgs/development/compilers/unison/default.nix +++ b/pkgs/development/compilers/unison/default.nix @@ -4,24 +4,26 @@ , gmp , less , makeWrapper +, libb2 , ncurses6 +, openssl , stdenv , zlib }: stdenv.mkDerivation (finalAttrs: { pname = "unison-code-manager"; - version = "0.5.19"; + version = "0.5.20"; src = if stdenv.isDarwin then fetchurl { url = "https://github.com/unisonweb/unison/releases/download/release/${finalAttrs.version}/ucm-macos.tar.gz"; - hash = "sha256-//bjpmW45BqBHmBIj2uMahYQYjhNJ8hvGh+O/7oYQOk="; + hash = "sha256-jhI3qy2ov8bf3l1n0wsslWT70LDeQ6sGNSH62VFJ5cE="; } else fetchurl { url = "https://github.com/unisonweb/unison/releases/download/release/${finalAttrs.version}/ucm-linux.tar.gz"; - hash = "sha256-3WyiV6mIuo5GDpDK/KdWMvj22sZ3uph15u3v3TX5YZA="; + hash = "sha256-MOm0RsMFWGik2OL2MPkgmHqKYNO28fkZHVJ/6P3aIww="; }; # The tarball is just the prebuilt binary, in the archive root. @@ -31,14 +33,17 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ makeWrapper ] ++ lib.optional (!stdenv.isDarwin) autoPatchelfHook; - buildInputs = lib.optionals (!stdenv.isDarwin) [ ncurses6 zlib gmp ]; + buildInputs = lib.optionals (!stdenv.isDarwin) [ gmp ncurses6 zlib ]; installPhase = '' - mkdir -p $out/bin - mv ucm $out/bin + mkdir -p $out/{bin,lib} + mv runtime $out/lib/runtime mv ui $out/ui - wrapProgram $out/bin/ucm \ + mv unison $out/unison + makeWrapper $out/unison/unison $out/bin/ucm \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libb2 openssl ]} \ --prefix PATH ":" "${lib.makeBinPath [ less ]}" \ + --add-flags "--runtime-path $out/lib/runtime/bin/unison-runtime" \ --set UCM_WEB_UI "$out/ui" ''; diff --git a/pkgs/development/interpreters/wasmtime/default.nix b/pkgs/development/interpreters/wasmtime/default.nix index fafe521fbde19..afa65741892c9 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 = "20.0.2"; + version = "21.0.0"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = pname; rev = "v${version}"; - hash = "sha256-zXBVqSBq/dLY8oEs0dNZxtjs4H1aKTJYeeazysHvh3w="; + hash = "sha256-2iCtAgOhO7ydmaSKFFdiMMImrJHv53EtVeJ6tn3F7/Y="; fetchSubmodules = true; }; # Disable cargo-auditable until https://github.com/rust-secure-code/cargo-auditable/issues/124 is solved. auditable = false; - cargoHash = "sha256-jFqLUWdW/UfOc843aWO7RNDx1E6sBhUWB5Xw2+A2u90="; + cargoHash = "sha256-vYOSX01jYJ4x6QaGazYXA1QJiR501zlaV3QZfeDDUdw="; cargoBuildFlags = [ "--package" "wasmtime-cli" "--package" "wasmtime-c-api" ]; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/python-modules/django-modeltranslation/default.nix b/pkgs/development/python-modules/django-modeltranslation/default.nix index 3f7fd5abd6d19..eb6458d6a96cd 100644 --- a/pkgs/development/python-modules/django-modeltranslation/default.nix +++ b/pkgs/development/python-modules/django-modeltranslation/default.nix @@ -11,7 +11,7 @@ let # 0.18.12 was yanked from PyPI, it refers to this issue: # https://github.com/deschler/django-modeltranslation/issues/701 - version = "0.18.12"; + version = "0.18.13"; in buildPythonPackage { pname = "django-modeltranslation"; @@ -21,7 +21,7 @@ buildPythonPackage { owner = "deschler"; repo = "django-modeltranslation"; rev = "refs/tags/v${version}"; - hash = "sha256-6rAAu3Fd4D93rX8kvkcqhykzBu/lDByQ6zpjWq7J8mg="; + hash = "sha256-9tfB5/XMLnwn+AgaT9TkHtc3HcHiD4pme/+BW1uztIs="; }; # Remove all references to pytest-cov diff --git a/pkgs/development/python-modules/mitmproxy-macos/default.nix b/pkgs/development/python-modules/mitmproxy-macos/default.nix index 31f4c7d8292c9..34989f1655994 100644 --- a/pkgs/development/python-modules/mitmproxy-macos/default.nix +++ b/pkgs/development/python-modules/mitmproxy-macos/default.nix @@ -33,5 +33,6 @@ buildPythonPackage rec { license = licenses.mit; maintainers = with maintainers; [ boltzmannrain ]; platforms = platforms.darwin; + broken = true; # last successful build 2023-12-04 }; } diff --git a/pkgs/development/rocm-modules/6/default.nix b/pkgs/development/rocm-modules/6/default.nix index e74df33a7bfbf..4d10ea2440444 100644 --- a/pkgs/development/rocm-modules/6/default.nix +++ b/pkgs/development/rocm-modules/6/default.nix @@ -115,8 +115,7 @@ in rec { }; rocgdb = callPackage ./rocgdb { - inherit rocmUpdateScript; - elfutils = elfutils.override { enableDebuginfod = true; }; + inherit rocmUpdateScript rocdbgapi; stdenv = llvm.rocmClangStdenv; }; diff --git a/pkgs/development/rocm-modules/6/rocgdb/default.nix b/pkgs/development/rocm-modules/6/rocgdb/default.nix index 919b3e70f6e06..2112c6cf02105 100644 --- a/pkgs/development/rocm-modules/6/rocgdb/default.nix +++ b/pkgs/development/rocm-modules/6/rocgdb/default.nix @@ -6,11 +6,16 @@ , texinfo , bison , flex +, glibc , zlib -, elfutils , gmp +, mpfr , ncurses , expat +, rocdbgapi +, python3 +, babeltrace +, sourceHighlight }: stdenv.mkDerivation (finalAttrs: { @@ -33,12 +38,53 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ zlib - elfutils gmp + mpfr ncurses expat + rocdbgapi + python3 + babeltrace + sourceHighlight ]; + configureFlags = [ + # Ensure we build the amdgpu traget + "--enable-targets=${stdenv.targetPlatform.config},amdgcn-amd-amdhsa" + "--with-amd-dbgapi=yes" + + "--with-iconv-path=${glibc.bin}" + "--enable-tui" + "--with-babeltrace" + "--with-python=python3" + "--with-system-zlib" + "--enable-64-bit-bfd" + "--with-gmp=${gmp.dev}" + "--with-mpfr=${mpfr.dev}" + "--with-expat" + "--with-libexpat-prefix=${expat.dev}" + + # So the installed binary is called "rocgdb" instead on plain "gdb" + "--program-prefix=roc" + + # Disable building many components not used or incompatible with the amdgcn target + "--disable-sim" + "--disable-gdbserver" + "--disable-ld" + "--disable-gas" + "--disable-gdbserver" + "--disable-sim" + "--disable-gdbtk" + "--disable-gprofng" + "--disable-shared" + ]; + + # The source directory for ROCgdb (based on upstream GDB) contains multiple project + # of GNU’s toolchain (binutils and onther), we only need to install the GDB part. + installPhase = '' + make install-gdb + ''; + # `-Wno-format-nonliteral` doesn't work env.NIX_CFLAGS_COMPILE = "-Wno-error=format-security"; @@ -51,7 +97,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "ROCm source-level debugger for Linux, based on GDB"; homepage = "https://github.com/ROCm/ROCgdb"; - license = with licenses; [ gpl2 gpl3 bsd3 ]; + license = licenses.gpl3Plus; maintainers = teams.rocm.members; platforms = platforms.linux; broken = versionAtLeast finalAttrs.version "7.0.0"; diff --git a/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix b/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix index a86db85067f6a..c9b74bfb0f4e8 100644 --- a/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix +++ b/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "cirrus-cli"; - version = "0.117.0"; + version = "0.118.0"; src = fetchFromGitHub { owner = "cirruslabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-dJq2/XxhSvqlRQwMHX2RHct6KQu9uik3SPeWD2/rwto="; + sha256 = "sha256-b3riwH3/hsn5PL3QYk/TzVrMpVCVaFxn9gbEn0oTILQ="; }; vendorHash = "sha256-d3cHXO4SFeNybiVDc3dUmd1XzUJ1SlMqSw7KPC3ZrXQ="; diff --git a/pkgs/development/tools/okteto/default.nix b/pkgs/development/tools/okteto/default.nix index 50789530be67d..79514af491938 100644 --- a/pkgs/development/tools/okteto/default.nix +++ b/pkgs/development/tools/okteto/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "okteto"; - version = "2.26.1"; + version = "2.27.1"; src = fetchFromGitHub { owner = "okteto"; repo = "okteto"; rev = version; - hash = "sha256-bWyerkXmAto0c/LYybUSRctajmL1R0PldfpKsh8crfA="; + hash = "sha256-CpU29+dVC/OHZdVtbQKSUwoBHsUUb2ZmBNtU1YSa/UA="; }; - vendorHash = "sha256-cYiyKNpsMfjqLL+6Q/s3nHRcj2y0DHuOu+S5GndLHxk="; + vendorHash = "sha256-RpkKWz/cJ1StbpVydqpSfA6uwIYgKa1YOCJVXZRer6k="; postPatch = '' # Disable some tests that need file system & network access. @@ -21,6 +21,8 @@ buildGoModule rec { nativeBuildInputs = [ installShellFiles ]; + excludedPackages = [ "integration" "samples" ]; + ldflags = [ "-s" "-w" @@ -30,7 +32,7 @@ buildGoModule rec { tags = [ "osusergo" "netgo" "static_build" ]; preCheck = '' - export HOME=$(mktemp -d) + export HOME="$(mktemp -d)" ''; checkFlags = [ @@ -46,7 +48,7 @@ buildGoModule rec { passthru.tests.version = testers.testVersion { package = okteto; - command = "HOME=$(mktemp -d) okteto version"; + command = "HOME=\"$(mktemp -d)\" okteto version"; }; meta = with lib; { diff --git a/pkgs/development/tools/ols/default.nix b/pkgs/development/tools/ols/default.nix index 0737f56c2bdee..613dd0f5acbdc 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-05-11"; + version = "0-unstable-2024-05-18"; src = fetchFromGitHub { owner = "DanielGavin"; repo = "ols"; - rev = "30625d5568c085c622deece91ed8ac9e81ba28be"; - hash = "sha256-iBrXpLrnBL5W47Iz0Uy4nd5h/ADqSnxZt2jWQi9eYiM="; + rev = "b5b6733320bd866b6895cc2f44910f180dda4e0b"; + hash = "sha256-Mok77ioHklE3jeSFT2um1XgrnRuQf0ysDcTo3Fjukmk="; }; passthru.updateScript = unstableGitUpdater { diff --git a/pkgs/development/tools/profiling/heaptrack/default.nix b/pkgs/development/tools/profiling/heaptrack/default.nix index 2e4d996af01e3..88de0065e8ec2 100644 --- a/pkgs/development/tools/profiling/heaptrack/default.nix +++ b/pkgs/development/tools/profiling/heaptrack/default.nix @@ -1,5 +1,5 @@ { - lib, mkDerivation, fetchFromGitHub, cmake, extra-cmake-modules, + lib, stdenv, mkDerivation, fetchFromGitHub, cmake, extra-cmake-modules, makeBinaryWrapper, zlib, boost179, libunwind, elfutils, sparsehash, zstd, qtbase, kio, kitemmodels, threadweaver, kconfigwidgets, kcoreaddons, kdiagram }: @@ -12,20 +12,29 @@ mkDerivation rec { owner = "KDE"; repo = "heaptrack"; rev = "v${version}"; - sha256 = "sha256-pP+s60ERnmOctYTe/vezCg0VYzziApNY0QaF3aTccZU="; + hash = "sha256-pP+s60ERnmOctYTe/vezCg0VYzziApNY0QaF3aTccZU="; }; - nativeBuildInputs = [ cmake extra-cmake-modules ]; + nativeBuildInputs = [ cmake extra-cmake-modules makeBinaryWrapper ]; buildInputs = [ - zlib boost179 libunwind elfutils sparsehash zstd + zlib boost179 libunwind sparsehash zstd qtbase kio kitemmodels threadweaver kconfigwidgets kcoreaddons kdiagram + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ + elfutils ]; + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' + makeWrapper \ + $out/Applications/KDE/heaptrack_gui.app/Contents/MacOS/heaptrack_gui \ + $out/bin/heaptrack_gui + ''; + meta = with lib; { description = "Heap memory profiler for Linux"; homepage = "https://github.com/KDE/heaptrack"; license = licenses.lgpl21Plus; + mainProgram = "heaptrack_gui"; maintainers = with maintainers; [ gebner ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/games/chiaki4deck/default.nix b/pkgs/games/chiaki4deck/default.nix index fad7a26e356f4..7bdce8d1df421 100644 --- a/pkgs/games/chiaki4deck/default.nix +++ b/pkgs/games/chiaki4deck/default.nix @@ -17,6 +17,7 @@ , SDL2 , libevdev , udev +, curlFull , hidapi , json_c , fftw @@ -66,6 +67,7 @@ stdenv.mkDerivation rec { qtwebengine protobuf SDL2 + curlFull hidapi json_c fftw @@ -82,8 +84,18 @@ stdenv.mkDerivation rec { xxHash ]; + # handle cmake not being able to identify if curl is built with websocket support, and library name discrepancy when curl not built with cmake + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail ' WS WSS' "" + + substituteInPlace lib/CMakeLists.txt \ + --replace-fail 'libcurl_shared' 'libcurl' + ''; + cmakeFlags = [ "-Wno-dev" + (lib.cmakeFeature "CHIAKI_USE_SYSTEM_CURL" "true") ]; qtWrapperArgs = [ diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 777e5b6ca4d94..db6a5819c5bc4 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -51,14 +51,12 @@ rec { }); beta = selectHighestVersion latest (generic { - version = "550.40.07"; - sha256_64bit = "sha256-KYk2xye37v7ZW7h+uNJM/u8fNf7KyGTZjiaU03dJpK0="; - sha256_aarch64 = "sha256-AV7KgRXYaQGBFl7zuRcfnTGr8rS5n13nGUIe3mJTXb4="; - openSha256 = "sha256-mRUTEWVsbjq+psVe+kAT6MjyZuLkG2yRDxCMvDJRL1I="; - settingsSha256 = "sha256-c30AQa4g4a1EHmaEu1yc05oqY01y+IusbBuq+P6rMCs="; - persistencedSha256 = "sha256-11tLSY8uUIl4X/roNnxf5yS2PQvHvoNjnd2CB67e870="; - - patches = [ rcu_patch ]; + version = "555.42.02"; + sha256_64bit = "sha256-k7cI3ZDlKp4mT46jMkLaIrc2YUx1lh1wj/J4SVSHWyk="; + sha256_aarch64 = "sha256-ekx0s0LRxxTBoqOzpcBhEKIj/JnuRCSSHjtwng9qAc0="; + openSha256 = "sha256-3/eI1VsBzuZ3Y6RZmt3Q5HrzI2saPTqUNs6zPh5zy6w="; + settingsSha256 = "sha256-rtDxQjClJ+gyrCLvdZlT56YyHQ4sbaL+d5tL4L4VfkA="; + persistencedSha256 = "sha256-3ae31/egyMKpqtGEqgtikWcwMwfcqMv2K4MVFa70Bqs="; }); # Vulkan developer beta driver diff --git a/pkgs/servers/mail/mailman/web.nix b/pkgs/servers/mail/mailman/web.nix index dc5ef230c235a..ae4320fd443a2 100644 --- a/pkgs/servers/mail/mailman/web.nix +++ b/pkgs/servers/mail/mailman/web.nix @@ -6,30 +6,26 @@ with python3.pkgs; buildPythonPackage rec { - pname = "mailman-web"; - version = "0.0.8"; + pname = "mailman_web"; + version = "0.0.9"; disabled = pythonOlder "3.8"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-nN/L+X2Rvm6rqkscns4Tn2TAr59O5lCJObvcJp6M0+Q="; + hash = "sha256-3wnduej6xMQzrjGhGXQznfJud/Uoy3BDduukRJeahL8="; }; postPatch = '' - # Django is depended on transitively by hyperkitty and postorius, - # and mailman_web has overly restrictive version bounds on it, so - # let's remove it. - sed -i '/^[[:space:]]*django/Id' setup.cfg - # Upstream seems to mostly target installing on top of existing # distributions, and uses a path appropriate for that, but we are # a distribution, so use a state directory appropriate for a # distro package. substituteInPlace mailman_web/settings/base.py \ - --replace /opt/mailman/web /var/lib/mailman-web + --replace-fail /opt/mailman/web /var/lib/mailman-web ''; - nativeBuildInputs = [ setuptools-scm ]; + nativeBuildInputs = [ pdm-backend ]; propagatedBuildInputs = [ hyperkitty postorius whoosh ]; # Tries to check runtime configuration. diff --git a/pkgs/servers/mattermost/default.nix b/pkgs/servers/mattermost/default.nix index 6a2aedc4cbaf0..2e4df7b51dc9f 100644 --- a/pkgs/servers/mattermost/default.nix +++ b/pkgs/servers/mattermost/default.nix @@ -12,13 +12,13 @@ buildGoModule rec { # See https://docs.mattermost.com/upgrade/extended-support-release.html # When a new ESR version is available (e.g. 8.1.x -> 9.5.x), update # the version regex in passthru.updateScript as well. - version = "9.5.4"; + version = "9.5.5"; src = fetchFromGitHub { owner = "mattermost"; repo = "mattermost"; rev = "v${version}"; - hash = "sha256-iuUTAdgJJDSvUwVmcggJ4ZMVbQ19ymuIaB0PDIgEIdg="; + hash = "sha256-ZaFXuYm9SEE9ARN5PG8vjt9WnNfGiALilGzjfnDP7aA="; }; # Needed because buildGoModule does not support go workspaces yet. @@ -34,7 +34,7 @@ buildGoModule rec { webapp = fetchurl { url = "https://releases.mattermost.com/${version}/mattermost-${version}-linux-amd64.tar.gz"; - hash = "sha256-OVq+puaXPJGOmW9pcgX24LXBfYLzuczRY7KG2tQBY3Q="; + hash = "sha256-tgds8eTBeisuJcLgtx6zOiFUcVL1oU0LLbPqmh4SQUU="; }; vendorHash = "sha256-TJCtgNf56A1U0EbV5gXjTro+YudVBRWiSZoBC3nJxnE="; diff --git a/pkgs/servers/snac2/default.nix b/pkgs/servers/snac2/default.nix index 9c2594c80f999..31b3a0d907de9 100644 --- a/pkgs/servers/snac2/default.nix +++ b/pkgs/servers/snac2/default.nix @@ -10,14 +10,14 @@ stdenv.mkDerivation rec { pname = "snac2"; - version = "2.52"; + version = "2.53"; src = fetchFromGitea { domain = "codeberg.org"; owner = "grunfink"; repo = pname; rev = version; - hash = "sha256-2dDIbY6IaB53BbtNtzyOrigjzkGk7By2N2zZSuQhDAs="; + hash = "sha256-YSopopSJIcONw4utEBWhrfVglD5rTdf/rGNICFBHTvo="; }; buildInputs = [ curl openssl ]; diff --git a/pkgs/shells/zsh/zsh-abbr/default.nix b/pkgs/shells/zsh/zsh-abbr/default.nix index e44fa4a71a97e..20e9dcdb64729 100644 --- a/pkgs/shells/zsh/zsh-abbr/default.nix +++ b/pkgs/shells/zsh/zsh-abbr/default.nix @@ -5,13 +5,13 @@ }: stdenv.mkDerivation rec { pname = "zsh-abbr"; - version = "5.6.0"; + version = "5.7.1"; src = fetchFromGitHub { owner = "olets"; repo = "zsh-abbr"; rev = "v${version}"; - hash = "sha256-FcT1gk11a3nluP0sFMa5LoF7oT/MO4B1GdqdTdFxsLQ="; + hash = "sha256-2Uwo1gV732ZsSmJ6XU895Uqb5QOAQ2J1z85vufBv7nI="; }; strictDeps = true; diff --git a/pkgs/tools/admin/copilot-cli/default.nix b/pkgs/tools/admin/copilot-cli/default.nix index 505e44f3b3c14..941a7956dfb3f 100644 --- a/pkgs/tools/admin/copilot-cli/default.nix +++ b/pkgs/tools/admin/copilot-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "copilot-cli"; - version = "1.33.3"; + version = "1.33.4"; src = fetchFromGitHub { owner = "aws"; repo = pname; rev = "v${version}"; - hash = "sha256-WPPEox4NKFsVUpLkXawCK2QFwW1BAFaxQ85elvrneHo="; + hash = "sha256-sYsrjp23F/fyvNfLbJdZrptwNrZYespz8xMLYIwGfH0="; }; - vendorHash = "sha256-tVZ8TxJ77Qy+wn+O0otjZ6/VoKkav4OhNKWcrLhudgU="; + vendorHash = "sha256-GOr1l+4xDPm8ArqZpY0PshPeDnqYT+C4hgHGQkezBt8="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix index d5b1e306f8e8d..4c19fd9abc017 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix @@ -68,6 +68,13 @@ buildBazelPackage rec { unzip bazel-bin/unix/mozc.zip -x "tmp/*" -d / + # create a desktop file for gnome-control-center + # copied from ubuntu + mkdir -p $out/share/applications + cp ${./ibus-setup-mozc-jp.desktop} $out/share/applications/ibus-setup-mozc-jp.desktop + substituteInPlace $out/share/applications/ibus-setup-mozc-jp.desktop \ + --replace-fail "@mozc@" "$out" + runHook postInstall ''; diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/ibus-setup-mozc-jp.desktop b/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/ibus-setup-mozc-jp.desktop new file mode 100644 index 0000000000000..fd12e537a6761 --- /dev/null +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/ibus-setup-mozc-jp.desktop @@ -0,0 +1,7 @@ +[Desktop Entry] +Name=Mozc Setup +Exec=@mozc@/lib/mozc/mozc_tool --mode=config_dialog +Type=Application +StartupNotify=true +NoDisplay=true +X-Desktop-File-Install-Version=0.27 diff --git a/pkgs/tools/networking/openapi-generator-cli/default.nix b/pkgs/tools/networking/openapi-generator-cli/default.nix index 215d2466d4c82..d451c3094e14d 100644 --- a/pkgs/tools/networking/openapi-generator-cli/default.nix +++ b/pkgs/tools/networking/openapi-generator-cli/default.nix @@ -1,7 +1,7 @@ { callPackage, lib, stdenv, fetchurl, jre, makeWrapper }: let this = stdenv.mkDerivation (finalAttrs: { - version = "7.5.0"; + version = "7.6.0"; pname = "openapi-generator-cli"; jarfilename = "${finalAttrs.pname}-${finalAttrs.version}.jar"; @@ -12,7 +12,7 @@ let this = stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://maven/org/openapitools/${finalAttrs.pname}/${finalAttrs.version}/${finalAttrs.jarfilename}"; - sha256 = "sha256-R+u9G+3a99++5SPnuHYjxuwbHUKWD74V9srS9kJsab8="; + sha256 = "sha256-NQdL3TzfxGvpqQLhGlSj+qPK4eNOtmy9lZ0cgHC719c="; }; dontUnpack = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2f1be7f86551c..94fcff8c7287b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29677,8 +29677,6 @@ with pkgs; atlassian-cli = callPackage ../applications/office/atlassian-cli { }; - pulsar = callPackage ../applications/editors/pulsar { }; - asap = callPackage ../tools/audio/asap { }; aseprite = callPackage ../applications/editors/aseprite { }; |