nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-09-29 11:20:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge release-23.05 into staging-next-23.05

Browse Source
This commit is contained in:
github-actions[bot]
2023-07-11 00:15:45 +00:00
committed by GitHub
parent 32aed3c7c4 e7f8793795
commit 7426dc52cf
12 changed files with 117 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/applications/misc/todoist-electron/default.nix
View File

@@ -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}}"

6
pkgs/applications/networking/browsers/palemoon/bin.nix
View File

@@ -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;

4
pkgs/applications/networking/instant-messengers/psi-plus/default.nix
View File

@@ -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 = [

22
pkgs/applications/networking/remote/citrix-workspace/generic.nix
View File

@@ -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
@@ -82,12 +82,15 @@ stdenv.mkDerivation rec {
libcxxabi
libjpeg
libpng12
libpulseaudio
libsoup
libvorbis
libxml2
llvmPackages_12.libunwind
mesa
nspr
nss
opencv4
openssl'
pango
speex
@@ -98,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
@@ -121,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} \
@@ -142,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
@@ -198,6 +198,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

12
pkgs/applications/networking/remote/citrix-workspace/sources.nix
View File

@@ -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

4
pkgs/development/libraries/hwloc/default.nix
View File

@@ -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 = [

6
pkgs/misc/vencord/default.nix
View File

@@ -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" ];

4
pkgs/misc/vencord/package-lock.json generated
View File

@@ -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",

2
pkgs/tools/backup/bup/default.nix
View File

@@ -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 ]} \

4
pkgs/tools/graphics/gifsicle/default.nix
View File

@@ -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 ];

63
pkgs/tools/misc/rtx/default.nix Normal file
View File

@@ -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 ];
};
}

7
pkgs/top-level/all-packages.nix
View File

@@ -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 { };
@@ -17543,6 +17544,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 { };