move overlays from flake.nix -> cerulean/default.nix
This commit is contained in:
parent
99e03effce
commit
9202fa8678
2 changed files with 23 additions and 18 deletions
|
|
@ -11,10 +11,26 @@
|
||||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
# See the License for the specific language governing permissions and
|
# See the License for the specific language governing permissions and
|
||||||
# limitations under the License.
|
# limitations under the License.
|
||||||
{mix, ...} @ inputs:
|
{
|
||||||
|
mix,
|
||||||
|
deploy-rs,
|
||||||
|
...
|
||||||
|
} @ inputs:
|
||||||
mix.mkMod (mix.newMixture {specialArgs = inputs;})
|
mix.mkMod (mix.newMixture {specialArgs = inputs;})
|
||||||
(mixture: {
|
(mixture: {
|
||||||
includes.public = [
|
includes.public = [
|
||||||
./flake-config
|
./flake-config
|
||||||
];
|
];
|
||||||
|
|
||||||
|
overlays = [
|
||||||
|
# build deploy-rs as a package not from the flake input,
|
||||||
|
# hence we can rely on a nixpkg binary cache.
|
||||||
|
deploy-rs.overlays.default
|
||||||
|
(self: super: {
|
||||||
|
deploy-rs = {
|
||||||
|
inherit (super) deploy-rs;
|
||||||
|
lib = super.deploy-rs.lib;
|
||||||
|
};
|
||||||
|
})
|
||||||
|
];
|
||||||
})
|
})
|
||||||
|
|
|
||||||
23
flake.nix
23
flake.nix
|
|
@ -35,10 +35,12 @@
|
||||||
nixpkgs,
|
nixpkgs,
|
||||||
nixpkgs-unstable,
|
nixpkgs-unstable,
|
||||||
nib,
|
nib,
|
||||||
deploy-rs,
|
|
||||||
...
|
...
|
||||||
} @ inputs: let
|
} @ inputs: let
|
||||||
lib = nixpkgs.lib;
|
inherit
|
||||||
|
(nixpkgs)
|
||||||
|
lib
|
||||||
|
;
|
||||||
|
|
||||||
sys = nib.mkUSys {
|
sys = nib.mkUSys {
|
||||||
pkgs = nib.withPkgs nixpkgs {
|
pkgs = nib.withPkgs nixpkgs {
|
||||||
|
|
@ -49,19 +51,6 @@
|
||||||
config.allowUnfree = false;
|
config.allowUnfree = false;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
in
|
||||||
cerulean = import ./cerulean {inherit inputs lib sys;};
|
import ./cerulean <| inputs // {inherit lib sys;};
|
||||||
in {
|
|
||||||
overlays = [
|
|
||||||
# build deploy-rs as a package not from the flake input,
|
|
||||||
# hence we can rely on a nixpkg binary cache.
|
|
||||||
deploy-rs.overlays.default
|
|
||||||
(self: super: {
|
|
||||||
deploy-rs = {
|
|
||||||
inherit (super) deploy-rs;
|
|
||||||
lib = super.deploy-rs.lib;
|
|
||||||
};
|
|
||||||
})
|
|
||||||
];
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue