aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Formula/git-permalink-latest.rb17
-rw-r--r--Formula/git-permalink.rb17
-rw-r--r--Formula/remembering.rb17
-rw-r--r--Formula/td-latest.rb2
-rw-r--r--default.nix73
-rw-r--r--paku.json31
-rwxr-xr-xscripts/paku3
-rw-r--r--src/xyz/euandreh/packages.scm85
8 files changed, 29 insertions, 216 deletions
diff --git a/Formula/git-permalink-latest.rb b/Formula/git-permalink-latest.rb
deleted file mode 100644
index a36e161..0000000
--- a/Formula/git-permalink-latest.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-class Git-permalinkLatest < Formula
- desc 'Git extension to generate web permalinks of files in a repository'
- homepage 'https://git-permalink.euandreh.xyz'
- url 'https://euandreh.xyz/git-permalink.git/snapshot/git-permalink-7f0c97b64bcccbdcd1667f2c2ca8f1face9ca027.tar.gz'
- sha256 '12aada33a3c4c6b8d5b1e711584209f63df1cf96658302f1ee3abbcf0ab49031'
- license 'AGPL-3.0-or-later'
-
- def install
- system 'make'
- system 'make', 'check'
- system 'make', 'install', "PREFIX=#{prefix}"
- end
-
- test do
- system "#{bin}/git-permalink", '-V'
- end
-end
diff --git a/Formula/git-permalink.rb b/Formula/git-permalink.rb
deleted file mode 100644
index b26a8ef..0000000
--- a/Formula/git-permalink.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-class Git-permalink < Formula
- desc 'Git extension to generate web permalinks of files in a repository'
- homepage 'https://git-permalink.euandreh.xyz'
- url 'https://euandreh.xyz/git-permalink.git/snapshot/git-permalink-0.3.1.tar.gz'
- sha256 'e1252260170e15095720e6883ccd892ec0c924d2aabcb51618943999473cab1d'
- license 'AGPL-3.0-or-later'
-
- def install
- system 'make'
- system 'make', 'check'
- system 'make', 'install', "PREFIX=#{prefix}"
- end
-
- test do
- system "#{bin}/git-permalink", '-V'
- end
-end
diff --git a/Formula/remembering.rb b/Formula/remembering.rb
deleted file mode 100644
index 879188f..0000000
--- a/Formula/remembering.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-class Remembering < Formula
- desc 'Add memory to dmenu, fzf and similar tools.'
- homepage 'https://remembering.euandreh.xyz'
- url 'https://euandreh.xyz/remembering.git/snapshot/remembering-0.2.1.tar.gz'
- sha256 '0e8d4068c091f84a3303bf6e95c58fb79764dea5e26696c4d7f8f86e1a45031f'
- license 'AGPL-3.0-or-later'
-
- def install
- system 'make'
- system 'make', 'check'
- system 'make', 'install', "PREFIX=#{prefix}"
- end
-
- test do
- system "#{bin}/remembering", '-V'
- end
-end
diff --git a/Formula/td-latest.rb b/Formula/td-latest.rb
index 6ee8250..ffa3515 100644
--- a/Formula/td-latest.rb
+++ b/Formula/td-latest.rb
@@ -5,6 +5,8 @@ class TdLatest < Formula
sha256 'd25e72d3b68606c01ba1b5f98ec4c0458e684db0c981c9a974f383d2d919e063'
license 'AGPL-3.0-or-later'
+ depends_on 'm4' => :build
+
def install
system 'make'
system 'make', 'check'
diff --git a/default.nix b/default.nix
index f9af6c7..10b2b39 100644
--- a/default.nix
+++ b/default.nix
@@ -13,78 +13,7 @@ self: super: {
makeFlags = [ "CC=cc" "PREFIX=$(out)" ];
- 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 = "0.2.1";
-
- src = fetchTarball {
- url =
- "https://euandreh.xyz/${name}.git/snapshot/${name}-${version}.tar.gz";
- sha256 = "15lxlhxllgmw1ampf36g4sr1gfd6vr257l4jw0z5457z2jvis9yg";
- };
-
- makeFlags = [ "CC=cc" "PREFIX=$(out)" ];
-
- 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;
- };
- };
- git-permalink-latest = pkgs.stdenv.mkDerivation rec {
- name = "git-permalink";
- version = "7f0c97b64bcccbdcd1667f2c2ca8f1face9ca027";
-
- src = fetchTarball {
- url =
- "https://euandreh.xyz/${name}.git/snapshot/${name}-${version}.tar.gz";
- sha256 = "1s9gbq0k5wpn0rjp1a9kzjh6sy7bbbqghykb7k4nms3wl0prip67";
- };
-
- makeFlags = [ "CC=cc" "PREFIX=$(out)" ];
-
- 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;
- };
- };
- git-permalink = pkgs.stdenv.mkDerivation rec {
- name = "git-permalink";
- version = "0.3.1";
-
- src = fetchTarball {
- url =
- "https://euandreh.xyz/${name}.git/snapshot/${name}-${version}.tar.gz";
- sha256 = "0agymhi7c75mn0glr3fg94grn1mmp2mk8ph2cwr0zf8pzyx0imcn";
- };
-
- makeFlags = [ "CC=cc" "PREFIX=$(out)" ];
-
+ checkInputs = with pkgs; [ m4 ];
doCheck = true;
meta = with pkgs.lib; {
diff --git a/paku.json b/paku.json
index 673abe7..24a3253 100644
--- a/paku.json
+++ b/paku.json
@@ -5,15 +5,13 @@
"suffix": "-latest",
"version": "707bb2080c35944b14da57f13310c4bad61259fe",
"type": "bin",
- "description": "Minimalistic bug tracker CLI"
- },
- {
- "name": "remembering",
- "suffix": "",
- "version": "0.2.1",
- "type": "bin",
- "description": "Add memory to dmenu, fzf and similar tools."
- },
+ "description": "Minimalistic bug tracker CLI",
+ "check_inputs": [
+ "m4"
+ ]
+ }
+ ],
+ "queue": [
{
"name": "git-permalink",
"suffix": "-latest",
@@ -26,7 +24,20 @@
"suffix": "",
"version": "0.3.1",
"type": "bin",
- "description": "Git extension to generate web permalinks of files in a repository"
+ "description": "Git extension to generate web permalinks of files in a repository",
+ "check_inputs": [
+ "m4"
+ ]
+ },
+ {
+ "name": "remembering",
+ "suffix": "",
+ "version": "0.2.1",
+ "type": "bin",
+ "description": "Add memory to dmenu, fzf and similar tools.",
+ "check_inputs": [
+ "m4"
+ ]
}
]
}
diff --git a/scripts/paku b/scripts/paku
index 73fd7ec..e9e7f37 100755
--- a/scripts/paku
+++ b/scripts/paku
@@ -72,8 +72,7 @@ EOF
"$SHA256"))))
(build-system gnu-build-system)$CHECK_INPUTS
(arguments \`(#:make-flags
- (list (string-append "CC=" ,(cc-for-target))
- (string-append "PREFIX=" %output))
+ (list (string-append "PREFIX=" %output))
#:phases
(modify-phases %standard-phases
(delete 'configure))))
diff --git a/src/xyz/euandreh/packages.scm b/src/xyz/euandreh/packages.scm
index 32641d0..d0a93be 100644
--- a/src/xyz/euandreh/packages.scm
+++ b/src/xyz/euandreh/packages.scm
@@ -26,84 +26,10 @@
(base32
"0qz037cx50zkfjlwk0f9n16ni3j5q328xydml4dw01l6nv9p4pnj"))))
(build-system gnu-build-system)
+ (inputs
+ `(("m4" ,(specification->package "m4"))))
(arguments `(#:make-flags
- (list (string-append "CC=" ,(cc-for-target))
- (string-append "PREFIX=" %output))
- #:phases
- (modify-phases %standard-phases
- (delete 'configure))))
- (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 "0.2.1")
- (source (origin
- (method url-fetch)
- (uri (string-append
- "https://euandreh.xyz/remembering.git/snapshot/remembering-"
- version
- ".tar.gz"))
- (sha256
- (base32
- "07q38ld6xy7qsz29crp2lpg695xpiz2ravmz0crlmy4iq1l4138f"))))
- (build-system gnu-build-system)
- (arguments `(#:make-flags
- (list (string-append "CC=" ,(cc-for-target))
- (string-append "PREFIX=" %output))
- #:phases
- (modify-phases %standard-phases
- (delete 'configure))))
- (synopsis (file-append source "/description"))
- (description (file-append source "/long-description"))
- (home-page (string-append "https://" name ".euandreh.xyz"))
- (license license:agpl3+)))
-
-(define-public git-permalink-latest
- (package
- (name "git-permalink-latest")
- (version "7f0c97b64bcccbdcd1667f2c2ca8f1face9ca027")
- (source (origin
- (method url-fetch)
- (uri (string-append
- "https://euandreh.xyz/git-permalink.git/snapshot/git-permalink-"
- version
- ".tar.gz"))
- (sha256
- (base32
- "0cchnh5czfrsxvqh50v5jv7z2ggn1515h4g7n7aviin4lcrxmahj"))))
- (build-system gnu-build-system)
- (arguments `(#:make-flags
- (list (string-append "CC=" ,(cc-for-target))
- (string-append "PREFIX=" %output))
- #:phases
- (modify-phases %standard-phases
- (delete 'configure))))
- (synopsis (file-append source "/description"))
- (description (file-append source "/long-description"))
- (home-page (string-append "https://" name ".euandreh.xyz"))
- (license license:agpl3+)))
-
-(define-public git-permalink
- (package
- (name "git-permalink")
- (version "0.3.1")
- (source (origin
- (method url-fetch)
- (uri (string-append
- "https://euandreh.xyz/git-permalink.git/snapshot/git-permalink-"
- version
- ".tar.gz"))
- (sha256
- (base32
- "07db7i3rjfcl30bbbg5as8jckh1fi76kr27641bhj58f2xh249g1"))))
- (build-system gnu-build-system)
- (arguments `(#:make-flags
- (list (string-append "CC=" ,(cc-for-target))
- (string-append "PREFIX=" %output))
+ (list (string-append "PREFIX=" %output))
#:phases
(modify-phases %standard-phases
(delete 'configure))))
@@ -113,7 +39,4 @@
(license license:agpl3+)))
(list
- td-latest
- remembering
- git-permalink-latest
- git-permalink)
+ td-latest)
generated by cgit v1.2.3 (git 2.46.2) at 2024-10-30 12:13:40 +0000