From f34b9f5e60799e80576f7bfeca310f4631c4a443 Mon Sep 17 00:00:00 2001 From: Daniel Nagy Date: Thu, 12 Sep 2024 19:15:00 +0200 Subject: [PATCH 01/10] nixos/netboot: Compress squashfs with zstd 19 --- nixos/modules/installer/netboot/netboot.nix | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/nixos/modules/installer/netboot/netboot.nix b/nixos/modules/installer/netboot/netboot.nix index 33301c6423db9..28825829b022f 100644 --- a/nixos/modules/installer/netboot/netboot.nix +++ b/nixos/modules/installer/netboot/netboot.nix @@ -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. ''; From 82459a8dc1f97f9e4a3e96e7b0964b624409de5b Mon Sep 17 00:00:00 2001 From: aleksana Date: Tue, 24 Sep 2024 15:53:14 +0800 Subject: [PATCH 02/10] tex-match: remove --- .../typesetting/tex/tex-match/default.nix | 28 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 1 insertion(+), 30 deletions(-) delete mode 100644 pkgs/tools/typesetting/tex/tex-match/default.nix diff --git a/pkgs/tools/typesetting/tex/tex-match/default.nix b/pkgs/tools/typesetting/tex/tex-match/default.nix deleted file mode 100644 index 18dffb657c89f..0000000000000 --- a/pkgs/tools/typesetting/tex/tex-match/default.nix +++ /dev/null @@ -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; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index bdddfc3176584..93e6976a224b5 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1244,6 +1244,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; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 20802383bd4c3..d42330381f5f8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5047,8 +5047,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 From 8bf3d7c75ad85b66b0b33f716ee1c049d9bebcfb Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Sat, 14 Sep 2024 16:25:10 -0400 Subject: [PATCH 03/10] jellyfin-media-player: fix build on Darwin - Stop removing web resources (it no longer seems necessary); and - Enable aarch64-darwin --- pkgs/applications/video/jellyfin-media-player/default.nix | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/pkgs/applications/video/jellyfin-media-player/default.nix b/pkgs/applications/video/jellyfin-media-player/default.nix index 013b6bdf36316..6c25495b03418 100644 --- a/pkgs/applications/video/jellyfin-media-player/default.nix +++ b/pkgs/applications/video/jellyfin-media-player/default.nix @@ -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"; }; From babfed05cc9bf43ee57b7cfae3d459a1b9e817cd Mon Sep 17 00:00:00 2001 From: Nicolas Benes Date: Tue, 8 Oct 2024 21:21:09 +0200 Subject: [PATCH 04/10] howard-hinnant-date: enable for Windows --- .../development/libraries/howard-hinnant-date/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/howard-hinnant-date/default.nix b/pkgs/development/libraries/howard-hinnant-date/default.nix index 953dd472210a7..3f7210df56f73 100644 --- a/pkgs/development/libraries/howard-hinnant-date/default.nix +++ b/pkgs/development/libraries/howard-hinnant-date/default.nix @@ -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 header"; homepage = "https://github.com/HowardHinnant/date"; - platforms = platforms.unix; + platforms = with platforms; unix ++ windows; maintainers = with maintainers; [ r-burns ]; }; } From ecdcdeb29df5f2744ebcb7cfdc3078790dc312a8 Mon Sep 17 00:00:00 2001 From: dr56ekgbb Date: Thu, 10 Oct 2024 02:47:10 +0800 Subject: [PATCH 05/10] waveterm: add update script --- pkgs/by-name/wa/waveterm/package.nix | 42 +++++++++++++++------------- pkgs/by-name/wa/waveterm/update.sh | 25 +++++++++++++++++ 2 files changed, 48 insertions(+), 19 deletions(-) create mode 100755 pkgs/by-name/wa/waveterm/update.sh diff --git a/pkgs/by-name/wa/waveterm/package.nix b/pkgs/by-name/wa/waveterm/package.nix index cc1053d58fe21..03b8fd2c0732c 100644 --- a/pkgs/by-name/wa/waveterm/package.nix +++ b/pkgs/by-name/wa/waveterm/package.nix @@ -29,35 +29,36 @@ wrapGAppsHook3, udev, libGL, + gitUpdater, }: let - inherit (stdenv.hostPlatform) system; - throwSystem = throw "Unsupported system: ${system}"; - pname = "waveterm"; version = "0.8.8"; - 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 = fetchurl { - url = "https://github.com/wavetermdev/waveterm/releases/download/v${version}/${suffix}"; - hash = - { + 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-hRpJTFVoBQZyJD06FTRbBPj/1DlYlDWPRjJ1IKeK7Cs="; aarch64-linux = "sha256-T3VqsoHhPYYrAe/dEd0SUH+G4jpHjKpJTrFy8/AgoKI="; x86_64-darwin = "sha256-UlyNl2Qu59L4hnK8rTeUV30YVD45L7ub5SP8f97aJrw="; aarch64-darwin = "sha256-cP+z8DQsNBJc3p57xQdGqqq7jvYcRQRIa+P+6kD3eCc="; - } - .${system} or throwSystem; - }; + }; + in + fetchurl { + url = "https://github.com/wavetermdev/waveterm/releases/download/v${version}/${suffix}"; + inherit hash; + }; + + passthru.updateScript = ./update.sh; desktopItems = [ (makeDesktopItem { @@ -112,6 +113,8 @@ let src desktopItems unpackPhase + meta + passthru ; nativeBuildInputs = [ @@ -172,6 +175,7 @@ let src unpackPhase meta + passthru ; nativeBuildInputs = [ diff --git a/pkgs/by-name/wa/waveterm/update.sh b/pkgs/by-name/wa/waveterm/update.sh new file mode 100755 index 0000000000000..7950a65e8dfa6 --- /dev/null +++ b/pkgs/by-name/wa/waveterm/update.sh @@ -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 From 0e9589b19ec3854978a14b603ce629b5ecf1b193 Mon Sep 17 00:00:00 2001 From: dr56ekgbb Date: Thu, 10 Oct 2024 05:50:55 +0800 Subject: [PATCH 06/10] waveterm: 0.8.8 -> 0.8.9 --- pkgs/by-name/wa/waveterm/package.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/wa/waveterm/package.nix b/pkgs/by-name/wa/waveterm/package.nix index 03b8fd2c0732c..af588aa2b97fe 100644 --- a/pkgs/by-name/wa/waveterm/package.nix +++ b/pkgs/by-name/wa/waveterm/package.nix @@ -29,12 +29,11 @@ wrapGAppsHook3, udev, libGL, - gitUpdater, }: let pname = "waveterm"; - version = "0.8.8"; + version = "0.8.9"; src = let @@ -47,10 +46,10 @@ let aarch64-darwin = "Wave-darwin-arm64-${version}.zip"; }; hash = selectSystem { - 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="; + x86_64-linux = "sha256-C3i/NGMctc8DwR7b7ec4gq9VClvehQ0wuovH++EPPqE="; + aarch64-linux = "sha256-iNCvDGLa5pe19d1GWZ2SZ29DZ1h7T80OK7zAs9hHhAQ="; + x86_64-darwin = "sha256-SaUoW4pnSFJsUioNfXukZGc5j0+2yyZrydNOO6oqKyo="; + aarch64-darwin = "sha256-wNiLtriTL5Ohcma8Sop3stsqKLJyUpHihoMlylGxTRI="; }; in fetchurl { From 3e4460083ead1e307481991862b72533855ecac2 Mon Sep 17 00:00:00 2001 From: Ingo Reitz <9l@9lo.re> Date: Thu, 10 Oct 2024 20:53:46 +0200 Subject: [PATCH 07/10] vscode: 1.94.1 -> 1.94.2 --- pkgs/applications/editors/vscode/vscode.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index c6a7eff1d835b..1c12abb14780a 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -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"; }; }; From e5c73a5dbd60e6e17d8dbecd235a75cc564d3d8f Mon Sep 17 00:00:00 2001 From: aucub <78630225+aucub@users.noreply.github.com> Date: Thu, 10 Oct 2024 19:36:08 +0000 Subject: [PATCH 08/10] waveterm: 0.8.9 -> 0.8.10 --- pkgs/by-name/wa/waveterm/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/wa/waveterm/package.nix b/pkgs/by-name/wa/waveterm/package.nix index af588aa2b97fe..9d13d24abdc86 100644 --- a/pkgs/by-name/wa/waveterm/package.nix +++ b/pkgs/by-name/wa/waveterm/package.nix @@ -33,7 +33,7 @@ let pname = "waveterm"; - version = "0.8.9"; + version = "0.8.10"; src = let @@ -46,10 +46,10 @@ let aarch64-darwin = "Wave-darwin-arm64-${version}.zip"; }; hash = selectSystem { - x86_64-linux = "sha256-C3i/NGMctc8DwR7b7ec4gq9VClvehQ0wuovH++EPPqE="; - aarch64-linux = "sha256-iNCvDGLa5pe19d1GWZ2SZ29DZ1h7T80OK7zAs9hHhAQ="; - x86_64-darwin = "sha256-SaUoW4pnSFJsUioNfXukZGc5j0+2yyZrydNOO6oqKyo="; - aarch64-darwin = "sha256-wNiLtriTL5Ohcma8Sop3stsqKLJyUpHihoMlylGxTRI="; + 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 { From ae5481883dbb98f7276969849ec42110a26c0f5d Mon Sep 17 00:00:00 2001 From: oddlama Date: Fri, 11 Oct 2024 02:30:58 +0200 Subject: [PATCH 09/10] nixos/stalwart-mail: fix issue where webadmin interface disappears after some time --- nixos/modules/services/mail/stalwart-mail.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/services/mail/stalwart-mail.nix b/nixos/modules/services/mail/stalwart-mail.nix index aabe46d607a8c..9985e49067a94 100644 --- a/nixos/modules/services/mail/stalwart-mail.nix +++ b/nixos/modules/services/mail/stalwart-mail.nix @@ -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 From ffc65adb0af066405f3c873450a4068f734e25da Mon Sep 17 00:00:00 2001 From: Emily Date: Fri, 11 Oct 2024 02:44:10 +0100 Subject: [PATCH 10/10] OWNERS: reference the ACME team directly MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We can finally stop leaving @m1cr0man out thanks to 🎉 --- ci/OWNERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/OWNERS b/ci/OWNERS index 7c775d469baa3..859233655059b 100644 --- a/ci/OWNERS +++ b/ci/OWNERS @@ -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