k900/nixos-module
0
0
Fork 0
forked from lix-project/nixos-module
Code Pull requests Activity

Compare commits

base: k900:71f268f215dbd6d8755813d9674a4cd588f10552
Branches Tags
k900:main
k900:drop-patch
k900:prefetch-npm-fix
k900:jade/license
k900:chase-fixedpoint-failure
k900:jade/wtf
k900:flake-compat
lix-project:main
lix-project:release-2.90
lix-project:fix-build-release-notes
lix-project:fix-prefetch-npm-deps
lix-project:flake-input-with-git
lix-project:nogit-urls
lix-project:flake-input-https
lix-project:2.90.0-rc1
...
compare: k900:7f44f96df035ab6b4147da4b6720d84db139a496
Branches Tags
k900:drop-patch
k900:prefetch-npm-fix
k900:main
k900:jade/license
k900:chase-fixedpoint-failure
k900:jade/wtf
k900:flake-compat
lix-project:main
lix-project:release-2.90
lix-project:fix-build-release-notes
lix-project:fix-prefetch-npm-deps
lix-project:flake-input-with-git
lix-project:nogit-urls
lix-project:flake-input-https
lix-project:2.90.0-rc1

5 commits
71f268f215 ... 7f44f96df0

Author SHA1 Message Date
Ilya K 7f44f96df0 Drop boehm-gc patch, now included in nixpkgs 
Not actually included yet, please wait for staging-next before merging
 2024-05-03 18:53:33 +03:00
jade a792d328c4 Remove flake-compat, add readme 
flake-compat is a kind of unhelpful thing to add here since it makes it
impossible to update lix separately from its module when not using
flakes. We would like non-flakes users to not use the flake by using
module.nix directly.
 2024-05-02 20:02:34 -07:00
jade ae4a5342c1 update lix 2024-05-02 00:36:53 -07:00
jade 21907b875d update lix 2024-04-22 15:11:54 -07:00
jade fac4f00719 Fix eval on nixos-unstable following prefetch-npm-deps dep fix 
See: https://github.com/NixOS/nixpkgs/pull/304913

We want to support older nixpkgs too, so we feature detect if we need to
apply this change.

Closes: lix-project/nixos-module#18
 2024-04-22 14:59:54 -07:00
5 changed files with 23 additions and 40 deletions
Show stats Expand all files Collapse all files

5
README.md Normal file
View file

@ -0,0 +1,5 @@
# Lix NixOS module
See the [beta guide][beta-guide] for details on how to use this:
[beta-guide]: https://wiki.lix.systems/link/1

10
default.nix
View file

@ -1,10 +0,0 @@
(import
(
let lock = builtins.fromJSON (builtins.readFile ./flake.lock); in
fetchTarball {
url = lock.nodes.flake-compat.locked.url or "https://git.lix.systems/lix-project/flake-compat/archive/${lock.nodes.flake-compat.locked.rev}.tar.gz";
sha256 = lock.nodes.flake-compat.locked.narHash;
}
)
{ src = ./.; }
).defaultNix

30
flake.lock
View file

@ -1,20 +1,5 @@
{
"nodes": {
"flake-compat": {
"locked": {
"lastModified": 1696426674,
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
"ref": "refs/heads/master",
"rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
"revCount": 57,
"type": "git",
"url": "ssh://git@git.lix.systems/lix-project/flake-compat"
},
"original": {
"type": "git",
"url": "ssh://git@git.lix.systems/lix-project/flake-compat"
}
},
"flake-utils": {
"inputs": {
"systems": "systems"
@ -51,11 +36,11 @@
"lix": {
"flake": false,
"locked": {
"lastModified": 1713222580,
"narHash": "sha256-wWUZtNf1mSaO8B9mYWSR0AoYVQhryTZIW+b1yIYkAcs=",
"lastModified": 1714353561,
"narHash": "sha256-1OKjSB5kPw0Tnm/h4j1IZe6TfdX04QNbm1kn0q58Rls=",
"ref": "refs/heads/main",
"rev": "866c76c7f93442993eb84b4268811bc101b4d447",
"revCount": 15403,
"rev": "c0733f3cec9e5edd7fa3a4bf156b6ee065762fea",
"revCount": 15448,
"type": "git",
"url": "ssh://git@git.lix.systems/lix-project/lix.git"
},
@ -66,11 +51,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1709703039,
"narHash": "sha256-6hqgQ8OK6gsMu1VtcGKBxKQInRLHtzulDo9Z5jxHEFY=",
"lastModified": 1714253743,
"narHash": "sha256-mdTQw2XlariysyScCv2tTE45QSU9v/ezLcHJ22f0Nxc=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "9df3e30ce24fd28c7b3e2de0d986769db5d6225d",
"rev": "58a1abdbae3217ca6b702f03d3b35125d88a2994",
"type": "github"
},
"original": {
@ -82,7 +67,6 @@
},
"root": {
"inputs": {
"flake-compat": "flake-compat",
"flake-utils": "flake-utils",
"flakey-profile": "flakey-profile",
"lix": "lix",

1
flake.nix
View file

@ -5,7 +5,6 @@
flake = false;
};
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, flakey-profile, ... }:

17
overlay.nix
View file

@ -8,9 +8,6 @@ let
# for clown reasons this version is newer than the one in lix, we should
# fix this and update our nixpkgs pin
(prev.path + "/pkgs/tools/package-management/nix/patches/boehmgc-coroutine-sp-fallback.patch")
# https://github.com/ivmai/bdwgc/pull/586
(builtins.path { path = lix + "/boehmgc-traceable_allocator-public.diff"; name = "boehmgc-traceable_allocator-public.patch"; })
];
})
);
@ -24,6 +21,8 @@ let
# what commands and whatnot we support, so tell Nixpkgs that we're 2.18 (ish).
version = "2.18.3-lix${versionSuffix}";
};
inherit (prev) lib;
in
{
# used for things that one wouldn't necessarily want to update, but we
@ -54,9 +53,15 @@ in
prefetch-yarn-deps = prev.prefetch-yarn-deps.override {
nix = final.nixVersions.nix_2_18_upstream;
};
prefetch-npm-deps = prev.prefetch-npm-deps.override {
nix = final.nixVersions.nix_2_18_upstream;
};
# support both having and missing https://github.com/NixOS/nixpkgs/pull/304913
prefetch-npm-deps =
if (lib.functionArgs prev.prefetch-npm-deps.override) ? nix
then prev.prefetch-npm-deps.override {
nix = final.nixVersions.nix_2_18_upstream;
}
else prev.prefetch-npm-deps;
nix-prefetch-git = prev.nix-prefetch-git.override {
nix = final.nixVersions.nix_2_18_upstream;
};