From b7cfdd4f9d173011690951d01ca7e63d871b1570 Mon Sep 17 00:00:00 2001 From: clerie Date: Fri, 28 Jul 2023 21:06:10 +0200 Subject: [PATCH] Flake update 2023-07-28T19:05+00:00 --- flake.lock | 52 +++++++++++++++++------- flake.nix | 1 + pkgs/nixfiles/default.nix | 10 +++++ pkgs/nixfiles/nixfiles-updated-inputs.sh | 13 ++++++ pkgs/overlay.nix | 1 + 5 files changed, 62 insertions(+), 15 deletions(-) create mode 100644 pkgs/nixfiles/default.nix create mode 100755 pkgs/nixfiles/nixfiles-updated-inputs.sh diff --git a/flake.lock b/flake.lock index 834eb5a..68386b5 100644 --- a/flake.lock +++ b/flake.lock @@ -3,16 +3,17 @@ "agenix": { "inputs": { "darwin": "darwin", + "home-manager": "home-manager", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1682101079, - "narHash": "sha256-MdAhtjrLKnk2uiqun1FWABbKpLH090oeqCSiWemtuck=", + "lastModified": 1690228878, + "narHash": "sha256-9Xe7JV0krp4RJC9W9W9WutZVlw6BlHTFMiUP/k48LQY=", "owner": "ryantm", "repo": "agenix", - "rev": "2994d002dcff5353ca1ac48ec584c7f6589fe447", + "rev": "d8c973fd228949736dedf61b7f8cc1ece3236792", "type": "github" }, "original": { @@ -118,6 +119,27 @@ "type": "github" } }, + "home-manager": { + "inputs": { + "nixpkgs": [ + "agenix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1682203081, + "narHash": "sha256-kRL4ejWDhi0zph/FpebFYhzqlOBrk0Pl3dzGEKSAlEw=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "32d3e39c491e2f91152c84f8ad8b003420eab0a1", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, "mitel-ommclient2": { "inputs": { "nixpkgs": [ @@ -161,11 +183,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1686838567, - "narHash": "sha256-aqKCUD126dRlVSKV6vWuDCitfjFrZlkwNuvj5LtjRRU=", + "lastModified": 1690200740, + "narHash": "sha256-aRkEXGmCbAGcvDcdh/HB3YN+EvoPoxmJMOaqRZmf6vM=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "429f232fe1dc398c5afea19a51aad6931ee0fb89", + "rev": "ba9650b14e83b365fb9e731f7d7c803f22d2aecf", "type": "github" }, "original": { @@ -193,11 +215,11 @@ }, "nixpkgs-krypton": { "locked": { - "lastModified": 1690179384, - "narHash": "sha256-+arbgqFTAtoeKtepW9wCnA0njCOyoiDFyl0Q0SBSOtE=", + "lastModified": 1690367991, + "narHash": "sha256-2VwOn1l8y6+cu7zjNE8MgeGJNNz1eat1HwHrINeogFA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b12803b6d90e2e583429bb79b859ca53c348b39a", + "rev": "c9cf0708f00fbe553319258e48ca89ff9a413703", "type": "github" }, "original": { @@ -209,11 +231,11 @@ }, "nixpkgs-schule": { "locked": { - "lastModified": 1679437018, - "narHash": "sha256-vOuiDPLHSEo/7NkiWtxpHpHgoXoNmrm+wkXZ6a072Fc=", + "lastModified": 1690367991, + "narHash": "sha256-2VwOn1l8y6+cu7zjNE8MgeGJNNz1eat1HwHrINeogFA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "19cf008bb18e47b6e3b4e16e32a9a4bdd4b45f7e", + "rev": "c9cf0708f00fbe553319258e48ca89ff9a413703", "type": "github" }, "original": { @@ -225,11 +247,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1681557730, - "narHash": "sha256-j2E3639kS3Qop2jQPyqWCdenZNaqIdxfoTvAHnGuAGI=", + "lastModified": 1690367991, + "narHash": "sha256-2VwOn1l8y6+cu7zjNE8MgeGJNNz1eat1HwHrINeogFA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "85b081528b937df4bfcaee80c3541b58f397df8b", + "rev": "c9cf0708f00fbe553319258e48ca89ff9a413703", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index dd2b267..81ec93b 100644 --- a/flake.nix +++ b/flake.nix @@ -94,6 +94,7 @@ anycast_healthchecker flask-excel iot-data + nixfiles-updated-inputs pyexcel-xlsx pyexcel-webio uptimestatus diff --git a/pkgs/nixfiles/default.nix b/pkgs/nixfiles/default.nix new file mode 100644 index 0000000..f754a68 --- /dev/null +++ b/pkgs/nixfiles/default.nix @@ -0,0 +1,10 @@ +{ pkgs, ... }: + +pkgs.writeShellApplication { + name = "nixfiles-updated-inputs.sh"; + text = builtins.readFile ./nixfiles-updated-inputs.sh; + runtimeInputs = [ + pkgs.git + ]; +}; + diff --git a/pkgs/nixfiles/nixfiles-updated-inputs.sh b/pkgs/nixfiles/nixfiles-updated-inputs.sh new file mode 100755 index 0000000..b8a2806 --- /dev/null +++ b/pkgs/nixfiles/nixfiles-updated-inputs.sh @@ -0,0 +1,13 @@ +#!/usr/bin/env bash + +set -euo pipefail + +NOW="$(date --utc --iso-8601=minutes)" + +git fetch origin master +git checkout updated-inputs +git merge -s ort -X theirs origin/master -m "Update from master ${NOW}" +nix flake update +git add flake.lock +git commit -m "Flake update ${NOW}" || true +git push origin updated-inputs diff --git a/pkgs/overlay.nix b/pkgs/overlay.nix index 347a132..b4514a6 100644 --- a/pkgs/overlay.nix +++ b/pkgs/overlay.nix @@ -2,6 +2,7 @@ self: super: { anycast_healthchecker = self.python3.pkgs.callPackage ./anycast_healthchecker {}; flask-excel = self.python3.pkgs.callPackage ./flask-excel {}; iot-data = self.python3.pkgs.callPackage ./iot-data {}; + nixfiles-updated-inputs = self.callPackage ./nixfiles {}; pyexcel-xlsx = self.python3.pkgs.callPackage ./pyexcel-xlsx {}; pyexcel-webio = self.python3.pkgs.callPackage ./pyexcel-webio {}; uptimestatus = self.python3.pkgs.callPackage ./uptimestatus {};