From 3fd7b03ed177b2a5e59f7209b45eaf5c980afc47 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Tue, 22 Sep 2026 20:55:17 -0400 Subject: nix devshells: transient fix re nixpkgs broken nixpkgs in devshells commented out --- flake.lock | 8 ++++---- flake.nix | 8 ++++---- org/config_nix.org | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 5da5518..698d13e 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1789370336, - "narHash": "sha256-obwZbWHP7htCIoq2Z0g/uTMcEgN6yqcMNIcOMe6P2qI=", - "rev": "c7def046b9a883d46974757852106483d741586f", + "lastModified": 1790055231, + "narHash": "sha256-wQZif6Lyrg1IDl8k68Gwa3OK9PermeRsjdKgso4K1VA=", + "rev": "b6c98e9e6633ee64753b594ff4a5febf0367fc00", "type": "tarball", - "url": "https://releases.nixos.org/nixpkgs/nixpkgs-26.11pre1073483.c7def046b9a8/nixexprs.tar.zst" + "url": "https://releases.nixos.org/nixpkgs/nixpkgs-26.11pre1078010.b6c98e9e6633/nixexprs.tar.zst" }, "original": { "type": "tarball", diff --git a/flake.nix b/flake.nix index 6186c18..c4f97f0 100644 --- a/flake.nix +++ b/flake.nix @@ -232,7 +232,7 @@ litecli visidata sqlitebrowser - sqlitestudio + #letos dbeaver-bin ]; }; @@ -260,7 +260,7 @@ xmlstarlet # xml sel -t -v html-tidy # the scroll html, which epubcheck never sees # pdf - poppler_utils # pdfinfo, pdftotext + poppler-utils # pdfinfo, pdftotext #texliveFull # NOT texlive.combined.scheme-full: deprecated, file # what a file is ]; @@ -273,7 +273,7 @@ # the suite shells out to these two; without them run-tests.sh # re-execs itself into a nix shell that has them sqlite-interactive # readline cli; base sqlite has none - datasette # serves an .ocda.db as a browsable, queryable web page with a json api, one command, no configuration + #datasette # serves an .ocda.db as a browsable, queryable web page with a json api, one command, no configuration epubcheck diffoscope # diffs two epubs, two odts or two pdfs by content rather (than as bytes) (useful when output moves and cmp only says "differ") unzip # containers: every one spine writes is a zip @@ -285,7 +285,7 @@ ebook_tools #jing # pdf - poppler_utils # pdfinfo, pdftotext + poppler-utils # pdfinfo, pdftotext texliveFull # NOT texlive.combined.scheme-full: deprecated, file # what a file is coreutils # sha256sum and numfmt guaranteed, for checking a digests.txt line by hand diff --git a/org/config_nix.org b/org/config_nix.org index f2bc085..abde477 100644 --- a/org/config_nix.org +++ b/org/config_nix.org @@ -255,7 +255,7 @@ litecli visidata sqlitebrowser - sqlitestudio + #letos dbeaver-bin ]; }; @@ -283,7 +283,7 @@ xmlstarlet # xml sel -t -v html-tidy # the scroll html, which epubcheck never sees # pdf - poppler_utils # pdfinfo, pdftotext + poppler-utils # pdfinfo, pdftotext #texliveFull # NOT texlive.combined.scheme-full: deprecated, file # what a file is ]; @@ -296,7 +296,7 @@ # the suite shells out to these two; without them run-tests.sh # re-execs itself into a nix shell that has them sqlite-interactive # readline cli; base sqlite has none - datasette # serves an .ocda.db as a browsable, queryable web page with a json api, one command, no configuration + #datasette # serves an .ocda.db as a browsable, queryable web page with a json api, one command, no configuration epubcheck diffoscope # diffs two epubs, two odts or two pdfs by content rather (than as bytes) (useful when output moves and cmp only says "differ") unzip # containers: every one spine writes is a zip @@ -308,7 +308,7 @@ ebook_tools #jing # pdf - poppler_utils # pdfinfo, pdftotext + poppler-utils # pdfinfo, pdftotext texliveFull # NOT texlive.combined.scheme-full: deprecated, file # what a file is coreutils # sha256sum and numfmt guaranteed, for checking a digests.txt line by hand -- cgit v1.2.3