···145145 else if final.isS390 && !final.isS390x then null
146146 else if final.isx86_64 then "x86_64"
147147 else if final.isx86 then "i386"
148148+ else if final.isMips64 then "mips64${lib.optionalString final.isLittleEndian "el"}"
148149 else final.uname.processor;
149150150151 # Name used by UEFI for architectures.
···5050 }
5151}
52525353+my $bucket;
53545454-# S3 setup.
5555-my $aws_access_key_id = $ENV{'AWS_ACCESS_KEY_ID'} or die "AWS_ACCESS_KEY_ID not set\n";
5656-my $aws_secret_access_key = $ENV{'AWS_SECRET_ACCESS_KEY'} or die "AWS_SECRET_ACCESS_KEY not set\n";
5555+if (not defined $ENV{DEBUG}) {
5656+ # S3 setup.
5757+ my $aws_access_key_id = $ENV{'AWS_ACCESS_KEY_ID'} or die "AWS_ACCESS_KEY_ID not set\n";
5858+ my $aws_secret_access_key = $ENV{'AWS_SECRET_ACCESS_KEY'} or die "AWS_SECRET_ACCESS_KEY not set\n";
57595858-my $s3 = Net::Amazon::S3->new(
5959- { aws_access_key_id => $aws_access_key_id,
6060- aws_secret_access_key => $aws_secret_access_key,
6161- retry => 1,
6262- host => "s3-eu-west-1.amazonaws.com",
6363- });
6060+ my $s3 = Net::Amazon::S3->new(
6161+ { aws_access_key_id => $aws_access_key_id,
6262+ aws_secret_access_key => $aws_secret_access_key,
6363+ retry => 1,
6464+ host => "s3-eu-west-1.amazonaws.com",
6565+ });
64666565-my $bucket = $s3->bucket("nixpkgs-tarballs") or die;
6767+ $bucket = $s3->bucket("nixpkgs-tarballs") or die;
6868+}
66696770my $doWrite = 0;
6871my $cacheFile = ($ENV{"HOME"} or die "\$HOME is not set") . "/.cache/nix/copy-tarballs";
+2
nixos/doc/manual/release-notes/rl-2305.section.md
···345345 `services.dnsmasq.extraConfig` will be deprecated when NixOS 22.11 reaches
346346 end of life.
347347348348+- `kube3d` has now been renamed to `k3d` since the 3d editor that originally took that name has been dropped from nixpkgs. `kube3d` will continue to work as an alias for now.
349349+348350- The `dokuwiki` service is now configured via `services.dokuwiki.sites.<name>.settings` attribute set; `extraConfig` has been removed.
349351 The `{aclUse,superUser,disableActions}` attributes have been renamed accordingly. `pluginsConfig` now only accepts an attribute set of booleans.
350352 Passing plain PHP is no longer possible.
+21-5
nixos/lib/test-driver/test_driver/machine.py
···77import os
88import queue
99import re
1010+import select
1011import shlex
1112import shutil
1213import socket
···99100 + "-blur 1x65535"
100101 )
101102102102- tess_args = f"-c debug_file=/dev/null --psm 11"
103103+ tess_args = "-c debug_file=/dev/null --psm 11"
103104104105 cmd = f"convert {magick_args} '{screenshot_path}' 'tiff:{screenshot_path}.tiff'"
105106 ret = subprocess.run(cmd, shell=True, capture_output=True)
···154155 # qemu options
155156 qemu_opts = (
156157 " -device virtio-serial"
158158+ # Note: virtconsole will map to /dev/hvc0 in Linux guests
157159 " -device virtconsole,chardev=shell"
158160 " -device virtio-rng-pci"
159161 " -serial stdio"
···524526 if timeout is not None:
525527 timeout_str = f"timeout {timeout}"
526528529529+ # While sh is bash on NixOS, this is not the case for every distro.
530530+ # We explicitely call bash here to allow for the driver to boot other distros as well.
527531 out_command = (
528528- f"{timeout_str} sh -c {shlex.quote(command)} | (base64 --wrap 0; echo)\n"
532532+ f"{timeout_str} bash -c {shlex.quote(command)} | (base64 --wrap 0; echo)\n"
529533 )
530534531535 assert self.shell
···719723 self.wait_for_unit(jobname)
720724721725 def connect(self) -> None:
726726+ def shell_ready(timeout_secs: int) -> bool:
727727+ """We sent some data from the backdoor service running on the guest
728728+ to indicate that the backdoor shell is ready.
729729+ As soon as we read some data from the socket here, we assume that
730730+ our root shell is operational.
731731+ """
732732+ (ready, _, _) = select.select([self.shell], [], [], timeout_secs)
733733+ return bool(ready)
734734+722735 if self.connected:
723736 return
724737···728741 assert self.shell
729742730743 tic = time.time()
731731- self.shell.recv(1024)
732732- # TODO: Timeout
744744+ # TODO: do we want to bail after a set number of attempts?
745745+ while not shell_ready(timeout_secs=30):
746746+ self.log("Guest root shell did not produce any data yet...")
747747+748748+ self.log(self.shell.recv(1024).decode())
733749 toc = time.time()
734750735751 self.log("connected to guest root shell")
···950966 Prepares the machine to be reconnected which is useful if the
951967 machine was started with `allow_reboot = True`
952968 """
953953- self.send_key(f"ctrl-alt-delete")
969969+ self.send_key("ctrl-alt-delete")
954970 self.connected = False
955971956972 def wait_for_x(self) -> None:
···483483 Compression settings to use for the squashfs nix store.
484484 '';
485485 example = "zstd -Xcompression-level 6";
486486+ type = types.str;
486487 };
487488488489 isoImage.edition = mkOption {
+15
nixos/modules/installer/netboot/netboot.nix
···88{
99 options = {
10101111+ netboot.squashfsCompression = mkOption {
1212+ default = with pkgs.stdenv.hostPlatform; "xz -Xdict-size 100% "
1313+ + lib.optionalString isx86 "-Xbcj x86"
1414+ # Untested but should also reduce size for these platforms
1515+ + lib.optionalString isAarch "-Xbcj arm"
1616+ + lib.optionalString (isPower && is32bit && isBigEndian) "-Xbcj powerpc"
1717+ + lib.optionalString (isSparc) "-Xbcj sparc";
1818+ description = lib.mdDoc ''
1919+ Compression settings to use for the squashfs nix store.
2020+ '';
2121+ example = "zstd -Xcompression-level 6";
2222+ type = types.str;
2323+ };
2424+1125 netboot.storeContents = mkOption {
1226 example = literalExpression "[ pkgs.stdenv ]";
1327 description = lib.mdDoc ''
···7791 # Create the squashfs image that contains the Nix store.
7892 system.build.squashfsStore = pkgs.callPackage ../../../lib/make-squashfs.nix {
7993 storeContents = config.netboot.storeContents;
9494+ comp = config.netboot.squashfsCompression;
8095 };
81968297
···4141 # This should be made configurable.
4242 #CHFN_RESTRICT frwh
43434444+ # The default crypt() method, keep in sync with the PAM default
4545+ ENCRYPT_METHOD YESCRYPT
4446 '';
45474648 mkSetuidRoot = source:
+1-1
nixos/modules/security/apparmor/includes.nix
···2222# some may even be completely useless.
2323config.security.apparmor.includes = {
2424 # This one is included by <tunables/global>
2525- # which is usualy included before any profile.
2525+ # which is usually included before any profile.
2626 "abstractions/tunables/alias" = ''
2727 alias /bin -> /run/current-system/sw/bin,
2828 alias /lib/modules -> /run/current-system/kernel/lib/modules,
+1-1
nixos/modules/security/tpm2.nix
···33 cfg = config.security.tpm2;
4455 # This snippet is taken from tpm2-tss/dist/tpm-udev.rules, but modified to allow custom user/groups
66- # The idea is that the tssUser is allowed to acess the TPM and kernel TPM resource manager, while
66+ # The idea is that the tssUser is allowed to access the TPM and kernel TPM resource manager, while
77 # the tssGroup is only allowed to access the kernel resource manager
88 # Therefore, if either of the two are null, the respective part isn't generated
99 udevRules = tssUser: tssGroup: ''
···7676 directory, which will be called postfix.nix and contains all exporter
7777 specific options and configuration:
7878 ```
7979- # nixpgs/nixos/modules/services/prometheus/exporters/postfix.nix
7979+ # nixpkgs/nixos/modules/services/prometheus/exporters/postfix.nix
8080 { config, lib, pkgs, options }:
81818282 with lib;
+1-1
nixos/modules/services/torrent/deluge.nix
···9393 `true`.
94949595 It does NOT apply to the daemon port nor the web UI port. To access those
9696- ports secuerly check the documentation
9696+ ports securely check the documentation
9797 <https://dev.deluge-torrent.org/wiki/UserGuide/ThinClient#CreateSSHTunnel>
9898 or use a VPN or configure certificates for deluge.
9999 '';
+1-1
nixos/modules/services/web-apps/matomo.md
···33Matomo is a real-time web analytics application. This module configures
44php-fpm as backend for Matomo, optionally configuring an nginx vhost as well.
5566-An automatic setup is not suported by Matomo, so you need to configure Matomo
66+An automatic setup is not supported by Matomo, so you need to configure Matomo
77itself in the browser-based Matomo setup.
8899## Database Setup {#module-services-matomo-database-setup}
···7272 };
73737474 config = lib.mkIf (cfg.enable || initrdCfg.enable) {
7575- # Always link the definitions into /etc so that they are also included in
7676- # the /nix/store of the sysroot during early userspace (i.e. while in the
7777- # initrd).
7878- environment.etc."repart.d".source = definitionsDirectory;
7979-8075 boot.initrd.systemd = lib.mkIf initrdCfg.enable {
8176 additionalUpstreamUnits = [
8277 "systemd-repart.service"
···8681 "${config.boot.initrd.systemd.package}/bin/systemd-repart"
8782 ];
88838484+ contents."/etc/repart.d".source = definitionsDirectory;
8585+8986 # Override defaults in upstream unit.
9087 services.systemd-repart = {
9191- # Unset the conditions as they cannot be met before activation because
9292- # the definition files are not stored in the expected locations.
9393- unitConfig.ConditionDirectoryNotEmpty = [
9494- " " # required to unset the previous value.
9595- ];
8888+ # systemd-repart tries to create directories in /var/tmp by default to
8989+ # store large temporary files that benefit from persistence on disk. In
9090+ # the initrd, however, /var/tmp does not provide more persistence than
9191+ # /tmp, so we re-use it here.
9292+ environment."TMPDIR" = "/tmp";
9693 serviceConfig = {
9797- # systemd-repart runs before the activation script. Thus we cannot
9898- # rely on them being linked in /etc already. Instead we have to
9999- # explicitly pass their location in the sysroot to the binary.
10094 ExecStart = [
10195 " " # required to unset the previous value.
9696+ # When running in the initrd, systemd-repart by default searches
9797+ # for definition files in /sysroot or /sysusr. We tell it to look
9898+ # in the initrd itself.
10299 ''${config.boot.initrd.systemd.package}/bin/systemd-repart \
103103- --definitions=/sysroot${definitionsDirectory} \
100100+ --definitions=/etc/repart.d \
104101 --dry-run=no
105102 ''
106103 ];
107104 };
108108- # Because the initrd does not have the `initrd-usr-fs.target` the
109109- # upestream unit runs too early in the boot process, before the sysroot
110110- # is available. However, systemd-repart needs access to the sysroot to
111111- # find the definition files.
105105+ # systemd-repart needs to run after /sysroot (or /sysuser, but we don't
106106+ # have it) has been mounted because otherwise it cannot determine the
107107+ # device (i.e disk) to operate on. If you want to run systemd-repart
108108+ # without /sysroot, you have to explicitly tell it which device to
109109+ # operate on.
112110 after = [ "sysroot.mount" ];
113111 };
112112+ };
113113+114114+ environment.etc = lib.mkIf cfg.enable {
115115+ "repart.d".source = definitionsDirectory;
114116 };
115117116118 systemd = lib.mkIf cfg.enable {
···119121 ];
120122 };
121123 };
122122-123124}
+10-2
nixos/modules/testing/test-instrumentation.nix
···3636 while ! exec 2> /dev/${qemu-common.qemuSerialDevice}; do sleep 0.1; done
3737 echo "connecting to host..." >&2
3838 stty -F /dev/hvc0 raw -echo # prevent nl -> cr/nl conversion
3939- echo
4040- PS1= exec /bin/sh
3939+ # The following line is essential since it signals to
4040+ # the test driver that the shell is ready.
4141+ # See: the connect method in the Machine class.
4242+ echo "Spawning backdoor root shell..."
4343+ # Passing the terminal device makes bash run non-interactively.
4444+ # Otherwise we get errors on the terminal because bash tries to
4545+ # setup things like job control.
4646+ # Note: calling bash explicitely here instead of sh makes sure that
4747+ # we can also run non-NixOS guests during tests.
4848+ PS1= exec /usr/bin/env bash --norc /dev/hvc0
4149 '';
4250 serviceConfig.KillSignal = "SIGHUP";
4351 };
···11-{ lib, stdenv, fetchFromGitHub, spotify, xorg, runtimeShell }:
11+{ lib, stdenv, fetchFromGitHub, spotify, xorg, makeWrapper }:
22stdenv.mkDerivation {
33 pname = "spotifywm-unstable";
44 version = "2022-10-26";
···1010 sha256 = "sha256-AsXqcoqUXUFxTG+G+31lm45gjP6qGohEnUSUtKypew0=";
1111 };
12121313+ nativeBuildInputs = [ makeWrapper ];
1414+1315 buildInputs = [ xorg.libX11 ];
14161515- propagatedBuildInputs = [ spotify ];
1616-1717 installPhase = ''
1818- echo "#!${runtimeShell}" > spotifywm
1919- echo "LD_PRELOAD="$out/lib/spotifywm.so" ${spotify}/bin/spotify \$*" >> spotifywm
2020- install -Dm644 spotifywm.so $out/lib/spotifywm.so
2121- install -Dm755 spotifywm $out/bin/spotifywm
1818+ runHook preInstall
1919+2020+ mkdir -p $out/{bin,lib}
2121+ install -Dm644 spotifywm.so $out/lib/
2222+ ln -sf ${spotify}/bin/spotify $out/bin/spotify
2323+2424+ # wrap spotify to use spotifywm.so
2525+ wrapProgram $out/bin/spotify --set LD_PRELOAD "$out/lib/spotifywm.so"
2626+ # backwards compatibility for people who are using the "spotifywm" binary
2727+ ln -sf $out/bin/spotify $out/bin/spotifywm
2828+2929+ runHook postInstall
2230 '';
23312432 meta = with lib; {
···2634 description = "Wrapper around Spotify that correctly sets class name before opening the window";
2735 license = licenses.mit;
2836 platforms = platforms.linux;
2929- maintainers = with maintainers; [ jqueiroz ];
3737+ maintainers = with maintainers; [ jqueiroz the-argus ];
3038 };
3139}
+1-1
pkgs/applications/audio/vocal/default.nix
···8686 meta = with lib; {
8787 description = "The podcast client for the modern free desktop";
8888 longDescription = ''
8989- Vocal is a powerful, fast, and intuitive application that helps users find new podcasts, manage their libraries, and enjoy the best that indepedent audio and video publishing has to offer. Vocal features full support for both episode downloading and streaming, native system integration, iTunes store search and top 100 charts (with international results support), iTunes link parsing, OPML importing and exporting, and so much more. Plus, it has great smart features like automatically keeping your library clean from old files, and the ability to set custom skip intervals.
8989+ Vocal is a powerful, fast, and intuitive application that helps users find new podcasts, manage their libraries, and enjoy the best that independent audio and video publishing has to offer. Vocal features full support for both episode downloading and streaming, native system integration, iTunes store search and top 100 charts (with international results support), iTunes link parsing, OPML importing and exporting, and so much more. Plus, it has great smart features like automatically keeping your library clean from old files, and the ability to set custom skip intervals.
9090 '';
9191 homepage = "https://github.com/needle-and-thread/vocal";
9292 license = licenses.gpl3Plus;
···2424 keyboard between two or more computers.
25252626 Without the need for any external hardware, Synergy2 uses the TCP-IP
2727- protocol to share the resources, even between machines with diferent
2727+ protocol to share the resources, even between machines with different
2828 operating systems, such as Mac OS, Linux and Windows.
29293030 Remember to open port 24800 (used by synergys program) if you want to
···2727 '';
28282929 meta = with lib; {
3030- description = "Browser with unified devtools targeting responsability and acessibility";
3030+ description = "Browser with unified devtools targeting responsability and accessibility";
3131 longDescription = ''
3232 The stand-alone browser for ambitious developers that want to build responsive,
3333 accessible and performant websites in a fraction of the time it takes with other browsers.
···31313232 enableParallelBuilding = false; # Started making trouble with gcc-11
33333434- # Must do manualy becuase siesta does not do the regular
3434+ # Must do manually because siesta does not do the regular
3535 # ./configure; make; make install
3636 configurePhase = ''
3737 cd Obj
···2828 '';
29293030 meta = with lib;{
3131- description = "A tiny window manger for X11";
3131+ description = "A tiny window manager for X11";
3232 longDescription = ''
33333434 TinyWM is a tiny window manager that I created as an exercise in
+3-3
pkgs/build-support/cc-wrapper/default.nix
···364364 ''
365365 # this ensures that when clang passes -lgcc_s to lld (as it does
366366 # when building e.g. firefox), lld is able to find libgcc_s.so
367367- + lib.optionalString (gccForLibs?libgcc) ''
368368- echo "-L${gccForLibs.libgcc}/lib" >> $out/nix-support/cc-ldflags
369369- '')
367367+ + concatMapStrings (libgcc: ''
368368+ echo "-L${libgcc}/lib" >> $out/nix-support/cc-ldflags
369369+ '') (lib.toList (gccForLibs.libgcc or [])))
370370371371 ##
372372 ## General libc support
+1-1
pkgs/data/fonts/d2coding/default.nix
···2424 D2Coding is a monospace font developed by a Korean IT Company called Naver.
2525 Font is good for displaying both Korean characters and latin characters,
2626 as sometimes these two languages could share some similar strokes.
2727- Since verion 1.3, D2Coding font is officially supported by the font
2727+ Since version 1.3, D2Coding font is officially supported by the font
2828 creator, with symbols for Powerline.
2929 '';
3030 homepage = "https://github.com/naver/d2codingfont";
+2-2
pkgs/data/fonts/sarasa-gothic/default.nix
···2233stdenvNoCC.mkDerivation rec {
44 pname = "sarasa-gothic";
55- version = "0.40.6";
55+ version = "0.40.7";
6677 src = fetchurl {
88 # Use the 'ttc' files here for a smaller closure size.
99 # (Using 'ttf' files gives a closure size about 15x larger, as of November 2021.)
1010 url = "https://github.com/be5invis/Sarasa-Gothic/releases/download/v${version}/sarasa-gothic-ttc-${version}.7z";
1111- hash = "sha256-AHslDiYBQXcxo8XVh1GMZDR8LJXvzJHl4hrisfhltEM=";
1111+ hash = "sha256-muxmoTfAZWLhPp4rx91PDnYogBGHuD4esYjE2kZiOAY=";
1212 };
13131414 sourceRoot = ".";
···2727 logic that will be used by all financial applications in KDE.
28282929 The target is to share financial related information over
3030- application bounderies.
3030+ application boundaries.
3131 '';
3232 license = lib.licenses.lgpl21Plus;
3333 platforms = qtbase.meta.platforms;
···4040}:
41414242# If this package is built with polkit support (withPolkit=true),
4343-# usb redirection reqires spice-client-glib-usb-acl-helper to run setuid root.
4343+# usb redirection requires spice-client-glib-usb-acl-helper to run setuid root.
4444# The helper confirms via polkit that the user has an active session,
4545# then adds a device acl entry for that user.
4646# Example NixOS config to create a setuid wrapper for the helper:
+1-1
pkgs/development/libraries/zlib/default.nix
···5757 export CHOST=${stdenv.hostPlatform.config}
5858 '';
59596060- # For zlib's ./configure (as of verion 1.2.11), the order
6060+ # For zlib's ./configure (as of version 1.2.11), the order
6161 # of --static/--shared flags matters!
6262 # `--shared --static` builds only static libs, while
6363 # `--static --shared` builds both.
+1-1
pkgs/development/node-packages/overrides.nix
···11-# Do not use overrides in this file to add `meta.mainProgram` to packges. Use `./main-programs.nix`
11+# Do not use overrides in this file to add `meta.mainProgram` to packages. Use `./main-programs.nix`
22# instead.
33{ pkgs, nodejs }:
44
···5353 ] ++ passthru.optional-dependencies.compiler;
54545555 # The tests require the generation of code before execution. This requires
5656- # the protoc-gen-python_betterproto script from the packge to be on PATH.
5656+ # the protoc-gen-python_betterproto script from the package to be on PATH.
5757 preCheck = ''
5858 export PATH=$PATH:$out/bin
5959 ${python.interpreter} -m tests.generate
···7373 ];
74747575 meta = with lib; {
7676- description = "Universal archive extractor using z7zip, libarchve, other libraries and the Python standard library";
7676+ description = "Universal archive extractor using z7zip, libarchive, other libraries and the Python standard library";
7777 homepage = "https://github.com/nexB/extractcode";
7878 changelog = "https://github.com/nexB/extractcode/releases/tag/v${version}";
7979 license = licenses.asl20;
···6363 # aarch64-darwin is broken because of https://github.com/bazelbuild/rules_cc/pull/136
6464 # however even with that fix applied, it doesn't work for everyone:
6565 # https://github.com/NixOS/nixpkgs/pull/184395#issuecomment-1207287129
6666- broken = stdenv.isAarch64;
6666+ broken = stdenv.isAarch64 || stdenv.isDarwin;
6767 };
68686969 cudatoolkit_joined = symlinkJoin {
···2525 httpx
2626 ];
27272828- # disable coverage options as they don't provide us value, and they break the defalt pytestCheckHook
2828+ # disable coverage options as they don't provide us value, and they break the default pytestCheckHook
2929 preCheck = ''
3030 sed -i '/addopts/d' ./setup.cfg
3131 '';
···40404141 # Tests have dependencies (pytest-harvest, pytest-steps) which
4242 # are not available in Nixpkgs. Most of the packages (decopatch,
4343- # makefun, pytest-*) have circular dependecies.
4343+ # makefun, pytest-*) have circular dependencies.
4444 doCheck = false;
45454646 pythonImportsCheck = [
···5353 "--regex-PHP=/function[ \\t]+([^ (]*)/\\1/f/"
5454 ];
55555656- # Javascript: also find unnamed functions and funtions beeing passed within a dict.
5656+ # Javascript: also find unnamed functions and functions being passed within a dict.
5757 # the dict properties is used to implement duck typing in frameworks
5858 # var foo = function () { ... }
5959 # {
+1-1
pkgs/development/tools/misc/pkgconf/default.nix
···3535 # reason, but in this case the dev output is for the `libpkgconf` library,
3636 # while the aclocal stuff is for the tool. The tool is already for use during
3737 # development, so there is no reason to have separate "dev-bin" and "dev-lib"
3838- # outputs or someting.
3838+ # outputs or something.
3939 + ''
4040 mv ${placeholder "dev"}/share ${placeholder "out"}
4141 '';
···15151616 # Avoid building example
1717 subPackages = [ "." "fs" ];
1818- # Tests are checking that the files embeded are preserving
1818+ # Tests are checking that the files embedded are preserving
1919 # their meta data like dates etc, but it assumes to be in 2048
2020 # which is not the case once entered the nix store
2121 doCheck = false;
···148148149149 preFixup = ''
150150 # Pull in 'objdump' into PATH to make annotations work.
151151- # The embeded Python interpreter will search PATH to calculate the Python path configuration(Should be fixed by upstream).
151151+ # The embedded Python interpreter will search PATH to calculate the Python path configuration(Should be fixed by upstream).
152152 # Add python.interpreter to PATH for now.
153153 wrapProgram $out/bin/perf \
154154 --prefix PATH : ${lib.makeBinPath [ binutils-unwrapped python3 ]}
+1-1
pkgs/os-specific/linux/tpacpi-bat/default.nix
···2828 meta = {
2929 maintainers = [lib.maintainers.orbekk];
3030 platforms = lib.platforms.linux;
3131- description = "Tool to set battery charging thesholds on Lenovo Thinkpad";
3131+ description = "Tool to set battery charging thresholds on Lenovo Thinkpad";
3232 license = lib.licenses.gpl3Plus;
3333 };
3434}
+1-1
pkgs/os-specific/linux/zenpower/default.nix
···2323 '';
24242525 meta = with lib; {
2626+ inherit (src.meta) homepage;
2627 description = "Linux kernel driver for reading temperature, voltage(SVI2), current(SVI2) and power(SVI2) for AMD Zen family CPUs.";
2727- homepage = "https://github.com/Ta180m/zenpower3";
2828 license = licenses.gpl2Plus;
2929 maintainers = with maintainers; [ alexbakker artturin ];
3030 platforms = [ "x86_64-linux" ];
···7788stdenv.mkDerivation rec {
99 pname = "acpica-tools";
1010- version = "20221020";
1010+ version = "20230331";
11111212 src = fetchurl {
1313- # 20221020 has a weird filename published: https://acpica.org/node/201
1414- name = "acpica-unix-${version}.tar.gz";
1515- url = "https://acpica.org/sites/acpica/files/acpica-unix-${version}.tar_0.gz";
1616- hash = "sha256-M6LjlKygylfUAYr+PaNA361etFsbkwDoHdWV/aB88cU=";
1313+ url = "https://acpica.org/sites/acpica/files/acpica-unix-${version}.tar.gz";
1414+ hash = "sha256-DF1pXWBaqmFwnzxj9XoambiQIpFyOZhEawgTtXrDEOI=";
1715 };
18161917 nativeBuildInputs = [ bison flex ];
···3735 ]);
38363937 enableParallelBuilding = true;
3838+3939+ # i686 builds fail with hardening enabled (due to -Wformat-overflow). Disable
4040+ # -Werror altogether to make this derivation less fragile to toolchain
4141+ # updates.
4242+ NOWERROR = "TRUE";
40434144 # We can handle stripping ourselves.
4245 # Unless we are on Darwin. Upstream makefiles degrade coreutils install to cp if _APPLE is detected.
+5-1
pkgs/tools/typesetting/tex/texlive/combine.nix
···248248 # libfaketime fixes non-determinism related to timestamps ignoring FORCE_SOURCE_DATE
249249 # we cannot fix further randomness caused by luatex; for further details, see
250250 # https://salsa.debian.org/live-team/live-build/-/blob/master/examples/hooks/reproducible/2006-reproducible-texlive-binaries-fmt-files.hook.chroot#L52
251251- FORCE_SOURCE_DATE=1 TZ= faketime -f '@1980-01-01 00:00:00 x0.001' fmtutil --sys --all | grep '^fmtutil' # too verbose
251251+ # note that calling faketime and fmtutil is fragile (faketime uses LD_PRELOAD, fmtutil calls /bin/sh, causing potential glibc issues on non-NixOS)
252252+ # so we patch fmtutil to use faketime, rather than calling faketime fmtutil
253253+ substitute "$out/bin/fmtutil" fmtutil \
254254+ --replace 'my $cmdline = "$eng -ini ' 'my $cmdline = "faketime -f '"'"'\@1980-01-01 00:00:00 x0.001'"'"' $eng -ini '
255255+ FORCE_SOURCE_DATE=1 TZ= perl fmtutil --sys --all | grep '^fmtutil' # too verbose
252256 #texlinks "$out/bin" && wrapBin # do we need to regenerate format links?
253257254258 # Disable unavailable map files
+21-18
pkgs/top-level/aliases.nix
···260260 couchdb = throw "couchdb was removed from nixpkgs, use couchdb3 instead"; # Added 2021-03-03
261261 couchdb2 = throw "couchdb2 was removed from nixpkgs, use couchdb3 instead"; # Added 2021-03-03
262262 coreclr = throw "coreclr has been removed from nixpkgs, use dotnet-sdk instead"; # added 2022-06-12
263263- corgi = throw "corgi has been dropped due to the lack of maintanence from upstream since 2018"; # Added 2022-06-02
263263+ corgi = throw "corgi has been dropped due to the lack of maintenance from upstream since 2018"; # Added 2022-06-02
264264 cpp-gsl = throw "'cpp-gsl' has been renamed to/replaced by 'microsoft_gsl'"; # Converted to throw 2022-02-22
265265 cpp_ethereum = throw "cpp_ethereum has been removed; abandoned upstream"; # Added 2020-11-30
266266 cpuminer-multi = throw "cpuminer-multi has been removed: deleted by upstream"; # Added 2022-01-07
···318318 cudnn_cudatoolkit_9_1 = throw "cudnn_cudatoolkit_9_1 has been removed in favor of newer versions"; # Added 2021-04-18
319319 cudnn_cudatoolkit_9_2 = throw "cudnn_cudatoolkit_9_2 has been removed in favor of newer versions"; # Added 2021-04-18
320320 cura_stable = throw "cura_stable was removed because it was broken and used Python 2"; # added 2022-06-05
321321- curl_unix_socket = throw "curl_unix_socket has been dropped due to the lack of maintanence from upstream since 2015"; # Added 2022-06-02
321321+ curl_unix_socket = throw "curl_unix_socket has been dropped due to the lack of maintenance from upstream since 2015"; # Added 2022-06-02
322322 cutensor = throw "cutensor is now part of cudaPackages*"; # Added 2022-04-04
323323 cutensor_cudatoolkit_10 = throw "cutensor* is now part of cudaPackages*"; # Added 2022-04-04
324324 cutensor_cudatoolkit_10_1 = throw "cutensor* is now part of cudaPackages*"; # Added 2022-04-04
···391391 docbook5_xsl = throw "'docbook5_xsl' has been renamed to/replaced by 'docbook_xsl_ns'"; # Converted to throw 2022-02-22
392392 docbookrx = throw "docbookrx has been removed since it was unmaintained"; # Added 2021-01-12
393393 docbook_xml_xslt = throw "'docbook_xml_xslt' has been renamed to/replaced by 'docbook_xsl'"; # Converted to throw 2022-02-22
394394- doh-proxy = throw "doh-proxy has been removed because upstream abandoned it and its depedencies where removed."; # Added 2022-03-30
394394+ doh-proxy = throw "doh-proxy has been removed because upstream abandoned it and its dependencies where removed."; # Added 2022-03-30
395395 docker_compose = throw "'docker_compose' has been renamed to/replaced by 'docker-compose'"; # Converted to throw 2022-02-22
396396 docker-compose_2 = throw "'docker-compose_2' has been renamed to 'docker-compose'"; # Added 2022-06-05
397397 docker-edge = throw "'docker-edge' has been removed, it was an alias for 'docker'"; # Added 2022-06-05
···541541 gaia = throw "gaia has been removed because it seems abandoned upstream and uses no longer supported dependencies"; # Added 2020-06-06
542542 gammy = throw "'gammy' is deprecated upstream and has been replaced by 'gummy'"; # Added 2022-09-03
543543 garmindev = throw "'garmindev' has been removed as the dependent software 'qlandkartegt' has been removed"; # Added 2023-04-17
544544- gawp = throw "gawp has been dropped due to the lack of maintanence from upstream since 2017"; # Added 2022-06-02
544544+ gawp = throw "gawp has been dropped due to the lack of maintenance from upstream since 2017"; # Added 2022-06-02
545545 gdal_1_11 = throw "gdal_1_11 was removed. Use gdal instead"; # Added 2021-04-03
546546 gdb-multitarget = throw "'gdb-multitarget' has been renamed to/replaced by 'gdb'"; # Converted to throw 2022-02-22
547547 gdk_pixbuf = throw "'gdk_pixbuf' has been renamed to/replaced by 'gdk-pixbuf'"; # Converted to throw 2022-02-22
···553553 ghostwriter = libsForQt5.kdeGear.ghostwriter; # Added 2023-03-18
554554 giblib = throw " giblib has been removed from nixpkgs because upstream is gone"; # Added 2022-01-23
555555 giflib_4_1 = throw "giflib_4_1 has been removed; use giflib instead"; # Added 2020-02-12
556556- git-annex-remote-b2 = throw "git-annex-remote-b2 has been dropped due to the lack of maintanence from upstream since 2016"; # Added 2022-06-02
556556+ git-annex-remote-b2 = throw "git-annex-remote-b2 has been dropped due to the lack of maintenance from upstream since 2016"; # Added 2022-06-02
557557 git-bz = throw "giz-bz has been removed from nixpkgs as it is stuck on python2"; # Added 2022-01-01
558558 git-subset = throw "'git-subset' has been removed in favor of 'git-filter-repo'"; # Added 2023-01-13
559559···611611 gobby5 = gobby; # Added 2021-02-01
612612 gobjectIntrospection = throw "'gobjectIntrospection' has been renamed to/replaced by 'gobject-introspection'"; # Converted to throw 2022-02-22
613613 gogoclient = throw "gogoclient has been removed, because it was unmaintained"; # Added 2021-12-15
614614- goklp = throw "goklp has been dropped due to the lack of maintanence from upstream since 2017"; # Added 2022-06-02
614614+ goklp = throw "goklp has been dropped due to the lack of maintenance from upstream since 2017"; # Added 2022-06-02
615615 golly-beta = throw "golly-beta has been removed: use golly instead"; # Added 2022-03-21
616616 goimports = throw "'goimports' has been renamed to/replaced by 'gotools'"; # Converted to throw 2022-02-22
617617 gometalinter = throw "gometalinter was abandoned by upstream. Consider switching to golangci-lint instead"; # Added 2020-04-23
···620620 google-gflags = gflags; # Added 2019-07-25
621621 google-musicmanager = throw "google-musicmanager has been removed because Google Play Music was discontinued"; # Added 2021-03-07
622622 google-music-scripts = throw "google-music-scripts has been removed because Google Play Music was discontinued"; # Added 2021-03-07
623623- gosca = throw "gosca has been dropped due to the lack of maintanence from upstream since 2018"; # Added 2022-06-30
623623+ gosca = throw "gosca has been dropped due to the lack of maintenance from upstream since 2018"; # Added 2022-06-30
624624 google-play-music-desktop-player = throw "GPMDP shows a black screen, upstream homepage is dead, use 'ytmdesktop' instead"; # Added 2022-06-16
625625 go-langserver = throw "go-langserver has been replaced by gopls"; # Added 2022-06-30
626626- go-mk = throw "go-mk has been dropped due to the lack of maintanence from upstream since 2015"; # Added 2022-06-02
626626+ go-mk = throw "go-mk has been dropped due to the lack of maintenance from upstream since 2015"; # Added 2022-06-02
627627 go-pup = throw "'go-pup' has been renamed to/replaced by 'pup'"; # Converted to throw 2022-02-22
628628- go-repo-root = throw "go-repo-root has been dropped due to the lack of maintanence from upstream since 2014"; # Added 2022-06-02
628628+ go-repo-root = throw "go-repo-root has been dropped due to the lack of maintenance from upstream since 2014"; # Added 2022-06-02
629629 gometer = throw "gometer has been removed from nixpkgs because goLance stopped offering Linux support"; # Added 2023-02-10
630630 gpgstats = throw "gpgstats has been removed: upstream is gone"; # Added 2022-02-06
631631 gpshell = throw "gpshell has been removed, because it was unmaintained in nixpkgs"; # added 2021-12-17
···649649 gr-osmosdr = gnuradio3_7.pkgs.osmosdr; # Added 2019-05-27, changed 2020-10-16
650650 gr-rds = gnuradio3_7.pkgs.rds; # Added 2019-05-27, changed 2020-10-16
651651 grub2_full = grub2; # Added 2022-11-18
652652- grv = throw "grv has been dropped due to the lack of maintanence from upstream since 2019"; # Added 2022-06-01
652652+ grv = throw "grv has been dropped due to the lack of maintenance from upstream since 2019"; # Added 2022-06-01
653653 gsettings_desktop_schemas = throw "'gsettings_desktop_schemas' has been renamed to/replaced by 'gsettings-desktop-schemas'"; # Converted to throw 2022-02-22
654654 gsl_1 = throw "'gsl_1' has been renamed to/replaced by 'gsl'"; # Added 2022-11-19
655655 gtk_doc = throw "'gtk_doc' has been renamed to/replaced by 'gtk-doc'"; # Converted to throw 2022-02-22
···695695 ### I ###
696696697697 i3-gaps = i3; # Added 2023-01-03
698698- i3cat = throw "i3cat has been dropped due to the lack of maintanence from upstream since 2016"; # Added 2022-06-02
698698+ i3cat = throw "i3cat has been dropped due to the lack of maintenance from upstream since 2016"; # Added 2022-06-02
699699 iana_etc = throw "'iana_etc' has been renamed to/replaced by 'iana-etc'"; # Converted to throw 2022-02-22
700700 iasl = throw "iasl has been removed, use acpica-tools instead"; # Added 2021-08-08
701701- ical2org = throw "ical2org has been dropped due to the lack of maintanence from upstream since 2018"; # Added 2022-06-02
701701+ ical2org = throw "ical2org has been dropped due to the lack of maintenance from upstream since 2018"; # Added 2022-06-02
702702 icecat-bin = throw "icecat-bin has been removed, the binary builds are not maintained upstream"; # Added 2022-02-15
703703 icedtea8_web = adoptopenjdk-icedtea-web; # Added 2019-08-21
704704 icedtea_web = adoptopenjdk-icedtea-web; # Added 2019-08-21
···769769770770 ### K ###
771771772772- k3d = throw "k3d has been removed because it was broken and has seen no release since 2016"; # Added 2022-01-04
772772+ # k3d was a 3d editing software k-3d - "k3d has been removed because it was broken and has seen no release since 2016" Added 2022-01-04
773773+ # now kube3d/k3d will take it's place
774774+ kube3d = k3d; # Added 2022-0705
773775 k9copy = throw "k9copy has been removed from nixpkgs, as there is no upstream activity"; # Added 2020-11-06
774776 kafkacat = kcat; # Added 2021-10-07
775777 kbdKeymaps = throw "kbdKeymaps is not needed anymore since dvp and neo are now part of kbd"; # Added 2021-04-11
···785787 keepnote = throw "keepnote has been removed from nixpkgs, as it is stuck on python2"; # Added 2022-01-01
786788 kerberos = libkrb5; # moved from top-level 2021-03-14
787789 kexectools = kexec-tools; # Added 2021-09-03
788788- kexpand = throw "kexpand awless has been dropped due to the lack of maintanence from upstream since 2017"; # Added 2022-06-01
790790+ kexpand = throw "kexpand awless has been dropped due to the lack of maintenance from upstream since 2017"; # Added 2022-06-01
789791 keybase-go = throw "'keybase-go' has been renamed to/replaced by 'keybase'"; # Converted to throw 2022-02-22
790792 keysmith = libsForQt5.kdeGear.keysmith; # Added 2021-07-14
791793 kgx = gnome-console; # Added 2022-02-19
···866868 librdf = lrdf; # Added 2020-03-22
867869 librecad2 = throw "'librecad2' has been renamed to/replaced by 'librecad'"; # Converted to throw 2022-02-22
868870 libressl_3_2 = throw "'libressl_3_2' has reached end-of-life "; # Added 2022-03-19
871871+ libressl_3_5 = throw "'libressl_3_5' has reached end-of-life "; # Added 2023-05-07
869872 librevisa = throw "librevisa has been removed because its website and source have disappeared upstream"; # Added 2022-09-23
870873 librsync_0_9 = throw "librsync_0_9 has been removed"; # Added 2021-07-24
871874 librtlsdr = rtl-sdr; # Added 2023-02-18
···12291232 phwmon = throw "phwmon has been removed: abandoned by upstream"; # Added 2022-04-24
1230123312311234 # Obsolete PHP version aliases
12321232- php74 = throw "php74 has been dropped due to the lack of maintanence from upstream for future releases"; # Added 2022-05-24
12351235+ php74 = throw "php74 has been dropped due to the lack of maintenance from upstream for future releases"; # Added 2022-05-24
12331236 php74Packages = php74; # Added 2022-05-24
12341237 php74Extensions = php74; # Added 2022-05-24
1235123812361236- php73 = throw "php73 has been dropped due to the lack of maintanence from upstream for future releases"; # Added 2021-06-03
12391239+ php73 = throw "php73 has been dropped due to the lack of maintenance from upstream for future releases"; # Added 2021-06-03
12371240 php73Packages = php73; # Added 2021-06-03
12381241 php73Extensions = php73; # Added 2021-06-03
12391242···13081311 polarssl = throw "'polarssl' has been renamed to/replaced by 'mbedtls'"; # Converted to throw 2022-02-22
13091312 polymc = throw "PolyMC has been removed from nixpkgs due to a hostile takeover by a rogue maintainer. The rest of the maintainers have made a fork which is packaged as 'prismlauncher'"; # Added 2022-10-18
13101313 polysh = throw "polysh has been removed from nixpkgs as the upstream has abandoned the project"; # Added 2022-01-01
13111311- pond = throw "pond has been dropped due to the lack of maintanence from upstream since 2016"; # Added 2022-06-02
13141314+ pond = throw "pond has been dropped due to the lack of maintenance from upstream since 2016"; # Added 2022-06-02
13121315 poppler_qt5 = throw "'poppler_qt5' has been renamed to/replaced by 'libsForQt5.poppler'"; # Converted to throw 2022-02-22
13131316 powerdns = pdns; # Added 2022-03-28
13141317 portaudio2014 = throw "'portaudio2014' has been removed"; # Added 2022-05-10
···17681771 xineUI = xine-ui; # Added 2021-04-27
17691772 xlibsWrapper = throw "'xlibsWrapper' has been replaced by its constituents"; # Converted to throw 2022-12-27
17701773 xmonad_log_applet_gnome3 = throw "'xmonad_log_applet_gnome3' has been renamed to/replaced by 'xmonad_log_applet'"; # Converted to throw 2022-02-22
17711771- xmpp-client = throw "xmpp-client has been dropped due to the lack of maintanence from upstream since 2017"; # Added 2022-06-02
17741774+ xmpp-client = throw "xmpp-client has been dropped due to the lack of maintenance from upstream since 2017"; # Added 2022-06-02
17721775 xmpppy = throw "xmpppy has been removed from nixpkgs as it is unmaintained and python2-only";
17731776 xp-pen-g430 = throw "xp-pen-g430 has been renamed to xp-pen-g430-driver"; # Converted to throw 2022-06-23
17741777 xpf = throw "xpf has been removed: abandoned by upstream"; # Added 2022-04-26
···242242 # so it will fail unless buildPlatform.canExecute hostPlatform.
243243 # Unfortunately `bootstrapTools` also clobbers its own `system`
244244 # attribute, so there is no way to detect this -- we must add it
245245- # as a special case.
246246- (builtins.removeAttrs tools ["bootstrapTools"]);
245245+ # as a special case. We filter the "test" attribute (only from
246246+ # *cross*-built bootstrapTools) for the same reason.
247247+ (builtins.mapAttrs (_: v: builtins.removeAttrs v ["bootstrapTools" "test"]) tools);
247248248249 # Cross-built nixStatic for platforms for enabled-but-unsupported platforms
249250 mips64el-nixCrossStatic = mapTestOnCross lib.systems.examples.mips64el-linux-gnuabi64 nixCrossStatic;