Compare commits

...

21 commits

Author SHA1 Message Date
Ilya K f425f32a62 Rename nix-doc to lix-doc here too
Fixes build
2024-04-08 11:15:34 +03:00
jade 93ce1e3f5d Merge pull request 'overlay: fix builds of Lix after c21d11ac0' (#12) from qyriad/nixos-module:fixes/python-dep into main
Reviewed-on: lix-project/nixos-module#12
2024-04-06 04:30:25 +00:00
Qyriad 1b35b90445 overlay: fix builds of Lix after c21d11ac0
lix-project/lix/c21d11ac094d4f39215dba6763fcabc62341def4 added a direct
build dependency on Python.
2024-04-05 22:20:24 -06:00
jade 9515bc250a Merge pull request 'overlay: support nix-doc integration into Lix' (#11) from feature/nix-doc into main
Reviewed-on: lix-project/nixos-module#11
2024-04-03 22:48:05 +00:00
Lunaphied 54cc0918d4 overlay: support nix-doc integration into Lix 2024-04-03 15:55:27 -06:00
jade 2714f7ac02 Merge pull request 'Add LICENSE' (#10) from jade/license into main
Reviewed-on: lix-project/nixos-module#10
2024-04-03 20:08:18 +00:00
jade 48055468d5 Add LICENSE 2024-04-02 13:21:56 -07:00
jade a428fa24ae probably fix cross compilation 2024-04-02 00:41:06 -07:00
jade 9c691a4185 Merge pull request 'fix: pin nurl to upstream nix' (#9) from mweinelt/nixos-module:nurl-pin into main
Reviewed-on: lix-project/nixos-module#9
2024-03-29 07:16:53 +00:00
hexa 600fc154e4
fix: pin nurl to upstream nix
nix-init depends on nurl, so they need to use the same nix for nix-init
to not be rebuilt.
2024-03-29 02:27:19 +01:00
eldritch horrors 280c404856 flake.lock: update 2024-03-28 18:32:40 +01:00
eldritch horrors eabed5a04f fix: add cmake and toml11 to inputs
toml11 is needed anyway, cmake is only needed for meson. meson isn't
needed right now but let's not have this cause problems *again* soon
2024-03-28 18:32:00 +01:00
jade 5d64b01d02 Merge pull request 'fix: pin nix-init to upstream nix' (#8) from mweinelt/nixos-module:nix-init-pin into main
Reviewed-on: lix-project/nixos-module#8
2024-03-27 08:07:07 +00:00
hexa 7afd8fbb0d
fix: pin nix-init to upstream nix 2024-03-27 05:54:26 +01:00
jade 5d2b325d3a flake.lock: Update
Flake lock file updates:

• Updated input 'lix':
    'git+ssh://git@git.lix.systems/lix-project/lix.git?ref=refs/heads/main&rev=66ccc93eeded1ab77281600bd41d6b0d8d8bf43a' (2024-03-25)
  → 'git+ssh://git@git.lix.systems/lix-project/lix.git?ref=refs/heads/main&rev=0be766c12de6badbbfa4fb9f76b6688b04d81059' (2024-03-25)
2024-03-25 13:45:09 -07:00
jade 1062d3c1ff Add version suffix in nixos module 2024-03-25 13:44:56 -07:00
jade f8b5d0bc9c flake.lock: Update
Flake lock file updates:

• Updated input 'lix':
    'git+ssh://git@git.lix.systems/lix-project/lix.git?ref=refs/heads/main&rev=d26eccebfc1f0d3f5b77e781ffc6455f05f8f90c' (2024-03-24)
  → 'git+ssh://git@git.lix.systems/lix-project/lix.git?ref=refs/heads/main&rev=66ccc93eeded1ab77281600bd41d6b0d8d8bf43a' (2024-03-25)
2024-03-24 21:32:14 -07:00
Qyriad adbbecb518 Merge pull request 'Add gitignore' (#6) from emilytrau/nixos-module:emilytrau/gitignore into main
Reviewed-on: lix-project/nixos-module#6
2024-03-25 03:03:56 +00:00
Emily Trau ebdf6e66ae Add gitignore 2024-03-25 13:57:03 +11:00
jade 30a7b8f7c8 Update lix and add system profile 2024-03-24 17:17:53 -07:00
jade 41990c5d80 Add system profile 2024-03-24 17:14:18 -07:00
7 changed files with 99 additions and 28 deletions

2
.gitignore vendored Normal file
View file

@ -0,0 +1,2 @@
result
result-*

19
LICENSE Normal file
View file

@ -0,0 +1,19 @@
MIT License
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is furnished
to do so, subject to the following conditions:
The above copyright notice and this permission notice (including the next
paragraph) shall be included in all copies or substantial portions of the
Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS
OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

View file

@ -33,14 +33,29 @@
"type": "github"
}
},
"flakey-profile": {
"locked": {
"lastModified": 1711325813,
"narHash": "sha256-ygJR5VikyCfK0CUJHboOKJVr6s9HQ1RXcvFEFnv+KIk=",
"owner": "lf-",
"repo": "flakey-profile",
"rev": "3b32c4a71f89b874fe0be2dc125eacb9c3473204",
"type": "github"
},
"original": {
"owner": "lf-",
"repo": "flakey-profile",
"type": "github"
}
},
"lix": {
"flake": false,
"locked": {
"lastModified": 1710788611,
"narHash": "sha256-nBiCx4mfntmJNv1MxVS3KmDeFzusxWC4ZdwKCT4noQw=",
"lastModified": 1712180067,
"narHash": "sha256-XU32CuKt0wXB8Ws5P3pZFMlYIMVx9om1GycYpITAwZ0=",
"ref": "refs/heads/main",
"rev": "f256e3c5c69c7aa658ff6e8fd9c05063a1e9ace6",
"revCount": 15196,
"rev": "89c31953c58d8089c85ae7ab43a5c59bb0f9f69b",
"revCount": 15311,
"type": "git",
"url": "ssh://git@git.lix.systems/lix-project/lix.git"
},
@ -69,6 +84,7 @@
"inputs": {
"flake-compat": "flake-compat",
"flake-utils": "flake-utils",
"flakey-profile": "flakey-profile",
"lix": "lix",
"nixpkgs": "nixpkgs"
}

View file

@ -6,24 +6,26 @@
};
inputs.flake-utils.url = "github:numtide/flake-utils";
inputs.flake-compat.url = "git+ssh://git@git.lix.systems/lix-project/flake-compat";
inputs.flakey-profile.url = "github:lf-/flakey-profile";
outputs = inputs@{ self, nixpkgs, lix, flake-utils, ... }: {
inherit inputs;
nixosModules.default = import ./module.nix { inherit lix; };
overlays.default = import ./overlay.nix {
inherit lix;
versionSuffix = "pre${builtins.substring 0 8 lix.lastModifiedDate}-${lix.shortRev}";
};
} // flake-utils.lib.eachDefaultSystem (system:
let
pkgs = import nixpkgs {
inherit system;
overlays = [ self.overlays.default ];
};
in
{
inherit pkgs;
packages.default = pkgs.nixVersions.nix_2_18;
packages.nix-doc = pkgs.nix-doc;
});
outputs = inputs@{ self, nixpkgs, lix, flake-utils, flakey-profile, ... }:
let versionSuffix = "pre${builtins.substring 0 8 lix.lastModifiedDate}-${lix.shortRev}";
in {
inherit inputs;
nixosModules.default = import ./module.nix { inherit lix versionSuffix; };
overlays.default = import ./overlay.nix { inherit lix versionSuffix; };
} // flake-utils.lib.eachDefaultSystem (system:
let
pkgs = import nixpkgs {
inherit system;
overlays = [ self.overlays.default ];
};
in
{
inherit pkgs;
packages.default = pkgs.nixVersions.nix_2_18;
packages.nix-doc = pkgs.nix-doc;
packages.system-profile = import ./system-profile.nix { inherit pkgs flakey-profile; };
});
}

View file

@ -1,5 +1,5 @@
{ lix }:
{ lix, versionSuffix ? "" }:
{ pkgs, config, ... }:
{
nixpkgs.overlays = [ (import ./overlay.nix { inherit lix; }) ];
nixpkgs.overlays = [ (import ./overlay.nix { inherit lix versionSuffix; }) ];
}

View file

@ -14,6 +14,9 @@ let
];
})
);
# Internal nix-doc used by Lix.
lix-doc = final.callPackage (lix + "/lix-doc/package.nix") { };
in
{
nixVersions = prev.nixVersions // rec {
@ -24,10 +27,21 @@ in
version = "2.18.3-lix${versionSuffix}";
VERSION_SUFFIX = "-lix${versionSuffix}";
# We only include CMake so that Meson can locate toml11, which only ships CMake dependency metadata.
dontUseCmakeConfigure = true;
patches = [ ];
# FIXME: we don't know why this was not being picked up properly when
# included in nativeCheckInputs.
nativeBuildInputs = old.nativeBuildInputs or [ ] ++ [ final.git ];
buildInputs = old.buildInputs or [ ] ++ [
final.toml11
lix-doc
];
nativeBuildInputs = old.nativeBuildInputs or [ ] ++ [
final.buildPackages.cmake
# FIXME: we don't know why this was not being picked up properly when
# included in nativeCheckInputs.
final.buildPackages.git
final.buildPackages.python3
];
});
stable = nix_2_18;
nix_2_18_upstream = prev.nixVersions.nix_2_18;
@ -49,4 +63,12 @@ in
};
nix-doc = prev.callPackage ./nix-doc/package.nix { withPlugin = false; };
nix-init = prev.nix-init.override {
nix = final.nixVersions.nix_2_18_upstream;
};
nurl = prev.nurl.override {
nix = final.nixVersions.nix_2_18_upstream;
};
}

10
system-profile.nix Normal file
View file

@ -0,0 +1,10 @@
{ pkgs, flakey-profile }:
flakey-profile.lib.mkProfile {
inherit pkgs;
paths = with pkgs; [
cacert
nix
];
name = "system-profile";
extraSwitchArgs = [ "--profile" "/nix/var/nix/profiles/default" ];
}