aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--Formula/autoqemu-latest.rb18
-rw-r--r--Formula/autoqemu.rb4
-rw-r--r--Formula/fallible-latest.rb16
-rw-r--r--Formula/fallible.rb4
-rw-r--r--Formula/remembering-latest.rb18
-rw-r--r--Formula/remembering.rb4
-rw-r--r--default.nix63
-rw-r--r--paku.json24
-rwxr-xr-xscripts/paku29
-rw-r--r--src/xyz/euandreh/packages.scm62
10 files changed, 209 insertions, 33 deletions
diff --git a/Formula/autoqemu-latest.rb b/Formula/autoqemu-latest.rb
new file mode 100644
index 0000000..a153824
--- /dev/null
+++ b/Formula/autoqemu-latest.rb
@@ -0,0 +1,18 @@
+class AutoqemuLatest < Formula
+ desc 'Installation and setup automation tool for QEMU virtual machines'
+ homepage 'https://autoqemu.euandreh.xyz'
+ url 'https://git.euandreh.xyz/autoqemu/snapshot/autoqemu-a62d3425d91bb65ab883d8487fc73431a22487d4.tar.gz'
+ sha256 '8a2d95966d7ebe2cf8af928c8807a42a84e45111e60840fdf5737e17a987900a'
+ license 'AGPL-3.0-or-later'
+
+ def install
+ system './configure', "--prefix=#{prefix}"
+ system 'make'
+ system 'make', 'check'
+ system 'make', 'install'
+ end
+
+ test do
+ system "#{bin}/autoqemu", '-V'
+ end
+end
diff --git a/Formula/autoqemu.rb b/Formula/autoqemu.rb
index 1f83094..33fee90 100644
--- a/Formula/autoqemu.rb
+++ b/Formula/autoqemu.rb
@@ -1,8 +1,8 @@
class Autoqemu < Formula
desc 'Installation and setup automation tool for QEMU virtual machines'
homepage 'https://autoqemu.euandreh.xyz'
- url 'https://git.euandreh.xyz/autoqemu/snapshot/autoqemu-4d1a0b6314c4f6fcf31f80e608f6b03a316a7255.tar.gz'
- sha256 'fd501b421c8e562d957a38c83ea42173b5e9dc9b1bb9cef300aee48088fe3afe'
+ url 'https://git.euandreh.xyz/autoqemu/snapshot/autoqemu-a62d3425d91bb65ab883d8487fc73431a22487d4.tar.gz'
+ sha256 '8a2d95966d7ebe2cf8af928c8807a42a84e45111e60840fdf5737e17a987900a'
license 'AGPL-3.0-or-later'
def install
diff --git a/Formula/fallible-latest.rb b/Formula/fallible-latest.rb
new file mode 100644
index 0000000..fa0668e
--- /dev/null
+++ b/Formula/fallible-latest.rb
@@ -0,0 +1,16 @@
+class FallibleLatest < Formula
+ desc 'Fault injection library for stress-testing failure scenarios'
+ homepage 'https://fallible.euandreh.xyz'
+ url 'https://git.euandreh.xyz/fallible/snapshot/fallible-db1527a0d72471d702e0ec4609ce67ef7df73b41.tar.gz'
+ sha256 'ebe9517b415407766fbafe7d9cb725bc8f32ab79151c48e1bf4b69f773aeccef'
+ license 'AGPL-3.0-or-later'
+
+ depends_on 'valgrind' => :build
+
+ def install
+ system './configure', "--prefix=#{prefix}"
+ system 'make'
+ system 'make', 'check'
+ system 'make', 'install'
+ end
+end
diff --git a/Formula/fallible.rb b/Formula/fallible.rb
index 53d2177..0fbdf1d 100644
--- a/Formula/fallible.rb
+++ b/Formula/fallible.rb
@@ -1,8 +1,8 @@
class Fallible < Formula
desc 'Fault injection library for stress-testing failure scenarios'
homepage 'https://fallible.euandreh.xyz'
- url 'https://git.euandreh.xyz/fallible/snapshot/fallible-66a2ee41beaaffb9a9a6b521837c0967528845fa.tar.gz'
- sha256 'da5c6e7ef4de276424b28095fde09b029af0b9eccaf91e8ab477bf2bc8b1b95e'
+ url 'https://git.euandreh.xyz/fallible/snapshot/fallible-0.2.0.tar.gz'
+ sha256 '661eac346c956d2e3536ed2411dda76893f11cb9e68996b9dcd13d98573f2b44'
license 'AGPL-3.0-or-later'
depends_on 'valgrind' => :build
diff --git a/Formula/remembering-latest.rb b/Formula/remembering-latest.rb
new file mode 100644
index 0000000..9a1b33a
--- /dev/null
+++ b/Formula/remembering-latest.rb
@@ -0,0 +1,18 @@
+class RememberingLatest < Formula
+ desc 'Add memory to dmenu, fzf and similar tools.'
+ homepage 'https://remembering.euandreh.xyz'
+ url 'https://git.euandreh.xyz/remembering/snapshot/remembering-3c4e5879b47ed18838352e567cd26beed9361acc.tar.gz'
+ sha256 'b072df907f68efca62dcd81c58b47bfbdc5ea85f8a82dcb76dd89fb246af5b7d'
+ license 'AGPL-3.0-or-later'
+
+ def install
+ system './configure', "--prefix=#{prefix}"
+ system 'make'
+ system 'make', 'check'
+ system 'make', 'install'
+ end
+
+ test do
+ system "#{bin}/remembering", '-V'
+ end
+end
diff --git a/Formula/remembering.rb b/Formula/remembering.rb
index 1007a0d..a2b4f22 100644
--- a/Formula/remembering.rb
+++ b/Formula/remembering.rb
@@ -1,8 +1,8 @@
class Remembering < Formula
desc 'Add memory to dmenu, fzf and similar tools.'
homepage 'https://remembering.euandreh.xyz'
- url 'https://git.euandreh.xyz/remembering/snapshot/remembering-793b782617b0667eefa938a836f24d8a5e087bb0.tar.gz'
- sha256 '0049501383ce7fc4d42a406f8193e1f05ff3e9a3dce3a9e40e56d9997f96f691'
+ url 'https://git.euandreh.xyz/remembering/snapshot/remembering-0.2.0.tar.gz'
+ sha256 '2ca3033defb5af91f574afd5a487cf0c4acca536dff731244f40b8130fa35612'
license 'AGPL-3.0-or-later'
def install
diff --git a/default.nix b/default.nix
index 5c1be89..1e6e6b9 100644
--- a/default.nix
+++ b/default.nix
@@ -1,14 +1,38 @@
{ pkgs }:
self: super: {
xyz-euandreh = {
+ remembering-latest = pkgs.stdenv.mkDerivation rec {
+ name = "remembering";
+ version = "3c4e5879b47ed18838352e567cd26beed9361acc";
+
+ src = fetchTarball {
+ url =
+ "https://git.euandreh.xyz/${name}/snapshot/${name}-${version}.tar.gz";
+ sha256 = "18pb61z0bhr0qhxpjklqcji8srllxz1pr42da8psy0jaja556zw6";
+ };
+
+ makeFlags = [ "CC=cc" ];
+
+ doCheck = true;
+
+ meta = with pkgs.lib; {
+ description = readFile "${src}/description";
+ longDescription = readFile "${src}/long-description";
+ homepage = "https://${name}.euandreh.xyz";
+ changelog = "https://${name}.euandreh.xyz/CHANGELOG.html";
+ downloadPage = "https://${name}.euandreh.xyz/#releases";
+ license = licenses.agpl3;
+ platforms = platforms.unix;
+ };
+ };
remembering = pkgs.stdenv.mkDerivation rec {
name = "remembering";
- version = "793b782617b0667eefa938a836f24d8a5e087bb0";
+ version = "0.2.0";
src = fetchTarball {
url =
"https://git.euandreh.xyz/${name}/snapshot/${name}-${version}.tar.gz";
- sha256 = "0sr5ggyrqy95jalycmwj4x8prrgrsak1s7wsyxslvj9w38rckdrd";
+ sha256 = "18pb61z0bhr0qhxpjklqcji8srllxz1pr42da8psy0jaja556zw6";
};
makeFlags = [ "CC=cc" ];
@@ -25,14 +49,14 @@ self: super: {
platforms = platforms.unix;
};
};
- autoqemu = pkgs.stdenv.mkDerivation rec {
+ autoqemu-latest = pkgs.stdenv.mkDerivation rec {
name = "autoqemu";
- version = "4d1a0b6314c4f6fcf31f80e608f6b03a316a7255";
+ version = "a62d3425d91bb65ab883d8487fc73431a22487d4";
src = fetchTarball {
url =
"https://git.euandreh.xyz/${name}/snapshot/${name}-${version}.tar.gz";
- sha256 = "1viq6vv79lkgr2a1kiz4gk5x5kxxjzfbf67lnc22ksyfbayvd788";
+ sha256 = "08wb5ydh038z1zbl7rhn846yxq4i4g86z7h9l4pj162la3d943sv";
};
makeFlags = [ "CC=cc" ];
@@ -49,14 +73,39 @@ self: super: {
platforms = platforms.unix;
};
};
+ fallible-latest = pkgs.stdenv.mkDerivation rec {
+ name = "fallible";
+ version = "db1527a0d72471d702e0ec4609ce67ef7df73b41";
+
+ src = fetchTarball {
+ url =
+ "https://git.euandreh.xyz/${name}/snapshot/${name}-${version}.tar.gz";
+ sha256 = "18vmihnl1d03kd2amq46rhvnz1skh877rgahpqc61k31mfdw06p9";
+ };
+
+ makeFlags = [ "CC=cc" ];
+
+ checkInputs = with pkgs; [ valgrind ];
+ doCheck = true;
+
+ meta = with pkgs.lib; {
+ description = readFile "${src}/description";
+ longDescription = readFile "${src}/long-description";
+ homepage = "https://${name}.euandreh.xyz";
+ changelog = "https://${name}.euandreh.xyz/CHANGELOG.html";
+ downloadPage = "https://${name}.euandreh.xyz/#releases";
+ license = licenses.agpl3;
+ platforms = platforms.unix;
+ };
+ };
fallible = pkgs.stdenv.mkDerivation rec {
name = "fallible";
- version = "66a2ee41beaaffb9a9a6b521837c0967528845fa";
+ version = "0.2.0";
src = fetchTarball {
url =
"https://git.euandreh.xyz/${name}/snapshot/${name}-${version}.tar.gz";
- sha256 = "0mws8k6gylsrph841c1q40a9zbw5wn1p2hxl16waymgwn80bl1bq";
+ sha256 = "18vmihnl1d03kd2amq46rhvnz1skh877rgahpqc61k31mfdw06p9";
};
makeFlags = [ "CC=cc" ];
diff --git a/paku.json b/paku.json
index 9ee03b1..e1eee5a 100644
--- a/paku.json
+++ b/paku.json
@@ -2,17 +2,35 @@
"packages": [
{
"name": "remembering",
- "version": "793b782617b0667eefa938a836f24d8a5e087bb0",
+ "suffix": "-latest",
+ "version": "3c4e5879b47ed18838352e567cd26beed9361acc",
+ "type": "bin"
+ },
+ {
+ "name": "remembering",
+ "suffix": "",
+ "version": "0.2.0",
"type": "bin"
},
{
"name": "autoqemu",
- "version": "4d1a0b6314c4f6fcf31f80e608f6b03a316a7255",
+ "suffix": "-latest",
+ "version": "a62d3425d91bb65ab883d8487fc73431a22487d4",
"type": "bin"
},
{
"name": "fallible",
- "version": "66a2ee41beaaffb9a9a6b521837c0967528845fa",
+ "suffix": "-latest",
+ "version": "db1527a0d72471d702e0ec4609ce67ef7df73b41",
+ "type": "lib",
+ "check_inputs": [
+ "valgrind"
+ ]
+ },
+ {
+ "name": "fallible",
+ "suffix": "",
+ "version": "0.2.0",
"type": "lib",
"check_inputs": [
"valgrind"
diff --git a/scripts/paku b/scripts/paku
index 88fd917..b31d2c4 100755
--- a/scripts/paku
+++ b/scripts/paku
@@ -32,6 +32,7 @@ EOF
for p in $(jq -r '.packages[] | @base64' < paku.json); do
NAME="$(echo "$p" | base64 --decode | jq -r '.name')"
+ SUFFIX="$(echo "$p" | base64 --decode | jq -r '.suffix')"
VERSION="$(echo "$p" | base64 --decode | jq -r '.version')"
TARBALL="$(tarball_url "$NAME" "$VERSION")"
@@ -58,9 +59,9 @@ EOF
cat <<EOF >>"$GUIX_OUT"
-(define-public $NAME
+(define-public $NAME$SUFFIX
(package
- (name "$NAME")
+ (name "$NAME$SUFFIX")
(version "$VERSION")
(source (origin
(method url-fetch)
@@ -81,8 +82,11 @@ EOF
done
printf '\n(list' >>"$GUIX_OUT"
- for name in $(jq -r '.packages[].name' < paku.json); do
- printf '\n %s' "$name" >>"$GUIX_OUT"
+ for p in $(jq -r '.packages[] | @base64' < paku.json); do
+ NAME="$(echo "$p" | base64 --decode | jq -r '.name')"
+ SUFFIX="$(echo "$p" | base64 --decode | jq -r '.suffix')"
+
+ printf '\n %s%s' "$NAME" "$SUFFIX" >>"$GUIX_OUT"
done
printf ')\n' >>"$GUIX_OUT"
@@ -100,6 +104,7 @@ EOF
for p in $(jq -r '.packages[] | @base64' < paku.json); do
NAME="$(echo "$p" | base64 --decode | jq -r '.name')"
+ SUFFIX="$(echo "$p" | base64 --decode | jq -r '.suffix')"
VERSION="$(echo "$p" | base64 --decode | jq -r '.version')"
TARBALL="$(tarball_url "$NAME" "$VERSION")"
SHA256="$(nix-prefetch-url --unpack "$TARBALL")"
@@ -118,7 +123,7 @@ EOF
fi
cat <<EOF >>"$NIX_OUT"
- $NAME = pkgs.stdenv.mkDerivation rec {
+ $NAME$SUFFIX = pkgs.stdenv.mkDerivation rec {
name = "$NAME";
version = "$VERSION";
@@ -157,6 +162,9 @@ gen_homebrew() {
for p in $(jq -r '.packages[] | @base64' < paku.json); do
HOMEBREW_OUT="$(mktemp)"
NAME="$(echo "$p" | base64 --decode | jq -r '.name')"
+ SUFFIX="$(echo "$p" | base64 --decode | jq -r '.suffix')"
+ SUFFIX_UC="$(echo "$SUFFIX" | cut -c2-)"
+ SUFFIX_UC="${SUFFIX_UC^}"
VERSION="$(echo "$p" | base64 --decode | jq -r '.version')"
TYPE="$(echo "$p" | base64 --decode | jq -r '.type')"
@@ -189,7 +197,7 @@ gen_homebrew() {
fi
cat <<EOF >>"$HOMEBREW_OUT"
-class ${NAME^} < Formula
+class ${NAME^}$SUFFIX_UC < Formula
desc '$DESCRIPTION'
homepage 'https://$NAME.euandreh.xyz'
url '$TARBALL_URL'
@@ -204,7 +212,7 @@ $CHECK_INPUTS
end$TEST_SECTION
end
EOF
- mv "$HOMEBREW_OUT" "Formula/$NAME.rb"
+ mv "$HOMEBREW_OUT" "Formula/$NAME$SUFFIX.rb"
done
}
@@ -213,8 +221,13 @@ refresh_packages() {
INDEXES="$(seq 0 "$((COUNT - 1))")"
for N in $INDEXES; do
NAME="$(jq -r ".packages[$N].name" < paku.json)"
+ SUFFIX="$(jq -r ".packages[$N].suffix" < paku.json)"
cd "../$NAME/"
- NEW_VERSION="$(git rev-parse HEAD)"
+ if [ "$SUFFIX" = '-latest' ]; then
+ NEW_VERSION="$(git rev-parse HEAD)"
+ else
+ NEW_VERSION="$(git describe --tags --abbrev=0 | cut -c2-)"
+ fi
cd - >/dev/null
jq -r ".packages[$N].version = \"$NEW_VERSION\"" paku.json | sponge paku.json
done
diff --git a/src/xyz/euandreh/packages.scm b/src/xyz/euandreh/packages.scm
index e8cdc1d..bd90656 100644
--- a/src/xyz/euandreh/packages.scm
+++ b/src/xyz/euandreh/packages.scm
@@ -12,10 +12,30 @@
#:use-module (guix store)
#:use-module (guix build-system gnu))
+(define-public remembering-latest
+ (package
+ (name "remembering-latest")
+ (version "3c4e5879b47ed18838352e567cd26beed9361acc")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append
+ "https://git.euandreh.xyz/remembering/snapshot/remembering-"
+ version
+ ".tar.gz"))
+ (sha256
+ (base32
+ "0zavmx3b57yqdnvxr0labyl5xp7vgfs5h76qviicmvv8gy8dywmh"))))
+ (build-system gnu-build-system)
+ (arguments `(#:make-flags (list (string-append "CC=" ,(cc-for-target)))))
+ (synopsis (file-append source "/description"))
+ (description (file-append source "/long-description"))
+ (home-page (string-append "https://" name ".euandreh.xyz"))
+ (license license:agpl3+)))
+
(define-public remembering
(package
(name "remembering")
- (version "793b782617b0667eefa938a836f24d8a5e087bb0")
+ (version "0.2.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -24,7 +44,7 @@
".tar.gz"))
(sha256
(base32
- "14gnjrzrknan1vjakqywlglz6pzhw69q2vs05bac8zyfhc9m0j80"))))
+ "04jnlc7i7f209wj33xyz6sjwqjhcry3s9mdgfksr3bxmxwyh78rc"))))
(build-system gnu-build-system)
(arguments `(#:make-flags (list (string-append "CC=" ,(cc-for-target)))))
(synopsis (file-append source "/description"))
@@ -32,10 +52,10 @@
(home-page (string-append "https://" name ".euandreh.xyz"))
(license license:agpl3+)))
-(define-public autoqemu
+(define-public autoqemu-latest
(package
- (name "autoqemu")
- (version "4d1a0b6314c4f6fcf31f80e608f6b03a316a7255")
+ (name "autoqemu-latest")
+ (version "a62d3425d91bb65ab883d8487fc73431a22487d4")
(source (origin
(method url-fetch)
(uri (string-append
@@ -44,8 +64,30 @@
".tar.gz"))
(sha256
(base32
- "1ziszs481r5f03rwxf8vkgffkdbk46j3xj1qgaajsmlf3i11nl7x"))))
+ "02lhhylifzkkypyl0276258y911alh3qi34jmzw2rgkydnb9abca"))))
+ (build-system gnu-build-system)
+ (arguments `(#:make-flags (list (string-append "CC=" ,(cc-for-target)))))
+ (synopsis (file-append source "/description"))
+ (description (file-append source "/long-description"))
+ (home-page (string-append "https://" name ".euandreh.xyz"))
+ (license license:agpl3+)))
+
+(define-public fallible-latest
+ (package
+ (name "fallible-latest")
+ (version "db1527a0d72471d702e0ec4609ce67ef7df73b41")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append
+ "https://git.euandreh.xyz/fallible/snapshot/fallible-"
+ version
+ ".tar.gz"))
+ (sha256
+ (base32
+ "1vycmrrzfsabpzhlh70mg6mk53xw4nvrqzgyp9ppc1sl85xm3sgb"))))
(build-system gnu-build-system)
+ (inputs
+ `(("valgrind" ,(specification->package "valgrind"))))
(arguments `(#:make-flags (list (string-append "CC=" ,(cc-for-target)))))
(synopsis (file-append source "/description"))
(description (file-append source "/long-description"))
@@ -55,7 +97,7 @@
(define-public fallible
(package
(name "fallible")
- (version "66a2ee41beaaffb9a9a6b521837c0967528845fa")
+ (version "0.2.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -64,7 +106,7 @@
".tar.gz"))
(sha256
(base32
- "0pmrn742pgvpnj51xyfaxjwz16h2kghgv5c0n8j689yyyiz6wp6s"))))
+ "0i1b7xbrhgfivjwrd2g6p4fg34v8lzfi297d6qsjwvcmdhsaq7k6"))))
(build-system gnu-build-system)
(inputs
`(("valgrind" ,(specification->package "valgrind"))))
@@ -75,6 +117,8 @@
(license license:agpl3+)))
(list
+ remembering-latest
remembering
- autoqemu
+ autoqemu-latest
+ fallible-latest
fallible)
generated by cgit v1.2.3 (git 2.46.2) at 2024-10-31 12:20:07 +0000