From 0f5cde63d824069793214d51d5335dddf3f45e0a Mon Sep 17 00:00:00 2001 From: clerie Date: Sat, 29 Jul 2023 11:59:00 +0200 Subject: [PATCH] Flake update 2023-07-29T09:58+00:00 --- flake.lock | 18 +++++++++--------- pkgs/nixfiles/default.nix | 10 ++++++++++ pkgs/nixfiles/nixfiles-updated-inputs.sh | 13 +++++++++++++ pkgs/overlay.nix | 1 + 4 files changed, 33 insertions(+), 9 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 68386b5..815da96 100644 --- a/flake.lock +++ b/flake.lock @@ -215,11 +215,11 @@ }, "nixpkgs-krypton": { "locked": { - "lastModified": 1690367991, - "narHash": "sha256-2VwOn1l8y6+cu7zjNE8MgeGJNNz1eat1HwHrINeogFA=", + "lastModified": 1690548937, + "narHash": "sha256-x3ZOPGLvtC0/+iFAg9Kvqm/8hTAIkGjc634SqtgaXTA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c9cf0708f00fbe553319258e48ca89ff9a413703", + "rev": "2a9d660ff0f7ffde9d73be328ee6e6f10ef66b28", "type": "github" }, "original": { @@ -231,11 +231,11 @@ }, "nixpkgs-schule": { "locked": { - "lastModified": 1690367991, - "narHash": "sha256-2VwOn1l8y6+cu7zjNE8MgeGJNNz1eat1HwHrINeogFA=", + "lastModified": 1690548937, + "narHash": "sha256-x3ZOPGLvtC0/+iFAg9Kvqm/8hTAIkGjc634SqtgaXTA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c9cf0708f00fbe553319258e48ca89ff9a413703", + "rev": "2a9d660ff0f7ffde9d73be328ee6e6f10ef66b28", "type": "github" }, "original": { @@ -247,11 +247,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1690367991, - "narHash": "sha256-2VwOn1l8y6+cu7zjNE8MgeGJNNz1eat1HwHrINeogFA=", + "lastModified": 1690548937, + "narHash": "sha256-x3ZOPGLvtC0/+iFAg9Kvqm/8hTAIkGjc634SqtgaXTA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c9cf0708f00fbe553319258e48ca89ff9a413703", + "rev": "2a9d660ff0f7ffde9d73be328ee6e6f10ef66b28", "type": "github" }, "original": { 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 {};