uninsane-dot-org: acquire by fetchFromGitea instead of flake
This commit is contained in:
parent
c9b7f58f3d
commit
197df696be
23
flake.lock
23
flake.lock
|
@ -52,28 +52,7 @@
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs-next-unpatched": "nixpkgs-next-unpatched",
|
"nixpkgs-next-unpatched": "nixpkgs-next-unpatched",
|
||||||
"nixpkgs-staging-unpatched": "nixpkgs-staging-unpatched",
|
"nixpkgs-staging-unpatched": "nixpkgs-staging-unpatched",
|
||||||
"nixpkgs-unpatched": "nixpkgs-unpatched",
|
"nixpkgs-unpatched": "nixpkgs-unpatched"
|
||||||
"uninsane-dot-org": "uninsane-dot-org"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"uninsane-dot-org": {
|
|
||||||
"inputs": {
|
|
||||||
"nixpkgs": [
|
|
||||||
"nixpkgs-unpatched"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1715894399,
|
|
||||||
"narHash": "sha256-h1EdA/h74zgNPNEYbH+0mgOMlJgLVcxuZ8/ewsZlgEc=",
|
|
||||||
"ref": "refs/heads/master",
|
|
||||||
"rev": "e6f88f563bdd1700c04018951de4f69862646dd1",
|
|
||||||
"revCount": 240,
|
|
||||||
"type": "git",
|
|
||||||
"url": "https://git.uninsane.org/colin/uninsane"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"type": "git",
|
|
||||||
"url": "https://git.uninsane.org/colin/uninsane"
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
20
flake.nix
20
flake.nix
|
@ -47,13 +47,6 @@
|
||||||
nixpkgs-staging-unpatched.url = "github:nixos/nixpkgs?ref=staging";
|
nixpkgs-staging-unpatched.url = "github:nixos/nixpkgs?ref=staging";
|
||||||
# nixpkgs-unpatched.url = "github:nixos/nixpkgs?ref=nixos-staging-next";
|
# nixpkgs-unpatched.url = "github:nixos/nixpkgs?ref=nixos-staging-next";
|
||||||
nixpkgs-next-unpatched.url = "github:nixos/nixpkgs?ref=staging-next";
|
nixpkgs-next-unpatched.url = "github:nixos/nixpkgs?ref=staging-next";
|
||||||
|
|
||||||
uninsane-dot-org = {
|
|
||||||
# provides the package to deploy <https://uninsane.org>, used only when building the servo host
|
|
||||||
url = "git+https://git.uninsane.org/colin/uninsane";
|
|
||||||
# inputs.nixpkgs.follows = "nixpkgs";
|
|
||||||
inputs.nixpkgs.follows = "nixpkgs-unpatched";
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = {
|
outputs = {
|
||||||
|
@ -61,7 +54,6 @@
|
||||||
nixpkgs-unpatched,
|
nixpkgs-unpatched,
|
||||||
nixpkgs-next-unpatched ? nixpkgs-unpatched,
|
nixpkgs-next-unpatched ? nixpkgs-unpatched,
|
||||||
nixpkgs-staging-unpatched ? nixpkgs-unpatched,
|
nixpkgs-staging-unpatched ? nixpkgs-unpatched,
|
||||||
uninsane-dot-org,
|
|
||||||
...
|
...
|
||||||
}@inputs:
|
}@inputs:
|
||||||
let
|
let
|
||||||
|
@ -131,7 +123,6 @@
|
||||||
self.nixosModules.passthru
|
self.nixosModules.passthru
|
||||||
{
|
{
|
||||||
nixpkgs.overlays = [
|
nixpkgs.overlays = [
|
||||||
self.overlays.passthru
|
|
||||||
self.overlays.sane-all
|
self.overlays.sane-all
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
@ -199,7 +190,6 @@
|
||||||
sane-all = final: prev: import ./overlays/all.nix final prev;
|
sane-all = final: prev: import ./overlays/all.nix final prev;
|
||||||
pkgs = final: prev: import ./overlays/pkgs.nix final prev;
|
pkgs = final: prev: import ./overlays/pkgs.nix final prev;
|
||||||
preferences = final: prev: import ./overlays/preferences.nix final prev;
|
preferences = final: prev: import ./overlays/preferences.nix final prev;
|
||||||
passthru = uninsane-dot-org.overlays.default;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
nixosModules = rec {
|
nixosModules = rec {
|
||||||
|
@ -220,7 +210,6 @@
|
||||||
(nixpkgsCompiledBy { inherit system variant; })
|
(nixpkgsCompiledBy { inherit system variant; })
|
||||||
.appendOverlays (
|
.appendOverlays (
|
||||||
[
|
[
|
||||||
self.overlays.passthru
|
|
||||||
self.overlays.pkgs
|
self.overlays.pkgs
|
||||||
] ++ additionalOverlays
|
] ++ additionalOverlays
|
||||||
);
|
);
|
||||||
|
@ -250,17 +239,12 @@
|
||||||
&& (passthruPkgs.lib.meta.availableOn passthruPkgs.stdenv.hostPlatform pkg)
|
&& (passthruPkgs.lib.meta.availableOn passthruPkgs.stdenv.hostPlatform pkg)
|
||||||
)
|
)
|
||||||
(
|
(
|
||||||
# expose sane packages and chosen inputs (uninsane.org)
|
import ./pkgs { pkgs = passthruPkgs; }
|
||||||
(import ./pkgs { pkgs = passthruPkgs; }) // {
|
|
||||||
inherit (passthruPkgs) uninsane-dot-org;
|
|
||||||
}
|
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
# self.legacyPackages;
|
# self.legacyPackages;
|
||||||
{
|
{
|
||||||
x86_64-linux = (nixpkgsCompiledBy { system = "x86_64-linux"; }).appendOverlays [
|
x86_64-linux = nixpkgsCompiledBy { system = "x86_64-linux"; };
|
||||||
self.overlays.passthru
|
|
||||||
];
|
|
||||||
}
|
}
|
||||||
;
|
;
|
||||||
|
|
||||||
|
|
12
pkgs/additional/uninsane-dot-org/default.nix
Normal file
12
pkgs/additional/uninsane-dot-org/default.nix
Normal file
|
@ -0,0 +1,12 @@
|
||||||
|
{ callPackage
|
||||||
|
, fetchFromGitea
|
||||||
|
}:
|
||||||
|
let
|
||||||
|
src = fetchFromGitea {
|
||||||
|
domain = "git.uninsane.org";
|
||||||
|
owner = "colin";
|
||||||
|
repo = "uninsane";
|
||||||
|
rev = "e6f88f563bdd1700c04018951de4f69862646dd1";
|
||||||
|
hash = "sha256-h1EdA/h74zgNPNEYbH+0mgOMlJgLVcxuZ8/ewsZlgEc=";
|
||||||
|
};
|
||||||
|
in callPackage "${src}/default.nix" { }
|
|
@ -93,6 +93,7 @@ let
|
||||||
tree-sitter-nix-shell = callPackage ./additional/tree-sitter-nix-shell { };
|
tree-sitter-nix-shell = callPackage ./additional/tree-sitter-nix-shell { };
|
||||||
trivial-builders = lib.recurseIntoAttrs (callPackage ./additional/trivial-builders { });
|
trivial-builders = lib.recurseIntoAttrs (callPackage ./additional/trivial-builders { });
|
||||||
uassets = callPackage ./additional/uassets { };
|
uassets = callPackage ./additional/uassets { };
|
||||||
|
uninsane-dot-org = callPackage ./additional/uninsane-dot-org { };
|
||||||
wvkbd-mk = callPackage ./additional/wvkbd-mk { };
|
wvkbd-mk = callPackage ./additional/wvkbd-mk { };
|
||||||
inherit (trivial-builders)
|
inherit (trivial-builders)
|
||||||
copyIntoOwnPackage
|
copyIntoOwnPackage
|
||||||
|
|
Loading…
Reference in New Issue
Block a user