diff options
| author | sterni <sternenseemann@systemli.org> | 2022-10-26T13·39+0200 |
|---|---|---|
| committer | clbot <clbot@tvl.fyi> | 2022-10-27T12·05+0000 |
| commit | b2de59e47c5fa0bf83aedc2125ec18d43c8d4b0f (patch) | |
| tree | 52722e16dc8ade89a5a5c4900c74640085c1e851 | |
| parent | ab49498b4001af727585aff34f5a773ef8603eba (diff) | |
chore(3p): obtain home-manager source from upstream directly r/5210
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
| -rw-r--r-- | third_party/overlays/tvl.nix | 6 | ||||
| -rw-r--r-- | third_party/sources/sources.json | 12 | ||||
| -rw-r--r-- | users/tazjin/home/shared.nix | 3 | ||||
| -rw-r--r-- | users/wpcarro/nixos/marcus/default.nix | 3 |
4 files changed, 24 insertions, 0 deletions
diff --git a/third_party/overlays/tvl.nix b/third_party/overlays/tvl.nix index afa1c6cdeec4..5efb87745e22 100644 --- a/third_party/overlays/tvl.nix +++ b/third_party/overlays/tvl.nix @@ -28,6 +28,12 @@ in 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 { llvmPackages = self.llvmPackages_11; }; diff --git a/third_party/sources/sources.json b/third_party/sources/sources.json index 0c6cf6a7b0d8..9b7b689a6cea 100644 --- a/third_party/sources/sources.json +++ b/third_party/sources/sources.json @@ -23,6 +23,18 @@ "url": "https://github.com/nix-community/emacs-overlay/archive/91c29a0653afdbda4e75c37babdc1c598a2d13f5.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": { "branch": "master", "description": "Modules to help you handle persistent state on systems with ephemeral root storage [maintainer=@talyz]", diff --git a/users/tazjin/home/shared.nix b/users/tazjin/home/shared.nix index 87ee05475e60..e2d51b4b04d0 100644 --- a/users/tazjin/home/shared.nix +++ b/users/tazjin/home/shared.nix @@ -87,4 +87,7 @@ }; 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"; } diff --git a/users/wpcarro/nixos/marcus/default.nix b/users/wpcarro/nixos/marcus/default.nix index fb7470a0e742..355b50e17422 100644 --- a/users/wpcarro/nixos/marcus/default.nix +++ b/users/wpcarro/nixos/marcus/default.nix @@ -147,6 +147,9 @@ in }; 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 = |