forked from lix-project/nixos-module
put prerelease info in the version
This commit is contained in:
parent
057c652b5d
commit
9b5adef52d
|
@ -7,9 +7,13 @@
|
||||||
inputs.flake-utils.url = "github:numtide/flake-utils";
|
inputs.flake-utils.url = "github:numtide/flake-utils";
|
||||||
inputs.flake-compat.url = "git+ssh://git@git.lix.systems/lix-project/flake-compat";
|
inputs.flake-compat.url = "git+ssh://git@git.lix.systems/lix-project/flake-compat";
|
||||||
|
|
||||||
outputs = { self, nixpkgs, lix, flake-utils, ... }: {
|
outputs = inputs@{ self, nixpkgs, lix, flake-utils, ... }: {
|
||||||
|
inherit inputs;
|
||||||
nixosModules.default = import ./module.nix { inherit lix; };
|
nixosModules.default = import ./module.nix { inherit lix; };
|
||||||
overlays.default = import ./overlay.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:
|
} // flake-utils.lib.eachDefaultSystem (system:
|
||||||
let
|
let
|
||||||
pkgs = import nixpkgs {
|
pkgs = import nixpkgs {
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{ lix }:
|
{ lix, versionSuffix ? "" }:
|
||||||
final: prev:
|
final: prev:
|
||||||
let
|
let
|
||||||
boehmgc-patched = ((final.boehmgc.override {
|
boehmgc-patched = ((final.boehmgc.override {
|
||||||
|
@ -21,8 +21,8 @@ in
|
||||||
nix_2_18 = (prev.nixVersions.nix_2_18.override { boehmgc = boehmgc-patched; }).overrideAttrs (old: {
|
nix_2_18 = (prev.nixVersions.nix_2_18.override { boehmgc = boehmgc-patched; }).overrideAttrs (old: {
|
||||||
src = lix;
|
src = lix;
|
||||||
# FIXME: fake version so that nixpkgs will not try to use nix config >_>
|
# FIXME: fake version so that nixpkgs will not try to use nix config >_>
|
||||||
version = "2.18.3-lix";
|
version = "2.18.3-lix${versionSuffix}";
|
||||||
VERSION_SUFFIX = "-lix";
|
VERSION_SUFFIX = "-lix${versionSuffix}";
|
||||||
|
|
||||||
patches = [ ];
|
patches = [ ];
|
||||||
# FIXME: we don't know why this was not being picked up properly when
|
# FIXME: we don't know why this was not being picked up properly when
|
||||||
|
|
Loading…
Reference in a new issue