diff options
18 files changed, 537 insertions, 225 deletions
diff --git a/doc/languages-frameworks/maven.section.md b/doc/languages-frameworks/maven.section.md index 3b5e2e14ee6..7e287a097c7 100644 --- a/doc/languages-frameworks/maven.section.md +++ b/doc/languages-frameworks/maven.section.md @@ -4,6 +4,87 @@ Maven is a well-known build tool for the Java ecosystem however it has some chal The following provides a list of common patterns with how to package a Maven project (or any JVM language that can export to Maven) as a Nix package. +## Building a package using `maven.buildMavenPackage` {#maven-buildmavenpackage} + +Consider the following package: + +```nix +{ lib, fetchFromGitHub, jre, makeWrapper, maven }: + +maven.buildMavenPackage rec { + pname = "jd-cli"; + version = "1.2.1"; + + src = fetchFromGitHub { + owner = "intoolswetrust"; + repo = pname; + rev = "${pname}-${version}"; + hash = "sha256-rRttA5H0A0c44loBzbKH7Waoted3IsOgxGCD2VM0U/Q="; + }; + + mvnHash = "sha256-kLpjMj05uC94/5vGMwMlFzLKNFOKeyNvq/vmB6pHTAo="; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + mkdir -p $out/bin $out/share/jd-cli + install -Dm644 jd-cli/target/jd-cli.jar $out/share/jd-cli + + makeWrapper ${jre}/bin/java $out/bin/jd-cli \ + --add-flags "-jar $out/share/jd-cli/jd-cli.jar" + ''; + + meta = with lib; { + description = "Simple command line wrapper around JD Core Java Decompiler project"; + homepage = "https://github.com/intoolswetrust/jd-cli"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ majiir ]; + }; +}: +``` + +This package calls `maven.buildMavenPackage` to do its work. The primary difference from `stdenv.mkDerivation` is the `mvnHash` variable, which is a hash of all of the Maven dependencies. + +::: {.tip} +After setting `maven.buildMavenPackage`, we then do standard Java `.jar` installation by saving the `.jar` to `$out/share/java` and then making a wrapper which allows executing that file; see [](#sec-language-java) for additional generic information about packaging Java applications. +::: + +### Stable Maven plugins {#stable-maven-plugins} + +Maven defines default versions for its core plugins, e.g. `maven-compiler-plugin`. If your project does not override these versions, an upgrade of Maven will change the version of the used plugins, and therefore the derivation and hash. + +When `maven` is upgraded, `mvnHash` for the derivation must be updated as well: otherwise, the project will simply be built on the derivation of old plugins, and fail because the requested plugins are missing. + +This clearly prevents automatic upgrades of Maven: a manual effort must be made throughout nixpkgs by any maintainer wishing to push the upgrades. + +To make sure that your package does not add extra manual effort when upgrading Maven, explicitly define versions for all plugins. You can check if this is the case by adding the following plugin to your (parent) POM: + +```xml +<plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-enforcer-plugin</artifactId> + <version>3.3.0</version> + <executions> + <execution> + <id>enforce-plugin-versions</id> + <goals> + <goal>enforce</goal> + </goals> + <configuration> + <rules> + <requirePluginVersions /> + </rules> + </configuration> + </execution> + </executions> +</plugin> +``` + +## Manually using `mvn2nix` {#maven-mvn2nix} +::: {.warning} +This way is no longer recommended; see [](#maven-buildmavenpackage) for the simpler and preferred way. +::: + For the purposes of this example let's consider a very basic Maven project with the following `pom.xml` with a single dependency on [emoji-java](https://github.com/vdurmont/emoji-java). ```xml @@ -41,14 +122,11 @@ public class Main { } ``` -You find this demo project at https://github.com/fzakaria/nixos-maven-example - -## Solving for dependencies {#solving-for-dependencies} +You find this demo project at [https://github.com/fzakaria/nixos-maven-example](https://github.com/fzakaria/nixos-maven-example). -### buildMaven with NixOS/mvn2nix-maven-plugin {#buildmaven-with-nixosmvn2nix-maven-plugin} - -> ⚠️ Although `buildMaven` is the "blessed" way within nixpkgs, as of 2020, it hasn't seen much activity in quite a while. +### Solving for dependencies {#solving-for-dependencies} +#### buildMaven with NixOS/mvn2nix-maven-plugin {#buildmaven-with-nixosmvn2nix-maven-plugin} `buildMaven` is an alternative method that tries to follow similar patterns of other programming languages by generating a lock file. It relies on the maven plugin [mvn2nix-maven-plugin](https://github.com/NixOS/mvn2nix-maven-plugin). First you generate a `project-info.json` file using the maven plugin. @@ -105,9 +183,10 @@ The benefit over the _double invocation_ as we will see below, is that the _/nix │ ├── avalon-framework-4.1.3.jar -> /nix/store/iv5fp3955w3nq28ff9xfz86wvxbiw6n9-avalon-framework-4.1.3.jar ``` -### Double Invocation {#double-invocation} - -> ⚠️ This pattern is the simplest but may cause unnecessary rebuilds due to the output hash changing. +#### Double Invocation {#double-invocation} +::: {.note} +This pattern is the simplest but may cause unnecessary rebuilds due to the output hash changing. +::: The double invocation is a _simple_ way to get around the problem that `nix-build` may be sandboxed and have no Internet connectivity. @@ -115,7 +194,9 @@ It treats the entire Maven repository as a single source to be downloaded, relyi The first step will be to build the Maven project as a fixed-output derivation in order to collect the Maven repository -- below is an [example](https://github.com/fzakaria/nixos-maven-example/blob/main/double-invocation-repository.nix). -> Traditionally the Maven repository is at `~/.m2/repository`. We will override this to be the `$out` directory. +::: {.note} +Traditionally the Maven repository is at `~/.m2/repository`. We will override this to be the `$out` directory. +::: ```nix { lib, stdenv, maven }: @@ -147,7 +228,9 @@ stdenv.mkDerivation { The build will fail, and tell you the expected `outputHash` to place. When you've set the hash, the build will return with a `/nix/store` entry whose contents are the full Maven repository. -> Some additional files are deleted that would cause the output hash to change potentially on subsequent runs. +::: {.warning} +Some additional files are deleted that would cause the output hash to change potentially on subsequent runs. +::: ```bash ❯ tree $(nix-build --no-out-link double-invocation-repository.nix) | head @@ -165,40 +248,7 @@ The build will fail, and tell you the expected `outputHash` to place. When you'v If your package uses _SNAPSHOT_ dependencies or _version ranges_; there is a strong likelihood that over-time your output hash will change since the resolved dependencies may change. Hence this method is less recommended then using `buildMaven`. -#### Stable Maven plugins {#stable-maven-plugins} - -Maven defines default versions for its core plugins, e.g. `maven-compiler-plugin`. -If your project does not override these versions, an upgrade of Maven will change the version of the used plugins. -This changes the output of the first invocation and the plugins required by the second invocation. -However, since a hash is given for the output of the first invocation, the second invocation will simply fail -because the requested plugins are missing. -This will prevent automatic upgrades of Maven: the manual fix for this is to change the hash of the first invocation. - -To make sure that your package does not add manual effort when upgrading Maven, explicitly define versions for all -plugins. You can check if this is the case by adding the following plugin to your (parent) POM: - -```xml -<plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-enforcer-plugin</artifactId> - <version>3.3.0</version> - <executions> - <execution> - <id>enforce-plugin-versions</id> - <goals> - <goal>enforce</goal> - </goals> - <configuration> - <rules> - <requirePluginVersions /> - </rules> - </configuration> - </execution> - </executions> -</plugin> -``` - -## Building a JAR {#building-a-jar} +### Building a JAR {#building-a-jar} Regardless of which strategy is chosen above, the step to build the derivation is the same. @@ -224,7 +274,9 @@ in stdenv.mkDerivation rec { } ``` -> We place the library in `$out/share/java` since JDK package has a _stdenv setup hook_ that adds any JARs in the `share/java` directories of the build inputs to the CLASSPATH environment. +::: {.tip} +We place the library in `$out/share/java` since JDK package has a _stdenv setup hook_ that adds any JARs in the `share/java` directories of the build inputs to the CLASSPATH environment. +::: ```bash ❯ tree $(nix-build --no-out-link build-jar.nix) @@ -236,7 +288,7 @@ in stdenv.mkDerivation rec { 2 directories, 1 file ``` -## Runnable JAR {#runnable-jar} +### Runnable JAR {#runnable-jar} The previous example builds a `jar` file but that's not a file one can run. @@ -248,9 +300,9 @@ We will use the same repository we built above (either _double invocation_ or _b The following two methods are more suited to Nix then building an [UberJar](https://imagej.net/Uber-JAR) which may be the more traditional approach. -### CLASSPATH {#classpath} +#### CLASSPATH {#classpath} -> This is ideal if you are providing a derivation for _nixpkgs_ and don't want to patch the project's `pom.xml`. +This method is ideal if you are providing a derivation for _nixpkgs_ and don't want to patch the project's `pom.xml`. We will read the Maven repository and flatten it to a single list. This list will then be concatenated with the _CLASSPATH_ separator to create the full classpath. @@ -288,9 +340,9 @@ in stdenv.mkDerivation rec { } ``` -### MANIFEST file via Maven Plugin {#manifest-file-via-maven-plugin} +#### MANIFEST file via Maven Plugin {#manifest-file-via-maven-plugin} -> This is ideal if you are the project owner and want to change your `pom.xml` to set the CLASSPATH within it. +This method is ideal if you are the project owner and want to change your `pom.xml` to set the CLASSPATH within it. Augment the `pom.xml` to create a JAR with the following manifest: @@ -366,8 +418,9 @@ in stdenv.mkDerivation rec { ''; } ``` - -> Our script produces a dependency on `jre` rather than `jdk` to restrict the runtime closure necessary to run the application. +::: {.note} +Our script produces a dependency on `jre` rather than `jdk` to restrict the runtime closure necessary to run the application. +::: This will give you an executable shell-script that launches your JAR with all the dependencies available. diff --git a/nixos/tests/nextcloud/basic.nix b/nixos/tests/nextcloud/basic.nix index e17f701c54b..db5cee9f658 100644 --- a/nixos/tests/nextcloud/basic.nix +++ b/nixos/tests/nextcloud/basic.nix @@ -14,12 +14,12 @@ in { client = { ... }: { services.davfs2.enable = true; system.activationScripts.davfs2-secrets = '' - echo "http://nextcloud/remote.php/webdav/ ${adminuser} ${adminpass}" > /tmp/davfs2-secrets + echo "http://nextcloud/remote.php/dav/files/${adminuser} ${adminuser} ${adminpass}" > /tmp/davfs2-secrets chmod 600 /tmp/davfs2-secrets ''; virtualisation.fileSystems = { "/mnt/dav" = { - device = "http://nextcloud/remote.php/webdav/"; + device = "http://nextcloud/remote.php/dav/files/${adminuser}"; fsType = "davfs"; options = let davfs2Conf = (pkgs.writeText "davfs2.conf" "secrets /tmp/davfs2-secrets"); @@ -70,7 +70,7 @@ in { withRcloneEnv = pkgs.writeScript "with-rclone-env" '' #!${pkgs.runtimeShell} export RCLONE_CONFIG_NEXTCLOUD_TYPE=webdav - export RCLONE_CONFIG_NEXTCLOUD_URL="http://nextcloud/remote.php/webdav/" + export RCLONE_CONFIG_NEXTCLOUD_URL="http://nextcloud/remote.php/dav/files/${adminuser}" export RCLONE_CONFIG_NEXTCLOUD_VENDOR="nextcloud" export RCLONE_CONFIG_NEXTCLOUD_USER="${adminuser}" export RCLONE_CONFIG_NEXTCLOUD_PASS="$(${pkgs.rclone}/bin/rclone obscure ${adminpass})" diff --git a/nixos/tests/nextcloud/openssl-sse.nix b/nixos/tests/nextcloud/openssl-sse.nix index 659a4311cdd..92beb869eb0 100644 --- a/nixos/tests/nextcloud/openssl-sse.nix +++ b/nixos/tests/nextcloud/openssl-sse.nix @@ -33,7 +33,7 @@ in { withRcloneEnv = host: pkgs.writeScript "with-rclone-env" '' #!${pkgs.runtimeShell} export RCLONE_CONFIG_NEXTCLOUD_TYPE=webdav - export RCLONE_CONFIG_NEXTCLOUD_URL="http://${host}/remote.php/webdav/" + export RCLONE_CONFIG_NEXTCLOUD_URL="http://${host}/remote.php/dav/files/${adminuser}" export RCLONE_CONFIG_NEXTCLOUD_VENDOR="nextcloud" export RCLONE_CONFIG_NEXTCLOUD_USER="${adminuser}" export RCLONE_CONFIG_NEXTCLOUD_PASS="$(${pkgs.rclone}/bin/rclone obscure ${adminpass})" diff --git a/nixos/tests/nextcloud/with-declarative-redis-and-secrets.nix b/nixos/tests/nextcloud/with-declarative-redis-and-secrets.nix index 915fa58ab14..e638f2e5b86 100644 --- a/nixos/tests/nextcloud/with-declarative-redis-and-secrets.nix +++ b/nixos/tests/nextcloud/with-declarative-redis-and-secrets.nix @@ -1,6 +1,6 @@ args@{ nextcloudVersion ? 27, ... }: (import ../make-test-python.nix ({ pkgs, ...}: let - username = "custom_admin_username"; + adminuser = "custom_admin_username"; # This will be used both for redis and postgresql pass = "hunter2"; # Don't do this at home, use a file outside of the nix store instead @@ -34,9 +34,9 @@ in { config = { dbtype = "pgsql"; dbname = "nextcloud"; - dbuser = username; + dbuser = adminuser; dbpassFile = passFile; - adminuser = username; + adminuser = adminuser; adminpassFile = passFile; }; secretFile = "/etc/nextcloud-secrets.json"; @@ -66,9 +66,9 @@ in { systemd.services.postgresql.postStart = pkgs.lib.mkAfter '' password=$(cat ${passFile}) ${config.services.postgresql.package}/bin/psql <<EOF - CREATE ROLE ${username} WITH LOGIN PASSWORD '$password' CREATEDB; + CREATE ROLE ${adminuser} WITH LOGIN PASSWORD '$password' CREATEDB; CREATE DATABASE nextcloud; - GRANT ALL PRIVILEGES ON DATABASE nextcloud TO ${username}; + GRANT ALL PRIVILEGES ON DATABASE nextcloud TO ${adminuser}; EOF ''; @@ -89,9 +89,9 @@ in { withRcloneEnv = pkgs.writeScript "with-rclone-env" '' #!${pkgs.runtimeShell} export RCLONE_CONFIG_NEXTCLOUD_TYPE=webdav - export RCLONE_CONFIG_NEXTCLOUD_URL="http://nextcloud/remote.php/webdav/" + export RCLONE_CONFIG_NEXTCLOUD_URL="http://nextcloud/remote.php/dav/files/${adminuser}" export RCLONE_CONFIG_NEXTCLOUD_VENDOR="nextcloud" - export RCLONE_CONFIG_NEXTCLOUD_USER="${username}" + export RCLONE_CONFIG_NEXTCLOUD_USER="${adminuser}" export RCLONE_CONFIG_NEXTCLOUD_PASS="$(${pkgs.rclone}/bin/rclone obscure ${pass})" "''${@}" ''; diff --git a/nixos/tests/nextcloud/with-mysql-and-memcached.nix b/nixos/tests/nextcloud/with-mysql-and-memcached.nix index e57aabfaf86..035a7fdcb0c 100644 --- a/nixos/tests/nextcloud/with-mysql-and-memcached.nix +++ b/nixos/tests/nextcloud/with-mysql-and-memcached.nix @@ -49,7 +49,7 @@ in { withRcloneEnv = pkgs.writeScript "with-rclone-env" '' #!${pkgs.runtimeShell} export RCLONE_CONFIG_NEXTCLOUD_TYPE=webdav - export RCLONE_CONFIG_NEXTCLOUD_URL="http://nextcloud/remote.php/webdav/" + export RCLONE_CONFIG_NEXTCLOUD_URL="http://nextcloud/remote.php/dav/files/${adminuser}" export RCLONE_CONFIG_NEXTCLOUD_VENDOR="nextcloud" export RCLONE_CONFIG_NEXTCLOUD_USER="${adminuser}" export RCLONE_CONFIG_NEXTCLOUD_PASS="$(${pkgs.rclone}/bin/rclone obscure ${adminpass})" diff --git a/nixos/tests/nextcloud/with-postgresql-and-redis.nix b/nixos/tests/nextcloud/with-postgresql-and-redis.nix index a91208e6cdc..586bf50fd93 100644 --- a/nixos/tests/nextcloud/with-postgresql-and-redis.nix +++ b/nixos/tests/nextcloud/with-postgresql-and-redis.nix @@ -60,7 +60,7 @@ in { withRcloneEnv = pkgs.writeScript "with-rclone-env" '' #!${pkgs.runtimeShell} export RCLONE_CONFIG_NEXTCLOUD_TYPE=webdav - export RCLONE_CONFIG_NEXTCLOUD_URL="http://nextcloud/remote.php/webdav/" + export RCLONE_CONFIG_NEXTCLOUD_URL="http://nextcloud/remote.php/dav/files/${adminuser}" export RCLONE_CONFIG_NEXTCLOUD_VENDOR="nextcloud" export RCLONE_CONFIG_NEXTCLOUD_USER="${adminuser}" export RCLONE_CONFIG_NEXTCLOUD_PASS="$(${pkgs.rclone}/bin/rclone obscure ${adminpass})" diff --git a/pkgs/applications/misc/confy/default.nix b/pkgs/applications/misc/confy/default.nix index ed4994517bf..ce84840c1e2 100644 --- a/pkgs/applications/misc/confy/default.nix +++ b/pkgs/applications/misc/confy/default.nix @@ -1,6 +1,6 @@ { blueprint-compiler , desktop-file-utils -, fetchurl +, fetchzip , gobject-introspection , gtk4 , lib @@ -18,9 +18,9 @@ stdenv.mkDerivation rec { pname = "confy"; version = "0.7.0"; - src = fetchurl { + src = fetchzip { url = "https://git.sr.ht/~fabrixxm/confy/archive/${version}.tar.gz"; - hash = "sha256-qOU/rPj7ZhwWafQ3Vx7K41fdAyxz6jMhFUqU3mH5CHo="; + hash = "sha256-q8WASTNbiBuKb2tPQBmUL9ji60PRAPnYOTYxnUn0MAw="; }; nativeBuildInputs = [ @@ -34,7 +34,6 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - gobject-introspection gtk4 libadwaita libnotify diff --git a/pkgs/applications/office/iotas/default.nix b/pkgs/applications/office/iotas/default.nix index c5c3afb5c5d..4c9c53afd22 100644 --- a/pkgs/applications/office/iotas/default.nix +++ b/pkgs/applications/office/iotas/default.nix @@ -19,7 +19,7 @@ python3.pkgs.buildPythonApplication rec { pname = "iotas"; - version = "0.1.14"; + version = "0.2.2"; format = "other"; src = fetchFromGitLab { @@ -27,7 +27,7 @@ python3.pkgs.buildPythonApplication rec { owner = "cheywood"; repo = pname; rev = version; - hash = "sha256-IvKjvsHJdoFmDvsM1/kFPikYbBLUEQ57DKr1T+Jyw7w="; + hash = "sha256-oThsyTsNM3283e4FViISdFzmeQnU7qXHh4xEJWA2fkc="; }; nativeBuildInputs = [ @@ -56,11 +56,11 @@ python3.pkgs.buildPythonApplication rec { requests markdown-it-py linkify-it-py + mdit-py-plugins ]; # prevent double wrapping dontWrapGApps = true; - preFixup = '' makeWrapperArgs+=("''${gappsWrapperArgs[@]}") ''; diff --git a/pkgs/applications/science/molecular-dynamics/lammps/default.nix b/pkgs/applications/science/molecular-dynamics/lammps/default.nix index a1c0f60ffa0..5842efea44e 100644 --- a/pkgs/applications/science/molecular-dynamics/lammps/default.nix +++ b/pkgs/applications/science/molecular-dynamics/lammps/default.nix @@ -7,6 +7,7 @@ , blas , lapack , cmake +, cudaPackages , pkg-config # Available list of packages can be found near here: # @@ -59,6 +60,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config + # Although not always needed, it is needed if cmakeFlags include + # GPU_API=cuda, and it doesn't users that don't enable the GPU package. + cudaPackages.autoAddOpenGLRunpathHook ]; passthru = { @@ -84,9 +88,14 @@ stdenv.mkDerivation rec { ] ++ extraBuildInputs ; - # For backwards compatibility postInstall = '' + # For backwards compatibility ln -s $out/bin/lmp $out/bin/lmp_serial + # Install vim and neovim plugin + install -Dm644 ../../tools/vim/lammps.vim $out/share/vim-plugins/lammps/syntax/lammps.vim + install -Dm644 ../../tools/vim/filetype.vim $out/share/vim-plugins/lammps/ftdetect/lammps.vim + mkdir -p $out/share/nvim + ln -s $out/share/vim-plugins/lammps $out/share/nvim/site ''; meta = with lib; { @@ -106,5 +115,6 @@ stdenv.mkDerivation rec { # support. broken = (blas.isILP64 && lapack.isILP64); maintainers = [ maintainers.costrouc maintainers.doronbehar ]; + mainProgram = "lmp"; }; } diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index f111305ce4b..059730684c3 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -43,6 +43,7 @@ mapAliases { "@githubnext/github-copilot-cli" = pkgs.github-copilot-cli; # Added 2023-05-02 "@google/clasp" = pkgs.google-clasp; # Added 2023-05-07 "@nestjs/cli" = pkgs.nest-cli; # Added 2023-05-06 + bibtex-tidy = pkgs.bibtex-tidy; # added 2023-07-30 bitwarden-cli = pkgs.bitwarden-cli; # added 2023-07-25 eslint_d = pkgs.eslint_d; # Added 2023-05-26 gtop = pkgs.gtop; # added 2023-07-31 diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index a694b608180..9c9a80b8f55 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -39,7 +39,6 @@ , "awesome-lint" , "balanceofsatoshis" , "bash-language-server" -, "bibtex-tidy" , "bower" , "bower2nix" , "browserify" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 1b0c5a39644..b853a502a6f 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -94386,24 +94386,6 @@ in bypassCache = true; reconstructLock = true; }; - bibtex-tidy = nodeEnv.buildNodePackage { - name = "bibtex-tidy"; - packageName = "bibtex-tidy"; - version = "1.11.0"; - src = fetchurl { - url = "https://registry.npmjs.org/bibtex-tidy/-/bibtex-tidy-1.11.0.tgz"; - sha512 = "jbY7PxjYQlRQIWpqdCxEVtW0T9xTLecXxvGPFGMs3FlzKNTylTr5yutC2qWsFyfNQgMHvAzyCdqT5YIU9p/ZHg=="; - }; - buildInputs = globalBuildInputs; - meta = { - description = "Tidy bibtex files"; - homepage = "https://github.com/FlamingTempura/bibtex-tidy"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; bower = nodeEnv.buildNodePackage { name = "bower"; packageName = "bower"; diff --git a/pkgs/development/tools/ruff/Cargo.lock b/pkgs/development/tools/ruff/Cargo.lock index 86899ddff47..f8f6a0b519b 100644 --- a/pkgs/development/tools/ruff/Cargo.lock +++ b/pkgs/development/tools/ruff/Cargo.lock @@ -134,6 +134,15 @@ dependencies = [ ] [[package]] +name = "ascii-canvas" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8824ecca2e851cec16968d54a01dd372ef8f95b244fb84b84e70128be347c3c6" +dependencies = [ + "term", +] + +[[package]] name = "assert_cmd" version = "2.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -170,6 +179,21 @@ dependencies = [ ] [[package]] +name = "bit-set" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1" +dependencies = [ + "bit-vec", +] + +[[package]] +name = "bit-vec" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" + +[[package]] name = "bitflags" version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -610,6 +634,16 @@ dependencies = [ ] [[package]] +name = "dirs-next" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" +dependencies = [ + "cfg-if", + "dirs-sys-next", +] + +[[package]] name = "dirs-sys" version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -633,6 +667,17 @@ dependencies = [ ] [[package]] +name = "dirs-sys-next" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" +dependencies = [ + "libc", + "redox_users", + "winapi", +] + +[[package]] name = "doc-comment" version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -657,6 +702,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" [[package]] +name = "ena" +version = "0.14.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c533630cf40e9caa44bd91aadc88a75d75a4c3a12b4cfde353cbed41daa1e1f1" +dependencies = [ + "log", +] + +[[package]] name = "encode_unicode" version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -733,8 +787,14 @@ dependencies = [ ] [[package]] +name = "fixedbitset" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" + +[[package]] name = "flake8-to-ruff" -version = "0.0.280" +version = "0.0.281" dependencies = [ "anyhow", "clap", @@ -1100,6 +1160,28 @@ dependencies = [ ] [[package]] +name = "lalrpop" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da4081d44f4611b66c6dd725e6de3169f9f63905421e8626fcb86b6a898998b8" +dependencies = [ + "ascii-canvas", + "bit-set", + "diff", + "ena", + "is-terminal", + "itertools", + "lalrpop-util", + "petgraph", + "regex", + "regex-syntax 0.7.3", + "string_cache", + "term", + "tiny-keccak", + "unicode-xid", +] + +[[package]] name = "lalrpop-util" version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1200,6 +1282,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09fc20d2ca12cb9f044c93e3bd6d32d523e6e2ec3db4f7b2939cd99026ecd3f0" [[package]] +name = "lock_api" +version = "0.4.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] name = "log" version = "0.4.19" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1278,6 +1370,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "308d96db8debc727c3fd9744aac51751243420e46edf401010908da7f8d5e57c" [[package]] +name = "new_debug_unreachable" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54" + +[[package]] name = "nextest-workspace-hack" version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1296,12 +1394,6 @@ dependencies = [ ] [[package]] -name = "nohash-hasher" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bf50223579dc7cdcfb3bfcacf7069ff68243f8c363f62ffa99cf000a6b9c451" - -[[package]] name = "nom" version = "7.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1428,6 +1520,29 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" [[package]] +name = "parking_lot" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +dependencies = [ + "lock_api", + "parking_lot_core", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall 0.3.5", + "smallvec", + "windows-targets 0.48.1", +] + +[[package]] name = "paste" version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1519,13 +1634,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" [[package]] +name = "petgraph" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4dd7d28ee937e54fe3080c91faa1c3a46c06de6252988a7f4592ba2310ef22a4" +dependencies = [ + "fixedbitset", + "indexmap 1.9.3", +] + +[[package]] name = "phf" version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" dependencies = [ - "phf_macros", - "phf_shared", + "phf_shared 0.11.2", ] [[package]] @@ -1535,7 +1659,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e8d39688d359e6b34654d328e262234662d16cc0f60ec8dcbe5e718709342a5a" dependencies = [ "phf_generator", - "phf_shared", + "phf_shared 0.11.2", ] [[package]] @@ -1544,21 +1668,17 @@ version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" dependencies = [ - "phf_shared", + "phf_shared 0.11.2", "rand", ] [[package]] -name = "phf_macros" -version = "0.11.2" +name = "phf_shared" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b" +checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096" dependencies = [ - "phf_generator", - "phf_shared", - "proc-macro2", - "quote", - "syn 2.0.23", + "siphasher", ] [[package]] @@ -1622,6 +1742,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "767eb9f07d4a5ebcb39bbf2d452058a93c011373abf6832e24194a1c3f004794" [[package]] +name = "ppv-lite86" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" + +[[package]] +name = "precomputed-hash" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" + +[[package]] name = "predicates" version = "3.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1745,6 +1877,18 @@ version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ + "libc", + "rand_chacha", + "rand_core", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", "rand_core", ] @@ -1753,6 +1897,9 @@ name = "rand_core" version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom", +] [[package]] name = "rayon" @@ -1888,7 +2035,7 @@ dependencies = [ [[package]] name = "ruff" -version = "0.0.280" +version = "0.0.281" dependencies = [ "annotate-snippets 0.9.1", "anyhow", @@ -1909,14 +2056,12 @@ dependencies = [ "log", "memchr", "natord", - "nohash-hasher", "num-bigint", "num-traits", "once_cell", "path-absolutize", "pathdiff", "pep440_rs", - "phf", "pretty_assertions", "pyproject-toml", "quick-junit", @@ -1927,15 +2072,16 @@ dependencies = [ "ruff_index", "ruff_macros", "ruff_python_ast", + "ruff_python_codegen", + "ruff_python_index", + "ruff_python_literal", + "ruff_python_parser", "ruff_python_semantic", "ruff_python_stdlib", "ruff_python_trivia", - "ruff_rustpython", + "ruff_source_file", "ruff_text_size", - "ruff_textwrap", "rustc-hash", - "rustpython-format", - "rustpython-parser", "schemars", "semver", "serde", @@ -1966,7 +2112,7 @@ dependencies = [ "ruff", "ruff_python_ast", "ruff_python_formatter", - "rustpython-parser", + "ruff_python_parser", "serde", "serde_json", "tikv-jemallocator", @@ -1988,7 +2134,7 @@ dependencies = [ [[package]] name = "ruff_cli" -version = "0.0.280" +version = "0.0.281" dependencies = [ "annotate-snippets 0.9.1", "anyhow", @@ -2017,11 +2163,13 @@ dependencies = [ "ruff", "ruff_cache", "ruff_diagnostics", + "ruff_macros", "ruff_python_ast", "ruff_python_formatter", "ruff_python_stdlib", + "ruff_python_trivia", + "ruff_source_file", "ruff_text_size", - "ruff_textwrap", "rustc-hash", "serde", "serde_json", @@ -2055,11 +2203,13 @@ dependencies = [ "ruff_cli", "ruff_diagnostics", "ruff_formatter", + "ruff_python_ast", + "ruff_python_codegen", "ruff_python_formatter", + "ruff_python_literal", + "ruff_python_parser", "ruff_python_stdlib", - "ruff_textwrap", - "rustpython-format", - "rustpython-parser", + "ruff_python_trivia", "schemars", "serde", "serde_json", @@ -2110,7 +2260,7 @@ dependencies = [ "itertools", "proc-macro2", "quote", - "ruff_textwrap", + "ruff_python_trivia", "syn 2.0.23", ] @@ -2118,27 +2268,34 @@ dependencies = [ name = "ruff_python_ast" version = "0.0.0" dependencies = [ - "anyhow", "bitflags 2.3.3", "insta", "is-macro", - "itertools", - "log", "memchr", "num-bigint", "num-traits", "once_cell", + "ruff_python_parser", "ruff_python_trivia", + "ruff_source_file", "ruff_text_size", "rustc-hash", - "rustpython-ast", - "rustpython-literal", - "rustpython-parser", "serde", "smallvec", ] [[package]] +name = "ruff_python_codegen" +version = "0.0.0" +dependencies = [ + "once_cell", + "ruff_python_ast", + "ruff_python_literal", + "ruff_python_parser", + "ruff_source_file", +] + +[[package]] name = "ruff_python_formatter" version = "0.0.0" dependencies = [ @@ -2152,10 +2309,12 @@ dependencies = [ "once_cell", "ruff_formatter", "ruff_python_ast", + "ruff_python_index", + "ruff_python_parser", "ruff_python_trivia", + "ruff_source_file", "ruff_text_size", "rustc-hash", - "rustpython-parser", "serde", "serde_json", "similar", @@ -2164,6 +2323,55 @@ dependencies = [ ] [[package]] +name = "ruff_python_index" +version = "0.0.0" +dependencies = [ + "itertools", + "ruff_python_ast", + "ruff_python_parser", + "ruff_python_trivia", + "ruff_source_file", + "ruff_text_size", +] + +[[package]] +name = "ruff_python_literal" +version = "0.0.0" +dependencies = [ + "bitflags 2.3.3", + "hexf-parse", + "is-macro", + "itertools", + "lexical-parse-float", + "num-bigint", + "num-traits", + "rand", + "unic-ucd-category", +] + +[[package]] +name = "ruff_python_parser" +version = "0.0.0" +dependencies = [ + "anyhow", + "insta", + "is-macro", + "itertools", + "lalrpop", + "lalrpop-util", + "num-bigint", + "num-traits", + "ruff_python_ast", + "ruff_text_size", + "rustc-hash", + "static_assertions", + "tiny-keccak", + "unic-emoji-char", + "unic-ucd-ident", + "unicode_names2", +] + +[[package]] name = "ruff_python_resolver" version = "0.0.0" dependencies = [ @@ -2179,14 +2387,13 @@ version = "0.0.0" dependencies = [ "bitflags 2.3.3", "is-macro", - "nohash-hasher", "num-traits", "ruff_index", "ruff_python_ast", "ruff_python_stdlib", + "ruff_source_file", "ruff_text_size", "rustc-hash", - "rustpython-parser", "smallvec", ] @@ -2200,20 +2407,15 @@ version = "0.0.0" dependencies = [ "insta", "memchr", + "ruff_python_ast", + "ruff_python_parser", + "ruff_source_file", "ruff_text_size", "smallvec", "unic-ucd-ident", ] [[package]] -name = "ruff_rustpython" -version = "0.0.0" -dependencies = [ - "anyhow", - "rustpython-parser", -] - -[[package]] name = "ruff_shrinking" version = "0.1.0" dependencies = [ @@ -2222,28 +2424,32 @@ dependencies = [ "fs-err", "regex", "ruff_python_ast", - "ruff_rustpython", - "rustpython-ast", + "ruff_python_parser", + "ruff_text_size", "shlex", "tracing", "tracing-subscriber", ] [[package]] -name = "ruff_text_size" +name = "ruff_source_file" version = "0.0.0" -source = "git+https://github.com/astral-sh/RustPython-Parser.git?rev=4d03b9b5b212fc869e4cfda151414438186a7779#4d03b9b5b212fc869e4cfda151414438186a7779" dependencies = [ - "schemars", + "insta", + "memchr", + "once_cell", + "ruff_text_size", "serde", ] [[package]] -name = "ruff_textwrap" +name = "ruff_text_size" version = "0.0.0" dependencies = [ - "ruff_python_trivia", - "ruff_text_size", + "schemars", + "serde", + "serde_test", + "static_assertions", ] [[package]] @@ -2257,9 +2463,11 @@ dependencies = [ "ruff", "ruff_diagnostics", "ruff_python_ast", + "ruff_python_codegen", "ruff_python_formatter", - "ruff_rustpython", - "rustpython-parser", + "ruff_python_index", + "ruff_python_parser", + "ruff_source_file", "serde", "serde-wasm-bindgen", "wasm-bindgen", @@ -2332,74 +2540,6 @@ dependencies = [ ] [[package]] -name = "rustpython-ast" -version = "0.2.0" -source = "git+https://github.com/astral-sh/RustPython-Parser.git?rev=4d03b9b5b212fc869e4cfda151414438186a7779#4d03b9b5b212fc869e4cfda151414438186a7779" -dependencies = [ - "is-macro", - "num-bigint", - "rustpython-parser-core", - "static_assertions", -] - -[[package]] -name = "rustpython-format" -version = "0.2.0" -source = "git+https://github.com/astral-sh/RustPython-Parser.git?rev=4d03b9b5b212fc869e4cfda151414438186a7779#4d03b9b5b212fc869e4cfda151414438186a7779" -dependencies = [ - "bitflags 2.3.3", - "itertools", - "num-bigint", - "num-traits", - "rustpython-literal", -] - -[[package]] -name = "rustpython-literal" -version = "0.2.0" -source = "git+https://github.com/astral-sh/RustPython-Parser.git?rev=4d03b9b5b212fc869e4cfda151414438186a7779#4d03b9b5b212fc869e4cfda151414438186a7779" -dependencies = [ - "hexf-parse", - "is-macro", - "lexical-parse-float", - "num-traits", - "unic-ucd-category", -] - -[[package]] -name = "rustpython-parser" -version = "0.2.0" -source = "git+https://github.com/astral-sh/RustPython-Parser.git?rev=4d03b9b5b212fc869e4cfda151414438186a7779#4d03b9b5b212fc869e4cfda151414438186a7779" -dependencies = [ - "anyhow", - "is-macro", - "itertools", - "lalrpop-util", - "log", - "num-bigint", - "num-traits", - "phf", - "phf_codegen", - "rustc-hash", - "rustpython-ast", - "rustpython-parser-core", - "tiny-keccak", - "unic-emoji-char", - "unic-ucd-ident", - "unicode_names2", -] - -[[package]] -name = "rustpython-parser-core" -version = "0.2.0" -source = "git+https://github.com/astral-sh/RustPython-Parser.git?rev=4d03b9b5b212fc869e4cfda151414438186a7779#4d03b9b5b212fc869e4cfda151414438186a7779" -dependencies = [ - "is-macro", - "memchr", - "ruff_text_size", -] - -[[package]] name = "rustversion" version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2535,6 +2675,15 @@ dependencies = [ ] [[package]] +name = "serde_test" +version = "1.0.176" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a2f49ace1498612d14f7e0b8245519584db8299541dfe31a06374a828d620ab" +dependencies = [ + "serde", +] + +[[package]] name = "serde_with" version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2617,6 +2766,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" [[package]] +name = "string_cache" +version = "0.8.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f91138e76242f575eb1d3b38b4f1362f10d3a43f47d182a5b359af488a02293b" +dependencies = [ + "new_debug_unreachable", + "once_cell", + "parking_lot", + "phf_shared 0.10.0", + "precomputed-hash", +] + +[[package]] name = "strsim" version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2690,6 +2852,17 @@ dependencies = [ ] [[package]] +name = "term" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c59df8ac95d96ff9bede18eb7300b0fda5e5d8d90960e76f8e14ae765eedbf1f" +dependencies = [ + "dirs-next", + "rustversion", + "winapi", +] + +[[package]] name = "termcolor" version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3069,6 +3242,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" [[package]] +name = "unicode-xid" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" + +[[package]] name = "unicode_names2" version = "0.6.0" source = "git+https://github.com/youknowone/unicode_names2.git?rev=4ce16aa85cbcdd9cc830410f1a72ef9a235f2fde#4ce16aa85cbcdd9cc830410f1a72ef9a235f2fde" diff --git a/pkgs/development/tools/ruff/default.nix b/pkgs/development/tools/ruff/default.nix index 7b1582a5521..8144456b6c7 100644 --- a/pkgs/development/tools/ruff/default.nix +++ b/pkgs/development/tools/ruff/default.nix @@ -10,20 +10,19 @@ rustPlatform.buildRustPackage rec { pname = "ruff"; - version = "0.0.280"; + version = "0.0.281"; src = fetchFromGitHub { owner = "astral-sh"; repo = pname; rev = "v${version}"; - hash = "sha256-Pp/yurRPUHqrCD3V93z5EGMYf4IyLFQOL9d2sNe3TKs="; + hash = "sha256-rIN2GaNrHO6s+6fMUN1a4H58ryoTr8EMjkX34YCCKaU="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { "libcst-0.1.0" = "sha256-FgQE8ofRXQs/zHh7AKscXu0deN3IG+Nk/h+a09Co5R8="; - "ruff_text_size-0.0.0" = "sha256-5BAsTsgvrP+77yZuA/QfEwVOmCj82ab8Y4D3NtY7E2Q="; "unicode_names2-0.6.0" = "sha256-eWg9+ISm/vztB0KIdjhq5il2ZnwGJQCleCYfznCI3Wg="; }; }; diff --git a/pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix b/pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix index a0010421545..753118528bd 100644 --- a/pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix +++ b/pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix @@ -31,6 +31,8 @@ in stdenv.mkDerivation { inherit pname version src yarnOfflineCache; + strictDeps = true; + nativeBuildInputs = [ prefetch-yarn-deps nodejs-slim @@ -62,6 +64,7 @@ stdenv.mkDerivation { runHook preInstall mkdir $out + cp package.json $out cp app.js config.schema.yml $out cp -r bin lib public $out diff --git a/pkgs/tools/typesetting/bibtex-tidy/default.nix b/pkgs/tools/typesetting/bibtex-tidy/default.nix new file mode 100644 index 00000000000..7aeaf13fb02 --- /dev/null +++ b/pkgs/tools/typesetting/bibtex-tidy/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildNpmPackage +, fetchFromGitHub +}: + +buildNpmPackage rec { + pname = "bibtex-tidy"; + version = "1.11.0"; + + src = fetchFromGitHub { + owner = "FlamingTempura"; + repo = "bibtex-tidy"; + rev = "v${version}"; + hash = "sha256-VjQuMQr3OJgjgX6FdH/C4mehf8H7XjDZ9Rxs92hyQVo="; + }; + + patches = [ + # downloads Google fonts during `npm run build` + ./remove-google-font-loader.patch + ]; + + npmDepsHash = "sha256-u2lyG95F00S/bvsVwu0hIuUw2UZYQWFakCF31LIijSU="; + + env = { + PUPPETEER_SKIP_DOWNLOAD = true; + }; + + meta = { + changelog = "https://github.com/FlamingTempura/bibtex-tidy/blob/${src.rev}/CHANGELOG.md"; + description = "Cleaner and Formatter for BibTeX files"; + homepage = "https://github.com/FlamingTempura/bibtex-tidy"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ bertof ]; + }; +} diff --git a/pkgs/tools/typesetting/bibtex-tidy/remove-google-font-loader.patch b/pkgs/tools/typesetting/bibtex-tidy/remove-google-font-loader.patch new file mode 100644 index 00000000000..79c6850cf6c --- /dev/null +++ b/pkgs/tools/typesetting/bibtex-tidy/remove-google-font-loader.patch @@ -0,0 +1,52 @@ +diff --git a/build.ts b/build.ts +index ae4e350..3498ae7 100644 +--- a/build.ts ++++ b/build.ts +@@ -312,7 +312,6 @@ async function buildWebBundle() { + target: ['esnext'], + plugins: [ + sveltePlugin({ preprocess: autoPreprocess() }), +- googleFontPlugin, + regexpuPlugin, + ], + }); +@@ -344,7 +343,6 @@ async function serveWeb() { + preprocess: autoPreprocess(), + compilerOptions: { enableSourcemap: true }, + }), +- googleFontPlugin, + ], + }); + const server = await ctx.serve({ servedir: WEB_PATH }); +@@ -375,31 +373,6 @@ const regexpuPlugin: Plugin = { + }, + }; + +-// Downloads google fonts and injects them as base64 urls into bundle css +-const googleFontPlugin: Plugin = { +- name: 'google-font-loader', +- setup(build) { +- build.onResolve({ filter: /^https?:\/\/fonts\./ }, (args) => ({ +- path: args.path, +- namespace: 'http-url', +- })); +- build.onLoad( +- { filter: /.*/, namespace: 'http-url' }, +- async (args): Promise<OnLoadResult> => { +- const res = await fetch(args.path, { +- headers: { +- // ensures google responds with woff2 fonts +- 'User-Agent': 'Mozilla/5.0 Firefox/90.0', +- }, +- }); +- const contents = Buffer.from(await res.arrayBuffer()); +- const loader = args.path.endsWith('.woff2') ? 'dataurl' : 'css'; +- return { contents, loader }; +- } +- ); +- }, +-}; +- + /** + * swc converts js syntax to support older browsers. ESBuild can kinda do this + * but only for more recent browsers. swc is also far easier to configure than diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 08b0b7cdb09..82480e2d70f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -342,7 +342,7 @@ with pkgs; beyond-identity = callPackage ../tools/security/beyond-identity { }; - bibtex-tidy = nodePackages.bibtex-tidy; + bibtex-tidy = callPackage ../tools/typesetting/bibtex-tidy { }; binbloom = callPackage ../tools/security/binbloom { }; |