2019-04-08 15:28:05 +00:00
|
|
|
|
{
|
|
|
|
|
description = "The purely functional package manager";
|
|
|
|
|
|
2024-03-27 17:16:16 +00:00
|
|
|
|
inputs = {
|
[resubmit] flake: update nixpkgs pin 23.11->24.05 (+ boehmgc compat changes)
-- message from cl/1418 --
The boehmgc changes are bundled into this commit because doing otherwise
would require an annoying dance of "adding compatibility for < 8.2.6 and
>= 8.2.6" then updating the pin then removing the (now unneeded)
compatibility. It doesn't seem worth the trouble to me given the low
complexity of said changes.
Rebased coroutine-sp-fallback.diff patch taken from https://github.com/NixOS/nixpkgs/pull/317227
-- jade resubmit changes --
This is a resubmission of https://gerrit.lix.systems/c/lix/+/1418, which
was reverted in https://gerrit.lix.systems/c/lix/+/1432 for breaking CI
evaluation without being detected.
I have run `nix flake check -Lv` on this one before submission and it
passes on my machine and crucially without eval errors, so the CI result
should be accurate.
It seems like someone renamed forbiddenDependenciesRegex to
forbiddenDependenciesRegexes in nixpkgs and also changed the type
incompatibly. That's pretty silly, but at least it's just an eval error.
Also, `xonsh` regressed the availability of `xonsh-unwrapped`, but it
was fixed by us in https://github.com/NixOS/nixpkgs/pull/317636, which
is now in our channel, so we update nixpkgs compared to the original
iteration of this to simply get that.
We originally had a regression related to some reorganization of the
nixpkgs lib test suite in which there was broken parameter passing.
This, too, we got quickfixed in nixpkgs, so we don't need any changes
for it: https://github.com/NixOS/nixpkgs/pull/317772
Related: https://gerrit.lix.systems/c/lix/+/1428
Fixes: https://git.lix.systems/lix-project/lix/issues/385
Change-Id: I26d41ea826fec900ebcad0f82a727feb6bcd28f3
2024-06-08 14:57:08 +00:00
|
|
|
|
nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05-small";
|
2024-03-27 17:16:16 +00:00
|
|
|
|
nixpkgs-regression.url = "github:NixOS/nixpkgs/215d4d0fd80ca5163643b03a33fde804a29cc1e2";
|
|
|
|
|
pre-commit-hooks = {
|
2024-04-01 17:34:30 +00:00
|
|
|
|
url = "github:cachix/git-hooks.nix";
|
2024-04-08 03:05:19 +00:00
|
|
|
|
flake = false;
|
2024-03-27 17:16:16 +00:00
|
|
|
|
};
|
2024-06-07 08:35:26 +00:00
|
|
|
|
nix2container = {
|
|
|
|
|
url = "github:nlewo/nix2container";
|
|
|
|
|
flake = false;
|
|
|
|
|
};
|
2024-04-04 23:07:44 +00:00
|
|
|
|
flake-compat = {
|
|
|
|
|
url = "github:edolstra/flake-compat";
|
|
|
|
|
flake = false;
|
|
|
|
|
};
|
2024-03-27 17:16:16 +00:00
|
|
|
|
};
|
2019-04-08 15:28:05 +00:00
|
|
|
|
|
2024-04-04 23:07:44 +00:00
|
|
|
|
outputs =
|
|
|
|
|
{
|
|
|
|
|
self,
|
|
|
|
|
nixpkgs,
|
|
|
|
|
nixpkgs-regression,
|
|
|
|
|
pre-commit-hooks,
|
2024-06-07 08:35:26 +00:00
|
|
|
|
nix2container,
|
2024-04-04 23:07:44 +00:00
|
|
|
|
flake-compat,
|
|
|
|
|
}:
|
2019-04-08 15:28:05 +00:00
|
|
|
|
|
2019-10-04 08:45:33 +00:00
|
|
|
|
let
|
2022-03-02 02:40:18 +00:00
|
|
|
|
inherit (nixpkgs) lib;
|
2019-05-29 15:25:41 +00:00
|
|
|
|
|
2024-05-04 00:01:05 +00:00
|
|
|
|
# This notice gets echoed as a dev shell hook, and can be turned off with
|
|
|
|
|
# `touch .nocontribmsg`
|
|
|
|
|
sgr = ''['';
|
|
|
|
|
freezePage = "https://wiki.lix.systems/books/lix-contributors/page/freezes-and-recommended-contributions";
|
|
|
|
|
codebaseOverview = "https://wiki.lix.systems/books/lix-contributors/page/codebase-overview";
|
|
|
|
|
contribNotice = builtins.toFile "lix-contrib-notice" ''
|
|
|
|
|
Hey there!
|
|
|
|
|
|
|
|
|
|
If you're thinking of working on Lix, please consider talking to us about it!
|
|
|
|
|
You should be aware that we are ${sgr}1mnot${sgr}0m accepting major features without some conditions,
|
|
|
|
|
and we highly recommend looking at our freeze status page on the wiki:
|
|
|
|
|
${sgr}32m${freezePage}${sgr}0m
|
|
|
|
|
|
|
|
|
|
We also have an overview of the codebase at
|
|
|
|
|
${sgr}32m${codebaseOverview}${sgr}0m,
|
|
|
|
|
and other helpful information on the wiki.
|
|
|
|
|
|
|
|
|
|
But above all else, ${sgr}1mwe want to hear from you!${sgr}0m
|
|
|
|
|
We can help you figure out where in the codebase to look for whatever you want to do,
|
|
|
|
|
and we'd like to work together with all contributors as much as possible.
|
|
|
|
|
Lix is a collaborative project :)
|
|
|
|
|
|
|
|
|
|
You can open an issue at https://git.lix.systems/lix-project/lix/issues
|
|
|
|
|
or chat with us on Matrix: #space:lix.systems.
|
|
|
|
|
|
|
|
|
|
(Run `touch .nocontribmsg` to hide this message.)
|
|
|
|
|
'';
|
|
|
|
|
|
2024-04-11 18:17:19 +00:00
|
|
|
|
officialRelease = false;
|
2022-12-06 17:00:10 +00:00
|
|
|
|
|
2024-03-04 06:11:19 +00:00
|
|
|
|
# Set to true to build the release notes for the next release.
|
2024-05-15 22:01:38 +00:00
|
|
|
|
buildUnreleasedNotes = true;
|
2024-03-04 06:11:19 +00:00
|
|
|
|
|
2020-03-31 22:20:12 +00:00
|
|
|
|
versionSuffix =
|
2024-04-04 23:07:44 +00:00
|
|
|
|
if officialRelease then
|
|
|
|
|
""
|
|
|
|
|
else
|
|
|
|
|
"pre${
|
|
|
|
|
builtins.substring 0 8 (self.lastModifiedDate or self.lastModified or "19700101")
|
|
|
|
|
}_${self.shortRev or "dirty"}";
|
2020-03-13 17:28:01 +00:00
|
|
|
|
|
2023-08-23 18:28:24 +00:00
|
|
|
|
linux32BitSystems = [ "i686-linux" ];
|
2024-04-04 23:07:44 +00:00
|
|
|
|
linux64BitSystems = [
|
|
|
|
|
"x86_64-linux"
|
|
|
|
|
"aarch64-linux"
|
|
|
|
|
];
|
2023-08-23 18:28:24 +00:00
|
|
|
|
linuxSystems = linux32BitSystems ++ linux64BitSystems;
|
2024-04-04 23:07:44 +00:00
|
|
|
|
darwinSystems = [
|
|
|
|
|
"x86_64-darwin"
|
|
|
|
|
"aarch64-darwin"
|
|
|
|
|
];
|
2023-08-23 18:28:24 +00:00
|
|
|
|
systems = linuxSystems ++ darwinSystems;
|
2023-10-05 16:12:18 +00:00
|
|
|
|
|
2024-06-26 04:46:26 +00:00
|
|
|
|
# If you add something here, please update the list in doc/manual/src/contributing/hacking.md.
|
|
|
|
|
# Thanks~
|
2023-09-25 17:46:55 +00:00
|
|
|
|
crossSystems = [
|
2024-04-04 23:07:44 +00:00
|
|
|
|
"armv6l-linux"
|
|
|
|
|
"armv7l-linux"
|
2024-06-13 22:04:06 +00:00
|
|
|
|
"riscv64-linux"
|
[resubmit] flake: update nixpkgs pin 23.11->24.05 (+ boehmgc compat changes)
-- message from cl/1418 --
The boehmgc changes are bundled into this commit because doing otherwise
would require an annoying dance of "adding compatibility for < 8.2.6 and
>= 8.2.6" then updating the pin then removing the (now unneeded)
compatibility. It doesn't seem worth the trouble to me given the low
complexity of said changes.
Rebased coroutine-sp-fallback.diff patch taken from https://github.com/NixOS/nixpkgs/pull/317227
-- jade resubmit changes --
This is a resubmission of https://gerrit.lix.systems/c/lix/+/1418, which
was reverted in https://gerrit.lix.systems/c/lix/+/1432 for breaking CI
evaluation without being detected.
I have run `nix flake check -Lv` on this one before submission and it
passes on my machine and crucially without eval errors, so the CI result
should be accurate.
It seems like someone renamed forbiddenDependenciesRegex to
forbiddenDependenciesRegexes in nixpkgs and also changed the type
incompatibly. That's pretty silly, but at least it's just an eval error.
Also, `xonsh` regressed the availability of `xonsh-unwrapped`, but it
was fixed by us in https://github.com/NixOS/nixpkgs/pull/317636, which
is now in our channel, so we update nixpkgs compared to the original
iteration of this to simply get that.
We originally had a regression related to some reorganization of the
nixpkgs lib test suite in which there was broken parameter passing.
This, too, we got quickfixed in nixpkgs, so we don't need any changes
for it: https://github.com/NixOS/nixpkgs/pull/317772
Related: https://gerrit.lix.systems/c/lix/+/1428
Fixes: https://git.lix.systems/lix-project/lix/issues/385
Change-Id: I26d41ea826fec900ebcad0f82a727feb6bcd28f3
2024-06-08 14:57:08 +00:00
|
|
|
|
# FIXME: still broken in 24.05: fails to build rustc(??) due to missing -lstdc++ dep
|
|
|
|
|
# "x86_64-freebsd"
|
|
|
|
|
# FIXME: broken dev shell due to python
|
|
|
|
|
# "x86_64-netbsd"
|
2023-09-25 17:46:55 +00:00
|
|
|
|
];
|
2021-02-06 00:07:48 +00:00
|
|
|
|
|
2024-04-04 23:07:44 +00:00
|
|
|
|
stdenvs = [
|
|
|
|
|
"gccStdenv"
|
|
|
|
|
"clangStdenv"
|
|
|
|
|
"stdenv"
|
|
|
|
|
"libcxxStdenv"
|
|
|
|
|
"ccacheStdenv"
|
|
|
|
|
];
|
2021-07-08 15:01:51 +00:00
|
|
|
|
|
2022-03-02 02:40:18 +00:00
|
|
|
|
forAllSystems = lib.genAttrs systems;
|
2024-05-07 04:54:18 +00:00
|
|
|
|
# Same as forAllSystems, but removes nulls, in case something is broken
|
|
|
|
|
# on that system.
|
|
|
|
|
forAvailableSystems =
|
|
|
|
|
f: lib.filterAttrs (name: value: value != null && value != { }) (forAllSystems f);
|
2022-03-02 02:40:18 +00:00
|
|
|
|
|
|
|
|
|
forAllCrossSystems = lib.genAttrs crossSystems;
|
|
|
|
|
|
2024-04-04 23:07:44 +00:00
|
|
|
|
forAllStdenvs =
|
|
|
|
|
f:
|
|
|
|
|
lib.listToAttrs (
|
|
|
|
|
map (stdenvName: {
|
|
|
|
|
name = "${stdenvName}Packages";
|
|
|
|
|
value = f stdenvName;
|
|
|
|
|
}) stdenvs
|
|
|
|
|
);
|
2021-07-08 15:01:51 +00:00
|
|
|
|
|
2019-10-04 08:45:33 +00:00
|
|
|
|
# Memoize nixpkgs for different platforms for efficiency.
|
2024-04-04 23:07:44 +00:00
|
|
|
|
nixpkgsFor = forAllSystems (
|
|
|
|
|
system:
|
|
|
|
|
let
|
|
|
|
|
make-pkgs =
|
|
|
|
|
crossSystem: stdenv:
|
|
|
|
|
import nixpkgs {
|
|
|
|
|
localSystem = {
|
|
|
|
|
inherit system;
|
|
|
|
|
};
|
|
|
|
|
crossSystem =
|
|
|
|
|
if crossSystem == null then
|
|
|
|
|
null
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
system = crossSystem;
|
|
|
|
|
}
|
2024-06-10 00:10:44 +00:00
|
|
|
|
// lib.optionalAttrs (crossSystem == "x86_64-freebsd") { useLLVM = true; };
|
2024-04-04 23:07:44 +00:00
|
|
|
|
overlays = [
|
|
|
|
|
(overlayFor (p: p.${stdenv}))
|
|
|
|
|
(final: prev: { nixfmt = final.callPackage ./nix-support/nixfmt.nix { }; })
|
|
|
|
|
];
|
2023-09-25 17:46:55 +00:00
|
|
|
|
};
|
2022-03-02 02:40:18 +00:00
|
|
|
|
stdenvs = forAllStdenvs (make-pkgs null);
|
|
|
|
|
native = stdenvs.stdenvPackages;
|
2024-04-04 23:07:44 +00:00
|
|
|
|
in
|
|
|
|
|
{
|
2022-03-02 02:40:18 +00:00
|
|
|
|
inherit stdenvs native;
|
|
|
|
|
static = native.pkgsStatic;
|
|
|
|
|
cross = forAllCrossSystems (crossSystem: make-pkgs crossSystem "stdenv");
|
2024-04-04 23:07:44 +00:00
|
|
|
|
}
|
|
|
|
|
);
|
2019-10-04 08:45:33 +00:00
|
|
|
|
|
2024-04-04 23:07:44 +00:00
|
|
|
|
overlayFor =
|
|
|
|
|
getStdenv: final: prev:
|
2024-03-01 20:15:44 +00:00
|
|
|
|
let
|
|
|
|
|
currentStdenv = getStdenv final;
|
2024-04-04 23:07:44 +00:00
|
|
|
|
in
|
|
|
|
|
{
|
2024-03-01 20:15:44 +00:00
|
|
|
|
nixStable = prev.nix;
|
2020-02-15 20:30:26 +00:00
|
|
|
|
|
2024-03-01 20:15:44 +00:00
|
|
|
|
# Forward from the previous stage as we don’t want it to pick the lowdown override
|
|
|
|
|
nixUnstable = prev.nixUnstable;
|
|
|
|
|
|
2024-04-08 22:08:29 +00:00
|
|
|
|
check-headers = final.buildPackages.callPackage ./maintainers/check-headers.nix { };
|
2024-03-01 20:15:44 +00:00
|
|
|
|
|
|
|
|
|
default-busybox-sandbox-shell = final.busybox.override {
|
|
|
|
|
useMusl = true;
|
|
|
|
|
enableStatic = true;
|
|
|
|
|
enableMinimal = true;
|
|
|
|
|
extraConfig = ''
|
|
|
|
|
CONFIG_FEATURE_FANCY_ECHO y
|
|
|
|
|
CONFIG_FEATURE_SH_MATH y
|
|
|
|
|
CONFIG_FEATURE_SH_MATH_64 y
|
|
|
|
|
|
|
|
|
|
CONFIG_ASH y
|
|
|
|
|
CONFIG_ASH_OPTIMIZE_FOR_SIZE y
|
|
|
|
|
|
|
|
|
|
CONFIG_ASH_ALIAS y
|
|
|
|
|
CONFIG_ASH_BASH_COMPAT y
|
|
|
|
|
CONFIG_ASH_CMDCMD y
|
|
|
|
|
CONFIG_ASH_ECHO y
|
|
|
|
|
CONFIG_ASH_GETOPTS y
|
|
|
|
|
CONFIG_ASH_INTERNAL_GLOB y
|
|
|
|
|
CONFIG_ASH_JOB_CONTROL y
|
|
|
|
|
CONFIG_ASH_PRINTF y
|
|
|
|
|
CONFIG_ASH_TEST y
|
2024-03-08 19:51:26 +00:00
|
|
|
|
'';
|
2024-03-01 20:15:44 +00:00
|
|
|
|
};
|
2024-03-08 19:51:26 +00:00
|
|
|
|
|
2024-03-01 20:15:44 +00:00
|
|
|
|
nix = final.callPackage ./package.nix {
|
2024-06-06 21:06:07 +00:00
|
|
|
|
inherit versionSuffix officialRelease;
|
2024-03-01 20:15:44 +00:00
|
|
|
|
stdenv = currentStdenv;
|
|
|
|
|
busybox-sandbox-shell = final.busybox-sandbox-shell or final.default-busybox-sandbox-shell;
|
|
|
|
|
};
|
2024-04-06 21:44:27 +00:00
|
|
|
|
|
2024-06-16 21:10:09 +00:00
|
|
|
|
pegtl = final.callPackage ./misc/pegtl.nix { };
|
|
|
|
|
|
2024-05-08 08:00:56 +00:00
|
|
|
|
# Export the patched version of boehmgc that Lix uses into the overlay
|
2024-04-06 21:44:27 +00:00
|
|
|
|
# for consumers of this flake.
|
|
|
|
|
boehmgc-nix = final.nix.boehmgc-nix;
|
2024-05-07 20:40:18 +00:00
|
|
|
|
# And same thing for our build-release-notes package.
|
|
|
|
|
build-release-notes = final.nix.build-release-notes;
|
2020-07-22 11:51:11 +00:00
|
|
|
|
};
|
2024-04-04 23:07:44 +00:00
|
|
|
|
in
|
|
|
|
|
{
|
2021-07-08 15:01:51 +00:00
|
|
|
|
# A Nixpkgs overlay that overrides the 'nix' and
|
|
|
|
|
# 'nix.perl-bindings' packages.
|
2022-02-11 14:05:07 +00:00
|
|
|
|
overlays.default = overlayFor (p: p.stdenv);
|
2021-07-08 15:01:51 +00:00
|
|
|
|
|
2020-03-13 17:31:16 +00:00
|
|
|
|
hydraJobs = {
|
2019-10-04 08:45:33 +00:00
|
|
|
|
# Binary package for various platforms.
|
2022-03-02 02:40:18 +00:00
|
|
|
|
build = forAllSystems (system: self.packages.${system}.nix);
|
2020-07-30 19:59:57 +00:00
|
|
|
|
|
2024-06-11 19:42:51 +00:00
|
|
|
|
devShell = forAllSystems (system: {
|
|
|
|
|
default = self.devShells.${system}.default;
|
|
|
|
|
clang = self.devShells.${system}.native-clangStdenvPackages;
|
|
|
|
|
});
|
|
|
|
|
|
2024-04-04 23:07:44 +00:00
|
|
|
|
rl-next = forAllSystems (
|
|
|
|
|
system:
|
2024-04-06 13:25:37 +00:00
|
|
|
|
let
|
2024-04-04 23:07:44 +00:00
|
|
|
|
rl-next-check =
|
|
|
|
|
name: dir:
|
|
|
|
|
let
|
|
|
|
|
pkgs = nixpkgsFor.${system}.native;
|
|
|
|
|
in
|
|
|
|
|
pkgs.buildPackages.runCommand "test-${name}-release-notes" { } ''
|
2024-05-15 19:46:17 +00:00
|
|
|
|
LANG=C.UTF-8 ${lib.getExe pkgs.build-release-notes} --change-authors ${./doc/manual/change-authors.yml} ${dir} >$out
|
2024-04-04 23:07:44 +00:00
|
|
|
|
'';
|
2024-04-06 13:25:37 +00:00
|
|
|
|
in
|
2024-04-04 23:07:44 +00:00
|
|
|
|
{
|
|
|
|
|
user = rl-next-check "rl-next" ./doc/manual/rl-next;
|
|
|
|
|
}
|
|
|
|
|
);
|
2024-04-06 13:25:37 +00:00
|
|
|
|
|
2024-05-27 07:58:49 +00:00
|
|
|
|
# Completion tests for the Nix REPL.
|
|
|
|
|
repl-completion = forAllSystems (
|
|
|
|
|
system: nixpkgsFor.${system}.native.callPackage ./tests/repl-completion.nix { }
|
|
|
|
|
);
|
|
|
|
|
|
2019-10-04 08:45:33 +00:00
|
|
|
|
# Perl bindings for various platforms.
|
2024-06-13 22:11:28 +00:00
|
|
|
|
perlBindings = forAllSystems (system: nixpkgsFor.${system}.native.nix.passthru.perl-bindings);
|
2019-10-04 08:45:33 +00:00
|
|
|
|
|
|
|
|
|
# Binary tarball for various platforms, containing a Nix store
|
2024-03-14 18:15:46 +00:00
|
|
|
|
# with the closure of 'nix' package.
|
2024-06-13 22:11:28 +00:00
|
|
|
|
binaryTarball = forAllSystems (system: nixpkgsFor.${system}.native.nix.passthru.binaryTarball);
|
2022-03-02 02:40:18 +00:00
|
|
|
|
|
2024-05-14 00:05:08 +00:00
|
|
|
|
# docker image with Lix inside
|
2022-03-02 02:40:18 +00:00
|
|
|
|
dockerImage = lib.genAttrs linux64BitSystems (system: self.packages.${system}.dockerImage);
|
2021-10-30 22:22:35 +00:00
|
|
|
|
|
2023-02-13 17:37:35 +00:00
|
|
|
|
# API docs for Nix's unstable internal C++ interfaces.
|
2024-04-04 23:07:44 +00:00
|
|
|
|
internal-api-docs =
|
|
|
|
|
let
|
|
|
|
|
nixpkgs = nixpkgsFor.x86_64-linux.native;
|
|
|
|
|
inherit (nixpkgs) pkgs;
|
|
|
|
|
|
|
|
|
|
nix = pkgs.callPackage ./package.nix {
|
|
|
|
|
inherit versionSuffix officialRelease buildUnreleasedNotes;
|
|
|
|
|
inherit (pkgs) build-release-notes;
|
|
|
|
|
internalApiDocs = true;
|
|
|
|
|
busybox-sandbox-shell = pkgs.busybox-sandbox-shell;
|
|
|
|
|
};
|
|
|
|
|
in
|
2024-03-09 04:09:11 +00:00
|
|
|
|
nix.overrideAttrs (prev: {
|
|
|
|
|
# This Hydra job is just for the internal API docs.
|
|
|
|
|
# We don't need the build artifacts here.
|
|
|
|
|
dontBuild = true;
|
|
|
|
|
doCheck = false;
|
|
|
|
|
doInstallCheck = false;
|
|
|
|
|
});
|
2023-02-13 17:37:35 +00:00
|
|
|
|
|
2019-10-04 08:45:33 +00:00
|
|
|
|
# System tests.
|
2024-03-05 20:11:59 +00:00
|
|
|
|
tests = import ./tests/nixos { inherit lib nixpkgs nixpkgsFor; } // {
|
2022-02-23 14:58:09 +00:00
|
|
|
|
|
2024-03-05 20:11:59 +00:00
|
|
|
|
# Make sure that nix-env still produces the exact same result
|
|
|
|
|
# on a particular version of Nixpkgs.
|
|
|
|
|
evalNixpkgs =
|
|
|
|
|
with nixpkgsFor.x86_64-linux.native;
|
2024-04-04 23:07:44 +00:00
|
|
|
|
runCommand "eval-nixos" { buildInputs = [ nix ]; } ''
|
|
|
|
|
type -p nix-env
|
|
|
|
|
# Note: we're filtering out nixos-install-tools because https://github.com/NixOS/nixpkgs/pull/153594#issuecomment-1020530593.
|
|
|
|
|
time nix-env --store dummy:// -f ${nixpkgs-regression} -qaP --drv-path | sort | grep -v nixos-install-tools > packages
|
|
|
|
|
[[ $(sha1sum < packages | cut -c1-40) = 402242fca90874112b34718b8199d844e8b03d12 ]]
|
|
|
|
|
mkdir $out
|
|
|
|
|
'';
|
2022-01-24 23:02:48 +00:00
|
|
|
|
|
2024-04-04 23:07:44 +00:00
|
|
|
|
nixpkgsLibTests = forAllSystems (
|
|
|
|
|
system:
|
[resubmit] flake: update nixpkgs pin 23.11->24.05 (+ boehmgc compat changes)
-- message from cl/1418 --
The boehmgc changes are bundled into this commit because doing otherwise
would require an annoying dance of "adding compatibility for < 8.2.6 and
>= 8.2.6" then updating the pin then removing the (now unneeded)
compatibility. It doesn't seem worth the trouble to me given the low
complexity of said changes.
Rebased coroutine-sp-fallback.diff patch taken from https://github.com/NixOS/nixpkgs/pull/317227
-- jade resubmit changes --
This is a resubmission of https://gerrit.lix.systems/c/lix/+/1418, which
was reverted in https://gerrit.lix.systems/c/lix/+/1432 for breaking CI
evaluation without being detected.
I have run `nix flake check -Lv` on this one before submission and it
passes on my machine and crucially without eval errors, so the CI result
should be accurate.
It seems like someone renamed forbiddenDependenciesRegex to
forbiddenDependenciesRegexes in nixpkgs and also changed the type
incompatibly. That's pretty silly, but at least it's just an eval error.
Also, `xonsh` regressed the availability of `xonsh-unwrapped`, but it
was fixed by us in https://github.com/NixOS/nixpkgs/pull/317636, which
is now in our channel, so we update nixpkgs compared to the original
iteration of this to simply get that.
We originally had a regression related to some reorganization of the
nixpkgs lib test suite in which there was broken parameter passing.
This, too, we got quickfixed in nixpkgs, so we don't need any changes
for it: https://github.com/NixOS/nixpkgs/pull/317772
Related: https://gerrit.lix.systems/c/lix/+/1428
Fixes: https://git.lix.systems/lix-project/lix/issues/385
Change-Id: I26d41ea826fec900ebcad0f82a727feb6bcd28f3
2024-06-08 14:57:08 +00:00
|
|
|
|
let
|
|
|
|
|
inherit (self.packages.${system}) nix;
|
2024-04-04 23:07:44 +00:00
|
|
|
|
pkgs = nixpkgsFor.${system}.native;
|
[resubmit] flake: update nixpkgs pin 23.11->24.05 (+ boehmgc compat changes)
-- message from cl/1418 --
The boehmgc changes are bundled into this commit because doing otherwise
would require an annoying dance of "adding compatibility for < 8.2.6 and
>= 8.2.6" then updating the pin then removing the (now unneeded)
compatibility. It doesn't seem worth the trouble to me given the low
complexity of said changes.
Rebased coroutine-sp-fallback.diff patch taken from https://github.com/NixOS/nixpkgs/pull/317227
-- jade resubmit changes --
This is a resubmission of https://gerrit.lix.systems/c/lix/+/1418, which
was reverted in https://gerrit.lix.systems/c/lix/+/1432 for breaking CI
evaluation without being detected.
I have run `nix flake check -Lv` on this one before submission and it
passes on my machine and crucially without eval errors, so the CI result
should be accurate.
It seems like someone renamed forbiddenDependenciesRegex to
forbiddenDependenciesRegexes in nixpkgs and also changed the type
incompatibly. That's pretty silly, but at least it's just an eval error.
Also, `xonsh` regressed the availability of `xonsh-unwrapped`, but it
was fixed by us in https://github.com/NixOS/nixpkgs/pull/317636, which
is now in our channel, so we update nixpkgs compared to the original
iteration of this to simply get that.
We originally had a regression related to some reorganization of the
nixpkgs lib test suite in which there was broken parameter passing.
This, too, we got quickfixed in nixpkgs, so we don't need any changes
for it: https://github.com/NixOS/nixpkgs/pull/317772
Related: https://gerrit.lix.systems/c/lix/+/1428
Fixes: https://git.lix.systems/lix-project/lix/issues/385
Change-Id: I26d41ea826fec900ebcad0f82a727feb6bcd28f3
2024-06-08 14:57:08 +00:00
|
|
|
|
testWithNix = import (nixpkgs + "/lib/tests/test-with-nix.nix") { inherit pkgs lib nix; };
|
|
|
|
|
in
|
|
|
|
|
pkgs.symlinkJoin {
|
|
|
|
|
name = "nixpkgs-lib-tests";
|
|
|
|
|
paths =
|
|
|
|
|
[ testWithNix ]
|
|
|
|
|
# FIXME: This is disabled on darwin due to a nixpkgs bug https://github.com/NixOS/nixpkgs/issues/319147
|
|
|
|
|
# After that is fixed, it should be restored to use lib/tests/release.nix as before, rather than this reimplementation.
|
|
|
|
|
++ lib.optionals pkgs.stdenv.isLinux [
|
|
|
|
|
(import (nixpkgs + "/pkgs/test/release") { inherit pkgs lib nix; })
|
|
|
|
|
];
|
2024-04-04 23:07:44 +00:00
|
|
|
|
}
|
|
|
|
|
);
|
2024-03-05 20:11:59 +00:00
|
|
|
|
};
|
2024-03-27 17:16:16 +00:00
|
|
|
|
|
2024-05-07 04:54:18 +00:00
|
|
|
|
pre-commit = forAvailableSystems (
|
2024-04-08 03:05:19 +00:00
|
|
|
|
system:
|
|
|
|
|
let
|
|
|
|
|
pkgs = nixpkgsFor.${system}.native;
|
2024-05-07 04:54:18 +00:00
|
|
|
|
pre-commit-check = import ./misc/pre-commit.nix { inherit self pkgs pre-commit-hooks; };
|
|
|
|
|
# dotnet-sdk_6, a nativeBuildInputs of pre-commit, is broken on i686-linux.
|
|
|
|
|
available = lib.meta.availableOn { inherit system; } pkgs.dotnet-sdk_6;
|
2024-04-08 03:05:19 +00:00
|
|
|
|
in
|
2024-05-07 04:54:18 +00:00
|
|
|
|
lib.optionalAttrs available pre-commit-check
|
2024-04-08 03:05:19 +00:00
|
|
|
|
);
|
2021-10-15 10:36:29 +00:00
|
|
|
|
};
|
|
|
|
|
|
2024-05-31 23:35:13 +00:00
|
|
|
|
release-jobs = import ./releng/release-jobs.nix {
|
|
|
|
|
inherit (self) hydraJobs;
|
|
|
|
|
pkgs = nixpkgsFor.x86_64-linux.native;
|
|
|
|
|
};
|
|
|
|
|
|
2024-04-06 13:25:37 +00:00
|
|
|
|
# NOTE *do not* add fresh derivations to checks, always add them to
|
|
|
|
|
# hydraJobs first (so CI will pick them up) and only link them here
|
2024-05-07 04:54:18 +00:00
|
|
|
|
checks = forAvailableSystems (
|
2024-04-04 23:07:44 +00:00
|
|
|
|
system:
|
|
|
|
|
{
|
2024-06-11 19:42:51 +00:00
|
|
|
|
# devShells and packages already get checked by nix flake check, so
|
|
|
|
|
# this is just jobs that are special
|
|
|
|
|
|
2024-04-04 23:07:44 +00:00
|
|
|
|
binaryTarball = self.hydraJobs.binaryTarball.${system};
|
|
|
|
|
perlBindings = self.hydraJobs.perlBindings.${system};
|
|
|
|
|
nixpkgsLibTests = self.hydraJobs.tests.nixpkgsLibTests.${system};
|
|
|
|
|
rl-next = self.hydraJobs.rl-next.${system}.user;
|
2024-05-07 04:54:18 +00:00
|
|
|
|
# Will be empty attr set on i686-linux, and filtered out by forAvailableSystems.
|
2024-04-04 23:07:44 +00:00
|
|
|
|
pre-commit = self.hydraJobs.pre-commit.${system};
|
2024-05-27 07:58:49 +00:00
|
|
|
|
repl-completion = self.hydraJobs.repl-completion.${system};
|
2024-04-04 23:07:44 +00:00
|
|
|
|
}
|
|
|
|
|
// (lib.optionalAttrs (builtins.elem system linux64BitSystems)) {
|
|
|
|
|
dockerImage = self.hydraJobs.dockerImage.${system};
|
|
|
|
|
}
|
|
|
|
|
);
|
|
|
|
|
|
|
|
|
|
packages = forAllSystems (
|
|
|
|
|
system:
|
|
|
|
|
rec {
|
|
|
|
|
inherit (nixpkgsFor.${system}.native) nix;
|
|
|
|
|
default = nix;
|
|
|
|
|
}
|
|
|
|
|
// (
|
|
|
|
|
lib.optionalAttrs (builtins.elem system linux64BitSystems) {
|
|
|
|
|
nix-static = nixpkgsFor.${system}.static.nix;
|
|
|
|
|
dockerImage =
|
|
|
|
|
let
|
|
|
|
|
pkgs = nixpkgsFor.${system}.native;
|
2024-06-07 08:35:26 +00:00
|
|
|
|
nix2container' = import nix2container { inherit pkgs system; };
|
2024-04-04 23:07:44 +00:00
|
|
|
|
in
|
2024-06-07 08:35:26 +00:00
|
|
|
|
import ./docker.nix {
|
|
|
|
|
inherit pkgs;
|
|
|
|
|
nix2container = nix2container'.nix2container;
|
|
|
|
|
tag = pkgs.nix.version;
|
|
|
|
|
};
|
2024-04-04 23:07:44 +00:00
|
|
|
|
}
|
|
|
|
|
// builtins.listToAttrs (
|
|
|
|
|
map (crossSystem: {
|
|
|
|
|
name = "nix-${crossSystem}";
|
|
|
|
|
value = nixpkgsFor.${system}.cross.${crossSystem}.nix;
|
|
|
|
|
}) crossSystems
|
|
|
|
|
)
|
|
|
|
|
// builtins.listToAttrs (
|
|
|
|
|
map (stdenvName: {
|
|
|
|
|
name = "nix-${stdenvName}";
|
|
|
|
|
value = nixpkgsFor.${system}.stdenvs."${stdenvName}Packages".nix;
|
|
|
|
|
}) stdenvs
|
|
|
|
|
)
|
|
|
|
|
)
|
|
|
|
|
);
|
|
|
|
|
|
|
|
|
|
devShells =
|
|
|
|
|
let
|
|
|
|
|
makeShell =
|
|
|
|
|
pkgs: stdenv:
|
|
|
|
|
let
|
|
|
|
|
nix = pkgs.callPackage ./package.nix {
|
2024-06-06 21:06:07 +00:00
|
|
|
|
inherit stdenv officialRelease versionSuffix;
|
2024-04-04 23:07:44 +00:00
|
|
|
|
busybox-sandbox-shell = pkgs.busybox-sandbox-shell or pkgs.default-busybox-sandbox;
|
2024-06-24 22:57:38 +00:00
|
|
|
|
internalApiDocs = false;
|
2024-04-04 23:07:44 +00:00
|
|
|
|
};
|
|
|
|
|
pre-commit = self.hydraJobs.pre-commit.${pkgs.system} or { };
|
|
|
|
|
in
|
2024-05-07 21:25:08 +00:00
|
|
|
|
pkgs.callPackage nix.mkDevShell {
|
|
|
|
|
pre-commit-checks = pre-commit;
|
|
|
|
|
inherit contribNotice;
|
|
|
|
|
};
|
2022-03-02 02:40:18 +00:00
|
|
|
|
in
|
2024-04-04 23:07:44 +00:00
|
|
|
|
forAllSystems (
|
|
|
|
|
system:
|
2022-03-02 02:40:18 +00:00
|
|
|
|
let
|
2024-04-04 23:07:44 +00:00
|
|
|
|
makeShells =
|
|
|
|
|
prefix: pkgs:
|
|
|
|
|
lib.mapAttrs' (k: v: lib.nameValuePair "${prefix}-${k}" v) (
|
|
|
|
|
forAllStdenvs (stdenvName: makeShell pkgs pkgs.${stdenvName})
|
|
|
|
|
);
|
2022-03-02 02:40:18 +00:00
|
|
|
|
in
|
2024-04-04 23:07:44 +00:00
|
|
|
|
(makeShells "native" nixpkgsFor.${system}.native)
|
|
|
|
|
// (makeShells "static" nixpkgsFor.${system}.static)
|
|
|
|
|
// (forAllCrossSystems (
|
|
|
|
|
crossSystem:
|
|
|
|
|
let
|
|
|
|
|
pkgs = nixpkgsFor.${system}.cross.${crossSystem};
|
|
|
|
|
in
|
|
|
|
|
makeShell pkgs pkgs.stdenv
|
|
|
|
|
))
|
|
|
|
|
// {
|
|
|
|
|
default = self.devShells.${system}.native-stdenvPackages;
|
|
|
|
|
}
|
2022-03-02 02:40:18 +00:00
|
|
|
|
);
|
2024-04-04 23:07:44 +00:00
|
|
|
|
};
|
2019-04-08 15:28:05 +00:00
|
|
|
|
}
|