interdiff of round #1 and #0 · pull #112 · freshlybakedca.ke/patisserie

ERROR

packetmix/homes/catppuccin/catppuccin.nix

Failed to calculate interdiff for this file.

ERROR

packetmix/homes/coded/games.nix

Failed to calculate interdiff for this file.

ERROR

packetmix/homes/niri/niri.nix

Failed to calculate interdiff for this file.

ERROR

packetmix/homes/niri/quickshell.nix

Failed to calculate interdiff for this file.

ERROR

packetmix/npins/default.nix

Failed to calculate interdiff for this file.

ERROR

packetmix/npins/sources.json

Failed to calculate interdiff for this file.

ERROR

packetmix/packages/OpenLinkHub/default.nix

Failed to calculate interdiff for this file.

ERROR

packetmix/packages/default.nix

Failed to calculate interdiff for this file.

ERROR

packetmix/packages/vs-launcher/default.nix

Failed to calculate interdiff for this file.

ERROR

packetmix/systems/common/inputs.nix

Failed to calculate interdiff for this file.

ERROR

packetmix/systems/corsair/openlinkhub.nix

Failed to calculate interdiff for this file.

ERROR

packetmix/systems/espanso/espanso.nix

Failed to calculate interdiff for this file.

ERROR

packetmix/systems/espanso/nixpkgs-328890--espanso-capdacoverride.nix

Failed to calculate interdiff for this file.

ERROR

packetmix/systems/espanso/nixpkgs-328890--espanso-capdacoverride/espanso-capdacoverride.nix

Failed to calculate interdiff for this file.

ERROR

packetmix/systems/espanso/nixpkgs-328890--espanso-capdacoverride/wrapper-lib.c

Failed to calculate interdiff for this file.

ERROR

packetmix/systems/freshlybakedcake+personal/kanidm.nix

Failed to calculate interdiff for this file.

ERROR

packetmix/systems/midnight/spindle.nix

Failed to calculate interdiff for this file.

ERROR

packetmix/systems/niri/niri.nix

Failed to calculate interdiff for this file.

ERROR

packetmix/systems/shorthair/vr.nix

Failed to calculate interdiff for this file.

ERROR

packetmix/systems/teal/kanidm.nix

Failed to calculate interdiff for this file.

ERROR

packetmix/systems/teal/pds.nix

Failed to calculate interdiff for this file.

NEW

packetmix/modules/nilla-home/nixos.nix

··· 117 117 homeName: home: 118 118 let 119 119 homeHasHomeManager = !(builtins.isNull home.home-manager); 120 - homeIsValidForSystem = home ? result.${value.pkgs.system}; 120 + homeIsValidForSystem = home ? result.${value.pkgs.stdenv.hostPlatform.system}; 121 121 in 122 122 [ 123 123 { ··· 126 126 } 127 127 { 128 128 assertion = !homeHasHomeManager || !hasNixpkgs || homeIsValidForSystem; 129 - message = "You've asked for the home \"${homeName}\" to be activated in the NixOS system \"${name}\", but it isn't valid for \"${value.pkgs.system}\" systems."; 129 + message = "You've asked for the home \"${homeName}\" to be activated in the NixOS system \"${name}\", but it isn't valid for \"${value.pkgs.stdenv.hostPlatform.system}\" systems."; 130 130 } 131 131 ] 132 132 ) value.homes) ··· 136 136 homeName: home: 137 137 let 138 138 homeHasHomeManager = !(builtins.isNull home.home-manager); 139 - homeIsValidForSystem = home ? result.${value.pkgs.system}; 139 + homeIsValidForSystem = home ? result.${value.pkgs.stdenv.hostPlatform.system}; 140 140 in 141 141 if homeHasHomeManager && hasNixpkgs && homeIsValidForSystem then 142 142 let

NEW

packetmix/nilla.nix

