diff options
| author | sterni <sternenseemann@systemli.org> | 2022-01-27T10·33+0100 |
|---|---|---|
| committer | sterni <sternenseemann@systemli.org> | 2022-01-28T10·43+0000 |
| commit | 6a897551ccd04099dc93c052cb91fb768bea664b (patch) | |
| tree | 2a4e7d46d7481c4958eb6c266000036b444ab8cc | |
| parent | 6908d960b24072043923adcd6ecc0aa128496187 (diff) | |
chore(3p): bump NixOS channels to 2022-01-27 r/3693
Use a nixos-unstable revision the channel has not yet advanced to (but the tested jobset has succeeded already), so we'll benefit from the polkit security update. * //users/grfn/home/games: replace multimc with polymc. Seems like this is the conclusion in in the trademark saga. * //third_party/terrform-provider-glesys: use new mkProvider interface See https://github.com/nixos/nixpkgs/commit/e7dbfd7ece0e Change-Id: Ieb76a3d73c42ce1fa34050ac797fa4e3a905e8ef Reviewed-on: https://cl.tvl.fyi/c/depot/+/5075 Tested-by: BuildkiteCI Reviewed-by: tazjin <tazjin@tvl.su> Reviewed-by: grfn <grfn@gws.fyi>
| -rw-r--r-- | third_party/nixpkgs/default.nix | 12 | ||||
| -rw-r--r-- | third_party/terraform-provider-glesys/default.nix | 16 | ||||
| -rw-r--r-- | users/grfn/system/home/modules/games.nix | 2 |
3 files changed, 13 insertions, 17 deletions
diff --git a/third_party/nixpkgs/default.nix b/third_party/nixpkgs/default.nix index 27a5a8673e..5afed93e4c 100644 --- a/third_party/nixpkgs/default.nix +++ b/third_party/nixpkgs/default.nix @@ -13,16 +13,16 @@ let # nixos-unstable, and the current stable channel of the latest NixOS # release. - # Tracking nixos-unstable as of 2022-01-15. + # Tracking nixos-unstable as of 2022-01-27. unstableHashes = { - commit = "5aaed40d22f0d9376330b6fa413223435ad6fee5"; - sha256 = "0bs8sr92lzz7mdrlv143draq3j7l42dj69w3px1x31qcr3n5pgcv"; + commit = "945ec499041db73043f745fad3b2a3a01e826081"; + sha256 = "1ixv310sjw0r5vda4yfwp3snyha2i9h7aqygd43cyvdk2qsjk8pq"; }; - # Tracking nixos-21.11 as of 2022-01-16. + # Tracking nixos-21.11 as of 2022-01-26. stableHashes = { - commit = "3ddd960a3b575bf3230d0e59f42614b71f9e0db9"; - sha256 = "1sk60h584gfdf5ql3mv4hps6jly6yj6dc5fbkfkh082z1c8885vk"; + commit = "b3d86c56c786ad9530f1400adbd4dfac3c42877b"; + sha256 = "09nslcjdgwwb6j9alxrsnq1wvhifq1nmzl2w02l305j0wsmgdial"; }; # import the nixos-unstable package set, or optionally use the diff --git a/third_party/terraform-provider-glesys/default.nix b/third_party/terraform-provider-glesys/default.nix index a944af34f9..51582fd609 100644 --- a/third_party/terraform-provider-glesys/default.nix +++ b/third_party/terraform-provider-glesys/default.nix @@ -3,21 +3,17 @@ # Some TVL resources (DNS, object storage, ...) are hosted with them. { pkgs, ... }: -pkgs.buildGoModule rec { - pname = "terraform-provider-glesys"; +pkgs.terraform-providers.mkProvider rec { version = "0.3.1"; - src = pkgs.fetchFromGitHub { - owner = "glesys"; - repo = pname; - rev = "v${version}"; - sha256 = "1rcwzf31gdxjywkcnlq1nxv4y8fcrc2z2xrp73q61mglv01bqq8m"; - }; + owner = "glesys"; + repo = "terraform-provider-glesys"; + rev = "v${version}"; + sha256 = "1rcwzf31gdxjywkcnlq1nxv4y8fcrc2z2xrp73q61mglv01bqq8m"; vendorSha256 = "0g5g69absf0vmin0ff0anrxcgfq0bzx4iz3qci90p9xkvyph4nlw"; - postInstall = "mv $out/bin/${pname}{,_v${version}}"; # This provider is not officially published in the TF registry, so # we're giving it a fake source here. - passthru.provider-source-address = "registry.terraform.io/depot/glesys"; + provider-source-address = "registry.terraform.io/depot/glesys"; } diff --git a/users/grfn/system/home/modules/games.nix b/users/grfn/system/home/modules/games.nix index da54f99e5b..26dc9d31f3 100644 --- a/users/grfn/system/home/modules/games.nix +++ b/users/grfn/system/home/modules/games.nix @@ -53,7 +53,7 @@ in mkMerge [ (mkIf stdenv.isLinux { home.packages = [ df - multimc + polymc ]; }) ] |