···22 - made sure NixOS tests are [linked](https://nixos.org/manual/nixpkgs/unstable/#ssec-nixos-tests-linking) to the relevant packages
23- [ ] 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)
24- [ ] Tested basic functionality of all binary files (usually in `./result/bin/`)
25-- [22.11 Release Notes (or backporting 21.11 Release notes)](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#generating-2211-release-notes)
26 - [ ] (Package updates) Added a release notes entry if the change is major or breaking
27 - [ ] (Module updates) Added a release notes entry if the change is significant
28 - [ ] (Module addition) Added a release notes entry if adding a new NixOS module
···22 - made sure NixOS tests are [linked](https://nixos.org/manual/nixpkgs/unstable/#ssec-nixos-tests-linking) to the relevant packages
23- [ ] 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)
24- [ ] Tested basic functionality of all binary files (usually in `./result/bin/`)
25+- [22.11 Release Notes (or backporting 22.05 Release notes)](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#generating-2211-release-notes)
26 - [ ] (Package updates) Added a release notes entry if the change is major or breaking
27 - [ ] (Module updates) Added a release notes entry if the change is significant
28 - [ ] (Module addition) Added a release notes entry if adding a new NixOS module
+2-2
README.md
···51system, [Hydra](https://hydra.nixos.org/).
5253* [Continuous package builds for unstable/master](https://hydra.nixos.org/jobset/nixos/trunk-combined)
54-* [Continuous package builds for the NixOS 21.11 release](https://hydra.nixos.org/jobset/nixos/release-21.11)
55* [Tests for unstable/master](https://hydra.nixos.org/job/nixos/trunk-combined/tested#tabs-constituents)
56-* [Tests for the NixOS 21.11 release](https://hydra.nixos.org/job/nixos/release-21.11/tested#tabs-constituents)
5758Artifacts successfully built with Hydra are published to cache at
59https://cache.nixos.org/. When successful build and test criteria are
···51system, [Hydra](https://hydra.nixos.org/).
5253* [Continuous package builds for unstable/master](https://hydra.nixos.org/jobset/nixos/trunk-combined)
54+* [Continuous package builds for the NixOS 22.05 release](https://hydra.nixos.org/jobset/nixos/release-22.05)
55* [Tests for unstable/master](https://hydra.nixos.org/job/nixos/trunk-combined/tested#tabs-constituents)
56+* [Tests for the NixOS 22.05 release](https://hydra.nixos.org/job/nixos/release-22.05/tested#tabs-constituents)
5758Artifacts successfully built with Hydra are published to cache at
59https://cache.nixos.org/. When successful build and test criteria are
+1-1
lib/lists.nix
···507 compareLists compare [ "a" ] []
508 => 1
509 compareLists compare [ "a" "b" ] [ "a" "c" ]
510- => 1
511 */
512 compareLists = cmp: a: b:
513 if a == []
···507 compareLists compare [ "a" ] []
508 => 1
509 compareLists compare [ "a" "b" ] [ "a" "c" ]
510+ => -1
511 */
512 compareLists = cmp: a: b:
513 if a == []
···615 version of the <literal>xmonad</literal> module, which will
616 break your configuration if you use <literal>launch</literal>
617 as entrypoint. The example code the corresponding nixos module
618- was adjusted, you way want to have a look at it.
619 </para>
620 </listitem>
621 <listitem>
···615 version of the <literal>xmonad</literal> module, which will
616 break your configuration if you use <literal>launch</literal>
617 as entrypoint. The example code the corresponding nixos module
618+ was adjusted, you may want to have a look at it.
619 </para>
620 </listitem>
621 <listitem>
+1-1
nixos/doc/manual/release-notes/rl-2205.section.md
···195196- The update of the haskell package set brings with it a new version of the `xmonad`
197 module, which will break your configuration if you use `launch` as entrypoint. The
198- example code the corresponding nixos module was adjusted, you way want to have a look at it.
199200- The `home-assistant` module now requires users that don't want their
201 configuration to be managed declaratively to set
···195196- The update of the haskell package set brings with it a new version of the `xmonad`
197 module, which will break your configuration if you use `launch` as entrypoint. The
198+ example code the corresponding nixos module was adjusted, you may want to have a look at it.
199200- The `home-assistant` module now requires users that don't want their
201 configuration to be managed declaratively to set
-5
nixos/lib/eval-config.nix
···50 # they way through, but has the last priority behind everything else.
51 nixpkgs.system = lib.mkDefault system;
5253- # Stash the value of the `system` argument. When using `nesting.children`
54- # we want to have the same default value behavior (immediately above)
55- # without any interference from the user's configuration.
56- nixpkgs.initialSystem = system;
57-58 _module.args.pkgs = lib.mkIf (pkgs_ != null) (lib.mkForce pkgs_);
59 };
60 };
···50 # they way through, but has the last priority behind everything else.
51 nixpkgs.system = lib.mkDefault system;
520000053 _module.args.pkgs = lib.mkIf (pkgs_ != null) (lib.mkForce pkgs_);
54 };
55 };
+1-8
nixos/modules/misc/nixpkgs.nix
···67 imports = [
68 ./assertions.nix
69 ./meta.nix
070 ];
7172 options.nixpkgs = {
···217218 Ignored when <code>nixpkgs.localSystem</code> is set.
219 Ignored when <code>nixpkgs.pkgs</code> is set.
220- '';
221- };
222-223- initialSystem = mkOption {
224- type = types.str;
225- internal = true;
226- description = ''
227- Preserved value of <literal>system</literal> passed to <literal>eval-config.nix</literal>.
228 '';
229 };
230 };
···67 imports = [
68 ./assertions.nix
69 ./meta.nix
70+ (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.")
71 ];
7273 options.nixpkgs = {
···218219 Ignored when <code>nixpkgs.localSystem</code> is set.
220 Ignored when <code>nixpkgs.pkgs</code> is set.
00000000221 '';
222 };
223 };
···107 with subtest("gitolite server starts"):
108 server.wait_for_unit("gitolite-init.service")
109 server.wait_for_unit("sshd.service")
110- client.succeed("ssh gitolite@server info")
111112 with subtest("admin can clone and configure gitolite-admin.git"):
113 client.succeed(
···107 with subtest("gitolite server starts"):
108 server.wait_for_unit("gitolite-init.service")
109 server.wait_for_unit("sshd.service")
110+ client.succeed("ssh -n gitolite@server info")
111112 with subtest("admin can clone and configure gitolite-admin.git"):
113 client.succeed(
+8-6
nixos/tests/libreddit.nix
···6 name = "libreddit";
7 meta.maintainers = with maintainers; [ fab ];
89- nodes.machine =
10- { pkgs, ... }:
11- { services.libreddit.enable = true; };
001213 testScript = ''
14 machine.wait_for_unit("libreddit.service")
15- machine.wait_for_open_port("8080")
16- # The service wants to get data from https://www.reddit.com
17- machine.succeed("curl http://localhost:8080/")
18 '';
19})
···6 name = "libreddit";
7 meta.maintainers = with maintainers; [ fab ];
89+ nodes.machine = {
10+ services.libreddit.enable = true;
11+ # Test CAP_NET_BIND_SERVICE
12+ services.libreddit.port = 80;
13+ };
1415 testScript = ''
16 machine.wait_for_unit("libreddit.service")
17+ machine.wait_for_open_port("80")
18+ # Query a page that does not require Internet access
19+ machine.succeed("curl --fail http://localhost:80/settings")
20 '';
21})
···4}:
5rustPlatform.buildRustPackage rec {
6 pname = "nearcore";
7- version = "1.26.0";
89 # https://github.com/near/nearcore/tags
10 src = fetchFromGitHub {
···12 repo = "nearcore";
13 # there is also a branch for this version number, so we need to be explicit
14 rev = "refs/tags/${version}";
15- sha256 = "sha256-N3A+hy5I1/yJ3IN9gDw3m1IZ9qK8LNhn3fuXLMn23bg=";
16 };
1718- cargoSha256 = "sha256-g07liit048TSL73wFyDK+eKu33Z6fPJcJ+VeGgTtuS8=";
1920 postPatch = ''
21 substituteInPlace neard/build.rs \
···4}:
5rustPlatform.buildRustPackage rec {
6 pname = "nearcore";
7+ version = "1.26.1";
89 # https://github.com/near/nearcore/tags
10 src = fetchFromGitHub {
···12 repo = "nearcore";
13 # there is also a branch for this version number, so we need to be explicit
14 rev = "refs/tags/${version}";
15+ sha256 = "sha256-WoQtDdbFcvl6Wp5uv2tr/W/YYH8dyezF+LzSJ5oJcYY=";
16 };
1718+ cargoSha256 = "sha256-7h14XzhhPmkPoTx0kkJl7I7CPqbRAtxa1zpplYxg4p4=";
1920 postPatch = ''
21 substituteInPlace neard/build.rs \
···66 # Put all the providers we not longer support in this list.
67 removed-providers =
68 let
69- archived = date: throw "the provider has been archived by upstream on ${date}";
70- removed = date: throw "removed from nixpkgs on ${date}";
71 in
72 lib.optionalAttrs config.allowAliases {
73- opc = archived "2022/05";
74- oraclepaas = archived "2022/05";
75- template = archived "2022/05";
76 };
7778 # excluding aliases, used by terraform-full
···66 # Put all the providers we not longer support in this list.
67 removed-providers =
68 let
69+ archived = name: date: throw "the ${name} terraform provider has been archived by upstream on ${date}";
70+ removed = name: date: throw "the ${name} terraform provider removed from nixpkgs on ${date}";
71 in
72 lib.optionalAttrs config.allowAliases {
73+ opc = archived "opc" "2022/05";
74+ oraclepaas = archived "oraclepaas" "2022/05";
75+ template = archived "template" "2022/05";
76 };
7778 # excluding aliases, used by terraform-full
···1+diff --git a/usr/lib/hypnotix/mpv.py b/usr/lib/hypnotix/mpv.py
2+index f42a3be..f1fc40b 100644
3+--- a/usr/lib/hypnotix/mpv.py
4++++ b/usr/lib/hypnotix/mpv.py
5+@@ -44,12 +44,7 @@ else:
6+ # still better than segfaulting, we are setting LC_NUMERIC to "C".
7+ locale.setlocale(locale.LC_NUMERIC, 'C')
8+9+- sofile = ctypes.util.find_library('mpv')
10+- if sofile is None:
11+- raise OSError("Cannot find libmpv in the usual places. Depending on your distro, you may try installing an "
12+- "mpv-devel or mpv-libs package. If you have libmpv around but this script can't find it, consult "
13+- "the documentation for ctypes.util.find_library which this script uses to look up the library "
14+- "filename.")
15++ sofile = '@libmpv@'
16+ backend = CDLL(sofile)
17+ fs_enc = sys.getfilesystemencoding()
18+
···1+# How to update
2+3+1. `./fetchrepo.sh`
4+2. `./mkrepo.sh`
5+3. Check the `repo.json` diff for new stable versions of `tools`, `platform-tools`, `build-tools`, `emulator` and/or `ndk`
6+4. Update the relevant argument defaults in `compose-android-packages.nix`
···34 buildFlagsArray+=("LIBS=-lXaw -lXext -lSM -lICE -lXmu -lXt -lX11 -lncurses")
35 '';
3600000037 installPhase = ''
38 # the makefile doesn't have a sensible install target, so we hav to do it ourselves
39 mkdir -p $out/bin
···34 buildFlagsArray+=("LIBS=-lXaw -lXext -lSM -lICE -lXmu -lXt -lX11 -lncurses")
35 '';
3637+ # Workaround build failure on -fno-common toolchains like upstream
38+ # gcc-10. Otherwise build fails as:
39+ # ld: main.o:/build/source/Sil/src/externs.h:57: multiple definition of
40+ # `mini_screenshot_char'; variable.o:/build/source/Sil/src/externs.h:57: first defined here
41+ NIX_CFLAGS_COMPILE = "-fcommon";
42+43 installPhase = ''
44 # the makefile doesn't have a sensible install target, so we hav to do it ourselves
45 mkdir -p $out/bin
···41 runHook postInstall
42 '';
430044 meta = common.meta // {
45 description = "An entirely open source Linux driver that allows you to manage your Razer peripherals on GNU/Linux";
46 broken = kernel.kernelOlder "4.19";
···41 runHook postInstall
42 '';
4344+ enableParallelBuilding = true;
45+46 meta = common.meta // {
47 description = "An entirely open source Linux driver that allows you to manage your Razer peripherals on GNU/Linux";
48 broken = kernel.kernelOlder "4.19";
···13, Security
14, nghttp2
15, libgit2
016, withExtraFeatures ? true
17, testers
18, nushell
···29 sha256 = "sha256-4thvUSOSvH/bv0aW7hGGQMvtXdS+yDfZzPRLZmPZQMQ=";
30 };
3132- cargoSha256 = "sha256-ALUp6sPcmnJy/A078umyKg8KBv23P0vv8mwoO9OU+DQ=";
00000000000000003334 nativeBuildInputs = [ pkg-config ]
35 ++ lib.optionals (withExtraFeatures && stdenv.isLinux) [ python3 ];
···40 ++ lib.optionals (withExtraFeatures && stdenv.isDarwin) [ AppKit nghttp2 libgit2 ];
4142 buildFeatures = lib.optional withExtraFeatures "extra";
43-44- # Since 0.34, nu has an indirect dependency on `zstd-sys` (via `polars` and
45- # `parquet`, for dataframe support), which by default has an impure build
46- # (git submodule for the `zstd` C library). The `pkg-config` feature flag
47- # fixes this, but it's hard to invoke this in the right place, because of
48- # the indirect dependencies. So add a direct dependency on `zstd-sys` here
49- # at the top level, along with this feature flag, to ensure that when
50- # `zstd-sys` is transitively invoked, it triggers a pure build using the
51- # system `zstd` library provided above.
52- #
53- # (If this patch needs updating, in a nushell repo add the zstd-sys line to
54- # Cargo.toml, then `cargo update --package zstd-sys` to update Cargo.lock.)
55- cargoPatches = [ ./use-system-zstd-lib.diff ];
5657 # TODO investigate why tests are broken on darwin
58 # failures show that tests try to write to paths
···13, Security
14, nghttp2
15, libgit2
16+, cargo-edit
17, withExtraFeatures ? true
18, testers
19, nushell
···30 sha256 = "sha256-4thvUSOSvH/bv0aW7hGGQMvtXdS+yDfZzPRLZmPZQMQ=";
31 };
3233+ cargoSha256 = "sha256-Vd8R9EsO52q840HqRzc37PirZZyTZr+Bnow5qHEacJ0=";
34+ # Since 0.34, nu has an indirect dependency on `zstd-sys` (via `polars` and
35+ # `parquet`, for dataframe support), which by default has an impure build
36+ # (git submodule for the `zstd` C library). The `pkg-config` feature flag
37+ # fixes this, but it's hard to invoke this in the right place, because of
38+ # the indirect dependencies. So add a direct dependency on `zstd-sys` here
39+ # at the top level, along with this feature flag, to ensure that when
40+ # `zstd-sys` is transitively invoked, it triggers a pure build using the
41+ # system `zstd` library provided above.
42+ depsExtraArgs = { nativeBuildInputs = [ cargo-edit ]; };
43+ # cargo add has been merged in to cargo so the above can be removed once 1.62.0 is available in nixpkgs
44+ # https://github.com/rust-lang/cargo/pull/10472
45+ cargoUpdateHook = ''
46+ cargo add zstd-sys --features pkg-config --offline
47+ # write the change to the lockfile
48+ cargo update --package zstd-sys --offline
49+ '';
5051 nativeBuildInputs = [ pkg-config ]
52 ++ lib.optionals (withExtraFeatures && stdenv.isLinux) [ python3 ];
···57 ++ lib.optionals (withExtraFeatures && stdenv.isDarwin) [ AppKit nghttp2 libgit2 ];
5859 buildFeatures = lib.optional withExtraFeatures "extra";
00000000000006061 # TODO investigate why tests are broken on darwin
62 # failures show that tests try to write to paths
-32
pkgs/shells/nushell/use-system-zstd-lib.diff
···1-diff --git a/Cargo.lock b/Cargo.lock
2-index 6cebf66d..b6e40cd9 100644
3---- a/Cargo.lock
4-+++ b/Cargo.lock
5-@@ -2443,6 +2443,7 @@ dependencies = [
6- "rstest",
7- "serial_test",
8- "tempfile",
9-+ "zstd-sys",
10- ]
11-12- [[package]]
13-@@ -5365,4 +5366,5 @@ checksum = "9fd07cbbc53846d9145dbffdf6dd09a7a0aa52be46741825f5c97bdd4f73f12b"
14- dependencies = [
15- "cc",
16- "libc",
17-+ "pkg-config",
18- ]
19-diff --git a/Cargo.toml b/Cargo.toml
20-index 0791d462..d520d9ae 100644
21---- a/Cargo.toml
22-+++ b/Cargo.toml
23-@@ -58,6 +58,9 @@ rayon = "1.5.1"
24- reedline = { version = "0.6.0", features = ["bashisms"]}
25- is_executable = "1.0.1"
26-27-+# Specify that the indirect dependency ztsd-sys should pick up the system zstd C library
28-+zstd-sys = { version = "2", features = [ "pkg-config" ] }
29-+
30- [dev-dependencies]
31- nu-test-support = { path="./crates/nu-test-support", version = "0.63.0" }
32- tempfile = "3.2.0"
···9 tempAllow pkgs.authy "2.1.0" [ "electron-9.4.4" ];
10 };
11 };
12- # Allow with forgetting
13- tempAllow = p: v: pa:
14- lib.optionals (lib.assertMsg (p.version == v) "${p.name} is no longer at version ${v}, consider removing the tempAllow") pa;
15- # For this test we don't _really_ care about the version though,
16- # only about evaluation strictness
17- tempAllowAlike = p: v: pa: builtins.seq v builtins.seq p.version pa;
0001819 in pkgs.hello;
20
···9 tempAllow pkgs.authy "2.1.0" [ "electron-9.4.4" ];
10 };
11 };
12+ # A simplification of `tempAllow` that doesn't check the version, but
13+ # has the same strictness characteristics. Actually checking a version
14+ # here would add undue maintenance.
15+ #
16+ # Original:
17+ # tempAllow = p: v: pa:
18+ # lib.optionals (lib.assertMsg (p.version == v) "${p.name} is no longer at version ${v}, consider removing the tempAllow") pa;
19+ #
20+ tempAllow = p: v: pa: builtins.seq v builtins.seq p.version pa;
2122 in pkgs.hello;
23
···90 at_spi2_atk = throw "'at_spi2_atk' has been renamed to/replaced by 'at-spi2-atk'"; # Converted to throw 2022-02-22
91 at_spi2_core = throw "'at_spi2_core' has been renamed to/replaced by 'at-spi2-core'"; # Converted to throw 2022-02-22
92 aucdtect = throw "aucdtect: Upstream no longer provides download urls"; # Added 2020-12-26
093 avldrums-lv2 = x42-avldrums; # Added 2020-03-29
94 avxsynth = throw "avxsynth was removed because it was broken"; # Added 2021-05-18
95 awesome-4-0 = awesome; # Added 2022-05-05
···908 nix_2_6 = nixVersions.nix_2_6;
909 nixopsUnstable = nixops_unstable; # Added 2022-03-03
910 nixosTest = testers.nixosTest; # Added 2022-05-05
0911 nmap-unfree = nmap; # Added 2021-04-06
912 nmap-graphical = throw "nmap graphical support has been removed due to its python2 dependency"; # Added 2022-04-26
913 nmap_graphical = throw "nmap graphical support has been removed due to its python2 dependency"; # Modified 2022-04-26
···1097 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
1098 proj_5 = throw "Proj-5 has been removed from nixpkgs, use proj instead"; # Added 2021-04-12
1099 prometheus-cups-exporter = throw "outdated and broken by design; removed by developer"; # Added 2021-03-16
01100 prometheus-mesos-exporter = throw "prometheus-mesos-exporter is deprecated and archived by upstream"; # Added 2022-04-05
1101 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
1102 pulseaudio-hsphfpd = throw "pulseaudio-hsphfpd upstream has been abandoned"; # Added 2022-03-23
···1426 winpdb = throw "winpdb has been removed: abandoned by upstream"; # Added 2022-04-22
1427 winusb = throw "'winusb' has been renamed to/replaced by 'woeusb'"; # Converted to throw 2022-02-22
1428 wireguard = throw "'wireguard' has been renamed to/replaced by 'wireguard-tools'"; # Converted to throw 2022-02-22
01429 wmii_hg = wmii;
1430 wxmupen64plus = throw "wxmupen64plus was removed because the upstream disappeared"; # Added 2022-01-31
1431
···90 at_spi2_atk = throw "'at_spi2_atk' has been renamed to/replaced by 'at-spi2-atk'"; # Converted to throw 2022-02-22
91 at_spi2_core = throw "'at_spi2_core' has been renamed to/replaced by 'at-spi2-core'"; # Converted to throw 2022-02-22
92 aucdtect = throw "aucdtect: Upstream no longer provides download urls"; # Added 2020-12-26
93+ automoc4 = throw "automoc4 has been removed from nixpkgs"; # Added 2022-05-30
94 avldrums-lv2 = x42-avldrums; # Added 2020-03-29
95 avxsynth = throw "avxsynth was removed because it was broken"; # Added 2021-05-18
96 awesome-4-0 = awesome; # Added 2022-05-05
···909 nix_2_6 = nixVersions.nix_2_6;
910 nixopsUnstable = nixops_unstable; # Added 2022-03-03
911 nixosTest = testers.nixosTest; # Added 2022-05-05
912+ nixui = throw "nixui has been removed from nixpkgs, due to the project being unmaintained"; # Added 2022-05-23
913 nmap-unfree = nmap; # Added 2021-04-06
914 nmap-graphical = throw "nmap graphical support has been removed due to its python2 dependency"; # Added 2022-04-26
915 nmap_graphical = throw "nmap graphical support has been removed due to its python2 dependency"; # Modified 2022-04-26
···1099 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
1100 proj_5 = throw "Proj-5 has been removed from nixpkgs, use proj instead"; # Added 2021-04-12
1101 prometheus-cups-exporter = throw "outdated and broken by design; removed by developer"; # Added 2021-03-16
1102+ prometheus-dmarc-exporter = dmarc-metrics-exporter; # added 2022-05-31
1103 prometheus-mesos-exporter = throw "prometheus-mesos-exporter is deprecated and archived by upstream"; # Added 2022-04-05
1104 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
1105 pulseaudio-hsphfpd = throw "pulseaudio-hsphfpd upstream has been abandoned"; # Added 2022-03-23
···1429 winpdb = throw "winpdb has been removed: abandoned by upstream"; # Added 2022-04-22
1430 winusb = throw "'winusb' has been renamed to/replaced by 'woeusb'"; # Converted to throw 2022-02-22
1431 wireguard = throw "'wireguard' has been renamed to/replaced by 'wireguard-tools'"; # Converted to throw 2022-02-22
1432+ wormhole-rs = magic-wormhole-rs; # Added 2022-05-30. preserve, reason: Arch package name, main binary name
1433 wmii_hg = wmii;
1434 wxmupen64plus = throw "wxmupen64plus was removed because the upstream disappeared"; # Added 2022-01-31
1435