··· 46 46 systems = [ "x86_64-linux" ]; 47 47 48 48 package = 49 - { system, stdenv }: 49 + { stdenv }: 50 50 stdenv.mkDerivation { 51 51 name = "all-homes"; 52 52 ··· 57 57 '' 58 58 + (builtins.concatStringsSep "\n" ( 59 59 config.lib.attrs.mapToList ( 60 - name: value: ''ln -s "${value.result.${system}.activationPackage}" "$out/${name}"'' 61 - ) (config.lib.attrs.filter (_: value: value.result ? ${system}) config.homes) 60 + name: value: 61 + ''ln -s "${value.result.${stdenv.hostPlatform.system}.activationPackage}" "$out/${name}"'' 62 + ) (config.lib.attrs.filter (_: value: value.result ? ${stdenv.hostPlatform.system}) config.homes) 62 63 )); 63 64 }; 64 65 }; ··· 80 81 ); 81 82 }; 82 83 83 - packages.reuse = { 84 - systems = [ "x86_64-linux" ]; 85 - 86 - package = 87 - { reuse }: 88 - reuse.overrideAttrs ( 89 - { 90 - patches ? [ ], 91 - ... 92 - }: 93 - { 94 - patches = patches ++ [ ./patches/reuse/1191-correct-invocation-for-jujutsu-file-listing.patch ]; 95 - } 96 - ); 97 - }; 98 - 99 84 # With a package set defined, we can create a shell. 100 85 shells.default = { 101 86 # Declare what systems the shell can be used on. ··· 105 90 shell = 106 91 { 107 92 pkgs, 108 - system, 93 + stdenv, 109 94 mkShell, 110 95 kdePackages, 96 + reuse, 111 97 ... 112 98 }: 113 99 mkShell { ··· 118 104 (builtins.concatStringsSep ":") 119 105 ] 120 106 [ 121 - config.inputs.nixos-unstable.result.${system}.quickshell 107 + config.inputs.nixos-unstable.result.${stdenv.hostPlatform.system}.quickshell 122 108 kdePackages.qtdeclarative 123 109 ]; 124 110 125 111 packages = [ 126 - config.inputs.nilla-cli.result.packages.nilla-cli.result.${system} 127 - config.inputs.nilla-home.result.packages.nilla-home.result.${system} 128 - config.inputs.nilla-nixos.result.packages.nilla-nixos.result.${system} 129 - config.inputs.nixos-unstable.result.${system}.quickshell 130 - config.inputs.nixpkgs.result.${system}.deadnix 131 - config.packages.nilla-fmt.result.${system} 132 - config.packages.treefmt.result.${system} 133 - (config.inputs.npins.result { inherit pkgs system; }) 112 + config.inputs.nilla-cli.result.packages.nilla-cli.result.${stdenv.hostPlatform.system} 113 + config.inputs.nilla-home.result.packages.nilla-home.result.${stdenv.hostPlatform.system} 114 + config.inputs.nilla-nixos.result.packages.nilla-nixos.result.${stdenv.hostPlatform.system} 115 + config.inputs.nixos-unstable.result.${stdenv.hostPlatform.system}.quickshell 116 + config.inputs.nixpkgs.result.${stdenv.hostPlatform.system}.deadnix 117 + config.packages.nilla-fmt.result.${stdenv.hostPlatform.system} 118 + config.packages.treefmt.result.${stdenv.hostPlatform.system} 119 + (config.inputs.npins.result { 120 + inherit pkgs; 121 + inherit (stdenv.hostPlatform) system; 122 + }) 134 123 kdePackages.qtdeclarative 135 - config.packages.reuse.result.${system} 124 + reuse 136 125 ]; 137 126 }; 138 127 };

NEW

packetmix/packages/beancount-beancount_share/default.nix

