forked from DGNum/infrastructure
chore(npins): Remove nixpkgs, use nixos-unstable instead
This commit is contained in:
parent
91cd3c9c07
commit
9219e8a9c5
6 changed files with 4 additions and 39 deletions
|
@ -760,35 +760,6 @@ jobs:
|
||||||
-o simple | grep \"$COMMIT_MESSAGE dgnum-chores\") ]; then\n tea pr create
|
-o simple | grep \"$COMMIT_MESSAGE dgnum-chores\") ]; then\n tea pr create
|
||||||
--description \"Automatic npins update\" --title \"$COMMIT_MESSAGE\" --head
|
--description \"Automatic npins update\" --title \"$COMMIT_MESSAGE\" --head
|
||||||
\"$GIT_UPDATE_BRANCH\"\n fi\nfi\n"
|
\"$GIT_UPDATE_BRANCH\"\n fi\nfi\n"
|
||||||
nixpkgs:
|
|
||||||
runs-on: nix
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v3
|
|
||||||
with:
|
|
||||||
fetch-depth: 0
|
|
||||||
token: ${{ secrets.TEA_DGNUM_CHORES_TOKEN }}
|
|
||||||
- env:
|
|
||||||
GIT_UPDATE_BRANCH: npins-updates/nixpkgs
|
|
||||||
name: Switch to a new branch
|
|
||||||
run: "if git ls-remote --exit-code --heads origin \"refs/heads/$GIT_UPDATE_BRANCH\"\
|
|
||||||
; then\n git switch \"$GIT_UPDATE_BRANCH\"\n git rebase main\n echo \"\
|
|
||||||
EXISTING_BRANCH=1\" >> $GITHUB_ENV\nelse\n git switch -C \"$GIT_UPDATE_BRANCH\"\
|
|
||||||
\nfi\n"
|
|
||||||
- env:
|
|
||||||
COMMIT_MESSAGE: 'chore(npins): Update nixpkgs'
|
|
||||||
GIT_UPDATE_BRANCH: npins-updates/nixpkgs
|
|
||||||
name: Open a PR if updates are present
|
|
||||||
run: "npins update nixpkgs\n\nif [ ! -z \"$(git diff --name-only)\" ]; then\n\
|
|
||||||
\ echo \"[+] Changes detected, pushing updates.\"\n\n git add npins\n\n\
|
|
||||||
\ if [ -n \"$EXISTING_BRANCH\" ]; then\n git commit --amend --no-edit\n\
|
|
||||||
\ git push --force\n else\n git commit --message \"$COMMIT_MESSAGE\"\
|
|
||||||
\n git push -u origin \"$GIT_UPDATE_BRANCH\"\n fi\n\n # Connect to the
|
|
||||||
server with the cli\n tea login add -n dgnum-chores -t \"${{ secrets.TEA_DGNUM_CHORES_TOKEN
|
|
||||||
}}\" -u https://git.dgnum.eu\n\n # Create a pull request if needed\n # i.e.
|
|
||||||
no PR with the same title exists\n if [ -z $(tea pr ls -f='title,author'
|
|
||||||
-o simple | grep \"$COMMIT_MESSAGE dgnum-chores\") ]; then\n tea pr create
|
|
||||||
--description \"Automatic npins update\" --title \"$COMMIT_MESSAGE\" --head
|
|
||||||
\"$GIT_UPDATE_BRANCH\"\n fi\nfi\n"
|
|
||||||
proxmox-nixos:
|
proxmox-nixos:
|
||||||
runs-on: nix
|
runs-on: nix
|
||||||
steps:
|
steps:
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
|
|
||||||
{
|
{
|
||||||
sources ? import ./npins,
|
sources ? import ./npins,
|
||||||
pkgs ? import sources.nixpkgs { },
|
pkgs ? import sources.nixos-unstable { },
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
|
|
2
hive.nix
2
hive.nix
|
@ -147,7 +147,7 @@ in
|
||||||
./${nodePath}.nix
|
./${nodePath}.nix
|
||||||
./modules/netconf
|
./modules/netconf
|
||||||
./lib/netconf-junos
|
./lib/netconf-junos
|
||||||
"${sources.nixpkgs}/nixos/modules/misc/assertions.nix"
|
"${sources.nixos-unstable}/nixos/modules/misc/assertions.nix"
|
||||||
];
|
];
|
||||||
|
|
||||||
system.host-name = name;
|
system.host-name = name;
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
let
|
let
|
||||||
_sources = import ../npins;
|
_sources = import ../npins;
|
||||||
|
|
||||||
inherit (import _sources.nixpkgs { }) lib;
|
inherit (import _sources.nixos-unstable { }) lib;
|
||||||
|
|
||||||
meta = import ../meta lib;
|
meta = import ../meta lib;
|
||||||
|
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
# To do so run `nix-build ./verify.nix`
|
# To do so run `nix-build ./verify.nix`
|
||||||
let
|
let
|
||||||
sources = import ../npins;
|
sources = import ../npins;
|
||||||
pkgs = import sources.nixpkgs { };
|
pkgs = import sources.nixos-unstable { };
|
||||||
|
|
||||||
dns = import sources."dns.nix" { inherit pkgs; };
|
dns = import sources."dns.nix" { inherit pkgs; };
|
||||||
in
|
in
|
||||||
|
|
|
@ -296,12 +296,6 @@
|
||||||
"url": "https://releases.nixos.org/nixos/unstable/nixos-25.05beta737779.9abb87b552b7/nixexprs.tar.xz",
|
"url": "https://releases.nixos.org/nixos/unstable/nixos-25.05beta737779.9abb87b552b7/nixexprs.tar.xz",
|
||||||
"hash": "0vjcyxzyiryspx8k1h7xsw0j9gcb4hs5wihhng64l9sqdf0b3kwp"
|
"hash": "0vjcyxzyiryspx8k1h7xsw0j9gcb4hs5wihhng64l9sqdf0b3kwp"
|
||||||
},
|
},
|
||||||
"nixpkgs": {
|
|
||||||
"type": "Channel",
|
|
||||||
"name": "nixpkgs-unstable",
|
|
||||||
"url": "https://releases.nixos.org/nixpkgs/nixpkgs-25.05pre737947.357cd3dfdb89/nixexprs.tar.xz",
|
|
||||||
"hash": "1i2y5wbbvk6bll1da33if1jq4f7icqsigyd3aqgi74gg18a8hqfw"
|
|
||||||
},
|
|
||||||
"proxmox-nixos": {
|
"proxmox-nixos": {
|
||||||
"type": "Git",
|
"type": "Git",
|
||||||
"repository": {
|
"repository": {
|
||||||
|
|
Loading…
Add table
Reference in a new issue