From 01347024e9b717a0678029c50e442d1261a504e1 Mon Sep 17 00:00:00 2001 From: Konrad Malik Date: Sun, 26 Feb 2023 15:17:01 +0100 Subject: [PATCH 01/10] rtx: init at 1.30.5 (cherry picked from commit 66cbf0144b06c44ba681a605ba206d66808684b6) --- pkgs/tools/misc/rtx/default.nix | 63 +++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 2 files changed, 67 insertions(+) create mode 100644 pkgs/tools/misc/rtx/default.nix diff --git a/pkgs/tools/misc/rtx/default.nix b/pkgs/tools/misc/rtx/default.nix new file mode 100644 index 000000000000..7194dc492b33 --- /dev/null +++ b/pkgs/tools/misc/rtx/default.nix @@ -0,0 +1,63 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, installShellFiles +, stdenv +, coreutils +, bash +, direnv +, Security +}: + +rustPlatform.buildRustPackage rec { + pname = "rtx"; + version = "1.30.5"; + + src = fetchFromGitHub { + owner = "jdxcode"; + repo = "rtx"; + rev = "v${version}"; + sha256 = "sha256-xJecTvhRMHyGOT1JJPSp+k5bI0FvIP2uySBt1R0YZ30="; + }; + + cargoSha256 = "sha256-29aGVKINVemppy+3nGDf5okvmJm72pVYUVbefuey0H8="; + + nativeBuildInputs = [ installShellFiles ]; + buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + + postPatch = '' + patchShebangs --build ./test/data/plugins/**/bin/* ./src/fake_asdf.rs ./src/cli/reshim.rs + + substituteInPlace ./src/env_diff.rs \ + --replace '"bash"' '"${bash}/bin/bash"' + + substituteInPlace ./src/cli/direnv/exec.rs \ + --replace '"env"' '"${coreutils}/bin/env"' \ + --replace 'cmd!("direnv"' 'cmd!("${direnv}/bin/direnv"' + ''; + + checkFlags = [ + # Requires .git directory to be present + "--skip=cli::plugins::ls::tests::test_plugin_list_urls" + ]; + cargoTestFlags = [ "--all-features" ]; + # some tests access the same folders, don't test in parallel to avoid race conditions + dontUseCargoParallelTests = true; + + postInstall = '' + installManPage ./man/man1/rtx.1 + + installShellCompletion \ + --bash ./completions/rtx.bash \ + --fish ./completions/rtx.fish \ + --zsh ./completions/_rtx + ''; + + meta = rec { + homepage = "https://github.com/jdxcode/rtx"; + description = "Polyglot runtime manager (asdf rust clone)"; + changelog = "https://github.com/jdxcode/rtx/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ konradmalik ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5e25487f23aa..a34012b81557 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17541,6 +17541,10 @@ with pkgs; asdf-vm = callPackage ../tools/misc/asdf-vm { }; + rtx = callPackage ../tools/misc/rtx { + inherit (darwin.apple_sdk.frameworks) Security; + }; + ### DEVELOPMENT / TOOLS abi-compliance-checker = callPackage ../development/tools/misc/abi-compliance-checker { }; From b4a7f2db772ca71b6742133a6a030b8d9518b87c Mon Sep 17 00:00:00 2001 From: Chris Moultrie <821688+tebriel@users.noreply.github.com> Date: Tue, 13 Jun 2023 21:08:09 -0400 Subject: [PATCH 02/10] todoist-electron: 1.0.8 -> 8.3.3 Also bump dependency: electron_21 -> electron_24 (cherry picked from commit 1c30b4b8287ca0c12f4250ce53721df90b6c52c3) --- pkgs/applications/misc/todoist-electron/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/todoist-electron/default.nix b/pkgs/applications/misc/todoist-electron/default.nix index 50e8a2ea10d8..67c9f83683b8 100644 --- a/pkgs/applications/misc/todoist-electron/default.nix +++ b/pkgs/applications/misc/todoist-electron/default.nix @@ -1,12 +1,12 @@ -{ lib, stdenv, fetchurl, appimageTools, makeWrapper, electron_21, libsecret }: +{ lib, stdenv, fetchurl, appimageTools, makeWrapper, electron_24, libsecret }: stdenv.mkDerivation rec { pname = "todoist-electron"; - version = "1.0.9"; + version = "8.3.3"; src = fetchurl { - url = "https://electron-dl.todoist.com/linux/Todoist-${version}.AppImage"; - sha256 = "sha256-DfNFDiGYTFGetVRlAjpV/cdWcGzRDEGZjR0Dc9aAtXc="; + url = "https://electron-dl.todoist.com/linux/Todoist-linux-x86_64-${version}.AppImage"; + hash = "sha256-X928hCrYVOBTEZq1hmZWgWlabtOzQrLUuptF/SJcAto="; }; appimageContents = appimageTools.extractType2 { @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { ''; postFixup = '' - makeWrapper ${electron_21}/bin/electron $out/bin/${pname} \ + makeWrapper ${electron_24}/bin/electron $out/bin/todoist-electron \ --add-flags $out/share/${pname}/resources/app.asar \ --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc libsecret ]}" \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" From 8b09ba2c1752e3ed7b501ec35655c80adeef9538 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 30 Jun 2023 21:44:10 +0000 Subject: [PATCH 03/10] gifsicle: 1.93 -> 1.94 (cherry picked from commit 7ecd36fb2cb9069f7acadfb5079c8bcd5a9baab6) --- pkgs/tools/graphics/gifsicle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/gifsicle/default.nix b/pkgs/tools/graphics/gifsicle/default.nix index c21d51dce605..912bbde2f3e6 100644 --- a/pkgs/tools/graphics/gifsicle/default.nix +++ b/pkgs/tools/graphics/gifsicle/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "gifsicle"; - version = "1.93"; + version = "1.94"; src = fetchurl { url = "https://www.lcdf.org/gifsicle/${pname}-${version}.tar.gz"; - sha256 = "sha256-kvZweXMr9MHaCH5q4JBSBYRuWsd3ulyqZtEqc6qUNEc="; + sha256 = "sha256-S8lwBcB4liDedfiZl9PC9wdYxyxhqgou8E96Zxov+Js="; }; buildInputs = lib.optionals gifview [ xorgproto libXt libX11 ]; From 958f040e28356cf3a880c8929f878cb8ecdaeb47 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Sun, 2 Jul 2023 21:43:55 +0200 Subject: [PATCH 04/10] palemoon-bin: 32.2.0 -> 32.2.1 (cherry picked from commit a10e518fdfd4e99a21fcd2479dc425a286978735) --- pkgs/applications/networking/browsers/palemoon/bin.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/palemoon/bin.nix b/pkgs/applications/networking/browsers/palemoon/bin.nix index 689bd68b0a50..cdae7b7c552d 100644 --- a/pkgs/applications/networking/browsers/palemoon/bin.nix +++ b/pkgs/applications/networking/browsers/palemoon/bin.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { pname = "palemoon-bin"; - version = "32.2.0"; + version = "32.2.1"; src = fetchzip { urls = [ @@ -27,9 +27,9 @@ stdenv.mkDerivation rec { "https://rm-us.palemoon.org/release/palemoon-${version}.linux-x86_64-gtk${if withGTK3 then "3" else "2"}.tar.xz" ]; hash = if withGTK3 then - "sha256-Bw8L5+3f46lOGJ5xR3bBF7sQWwEFxoK/NH3ngs1i4lU=" + "sha256-brF9ACAG+JM7bk/JarB208f8ihI/1d90l+6e1pHmC20=" else - "sha256-eP7GIsWPFLYmBPUcMPn6vAlsFEAP3Oyy9mhj0oGeMT4="; + "sha256-205rhW89Jlk4ICraqndTbJ6/88+ZqhtDOIvhFTiEUz0="; }; preferLocalBuild = true; From 805ec9b0d9e8bd899ccb093f9361224e16898555 Mon Sep 17 00:00:00 2001 From: wackbyte Date: Fri, 7 Jul 2023 22:44:38 -0400 Subject: [PATCH 05/10] vencord: 1.2.8 -> 1.3.4 (cherry picked from commit 79ceb03e0316d69eeb19833f994f0a5f678a7a59) --- pkgs/misc/vencord/default.nix | 6 +++--- pkgs/misc/vencord/package-lock.json | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/misc/vencord/default.nix b/pkgs/misc/vencord/default.nix index 38dbc1fa8f81..99d11b06976f 100644 --- a/pkgs/misc/vencord/default.nix +++ b/pkgs/misc/vencord/default.nix @@ -8,13 +8,13 @@ }: buildNpmPackage rec { pname = "vencord"; - version = "1.2.8"; + version = "1.3.4"; src = fetchFromGitHub { owner = "Vendicated"; repo = "Vencord"; rev = "v${version}"; - sha256 = "sha256-l3h4LrpMQ944i4QivKeL3dhZxZCr5uG29pQMY1XNbqc="; + sha256 = "sha256-r+VgxXwsBOfMggcVlr5q1/ONfp13CpX4ssrLQtmdLe8="; }; ESBUILD_BINARY_PATH = lib.getExe (esbuild.override { @@ -33,7 +33,7 @@ buildNpmPackage rec { # Supresses an error about esbuild's version. npmRebuildFlags = [ "|| true" ]; - npmDepsHash = "sha256-m+hczXog03Gz81CP/blkRJPaTrEhmLQFvVtOfWKYQL4="; + npmDepsHash = "sha256-HJK88z4Gs8mqd28zKrsTtk34VcRqIyb6aURbvRZLN0I="; npmFlags = [ "--legacy-peer-deps" ]; npmBuildScript = if buildWebExtension then "buildWeb" else "build"; npmBuildFlags = [ "--" "--standalone" ]; diff --git a/pkgs/misc/vencord/package-lock.json b/pkgs/misc/vencord/package-lock.json index 50bdbd220f6a..c75130a7e6fa 100644 --- a/pkgs/misc/vencord/package-lock.json +++ b/pkgs/misc/vencord/package-lock.json @@ -1,12 +1,12 @@ { "name": "vencord", - "version": "1.2.8", + "version": "1.3.4", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "vencord", - "version": "1.2.8", + "version": "1.3.4", "license": "GPL-3.0", "dependencies": { "@vap/core": "0.0.12", From 8914c0aa4acc4f39641f1f876cc42719f5a26c9e Mon Sep 17 00:00:00 2001 From: Michael Adler Date: Mon, 10 Jul 2023 09:20:52 +0200 Subject: [PATCH 06/10] citrix_workspace: 23.02.0 -> 23.07.0 (cherry picked from commit 31b0d9b169ce496b797c40e554d89a10d5b8270e) --- .../networking/remote/citrix-workspace/generic.nix | 11 ++++++++++- .../networking/remote/citrix-workspace/sources.nix | 12 ++++++++++++ pkgs/top-level/all-packages.nix | 3 ++- 3 files changed, 24 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/remote/citrix-workspace/generic.nix b/pkgs/applications/networking/remote/citrix-workspace/generic.nix index 5051d2308f02..b52d9ff695ae 100644 --- a/pkgs/applications/networking/remote/citrix-workspace/generic.nix +++ b/pkgs/applications/networking/remote/citrix-workspace/generic.nix @@ -3,7 +3,7 @@ , heimdal, krb5, libsoup, libvorbis, speex, openssl, zlib, xorg, pango, gtk2 , gnome2, mesa, nss, nspr, gtk_engines, freetype, dconf, libpng12, libxml2 , libjpeg, libredirect, tzdata, cacert, systemd, libcxxabi, libcxx, e2fsprogs, symlinkJoin -, libpulseaudio, pcsclite, glib-networking, llvmPackages_12 +, libpulseaudio, pcsclite, glib-networking, llvmPackages_12, opencv4 , homepage, version, prefix, hash @@ -88,6 +88,7 @@ stdenv.mkDerivation rec { mesa nspr nss + opencv4 openssl' pango speex @@ -198,6 +199,14 @@ stdenv.mkDerivation rec { # Make sure that `autoPatchelfHook` is executed before # running `ctx_rehash`. dontAutoPatchelf = true; + preFixup = '' + find $out/opt/citrix-icaclient/lib -name "libopencv_imgcodecs.so.*" | while read -r fname; do + # lib needs libtiff.so.5, but nixpkgs provides libtiff.so.6 + patchelf --replace-needed libtiff.so.5 libtiff.so $fname + # lib needs libjpeg.so.8, but nixpkgs provides libjpeg.so.9 + patchelf --replace-needed libjpeg.so.8 libjpeg.so $fname + done + ''; postFixup = '' autoPatchelf -- "$out" $out/opt/citrix-icaclient/util/ctx_rehash diff --git a/pkgs/applications/networking/remote/citrix-workspace/sources.nix b/pkgs/applications/networking/remote/citrix-workspace/sources.nix index 78f8b1a2a0c8..2422d7eb8efb 100644 --- a/pkgs/applications/networking/remote/citrix-workspace/sources.nix +++ b/pkgs/applications/networking/remote/citrix-workspace/sources.nix @@ -22,8 +22,20 @@ let x86hash = "39228fc8dd69adca4e56991c1ebc0832fec183c3ab5abd2d65c66b39b634391b"; x64suffix = "10"; x86suffix = "10"; + homepage = "https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-latest6.html"; + }; + + "23.07.0" = { + major = "23"; + minor = "7"; + patch = "0"; + x64hash = "d4001226e79b5353fc74da4c8ed4f6295c1859fe18142cb5de345a3c7ae48168"; + x86hash = "4a7da238286ae28d7baf0fefa1e7e09d077c8bc56c2bf7bec00da42c331bee59"; + x64suffix = "17"; + x86suffix = "17"; homepage = "https://www.citrix.com/downloads/workspace-app/linux/workspace-app-for-linux-latest.html"; }; + }; # Retain attribute-names for abandoned versions of Citrix workspace to diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 78285235c468..3e869d2114ab 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6274,8 +6274,9 @@ with pkgs; inherit (callPackage ../applications/networking/remote/citrix-workspace { }) citrix_workspace_23_02_0 + citrix_workspace_23_07_0 ; - citrix_workspace = citrix_workspace_23_02_0; + citrix_workspace = citrix_workspace_23_07_0; cmigemo = callPackage ../tools/text/cmigemo { }; From ce07171717672d229674469eee8b5e5282e344ce Mon Sep 17 00:00:00 2001 From: Michael Adler Date: Mon, 10 Jul 2023 09:28:56 +0200 Subject: [PATCH 07/10] citrix_workspace: remove obsolete version checks The oldest supported version is >= 23, so there is no need to have version checks for < 23 versions. (cherry picked from commit 724040fe18c59d8ab93d805f8572e58f716d56d5) --- .../networking/remote/citrix-workspace/generic.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/remote/citrix-workspace/generic.nix b/pkgs/applications/networking/remote/citrix-workspace/generic.nix index b52d9ff695ae..cd5f21a15ed8 100644 --- a/pkgs/applications/networking/remote/citrix-workspace/generic.nix +++ b/pkgs/applications/networking/remote/citrix-workspace/generic.nix @@ -82,9 +82,11 @@ stdenv.mkDerivation rec { libcxxabi libjpeg libpng12 + libpulseaudio libsoup libvorbis libxml2 + llvmPackages_12.libunwind mesa nspr nss @@ -99,9 +101,7 @@ stdenv.mkDerivation rec { xorg.libXScrnSaver xorg.libXtst zlib - ] ++ lib.optional (lib.versionOlder version "20.04") e2fsprogs - ++ lib.optional (lib.versionAtLeast version "20.10") libpulseaudio - ++ lib.optional (lib.versionAtLeast version "21.12") llvmPackages_12.libunwind; + ]; runtimeDependencies = [ glib @@ -122,7 +122,7 @@ stdenv.mkDerivation rec { installPhase = let icaFlag = program: if (builtins.match "selfservice(.*)" program) != null then "--icaroot" - else if (lib.versionAtLeast version "21.12" && builtins.match "wfica(.*)" program != null) then null + else if (builtins.match "wfica(.*)" program != null) then null else "-icaroot"; wrap = program: '' wrapProgram $out/opt/citrix-icaclient/${program} \ @@ -143,8 +143,7 @@ stdenv.mkDerivation rec { mkWrappers = lib.concatMapStringsSep "\n"; - toWrap = [ "wfica" "selfservice" "util/configmgr" "util/conncenter" "util/ctx_rehash" ] - ++ lib.optional (lib.versionOlder version "20.06") "selfservice_old"; + toWrap = [ "wfica" "selfservice" "util/configmgr" "util/conncenter" "util/ctx_rehash" ]; in '' runHook preInstall From aed81e9f3f92da363484506f547daa49b71794db Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Jul 2023 06:53:32 +0000 Subject: [PATCH 08/10] hwloc: 2.9.1 -> 2.9.2 (cherry picked from commit 92317986be606cb086640384f99b1cc99e6a8743) --- pkgs/development/libraries/hwloc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/hwloc/default.nix b/pkgs/development/libraries/hwloc/default.nix index 028504bb6996..fbef44bf67ea 100644 --- a/pkgs/development/libraries/hwloc/default.nix +++ b/pkgs/development/libraries/hwloc/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "hwloc"; - version = "2.9.1"; + version = "2.9.2"; src = fetchurl { url = "https://www.open-mpi.org/software/hwloc/v${lib.versions.majorMinor version}/downloads/hwloc-${version}.tar.bz2"; - sha256 = "sha256-fMSTGiD+9Ffgkzrz83W+bq+ncD/eIeE3v7loWxQJWZ4="; + sha256 = "sha256-Cof99nf4sAtWfSKbYyC/ayXGk+2qQ+C4UmjZmdawYM8="; }; configureFlags = [ From 52a3a338b1e0b0481400bb82e7d030dee34f0664 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Jul 2023 01:13:58 +0000 Subject: [PATCH 09/10] psi-plus: 1.5.1646 -> 1.5.1650 (cherry picked from commit f91df581608f5f33e7ef4c6831348dcf2a6a539c) --- .../networking/instant-messengers/psi-plus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix index 6f3b7cfb022f..2bed5babd048 100644 --- a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix +++ b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix @@ -43,13 +43,13 @@ assert enablePsiMedia -> enablePlugins; mkDerivation rec { pname = "psi-plus"; - version = "1.5.1646"; + version = "1.5.1650"; src = fetchFromGitHub { owner = "psi-plus"; repo = "psi-plus-snapshots"; rev = version; - sha256 = "sha256-FeZlJAJHmNGd7hbpjmthe2/yGxh0zIl3zXnA+vRjNCM="; + sha256 = "sha256-qoqusg2CbivoPFbYnBSzE5P5+p1vCKmMbSBrPdC6SqI="; }; cmakeFlags = [ From bca832a10574cf0b8a875cb91aee922b6156f498 Mon Sep 17 00:00:00 2001 From: Atemu Date: Mon, 10 Jul 2023 13:23:05 +0200 Subject: [PATCH 10/10] bup: don't error out on implicit-function-declaration on darwin Upstream should fix that but this fixes the build on Darwin for now: ``` building build flags: SHELL=/nix/store/mxvgjwzdvrl81plvgqnzbrqb14ccnji6-bash-5.2-p15/bin/bash MANDIR=\$\(out\)/share/man DOCDIR=\$\(out\)/share/doc/bup BINDIR=\$\(out\)/bin LIBDIR=\$\(out\)/lib/bup fatal: not a git repository (or any of the parent directories): .git clang -I/nix/store/2rrfpkq6cr8ppip9szl0z1qfdlskdinq-python3-3.10.12/include/python3.10 -I/nix/store/2rrfpkq6cr8ppip9szl0z1qfdlskdinq-python3-3.10.12/include/python3.10 -Wno-unused-result -Wsign-compare -Wunreachable-code -DNDEBUG -g -fwrapv -O3 -Wall -I/nix/store/vnn3dp5cyjlknkqxmi29vbg812ml5m7r-libxcrypt-4.4.35/include -Wno-unused-command-line-argument -D_FILE_OFFSET_BITS=64 -Wno-unknown-pragmas -Wsign-compare -O2 -Wall -Werror -Wformat=2 -MMD -MP -D BUP_DEV_BUP_EXEC=1 -I/private/tmp/nix-build-bup-0.33.2.drv-0/source/src -I src -g lib/cmd/bup.c src/bup/compat.c src/bup/io.c -lpython3.10 -lcrypt -ldl -L/nix/store/vnn3dp5cyjlknkqxmi29vbg812ml5m7r-libxcrypt-4.4.35/lib -framework CoreFoundation -g -fPIE -o dev/bup-exec lib/cmd/bup.c:153:14: error: implicit declaration of function '_NSGetExecutablePath' is invalid in C99 [-Werror,-Wimplicit-function-declaration] int rc = _NSGetExecutablePath(spath, &size); ^ 1 error generated. make: *** [GNUmakefile:185: dev/bup-exec] Error 1 ``` (cherry picked from commit ea1d1a8f5283dd585149e61215cb40650304722c) --- pkgs/tools/backup/bup/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/backup/bup/default.nix b/pkgs/tools/backup/bup/default.nix index 88b3693d7e99..7bea67dc621b 100644 --- a/pkgs/tools/backup/bup/default.nix +++ b/pkgs/tools/backup/bup/default.nix @@ -37,6 +37,8 @@ stdenv.mkDerivation { "LIBDIR=$(out)/lib/bup" ]; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-Wno-error=implicit-function-declaration"; + postInstall = '' wrapProgram $out/bin/bup \ --prefix PATH : ${lib.makeBinPath [ git par2cmdline ]} \