··· 8 8 systems = [ "x86_64-linux" ]; 9 9 package = 10 10 { 11 - system, 11 + stdenv, 12 12 lib, 13 13 python3, 14 14 }: ··· 25 25 26 26 propagatedBuildInputs = [ 27 27 python3.pkgs.beancount 28 - config.packages.beancount-beancount_plugin_utils.result.${system} 28 + config.packages.beancount-beancount_plugin_utils.result.${stdenv.hostPlatform.system} 29 29 ]; 30 30 31 31 buildInputs = [

NEW

packetmix/packages/beancount-smart_importer/default.nix

··· 31 31 32 32 buildInputs = [ 33 33 python3.pkgs.setuptools 34 - python3.pkgs.setuptools_scm 34 + python3.pkgs.setuptools-scm 35 35 ]; 36 36 37 37 meta = {

NEW

packetmix/packages/bluesky-pds/default.nix

··· 35 35 pnpmDeps = pnpm_9.fetchDeps { 36 36 inherit (finalAttrs) pname version src; 37 37 fetcherVersion = 2; 38 - hash = "sha256-3Q3k2zTAyJHWunOLU/CuCaNljmPf9r3ONUjZ/0vno8s="; 38 + hash = "sha256-9FYnpZ9wCC2JdpS/AGb8jrURrkrbMi5DTFvZVi7MYPc="; 39 39 }; 40 40 41 41 buildPhase = '' ··· 78 78 systems = [ "x86_64-linux" ]; 79 79 package = 80 80 { 81 - system, 81 + stdenv, 82 82 findutils, 83 83 ... 84 84 }: 85 - config.inputs.nixos-unstable.result.${system}.bluesky-pds.overrideAttrs { 85 + config.inputs.nixos-unstable.result.${stdenv.hostPlatform.system}.bluesky-pds.overrideAttrs { 86 86 postBuild = '' 87 87 atproto_pds_dir=$(${findutils}/bin/find node_modules/.pnpm -maxdepth 1 -name "@atproto+pds@*") 88 88 rm -r $atproto_pds_dir 89 89 mkdir -p $atproto_pds_dir 90 - ln -s ${config.packages.bluesky-atproto-pds.result.${system}}/lib $atproto_pds_dir/node_modules 90 + ln -s ${ 91 + config.packages.bluesky-atproto-pds.result.${stdenv.hostPlatform.system} 92 + }/lib $atproto_pds_dir/node_modules 91 93 ''; 92 94 }; 93 95 };

NEW

packetmix/packages/collabora-gtimelog/default.nix

··· 38 38 gtk3 39 39 harfbuzz 40 40 libsecret 41 - libsoup_2_4 41 + (libsoup_2_4.overrideAttrs { 42 + meta.knownVulnerabilities = [ ]; # FIXME: update libsoup to _3 43 + }) 42 44 pango 43 45 ] 44 46 }"

NEW

packetmix/packages/headscale/default.nix

··· 14 14 ... 15 15 }: 16 16 let 17 - vendorHash = "sha256-GUIzlPRsyEq1uSTzRNds9p1uVu4pTeH5PAxrJ5Njhis="; 17 + vendorHash = "sha256-VOi4PGZ8I+2MiwtzxpKc/4smsL5KcH/pHVkjJfAFPJ0="; 18 18 commitHash = config.inputs.headscale.src.revision; 19 19 headscaleVersion = commitHash; 20 20 in

NEW

packetmix/packages/treefmt/default.nix

··· 29 29 systems = [ "x86_64-linux" ]; 30 30 31 31 package = 32 - { stdenv, system }: 32 + { stdenv }: 33 33 stdenv.mkDerivation { 34 34 name = "nilla-fmt"; 35 35 36 - src = config.packages.treefmt.result.${system}; 36 + src = config.packages.treefmt.result.${stdenv.hostPlatform.system}; 37 37 38 38 dontBuild = true; 39 39

NEW

packetmix/patches/reuse/1191-correct-invocation-for-jujutsu-file-listing.patch

··· 1 - From 44d6d1a802e92c4837348329b32f1d0a158b5c30 Mon Sep 17 00:00:00 2001 2 - From: Jonas Fierlings <fnoegip@gmail.com> 3 - Date: Mon, 9 Jun 2025 18:28:42 +0200 4 - Subject: [PATCH] Correct invocation for jujutsu file listing 5 - 6 - The `jj files` command was deprecated in jujutsu 0.19.0, and removed in 7 - jujutsu 0.26.0 (released in february of 2025). The fix is to use the new 8 - `jj file list` command instead. 9 - --- 10 - src/reuse/vcs.py | 29 ++++++++++++++++++++++++++++- 11 - 1 files changed, 28 insertions(+), 1 deletion(-) 12 - 13 - diff --git a/src/reuse/vcs.py b/src/reuse/vcs.py 14 - index 8c1cb5c8e..63b220048 100644 15 - --- a/src/reuse/vcs.py 16 - +++ b/src/reuse/vcs.py 17 - @@ -2,6 +2,7 @@ 18 - # SPDX-FileCopyrightText: 2020 John Mulligan <jmulligan@redhat.com> 19 - # SPDX-FileCopyrightText: 2023 Markus Haug <korrat@proton.me> 20 - # SPDX-FileCopyrightText: 2024 Skyler Grey <sky@a.starrysky.fyi> 21 - +# SPDX-FileCopyrightText: 2025 Jonas Fierlings <fnoegip@gmail.com> 22 - # SPDX-FileCopyrightText: © 2020 Liferay, Inc. <https://liferay.com> 23 - # 24 - # SPDX-License-Identifier: GPL-3.0-or-later 25 - @@ -261,11 +262,37 @@ def _find_all_tracked_files(self) -> set[Path]: 26 - """ 27 - Return a set of all files tracked in the current jj revision 28 - """ 29 - - command = [str(self.EXE), "files"] 30 - + version = self._version() 31 - + # TODO: Remove the version check once most distributions ship jj 0.19.0 32 - + # or higher. 33 - + if version is None or version >= (0, 19, 0): 34 - + command = [str(self.EXE), "file", "list"] 35 - + else: 36 - + command = [str(self.EXE), "files"] 37 - result = execute_command(command, _LOGGER, cwd=self.root) 38 - all_files = result.stdout.decode("utf-8").split("\n") 39 - return {Path(file_) for file_ in all_files if file_} 40 - 41 - + def _version(self) -> Optional[tuple[int, int, int]]: 42 - + """ 43 - + Returns the (major, minor, patch) version of the jujutsu executable, 44 - + or None if the version components cannot be determined. 45 - + """ 46 - + result = execute_command( 47 - + [str(self.EXE), "--version"], _LOGGER, cwd=self.root 48 - + ) 49 - + lines = result.stdout.decode("utf-8").split("\n") 50 - + # Output has the form `jj major.minor.patch[-hash]\n`. 51 - + try: 52 - + line = lines[0] 53 - + version = line.split(" ")[-1] 54 - + without_hash = version.split("-")[0] 55 - + components = without_hash.split(".") 56 - + return (int(components[0]), int(components[1]), int(components[2])) 57 - + except (IndexError, ValueError) as e: 58 - + _LOGGER.debug("unable to parse jj version: %s", e) 59 - + return None 60 - + 61 - def is_ignored(self, path: StrPath) -> bool: 62 - path = relative_from_root(path, self.root) 63 -

NEW

packetmix/patches/reuse/1191-correct-invocation-for-jujutsu-file-listing.patch.license

··· 1 - SPDX-FileCopyrightText: 2025 Jonas Fierlings <fnoegip@gmail.com> 2 - 3 - SPDX-License-Identifier: GPL-3.0-or-later

NEW

packetmix/systems/nix-serve/cache.nix

··· 2 2 # 3 3 # SPDX-License-Identifier: MIT 4 4 5 + { pkgs, ... }: 5 6 { 6 7 networking.firewall.allowedTCPPorts = [ 1025 ]; 7 8 8 9 services.nix-serve = { 9 10 enable = true; 11 + package = pkgs.nix-serve-ng; 12 + 10 13 secretKeyFile = "/secrets/cache/signer.key"; 11 14 12 15 bindAddress = "0.0.0.0";

NEW

packetmix/systems/redhead/android.nix

··· 4 4 5 5 { pkgs, ... }: 6 6 { 7 - services.udev.packages = [ 8 - pkgs.android-udev-rules 9 - ]; 10 7 users.users.minion.extraGroups = [ "adbusers" ]; 11 8 }

NEW

packetmix/systems/redhead/nextcloud.nix

··· 18 18 19 19 hostName = "nextcloud.dev.redhead.starrysky.fyi"; 20 20 21 - package = pkgs.nextcloud31; 21 + package = pkgs.nextcloud32; 22 22 23 23 poolSettings = { 24 24 pm = "dynamic";