From 9ca3bf86f4866b0c25a7b80e1a1bfff9a508972c Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sat, 19 Mar 2022 21:16:36 +0100 Subject: pkgs/sternenseemann: drop some unused stuff --- pkgs/sternenseemann/build-git-tarball/default.nix | 41 -------- .../bundle-signed-release/default.nix | 54 ----------- pkgs/sternenseemann/default.nix | 15 --- pkgs/sternenseemann/schmecgit/default.nix | 37 -------- pkgs/sternenseemann/schmecgit/main.c | 105 --------------------- pkgs/sternenseemann/unicode_clock/default.nix | 22 ----- 6 files changed, 274 deletions(-) delete mode 100644 pkgs/sternenseemann/build-git-tarball/default.nix delete mode 100644 pkgs/sternenseemann/bundle-signed-release/default.nix delete mode 100644 pkgs/sternenseemann/schmecgit/default.nix delete mode 100644 pkgs/sternenseemann/schmecgit/main.c delete mode 100644 pkgs/sternenseemann/unicode_clock/default.nix (limited to 'pkgs') diff --git a/pkgs/sternenseemann/build-git-tarball/default.nix b/pkgs/sternenseemann/build-git-tarball/default.nix deleted file mode 100644 index 816ad9e2..00000000 --- a/pkgs/sternenseemann/build-git-tarball/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -# Build a reproducible tar.gz from a git revision or tag -{ lib -, fetchgit -, runCommandNoCC -, gnutar -, gzip -, getBins -}: - -{ url -, sha256 -, pname -, subDir ? "" -, ... -}@args: - -assert lib.assertMsg (args ? rev || args ? tag) "Need either rev or tag"; - -let - bins = getBins gzip [ "gzip" ] - // getBins gnutar [ "tar" ] - ; - - shortRev = args.tag or args.rev; - realRev = - if args ? tag - then "refs/tags/${args.tag}" - else args.rev; - - source = fetchgit { - inherit url sha256; - rev = realRev; - }; - - basename = "${pname}-${shortRev}"; -in - -runCommandNoCC "${basename}.tar.gz" {} '' - cd ${source}${subDir} - ${bins.tar} -c ./ --transform 's/^\./${basename}/' | ${bins.gzip} > $out -'' diff --git a/pkgs/sternenseemann/bundle-signed-release/default.nix b/pkgs/sternenseemann/bundle-signed-release/default.nix deleted file mode 100644 index 5db979b0..00000000 --- a/pkgs/sternenseemann/bundle-signed-release/default.nix +++ /dev/null @@ -1,54 +0,0 @@ -# Build a directory containing release tarballs and -# their signatures. Fail if a signature is invalid. -{ lib -, getBins -, signify -, buildGitTarball -, runCommandNoCC -}: - -{ # public key to verify against - publicKey - # directory signature files are located in -, sigs -}: - -{ # project name: - # * tarballs are name ${pname}-${tag}.tar.gz - # * signatures are name ${pname}-${tag}.tar.gz.sig - pname - # information about the git remote to fetch from - # must contain an url attribute and may contain - # a subDir attribute. -, git - # List of releases which are represented as an - # attribute set which contains a sha256 and - # either a tag or rev attribute. -, releases -}: - -let - bins = getBins signify [ "signify" ]; - - tarballs = builtins.map - (args: buildGitTarball (git // args // { - inherit pname; - })) releases; - - sigFor = tarball: "${sigs}/${tarball.name}.sig"; -in - -runCommandNoCC "${pname}-releases" {} ('' - mkdir -p "$out" -'' + lib.concatMapStrings (tarball: '' - # verify tarball and inform user about what's happening - echo -n "${tarball.name}: " - ${bins.signify} -V \ - -p "${publicKey}" \ - -m "${tarball}" \ - -x "${sigFor tarball}" - - # succeeded, so copy tarball and signature - ln -s "${tarball}" "$out/${tarball.name}" - ln -s "${sigFor tarball}" "$out/${baseNameOf (sigFor tarball)}" -'') tarballs) diff --git a/pkgs/sternenseemann/default.nix b/pkgs/sternenseemann/default.nix index 63d944ff..55af2db4 100644 --- a/pkgs/sternenseemann/default.nix +++ b/pkgs/sternenseemann/default.nix @@ -46,15 +46,6 @@ lib.fix (self: { # nix utilities lib = callPackage ./lib { }; - buildGitTarball = callPackage ./build-git-tarball { - inherit getBins; - }; - - bundleSignedReleases = callPackage ./bundle-signed-release { - inherit getBins; - inherit (self) buildGitTarball; - }; - # packaged sterniware inherit (haskellPackages) emoji-generic; @@ -65,10 +56,6 @@ lib.fix (self: { temp ; - schmecgit = callPackage ./schmecgit { - inherit (pkgs.llvmPackages_latest) stdenv; - }; - scripts = dontRecurseIntoAttrs (callPackage ./scripts { inherit (writers) writeBashBin; inherit (self) shakti; @@ -86,8 +73,6 @@ lib.fix (self: { }; }; - unicode_clock = python3Packages.callPackage ./unicode_clock { }; - vuizvui-update-programs-sqlite = python3Packages.callPackage ./vuizvui-update-programs-sqlite { inherit (pkgs.writers) writePython3; inherit (profpatsch) getBins; diff --git a/pkgs/sternenseemann/schmecgit/default.nix b/pkgs/sternenseemann/schmecgit/default.nix deleted file mode 100644 index 982b2c1d..00000000 --- a/pkgs/sternenseemann/schmecgit/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ runCommandWith -, stdenv -, lib -, lowdown -, chroma -, substituteAll -}: - -let - src = substituteAll { - src = ./main.c; - chroma = "${lib.getBin chroma}/bin/chroma"; - lowdown = "${lib.getBin lowdown}/bin/lowdown"; - }; -in - -runCommandWith { - name = "schmecgit"; - inherit stdenv; - derivationArgs.meta = { - description = "schmeck it, about and source filter for cgit"; - license = lib.licenses.gpl2Plus; - platforms = lib.platforms.unix; - }; -} '' - mkdir -p "$out/bin" - - # compile main executable - clang -o "$out/bin/schmecgit" -pedantic -Wall -Wextra -Werror -std=c99 ${src} - - # wrapper script for cgit about filter - cat > "$out/bin/schmecgit-about" < -#include -#include -#include -#include - -enum file_type { - PLAIN, - MARKDOWN, - HTML, - CODE -}; - -void output_xml_escaped_char(char c, FILE *out) { - switch(c) { - case '&': - fputs("&", out); - break; - case '<': - fputs("<", out); - break; - case '>': - fputs(">", out); - break; - case '\'': - fputs("'", out); - break; - case '\"': - fputs(""", out); - break; - default: - fputc(c, out); - break; - } -} - -int main(int argc, char *argv[]) { - bool about_filter; - char *file; - - if(argc == 2) { - about_filter = 0; - file = argv[1]; - } else if(argc == 3 && strcmp(argv[1], "--about") == 0) { - about_filter = 1; - file = argv[2]; - } else { - fprintf(stderr, "Usage: %s [--about] BASENAME\n", argv[0]); - return 1; - } - - char *extension = rindex(file, '.'); - enum file_type ft = PLAIN; - - if(extension != NULL) { - extension++; - - if(about_filter && (strcmp(extension, "md") == 0 || strcmp(extension, "markdown") == 0)) { - ft = MARKDOWN; - } else if(about_filter && (strcmp(extension, "html") == 0 || strcmp(extension, "htm") == 0)) { - ft = HTML; - } else if(strcmp(extension, "txt") == 0) { - ft = PLAIN; - } else { - ft = CODE; - } - } else { - if(strcmp(file, "Makefile") == 0 || strcmp(file, "Doxyfile")) { - ft = CODE; - } - } - - if(ft == PLAIN || ft == HTML) { - char c; - if(ft == PLAIN) { - fputs("
", stdout);
-    }
-
-    while((c = fgetc(stdin)) != EOF) {
-      if(ft == HTML) {
-        fputc(c, stdout);
-      } else {
-        output_xml_escaped_char(c, stdout);
-      }
-    }
-
-    if(ft == PLAIN) {
-      fputs("
", stdout); - } - } else if(ft == MARKDOWN) { - return execl("@lowdown@", "lowdown", NULL); - } else if(ft == CODE) { - return execl( - "@chroma@", "chroma", "--filename", file, - "--html", "--html-tab-width=2", "--html-only", "--html-inline-styles", - "--style=lovelace", - NULL - ); - } else { - return 1; - } - - return 0; -} diff --git a/pkgs/sternenseemann/unicode_clock/default.nix b/pkgs/sternenseemann/unicode_clock/default.nix deleted file mode 100644 index 8ff89499..00000000 --- a/pkgs/sternenseemann/unicode_clock/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ lib, buildPythonPackage, fetchFromGitHub }: - -buildPythonPackage rec { - pname = "unicode_clock"; - version = "0.1"; - - src = fetchFromGitHub { - owner = "sternenseemann"; - repo = pname; - rev = version; - sha256 = "12znnfpglyprjsr5slsw79wg09kjvwfv5brzsrf3s3s9z8vfpfmn"; - }; - - pythonImportsCheck = [ "unicode_clock" ]; - - meta = with lib; { - description = "Get unicode clock symbol for a time"; - license = licenses.gpl3; - inherit (src.meta) homepage; - }; -} - -- cgit 1.4.1