From cb5fb02e309f23c9bb0cfec41a1e6f5d4251a974 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Tue, 25 Nov 2025 13:32:39 +0100 Subject: ldif2json --- _sources/generated.json | 42 ++++++++++++++++++------- _sources/generated.nix | 36 ++++++++++++++------- accounts/gkleen@sif/default.nix | 2 +- accounts/gkleen@sif/utils/ldif2json/conf.patch | 12 +++++++ accounts/gkleen@sif/utils/ldif2json/default.nix | 20 ++++++++++++ nvfetcher.toml | 4 +++ 6 files changed, 93 insertions(+), 23 deletions(-) create mode 100644 accounts/gkleen@sif/utils/ldif2json/conf.patch create mode 100644 accounts/gkleen@sif/utils/ldif2json/default.nix diff --git a/_sources/generated.json b/_sources/generated.json index f5ead269..e2c9035a 100644 --- a/_sources/generated.json +++ b/_sources/generated.json @@ -83,6 +83,26 @@ }, "version": "v2.7" }, + "ldif2json": { + "cargoLock": null, + "date": "2025-03-29", + "extract": null, + "name": "ldif2json", + "passthru": null, + "pinned": false, + "src": { + "deepClone": false, + "fetchSubmodules": false, + "leaveDotGit": false, + "name": null, + "rev": "238c239985c688e879493a30a04f7195acb5120f", + "sha256": "sha256-1dyWbsOdeRVIx8mFOidhnCdGWHOjaeiZY4noPfWkW0s=", + "sparseCheckout": [], + "type": "git", + "url": "https://codeberg.org/joatca/ldif2json.git" + }, + "version": "238c239985c688e879493a30a04f7195acb5120f" + }, "lesspipe": { "cargoLock": null, "date": null, @@ -91,11 +111,11 @@ "passthru": null, "pinned": false, "src": { - "sha256": "sha256-yb3IzdaMiv1PwqHOfSyHvmWXyStvK/XXC49saXVAJFU=", + "sha256": "sha256-39ZfIA+gg/ImOwxPjOsVyakQ0kH6P2CgefMep1TBjVg=", "type": "tarball", - "url": "https://github.com/wofr06/lesspipe/archive/refs/tags/v2.20.tar.gz" + "url": "https://github.com/wofr06/lesspipe/archive/refs/tags/v2.21.tar.gz" }, - "version": "2.20" + "version": "2.21" }, "mpv-autosave": { "cargoLock": null, @@ -355,7 +375,7 @@ }, "quickshell": { "cargoLock": null, - "date": "2025-11-20", + "date": "2025-11-24", "extract": null, "name": "quickshell", "passthru": null, @@ -365,13 +385,13 @@ "fetchSubmodules": false, "leaveDotGit": false, "name": null, - "rev": "ed036d514b0fdbce03158a0b331305be166f4555", - "sha256": "sha256-jWz10RbNAyylJbH4cUTLS/CsDjkd8gxfT8OsIgQIgEg=", + "rev": "e9bad67619ee9937a1bbecfc6ad3b4231d2ecdc3", + "sha256": "sha256-W24ReyRrhOKTKIsuAMkY5hnVlCufGoONM79sjUoyQkk=", "sparseCheckout": [], "type": "git", "url": "https://git.outfoxxed.me/quickshell/quickshell.git" }, - "version": "ed036d514b0fdbce03158a0b331305be166f4555" + "version": "e9bad67619ee9937a1bbecfc6ad3b4231d2ecdc3" }, "scutiger": { "cargoLock": null, @@ -437,7 +457,7 @@ }, "v4l2loopback": { "cargoLock": null, - "date": "2025-10-15", + "date": "2025-11-24", "extract": null, "name": "v4l2loopback", "passthru": null, @@ -449,12 +469,12 @@ "name": null, "owner": "umlaeute", "repo": "v4l2loopback", - "rev": "c394f8fb2c168932055c2577247c42390198d7c9", - "sha256": "sha256-lf2n5tjnGHwhY49UVKnGgaz0ZPexFcK0/RkMDecGfXs=", + "rev": "a7e4a4dea36187ad3550c797d647bcc50faced42", + "sha256": "sha256-Z7cJEYIwA0sY7yVgQmlATZgqAFVhBiRVFY1opavX/7o=", "sparseCheckout": [], "type": "github" }, - "version": "c394f8fb2c168932055c2577247c42390198d7c9" + "version": "a7e4a4dea36187ad3550c797d647bcc50faced42" }, "xcompose": { "cargoLock": null, diff --git a/_sources/generated.nix b/_sources/generated.nix index d3d9b36f..3224783e 100644 --- a/_sources/generated.nix +++ b/_sources/generated.nix @@ -56,12 +56,26 @@ sha256 = "sha256-bUFh0Q7xcnKTBgVBUJU8BH6zzq1Y3krLfJJAgx5TqKs="; }; }; + ldif2json = { + pname = "ldif2json"; + version = "238c239985c688e879493a30a04f7195acb5120f"; + src = fetchgit { + url = "https://codeberg.org/joatca/ldif2json.git"; + rev = "238c239985c688e879493a30a04f7195acb5120f"; + fetchSubmodules = false; + deepClone = false; + leaveDotGit = false; + sparseCheckout = [ ]; + sha256 = "sha256-1dyWbsOdeRVIx8mFOidhnCdGWHOjaeiZY4noPfWkW0s="; + }; + date = "2025-03-29"; + }; lesspipe = { pname = "lesspipe"; - version = "2.20"; + version = "2.21"; src = fetchTarball { - url = "https://github.com/wofr06/lesspipe/archive/refs/tags/v2.20.tar.gz"; - sha256 = "sha256-yb3IzdaMiv1PwqHOfSyHvmWXyStvK/XXC49saXVAJFU="; + url = "https://github.com/wofr06/lesspipe/archive/refs/tags/v2.21.tar.gz"; + sha256 = "sha256-39ZfIA+gg/ImOwxPjOsVyakQ0kH6P2CgefMep1TBjVg="; }; }; mpv-autosave = { @@ -223,17 +237,17 @@ }; quickshell = { pname = "quickshell"; - version = "ed036d514b0fdbce03158a0b331305be166f4555"; + version = "e9bad67619ee9937a1bbecfc6ad3b4231d2ecdc3"; src = fetchgit { url = "https://git.outfoxxed.me/quickshell/quickshell.git"; - rev = "ed036d514b0fdbce03158a0b331305be166f4555"; + rev = "e9bad67619ee9937a1bbecfc6ad3b4231d2ecdc3"; fetchSubmodules = false; deepClone = false; leaveDotGit = false; sparseCheckout = [ ]; - sha256 = "sha256-jWz10RbNAyylJbH4cUTLS/CsDjkd8gxfT8OsIgQIgEg="; + sha256 = "sha256-W24ReyRrhOKTKIsuAMkY5hnVlCufGoONM79sjUoyQkk="; }; - date = "2025-11-20"; + date = "2025-11-24"; }; scutiger = { pname = "scutiger"; @@ -275,15 +289,15 @@ }; v4l2loopback = { pname = "v4l2loopback"; - version = "c394f8fb2c168932055c2577247c42390198d7c9"; + version = "a7e4a4dea36187ad3550c797d647bcc50faced42"; src = fetchFromGitHub { owner = "umlaeute"; repo = "v4l2loopback"; - rev = "c394f8fb2c168932055c2577247c42390198d7c9"; + rev = "a7e4a4dea36187ad3550c797d647bcc50faced42"; fetchSubmodules = true; - sha256 = "sha256-lf2n5tjnGHwhY49UVKnGgaz0ZPexFcK0/RkMDecGfXs="; + sha256 = "sha256-Z7cJEYIwA0sY7yVgQmlATZgqAFVhBiRVFY1opavX/7o="; }; - date = "2025-10-15"; + date = "2025-11-24"; }; xcompose = { pname = "xcompose"; diff --git a/accounts/gkleen@sif/default.nix b/accounts/gkleen@sif/default.nix index 36b722e4..5a4521a8 100644 --- a/accounts/gkleen@sif/default.nix +++ b/accounts/gkleen@sif/default.nix @@ -511,7 +511,7 @@ in { nerd-fonts.symbols-only nerd-fonts.fira-code powerline-fonts swtpm (hunspell.withDicts (dicts: with dicts; [en_GB-large de_DE])) libation libqalculate - ] ++ mapAttrsToList (_name: pkg: pkgs.callPackage pkg {}) (customUtils.nixImport { dir = ./utils; }); + ] ++ mapAttrsToList (_name: pkg: pkgs.callPackage pkg { inherit sources; }) (customUtils.nixImport { dir = ./utils; }); file = { ".backup-munin".source = ./backup-patterns; diff --git a/accounts/gkleen@sif/utils/ldif2json/conf.patch b/accounts/gkleen@sif/utils/ldif2json/conf.patch new file mode 100644 index 00000000..e253e5f7 --- /dev/null +++ b/accounts/gkleen@sif/utils/ldif2json/conf.patch @@ -0,0 +1,12 @@ +diff --git i/src/conf.cr w/src/conf.cr +index b29ca84..eb7e0b4 100644 +--- i/src/conf.cr ++++ w/src/conf.cr +@@ -89,7 +89,6 @@ module Ldif2json + + end.parse + +- puts "@coercions #{@coercions.inspect} @can_be_coerced #{@can_be_coerced.inspect} @can_be_coerced[\"foobar\"] #{@can_be_coerced["foobar"].inspect} @can_be_flattened #{@can_be_flattened.inspect} @can_be_flattened[\"foobar\"] #{@can_be_flattened["foobar"].inspect}" + raise NormalError.new("cannot set types in join mode") if @mode == Mode::Join && @coercions.size > 0 + + end diff --git a/accounts/gkleen@sif/utils/ldif2json/default.nix b/accounts/gkleen@sif/utils/ldif2json/default.nix new file mode 100644 index 00000000..35aef717 --- /dev/null +++ b/accounts/gkleen@sif/utils/ldif2json/default.nix @@ -0,0 +1,20 @@ +{ crystal, sources }: +crystal.buildCrystalPackage { + inherit (sources.ldif2json) pname version src; + + patches = [ + ./conf.patch + ]; + + buildPhase = '' + make bin/ldif2json + ''; + + installPhase = '' + mkdir -p $out/bin $out/share/man/man1 + install -m 0555 -t $out/bin bin/ldif2json + install -m 0444 -t $out/share/man/man1 doc/ldif2json.1.gz + ''; + + doCheck = false; +} diff --git a/nvfetcher.toml b/nvfetcher.toml index 4d49583e..499a4e81 100644 --- a/nvfetcher.toml +++ b/nvfetcher.toml @@ -123,3 +123,7 @@ fetch.git = "https://git.outfoxxed.me/quickshell/quickshell.git" [nix-output-monitor] src.git = "https://code.maralorn.de/maralorn/nix-output-monitor.git" fetch.git = "https://code.maralorn.de/maralorn/nix-output-monitor.git" + +[ldif2json] +src.git = "https://codeberg.org/joatca/ldif2json.git" +fetch.git = "https://codeberg.org/joatca/ldif2json.git" -- cgit v1.2.3