···212212213213# format files with nixfmt (#347275)
214214adb9714bd909df283c66bbd641bd631ff50a4260
215215+216216+# treewide: incus packages
217217+9ab59bb5fb943ad6740f64f5a79eae9642fb8211
+1-1
CONTRIBUTING.md
···345345Here's a brief overview of the main Git branches and what channels they're used for:
346346347347- `master`: The main branch, used for the unstable channels such as `nixpkgs-unstable`, `nixos-unstable` and `nixos-unstable-small`.
348348-- `release-YY.MM` (e.g. `release-24.11`): The NixOS release branches, used for the stable channels such as `nixos-24.11`, `nixos-24.11-small` and `nixpkgs-24.11-darwin`.
348348+- `release-YY.MM` (e.g. `release-25.05`): The NixOS release branches, used for the stable channels such as `nixos-25.05`, `nixos-25.05-small` and `nixpkgs-25.05-darwin`.
349349350350When a channel is updated, a corresponding Git branch is also updated to point to the corresponding commit.
351351So e.g. the [`nixpkgs-unstable` branch](https://github.com/nixos/nixpkgs/tree/nixpkgs-unstable) corresponds to the Git commit from the [`nixpkgs-unstable` channel](https://channels.nixos.org/nixpkgs-unstable).
+2-2
README.md
···5252system, [Hydra](https://hydra.nixos.org/).
53535454* [Continuous package builds for unstable/master](https://hydra.nixos.org/jobset/nixos/trunk-combined)
5555-* [Continuous package builds for the NixOS 24.05 release](https://hydra.nixos.org/jobset/nixos/release-24.05)
5555+* [Continuous package builds for the NixOS 24.11 release](https://hydra.nixos.org/jobset/nixos/release-24.11)
5656* [Tests for unstable/master](https://hydra.nixos.org/job/nixos/trunk-combined/tested#tabs-constituents)
5757-* [Tests for the NixOS 24.05 release](https://hydra.nixos.org/job/nixos/release-24.05/tested#tabs-constituents)
5757+* [Tests for the NixOS 24.11 release](https://hydra.nixos.org/job/nixos/release-24.11/tested#tabs-constituents)
58585959Artifacts successfully built with Hydra are published to cache at
6060https://cache.nixos.org/. When successful build and test criteria are
···66automatically from NixOS's Git repository after certain tests have
77passed and all packages have been built. These channels are:
8899-- *Stable channels*, such as [`nixos-24.05`](https://channels.nixos.org/nixos-24.05).
99+- *Stable channels*, such as [`nixos-24.11`](https://channels.nixos.org/nixos-24.11).
1010 These only get conservative bug fixes and package upgrades. For
1111 instance, a channel update may cause the Linux kernel on your system
1212 to be upgraded from 4.19.34 to 4.19.38 (a minor bug fix), but not
···1919 radical changes between channel updates. It's not recommended for
2020 production systems.
21212222-- *Small channels*, such as [`nixos-24.05-small`](https://channels.nixos.org/nixos-24.05-small)
2222+- *Small channels*, such as [`nixos-24.11-small`](https://channels.nixos.org/nixos-24.11-small)
2323 or [`nixos-unstable-small`](https://channels.nixos.org/nixos-unstable-small).
2424 These are identical to the stable and unstable channels described above,
2525 except that they contain fewer binary packages. This means they get updated
···38383939When you first install NixOS, you're automatically subscribed to the
4040NixOS channel that corresponds to your installation source. For
4141-instance, if you installed from a 24.05 ISO, you will be subscribed to
4242-the `nixos-24.05` channel. To see which NixOS channel you're subscribed
4141+instance, if you installed from a 24.11 ISO, you will be subscribed to
4242+the `nixos-24.11` channel. To see which NixOS channel you're subscribed
4343to, run the following as root:
44444545```ShellSession
···5454```
55555656(Be sure to include the `nixos` parameter at the end.) For instance, to
5757-use the NixOS 24.05 stable channel:
5757+use the NixOS 24.11 stable channel:
58585959```ShellSession
6060-# nix-channel --add https://channels.nixos.org/nixos-24.05 nixos
6060+# nix-channel --add https://channels.nixos.org/nixos-24.11 nixos
6161```
62626363If you have a server, you may want to use the "small" channel instead:
64646565```ShellSession
6666-# nix-channel --add https://channels.nixos.org/nixos-24.05-small nixos
6666+# nix-channel --add https://channels.nixos.org/nixos-24.11-small nixos
6767```
68686969And if you want to live on the bleeding edge:
···117117118118```nix
119119{
120120- system.autoUpgrade.channel = "https://channels.nixos.org/nixos-24.05";
120120+ system.autoUpgrade.channel = "https://channels.nixos.org/nixos-24.11";
121121}
122122```
+1-1
nixos/doc/manual/release-notes/rl-2411.section.md
···11-# Release 24.11 (“Vicuña”, 2024.11/??) {#sec-release-24.11}
11+# Release 24.11 (“Vicuña”, 2024.11/28) {#sec-release-24.11}
2233<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
44
···169169170170 patches =
171171 let
172172- # Disable haddock generating pretty source listings to stay under 3GB on aarch64-linux
173172 enableHyperlinkedSource =
174174- lib.versionAtLeast version "9.8" ||
175175- !(stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux);
173173+ # Disable haddock generating pretty source listings to stay under 3GB on aarch64-linux
174174+ !(stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux)
175175+ # 9.8 and 9.10 don't run into this problem for some reason
176176+ || (lib.versionAtLeast version "9.8" && lib.versionOlder version "9.11");
176177 in
177178 [
178179 # Fix docs build with Sphinx >= 7 https://gitlab.haskell.org/ghc/ghc/-/issues/24129
···207208 then ./Cabal-at-least-3.6-paths-fix-cycle-aarch64-darwin.patch
208209 else ./Cabal-3.12-paths-fix-cycle-aarch64-darwin.patch)
209210 ]
210210- # Prevents passing --hyperlinked-source to haddock. This is a custom
211211- # workaround as we wait for this to be configurable via userSettings or
212212- # similar. https://gitlab.haskell.org/ghc/ghc/-/issues/23625
211211+ # Prevents passing --hyperlinked-source to haddock. Note that this can
212212+ # be configured via a user defined flavour now. Unfortunately, it is
213213+ # impossible to import an existing flavour in UserSettings, so patching
214214+ # the defaults is actually simpler and less maintenance intensive
215215+ # compared to keeping an entire flavour definition in sync with upstream
216216+ # manually. See also https://gitlab.haskell.org/ghc/ghc/-/issues/23625
213217 ++ lib.optionals (!enableHyperlinkedSource) [
214214- # TODO(@sternenseemann): Doesn't apply for GHC >= 9.8
215215- ../../tools/haskell/hadrian/disable-hyperlinked-source.patch
218218+ (if lib.versionOlder version "9.8"
219219+ then ../../tools/haskell/hadrian/disable-hyperlinked-source-pre-9.8.patch
220220+ else ../../tools/haskell/hadrian/disable-hyperlinked-source-extra-args.patch)
216221 ]
217222 # Incorrect bounds on Cabal in hadrian
218223 # https://gitlab.haskell.org/ghc/ghc/-/issues/24100
···102102 #######################################
103103104104 # All jailbreaks in this section due to: https://github.com/haskell/haskell-language-server/pull/4316#discussion_r1667684895
105105- haskell-language-server = doJailbreak (dontCheck (super.haskell-language-server.overrideScope (lself: lsuper: {
106106- # For most ghc versions, we overrideScope Cabal in the configuration-ghc-???.nix,
107107- # because some packages, like ormolu, need a newer Cabal version.
108108- # ghc-paths is special because it depends on Cabal for building
109109- # its Setup.hs, and therefor declares a Cabal dependency, but does
110110- # not actually use it as a build dependency.
111111- # That means ghc-paths can just use the ghc included Cabal version,
112112- # without causing package-db incoherence and we should do that because
113113- # otherwise we have different versions of ghc-paths
114114- # around which have the same abi-hash, which can lead to confusions and conflicts.
115115- ghc-paths = lsuper.ghc-paths.override { Cabal = null; };
116116- })));
105105+ haskell-language-server =
106106+ lib.pipe
107107+ (super.haskell-language-server.overrideScope (lself: lsuper: {
108108+ # For most ghc versions, we overrideScope Cabal in the configuration-ghc-???.nix,
109109+ # because some packages, like ormolu, need a newer Cabal version.
110110+ # ghc-paths is special because it depends on Cabal for building
111111+ # its Setup.hs, and therefor declares a Cabal dependency, but does
112112+ # not actually use it as a build dependency.
113113+ # That means ghc-paths can just use the ghc included Cabal version,
114114+ # without causing package-db incoherence and we should do that because
115115+ # otherwise we have different versions of ghc-paths
116116+ # around which have the same abi-hash, which can lead to confusions and conflicts.
117117+ ghc-paths = lsuper.ghc-paths.override { Cabal = null; };
118118+ }))
119119+ [
120120+ doJailbreak
121121+ dontCheck
122122+ ];
123123+117124 hls-plugin-api = doJailbreak super.hls-plugin-api;
118118- ghcide = doJailbreak super.ghcide;
125125+ ghcide = doJailbreak (appendPatch (pkgs.fetchpatch {
126126+ name = "ghcide-ghc-9.8.3.patch";
127127+ url = "https://github.com/haskell/haskell-language-server/commit/6d0a6f220226fe6c1cb5b6533177deb55e755b0b.patch";
128128+ sha256 = "1jwxldar9qzkg2z6vsx8f2yih3vkf4yjk9p3mryv0azn929qn3h1";
129129+ stripLen = 1;
130130+ excludes = [ "cabal.project" ];
131131+ }) super.ghcide);
119132120133 # For -f-auto see cabal.project in haskell-language-server.
121134 ghc-lib-parser-ex = addBuildDepend self.ghc-lib-parser (disableCabalFlag "auto" super.ghc-lib-parser-ex);
···165165runCommand "julia-${julia.version}-env" {
166166 nativeBuildInputs = [makeWrapper];
167167168168- inherit julia;
169169- inherit juliaWrapped;
170170- meta = julia.meta;
168168+ passthru = {
169169+ inherit julia;
170170+ inherit juliaWrapped;
171171+ inherit (julia) pname version meta;
171172172172- # Expose the steps we used along the way in case the user wants to use them, for example to build
173173- # expressions and build them separately to avoid IFD.
174174- inherit dependencies;
175175- inherit closureYaml;
176176- inherit dependencyUuidToInfoYaml;
177177- inherit dependencyUuidToRepoYaml;
178178- inherit minimalRegistry;
179179- inherit artifactsNix;
180180- inherit overridesJson;
181181- inherit overridesToml;
182182- inherit projectAndDepot;
173173+ # Expose the steps we used along the way in case the user wants to use them, for example to build
174174+ # expressions and build them separately to avoid IFD.
175175+ inherit dependencies;
176176+ inherit closureYaml;
177177+ inherit dependencyUuidToInfoYaml;
178178+ inherit dependencyUuidToRepoYaml;
179179+ inherit minimalRegistry;
180180+ inherit artifactsNix;
181181+ inherit overridesJson;
182182+ inherit overridesToml;
183183+ inherit projectAndDepot;
184184+ };
183185} (''
184186 mkdir -p $out/bin
185187 makeWrapper ${juliaWrapped}/bin/julia $out/bin/julia \
···986986 perldevel = throw "'perldevel' has been dropped due to lack of updates in nixpkgs and lack of consistent support for devel versions by 'perl-cross' releases, use 'perl' instead";
987987 perldevelPackages = perldevel;
988988 petrinizer = throw "'petrinizer' has been removed, as it was broken and unmaintained"; # added 2024-05-09
989989+ pg-gvm = throw "pg-gvm has been moved to postgresql.pkgs.pg-gvm to make it work with all versions of PostgreSQL"; # added 2024-11-30
989990 pgadmin = pgadmin4;
990991 pharo-spur64 = pharo; # Added 2022-08-03
991992 picom-next = picom; # Added 2024-02-13
···1089109010901091 rabbitvcs = throw "rabbitvcs has been removed from nixpkgs, because it was broken"; # Added 2024-07-15
10911092 radare2-cutter = throw "'radare2-cutter' has been renamed to/replaced by 'cutter'"; # Converted to throw 2024-10-17
10931093+ radicale2 = throw "'radicale2' was removed because it was broken. Use 'radicale' (version 3) instead"; # Added 2024-11-29
10941094+ radicale3 = radicale; # Added 2024-11-29
10921095 radicle-cli = throw "'radicle-cli' was removed in favor of 'radicle-node'"; # Added 2024-05-04
10931096 radicle-upstream = throw "'radicle-upstream' was sunset, see <https://community.radworks.org/t/2962>"; # Added 2024-05-04
10941097 railway-travel = diebahn; # Added 2024-04-01