diff options
| -rw-r--r-- | _sources/generated.json | 42 | ||||
| -rw-r--r-- | _sources/generated.nix | 36 | ||||
| -rw-r--r-- | accounts/gkleen@sif/default.nix | 2 | ||||
| -rw-r--r-- | accounts/gkleen@sif/utils/ldif2json/conf.patch | 12 | ||||
| -rw-r--r-- | accounts/gkleen@sif/utils/ldif2json/default.nix | 20 | ||||
| -rw-r--r-- | nvfetcher.toml | 4 |
6 files changed, 93 insertions, 23 deletions
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 @@ | |||
| 83 | }, | 83 | }, |
| 84 | "version": "v2.7" | 84 | "version": "v2.7" |
| 85 | }, | 85 | }, |
| 86 | "ldif2json": { | ||
| 87 | "cargoLock": null, | ||
| 88 | "date": "2025-03-29", | ||
| 89 | "extract": null, | ||
| 90 | "name": "ldif2json", | ||
| 91 | "passthru": null, | ||
| 92 | "pinned": false, | ||
| 93 | "src": { | ||
| 94 | "deepClone": false, | ||
| 95 | "fetchSubmodules": false, | ||
| 96 | "leaveDotGit": false, | ||
| 97 | "name": null, | ||
| 98 | "rev": "238c239985c688e879493a30a04f7195acb5120f", | ||
| 99 | "sha256": "sha256-1dyWbsOdeRVIx8mFOidhnCdGWHOjaeiZY4noPfWkW0s=", | ||
| 100 | "sparseCheckout": [], | ||
| 101 | "type": "git", | ||
| 102 | "url": "https://codeberg.org/joatca/ldif2json.git" | ||
| 103 | }, | ||
| 104 | "version": "238c239985c688e879493a30a04f7195acb5120f" | ||
| 105 | }, | ||
| 86 | "lesspipe": { | 106 | "lesspipe": { |
| 87 | "cargoLock": null, | 107 | "cargoLock": null, |
| 88 | "date": null, | 108 | "date": null, |
| @@ -91,11 +111,11 @@ | |||
| 91 | "passthru": null, | 111 | "passthru": null, |
| 92 | "pinned": false, | 112 | "pinned": false, |
| 93 | "src": { | 113 | "src": { |
| 94 | "sha256": "sha256-yb3IzdaMiv1PwqHOfSyHvmWXyStvK/XXC49saXVAJFU=", | 114 | "sha256": "sha256-39ZfIA+gg/ImOwxPjOsVyakQ0kH6P2CgefMep1TBjVg=", |
| 95 | "type": "tarball", | 115 | "type": "tarball", |
| 96 | "url": "https://github.com/wofr06/lesspipe/archive/refs/tags/v2.20.tar.gz" | 116 | "url": "https://github.com/wofr06/lesspipe/archive/refs/tags/v2.21.tar.gz" |
| 97 | }, | 117 | }, |
| 98 | "version": "2.20" | 118 | "version": "2.21" |
| 99 | }, | 119 | }, |
| 100 | "mpv-autosave": { | 120 | "mpv-autosave": { |
| 101 | "cargoLock": null, | 121 | "cargoLock": null, |
| @@ -355,7 +375,7 @@ | |||
| 355 | }, | 375 | }, |
| 356 | "quickshell": { | 376 | "quickshell": { |
| 357 | "cargoLock": null, | 377 | "cargoLock": null, |
| 358 | "date": "2025-11-20", | 378 | "date": "2025-11-24", |
| 359 | "extract": null, | 379 | "extract": null, |
| 360 | "name": "quickshell", | 380 | "name": "quickshell", |
| 361 | "passthru": null, | 381 | "passthru": null, |
| @@ -365,13 +385,13 @@ | |||
| 365 | "fetchSubmodules": false, | 385 | "fetchSubmodules": false, |
| 366 | "leaveDotGit": false, | 386 | "leaveDotGit": false, |
| 367 | "name": null, | 387 | "name": null, |
| 368 | "rev": "ed036d514b0fdbce03158a0b331305be166f4555", | 388 | "rev": "e9bad67619ee9937a1bbecfc6ad3b4231d2ecdc3", |
| 369 | "sha256": "sha256-jWz10RbNAyylJbH4cUTLS/CsDjkd8gxfT8OsIgQIgEg=", | 389 | "sha256": "sha256-W24ReyRrhOKTKIsuAMkY5hnVlCufGoONM79sjUoyQkk=", |
| 370 | "sparseCheckout": [], | 390 | "sparseCheckout": [], |
| 371 | "type": "git", | 391 | "type": "git", |
| 372 | "url": "https://git.outfoxxed.me/quickshell/quickshell.git" | 392 | "url": "https://git.outfoxxed.me/quickshell/quickshell.git" |
| 373 | }, | 393 | }, |
| 374 | "version": "ed036d514b0fdbce03158a0b331305be166f4555" | 394 | "version": "e9bad67619ee9937a1bbecfc6ad3b4231d2ecdc3" |
| 375 | }, | 395 | }, |
| 376 | "scutiger": { | 396 | "scutiger": { |
| 377 | "cargoLock": null, | 397 | "cargoLock": null, |
| @@ -437,7 +457,7 @@ | |||
| 437 | }, | 457 | }, |
| 438 | "v4l2loopback": { | 458 | "v4l2loopback": { |
| 439 | "cargoLock": null, | 459 | "cargoLock": null, |
| 440 | "date": "2025-10-15", | 460 | "date": "2025-11-24", |
| 441 | "extract": null, | 461 | "extract": null, |
| 442 | "name": "v4l2loopback", | 462 | "name": "v4l2loopback", |
| 443 | "passthru": null, | 463 | "passthru": null, |
| @@ -449,12 +469,12 @@ | |||
| 449 | "name": null, | 469 | "name": null, |
| 450 | "owner": "umlaeute", | 470 | "owner": "umlaeute", |
| 451 | "repo": "v4l2loopback", | 471 | "repo": "v4l2loopback", |
| 452 | "rev": "c394f8fb2c168932055c2577247c42390198d7c9", | 472 | "rev": "a7e4a4dea36187ad3550c797d647bcc50faced42", |
| 453 | "sha256": "sha256-lf2n5tjnGHwhY49UVKnGgaz0ZPexFcK0/RkMDecGfXs=", | 473 | "sha256": "sha256-Z7cJEYIwA0sY7yVgQmlATZgqAFVhBiRVFY1opavX/7o=", |
| 454 | "sparseCheckout": [], | 474 | "sparseCheckout": [], |
| 455 | "type": "github" | 475 | "type": "github" |
| 456 | }, | 476 | }, |
| 457 | "version": "c394f8fb2c168932055c2577247c42390198d7c9" | 477 | "version": "a7e4a4dea36187ad3550c797d647bcc50faced42" |
| 458 | }, | 478 | }, |
| 459 | "xcompose": { | 479 | "xcompose": { |
| 460 | "cargoLock": null, | 480 | "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 @@ | |||
| 56 | sha256 = "sha256-bUFh0Q7xcnKTBgVBUJU8BH6zzq1Y3krLfJJAgx5TqKs="; | 56 | sha256 = "sha256-bUFh0Q7xcnKTBgVBUJU8BH6zzq1Y3krLfJJAgx5TqKs="; |
| 57 | }; | 57 | }; |
| 58 | }; | 58 | }; |
| 59 | ldif2json = { | ||
| 60 | pname = "ldif2json"; | ||
| 61 | version = "238c239985c688e879493a30a04f7195acb5120f"; | ||
| 62 | src = fetchgit { | ||
| 63 | url = "https://codeberg.org/joatca/ldif2json.git"; | ||
| 64 | rev = "238c239985c688e879493a30a04f7195acb5120f"; | ||
| 65 | fetchSubmodules = false; | ||
| 66 | deepClone = false; | ||
| 67 | leaveDotGit = false; | ||
| 68 | sparseCheckout = [ ]; | ||
| 69 | sha256 = "sha256-1dyWbsOdeRVIx8mFOidhnCdGWHOjaeiZY4noPfWkW0s="; | ||
| 70 | }; | ||
| 71 | date = "2025-03-29"; | ||
| 72 | }; | ||
| 59 | lesspipe = { | 73 | lesspipe = { |
| 60 | pname = "lesspipe"; | 74 | pname = "lesspipe"; |
| 61 | version = "2.20"; | 75 | version = "2.21"; |
| 62 | src = fetchTarball { | 76 | src = fetchTarball { |
| 63 | url = "https://github.com/wofr06/lesspipe/archive/refs/tags/v2.20.tar.gz"; | 77 | url = "https://github.com/wofr06/lesspipe/archive/refs/tags/v2.21.tar.gz"; |
| 64 | sha256 = "sha256-yb3IzdaMiv1PwqHOfSyHvmWXyStvK/XXC49saXVAJFU="; | 78 | sha256 = "sha256-39ZfIA+gg/ImOwxPjOsVyakQ0kH6P2CgefMep1TBjVg="; |
| 65 | }; | 79 | }; |
| 66 | }; | 80 | }; |
| 67 | mpv-autosave = { | 81 | mpv-autosave = { |
| @@ -223,17 +237,17 @@ | |||
| 223 | }; | 237 | }; |
| 224 | quickshell = { | 238 | quickshell = { |
| 225 | pname = "quickshell"; | 239 | pname = "quickshell"; |
| 226 | version = "ed036d514b0fdbce03158a0b331305be166f4555"; | 240 | version = "e9bad67619ee9937a1bbecfc6ad3b4231d2ecdc3"; |
| 227 | src = fetchgit { | 241 | src = fetchgit { |
| 228 | url = "https://git.outfoxxed.me/quickshell/quickshell.git"; | 242 | url = "https://git.outfoxxed.me/quickshell/quickshell.git"; |
| 229 | rev = "ed036d514b0fdbce03158a0b331305be166f4555"; | 243 | rev = "e9bad67619ee9937a1bbecfc6ad3b4231d2ecdc3"; |
| 230 | fetchSubmodules = false; | 244 | fetchSubmodules = false; |
| 231 | deepClone = false; | 245 | deepClone = false; |
| 232 | leaveDotGit = false; | 246 | leaveDotGit = false; |
| 233 | sparseCheckout = [ ]; | 247 | sparseCheckout = [ ]; |
| 234 | sha256 = "sha256-jWz10RbNAyylJbH4cUTLS/CsDjkd8gxfT8OsIgQIgEg="; | 248 | sha256 = "sha256-W24ReyRrhOKTKIsuAMkY5hnVlCufGoONM79sjUoyQkk="; |
| 235 | }; | 249 | }; |
| 236 | date = "2025-11-20"; | 250 | date = "2025-11-24"; |
| 237 | }; | 251 | }; |
| 238 | scutiger = { | 252 | scutiger = { |
| 239 | pname = "scutiger"; | 253 | pname = "scutiger"; |
| @@ -275,15 +289,15 @@ | |||
| 275 | }; | 289 | }; |
| 276 | v4l2loopback = { | 290 | v4l2loopback = { |
| 277 | pname = "v4l2loopback"; | 291 | pname = "v4l2loopback"; |
| 278 | version = "c394f8fb2c168932055c2577247c42390198d7c9"; | 292 | version = "a7e4a4dea36187ad3550c797d647bcc50faced42"; |
| 279 | src = fetchFromGitHub { | 293 | src = fetchFromGitHub { |
| 280 | owner = "umlaeute"; | 294 | owner = "umlaeute"; |
| 281 | repo = "v4l2loopback"; | 295 | repo = "v4l2loopback"; |
| 282 | rev = "c394f8fb2c168932055c2577247c42390198d7c9"; | 296 | rev = "a7e4a4dea36187ad3550c797d647bcc50faced42"; |
| 283 | fetchSubmodules = true; | 297 | fetchSubmodules = true; |
| 284 | sha256 = "sha256-lf2n5tjnGHwhY49UVKnGgaz0ZPexFcK0/RkMDecGfXs="; | 298 | sha256 = "sha256-Z7cJEYIwA0sY7yVgQmlATZgqAFVhBiRVFY1opavX/7o="; |
| 285 | }; | 299 | }; |
| 286 | date = "2025-10-15"; | 300 | date = "2025-11-24"; |
| 287 | }; | 301 | }; |
| 288 | xcompose = { | 302 | xcompose = { |
| 289 | pname = "xcompose"; | 303 | 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 { | |||
| 511 | nerd-fonts.symbols-only nerd-fonts.fira-code powerline-fonts | 511 | nerd-fonts.symbols-only nerd-fonts.fira-code powerline-fonts |
| 512 | swtpm (hunspell.withDicts (dicts: with dicts; [en_GB-large de_DE])) | 512 | swtpm (hunspell.withDicts (dicts: with dicts; [en_GB-large de_DE])) |
| 513 | libation libqalculate | 513 | libation libqalculate |
| 514 | ] ++ mapAttrsToList (_name: pkg: pkgs.callPackage pkg {}) (customUtils.nixImport { dir = ./utils; }); | 514 | ] ++ mapAttrsToList (_name: pkg: pkgs.callPackage pkg { inherit sources; }) (customUtils.nixImport { dir = ./utils; }); |
| 515 | 515 | ||
| 516 | file = { | 516 | file = { |
| 517 | ".backup-munin".source = ./backup-patterns; | 517 | ".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 @@ | |||
| 1 | diff --git i/src/conf.cr w/src/conf.cr | ||
| 2 | index b29ca84..eb7e0b4 100644 | ||
| 3 | --- i/src/conf.cr | ||
| 4 | +++ w/src/conf.cr | ||
| 5 | @@ -89,7 +89,6 @@ module Ldif2json | ||
| 6 | |||
| 7 | end.parse | ||
| 8 | |||
| 9 | - 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}" | ||
| 10 | raise NormalError.new("cannot set types in join mode") if @mode == Mode::Join && @coercions.size > 0 | ||
| 11 | |||
| 12 | 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 @@ | |||
| 1 | { crystal, sources }: | ||
| 2 | crystal.buildCrystalPackage { | ||
| 3 | inherit (sources.ldif2json) pname version src; | ||
| 4 | |||
| 5 | patches = [ | ||
| 6 | ./conf.patch | ||
| 7 | ]; | ||
| 8 | |||
| 9 | buildPhase = '' | ||
| 10 | make bin/ldif2json | ||
| 11 | ''; | ||
| 12 | |||
| 13 | installPhase = '' | ||
| 14 | mkdir -p $out/bin $out/share/man/man1 | ||
| 15 | install -m 0555 -t $out/bin bin/ldif2json | ||
| 16 | install -m 0444 -t $out/share/man/man1 doc/ldif2json.1.gz | ||
| 17 | ''; | ||
| 18 | |||
| 19 | doCheck = false; | ||
| 20 | } | ||
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" | |||
| 123 | [nix-output-monitor] | 123 | [nix-output-monitor] |
| 124 | src.git = "https://code.maralorn.de/maralorn/nix-output-monitor.git" | 124 | src.git = "https://code.maralorn.de/maralorn/nix-output-monitor.git" |
| 125 | fetch.git = "https://code.maralorn.de/maralorn/nix-output-monitor.git" | 125 | fetch.git = "https://code.maralorn.de/maralorn/nix-output-monitor.git" |
| 126 | |||
| 127 | [ldif2json] | ||
| 128 | src.git = "https://codeberg.org/joatca/ldif2json.git" | ||
| 129 | fetch.git = "https://codeberg.org/joatca/ldif2json.git" | ||
