magic_rb/dotfiles
1
0
Fork 0
mirror of https://git.sr.ht/~magic_rb/dotfiles synced 2024-11-22 16:04:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use specific nixpkgs pin for Hashicorp stuff

Browse source 
Signed-off-by: Magic_RB <magic_rb@redalder.org>
This commit is contained in:
Magic_RB 2023-04-03 01:26:58 +02:00
parent 13dc074960
commit 3f7585af77
No known key found for this signature in database
GPG key ID: 08D5287CC5DDCA0E
7 changed files with 62 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
flake.lock
View file

@ -752,6 +752,38 @@
"type": "sourcehut"
}
},
"nixpkgs-firefox": {
"locked": {
"lastModified": 1680213900,
"narHash": "sha256-cIDr5WZIj3EkKyCgj/6j3HBH4Jj1W296z7HTcWj1aMA=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "e3652e0735fbec227f342712f180f4f21f0594f2",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-hashicorp": {
"locked": {
"lastModified": 1680213900,
"narHash": "sha256-cIDr5WZIj3EkKyCgj/6j3HBH4Jj1W296z7HTcWj1aMA=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "e3652e0735fbec227f342712f180f4f21f0594f2",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-lib": {
"locked": {
"dir": "lib",

2
flake.nix
View file

@ -6,6 +6,8 @@
nixpkgs-stable.url = "github:NixOS/nixpkgs?ref=nixos-22.11";
nixpkgs.url = "sourcehut:~magic_rb/nixpkgs";
nixpkgs-master.url = "github:NixOS/nixpkgs?ref=master";
nixpkgs-hashicorp.url = "github:NixOS/nixpkgs?ref=nixos-unstable";
nixpkgs-firefox.url = "github:NixOS/nixpkgs?ref=nixos-unstable";
nixinate.url = "github:MagicRB/nixinate";
nixinate.inputs.nixpkgs.follows = "nixpkgs";

37
modules/devShells.nix
View file

@ -1,19 +1,26 @@
# SPDX-FileCopyrightText: 2022 Richard Brežák <richard@brezak.sk>
#
# SPDX-License-Identifier: LGPL-3.0-or-later
{...}: {
perSystem = {pkgs, ...}: {
devShells.default = pkgs.mkShell {
nativeBuildInputs = with pkgs; [
lefthook
alejandra
reuse
terraform
vault
nomad
consul
dnsutils
];
};
};
{ inputs, ... }:
{
perSystem = {pkgs, ...}:
let
pkgs-hashicorp = inputs.nixpkgs-hashicorp.legacyPackages.${pkgs.stdenv.system};
in
{
devShells.default = pkgs.mkShell {
nativeBuildInputs = with pkgs; [
lefthook
alejandra
reuse
pkgs-hashicorp.vault
pkgs-hashicorp.nomad
pkgs-hashicorp.consul
dnsutils
qemu_kvm
usbutils
jq
];
};
};
}

2
nixos/systems/blowhole/consul.nix
View file

@ -35,7 +35,7 @@ in
extraSettingsPaths =
[ "/run/secrets/consul.json"
];
package = pkgs.callPackage ("${inputs.nixpkgs-master}/pkgs/servers/consul/default.nix") {};
package = inputs.nixpkgs-hashicorp.legacyPackages.${pkgs.stdenv.system}.consul;
settings = {
datacenter = "homelab-1";

4
nixos/systems/blowhole/nomad.nix
View file

@ -1,4 +1,4 @@
{lib, config, pkgs, secret, ...}:
{inputs, lib, config, pkgs, secret, ...}:
with lib;
let
in
@ -38,7 +38,7 @@ in
extraSettingsPaths = [
"/run/secrets/nomad.json"
];
package = pkgs.nomad_1_3.overrideAttrs (old:
package = inputs.nixpkgs-hashicorp.legacyPackages.${pkgs.stdenv.system}.nomad_1_4.overrideAttrs (old:
{
patches = [
../0001-Revert-Change-consul-SI-tokens-to-be-local.patch

2
nixos/systems/toothpick/consul.nix
View file

@ -9,7 +9,7 @@ in
extraSettingsPaths =
[ "/run/secrets/consul.json"
];
package = pkgs.callPackage ("${inputs.nixpkgs-master}/pkgs/servers/consul/default.nix") {};
package = inputs.nixpkgs-hashicorp.legacyPackages.${pkgs.stdenv.system}.consul;
settings = {
datacenter = "do-1";

4
nixos/systems/toothpick/nomad.nix
View file

@ -1,4 +1,4 @@
{lib, config, pkgs, secret, ...}:
{lib, config, pkgs, inputs, secret, ...}:
with lib;
let
in
@ -10,7 +10,7 @@ in
extraSettingsPaths = [
"/run/secrets/nomad.json"
];
package = pkgs.nomad_1_3.overrideAttrs (old:
package = inputs.nixpkgs-hashicorp.legacyPackages.${pkgs.stdenv.system}.nomad_1_4.overrideAttrs (old:
{
patches = [
../0001-Revert-Change-consul-SI-tokens-to-be-local.patch