From 7077c1154ae08e2e13c740773cfaacab3b718aef Mon Sep 17 00:00:00 2001
From: Pim Kunis <pim@kunis.nl>
Date: Tue, 30 Apr 2024 13:14:20 +0200
Subject: [PATCH 1/2] Remove release script
---
flake.nix | 1 -
release.nix | 19 -------------------
release.sh | 25 -------------------------
3 files changed, 45 deletions(-)
delete mode 100644 release.nix
delete mode 100755 release.sh
diff --git a/flake.nix b/flake.nix
index 50ad703..2de4b25 100644
--- a/flake.nix
+++ b/flake.nix
@@ -21,6 +21,5 @@
./blog-pim.nix
./forgejo-nix-action.nix
./atticd.nix
- ./release.nix
];
}
diff --git a/release.nix b/release.nix
deleted file mode 100644
index ba68cc9..0000000
--- a/release.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ nixpkgs, flutils, ... }: flutils.lib.eachDefaultSystem (system:
-let
- pkgs = nixpkgs.legacyPackages.${system};
- createScript = name: runtimeInputs: scriptPath:
- let
- script = (pkgs.writeScriptBin name (builtins.readFile scriptPath)).overrideAttrs (old: {
- buildCommand = "${old.buildCommand}\n patchShebangs $out";
- });
- in
- pkgs.symlinkJoin {
- inherit name;
- paths = [ script ] ++ runtimeInputs;
- buildInputs = [ pkgs.makeWrapper ];
- postBuild = "wrapProgram $out/bin/${name} --set PATH $out/bin";
- };
-in
-{
- packages.release = createScript "release" (with pkgs; [ nix docker-client git ]) ./release.sh;
-})
diff --git a/release.sh b/release.sh
deleted file mode 100755
index 7d93be7..0000000
--- a/release.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/usr/bin/env bash
-
-set -euo pipefail
-IFS=$'\n\t'
-
-flakeref="${1-}"
-name="${2-}"
-gitdir="${3:-.}"
-
-if [ -z "$flakeref" ] || [ -z "$name" ];
- then
- echo "Usage: $0 FLAKEREF NAME [GITDIR]"
- exit 1
-fi
-
-imagename=$(nix eval --no-allow-dirty --raw $flakeref.imageName)
-imagetag=$(nix eval --no-allow-dirty --raw $flakeref.imageTag)
-image=$(nix build --no-allow-dirty $flakeref --print-out-paths --no-link)
-gitrev=$(git --git-dir $gitdir/.git --work-tree $gitdir rev-parse HEAD)
-
-docker load < $image
-docker tag $imagename:$imagetag git.kun.is/home/$name:$gitrev
-docker tag $imagename:$imagetag git.kun.is/home/$name:latest
-docker push git.kun.is/home/$name:$gitrev
-docker push git.kun.is/home/$name:latest
From 6ad1d58fbc709f8833d874fffb382eee2dfd6e41 Mon Sep 17 00:00:00 2001
From: Pim Kunis <pim@kunis.nl>
Date: Tue, 30 Apr 2024 13:14:51 +0200
Subject: [PATCH 2/2] Update Pim's blog source
---
flake.lock | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/flake.lock b/flake.lock
index 32fde47..cf75c92 100644
--- a/flake.lock
+++ b/flake.lock
@@ -30,11 +30,11 @@
]
},
"locked": {
- "lastModified": 1714137143,
- "narHash": "sha256-LMZjGiacgn0R9zuuolU+XJZsx1hkX5p9gs+d7B0YQCc=",
+ "lastModified": 1714475611,
+ "narHash": "sha256-7EmI74Xth23FM9ZDVJe2s/AeW9FqrJw9/b27dIYSvaM=",
"ref": "refs/heads/master",
- "rev": "77d432ad8b0e16213b29bbb58e3d73aef0512ee9",
- "revCount": 3,
+ "rev": "e242401553971d5903ae4671bcb395185a81bcd2",
+ "revCount": 5,
"type": "git",
"url": "https://git.kun.is/home/blog-pim"
},