pyrox.dev
+20
-20
nixos/modules/misc/nixpkgs.nix
+20
-20
nixos/modules/misc/nixpkgs.nix
······defaultText = lib.literalExpression ''(import "''${nixos}/../lib").lib.systems.examples.aarch64-multiplatform'';······defaultText = lib.literalExpression ''(import "''${nixos}/../lib").lib.systems.examples.aarch64-multiplatform'';······-(opt.hostPlatform.isDefined -> builtins.isAttrs cfg.buildPlatform -> !(cfg.buildPlatform ? parsed))-&& (opt.hostPlatform.isDefined -> builtins.isAttrs cfg.hostPlatform -> !(cfg.hostPlatform ? parsed))-Passing fully elaborated systems to `nixpkgs.localSystem`, `nixpkgs.crossSystem`, `nixpkgs.buildPlatform`-or `nixpkgs.hostPlatform` will break composability of package sets in nixpkgs. For example, pkgs.pkgsStatic
······+type = lib.types.either lib.types.str lib.types.attrs; # TODO utilize lib.systems.parsedPlatformdefaultText = lib.literalExpression ''(import "''${nixos}/../lib").lib.systems.examples.aarch64-multiplatform'';···+type = lib.types.either lib.types.str lib.types.attrs; # TODO utilize lib.systems.parsedPlatform+cfg.hostPlatform # make identical, so that `==` equality works; see https://github.com/NixOS/nixpkgs/issues/278001···defaultText = lib.literalExpression ''(import "''${nixos}/../lib").lib.systems.examples.aarch64-multiplatform'';······
+19
-6
nixos/modules/misc/nixpkgs/read-only.nix
+19
-6
nixos/modules/misc/nixpkgs/read-only.nix
······
······
+1
-1
nixos/modules/programs/chromium.nix
+1
-1
nixos/modules/programs/chromium.nix
+8
-6
nixos/modules/services/web-apps/homebox.nix
+8
-6
nixos/modules/services/web-apps/homebox.nix
···-HBOX_STORAGE_SQLITE_URL = "/var/lib/homebox/data/homebox.db?_pragma=busy_timeout=999&_pragma=journal_mode=WAL&_fk=1";The homebox configuration as Environment variables. For definitions and available options see the upstream
···+HBOX_STORAGE_SQLITE_URL = "/var/lib/homebox/data/homebox.db?_pragma=busy_timeout=999&_pragma=journal_mode=WAL&_fk=1";The homebox configuration as Environment variables. For definitions and available options see the upstream
+2
-6
nixos/modules/virtualisation/nixos-containers.nix
+2
-6
nixos/modules/virtualisation/nixos-containers.nix
···-} else { localSystem = lib.defaultTo host.config.nixpkgs.localSystem host.config.nixpkgs.crossSystem; }
+2
-2
nixos/tests/appliance-repart-image-verity-store.nix
+2
-2
nixos/tests/appliance-repart-image-verity-store.nix
······
······
+2
-2
nixos/tests/appliance-repart-image.nix
+2
-2
nixos/tests/appliance-repart-image.nix
······
······
+2
-2
pkgs/applications/misc/rofi/wayland.nix
+2
-2
pkgs/applications/misc/rofi/wayland.nix
···
···
+2
-2
pkgs/by-name/hi/hifile/package.nix
+2
-2
pkgs/by-name/hi/hifile/package.nix
+2
-2
pkgs/by-name/li/limesurvey/package.nix
+2
-2
pkgs/by-name/li/limesurvey/package.nix
···
···
+3
-3
pkgs/by-name/op/open-webui/package.nix
+3
-3
pkgs/by-name/op/open-webui/package.nix
···
···
+5
-3
pkgs/by-name/pm/pmccabe/package.nix
+5
-3
pkgs/by-name/pm/pmccabe/package.nix
···
-10
pkgs/by-name/rt/rtfm/enable-write-permissions.patch
-10
pkgs/by-name/rt/rtfm/enable-write-permissions.patch
···
···
-39
pkgs/by-name/rt/rtfm/make.patch
-39
pkgs/by-name/rt/rtfm/make.patch
···-install -D -m 0644 data/io.github.hugopl.rtfm.desktop $(DESTDIR)$(PREFIX)/share/applications/io.github.hugopl.rtfm.desktop-install -D -m 0644 data/icons/hicolor/scalable/apps/io.github.hugopl.rtfm.svg $(DESTDIR)$(PREFIX)/share/icons/hicolor/scalable/apps/io.github.hugopl.rtfm.svg-install -D -m644 data/io.github.hugopl.rtfm.gschema.xml $(DESTDIR)$(PREFIX)/share/glib-2.0/schemas/io.github.hugopl.rtfm.gschema.xml
···
+79
-47
pkgs/by-name/rt/rtfm/package.nix
+79
-47
pkgs/by-name/rt/rtfm/package.nix
······---replace-fail 'basedir = Path.new("/usr/share/doc")' 'basedir = Path.new(ARGV[0]? || "gtk-docs")'······
······+--replace-fail 'basedir = Path.new("/usr/share/doc")' 'basedir = Path.new(ARGV[0]? || "${gtk-doc}/share/doc")' \+--replace-fail 'doc_source = Path.new(ARGV[0]? || "/usr/share/doc/crystal/api")' 'doc_source = Path.new(ARGV[0]? || "${crystal_1_14}/share/doc/crystal/api")'+--replace-fail 'File.copy(original, real_dest)' 'File.copy(original, real_dest); File.chmod(real_dest, 0o600)'······
+7
-7
pkgs/by-name/rt/rtfm/shards.nix
+7
-7
pkgs/by-name/rt/rtfm/shards.nix
······
······
+2
-2
pkgs/by-name/si/sing-box/package.nix
+2
-2
pkgs/by-name/si/sing-box/package.nix
···
···
+3
-3
pkgs/by-name/sy/syn2mas/package.nix
+3
-3
pkgs/by-name/sy/syn2mas/package.nix
···
···
+4
-2
pkgs/by-name/th/the-powder-toy/package.nix
+4
-2
pkgs/by-name/th/the-powder-toy/package.nix
···
···
pkgs/by-name/vi/vistafonts-chs/no-op.conf
pkgs/by-name/vi/vista-fonts-chs/no-op.conf
pkgs/by-name/vi/vistafonts-chs/no-op.conf
pkgs/by-name/vi/vista-fonts-chs/no-op.conf
+9
-1
pkgs/by-name/vi/vistafonts-chs/package.nix
pkgs/by-name/vi/vista-fonts-chs/package.nix
+9
-1
pkgs/by-name/vi/vistafonts-chs/package.nix
pkgs/by-name/vi/vista-fonts-chs/package.nix
···url = "https://web.archive.org/web/20161221192937if_/http://download.microsoft.com/download/d/6/e/d6e2ff26-5821-4f35-a18b-78c963b1535d/VistaFont_CHS.EXE";···
···url = "https://web.archive.org/web/20161221192937if_/http://download.microsoft.com/download/d/6/e/d6e2ff26-5821-4f35-a18b-78c963b1535d/VistaFont_CHS.EXE";···
pkgs/by-name/vi/vistafonts-cht/no-op.conf
pkgs/by-name/vi/vista-fonts-cht/no-op.conf
pkgs/by-name/vi/vistafonts-cht/no-op.conf
pkgs/by-name/vi/vista-fonts-cht/no-op.conf
+13
-5
pkgs/by-name/vi/vistafonts-cht/package.nix
pkgs/by-name/vi/vista-fonts-cht/package.nix
+13
-5
pkgs/by-name/vi/vistafonts-cht/package.nix
pkgs/by-name/vi/vista-fonts-cht/package.nix
···url = "https://download.microsoft.com/download/7/6/b/76bd7a77-be02-47f3-8472-fa1de7eda62f/VistaFont_CHT.EXE";···description = "TrueType fonts from Microsoft Windows Vista For Traditional Chinese (Microsoft JhengHei)";
···url = "https://download.microsoft.com/download/7/6/b/76bd7a77-be02-47f3-8472-fa1de7eda62f/VistaFont_CHT.EXE";···description = "TrueType fonts from Microsoft Windows Vista For Traditional Chinese (Microsoft JhengHei)";
pkgs/by-name/vi/vistafonts/no-op.conf
pkgs/by-name/vi/vista-fonts/no-op.conf
pkgs/by-name/vi/vistafonts/no-op.conf
pkgs/by-name/vi/vista-fonts/no-op.conf
+9
-1
pkgs/by-name/vi/vistafonts/package.nix
pkgs/by-name/vi/vista-fonts/package.nix
+9
-1
pkgs/by-name/vi/vistafonts/package.nix
pkgs/by-name/vi/vista-fonts/package.nix
······
······
+4
pkgs/by-name/we/weblate/package.nix
+4
pkgs/by-name/we/weblate/package.nix
+2
-2
pkgs/development/python-modules/rapidfuzz/default.nix
+2
-2
pkgs/development/python-modules/rapidfuzz/default.nix
······
······
+3
-3
pkgs/servers/irc/solanum/default.nix
+3
-3
pkgs/servers/irc/solanum/default.nix
···
···
-128
pkgs/test/top-level/stage.nix
-128
pkgs/test/top-level/stage.nix
···-&& discardEvaluationErrors (pkgsCross.ppc64-musl.${set}.stdenv.hostPlatform.gcc.abi == "elfv2")-builtins.elem "trivialautovarinit" pkgs.pkgsExtraHardening.${set}.stdenv.cc.defaultHardeningFlags-# TODO: unexpected argument 'bintools' - uncomment once https://github.com/NixOS/nixpkgs/pull/331011 is done
···
+3
pkgs/top-level/aliases.nix
+3
pkgs/top-level/aliases.nix
···viper4linux-gui = throw "'viper4linux-gui' was removed as it is broken and not maintained upstream"; # Added 2024-12-16viper4linux = throw "'viper4linux' was removed as it is broken and not maintained upstream"; # Added 2024-12-16virtscreen = throw "'virtscreen' has been removed, as it was broken and unmaintained"; # Added 2024-10-17
···viper4linux-gui = throw "'viper4linux-gui' was removed as it is broken and not maintained upstream"; # Added 2024-12-16viper4linux = throw "'viper4linux' was removed as it is broken and not maintained upstream"; # Added 2024-12-16virtscreen = throw "'virtscreen' has been removed, as it was broken and unmaintained"; # Added 2024-10-17
+3
-3
pkgs/top-level/all-packages.nix
+3
-3
pkgs/top-level/all-packages.nix
···-if stdenv.buildPlatform == stdenv.hostPlatform then null else { config = lib.systems.parse.tripleFromSystem stdenv.hostPlatform; };···-config.nixpkgs.localSystem = lib.mkDefault ({ config = lib.systems.parse.tripleFromSystem stdenv.hostPlatform; });
······
+11
-12
pkgs/top-level/default.nix
+11
-12
pkgs/top-level/default.nix
·········
·········
+123
-83
pkgs/top-level/stage.nix
+123
-83
pkgs/top-level/stage.nix
···-(lib.systems.systemToAttrs (lib.defaultTo prevArgs.localSystem prevArgs.crossSystem or null)) // crossAttrs;-# For the case of "native cross", i.e. pkgsCross.gnu64 on a x86_64-linux system, we need to adjust **both**-newSystem = (lib.systems.systemToAttrs (lib.defaultTo prevArgs.localSystem prevArgs.crossSystem or null)) // hybridAttrs;-// lib.optionalAttrs (stdenv.hostPlatform == stdenv.buildPlatform) { localSystem = newSystem; }-nixpkgsFun (prevArgs: { crossSystem = (lib.systems.systemToAttrs (lib.defaultTo { } prevArgs.crossSystem or null)) // crossSystem; }))-config = lib.systems.parse.tripleFromSystem (makeLLVMParsedPlatform stdenv.hostPlatform.parsed);-pkgsMusl = if stdenv.hostPlatform.isLinux && stdenv.buildPlatform.is64bit then mkHybridPkgs "pkgsMusl" {-config = lib.systems.parse.tripleFromSystem (makeMuslParsedPlatform stdenv.hostPlatform.parsed);-pkgsi686Linux = if stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86 then mkHybridPkgs "pkgsi686Linux" {-config = lib.systems.parse.tripleFromSystem (lib.systems.elaborate "${stdenv.hostPlatform.parsed.cpu.name}-linux").parsed;-config = lib.systems.parse.tripleFromSystem (makeMuslParsedPlatform stdenv.hostPlatform.parsed);···
···+config = lib.systems.parse.tripleFromSystem (makeLLVMParsedPlatform stdenv.hostPlatform.parsed);+config = lib.systems.parse.tripleFromSystem (makeMuslParsedPlatform stdenv.hostPlatform.parsed);+# Otherwise, return a natively built linux package set for the current cpu architecture string.+gcc = lib.optionalAttrs (stdenv.hostPlatform.system == "powerpc64-linux") { abi = "elfv2"; } //···