···2222 - made sure NixOS tests are [linked](https://nixos.org/manual/nixpkgs/unstable/#ssec-nixos-tests-linking) to the relevant packages
2323- [ ] Tested compilation of all packages that depend on this change using `nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD"`. Note: all changes have to be committed, also see [nixpkgs-review usage](https://github.com/Mic92/nixpkgs-review#usage)
2424- [ ] Tested basic functionality of all binary files (usually in `./result/bin/`)
2525-- [22.11 Release Notes (or backporting 21.11 Release notes)](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#generating-2211-release-notes)
2525+- [22.11 Release Notes (or backporting 22.05 Release notes)](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#generating-2211-release-notes)
2626 - [ ] (Package updates) Added a release notes entry if the change is major or breaking
2727 - [ ] (Module updates) Added a release notes entry if the change is significant
2828 - [ ] (Module addition) Added a release notes entry if adding a new NixOS module
+2-2
README.md
···5151system, [Hydra](https://hydra.nixos.org/).
52525353* [Continuous package builds for unstable/master](https://hydra.nixos.org/jobset/nixos/trunk-combined)
5454-* [Continuous package builds for the NixOS 21.11 release](https://hydra.nixos.org/jobset/nixos/release-21.11)
5454+* [Continuous package builds for the NixOS 22.05 release](https://hydra.nixos.org/jobset/nixos/release-22.05)
5555* [Tests for unstable/master](https://hydra.nixos.org/job/nixos/trunk-combined/tested#tabs-constituents)
5656-* [Tests for the NixOS 21.11 release](https://hydra.nixos.org/job/nixos/release-21.11/tested#tabs-constituents)
5656+* [Tests for the NixOS 22.05 release](https://hydra.nixos.org/job/nixos/release-22.05/tested#tabs-constituents)
57575858Artifacts successfully built with Hydra are published to cache at
5959https://cache.nixos.org/. When successful build and test criteria are
+1-1
lib/lists.nix
···507507 compareLists compare [ "a" ] []
508508 => 1
509509 compareLists compare [ "a" "b" ] [ "a" "c" ]
510510- => 1
510510+ => -1
511511 */
512512 compareLists = cmp: a: b:
513513 if a == []
+10
maintainers/team-list.nix
···355355 shortName = "Linux Kernel";
356356 };
357357358358+ lumiguide = {
359359+ # Verify additions by approval of an already existing member of the team.
360360+ members = [
361361+ roelvandijk
362362+ lucus16
363363+ ];
364364+ scope = "Group registration for LumiGuide employees who collectively maintain packages.";
365365+ shortName = "Lumiguide employees";
366366+ };
367367+358368 lumina = {
359369 members = [
360370 romildo
···615615 version of the <literal>xmonad</literal> module, which will
616616 break your configuration if you use <literal>launch</literal>
617617 as entrypoint. The example code the corresponding nixos module
618618- was adjusted, you way want to have a look at it.
618618+ was adjusted, you may want to have a look at it.
619619 </para>
620620 </listitem>
621621 <listitem>
+1-1
nixos/doc/manual/release-notes/rl-2205.section.md
···195195196196- The update of the haskell package set brings with it a new version of the `xmonad`
197197 module, which will break your configuration if you use `launch` as entrypoint. The
198198- example code the corresponding nixos module was adjusted, you way want to have a look at it.
198198+ example code the corresponding nixos module was adjusted, you may want to have a look at it.
199199200200- The `home-assistant` module now requires users that don't want their
201201 configuration to be managed declaratively to set
-5
nixos/lib/eval-config.nix
···5050 # they way through, but has the last priority behind everything else.
5151 nixpkgs.system = lib.mkDefault system;
52525353- # Stash the value of the `system` argument. When using `nesting.children`
5454- # we want to have the same default value behavior (immediately above)
5555- # without any interference from the user's configuration.
5656- nixpkgs.initialSystem = system;
5757-5853 _module.args.pkgs = lib.mkIf (pkgs_ != null) (lib.mkForce pkgs_);
5954 };
6055 };
+1-8
nixos/modules/misc/nixpkgs.nix
···6767 imports = [
6868 ./assertions.nix
6969 ./meta.nix
7070+ (mkRemovedOptionModule [ "nixpkgs" "initialSystem" ] "The NixOS options `nesting.clone` and `nesting.children` have been deleted, and replaced with named specialisation. Therefore `nixpgks.initialSystem` has no effect anymore.")
7071 ];
71727273 options.nixpkgs = {
···217218218219 Ignored when <code>nixpkgs.localSystem</code> is set.
219220 Ignored when <code>nixpkgs.pkgs</code> is set.
220220- '';
221221- };
222222-223223- initialSystem = mkOption {
224224- type = types.str;
225225- internal = true;
226226- description = ''
227227- Preserved value of <literal>system</literal> passed to <literal>eval-config.nix</literal>.
228221 '';
229222 };
230223 };
+18
nixos/modules/programs/atop.nix
···136136 packages = [ atop (lib.mkIf cfg.netatop.enable cfg.netatop.package) ];
137137 services =
138138 mkService cfg.atopService.enable "atop" [ atop ]
139139+ // lib.mkIf cfg.atopService.enable {
140140+ # always convert logs to newer version first
141141+ # XXX might trigger TimeoutStart but restarting atop.service will
142142+ # convert remainings logs and start eventually
143143+ atop.serviceConfig.ExecStartPre = pkgs.writeShellScript "atop-update-log-format" ''
144144+ set -e -u
145145+ for logfile in "$LOGPATH"/atop_*
146146+ do
147147+ ${atop}/bin/atopconvert "$logfile" "$logfile".new
148148+ # only replace old file if version was upgraded to avoid
149149+ # false positives for atop-rotate.service
150150+ if ! ${pkgs.diffutils}/bin/cmp -s "$logfile" "$logfile".new
151151+ then
152152+ ${pkgs.coreutils}/bin/mv -v -f "$logfile".new "$logfile"
153153+ fi
154154+ done
155155+ '';
156156+ }
139157 // mkService cfg.atopacctService.enable "atopacct" [ atop ]
140158 // mkService cfg.netatop.enable "netatop" [ cfg.netatop.package ]
141159 // mkService cfg.atopgpu.enable "atopgpu" [ atop ];
···6666 # Put all the providers we not longer support in this list.
6767 removed-providers =
6868 let
6969- archived = date: throw "the provider has been archived by upstream on ${date}";
7070- removed = date: throw "removed from nixpkgs on ${date}";
6969+ archived = name: date: throw "the ${name} terraform provider has been archived by upstream on ${date}";
7070+ removed = name: date: throw "the ${name} terraform provider removed from nixpkgs on ${date}";
7171 in
7272 lib.optionalAttrs config.allowAliases {
7373- opc = archived "2022/05";
7474- oraclepaas = archived "2022/05";
7575- template = archived "2022/05";
7373+ opc = archived "opc" "2022/05";
7474+ oraclepaas = archived "oraclepaas" "2022/05";
7575+ template = archived "template" "2022/05";
7676 };
77777878 # excluding aliases, used by terraform-full
···11+diff --git a/usr/lib/hypnotix/mpv.py b/usr/lib/hypnotix/mpv.py
22+index f42a3be..f1fc40b 100644
33+--- a/usr/lib/hypnotix/mpv.py
44++++ b/usr/lib/hypnotix/mpv.py
55+@@ -44,12 +44,7 @@ else:
66+ # still better than segfaulting, we are setting LC_NUMERIC to "C".
77+ locale.setlocale(locale.LC_NUMERIC, 'C')
88+99+- sofile = ctypes.util.find_library('mpv')
1010+- if sofile is None:
1111+- raise OSError("Cannot find libmpv in the usual places. Depending on your distro, you may try installing an "
1212+- "mpv-devel or mpv-libs package. If you have libmpv around but this script can't find it, consult "
1313+- "the documentation for ctypes.util.find_library which this script uses to look up the library "
1414+- "filename.")
1515++ sofile = '@libmpv@'
1616+ backend = CDLL(sofile)
1717+ fs_enc = sys.getfilesystemencoding()
1818+
···11+# How to update
22+33+1. `./fetchrepo.sh`
44+2. `./mkrepo.sh`
55+3. Check the `repo.json` diff for new stable versions of `tools`, `platform-tools`, `build-tools`, `emulator` and/or `ndk`
66+4. Update the relevant argument defaults in `compose-android-packages.nix`
···4141 runHook postInstall
4242 '';
43434444+ enableParallelBuilding = true;
4545+4446 meta = common.meta // {
4547 description = "An entirely open source Linux driver that allows you to manage your Razer peripherals on GNU/Linux";
4648 broken = kernel.kernelOlder "4.19";
···1313, Security
1414, nghttp2
1515, libgit2
1616+, cargo-edit
1617, withExtraFeatures ? true
1718, testers
1819, nushell
···2930 sha256 = "sha256-4thvUSOSvH/bv0aW7hGGQMvtXdS+yDfZzPRLZmPZQMQ=";
3031 };
31323232- cargoSha256 = "sha256-ALUp6sPcmnJy/A078umyKg8KBv23P0vv8mwoO9OU+DQ=";
3333+ cargoSha256 = "sha256-Vd8R9EsO52q840HqRzc37PirZZyTZr+Bnow5qHEacJ0=";
3434+ # Since 0.34, nu has an indirect dependency on `zstd-sys` (via `polars` and
3535+ # `parquet`, for dataframe support), which by default has an impure build
3636+ # (git submodule for the `zstd` C library). The `pkg-config` feature flag
3737+ # fixes this, but it's hard to invoke this in the right place, because of
3838+ # the indirect dependencies. So add a direct dependency on `zstd-sys` here
3939+ # at the top level, along with this feature flag, to ensure that when
4040+ # `zstd-sys` is transitively invoked, it triggers a pure build using the
4141+ # system `zstd` library provided above.
4242+ depsExtraArgs = { nativeBuildInputs = [ cargo-edit ]; };
4343+ # cargo add has been merged in to cargo so the above can be removed once 1.62.0 is available in nixpkgs
4444+ # https://github.com/rust-lang/cargo/pull/10472
4545+ cargoUpdateHook = ''
4646+ cargo add zstd-sys --features pkg-config --offline
4747+ # write the change to the lockfile
4848+ cargo update --package zstd-sys --offline
4949+ '';
33503451 nativeBuildInputs = [ pkg-config ]
3552 ++ lib.optionals (withExtraFeatures && stdenv.isLinux) [ python3 ];
···4057 ++ lib.optionals (withExtraFeatures && stdenv.isDarwin) [ AppKit nghttp2 libgit2 ];
41584259 buildFeatures = lib.optional withExtraFeatures "extra";
4343-4444- # Since 0.34, nu has an indirect dependency on `zstd-sys` (via `polars` and
4545- # `parquet`, for dataframe support), which by default has an impure build
4646- # (git submodule for the `zstd` C library). The `pkg-config` feature flag
4747- # fixes this, but it's hard to invoke this in the right place, because of
4848- # the indirect dependencies. So add a direct dependency on `zstd-sys` here
4949- # at the top level, along with this feature flag, to ensure that when
5050- # `zstd-sys` is transitively invoked, it triggers a pure build using the
5151- # system `zstd` library provided above.
5252- #
5353- # (If this patch needs updating, in a nushell repo add the zstd-sys line to
5454- # Cargo.toml, then `cargo update --package zstd-sys` to update Cargo.lock.)
5555- cargoPatches = [ ./use-system-zstd-lib.diff ];
56605761 # TODO investigate why tests are broken on darwin
5862 # failures show that tests try to write to paths
-32
pkgs/shells/nushell/use-system-zstd-lib.diff
···11-diff --git a/Cargo.lock b/Cargo.lock
22-index 6cebf66d..b6e40cd9 100644
33---- a/Cargo.lock
44-+++ b/Cargo.lock
55-@@ -2443,6 +2443,7 @@ dependencies = [
66- "rstest",
77- "serial_test",
88- "tempfile",
99-+ "zstd-sys",
1010- ]
1111-1212- [[package]]
1313-@@ -5365,4 +5366,5 @@ checksum = "9fd07cbbc53846d9145dbffdf6dd09a7a0aa52be46741825f5c97bdd4f73f12b"
1414- dependencies = [
1515- "cc",
1616- "libc",
1717-+ "pkg-config",
1818- ]
1919-diff --git a/Cargo.toml b/Cargo.toml
2020-index 0791d462..d520d9ae 100644
2121---- a/Cargo.toml
2222-+++ b/Cargo.toml
2323-@@ -58,6 +58,9 @@ rayon = "1.5.1"
2424- reedline = { version = "0.6.0", features = ["bashisms"]}
2525- is_executable = "1.0.1"
2626-2727-+# Specify that the indirect dependency ztsd-sys should pick up the system zstd C library
2828-+zstd-sys = { version = "2", features = [ "pkg-config" ] }
2929-+
3030- [dev-dependencies]
3131- nu-test-support = { path="./crates/nu-test-support", version = "0.63.0" }
3232- tempfile = "3.2.0"
···99 tempAllow pkgs.authy "2.1.0" [ "electron-9.4.4" ];
1010 };
1111 };
1212- # Allow with forgetting
1313- tempAllow = p: v: pa:
1414- lib.optionals (lib.assertMsg (p.version == v) "${p.name} is no longer at version ${v}, consider removing the tempAllow") pa;
1515- # For this test we don't _really_ care about the version though,
1616- # only about evaluation strictness
1717- tempAllowAlike = p: v: pa: builtins.seq v builtins.seq p.version pa;
1212+ # A simplification of `tempAllow` that doesn't check the version, but
1313+ # has the same strictness characteristics. Actually checking a version
1414+ # here would add undue maintenance.
1515+ #
1616+ # Original:
1717+ # tempAllow = p: v: pa:
1818+ # lib.optionals (lib.assertMsg (p.version == v) "${p.name} is no longer at version ${v}, consider removing the tempAllow") pa;
1919+ #
2020+ tempAllow = p: v: pa: builtins.seq v builtins.seq p.version pa;
18211922 in pkgs.hello;
2023
···9090 at_spi2_atk = throw "'at_spi2_atk' has been renamed to/replaced by 'at-spi2-atk'"; # Converted to throw 2022-02-22
9191 at_spi2_core = throw "'at_spi2_core' has been renamed to/replaced by 'at-spi2-core'"; # Converted to throw 2022-02-22
9292 aucdtect = throw "aucdtect: Upstream no longer provides download urls"; # Added 2020-12-26
9393+ automoc4 = throw "automoc4 has been removed from nixpkgs"; # Added 2022-05-30
9394 avldrums-lv2 = x42-avldrums; # Added 2020-03-29
9495 avxsynth = throw "avxsynth was removed because it was broken"; # Added 2021-05-18
9596 awesome-4-0 = awesome; # Added 2022-05-05
···908909 nix_2_6 = nixVersions.nix_2_6;
909910 nixopsUnstable = nixops_unstable; # Added 2022-03-03
910911 nixosTest = testers.nixosTest; # Added 2022-05-05
912912+ nixui = throw "nixui has been removed from nixpkgs, due to the project being unmaintained"; # Added 2022-05-23
911913 nmap-unfree = nmap; # Added 2021-04-06
912914 nmap-graphical = throw "nmap graphical support has been removed due to its python2 dependency"; # Added 2022-04-26
913915 nmap_graphical = throw "nmap graphical support has been removed due to its python2 dependency"; # Modified 2022-04-26
···10971099 proglodyte-wasm = throw "proglodyte-wasm has been removed from nixpkgs, because it is unmaintained since 5 years with zero github stars"; # Added 2021-06-30
10981100 proj_5 = throw "Proj-5 has been removed from nixpkgs, use proj instead"; # Added 2021-04-12
10991101 prometheus-cups-exporter = throw "outdated and broken by design; removed by developer"; # Added 2021-03-16
11021102+ prometheus-dmarc-exporter = dmarc-metrics-exporter; # added 2022-05-31
11001103 prometheus-mesos-exporter = throw "prometheus-mesos-exporter is deprecated and archived by upstream"; # Added 2022-04-05
11011104 proxytunnel = throw "proxytunnel has been removed from nixpkgs, because it has not been update upstream since it was added to nixpkgs in 2008 and has therefore bitrotted."; # added 2021-12-15
11021105 pulseaudio-hsphfpd = throw "pulseaudio-hsphfpd upstream has been abandoned"; # Added 2022-03-23
···14261429 winpdb = throw "winpdb has been removed: abandoned by upstream"; # Added 2022-04-22
14271430 winusb = throw "'winusb' has been renamed to/replaced by 'woeusb'"; # Converted to throw 2022-02-22
14281431 wireguard = throw "'wireguard' has been renamed to/replaced by 'wireguard-tools'"; # Converted to throw 2022-02-22
14321432+ wormhole-rs = magic-wormhole-rs; # Added 2022-05-30. preserve, reason: Arch package name, main binary name
14291433 wmii_hg = wmii;
14301434 wxmupen64plus = throw "wxmupen64plus was removed because the upstream disappeared"; # Added 2022-01-31
14311435