gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot]
2024-10-11 06:04:46 +00:00
committed by GitHub
parent aa2334f4a8 35f64dd473
commit e26f69eb82
11 changed files with 72 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ci/OWNERS
+1 -1
View File
@@ -112,7 +112,7 @@ nixos/modules/installer/tools/nix-fallback-paths.nix @NixOS/nix-team @raitobeza
/nixos/modules/virtualisation/qemu-vm.nix @raitobezarius
# ACME
/nixos/modules/security/acme @arianvp @flokli @aanderse @emilazy # no merge permission: @m1cr0man
/nixos/modules/security/acme @NixOS/acme
# Systemd
/nixos/modules/system/boot/systemd.nix @NixOS/systemd
nixos/modules/installer/netboot/netboot.nix
+1 -6
View File
@@ -9,12 +9,7 @@ with lib;
options = {
netboot.squashfsCompression = mkOption {
default = with pkgs.stdenv.hostPlatform; "xz -Xdict-size 100% "
+ lib.optionalString isx86 "-Xbcj x86"
# Untested but should also reduce size for these platforms
+ lib.optionalString isAarch "-Xbcj arm"
+ lib.optionalString (isPower && is32bit && isBigEndian) "-Xbcj powerpc"
+ lib.optionalString (isSparc) "-Xbcj sparc";
default = "zstd -Xcompression-level 19";
description = ''
Compression settings to use for the squashfs nix store.
'';
nixos/modules/services/mail/stalwart-mail.nix
+2
View File
@@ -82,6 +82,7 @@ in {
) {
webadmin = lib.mkDefault "file://${cfg.package.webadmin}/webadmin.zip";
};
webadmin.path = "/var/cache/stalwart-mail";
};
# This service stores a potentially large amount of data.
@@ -117,6 +118,7 @@ in {
StandardOutput = "journal";
StandardError = "journal";
CacheDirectory = "stalwart-mail";
StateDirectory = "stalwart-mail";
# Bind standard privileged ports
pkgs/applications/editors/vscode/vscode.nix
+8 -8
View File
@@ -30,21 +30,21 @@ let
archive_fmt = if stdenv.hostPlatform.isDarwin then "zip" else "tar.gz";
sha256 = {
x86_64-linux = "11d9qqfb5kh5zsc7xd6h5xsywacir5z08l2snj0cz2cb0nji9xhj";
x86_64-darwin = "0rbwvvakh1b5iqca49hcmqlfq4g0j067rrphrh0yx7wdyr6kmwg2";
aarch64-linux = "0vrvcy1p5lrdy2lww42w32vr79075vpkwj4q8wfqzd7x72vmhfci";
aarch64-darwin = "03wccm854v9va50x91kp00a16r483zpndayhlwy1fm4n0wdy6iw8";
armv7l-linux = "0b9r78mz5djvv6n82isn2jqb4bwa41hqyxxc9arhrpvpj5w65rla";
x86_64-linux = "0w452wnzyb4wmr2qqq55dhfb1jd0zqmwf65fbmxdz7jn1jimjjrn";
x86_64-darwin = "1b333snvrw8khryhi5scfhhkg43m3b6ds3nvs24nbvx8k7h69hmm";
aarch64-linux = "12p5cdva14s9sfgyrzg3nylpmgdnmfavwx3xxxmblzq1gcal2g6i";
aarch64-darwin = "1l59fcdvynkl5kyz9bn31mld6pi89nynk1zw645rczjm940pac7p";
armv7l-linux = "07ylija6chg6jc2zcavdr9yw1laniigw57f2gilyjynv1cgjm76r";
}.${system} or throwSystem;
in
callPackage ./generic.nix rec {
# Please backport all compatible updates to the stable release.
# This is important for the extension ecosystem.
version = "1.94.1";
version = "1.94.2";
pname = "vscode" + lib.optionalString isInsiders "-insiders";
# This is used for VS Code - Remote SSH test
rev = "e10f2369d0d9614a452462f2e01cdc4aa9486296";
rev = "384ff7382de624fb94dbaf6da11977bba1ecd427";
executableName = "code" + lib.optionalString isInsiders "-insiders";
longName = "Visual Studio Code" + lib.optionalString isInsiders " - Insiders";
@@ -68,7 +68,7 @@ in
src = fetchurl {
name = "vscode-server-${rev}.tar.gz";
url = "https://update.code.visualstudio.com/commit:${rev}/server-linux-x64/stable";
sha256 = "094klvp32475f6rsapxkhgsm8cmjmpq4qp3lx2b1vgf3xzl7j9nw";
sha256 = "1mj9fg76b9x9r6ql21hbckpni179vfa9j8fiah9rd6ih7sb72048";
};
};
pkgs/applications/video/jellyfin-media-player/default.nix
+1 -6
View File
@@ -77,11 +77,6 @@ mkDerivation rec {
postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
mkdir -p $out/bin $out/Applications
mv "$out/Jellyfin Media Player.app" $out/Applications
# move web-client resources
mv $out/Resources/* "$out/Applications/Jellyfin Media Player.app/Contents/Resources/"
rmdir $out/Resources
ln -s "$out/Applications/Jellyfin Media Player.app/Contents/MacOS/Jellyfin Media Player" $out/bin/jellyfinmediaplayer
'';
@@ -89,7 +84,7 @@ mkDerivation rec {
homepage = "https://github.com/jellyfin/jellyfin-media-player";
description = "Jellyfin Desktop Client based on Plex Media Player";
license = with licenses; [ gpl2Only mit ];
platforms = [ "aarch64-linux" "x86_64-linux" "x86_64-darwin" ];
platforms = [ "aarch64-linux" "x86_64-linux" "aarch64-darwin" "x86_64-darwin" ];
maintainers = with maintainers; [ jojosch kranzes ];
mainProgram = "jellyfinmediaplayer";
};
pkgs/by-name/wa/waveterm/package.nix
+26 -23
View File
@@ -32,32 +32,32 @@
}:
let
inherit (stdenv.hostPlatform) system;
throwSystem = throw "Unsupported system: ${system}";
pname = "waveterm";
version = "0.8.8";
version = "0.8.10";
suffix =
{
x86_64-linux = "waveterm-linux-x64-${version}.zip";
aarch64-linux = "waveterm-linux-arm64-${version}.zip";
x86_64-darwin = "Wave-darwin-universal-${version}.zip ";
aarch64-darwin = "Wave-darwin-arm64-${version}.zip";
}
.${system} or throwSystem;
src =
let
inherit (stdenv.hostPlatform) system;
selectSystem = attrs: attrs.${system} or (throw "Unsupported system: ${system}");
suffix = selectSystem {
x86_64-linux = "waveterm-linux-x64-${version}.zip";
aarch64-linux = "waveterm-linux-arm64-${version}.zip";
x86_64-darwin = "Wave-darwin-universal-${version}.zip ";
aarch64-darwin = "Wave-darwin-arm64-${version}.zip";
};
hash = selectSystem {
x86_64-linux = "sha256-jhXHuzHMwo9U5B+FA2xAreOYRVroMCXqDo+9pjAyh0Q=";
aarch64-linux = "sha256-JnKkjG67uvYNod+uosJ+svTAm9bulJzTpza3jQie1yQ=";
x86_64-darwin = "sha256-Dk/pKZrqkjKc7WEGkrLdZdgUEaz8ndXjZuINyVNxEa8=";
aarch64-darwin = "sha256-FgBbUrp+Z9K4gmM4mew0NQ2yIjuC+cgYrrYkjv0Ohhg=";
};
in
fetchurl {
url = "https://github.com/wavetermdev/waveterm/releases/download/v${version}/${suffix}";
inherit hash;
};
src = fetchurl {
url = "https://github.com/wavetermdev/waveterm/releases/download/v${version}/${suffix}";
hash =
{
x86_64-linux = "sha256-hRpJTFVoBQZyJD06FTRbBPj/1DlYlDWPRjJ1IKeK7Cs=";
aarch64-linux = "sha256-T3VqsoHhPYYrAe/dEd0SUH+G4jpHjKpJTrFy8/AgoKI=";
x86_64-darwin = "sha256-UlyNl2Qu59L4hnK8rTeUV30YVD45L7ub5SP8f97aJrw=";
aarch64-darwin = "sha256-cP+z8DQsNBJc3p57xQdGqqq7jvYcRQRIa+P+6kD3eCc=";
}
.${system} or throwSystem;
};
passthru.updateScript = ./update.sh;
desktopItems = [
(makeDesktopItem {
@@ -112,6 +112,8 @@ let
src
desktopItems
unpackPhase
meta
passthru
;
nativeBuildInputs = [
@@ -172,6 +174,7 @@ let
src
unpackPhase
meta
passthru
;
nativeBuildInputs = [
pkgs/by-name/wa/waveterm/update.sh
Executable
+25
View File
@@ -0,0 +1,25 @@
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p bash curl coreutils jq common-updater-scripts
latestTag=$(curl https://api.github.com/repos/wavetermdev/waveterm/releases/latest | jq -r ".tag_name")
latestVersion="$(expr "$latestTag" : 'v\(.*\)')"
currentVersion=$(nix-instantiate --eval -E "with import ./. {}; waveterm.version" | tr -d '"')
echo "latest version: $latestVersion"
echo "current version: $currentVersion"
if [[ "$latestVersion" == "$currentVersion" ]]; then
echo "package is up-to-date"
exit 0
fi
for i in \
"x86_64-linux waveterm-linux-x64" \
"aarch64-linux waveterm-linux-arm64" \
"x86_64-darwin Wave-darwin-universal" \
"aarch64-darwin Wave-darwin-arm64"; do
set -- $i
prefetch=$(nix-prefetch-url "https://github.com/wavetermdev/waveterm/releases/download/v$latestVersion/$2-$latestVersion.zip")
hash=$(nix-hash --type sha256 --to-sri $prefetch)
update-source-version waveterm $latestVersion $hash --system=$1 --ignore-same-version
done
pkgs/development/libraries/howard-hinnant-date/default.nix
+7 -1
View File
@@ -61,11 +61,17 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" ];
# fixes "cycle detected in build"
postInstall = lib.optionalString stdenv.hostPlatform.isWindows ''
mkdir $dev/lib
mv $out/CMake $dev/lib/cmake
'';
meta = with lib; {
license = licenses.mit;
description = "Date and time library based on the C++11/14/17 <chrono> header";
homepage = "https://github.com/HowardHinnant/date";
platforms = platforms.unix;
platforms = with platforms; unix ++ windows;
maintainers = with maintainers; [ r-burns ];
};
}
pkgs/tools/typesetting/tex/tex-match/default.nix
-28
View File
@@ -1,28 +0,0 @@
{ rustPlatform, fetchFromGitHub, gtk3, pkg-config, glib, lib }:
rustPlatform.buildRustPackage rec {
pname = "tex-match";
version = "1.2.0";
src = fetchFromGitHub {
owner = "zoeyfyi";
repo = "TeX-Match";
rev = "v${version}";
sha256 = "1yb81j7mbqqb8jcn78dx4ydp7ncbzvaczkli6cqay5jf5j6dbk1z";
};
nativeBuildInputs = [ pkg-config glib ];
buildInputs = [ gtk3 ];
cargoHash = "sha256-Vgcfir7Mg0mTpN6nx2P2gGcXSoB7iBRVkGTpO1nmMI4=";
meta = with lib; {
description = "Search through over 1000 different LaTeX symbols by sketching. A desktop version of detexify";
mainProgram = "tex-match";
homepage = "https://tex-match.zoey.fyi/";
license = licenses.mit;
maintainers = [ maintainers.bootstrap-prime ];
platforms = platforms.linux;
};
}
pkgs/top-level/aliases.nix
+1
View File
@@ -1277,6 +1277,7 @@ mapAliases {
pgtap = postgresqlPackages.pgtap;
plv8 = postgresqlPackages.plv8;
postgis = postgresqlPackages.postgis;
tex-match = throw "'tex-match' has been removed due to lack of maintenance upstream. Consider using 'hieroglyphic' instead"; # Added 2024-09-24
texinfo5 = throw "'texinfo5' has been removed from nixpkgs"; # Added 2024-09-10
timescaledb = postgresqlPackages.timescaledb;
tsearch_extras = postgresqlPackages.tsearch_extras;
pkgs/top-level/all-packages.nix
-2
View File
@@ -5002,8 +5002,6 @@ with pkgs;
tetex = callPackage ../tools/typesetting/tex/tetex { libpng = libpng12; };
tex-match = callPackage ../tools/typesetting/tex/tex-match { };
texFunctions = callPackage ../tools/typesetting/tex/nix pkgs;
# TeX Live; see https://nixos.org/nixpkgs/manual/#sec-language-texlive