chore(3p): obtain home-manager source from upstream directly
Instead of waiting for nixpkgs to [update home-manager], we can track the upstream repository directly (using master as a channel seems to be common practice) and overlay the up to date source into our nixpkgs instance. For //users/tazjin/home and //users/wpcarro/nixos/marcus, we need to set `home.stateVersion`, since the default value for this option was removed some time this summer. [update home-manager]: https://github.com/NixOS/nixpkgs/issues/197907 Change-Id: I8c153fb7d3b55a4040652a5d619761b640119105 Reviewed-on: https://cl.tvl.fyi/c/depot/+/7098 Reviewed-by: tazjin <tazjin@tvl.su> Reviewed-by: wpcarro <wpcarro@gmail.com> Autosubmit: sterni <sternenseemann@systemli.org> Tested-by: BuildkiteCI
This commit is contained in:
parent
ab49498b40
commit
b2de59e47c
4 changed files with 24 additions and 0 deletions
6
third_party/overlays/tvl.nix
vendored
6
third_party/overlays/tvl.nix
vendored
|
@ -28,6 +28,12 @@ in
|
||||||
|
|
||||||
nix_latest = super.nix;
|
nix_latest = super.nix;
|
||||||
|
|
||||||
|
home-manager = super.home-manager.overrideAttrs (_: {
|
||||||
|
src = depot.third_party.sources.home-manager;
|
||||||
|
version = "git-"
|
||||||
|
+ builtins.substring 0 7 depot.third_party.sources.home-manager.rev;
|
||||||
|
});
|
||||||
|
|
||||||
clang-tools_11 = self.clang-tools.override {
|
clang-tools_11 = self.clang-tools.override {
|
||||||
llvmPackages = self.llvmPackages_11;
|
llvmPackages = self.llvmPackages_11;
|
||||||
};
|
};
|
||||||
|
|
12
third_party/sources/sources.json
vendored
12
third_party/sources/sources.json
vendored
|
@ -23,6 +23,18 @@
|
||||||
"url": "https://github.com/nix-community/emacs-overlay/archive/91c29a0653afdbda4e75c37babdc1c598a2d13f5.tar.gz",
|
"url": "https://github.com/nix-community/emacs-overlay/archive/91c29a0653afdbda4e75c37babdc1c598a2d13f5.tar.gz",
|
||||||
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
|
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
|
||||||
},
|
},
|
||||||
|
"home-manager": {
|
||||||
|
"branch": "master",
|
||||||
|
"description": "Manage a user environment using Nix [maintainer=@rycee] ",
|
||||||
|
"homepage": "https://nix-community.github.io/home-manager/",
|
||||||
|
"owner": "nix-community",
|
||||||
|
"repo": "home-manager",
|
||||||
|
"rev": "7dc4e4ebd71280842b4d30975439980baaac9db8",
|
||||||
|
"sha256": "1qlpcwdb1ar5a4f8cfa0apn185g6qzpm8bafaajmca5l20png0wh",
|
||||||
|
"type": "tarball",
|
||||||
|
"url": "https://github.com/nix-community/home-manager/archive/7dc4e4ebd71280842b4d30975439980baaac9db8.tar.gz",
|
||||||
|
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
|
||||||
|
},
|
||||||
"impermanence": {
|
"impermanence": {
|
||||||
"branch": "master",
|
"branch": "master",
|
||||||
"description": "Modules to help you handle persistent state on systems with ephemeral root storage [maintainer=@talyz]",
|
"description": "Modules to help you handle persistent state on systems with ephemeral root storage [maintainer=@talyz]",
|
||||||
|
|
|
@ -87,4 +87,7 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
systemd.user.startServices = true;
|
systemd.user.startServices = true;
|
||||||
|
|
||||||
|
# Previous default version, see https://github.com/nix-community/home-manager/blob/master/docs/release-notes/rl-2211.adoc
|
||||||
|
home.stateVersion = "18.09";
|
||||||
}
|
}
|
||||||
|
|
|
@ -147,6 +147,9 @@ in
|
||||||
};
|
};
|
||||||
|
|
||||||
systemd.user.startServices = true;
|
systemd.user.startServices = true;
|
||||||
|
|
||||||
|
# Previous default version, see https://github.com/nix-community/home-manager/blob/master/docs/release-notes/rl-2211.adoc
|
||||||
|
home.stateVersion = "18.09";
|
||||||
};
|
};
|
||||||
|
|
||||||
environment.systemPackages =
|
environment.systemPackages =
|
||||||
|
|
Loading…
Reference in a new issue