diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md index 06aa3fe56f0e..5ebd2aeb1238 100644 --- a/nixos/doc/manual/release-notes/rl-2505.section.md +++ b/nixos/doc/manual/release-notes/rl-2505.section.md @@ -129,6 +129,8 @@ - [Stash](https://github.com/stashapp/stash), An organizer for your adult videos/images, written in Go. Available as [services.stash](#opt-services.stash.enable). +- [vsmartcard-vpcd](https://frankmorgner.github.io/vsmartcard/virtualsmartcard/README.html), a virtual smart card driver. Available as [services.vsmartcard-vpcd](#opt-services.vsmartcard-vpcd.enable). + - [Fider](https://fider.io/), an open platform to collect and prioritize feedback. Available as [services.fider](#opt-services.fider.enable). - [PDS](https://github.com/bluesky-social/pds), Personal Data Server for [bsky](https://bsky.social/). Available as [services.pds](option.html#opt-services.pds). diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 81dca2243104..a07a08dbdd7c 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -567,6 +567,7 @@ ./services/development/lorri.nix ./services/development/nixseparatedebuginfod.nix ./services/development/rstudio-server/default.nix + ./services/development/vsmartcard-vpcd.nix ./services/development/zammad.nix ./services/display-managers/default.nix ./services/display-managers/greetd.nix diff --git a/nixos/modules/services/development/vsmartcard-vpcd.nix b/nixos/modules/services/development/vsmartcard-vpcd.nix new file mode 100644 index 000000000000..c1ce972b998e --- /dev/null +++ b/nixos/modules/services/development/vsmartcard-vpcd.nix @@ -0,0 +1,49 @@ +{ + config, + lib, + pkgs, + ... +}: + +let + + cfg = config.services.vsmartcard-vpcd; + +in +{ + + options.services.vsmartcard-vpcd = { + enable = lib.mkEnableOption "Virtual smart card driver."; + + port = lib.mkOption { + type = lib.types.port; + default = 35963; + description = '' + Port number vpcd will be listening on. + ''; + }; + + hostname = lib.mkOption { + type = lib.types.str; + default = "/dev/null"; + description = '' + Hostname of a waiting vpicc server vpcd will be connecting to. Use /dev/null for listening mode. + ''; + }; + }; + + config = lib.mkIf cfg.enable { + services.pcscd.readerConfigs = [ + '' + FRIENDLYNAME "Virtual PCD" + DEVICENAME ${cfg.hostname}:0x${lib.toHexString cfg.port} + LIBPATH ${pkgs.vsmartcard-vpcd}/var/lib/pcsc/drivers/serial/libifdvpcd.so + CHANNELID 0x${lib.toHexString cfg.port} + '' + ]; + + environment.systemPackages = [ pkgs.vsmartcard-vpcd ]; + }; + + meta.maintainers = with lib.maintainers; [ stargate01 ]; +} diff --git a/nixos/modules/virtualisation/nixos-containers.nix b/nixos/modules/virtualisation/nixos-containers.nix index 5f43e3322340..8c5621ca6f40 100644 --- a/nixos/modules/virtualisation/nixos-containers.nix +++ b/nixos/modules/virtualisation/nixos-containers.nix @@ -92,7 +92,7 @@ let chmod 0755 "$root/etc" "$root/var/lib" mkdir -p "$root/var/lib/private" "$root/root" /run/nixos-containers chmod 0700 "$root/var/lib/private" "$root/root" /run/nixos-containers - if ! [ -e "$root/etc/os-release" ]; then + if ! [ -e "$root/etc/os-release" ] && ! [ -h "$root/etc/os-release" ]; then touch "$root/etc/os-release" fi diff --git a/pkgs/applications/video/vdr/softhddevice/default.nix b/pkgs/applications/video/vdr/softhddevice/default.nix index 3c457f7b1c18..e6461b85863b 100644 --- a/pkgs/applications/video/vdr/softhddevice/default.nix +++ b/pkgs/applications/video/vdr/softhddevice/default.nix @@ -15,12 +15,12 @@ }: stdenv.mkDerivation rec { pname = "vdr-softhddevice"; - version = "2.4.3"; + version = "2.4.4"; src = fetchFromGitHub { owner = "ua0lnj"; repo = "vdr-plugin-softhddevice"; - sha256 = "sha256-KN0PJ/yER2iqk8+UZvLsgmScTa/9rmeBcZ19/ljHNAk="; + sha256 = "sha256-RaPzflLz712+UU4dD7p3waMD6dg5SHfT9SfmON4jVk4="; rev = "v${version}"; }; diff --git a/pkgs/tools/typesetting/tectonic/biber.nix b/pkgs/by-name/bi/biber-for-tectonic/package.nix similarity index 100% rename from pkgs/tools/typesetting/tectonic/biber.nix rename to pkgs/by-name/bi/biber-for-tectonic/package.nix diff --git a/pkgs/by-name/cl/clouddrive2/package.nix b/pkgs/by-name/cl/clouddrive2/package.nix index 62cd23dc8954..45fb6347303f 100644 --- a/pkgs/by-name/cl/clouddrive2/package.nix +++ b/pkgs/by-name/cl/clouddrive2/package.nix @@ -11,16 +11,16 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "clouddrive2"; - version = "0.8.7"; + version = "0.8.9"; src = fetchurl { url = "https://github.com/cloud-fs/cloud-fs.github.io/releases/download/v${finalAttrs.version}/clouddrive-2-${os}-${arch}-${finalAttrs.version}.tgz"; hash = { - x86_64-linux = "sha256-N5zZHBX0Vl4Ib3V2O4gXDQcNDibGInGDNNls226jMB0="; - aarch64-linux = "sha256-Tk5tNJbwI8hq8ajYa2/oDWvKJaLI8E/estuWKVB17jg="; - x86_64-darwin = "sha256-ySq8aXpCMQtU9jJFi7kJaPCRDtqZXyBRv9Zx3m3Ymms="; - aarch64-darwin = "sha256-KMobDLbZ38tAetqP2DrHe9oClzzYpuTEyMV3oOgPVHI="; + x86_64-linux = "sha256-8ZLDDRq3PzK25v0Gm6HdOruzFtCJVTR+fWGN5pXqk+A="; + aarch64-linux = "sha256-WF/d/wtvrO5BfqMhQ5189h1qB0GauttKQIHaGZOXUKo="; + x86_64-darwin = "sha256-uhYmRVukSLvAA08AEoHIgzsP/U3v8fTmlaP22HeYcL4="; + aarch64-darwin = "sha256-Il2dWcX8W1qhqaipqmPQU7oU7Dr3i5pY/+xQE8G3ix8="; } .${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}"); }; diff --git a/pkgs/by-name/io/ioc-scan/package.nix b/pkgs/by-name/io/ioc-scan/package.nix index dd326868acf1..542549447ebe 100644 --- a/pkgs/by-name/io/ioc-scan/package.nix +++ b/pkgs/by-name/io/ioc-scan/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "ioc-scan"; - version = "2.0.0"; + version = "3.0.0"; pyproject = true; src = fetchFromGitHub { owner = "cisagov"; repo = "ioc-scanner"; tag = "v${version}"; - hash = "sha256-SCyCANZfi7PqexM2Kc8WJwwEEiBQxPBg0ggWsK9WB4k="; + hash = "sha256-p1cx6MwAPmPIsOHNWSU9AyYcQaddFugBkm6a+kUjzvg="; }; build-system = with python3.pkgs; [ setuptools ]; @@ -31,7 +31,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "Tool to search a filesystem for indicators of compromise (IoC)"; homepage = "https://github.com/cisagov/ioc-scanner"; - changelog = "https://github.com/cisagov/ioc-scanner/releases/tag/v${version}"; + changelog = "https://github.com/cisagov/ioc-scanner/releases/tag/${src.tag}"; license = with licenses; [ cc0 ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/by-name/lu/luanti/package.nix b/pkgs/by-name/lu/luanti/package.nix index 4f895a586999..4ad0536d5a9c 100644 --- a/pkgs/by-name/lu/luanti/package.nix +++ b/pkgs/by-name/lu/luanti/package.nix @@ -40,13 +40,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "luanti"; - version = "5.10.0"; + version = "5.11.0"; src = fetchFromGitHub { owner = "minetest"; repo = "minetest"; - rev = finalAttrs.version; - hash = "sha256-sumwm8mJghpSriVflMQSHQM4BTmAhfI/Wl/FroLTVts="; + tag = finalAttrs.version; + hash = "sha256-0PJK7sS2oFTNWex9rLTgVIqaRhwuUb6H5HIlVOGA08k="; }; patches = [ diff --git a/pkgs/by-name/ma/mattermostLatest/package.nix b/pkgs/by-name/ma/mattermostLatest/package.nix index fd8662ec8a8c..f75060abe285 100644 --- a/pkgs/by-name/ma/mattermostLatest/package.nix +++ b/pkgs/by-name/ma/mattermostLatest/package.nix @@ -11,10 +11,10 @@ mattermost.override { # and make sure the version regex is up to date here. # Ensure you also check ../mattermost/package.nix for ESR releases. regex = "^v(10\\.[0-9]+\\.[0-9]+)$"; - version = "10.4.2"; - srcHash = "sha256-R/LiExICunQeL7UPeqjKhMvCHMdibcPTnpTbGYQnbgI="; + version = "10.5.0"; + srcHash = "sha256-xPEtgY/bGZAB0JodLHbbmZcdm5M0BFAIG2oXLIjQqog="; vendorHash = "sha256-AcemUxcBoytE/ZoXqaIlxkzAnmGV/C1laDqziMuE+XE="; - npmDepsHash = "sha256-HABPwdhtev9DZLhWJQsyU4g2ZueYgsX+tUduMsc74YY="; + npmDepsHash = "sha256-Fxm9OX5kFNL9NE5BBPUy0bfvZ0Aj46B80wemaMcA2J0="; lockfileOverlay = '' unlock(.; "@floating-ui/react"; "channels/node_modules/@floating-ui/react") ''; diff --git a/pkgs/tools/text/mdbook-admonish/default.nix b/pkgs/by-name/md/mdbook-admonish/package.nix similarity index 74% rename from pkgs/tools/text/mdbook-admonish/default.nix rename to pkgs/by-name/md/mdbook-admonish/package.nix index e38687e819b6..1e41e3056248 100644 --- a/pkgs/tools/text/mdbook-admonish/default.nix +++ b/pkgs/by-name/md/mdbook-admonish/package.nix @@ -1,9 +1,7 @@ { lib, - stdenv, fetchFromGitHub, rustPlatform, - CoreServices, }: rustPlatform.buildRustPackage rec { @@ -13,20 +11,18 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "tommilligan"; repo = pname; - rev = "v${version}"; + tag = "v${version}"; hash = "sha256-GNQIOjgHCt3XPCzF0RjV9YStI8psLdHhTPuTkdgx8vA="; }; useFetchCargoVendor = true; cargoHash = "sha256-GbXLlWHbLL7HbyuX223S/o1/+LwbK8FjL7lnEgVVn00="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ]; - - meta = with lib; { + meta = { description = "Preprocessor for mdbook to add Material Design admonishments"; mainProgram = "mdbook-admonish"; - license = licenses.mit; - maintainers = with maintainers; [ + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ jmgilman Frostman matthiasbeyer diff --git a/pkgs/tools/text/mdbook-epub/default.nix b/pkgs/by-name/md/mdbook-epub/package.nix similarity index 62% rename from pkgs/tools/text/mdbook-epub/default.nix rename to pkgs/by-name/md/mdbook-epub/package.nix index c6731a27fade..e172c27f7424 100644 --- a/pkgs/tools/text/mdbook-epub/default.nix +++ b/pkgs/by-name/md/mdbook-epub/package.nix @@ -1,48 +1,35 @@ { lib, - stdenv, rustPlatform, fetchFromGitHub, pkg-config, bzip2, - CoreServices, }: -let +rustPlatform.buildRustPackage rec { pname = "mdbook-epub"; version = "0.4.37"; -in -rustPlatform.buildRustPackage { - inherit pname version; src = fetchFromGitHub { owner = "michael-f-bryan"; repo = pname; - rev = version; + tag = version; hash = "sha256-ddWClkeGabvqteVUtuwy4pWZGnarrKrIbuPEe62m6es="; }; useFetchCargoVendor = true; cargoHash = "sha256-3R81PJCOFc22QDHH2BqGB9jjvEcMc1axoySSJLJD3wI="; - nativeBuildInputs = [ - pkg-config - ]; + nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ - bzip2 - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - CoreServices - ]; + buildInputs = [ bzip2 ]; - meta = with lib; { + meta = { description = "mdbook backend for generating an e-book in the EPUB format"; mainProgram = "mdbook-epub"; homepage = "https://michael-f-bryan.github.io/mdbook-epub"; - license = licenses.mpl20; - maintainers = with maintainers; [ + license = lib.licenses.mpl20; + maintainers = with lib.maintainers; [ yuu matthiasbeyer ]; diff --git a/pkgs/tools/text/mdbook-footnote/default.nix b/pkgs/by-name/md/mdbook-footnote/package.nix similarity index 75% rename from pkgs/tools/text/mdbook-footnote/default.nix rename to pkgs/by-name/md/mdbook-footnote/package.nix index 0559edf0488a..a5630089d293 100644 --- a/pkgs/tools/text/mdbook-footnote/default.nix +++ b/pkgs/by-name/md/mdbook-footnote/package.nix @@ -1,9 +1,7 @@ { lib, - stdenv, fetchFromGitHub, rustPlatform, - CoreServices, }: rustPlatform.buildRustPackage rec { pname = "mdbook-footnote"; @@ -12,21 +10,19 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "daviddrysdale"; repo = "mdbook-footnote"; - rev = "v${version}"; + tag = "v${version}"; hash = "sha256-WUMgm1hwsU9BeheLfb8Di0AfvVQ6j92kXxH2SyG3ses="; }; useFetchCargoVendor = true; cargoHash = "sha256-3tuejWMZlEAOgnBKEqZP2a72a8QP1yamfE/g2BJDEbg="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ]; - - meta = with lib; { + meta = { description = "Preprocessor for mdbook to support the inclusion of automatically numbered footnotes"; mainProgram = "mdbook-footnote"; homepage = "https://github.com/daviddrysdale/mdbook-footnote"; - license = licenses.asl20; - maintainers = with maintainers; [ + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ brianmcgillion matthiasbeyer ]; diff --git a/pkgs/tools/text/mdbook-graphviz/default.nix b/pkgs/by-name/md/mdbook-graphviz/package.nix similarity index 82% rename from pkgs/tools/text/mdbook-graphviz/default.nix rename to pkgs/by-name/md/mdbook-graphviz/package.nix index 253b579bb191..d0ceadc829d2 100644 --- a/pkgs/tools/text/mdbook-graphviz/default.nix +++ b/pkgs/by-name/md/mdbook-graphviz/package.nix @@ -1,9 +1,7 @@ { lib, - stdenv, fetchFromGitHub, rustPlatform, - CoreServices, graphviz, }: @@ -23,17 +21,15 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-A1pFifxshWynwA88iLTMOm21NKCH8fHl5nFiV4wEG8A="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ]; - nativeCheckInputs = [ graphviz ]; - meta = with lib; { + meta = { description = "Preprocessor for mdbook, rendering Graphviz graphs to HTML at build time"; mainProgram = "mdbook-graphviz"; homepage = "https://github.com/dylanowen/mdbook-graphviz"; changelog = "https://github.com/dylanowen/mdbook-graphviz/releases/tag/v${version}"; - license = [ licenses.mpl20 ]; - maintainers = with maintainers; [ + license = lib.licenses.mpl20; + maintainers = with lib.maintainers; [ lovesegfault matthiasbeyer ]; diff --git a/pkgs/tools/text/mdbook-katex/default.nix b/pkgs/by-name/md/mdbook-katex/package.nix similarity index 74% rename from pkgs/tools/text/mdbook-katex/default.nix rename to pkgs/by-name/md/mdbook-katex/package.nix index 260dcccd3e01..1771778f5f76 100644 --- a/pkgs/tools/text/mdbook-katex/default.nix +++ b/pkgs/by-name/md/mdbook-katex/package.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchCrate, - stdenv, - CoreServices, }: rustPlatform.buildRustPackage rec { @@ -18,14 +16,12 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-EoWsjuvvWeAI3OnVRJQT2hwoYq4BNqqvitH9LT0XGnA="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ]; - - meta = with lib; { + meta = { description = "Preprocessor for mdbook, rendering LaTeX equations to HTML at build time"; mainProgram = "mdbook-katex"; homepage = "https://github.com/lzanini/${pname}"; - license = [ licenses.mit ]; - maintainers = with maintainers; [ + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ lovesegfault matthiasbeyer ]; diff --git a/pkgs/tools/text/mdbook-mermaid/default.nix b/pkgs/by-name/md/mdbook-mermaid/package.nix similarity index 77% rename from pkgs/tools/text/mdbook-mermaid/default.nix rename to pkgs/by-name/md/mdbook-mermaid/package.nix index 8afaa0b1b00d..6281a185465e 100644 --- a/pkgs/tools/text/mdbook-mermaid/default.nix +++ b/pkgs/by-name/md/mdbook-mermaid/package.nix @@ -1,9 +1,7 @@ { lib, - stdenv, fetchFromGitHub, rustPlatform, - CoreServices, }: rustPlatform.buildRustPackage rec { @@ -20,17 +18,13 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-yb4EWSl/mQp5q9fmYUq6UEdsknqfUx//BZ8IK/BVs7g="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - CoreServices - ]; - - meta = with lib; { + meta = { description = "Preprocessor for mdbook to add mermaid.js support"; mainProgram = "mdbook-mermaid"; homepage = "https://github.com/badboy/mdbook-mermaid"; changelog = "https://github.com/badboy/mdbook-mermaid/blob/v${version}/CHANGELOG.md"; - license = licenses.mpl20; - maintainers = with maintainers; [ + license = lib.licenses.mpl20; + maintainers = with lib.maintainers; [ xrelkd matthiasbeyer ]; diff --git a/pkgs/tools/text/mdbook-pdf/default.nix b/pkgs/by-name/md/mdbook-pdf/package.nix similarity index 75% rename from pkgs/tools/text/mdbook-pdf/default.nix rename to pkgs/by-name/md/mdbook-pdf/package.nix index 2abc8e53a1a2..7be57a06b55d 100644 --- a/pkgs/tools/text/mdbook-pdf/default.nix +++ b/pkgs/by-name/md/mdbook-pdf/package.nix @@ -1,11 +1,9 @@ { lib, - stdenv, fetchCrate, rustPlatform, pkg-config, openssl, - CoreServices, }: rustPlatform.buildRustPackage rec { @@ -20,17 +18,9 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-cZNTfhrpuEoAXviog/qq2PWii/wycxxq5l/vFHW1f6k="; - nativeBuildInputs = [ - pkg-config - ]; + nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - CoreServices - ]; + buildInputs = [ openssl ]; # Stop downloading from the Internet to # generate the Chrome Devtools Protocol @@ -42,13 +32,13 @@ rustPlatform.buildRustPackage rec { # No test. doCheck = false; - meta = with lib; { + meta = { description = "Backend for mdBook written in Rust for generating PDF"; mainProgram = "mdbook-pdf"; homepage = "https://github.com/HollowMan6/mdbook-pdf"; changelog = "https://github.com/HollowMan6/mdbook-pdf/releases/tag/v${version}"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ hollowman6 matthiasbeyer ]; diff --git a/pkgs/tools/text/mdbook-plantuml/default.nix b/pkgs/by-name/md/mdbook-plantuml/package.nix similarity index 82% rename from pkgs/tools/text/mdbook-plantuml/default.nix rename to pkgs/by-name/md/mdbook-plantuml/package.nix index 8e844b8f1095..15ced4627992 100644 --- a/pkgs/tools/text/mdbook-plantuml/default.nix +++ b/pkgs/by-name/md/mdbook-plantuml/package.nix @@ -2,11 +2,9 @@ lib, fetchFromGitHub, fetchpatch, - stdenv, rustPlatform, pkg-config, openssl, - CoreServices, }: rustPlatform.buildRustPackage rec { @@ -16,7 +14,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "sytsereitsma"; repo = pname; - rev = "v${version}"; + tag = "v${version}"; hash = "sha256-26epwn6j/ZeMAphiFsrLjS0KIewvElr7V3p/EDr4Uqk="; }; @@ -34,14 +32,14 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ]; + buildInputs = [ openssl ]; - meta = with lib; { + meta = { description = "mdBook preprocessor to render PlantUML diagrams to png images in the book output directory"; mainProgram = "mdbook-plantuml"; homepage = "https://github.com/sytsereitsma/mdbook-plantuml"; - license = [ licenses.mit ]; - maintainers = with maintainers; [ + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ jcouyang matthiasbeyer ]; diff --git a/pkgs/tools/text/mdbook-toc/default.nix b/pkgs/by-name/md/mdbook-toc/package.nix similarity index 70% rename from pkgs/tools/text/mdbook-toc/default.nix rename to pkgs/by-name/md/mdbook-toc/package.nix index 5f5c1b289899..86cbc65de72a 100644 --- a/pkgs/tools/text/mdbook-toc/default.nix +++ b/pkgs/by-name/md/mdbook-toc/package.nix @@ -1,9 +1,7 @@ { lib, - stdenv, fetchFromGitHub, rustPlatform, - CoreServices, }: rustPlatform.buildRustPackage rec { @@ -13,20 +11,18 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "badboy"; repo = pname; - rev = version; + tag = version; sha256 = "sha256-OFNp+kFDafYbzqb7xfPTO885cAjgWfNeDvUPDKq5GJU="; }; useFetchCargoVendor = true; cargoHash = "sha256-0x/x3TRwRinQ/uLCQoRrJOE/mc2snkL/MCz76nQqb5E="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ]; - - meta = with lib; { + meta = { description = "Preprocessor for mdbook to add inline Table of Contents support"; mainProgram = "mdbook-toc"; homepage = "https://github.com/badboy/mdbook-toc"; - license = [ licenses.mpl20 ]; - maintainers = with maintainers; [ matthiasbeyer ]; + license = lib.licenses.mpl20; + maintainers = with lib.maintainers; [ matthiasbeyer ]; }; } diff --git a/pkgs/by-name/ob/obs-do/package.nix b/pkgs/by-name/ob/obs-do/package.nix index 960ecf5b5195..d6524a6da9c5 100644 --- a/pkgs/by-name/ob/obs-do/package.nix +++ b/pkgs/by-name/ob/obs-do/package.nix @@ -7,17 +7,17 @@ }: rustPlatform.buildRustPackage rec { pname = "obs-do"; - version = "0.1.6"; + version = "0.1.7"; src = fetchFromGitHub { owner = "jonhoo"; repo = "obs-do"; tag = "v${version}"; - hash = "sha256-t6m/PX4GMCFH9wFrOaU/dcrbKitUXQlOcU7aUyJPpxA="; + hash = "sha256-aeFUgwbB1sGD6n+WT4GJpQURk/xKvL0w+6DtF1VQsCM="; }; useFetchCargoVendor = true; - cargoHash = "sha256-gy/r8s4LF6LDeI+hz0ddAOTcaDh8Uvz9vF4Eg/+1q1Q="; + cargoHash = "sha256-uiQnWe/yni++czOwHXbXjQTdg2nOdI3FxUag+aKP69c="; nativeInstallCheckInputs = [ versionCheckHook diff --git a/pkgs/by-name/pa/pax-britannica/package.nix b/pkgs/by-name/pa/pax-britannica/package.nix new file mode 100644 index 000000000000..bb99f2a5f510 --- /dev/null +++ b/pkgs/by-name/pa/pax-britannica/package.nix @@ -0,0 +1,109 @@ +{ + lib, + stdenv, + copyDesktopItems, + fetchFromGitLab, + fetchpatch, + pkg-config, + luajit_2_0, + libGL, + libGLU, + alsa-lib, + xorg, + glfw2, + glfw3, + useGlfw3 ? false, +}: + +stdenv.mkDerivation { + pname = "pax-britannica"; + version = "1.0.0-5"; + + src = fetchFromGitLab { + domain = "salsa.debian.org"; + owner = "games-team"; + repo = "pax-britannica"; + rev = "00ccbac5"; + hash = "sha256-j69di+3P+vaFzv8Zke1MdABMkLtknTNvlfPk1YVUfmU="; + }; + + patches = + [ + (fetchpatch { + url = "https://sources.debian.org/data/main/p/pax-britannica/1.0.0-5/debian/patches/compile_for_linux.patch"; + hash = "sha256-XncjmJrBakz5/w90O6rDif2rWSoAVKzuPEj9wN2VNvQ="; + }) + (fetchpatch { + url = "https://sources.debian.org/data/main/p/pax-britannica/1.0.0-5/debian/patches/add_manpage.patch"; + hash = "sha256-c8O6t0Zv/ln7WiPdbN3sYGsb7SL9Rmeo+94DsjpfgvY="; + }) + (fetchpatch { + url = "https://sources.debian.org/data/main/p/pax-britannica/1.0.0-5/debian/patches/load_resources_from_usr_share.patch"; + hash = "sha256-61Yt4Rq1I/Ofu640XsDDo0il275B+ozqH0Z6P18XT6Q="; + }) + (fetchpatch { + url = "https://sources.debian.org/data/main/p/pax-britannica/1.0.0-5/debian/patches/add_desktop_entry.patch"; + hash = "sha256-QSQEBoCw7KTOLgy7TaFvQRpR17HoggTOCxhfTG+kIOA="; + }) + ] + ++ lib.optional useGlfw3 (fetchpatch { + url = "https://sources.debian.org/data/main/p/pax-britannica/1.0.0-5/debian/patches/glfw3.patch"; + hash = "sha256-hj00vnW/i7lxFc4CGlRz6Havkg45gGgIg6MmCXcMsSg="; + }); + postPatch = '' + substituteInPlace Makefile \ + --replace-fail '-DEXTRA_LOADERS=\"../extra_loaders.h\"' '-DEXTRA_LOADERS=\\\"../extra_loaders.h\\\"' + substituteInPlace dokidoki-support/Makefile \ + --replace-fail '$(STATIC_LINK)' "" \ + --replace-fail '-llua' '-lluajit-5.1' + substituteInPlace dokidoki-support/minlua.c \ + --replace-fail /usr/share/pax-britannica $out/share/pax-britannica + ''; + + nativeBuildInputs = [ + pkg-config + copyDesktopItems + ]; + buildInputs = [ + luajit_2_0 + libGL + libGLU + alsa-lib + xorg.libX11 + xorg.libXrandr + (if useGlfw3 then glfw3 else glfw2) + ]; + makeFlags = + if stdenv.hostPlatform.isLinux then + [ "linux" ] + else if stdenv.hostPlatform.isDarwin then + [ "macosx" ] + else if stdenv.hostPlatform.isMinGW then + [ "mingw" ] + else + throw "Unsupported hostPlatform"; + + preBuild = '' + makeFlagsArray+=( + EXTRA_LDFLAGS="$(pkg-config --libs alsa x11 xrandr)" + ) + ''; + + desktopItems = [ "pax-britannica.desktop" ]; + + installPhase = '' + mkdir -p $out/{bin,share/pax-britannica,share/pixmaps} + cp -ar *.lua audio components dokidoki scripts sprites $out/share/pax-britannica/ + cp pax-britannica.png $out/share/pixmaps/ + cp pax-britannica $out/bin/ + ''; + + meta = { + description = "One-button multi-player real-time strategy game"; + homepage = "http://gangles.ca/games/pax-britannica/"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ astro ]; + platforms = with lib.platforms; linux ++ darwin ++ windows; + mainProgram = "pax-britannica"; + }; +} diff --git a/pkgs/by-name/si/simpleproxy/package.nix b/pkgs/by-name/si/simpleproxy/package.nix index 54dbcb2bec67..cee75129e72b 100644 --- a/pkgs/by-name/si/simpleproxy/package.nix +++ b/pkgs/by-name/si/simpleproxy/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + autoreconfHook, }: stdenv.mkDerivation rec { @@ -16,6 +17,8 @@ stdenv.mkDerivation rec { sha256 = "1my9g4vp19dikx3fsbii4ichid1bs9b9in46bkg05gbljhj340f6"; }; + nativeBuildInputs = [ autoreconfHook ]; + meta = with lib; { homepage = "https://github.com/vzaliva/simpleproxy"; description = "Simple TCP proxy"; diff --git a/pkgs/by-name/ta/tana/package.nix b/pkgs/by-name/ta/tana/package.nix index 0ae9a9493a04..27ecc4800b73 100644 --- a/pkgs/by-name/ta/tana/package.nix +++ b/pkgs/by-name/ta/tana/package.nix @@ -55,7 +55,7 @@ let ]; buildInputs = glLibs ++ libs; runpathPackages = glLibs ++ [ stdenv.cc.cc stdenv.cc.libc ]; - version = "1.0.23"; + version = "1.0.24"; in stdenv.mkDerivation { pname = "tana"; @@ -63,7 +63,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://github.com/tanainc/tana-desktop-releases/releases/download/v${version}/tana_${version}_amd64.deb"; - hash = "sha256-Z8k5ootRAon68+0HlFy9eycQkuVEKFGdghxCyao+gUY="; + hash = "sha256-K3hJD42CWD+yQwbbzysMg2QD9RCw52h1mOV5lTO9CLc="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/typesetting/tectonic/default.nix b/pkgs/by-name/te/tectonic-unwrapped/package.nix similarity index 88% rename from pkgs/tools/typesetting/tectonic/default.nix rename to pkgs/by-name/te/tectonic-unwrapped/package.nix index 58c92c1dc4af..e9b9dcb2c815 100644 --- a/pkgs/tools/typesetting/tectonic/default.nix +++ b/pkgs/by-name/te/tectonic-unwrapped/package.nix @@ -1,8 +1,8 @@ /* This file provides the `tectonic-unwrapped` package. On the other hand, - the `tectonic` package is defined in `./wrapper.nix`, by wrapping - - [`tectonic-unwrapped`](./default.nix) i.e. this package, and - - [`biber-for-tectonic`](./biber.nix), + the `tectonic` package is defined in `../tectonic/package.nix`, by wrapping + - [`tectonic-unwrapped`](./package.nix) i.e. this package, and + - [`biber-for-tectonic`](../../bi/biber-for-tectonic/package.nix), which provides a compatible version of `biber`. */ @@ -13,7 +13,7 @@ rustPlatform, darwin, fontconfig, - harfbuzz, + harfbuzzFull, openssl, pkg-config, icu, @@ -60,7 +60,7 @@ rustPlatform.buildRustPackage rec { [ icu fontconfig - harfbuzz + harfbuzzFull openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin ( @@ -86,13 +86,13 @@ rustPlatform.buildRustPackage rec { doCheck = true; - meta = with lib; { + meta = { description = "Modernized, complete, self-contained TeX/LaTeX engine, powered by XeTeX and TeXLive"; homepage = "https://tectonic-typesetting.github.io/"; changelog = "https://github.com/tectonic-typesetting/tectonic/blob/tectonic@${version}/CHANGELOG.md"; - license = with licenses; [ mit ]; + license = with lib.licenses; [ mit ]; mainProgram = "tectonic"; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ lluchs doronbehar bryango diff --git a/pkgs/tools/typesetting/tectonic/wrapper.nix b/pkgs/by-name/te/tectonic/package.nix similarity index 100% rename from pkgs/tools/typesetting/tectonic/wrapper.nix rename to pkgs/by-name/te/tectonic/package.nix diff --git a/pkgs/tools/typesetting/tectonic/tests.nix b/pkgs/by-name/te/tectonic/tests.nix similarity index 100% rename from pkgs/tools/typesetting/tectonic/tests.nix rename to pkgs/by-name/te/tectonic/tests.nix diff --git a/pkgs/by-name/vs/vsmartcard-pcsc-relay/package.nix b/pkgs/by-name/vs/vsmartcard-pcsc-relay/package.nix new file mode 100644 index 000000000000..a277b2c63fa8 --- /dev/null +++ b/pkgs/by-name/vs/vsmartcard-pcsc-relay/package.nix @@ -0,0 +1,58 @@ +{ + lib, + stdenv, + fetchFromGitHub, + pkg-config, + libtool, + autoreconfHook, + pcsclite, + libnfc, + python3, + help2man, + gengetopt, + vsmartcard-vpcd, + darwin, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "vsmartcard-pcsc-relay"; + + inherit (vsmartcard-vpcd) version src; + + sourceRoot = "${finalAttrs.src.name}/pcsc-relay"; + + nativeBuildInputs = [ + autoreconfHook + libtool + pkg-config + help2man + ]; + + buildInputs = + [ + pcsclite + libnfc + gengetopt + (python3.withPackages ( + pp: with pp; [ + pyscard + pycrypto + pbkdf2 + pillow + gnureadline + ] + )) + ] + ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.PCSC + ]; + + meta = { + description = "Relays a smart card using an contact-less interface"; + homepage = "https://frankmorgner.github.io/vsmartcard/pcsc-relay/README.html"; + license = lib.licenses.gpl3Only; + platforms = lib.platforms.all; + broken = stdenv.isDarwin; + maintainers = with lib.maintainers; [ stargate01 ]; + }; +}) diff --git a/pkgs/by-name/vs/vsmartcard-vpcd/package.nix b/pkgs/by-name/vs/vsmartcard-vpcd/package.nix new file mode 100644 index 000000000000..d4fcf0d63f18 --- /dev/null +++ b/pkgs/by-name/vs/vsmartcard-vpcd/package.nix @@ -0,0 +1,63 @@ +{ + lib, + stdenv, + fetchFromGitHub, + pkg-config, + libtool, + autoreconfHook, + pcsclite, + qrencode, + python3, + help2man, + darwin, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "vsmartcard-vpcd"; + version = "0.9-unstable-2025-01-25"; + + src = fetchFromGitHub { + owner = "frankmorgner"; + repo = "vsmartcard"; + rev = "7369dae26bcb709845003ae2128b8db9df7031ae"; + hash = "sha256-mfw/Yv12ceBVZIyAKJqBh+w4otj3rYYZbJUjKRLcsr4="; + }; + + sourceRoot = "${finalAttrs.src.name}/virtualsmartcard"; + + nativeBuildInputs = [ + autoreconfHook + libtool + pkg-config + help2man + ]; + + buildInputs = + [ + pcsclite + qrencode + (python3.withPackages ( + pp: with pp; [ + pyscard + pycrypto + pbkdf2 + pillow + gnureadline + ] + )) + ] + ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.PCSC + ]; + + configureFlags = lib.optional stdenv.isDarwin "--enable-infoplist"; + + meta = { + description = "Emulates a smart card and makes it accessible through PC/SC"; + homepage = "http://frankmorgner.github.io/vsmartcard/virtualsmartcard/README.html"; + license = lib.licenses.gpl3Only; + platforms = lib.platforms.all; + broken = stdenv.isDarwin; + maintainers = with lib.maintainers; [ stargate01 ]; + }; +}) diff --git a/pkgs/development/python-modules/llama-index-core/default.nix b/pkgs/development/python-modules/llama-index-core/default.nix index a6673adcb410..e72812df2163 100644 --- a/pkgs/development/python-modules/llama-index-core/default.nix +++ b/pkgs/development/python-modules/llama-index-core/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { pname = "llama-index-core"; - version = "0.12.15"; + version = "0.12.17.post2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -45,7 +45,7 @@ buildPythonPackage rec { owner = "run-llama"; repo = "llama_index"; tag = "v${version}"; - hash = "sha256-GcY7AuyUYniEbjsMTMcRe4ulpR5kMvAW+XDoPzgjblw="; + hash = "sha256-lAjaW/Kx7tYdsiyWnv6VLQG6lPkVyliD1KPJA/Or0YA="; }; sourceRoot = "${src.name}/${pname}"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9af55aafe31c..85b28097ce29 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2678,8 +2678,6 @@ with pkgs; beetsPackages = lib.recurseIntoAttrs (callPackage ../tools/audio/beets { }); inherit (beetsPackages) beets beets-unstable; - biber-for-tectonic = callPackage ../tools/typesetting/tectonic/biber.nix { }; - binlore = callPackage ../development/tools/analysis/binlore { }; birdfont = callPackage ../tools/misc/birdfont { }; @@ -3974,51 +3972,15 @@ with pkgs; md2pdf = with python3Packages; toPythonApplication md2pdf; - mdbook-epub = callPackage ../tools/text/mdbook-epub { - inherit (darwin.apple_sdk.frameworks) CoreServices; - }; - - mdbook-graphviz = callPackage ../tools/text/mdbook-graphviz { - inherit (darwin.apple_sdk.frameworks) CoreServices; - }; - - mdbook-katex = callPackage ../tools/text/mdbook-katex { - inherit (darwin.apple_sdk.frameworks) CoreServices; + mdcat = callPackage ../tools/text/mdcat { + inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; + inherit (python3Packages) ansi2html; }; mdbook-linkcheck = callPackage ../tools/text/mdbook-linkcheck { inherit (darwin.apple_sdk.frameworks) Security; }; - mdbook-mermaid = callPackage ../tools/text/mdbook-mermaid { - inherit (darwin.apple_sdk.frameworks) CoreServices; - }; - - mdbook-pdf = callPackage ../tools/text/mdbook-pdf { - inherit (darwin.apple_sdk.frameworks) CoreServices; - }; - - mdbook-plantuml = callPackage ../tools/text/mdbook-plantuml { - inherit (darwin.apple_sdk.frameworks) CoreServices; - }; - - mdbook-toc = callPackage ../tools/text/mdbook-toc { - inherit (darwin.apple_sdk.frameworks) CoreServices; - }; - - mdbook-admonish = callPackage ../tools/text/mdbook-admonish { - inherit (darwin.apple_sdk.frameworks) CoreServices; - }; - - mdbook-footnote = callPackage ../tools/text/mdbook-footnote { - inherit (darwin.apple_sdk.frameworks) CoreServices; - }; - - mdcat = callPackage ../tools/text/mdcat { - inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; - inherit (python3Packages) ansi2html; - }; - medfile = callPackage ../development/libraries/medfile { hdf5 = hdf5.override { usev110Api = true; }; }; @@ -10676,12 +10638,6 @@ with pkgs; tclap_1_4 = callPackage ../development/libraries/tclap/1.4.nix { }; - tectonic = callPackage ../tools/typesetting/tectonic/wrapper.nix { }; - - tectonic-unwrapped = callPackage ../tools/typesetting/tectonic { - harfbuzz = harfbuzzFull; - }; - termbench-pro = callPackage ../by-name/te/termbench-pro/package.nix { stdenv = if stdenv.hostPlatform.isDarwin then llvmPackages_17.stdenv else stdenv; fmt = fmt_11;