diff options
120 files changed, 2032 insertions, 793 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/modules/services/web-apps/hedgedoc.nix b/nixos/modules/services/web-apps/hedgedoc.nix index e2014a9b7e3..bfa5fd5aff2 100644 --- a/nixos/modules/services/web-apps/hedgedoc.nix +++ b/nixos/modules/services/web-apps/hedgedoc.nix @@ -1,8 +1,8 @@ { config, lib, pkgs, ... }: -with lib; - let + inherit (lib) literalExpression mdDoc mkEnableOption mkIf mkOption mkPackageOptionMD mkRenamedOptionModule types versionAtLeast; + cfg = config.services.hedgedoc; # 21.03 will not be an official release - it was instead 21.05. This @@ -32,6 +32,7 @@ in ]; options.services.hedgedoc = { + package = mkPackageOptionMD pkgs "hedgedoc" { }; enable = mkEnableOption (lib.mdDoc "the HedgeDoc Markdown Editor"); groups = mkOption { @@ -107,6 +108,13 @@ in {option}`protocolUseSSL`. ''; }; + enableStatsApi = mkOption { + type = types.bool; + default = false; + description = lib.mdDoc '' + Enables or disables the /status and /metrics endpoint. + ''; + }; hsts = { enable = mkOption { type = types.bool; @@ -1018,16 +1026,6 @@ in `HedgeDoc` is running. ''; }; - - package = mkOption { - type = types.package; - default = pkgs.hedgedoc; - defaultText = literalExpression "pkgs.hedgedoc"; - description = lib.mdDoc '' - Package that provides HedgeDoc. - ''; - }; - }; config = mkIf cfg.enable { @@ -1060,7 +1058,7 @@ in serviceConfig = { WorkingDirectory = cfg.workDir; StateDirectory = [ cfg.workDir cfg.settings.uploadsPath ]; - ExecStart = "${cfg.package}/bin/hedgedoc"; + ExecStart = "${lib.getExe cfg.package}"; EnvironmentFile = mkIf (cfg.environmentFile != null) [ cfg.environmentFile ]; Environment = [ "CMD_CONFIG_FILE=${cfg.workDir}/config.json" 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/nixos/tests/sing-box.nix b/nixos/tests/sing-box.nix index 43be8931764..582d594be3f 100644 --- a/nixos/tests/sing-box.nix +++ b/nixos/tests/sing-box.nix @@ -8,7 +8,10 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: { nodes.machine = { pkgs, ... }: { environment.systemPackages = [ pkgs.curl ]; - services.nginx.enable = true; + services.nginx = { + enable = true; + statusPage = true; + }; services.sing-box = { enable = true; settings = { diff --git a/nixos/tests/terminal-emulators.nix b/nixos/tests/terminal-emulators.nix index 1651fd54400..6d76cc8e574 100644 --- a/nixos/tests/terminal-emulators.nix +++ b/nixos/tests/terminal-emulators.nix @@ -35,6 +35,8 @@ let tests = { darktile.pkg = p: p.darktile; + deepin-terminal.pkg = p: p.deepin.deepin-terminal; + eterm.pkg = p: p.eterm; eterm.executable = "Eterm"; eterm.pinkValue = "#D40055"; @@ -121,7 +123,7 @@ in mapAttrs (name: { pkg, executable ? name, cmd ? "SHELL=$command ${executable} maintainers = [ jjjollyjim ]; }; - machine = { pkgsInner, ... }: + nodes.machine = { pkgsInner, ... }: { imports = [ ./common/x11.nix ./common/user-account.nix ]; diff --git a/pkgs/applications/editors/textadept/default.nix b/pkgs/applications/editors/textadept/default.nix index a1ff1b8817f..c2b82321d4e 100644 --- a/pkgs/applications/editors/textadept/default.nix +++ b/pkgs/applications/editors/textadept/default.nix @@ -1,52 +1,30 @@ -{ lib, stdenv, fetchFromGitHub, fetchurl, gtk2, glib, pkg-config, unzip, ncurses, zip }: - +{ lib, stdenv, fetchFromGitHub, fetchurl, cmake, qtbase, wrapQtAppsHook }: stdenv.mkDerivation rec { - version = "11.4"; + version = "12.0"; pname = "textadept"; - nativeBuildInputs = [ pkg-config unzip zip ]; - buildInputs = [ - gtk2 ncurses glib - ]; - - enableParallelBuilding = true; - src = fetchFromGitHub { name = "textadept11"; owner = "orbitalquark"; repo = "textadept"; rev = "textadept_${version}"; - sha256 = "sha256-1we2NC4N8oY4QmmqIIWGSpTBuLx3MEFkZK+BjmNEfD0="; + sha256 = "sha256-KziVN0Fl/IvSnIJKK5s7UikXi3iP5mTauP0YxffKy9c="; }; - preConfigure = - lib.concatStringsSep "\n" (lib.mapAttrsToList (name: params: - "ln -s ${fetchurl params} $PWD/src/${name}" - ) (import ./deps.nix)) + '' - - cd src - make deps - ''; - - postBuild = '' - make curses - ''; + nativeBuildInputs = [ cmake wrapQtAppsHook ]; + buildInputs = [ qtbase ]; - preInstall = '' - mkdir -p $out/share/applications - mkdir -p $out/share/pixmaps - ''; + cmakeFlags = [ + "CMAKE_INSTALL_PREFIX=build/install" + ]; - postInstall = '' - make curses install PREFIX=$out MAKECMDGOALS=curses - ''; + preConfigure = '' + mkdir -p $PWD/build/_deps - makeFlags = [ - "PREFIX=$(out)" - "WGET=true" - "PIXMAPS_DIR=$(out)/share/pixmaps" - "GTK2=1" - ]; + '' + + lib.concatStringsSep "\n" (lib.mapAttrsToList (name: params: + "ln -s ${fetchurl params} $PWD/build/_deps/${name}" + ) (import ./deps.nix)); meta = with lib; { description = "An extensible text editor based on Scintilla with Lua scripting."; diff --git a/pkgs/applications/editors/textadept/deps.nix b/pkgs/applications/editors/textadept/deps.nix index 1baac73df8d..b0117f40224 100644 --- a/pkgs/applications/editors/textadept/deps.nix +++ b/pkgs/applications/editors/textadept/deps.nix @@ -1,39 +1,32 @@ { - "scintilla524.tgz" = { - url = "https://www.scintilla.org/scintilla524.tgz"; - sha256 = "sha256-Su8UiMmkOxcuBat2JWYEnhNdG5HKnV1fn1ClnJhazGY="; + "scintilla536.tgz" = { + url = "https://www.scintilla.org/scintilla536.tgz"; + sha256 = "sha256-ib6CeKg+eBOSWq/il32quH0r1r69F7AXn+cq/dVIyyQ="; }; "lexilla510.tgz" = { url = "https://www.scintilla.org/lexilla510.tgz"; sha256 = "sha256-azWVJ0AFSYZxuFTPV73uwiVJZvNxcS/POnFtl6p/P9g="; }; - "9088723504b19f8611b66c119933a4dc7939d7b8.zip" = { - url = - "https://github.com/orbitalquark/scintillua/archive/9088723504b19f8611b66c119933a4dc7939d7b8.zip"; - sha256 = "sha256-V2t1kt6+SpZQvQSzLhh8n+WiAnA32SRVFnrbTaJrHRo="; + "scinterm_5.0.zip" = { + url = "https://github.com/orbitalquark/scinterm/archive/scinterm_5.0.zip"; + sha256 = "sha256-l1qeLMCrhyoZA/GfmXFR20rY5EsUoO5e+1vZJtYdb24="; }; - "475d8d43f3418590c28bd2fb07ee9229d1fa2d07.zip" = { - url = - "https://github.com/orbitalquark/scinterm/archive/475d8d43f3418590c28bd2fb07ee9229d1fa2d07.zip"; - sha256 = "sha256-lNMK0RFcOLg9RRE5a6VelhSzUYVl5TiAiXcje2JOedE="; + "scintillua_6.2.zip" = { + url = "https://github.com/orbitalquark/scintillua/archive/scintillua_6.2.zip"; + sha256 = "sha256-vjlN6MBz0xjBwWd8dpx/ks37WvdXt2vE1A71YM3uDik="; }; - "lua-5.4.4.tar.gz" = { - url = "http://www.lua.org/ftp/lua-5.4.4.tar.gz"; - sha256 = "sha256-Fkx4SWU7gK5nvsS3RzuIS/XMjS3KBWU0dewu0nuev2E="; + "lua-5.4.6.tar.gz" = { + url = "http://www.lua.org/ftp/lua-5.4.6.tar.gz"; + sha256 = "sha256-fV6huctqoLWco93hxq3LV++DobqOVDLA7NBr9DmzrYg="; }; - "lpeg-1.0.2.tar.gz" = { - url = "http://www.inf.puc-rio.br/~roberto/lpeg/lpeg-1.0.2.tar.gz"; - sha256 = "sha256-SNZldgUbbHg4j6rQm3BJMJMmRYj80PJY3aqxzdShX/4="; + "lpeg-1.1.0.tar.gz" = { + url = "http://www.inf.puc-rio.br/~roberto/lpeg/lpeg-1.1.0.tar.gz"; + sha256 = "sha256-SxVdZ9IkbB/6ete8RmweqJm7xA/vAlfMnAPOy67UNSo="; }; "v1_8_0.zip" = { url = "https://github.com/keplerproject/luafilesystem/archive/v1_8_0.zip"; sha256 = "sha256-46a+ynqKkFIu7THbbM3F7WWkM4JlAMaGJ4TidnG54Yo="; }; - "444af9ca8a73151dbf759e6676d1035af469f01a.zip" = { - url = - "https://github.com/orbitalquark/gtdialog/archive/444af9ca8a73151dbf759e6676d1035af469f01a.zip"; - sha256 = "sha256-7AkX7OWXJtzKq3h4uJeLzHpf6mrsz67SXtPvmyA5xxg="; - }; "cdk-5.0-20200923.tgz" = { url = "http://invisible-mirror.net/archives/cdk/cdk-5.0-20200923.tgz"; sha256 = "sha256-AH9d6IDLLuvYVW335M2Gc9XmTJlwFH7uaSOoFMKfqu0="; @@ -42,4 +35,11 @@ url = "http://www.leonerd.org.uk/code/libtermkey/libtermkey-0.22.tar.gz"; sha256 = "sha256-aUW9PEqqg9qD2AoEXFVj2k7dfQN0xiwNNa7AnrMBRgA="; }; + # lua-std-regex + "1.0.zip" = { + url = "https://github.com/orbitalquark/lua-std-regex/archive/1.0.zip"; + sha256 = "sha256-W2hKHOfqYyo3qk+YvPJlzZfZ1wxZmMVphSlcaql+dOE="; + }; } + + diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 42f3de7f628..3007625285c 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -966,18 +966,23 @@ self: super: { sniprun = let - version = "1.3.5"; + version = "1.3.6"; src = fetchFromGitHub { owner = "michaelb"; repo = "sniprun"; rev = "v${version}"; - hash = "sha256-D2nHei7mc7Yn8rgFiWFyaR87wQuryv76B25BYOpyp2I="; + hash = "sha256-1xvB/YhpHlOhxbkIGlgQyTlO5ljWPHfOm+tuhKRTXAw="; }; sniprun-bin = rustPlatform.buildRustPackage { pname = "sniprun-bin"; inherit version src; - cargoHash = "sha256-TG84BeYm7K5Dn0CvMvv1gzqeX246JPks1qcwkfcsG8c="; + # Cargo.lock is outdated + preBuild = '' + cargo update --offline + ''; + + cargoHash = "sha256-pML4ZJYivC/tu/7yvbB/VHfXTT+UpLZuS1Y3iNXt2Ks="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 0f3707a2354..d17d2709344 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -2594,6 +2594,22 @@ let }; }; + mskelton.npm-outdated = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "npm-outdated"; + publisher = "mskelton"; + version = "2.2.0"; + sha256 = "sha256-kHItIlTW+PIVXrLgzdGAoPeR6sWKuKl/QyJ5+TIv3/E="; + }; + meta = { + changelog = "https://marketplace.visualstudio.com/items/mskelton.npm-outdated/changelog"; + description = "Shows which packages are outdated in an npm project"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=mskelton.npm-outdated"; + homepage = "https://github.com/mskelton/vscode-npm-outdated"; + license = lib.licenses.isc; + }; + }; + mvllow.rose-pine = buildVscodeMarketplaceExtension { mktplcRef = { publisher = "mvllow"; @@ -3018,8 +3034,8 @@ let mktplcRef = { name = "crates"; publisher = "serayuzgur"; - version = "0.5.10"; - sha256 = "1dbhd6xbawbnf9p090lpmn8i5gg1f7y8xk2whc9zhg4432kdv3vd"; + version = "0.6.0"; + sha256 = "080zd103vjrz86vllr1ricq2vi3hawn4534n492m7xdcry9l9dpc"; }; meta = { license = lib.licenses.mit; diff --git a/pkgs/applications/emulators/rpcs3/default.nix b/pkgs/applications/emulators/rpcs3/default.nix index cc38ad1fbcd..bea72c7ca44 100644 --- a/pkgs/applications/emulators/rpcs3/default.nix +++ b/pkgs/applications/emulators/rpcs3/default.nix @@ -34,10 +34,10 @@ let # Keep these separate so the update script can regex them - rpcs3GitVersion = "15372-38a5313ed"; - rpcs3Version = "0.0.28-15372-38a5313ed"; - rpcs3Revision = "38a5313ed2c4ebb626017a4f7f28ed0c0a89f931"; - rpcs3Hash = "sha256-tiByoxPf++TK/Xowo2VQ+OEojoYIpX/B8caDyaMZ3Qc="; + rpcs3GitVersion = "15409-fd6829f75"; + rpcs3Version = "0.0.28-15409-fd6829f75"; + rpcs3Revision = "fd6829f7576da07e3bb90de8821834d3ce44610c"; + rpcs3Hash = "sha256-I/CYDE7te8xxKjTyH1Mb45uemya5Sfjb96MQWlkFAbk="; in stdenv.mkDerivation { pname = "rpcs3"; diff --git a/pkgs/applications/emulators/wine/sources.nix b/pkgs/applications/emulators/wine/sources.nix index 23fcf4a4422..1bfb35e76d7 100644 --- a/pkgs/applications/emulators/wine/sources.nix +++ b/pkgs/applications/emulators/wine/sources.nix @@ -24,9 +24,9 @@ let fetchurl = args@{url, hash, ...}: in rec { stable = fetchurl rec { - version = "8.0.1"; + version = "8.0.2"; url = "https://dl.winehq.org/wine/source/8.0/wine-${version}.tar.xz"; - hash = "sha256-IgNfODa0+cOxlArZD5uePBvgkjQjbSqA2JMYBTXHW30="; + hash = "sha256-bsj7byxy1XbLEfUrL41Zr2RASAIVRlHRIrmEZtkdyEc="; ## see http://wiki.winehq.org/Gecko gecko32 = fetchurl rec { diff --git a/pkgs/applications/file-managers/mucommander/default.nix b/pkgs/applications/file-managers/mucommander/default.nix index 8882bf42a5b..cf3b1352f48 100644 --- a/pkgs/applications/file-managers/mucommander/default.nix +++ b/pkgs/applications/file-managers/mucommander/default.nix @@ -10,13 +10,13 @@ }: let - version = "1.2.0-1"; + version = "1.3.0-1"; src = fetchFromGitHub { owner = "mucommander"; repo = "mucommander"; rev = version; - sha256 = "sha256-OrtC7E/8n9uEo7zgFHYQqXV3qLpdKtxwbwZfxoOqTqA="; + sha256 = "sha256-rSHHv96L2EHQuKBSAdpfi1XGP2u9o2y4g1+65FHWFMw="; }; postPatch = '' @@ -49,7 +49,7 @@ let ''; outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "sha256-T4UhEzkaYh237+ZsoQTv1RgqcAKY4dPc/3x+dEie4A8="; + outputHash = "sha256-9tCcUg7hDNbkZiQEWtVRsUUfms73aU+vt5tQsfknM+E="; }; in diff --git a/pkgs/applications/graphics/xournalpp/default.nix b/pkgs/applications/graphics/xournalpp/default.nix index b36ac5968b3..cd3b73b6b48 100644 --- a/pkgs/applications/graphics/xournalpp/default.nix +++ b/pkgs/applications/graphics/xournalpp/default.nix @@ -6,9 +6,11 @@ , wrapGAppsHook , pkg-config +, alsa-lib , glib , gsettings-desktop-schemas , gtk3 +, gtksourceview4 , librsvg , libsndfile , libxml2 @@ -23,20 +25,23 @@ stdenv.mkDerivation rec { pname = "xournalpp"; - version = "1.1.3"; + version = "1.2.0"; src = fetchFromGitHub { owner = "xournalpp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Hn7IDnbrmK3V+iz8UqdmHRV2TS4MwYSgYtnH6igbGJ8="; + sha256 = "sha256-0xsNfnKdGl34qeN0KZbII9w6PzC1HvvO7mtlNlRvUqQ="; }; nativeBuildInputs = [ cmake gettext pkg-config wrapGAppsHook ]; buildInputs = - [ glib + [ + alsa-lib + glib gsettings-desktop-schemas gtk3 + gtksourceview4 librsvg libsndfile libxml2 diff --git a/pkgs/applications/misc/confy/default.nix b/pkgs/applications/misc/confy/default.nix index 24a21471b45..82d7267b047 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 +, fetchFromSourcehut , gobject-introspection , gtk4 , lib @@ -18,9 +18,11 @@ stdenv.mkDerivation rec { pname = "confy"; version = "0.7.0"; - src = fetchurl { - url = "https://git.sr.ht/~fabrixxm/confy/archive/${version}.tar.gz"; - hash = "sha256-ZvIzgCMDfUW9g+qmY0ZIUoEF0PeVmINjOPwilmFzWDk="; + src = fetchFromSourcehut { + owner = "~fabrixxm"; + repo = "confy"; + rev = version; + hash = "sha256-q8WASTNbiBuKb2tPQBmUL9ji60PRAPnYOTYxnUn0MAw="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix index f1a8c150b05..f4cf6e6d0e5 100644 --- a/pkgs/applications/misc/hugo/default.nix +++ b/pkgs/applications/misc/hugo/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "hugo"; - version = "0.116.0"; + version = "0.116.1"; src = fetchFromGitHub { owner = "gohugoio"; repo = pname; - rev = "v${version}"; - hash = "sha256-Q5aSpKBgPa2EBEI9qJAw/WRM9LjHa2rdsThMFRV2/F8="; + rev = "refs/tags/v${version}"; + hash = "sha256-YACMkfDdcou+Yve3D/ealaku1pzuWxInDtnhL/Y+cWw="; }; - vendorHash = "sha256-ScAjE+va/5K/9sYt05X1GmTJp8AUopMukWN/WlPG1sg="; + vendorHash = "sha256-l7XCCsJbqZ4g1U8G3VMVArMofPgchUP0T7wGF57d4rA="; doCheck = false; diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix index a0cb6a94286..3a920d19158 100644 --- a/pkgs/applications/misc/josm/default.nix +++ b/pkgs/applications/misc/josm/default.nix @@ -3,15 +3,15 @@ }: let pname = "josm"; - version = "18772"; + version = "18789"; srcs = { jar = fetchurl { url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar"; - hash = "sha256-Jy8Z/uYmVKCr9Gq0pOmIG9jfTQekzlpkgQrTDZ+ALI0="; + hash = "sha256-0NuCdGqDNY+UCXv9AhX4oT0WJbxMc5ghkL0YvqVWXOs="; }; macosx = fetchurl { url = "https://josm.openstreetmap.de/download/macosx/josm-macos-${version}-java17.zip"; - hash = "sha256-E125YYwVzLzbPh0bbz/FzJO+JysjBhKfpLKmMRO9nJc="; + hash = "sha256-f8VoPMF7cR6idzadkXC6/oUfzq4dnKb3UPa2JjsRNsw="; }; pkg = fetchsvn { url = "https://josm.openstreetmap.de/svn/trunk/native/linux/tested"; diff --git a/pkgs/applications/misc/logseq/default.nix b/pkgs/applications/misc/logseq/default.nix index 4acb84f93b1..f40fe7a0e1b 100644 --- a/pkgs/applications/misc/logseq/default.nix +++ b/pkgs/applications/misc/logseq/default.nix @@ -3,7 +3,8 @@ , fetchurl , appimageTools , makeWrapper -, electron +# graphs will not sync without matching upstream's major electron version +, electron_24 , git , nix-update-script }: @@ -56,10 +57,11 @@ in { postFixup = '' # set the env "LOCAL_GIT_DIRECTORY" for dugite so that we can use the git in nixpkgs - makeWrapper ${electron}/bin/electron $out/bin/${pname} \ + makeWrapper ${electron_24}/bin/electron $out/bin/${pname} \ --set "LOCAL_GIT_DIRECTORY" ${git} \ --add-flags $out/share/${pname}/resources/app \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc.lib ]}" ''; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/applications/misc/tellico/default.nix b/pkgs/applications/misc/tellico/default.nix index 56f4c43624b..2ec1097338e 100644 --- a/pkgs/applications/misc/tellico/default.nix +++ b/pkgs/applications/misc/tellico/default.nix @@ -24,14 +24,14 @@ mkDerivation rec { pname = "tellico"; - version = "3.5"; + version = "3.5.1"; src = fetchFromGitLab { domain = "invent.kde.org"; owner = "office"; repo = pname; rev = "v${version}"; - hash = "sha256-uMq/iqPAbjR85wkgqUS1pk2BL/eatNFpyKcagjN5rJ4="; + hash = "sha256-opg4FbfOM48eqWQUJnMHH7KSo6x4S2DHd7ucPw6iTzg="; }; postPatch = '' diff --git a/pkgs/applications/networking/cluster/istioctl/default.nix b/pkgs/applications/networking/cluster/istioctl/default.nix index 5ce35521449..a4421423830 100644 --- a/pkgs/applications/networking/cluster/istioctl/default.nix +++ b/pkgs/applications/networking/cluster/istioctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "istioctl"; - version = "1.18.1"; + version = "1.18.2"; src = fetchFromGitHub { owner = "istio"; repo = "istio"; rev = version; - sha256 = "sha256-+225LfSp9VP7J63kkbyi2Vj6UAFfb6jr+LLsFVe0ZcY="; + sha256 = "sha256-eSftWXwV8W/mpxZNvUUDS27z3vU36vJj/z0/Wo5qEts="; }; vendorHash = "sha256-tuiQ11pcfoTOu+OVey+YmU4tTOj5C7p5bKP2ylEkUug="; diff --git a/pkgs/applications/networking/cluster/kubeshark/default.nix b/pkgs/applications/networking/cluster/kubeshark/default.nix index a4eb88147f0..76d8a0905af 100644 --- a/pkgs/applications/networking/cluster/kubeshark/default.nix +++ b/pkgs/applications/networking/cluster/kubeshark/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kubeshark"; - version = "41.3"; + version = "41.6"; src = fetchFromGitHub { owner = "kubeshark"; repo = "kubeshark"; rev = version; - sha256 = "sha256-8RAUFiQLXKYRcthkthoRLl73RKjJj6PVE6SxTvqWiiI="; + sha256 = "sha256-UFBht8H8iOHwMU8PM2FCb+oh7rTkN/XC3/W3EmuTp84="; }; - vendorHash = "sha256-cINzo4G1Rn9T1HBGKOKo2boUpG2S2vnFL/uwEVXq2gU="; + vendorHash = "sha256-rcxnvKkc9zerfULRdU5eGRRqSDQQDNMYaLJ7oEMQghk="; ldflags = let t = "github.com/kubeshark/kubeshark"; in [ "-s" "-w" diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 5ef2b965236..e632e23bfd4 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1,10 +1,10 @@ { "aci": { - "hash": "sha256-MF1YeTzKmua4C6Ay9QQGjVzjYCEZtyGW2wrMQH5Un/k=", + "hash": "sha256-iHWb9dytaXs7ywkxi5aPetBV1YSgYC1rTMn9+EXl42U=", "homepage": "https://registry.terraform.io/providers/CiscoDevNet/aci", "owner": "CiscoDevNet", "repo": "terraform-provider-aci", - "rev": "v2.9.0", + "rev": "v2.10.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -37,13 +37,13 @@ "vendorHash": "sha256-Fcu4RWgbVyAUr72h8q91HT+LbUh9+4SPDz8Vc4/u5RM=" }, "akamai": { - "hash": "sha256-gQZ5yH3sV5DTpSE+/bZM12+PHitmUm/TtpAdPijF+Lk=", + "hash": "sha256-LGgZF2/YCYpoDOSu0UeuPqK9wGXrvPQE4WUGGS0sx30=", "homepage": "https://registry.terraform.io/providers/akamai/akamai", "owner": "akamai", "repo": "terraform-provider-akamai", - "rev": "v5.0.1", + "rev": "v5.1.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-xZ0pS7XxfYGbG2kEw5FAjABDQZmektaI7OhToiFMXKk=" + "vendorHash": "sha256-6oPftQghM0h0pgc04Rm4PD8OZ/z+dEdcsIqWPPbSgbM=" }, "alicloud": { "hash": "sha256-0qPmUmQ+CGRyah2GXUADAt3HPietpAahQ9ze6Ip6yvE=", @@ -390,11 +390,11 @@ "vendorHash": null }, "flexibleengine": { - "hash": "sha256-Y7rplfN7acrDWNO9Q4K3WaM5reFxi5ms012+wTm+EF0=", + "hash": "sha256-9qwGI7JBhX2WDX7u3SY2l9RJeiDffEpkE16f8/qqlI8=", "homepage": "https://registry.terraform.io/providers/FlexibleEngineCloud/flexibleengine", "owner": "FlexibleEngineCloud", "repo": "terraform-provider-flexibleengine", - "rev": "v1.39.0", + "rev": "v1.40.0", "spdx": "MPL-2.0", "vendorHash": "sha256-RqYzqKPzb5GcrzHnEDZC7GaBt1zP8g28Wo3WNAe07Ck=" }, @@ -474,13 +474,13 @@ "vendorHash": "sha256-fqVBnAivVekV+4tpkl+E6eNA3wi8mhLevJRCs3W7L2g=" }, "grafana": { - "hash": "sha256-I0qfG916mbYYwjKmlUmCD2iG0CuJxTFOFdVS6VyEfHM=", + "hash": "sha256-pgyyOLkMu7W4llDb4oY72ujZ26SiQqvufVGWVv7y3Sk=", "homepage": "https://registry.terraform.io/providers/grafana/grafana", "owner": "grafana", "repo": "terraform-provider-grafana", - "rev": "v2.1.0", + "rev": "v2.2.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-gY15FJb1svy2AxXs6ZOmZX5o3oXIokzf5hXlFlx1cXU=" + "vendorHash": "sha256-+I0nCbe/OK+9ax8PzLw+PCBHrNDTm96J1GITiNCQEfc=" }, "gridscale": { "hash": "sha256-Xs3eWLwsHFTvuH0rUroB6lkzusjUiH3ajt6ila9v/9M=", @@ -1052,13 +1052,13 @@ "vendorHash": "sha256-NO1r/EWLgH1Gogru+qPeZ4sW7FuDENxzNnpLSKstnE8=" }, "spotinst": { - "hash": "sha256-rxcpu3aQ5Ab6LmvQ4InN6/CNM1+44Z2Wmptg0Q9Kj2I=", + "hash": "sha256-8Pwy/jSzPWGXRCY+MszDPpbPWL6FFleoiu4VtSle0Kg=", "homepage": "https://registry.terraform.io/providers/spotinst/spotinst", "owner": "spotinst", "repo": "terraform-provider-spotinst", - "rev": "v1.130.0", + "rev": "v1.131.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-0rWVOVRndC/Y0gSfJoqd65rvBqUnNQb47S6RiBw7q+4=" + "vendorHash": "sha256-NN4mnXzt1GJYGC0HBvYQBBZKENXfvVq7cTbE4XSPwto=" }, "stackpath": { "hash": "sha256-7KQUddq+M35WYyAIAL8sxBjAaXFcsczBRO1R5HURUZg=", @@ -1252,13 +1252,13 @@ "vendorHash": null }, "wavefront": { - "hash": "sha256-CNKXL02XRbgBIJa2JsusrgYoe0BacE9pnYwH+6Nmj84=", + "hash": "sha256-DF9Q1cwzzLlF8+oJFF5HkOD0lfQhxsnIepl/fMCljcs=", "homepage": "https://registry.terraform.io/providers/vmware/wavefront", "owner": "vmware", "repo": "terraform-provider-wavefront", - "rev": "v4.0.0", + "rev": "v4.2.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-KrYtKeQsa2ApSt4QA2yxgWJHq8LpuAR+DYNB4tIsTZI=" + "vendorHash": "sha256-77pijBYzCQoaZgMRNRwZEAJVM51EMGezXXcrfn9ae1Q=" }, "yandex": { "hash": "sha256-bG8cBOkwsVew5qmaFXdq7yc2j8JNfY9qwnQ7IJGUZvM=", diff --git a/pkgs/applications/networking/freefilesync/default.nix b/pkgs/applications/networking/freefilesync/default.nix index 8ce157c6d57..63c674c1a0c 100644 --- a/pkgs/applications/networking/freefilesync/default.nix +++ b/pkgs/applications/networking/freefilesync/default.nix @@ -17,11 +17,16 @@ stdenv.mkDerivation rec { pname = "freefilesync"; - version = "12.4"; + version = "12.5"; src = fetchurl { url = "https://freefilesync.org/download/FreeFileSync_${version}_Source.zip"; - hash = "sha256-rH1xp0/ggWWyUPcksY2GhYtUddTGrEDxdL/uODurvDo="; + # The URL only redirects to the file on the second attempt + postFetch = '' + rm -f $out + tryDownload "$url" + ''; + hash = "sha256-KTN/HbNLP/+z5rryp3wDRo6c7l03vi6tUxCXZPMGUoM="; }; sourceRoot = "."; @@ -31,8 +36,12 @@ stdenv.mkDerivation rec { # Disable loading of the missing Animal.dat (fetchpatch { url = "https://sources.debian.org/data/main/f/freefilesync/12.0-2/debian/patches/ffs_devuan.patch"; + postFetch = '' + substituteInPlace $out \ + --replace "-std=c++2b" "-std=c++23" + ''; excludes = [ "FreeFileSync/Source/ffs_paths.cpp" ]; - hash = "sha256-6pHr5txabMTpGMKP7I5oe1lGAmgb0cPW8ZkPv/WXN74="; + hash = "sha256-CtUC94AoYTxoqSMWZrzuO3jTD46rj11JnbNyXtWckCo="; }) # Fix build with GTK 3 (fetchpatch { diff --git a/pkgs/applications/networking/instant-messengers/armcord/default.nix b/pkgs/applications/networking/instant-messengers/armcord/default.nix index e0d2cd3e0b7..f6fd6553c7f 100644 --- a/pkgs/applications/networking/instant-messengers/armcord/default.nix +++ b/pkgs/applications/networking/instant-messengers/armcord/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { pname = "armcord"; - version = "3.2.0"; + version = "3.2.1"; src = let @@ -48,11 +48,11 @@ stdenv.mkDerivation rec { { x86_64-linux = fetchurl { url = "${base}/v${version}/ArmCord_${version}_amd64.deb"; - sha256 = "sha256-7lT69fU7tGujhbDTX0tYpkEquoswMCZOGAUhk2Nr+C0="; + sha256 = "1cfbypn9kh566s09c1bvxswpc0r11pmsvxlh4dixd5s622ia3h7r"; }; aarch64-linux = fetchurl { url = "${base}/v${version}/ArmCord_${version}_arm64.deb"; - sha256 = "sha256-a5qLK8WjrlmKF24U9SiEpY+SNWuHf6gHJBym5IM8HZ4="; + sha256 = "0mb6az0mzjz2zal7igigjcigg3phn2ijfw04igpl7q2rg6ha3z00"; }; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); diff --git a/pkgs/applications/networking/instant-messengers/element/pin.nix b/pkgs/applications/networking/instant-messengers/element/pin.nix index d32b7255718..834bcb92356 100644 --- a/pkgs/applications/networking/instant-messengers/element/pin.nix +++ b/pkgs/applications/networking/instant-messengers/element/pin.nix @@ -1,9 +1,9 @@ { - "version" = "1.11.36"; + "version" = "1.11.37"; "hashes" = { - "desktopSrcHash" = "sha256-MMTuyyUXur5Fy24aXPWtZbQLAaXR2R7coEi8ZOJo1YI="; - "desktopYarnHash" = "03wmdqnxzjrvdypwrb5z564liiqamwn6qmw2fww1mja8dkdkx5ng"; - "webSrcHash" = "sha256-u+Y/iLRlTd5RkczF6qIaer9HKFnm8LUGP8ZnB/WfiGI="; - "webYarnHash" = "0s9ly1hr9jvb2asgjf6g5n5n5w6qh51wkwyl7ps891c0hv9m28zm"; + "desktopSrcHash" = "sha256-6YiMAmOb0lSaLDE/ohVpZFbl4J1NxS9xNFFcebVW9MA="; + "desktopYarnHash" = "1ksj99g649kvilr850rkk8nkl55z7vz7m8159777kjikakzra2ly"; + "webSrcHash" = "sha256-zFRoL/bnic6Waaiz7Vfama4qzlYKk0TTr5zPK6PNSpM="; + "webYarnHash" = "1lpd9mmg51jnhdr2zfisxdpc4i64kn4bpzkxqzip7dnn9iz432kw"; }; } diff --git a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix index 2381b8d3e23..49035e9bd55 100644 --- a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix +++ b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix @@ -2,13 +2,13 @@ (if stdenv.isDarwin then darwin.apple_sdk_11_0.llvmPackages_14.stdenv else stdenv).mkDerivation rec { pname = "signalbackup-tools"; - version = "20230723-1"; + version = "20230730"; src = fetchFromGitHub { owner = "bepaald"; repo = pname; rev = version; - hash = "sha256-EHwQHFKahjpP8OOIY0ZRpkmYZYiDNteeMLkRwJIEp7g="; + hash = "sha256-5gXeAX3eV70p5wdQEMXv5QAv3vXH2OH46XL2rY0AUvE="; }; postPatch = '' diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix index d4c5b18c5cd..540555b412a 100644 --- a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix +++ b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix @@ -115,6 +115,7 @@ stdenv.mkDerivation rec { free = false; }; maintainers = with maintainers; [ lhvwb lukegb atemu ]; + mainProgram = "ts3client"; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/networking/instant-messengers/threema-desktop/default.nix b/pkgs/applications/networking/instant-messengers/threema-desktop/default.nix index 347fa9d2e61..0cb8cc4ff2e 100644 --- a/pkgs/applications/networking/instant-messengers/threema-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/threema-desktop/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "threema-desktop"; - version = "1.2.27"; + version = "1.2.31"; src = fetchurl { # As Threema only offers a Latest Release url, the plan is to upload each # new release url to web.archive.org until their Github releases page gets populated. - url = "https://web.archive.org/web/20230302151220/https://releases.threema.ch/web-electron/v1/release/Threema-Latest.deb"; - sha256 = "0jx271zwqja7i7qdvhiyq5m6g19a12falfvxbkxrw7ab3ycds2px"; + url = "https://web.archive.org/web/20230731230034if_/https://releases.threema.ch/web-electron/v1/release/Threema-Latest.deb"; + hash = "sha256-eZ/bjcSnrnzub1G4sbwPn3GCTwhDfFuYv9Plf5SJL90="; }; nativeBuildInputs = [ 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/biology/paml/default.nix b/pkgs/applications/science/biology/paml/default.nix index 871c76dc6e3..c593b5ed3d3 100644 --- a/pkgs/applications/science/biology/paml/default.nix +++ b/pkgs/applications/science/biology/paml/default.nix @@ -1,23 +1,28 @@ -{stdenv, fetchurl}: +{ lib +, stdenv +, fetchFromGitHub +}: -stdenv.mkDerivation rec { - version = "4.9j"; +stdenv.mkDerivation (finalAttrs: { pname = "paml"; - src = fetchurl { - url = "http://abacus.gene.ucl.ac.uk/software/paml${version}.tgz"; - sha256 = "0qflf3i27x6jwks3c6q560m1q8r043ja96syah145113iz5wdalp"; + version = "4.10.7"; + + src = fetchFromGitHub { + owner = "abacus-gene"; + repo = "paml"; + rev = "refs/tags/${finalAttrs.version}"; + hash = "sha256-P/oHaLxoQzjFuvmHyRdShHv1ayruy6O/I9w8aTyya2s="; }; - # Workaround build failure on -fno-common toolchains like upstream - # gcc-10. Otherwise build fails as: - # ld: /build/ccKomtcd.o:(.bss+0x4544): multiple definition of `SeqTypes'; - # /build/ccx7EsgU.o:(.bss+0x2a0dfdc): first defined here - env.NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-D_POSIX_C_SOURCE"; preBuild = '' cd ./src/ ''; + installPhase = '' + runHook preInstall + mkdir -pv $out/bin cp -v codeml $out/bin cp -v baseml $out/bin @@ -28,12 +33,16 @@ stdenv.mkDerivation rec { cp -v mcmctree $out/bin cp -v pamp $out/bin cp -v yn00 $out/bin + + runHook postInstall ''; meta = { description = "Phylogenetic Analysis by Maximum Likelihood (PAML)"; longDescription = "PAML is a package of programs for phylogenetic analyses of DNA or protein sequences using maximum likelihood. It is maintained and distributed for academic use free of charge by Ziheng Yang. ANSI C source codes are distributed for UNIX/Linux/Mac OSX, and executables are provided for MS Windows. PAML is not good for tree making. It may be used to estimate parameters and test hypotheses to study the evolutionary process, when you have reconstructed trees using other programs such as PAUP*, PHYLIP, MOLPHY, PhyML, RaxML, etc."; - license = "non-commercial"; + license = lib.licenses.gpl3Only; homepage = "http://abacus.gene.ucl.ac.uk/software/paml.html"; + changelog = "https://github.com/abacus-gene/paml/releases/tag/${finalAttrs.src.rev}"; + platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/applications/science/logic/cbmc/default.nix b/pkgs/applications/science/logic/cbmc/default.nix index c24d5bb7f61..c287a74010d 100644 --- a/pkgs/applications/science/logic/cbmc/default.nix +++ b/pkgs/applications/science/logic/cbmc/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "cbmc"; - version = "5.87.0"; + version = "5.88.1"; src = fetchFromGitHub { owner = "diffblue"; repo = pname; rev = "${pname}-${version}"; - sha256 = "sha256-aBqJqsZK5O3yWTQ1BEej0eeDI8JcsnO6sIv7eH6wnkw="; + sha256 = "sha256-bfrtYqTMU/Nib0wZjS/t0kg5sBsuQuq9GaHX4PxL7tU="; }; nativeBuildInputs = [ 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/applications/terminal-emulators/foot/default.nix b/pkgs/applications/terminal-emulators/foot/default.nix index 5a50ba9448a..c2d817b4d57 100644 --- a/pkgs/applications/terminal-emulators/foot/default.nix +++ b/pkgs/applications/terminal-emulators/foot/default.nix @@ -27,7 +27,7 @@ }: let - version = "1.15.1"; + version = "1.15.2"; # build stimuli file for PGO build and the script to generate it # independently of the foot's build, so we can cache the result @@ -99,20 +99,9 @@ stdenv.mkDerivation rec { owner = "dnkl"; repo = "foot"; rev = version; - hash = "sha256-YCwmPSn+XtF7HkMOFJft7j/2vr+8UE59yu/iGZ1dT8A="; + hash = "sha256:1iz9l01fpryc335pb0c3qi67fmmfplizv5pbc9s578mxl5j9dxg4"; }; - patches = [ - # Check viewporter protocol support before using it, fixes crash under Mir - # Remove when https://codeberg.org/dnkl/foot/pulls/1445 in version > 1.15.1 - (fetchpatch { - name = "0001-foot-dont-try-to-use-a-non-existing-viewporter-interface.patch"; - url = "https://codeberg.org/dnkl/foot/commit/9d75c551465fa3dbb3cd20ae87d6de294fcebce1.patch"; - excludes = [ "CHANGELOG.md" ]; - hash = "sha256-sVfGbudsmwh7phbbobBgSXoGe1lKJ8s1UdyBnVLmLYQ="; - }) - ]; - depsBuildBuild = [ pkg-config ]; diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index 7b4ababdcdc..ea2d40f9234 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,15 +1,15 @@ { - "version": "16.1.2", - "repo_hash": "sha256-A9JkBwGym+CPpb5B7+Kwt8Ej4PGSHc3ZOgUA28hdyN8=", - "yarn_hash": "1cqyf06810ls94nkys0l4p86ni902q32aqjp66m7j1x6ldh248al", + "version": "16.1.3", + "repo_hash": "sha256-PI0nmwfk8uu74NJkavbbJR9/jDN9SS0Z9Axe4UmT2kk=", + "yarn_hash": "0wykn0vq16n8mz4jfh7dfyp9javzhqlfwmc5i1zm07gld91nirlm", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v16.1.2-ee", + "rev": "v16.1.3-ee", "passthru": { - "GITALY_SERVER_VERSION": "16.1.2", - "GITLAB_PAGES_VERSION": "16.1.2", + "GITALY_SERVER_VERSION": "16.1.3", + "GITLAB_PAGES_VERSION": "16.1.3", "GITLAB_SHELL_VERSION": "14.23.0", "GITLAB_ELASTICSEARCH_INDEXER_VERSION": "4.3.5", - "GITLAB_WORKHORSE_VERSION": "16.1.2" + "GITLAB_WORKHORSE_VERSION": "16.1.3" } } diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index 01f407e2e65..2d35d06dc8a 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -13,7 +13,7 @@ }: let - version = "16.1.2"; + version = "16.1.3"; package_version = "v${lib.versions.major version}"; gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}"; @@ -24,7 +24,7 @@ let owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "sha256-/yCmFbmKTp8V8CjdhoAPpAdwNEcaP/wB0oAeTLdMESo="; + sha256 = "sha256-g9K1dFcrUkWJInPrwg9fz/TEK35GrjqFpUS2bnemwLQ="; }; vendorSha256 = "sha256-6oOFQGPwiMRQrESXsQsGzvWz9bCb0VTYIyyG/C2b3nA="; diff --git a/pkgs/applications/version-management/gitlab/gitlab-container-registry/default.nix b/pkgs/applications/version-management/gitlab/gitlab-container-registry/default.nix index 17a186ef25e..62521099a7e 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-container-registry/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-container-registry/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "gitlab-container-registry"; - version = "3.77.0"; + version = "3.79.0"; rev = "v${version}-gitlab"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "container-registry"; inherit rev; - sha256 = "sha256-tHNxPwm1h1wyXuzUUadz5YcRkPdc0QeayMIRt292uf8="; + sha256 = "sha256-JOXJ8HSTf7yW78SlYzbdn7IAbSwv/UE/W3oSJRyGrAQ="; }; - vendorHash = "sha256-/ITZBh0vRYHb6fDUZQNRwW2pmQulJlDZ8EbObUBtsz4="; + vendorHash = "sha256-4cxfyG1uhqgIheAVDQbIDb4MRSqAUtLgxGYt5MuNfKw="; patches = [ ./Disable-inmemory-storage-driver-test.patch diff --git a/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix b/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix index 4b3595819ac..7fcc652056b 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "gitlab-pages"; - version = "16.1.2"; + version = "16.1.3"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-pages"; rev = "v${version}"; - sha256 = "sha256-T33/SnV+aWUjfRKxVOQNWaPtFnounMkCXAeQCQ9w5RY="; + sha256 = "sha256-FSdew0HMbgEAzVoDhINDIQQs8Q63AHu8mu/dKo+wP9k="; }; vendorHash = "sha256-SN4r9hcTTQUr3miv2Cm7iBryyh7yG1xx9lCvq3vQwc0="; diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index 6d1eecd891f..8a9ae208036 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -5,7 +5,7 @@ in buildGoModule rec { pname = "gitlab-workhorse"; - version = "16.1.2"; + version = "16.1.3"; src = fetchFromGitLab { owner = data.owner; diff --git a/pkgs/applications/video/davinci-resolve/default.nix b/pkgs/applications/video/davinci-resolve/default.nix index bce79d70453..d6a8125f324 100644 --- a/pkgs/applications/video/davinci-resolve/default.nix +++ b/pkgs/applications/video/davinci-resolve/default.nix @@ -99,7 +99,6 @@ let curl \ --retry 3 --retry-delay 3 \ - --header "Host: sw.cloud.blackmagicdesign.com" \ --header "Upgrade-Insecure-Requests: 1" \ --header "$USERAGENT" \ --header "Accept: text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,image/apng,*/*;q=0.8" \ diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index cf5698c5bbd..5deb6d77c37 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -97,7 +97,7 @@ rec { extraUserPath = lib.optionals (stdenv.isLinux && !clientOnly) (lib.makeBinPath [ rootlesskit slirp4netns fuse-overlayfs ]); - patches = [ + patches = lib.optionals (lib.versionOlder version "23") [ # This patch incorporates code from a PR fixing using buildkit with the ZFS graph driver. # It could be removed when a version incorporating this patch is released. (fetchpatch { @@ -105,6 +105,7 @@ rec { url = "https://github.com/moby/moby/pull/43136.patch"; hash = "sha256-1WZfpVnnqFwLMYqaHLploOodls0gHF8OCp7MrM26iX8="; }) + ] ++ lib.optionals (lib.versionOlder version "23.0.5") [ (fetchpatch { name = "fix-issue-with-go-1.20.6.patch"; url = "https://github.com/moby/moby/pull/45972.patch"; @@ -181,14 +182,13 @@ rec { nativeBuildInputs = [ makeWrapper pkg-config go-md2man go libtool installShellFiles ]; - buildInputs = lib.optional (!clientOnly) sqlite - ++ lib.optional withLvm lvm2 - ++ lib.optional withBtrfs btrfs-progs - ++ lib.optional withSystemd systemd - ++ lib.optional withSeccomp libseccomp - ++ plugins; - - patches = [ + + buildInputs = plugins ++ lib.optionals (lib.versionAtLeast version "23") [ + glibc + glibc.static + ]; + + patches = lib.optionals (lib.versionOlder version "23.0.5") [ (fetchpatch { name = "fix-issue-with-go-1.20.6.patch"; url = "https://github.com/docker/cli/pull/4441.patch"; @@ -222,7 +222,7 @@ rec { cd - ''; - outputs = ["out" "man"]; + outputs = ["out"] ++ lib.optional (lib.versionOlder version "23") "man"; installPhase = '' cd ./go/src/${goPackagePath} @@ -244,13 +244,13 @@ rec { installShellCompletion --bash ./contrib/completion/bash/docker installShellCompletion --fish ./contrib/completion/fish/docker.fish installShellCompletion --zsh ./contrib/completion/zsh/_docker - '' + lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) '' + '' + lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform && lib.versionOlder version "23") '' # Generate man pages from cobra commands echo "Generate man pages from cobra" mkdir -p ./man/man1 go build -o ./gen-manpages github.com/docker/cli/man ./gen-manpages --root . --target ./man/man1 - '' + '' + '' + lib.optionalString (lib.versionOlder version "23") '' # Generate legacy pages from markdown echo "Generate legacy manpages" ./man/md2man-all.sh -q @@ -292,4 +292,18 @@ rec { tiniRev = "v0.19.0"; tiniHash = "sha256-ZDKu/8yE5G0RYFJdhgmCdN3obJNyRWv6K/Gd17zc1sI="; }; + + docker_24 = callPackage dockerGen rec { + version = "24.0.5"; + cliRev = "v${version}"; + cliHash = "sha256-u1quVGTx/p8BDyRn33vYyyuE5BOhWMnGQ5uVX0PZ5mg="; + mobyRev = "v${version}"; + mobyHash = "sha256-JQjRz1fHZlQRkNw/R8WWLV8caN3/U3mrKKQXbZt2crU="; + runcRev = "v1.1.8"; + runcHash = "sha256-rDJYEc64KW4Qa3Eg2oUjJqIKrg6THb5hxQFFbvb9Zp4="; + containerdRev = "v1.7.1"; + containerdHash = "sha256-WwedtcsrDQwMQcKFO5nnPiHyGJpl5hXZlmpbBe1/ftY="; + tiniRev = "v0.19.0"; + tiniHash = "sha256-ZDKu/8yE5G0RYFJdhgmCdN3obJNyRWv6K/Gd17zc1sI="; + }; } diff --git a/pkgs/applications/virtualization/nixpacks/default.nix b/pkgs/applications/virtualization/nixpacks/default.nix index 1fc6b7dd9e7..6c9ea55a294 100644 --- a/pkgs/applications/virtualization/nixpacks/default.nix +++ b/pkgs/applications/virtualization/nixpacks/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "nixpacks"; - version = "1.10.1"; + version = "1.12.0"; src = fetchFromGitHub { owner = "railwayapp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-1XaIdnIBLHrT/w41pMm6EUEsvM8oY4r868MzK1vme44="; + sha256 = "sha256-Pm02VKqaxXVLKqChbp7MQIccwzukAG2h0QrEZftQoQo="; }; - cargoHash = "sha256-8b5fLmhEJozk0j2z5B8wCcza4ZKiKbFYsoVBwz/urK8="; + cargoHash = "sha256-elBLH2n+t+bixKePRmK1YiXsdDuerYzV+PbpjFEcA1g="; # skip test due FHS dependency doCheck = false; diff --git a/pkgs/applications/window-managers/i3/status-rust.nix b/pkgs/applications/window-managers/i3/status-rust.nix index 9d7eac5f554..d7792974459 100644 --- a/pkgs/applications/window-managers/i3/status-rust.nix +++ b/pkgs/applications/window-managers/i3/status-rust.nix @@ -15,16 +15,16 @@ rustPlatform.buildRustPackage rec { pname = "i3status-rust"; - version = "0.31.8"; + version = "0.31.9"; src = fetchFromGitHub { owner = "greshake"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-JkX1CGTy5iaItqKCEHaWmUt3qkLSEnxsZGpPScL4ERc="; + hash = "sha256-PldCtV979mJSgQtMHx/gfhKrsBByiywLMO9LjyggvCA="; }; - cargoHash = "sha256-QjqdGT0uVW67gQHeR4Rixpt9Wn0tyZvsDw1lyLrqabA="; + cargoHash = "sha256-wCBg3qYy9wrsM4eJ1FV4OEI+ZwkbXn5jQZ/m7KMgHCc="; nativeBuildInputs = [ pkg-config makeWrapper ]; diff --git a/pkgs/data/icons/papirus-icon-theme/default.nix b/pkgs/data/icons/papirus-icon-theme/default.nix index 0548ac07ced..6df3087a792 100644 --- a/pkgs/data/icons/papirus-icon-theme/default.nix +++ b/pkgs/data/icons/papirus-icon-theme/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "papirus-icon-theme"; - version = "20230601"; + version = "20230801"; src = fetchFromGitHub { owner = "PapirusDevelopmentTeam"; repo = pname; rev = version; - sha256 = "sha256-p47Vt1nR94bXtpWjNaIWJNKbdgFFMc0qCBeh2V98CJg="; + hash = "sha256-sEfJKlGdogM0rOqg3Buytgd7vm0zEkmkSR343ZgGI2I="; }; nativeBuildInputs = [ gtk3 papirus-folders ]; diff --git a/pkgs/data/themes/graphite-gtk-theme/default.nix b/pkgs/data/themes/graphite-gtk-theme/default.nix index 5376a618aa9..ea5cf7a7d92 100644 --- a/pkgs/data/themes/graphite-gtk-theme/default.nix +++ b/pkgs/data/themes/graphite-gtk-theme/default.nix @@ -27,13 +27,13 @@ lib.checkListOfEnum "${pname}: grub screens" [ "1080p" "2k" "4k" ] grubScreens stdenvNoCC.mkDerivation rec { inherit pname; - version = "2022-09-02"; + version = "2023-05-17"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "PaqEkl0E3pUEJDEv1WwUqcjzAcQniN8rUGhVgbOxuhA="; + sha256 = "hymOqtwMk6Yja5le6ADZl04yjbOJjhairiH7a4m7gMk="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/deepin/apps/deepin-terminal/default.nix b/pkgs/desktops/deepin/apps/deepin-terminal/default.nix index 9f27dbaab9e..5caa37bfead 100644 --- a/pkgs/desktops/deepin/apps/deepin-terminal/default.nix +++ b/pkgs/desktops/deepin/apps/deepin-terminal/default.nix @@ -2,6 +2,7 @@ , lib , fetchFromGitHub , fetchpatch +, nixosTests , dtkwidget , qt5integration , qt5platform-plugins @@ -55,6 +56,8 @@ stdenv.mkDerivation rec { strictDeps = true; + passthru.tests.test = nixosTests.terminal-emulators.deepin-terminal; + meta = with lib; { description = "Terminal emulator with workspace, multiple windows, remote management, quake mode and other features"; homepage = "https://github.com/linuxdeepin/deepin-terminal"; diff --git a/pkgs/desktops/deepin/core/dde-calendar/default.nix b/pkgs/desktops/deepin/core/dde-calendar/default.nix index f3023c7cb9f..62e8399ff25 100644 --- a/pkgs/desktops/deepin/core/dde-calendar/default.nix +++ b/pkgs/desktops/deepin/core/dde-calendar/default.nix @@ -1,53 +1,40 @@ { stdenv , lib , fetchFromGitHub -, fetchpatch -, dtkwidget -, qt5integration -, qt5platform-plugins -, dde-qt-dbus-factory , cmake , qttools , pkg-config , wrapQtAppsHook -, runtimeShell +, dtkwidget +, qt5integration +, qt5platform-plugins +, dde-qt-dbus-factory , qtbase -, gtest +, qtsvg +, libical +, sqlite +, runtimeShell }: stdenv.mkDerivation rec { pname = "dde-calendar"; - version = "5.8.30"; + version = "5.10.1"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "sha256-8/UXq9W3Gb1Lg/nOji6zcHJts6lgY2uDxvrBxQs3Zio="; + hash = "sha256-oPrtPOCLZof4BysWfsCYeoqbJf30r7LijGEEXZlsAAY="; }; patches = [ - (fetchpatch { - name = "chore-use-GNUInstallDirs-in-CmakeLists.patch"; - url = "https://github.com/linuxdeepin/dde-calendar/commit/b9d9555d90a36318eeee62ece49250b4bf8acd10.patch"; - sha256 = "sha256-pvgxZPczs/lkwNjysNuVu+1AY69VZlxOn7hR9A02/3M="; - }) + ./fix-wrapped-name-not-in-whitelist.diff ]; postPatch = '' - substituteInPlace calendar-service/src/dbmanager/huanglidatabase.cpp \ - --replace "/usr/share/dde-calendar/data/huangli.db" "$out/share/dde-calendar/data/huangli.db" - substituteInPlace calendar-service/src/main.cpp \ - --replace "/usr/share/dde-calendar/translations" "$out/share/dde-calendar/translations" - substituteInPlace calendar-service/assets/data/com.deepin.dataserver.Calendar.service \ - --replace "/usr/lib/deepin-daemon/dde-calendar-service" "$out/lib/deepin-daemon/dde-calendar-service" - substituteInPlace calendar-client/assets/dbus/com.deepin.Calendar.service \ - --replace "/usr/bin/dde-calendar" "$out/bin/dde-calendar" - substituteInPlace calendar-service/{src/{csystemdtimercontrol.cpp,jobremindmanager.cpp},assets/{data/com.dde.calendarserver.calendar.service,dde-calendar-service.desktop}} \ - --replace "/bin/bash" "${runtimeShell}" - - substituteInPlace CMakeLists.txt \ - --replace "ADD_SUBDIRECTORY(tests)" " " + for file in $(grep -rl "/bin/bash"); do + substituteInPlace $file --replace "/bin/bash" "${runtimeShell}" + done ''; nativeBuildInputs = [ @@ -58,22 +45,19 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - dtkwidget + qt5integration qt5platform-plugins + dtkwidget + qtbase + qtsvg dde-qt-dbus-factory - gtest + libical + sqlite ]; cmakeFlags = [ "-DVERSION=${version}" ]; - # qt5integration must be placed before qtsvg in QT_PLUGIN_PATH - qtWrapperArgs = [ - "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}" - ]; - - postFixup = '' - wrapQtApp $out/lib/deepin-daemon/dde-calendar-service - ''; + strictDeps = true; meta = with lib; { description = "Calendar for Deepin Desktop Environment"; @@ -83,3 +67,4 @@ stdenv.mkDerivation rec { maintainers = teams.deepin.members; }; } + diff --git a/pkgs/desktops/deepin/core/dde-calendar/fix-wrapped-name-not-in-whitelist.diff b/pkgs/desktops/deepin/core/dde-calendar/fix-wrapped-name-not-in-whitelist.diff new file mode 100644 index 00000000000..a139c4690a8 --- /dev/null +++ b/pkgs/desktops/deepin/core/dde-calendar/fix-wrapped-name-not-in-whitelist.diff @@ -0,0 +1,13 @@ +diff --git a/calendar-service/src/dbusservice/dservicebase.cpp b/calendar-service/src/dbusservice/dservicebase.cpp +index ac182881..93a9c2d8 100644 +--- a/calendar-service/src/dbusservice/dservicebase.cpp ++++ b/calendar-service/src/dbusservice/dservicebase.cpp +@@ -52,6 +52,8 @@ bool DServiceBase::clientWhite(const int index) + return true; + } + } ++ if (getClientName().contains("dde-calendar")) ++ return true; + return false; + #else + Q_UNUSED(index) diff --git a/pkgs/development/interpreters/erlang/25.nix b/pkgs/development/interpreters/erlang/25.nix index a3cb5166ef1..3644c12fd4b 100644 --- a/pkgs/development/interpreters/erlang/25.nix +++ b/pkgs/development/interpreters/erlang/25.nix @@ -1,6 +1,6 @@ { mkDerivation }: mkDerivation { - version = "25.3.2.4"; - sha256 = "U0hzGrLcJZndCGXz/4b9yXy21QGXbKAtc01H1QnwO4A="; + version = "25.3.2.5"; + sha256 = "fnyWyJ+QsaJk2/LK8jOuxZmt3AFXmeubdeoYSGid/0A="; } diff --git a/pkgs/development/libraries/mlt/default.nix b/pkgs/development/libraries/mlt/default.nix index 19b03a24a45..a13b3655066 100644 --- a/pkgs/development/libraries/mlt/default.nix +++ b/pkgs/development/libraries/mlt/default.nix @@ -40,13 +40,13 @@ stdenv.mkDerivation rec { pname = "mlt"; - version = "7.16.0"; + version = "7.18.0"; src = fetchFromGitHub { owner = "mltframework"; repo = "mlt"; rev = "v${version}"; - hash = "sha256-Ed9CHaeJ8Rkrvfq/dZVOn/5lhHLH7B6A1Qf2xOQfWik="; + hash = "sha256-3qvMuBr2w/gedTDIjG6ezatleXuQSnKX4SkBShzj6aw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/zziplib/default.nix b/pkgs/development/libraries/zziplib/default.nix index c4c20f207a4..e90df0888a0 100644 --- a/pkgs/development/libraries/zziplib/default.nix +++ b/pkgs/development/libraries/zziplib/default.nix @@ -36,6 +36,11 @@ stdenv.mkDerivation rec { url = "https://github.com/gdraheim/zziplib/commit/e47b1e1da952a92f917db6fb19485b8a0b1a42f3.diff"; sha256 = "0d032hkmi3s3db12z2zbppl2swa3gdpbj0c6w13ylv2g2ixglrwg"; }) + # Fixes invalid pointer conversions that cause compilation to fail with clang 15+ + (fetchpatch { + url = "https://github.com/gdraheim/zziplib/commit/38e4d5f561318fa825e6544c2ef55ac5899c81b0.diff"; + sha256 = "sha256-VJuFyiPhuAZlDxmNHBty+JbYwG85ea5u2sv7HZRHMwo="; + }) ]; nativeBuildInputs = [ diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index f111305ce4b..05d996865fb 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 @@ -52,4 +53,5 @@ mapAliases { triton = pkgs.triton; # Added 2023-05-06 typescript = pkgs.typescript; # Added 2023-06-21 vscode-langservers-extracted = pkgs.vscode-langservers-extracted; # Added 2023-05-27 + zx = pkgs.zx; # added 2023-08-01 } diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index a694b608180..da2f95ab848 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" @@ -396,5 +395,4 @@ , "yarn" , "yo" , "@zwave-js/server" -, "zx" ] diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 1b0c5a39644..a05307fcc56 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"; @@ -151854,79 +151836,4 @@ in bypassCache = true; reconstructLock = true; }; - zx = nodeEnv.buildNodePackage { - name = "zx"; - packageName = "zx"; - version = "7.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/zx/-/zx-7.2.3.tgz"; - sha512 = "QODu38nLlYXg/B/Gw7ZKiZrvPkEsjPN3LQ5JFXM7h0JvwhEdPNNl+4Ao1y4+o3CLNiDUNcwzQYZ4/Ko7kKzCMA=="; - }; - dependencies = [ - sources."@nodelib/fs.scandir-2.1.5" - sources."@nodelib/fs.stat-2.0.5" - sources."@nodelib/fs.walk-1.2.8" - sources."@types/fs-extra-11.0.1" - sources."@types/jsonfile-6.1.1" - sources."@types/minimist-1.2.2" - sources."@types/node-18.16.19" - sources."@types/ps-tree-1.1.2" - sources."@types/which-3.0.0" - sources."braces-3.0.2" - sources."chalk-5.3.0" - sources."data-uri-to-buffer-4.0.1" - sources."dir-glob-3.0.1" - sources."duplexer-0.1.2" - sources."event-stream-3.3.4" - sources."fast-glob-3.3.0" - sources."fastq-1.15.0" - sources."fetch-blob-3.2.0" - sources."fill-range-7.0.1" - sources."formdata-polyfill-4.0.10" - sources."from-0.1.7" - sources."fs-extra-11.1.1" - sources."fx-28.0.0" - sources."glob-parent-5.1.2" - sources."globby-13.2.2" - sources."graceful-fs-4.2.11" - sources."ignore-5.2.4" - sources."is-extglob-2.1.1" - sources."is-glob-4.0.3" - sources."is-number-7.0.0" - sources."isexe-2.0.0" - sources."jsonfile-6.1.0" - sources."map-stream-0.1.0" - sources."merge2-1.4.1" - sources."micromatch-4.0.5" - sources."minimist-1.2.8" - sources."node-domexception-1.0.0" - sources."node-fetch-3.3.1" - sources."path-type-4.0.0" - sources."pause-stream-0.0.11" - sources."picomatch-2.3.1" - sources."ps-tree-1.2.0" - sources."queue-microtask-1.2.3" - sources."reusify-1.0.4" - sources."run-parallel-1.2.0" - sources."slash-4.0.0" - sources."split-0.3.3" - sources."stream-combiner-0.0.4" - sources."through-2.3.8" - sources."to-regex-range-5.0.1" - sources."universalify-2.0.0" - sources."web-streams-polyfill-3.2.1" - sources."webpod-0.0.2" - sources."which-3.0.1" - sources."yaml-2.3.1" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "A tool for writing better scripts"; - homepage = "https://github.com/google/zx#readme"; - license = "Apache-2.0"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; } diff --git a/pkgs/development/ocaml-modules/unix-errno/default.nix b/pkgs/development/ocaml-modules/unix-errno/default.nix index 2b8deb6621d..d869748ecb5 100644 --- a/pkgs/development/ocaml-modules/unix-errno/default.nix +++ b/pkgs/development/ocaml-modules/unix-errno/default.nix @@ -2,13 +2,13 @@ buildDunePackage rec { pname = "unix-errno"; - version = "0.6.1"; + version = "0.6.2"; minimalOCamlVersion = "4.03.0"; # Specified to be 4.01.0, but it's actually 4.03 src = fetchurl { url = "https://github.com/xapi-project/ocaml-unix-errno/releases/download/${version}/unix-errno-${version}.tbz"; - sha256 = "sha256-jZqtHwUKTffjuOP2jdKKQRtEOBKyclhfeiPO96hEj4c="; + sha256 = "sha256-LWqbyGcxs6f/FcOPo3JYR3U+AL0JHeWCiGjuYhxxrWU="; }; propagatedBuildInputs = [ ctypes integers result ]; diff --git a/pkgs/development/perl-modules/Data-UUID-CVE-2013-4184.patch b/pkgs/development/perl-modules/Data-UUID-CVE-2013-4184.patch new file mode 100644 index 00000000000..731e2eeb0df --- /dev/null +++ b/pkgs/development/perl-modules/Data-UUID-CVE-2013-4184.patch @@ -0,0 +1,214 @@ +Eliminate use of state/node files in temp directory, which are a security concern due to insecure writing of State/Node files in a temporary directory, with predictable filenames, with a possible symlink attack. + +Fixes CVE-2013-4184 + +https://github.com/bleargh45/Data-UUID/pull/40 by Graham TerMarsch @bleargh45 + + +diff --git a/Makefile.PL b/Makefile.PL +index 4ca26af..fb1a0f0 100644 +--- a/Makefile.PL ++++ b/Makefile.PL +@@ -89,30 +89,14 @@ WriteMakefile( + + CONFIGURE => sub { + my %opt; +- GetOptions(\%opt, 's|state-storage-directory:s', 'd|default-umask:s', +- 'help|?', 'man') or pod2usage(2); ++ GetOptions(\%opt, 'help|?', 'man') or pod2usage(2); + pod2usage(1) if $opt{help}; + pod2usage(-verbose => 2) if $opt{man}; + + print "Configured options (run perl Makefile.PL --help for how to change this):\n"; + +- my $d = File::Spec->tmpdir; +- $d = $opt{s} || $d; +- print "\tUUID state storage: $d\n"; +- $d =~ s/\\/\\\\/g if $^O eq 'MSWin32'; +- +- my $m = '0007'; +- unless ($^O eq 'MSWin32') { +- $m = $opt{d} || $m; +- print "\tdefault umask: $m\n"; +- } +- +- chmod(0666, sprintf("%s/%s", $d, ".UUID_NODEID")); +- chmod(0666, sprintf("%s/%s", $d, ".UUID_STATE")); + return { +- DEFINE => '-D_STDIR=' . shell_quote(c_quote($d)) +- . ' -D' . shell_quote("__$Config{osname}__") +- . ' -D_DEFAULT_UMASK=' . shell_quote($m) ++ DEFINE => ' -D' . shell_quote("__$Config{osname}__") + }; + } + ); +@@ -127,11 +111,9 @@ Makefile.PL - configure Makefile for Data::UUID + + perl Makefile.PL [options] [EU::MM options] + +-perl Makefile.PL -s=/var/local/lib/data-uuid -d=0007 ++perl Makefile.PL + + Options: +- --state-storage-directory directory for storing library state information +- --default-umask umask for files in the state storage directory + --help brief help message + --man full documentation + +@@ -141,18 +123,6 @@ Options can be abbreviated, see L<Getopt::Long/"Case and abbreviations">. + + =over + +-=item --state-storage-directory +- +-Optional. Takes a string that is interpreted as directory for storing library +-state information. Default is c:/tmp/ on Windows if it already exists, or the +-operating system's temporary directory (see tmpdir in L<File::Spec/"METHODS">), +-or /var/tmp as fallback. +- +-=item --default-umask +- +-Optional. Takes a string that is interpreted as umask for the files in the state +-storage directory. Default is 0007. This is ignored on Windows. +- + =item --help + + Print a brief help message and exits. +@@ -165,10 +135,7 @@ Prints the manual page and exits. + + =head1 DESCRIPTION + +-B<Makefile.PL> writes the Makefile for the Data::UUID library. It is configured +-with the options L</"--state-storage-directory"> and L</"--default-umask">. +-Unless given, default values are used. In any case the values are printed for +-confirmation. ++B<Makefile.PL> writes the Makefile for the Data::UUID library. + + Additionally, the usual EU::MM options are processed, see + L<ExtUtils::MakeMaker/"Using Attributes and Parameters">. +diff --git a/README b/README +index 8aaa1c2..34d53a5 100644 +--- a/README ++++ b/README +@@ -23,15 +23,6 @@ To install this module type the following: + make test + make install + +-NOTE: This module is designed to save its state information in a permanent +-storage location. The installation script (i.e. Makefile.PL) prompts for +-a directory name to use as a storage location for state file and defaults +-this directory to "/var/tmp" if no directory name is provided. +-The installation script will not accept names of directories that do not +-exist, however, it will take the locations, which the installing user +-has no write permissions to. In this case, the state information will not be +-saved, which will maximize the chances of generating duplicate UUIDs. +- + COPYRIGHT AND LICENCE + + Copyright (C) 2001, Alexander Golomshtok +diff --git a/UUID.h b/UUID.h +index dc5ea28..11d6e13 100644 +--- a/UUID.h ++++ b/UUID.h +@@ -44,23 +44,6 @@ + #include <process.h> + #endif + +-#if !defined _STDIR +-# define _STDIR "/var/tmp" +-#endif +-#if !defined _DEFAULT_UMASK +-# define _DEFAULT_UMASK 0007 +-#endif +- +-#define UUID_STATE ".UUID_STATE" +-#define UUID_NODEID ".UUID_NODEID" +-#if defined __mingw32__ || (defined _WIN32 && !defined(__cygwin__)) || defined _MSC_VER +-#define UUID_STATE_NV_STORE _STDIR"\\"UUID_STATE +-#define UUID_NODEID_NV_STORE _STDIR"\\"UUID_NODEID +-#else +-#define UUID_STATE_NV_STORE _STDIR"/"UUID_STATE +-#define UUID_NODEID_NV_STORE _STDIR"/"UUID_NODEID +-#endif +- + #define UUIDS_PER_TICK 1024 + #ifdef _MSC_VER + #define I64(C) C##i64 +@@ -134,7 +117,6 @@ typedef struct _uuid_state_t { + typedef struct _uuid_context_t { + uuid_state_t state; + uuid_node_t nodeid; +- perl_uuid_time_t next_save; + } uuid_context_t; + + static void format_uuid_v1( +diff --git a/UUID.xs b/UUID.xs +index c3496a8..8191727 100644 +--- a/UUID.xs ++++ b/UUID.xs +@@ -356,29 +356,11 @@ PREINIT: + UV one = 1; + CODE: + RETVAL = (uuid_context_t *)PerlMemShared_malloc(sizeof(uuid_context_t)); +- if ((fd = fopen(UUID_STATE_NV_STORE, "rb"))) { +- fread(&(RETVAL->state), sizeof(uuid_state_t), 1, fd); +- fclose(fd); +- get_current_time(×tamp); +- RETVAL->next_save = timestamp; +- } +- if ((fd = fopen(UUID_NODEID_NV_STORE, "rb"))) { +- pid_t *hate = (pid_t *) &(RETVAL->nodeid); +- fread(&(RETVAL->nodeid), sizeof(uuid_node_t), 1, fd ); +- fclose(fd); +- +- *hate += getpid(); +- } else { ++ + get_random_info(seed); + seed[0] |= 0x80; + memcpy(&(RETVAL->nodeid), seed, sizeof(uuid_node_t)); +- mask = umask(_DEFAULT_UMASK); +- if ((fd = fopen(UUID_NODEID_NV_STORE, "wb"))) { +- fwrite(&(RETVAL->nodeid), sizeof(uuid_node_t), 1, fd); +- fclose(fd); +- }; +- umask(mask); +- } ++ + errno = 0; + #if DU_THREADSAFE + MUTEX_LOCK(&instances_mutex); +@@ -415,17 +397,6 @@ PPCODE: + self->state.node = self->nodeid; + self->state.ts = timestamp; + self->state.cs = clockseq; +- if (timestamp > self->next_save ) { +- mask = umask(_DEFAULT_UMASK); +- if((fd = fopen(UUID_STATE_NV_STORE, "wb"))) { +- LOCK(fd); +- fwrite(&(self->state), sizeof(uuid_state_t), 1, fd); +- UNLOCK(fd); +- fclose(fd); +- } +- umask(mask); +- self->next_save = timestamp + (10 * 10 * 1000 * 1000); +- } + ST(0) = make_ret(uuid, ix); + XSRETURN(1); + +@@ -585,14 +556,6 @@ CODE: + MUTEX_UNLOCK(&instances_mutex); + if (count == 0) { + #endif +- mask = umask(_DEFAULT_UMASK); +- if ((fd = fopen(UUID_STATE_NV_STORE, "wb"))) { +- LOCK(fd); +- fwrite(&(self->state), sizeof(uuid_state_t), 1, fd); +- UNLOCK(fd); +- fclose(fd); +- }; +- umask(mask); + PerlMemShared_free(self); + #if DU_THREADSAFE + } + diff --git a/pkgs/development/python-modules/ailment/default.nix b/pkgs/development/python-modules/ailment/default.nix index 21325a94422..ab46608dde4 100644 --- a/pkgs/development/python-modules/ailment/default.nix +++ b/pkgs/development/python-modules/ailment/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "ailment"; - version = "9.2.61"; + version = "9.2.62"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-QIYJ0Xp1MwCHN1LcpGXF+ZjzFV7dRP6faQy1nwBiMFM="; + hash = "sha256-a4YRbFOnBTGte52wYlAsh9o4+x+dugHGhU6kboSdU2c="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/angr/default.nix b/pkgs/development/python-modules/angr/default.nix index 16e34408e85..9d06b45a3c2 100644 --- a/pkgs/development/python-modules/angr/default.nix +++ b/pkgs/development/python-modules/angr/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { pname = "angr"; - version = "9.2.61"; + version = "9.2.62"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -41,7 +41,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-8nGiGDohzxiFNyvMls9EeUxcV7iFIBS2YhaE6Hep0KU="; + hash = "sha256-GyX0LBXABRRQj3bVW8whxp2T5CSPnfI/Vjlj5V4MqrE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/archinfo/default.nix b/pkgs/development/python-modules/archinfo/default.nix index 504fb66a491..58b6cc6c6fd 100644 --- a/pkgs/development/python-modules/archinfo/default.nix +++ b/pkgs/development/python-modules/archinfo/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "archinfo"; - version = "9.2.61"; + version = "9.2.62"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-ZTS+Z0PWcA/jhBx37SVZOZ+NjPyG2VaRYMmBg0BeCDI="; + hash = "sha256-7PNwJMsX3Z/j+zy9CgEvCRpbyJi9qI7ex6KJXwkywgU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/claripy/default.nix b/pkgs/development/python-modules/claripy/default.nix index e0b6126482c..e9b2ded49a2 100644 --- a/pkgs/development/python-modules/claripy/default.nix +++ b/pkgs/development/python-modules/claripy/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "claripy"; - version = "9.2.61"; + version = "9.2.62"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-ibxXVHVskDF0DcOWccNKQpWu2V50ZSLCoZHRo+XEZTM="; + hash = "sha256-rjHz0NfxUzEQxDD4XiUlIr/RltXN7GKRojWs/nxs1ac="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/cle/default.nix b/pkgs/development/python-modules/cle/default.nix index 3435e20b65e..17e09f785ff 100644 --- a/pkgs/development/python-modules/cle/default.nix +++ b/pkgs/development/python-modules/cle/default.nix @@ -16,7 +16,7 @@ let # The binaries are following the argr projects release cycle - version = "9.2.61"; + version = "9.2.62"; # Binary files from https://github.com/angr/binaries (only used for testing and only here) binaries = fetchFromGitHub { @@ -38,7 +38,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-iAKHNVAtUdm+ZTk5nXejI7WdEV9sTjLnfZ4B6Wxzk18="; + hash = "sha256-w1U9/Hvu64ULWQouE5gFRxtfUcNdKIIWACaYXtvlCtE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/imap-tools/default.nix b/pkgs/development/python-modules/imap-tools/default.nix index 7953ffb10f2..b7d2811fbd1 100644 --- a/pkgs/development/python-modules/imap-tools/default.nix +++ b/pkgs/development/python-modules/imap-tools/default.nix @@ -1,15 +1,15 @@ { lib , buildPythonPackage -, isPy27 +, pythonOlder , fetchFromGitHub , pytestCheckHook }: buildPythonPackage rec { pname = "imap-tools"; - version = "1.1.0"; + version = "1.2.0"; - disabled = isPy27; + disabled = pythonOlder "3.5"; format = "setuptools"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "ikvk"; repo = "imap_tools"; rev = "refs/tags/v${version}"; - hash = "sha256-IW67v7gXV04Nlr/0/lceC5WmknaqqwOJ8bqRGZZ4KcY="; + hash = "sha256-FC4uvBqQ9Lqpvj94ByM7LYiqqjAQQljYduBxwum49lI="; }; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/jsonmerge/default.nix b/pkgs/development/python-modules/jsonmerge/default.nix index 6d2c8b10108..83275f54a9b 100644 --- a/pkgs/development/python-modules/jsonmerge/default.nix +++ b/pkgs/development/python-modules/jsonmerge/default.nix @@ -9,6 +9,8 @@ buildPythonPackage rec { pname = "jsonmerge"; version = "1.9.2"; + format = "setuptools"; + src = fetchPypi { inherit pname version; hash = "sha256-xDdX4BgLDhm3rkwTCtQqB8xYDDGRL2H0gj6Ory+jlKM="; @@ -18,11 +20,6 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - disabledTests = [ - # Fails with "Unresolvable JSON pointer" - "test_local_reference_in_meta" - ]; - meta = with lib; { description = "Merge a series of JSON documents"; homepage = "https://github.com/avian2/jsonmerge"; diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix index 26af176ec47..b6d3593b94c 100644 --- a/pkgs/development/python-modules/pyvex/default.nix +++ b/pkgs/development/python-modules/pyvex/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "pyvex"; - version = "9.2.61"; + version = "9.2.62"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-UbaaudnwsIXs/IsiZyCamnWjLndwrn244ZdbvZa7P0I="; + hash = "sha256-eBmmXdtYeG6O8Wdt0Gye78/6dt+XZznXyEzlv9WFwcI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/shtab/default.nix b/pkgs/development/python-modules/shtab/default.nix index 4f939eed4f2..f27d2c1f253 100644 --- a/pkgs/development/python-modules/shtab/default.nix +++ b/pkgs/development/python-modules/shtab/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "shtab"; - version = "1.6.2"; + version = "1.6.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-qhWkUprDEFRvb9/0dGWBjyIFQY08sAqFSl5jYGtN6Z8="; + hash = "sha256-9XXAVwno8rO5Uw7S5FWsyEUSqUE46QRehpAr5wIlYgc="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/sqlite-utils/default.nix b/pkgs/development/python-modules/sqlite-utils/default.nix index 2a29fda8daa..c3ad45ec13a 100644 --- a/pkgs/development/python-modules/sqlite-utils/default.nix +++ b/pkgs/development/python-modules/sqlite-utils/default.nix @@ -8,8 +8,11 @@ , python-dateutil , sqlite-fts4 , tabulate +, pluggy , pytestCheckHook , hypothesis +, testers +, sqlite-utils }: buildPythonPackage rec { @@ -35,6 +38,7 @@ buildPythonPackage rec { python-dateutil sqlite-fts4 tabulate + pluggy ]; nativeCheckInputs = [ @@ -46,6 +50,10 @@ buildPythonPackage rec { "sqlite_utils" ]; + passthru.tests.version = testers.testVersion { + package = sqlite-utils; + }; + meta = with lib; { description = "Python CLI utility and library for manipulating SQLite databases"; homepage = "https://github.com/simonw/sqlite-utils"; diff --git a/pkgs/development/python-modules/unstructured-inference/default.nix b/pkgs/development/python-modules/unstructured-inference/default.nix index d8bb5e2896d..e03d2a6f454 100644 --- a/pkgs/development/python-modules/unstructured-inference/default.nix +++ b/pkgs/development/python-modules/unstructured-inference/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "unstructured-inference"; - version = "0.5.5"; + version = "0.5.7"; format = "setuptools"; src = fetchFromGitHub { owner = "Unstructured-IO"; repo = "unstructured-inference"; - rev = version; - hash = "sha256-Oma6vPoiA+5czauYFgsU1W6UECDRurYmBTaCSiEILNs="; + rev = "refs/tags/${version}"; + hash = "sha256-xlsihi1ZTNgdnSk3H8rMBRi4AAxPKNFqygcIMtM/jE0="; }; postPatch = '' diff --git a/pkgs/development/python-modules/vsure/default.nix b/pkgs/development/python-modules/vsure/default.nix index b204c6c79bf..583a17c0704 100644 --- a/pkgs/development/python-modules/vsure/default.nix +++ b/pkgs/development/python-modules/vsure/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "vsure"; - version = "2.6.2"; + version = "2.6.4"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-8AqxLIrsFtAazH+ZqhXbkYNhlAhQ5XL/tNFRAGLh2kk="; + hash = "sha256-d9t/zO1ROCndS+5kiFVyDbs+96z7GMHaH6T82b8hl40="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/tools/analysis/codeql/default.nix b/pkgs/development/tools/analysis/codeql/default.nix index 8a2789e0bc8..3825f81bcf1 100644 --- a/pkgs/development/tools/analysis/codeql/default.nix +++ b/pkgs/development/tools/analysis/codeql/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "codeql"; - version = "2.14.0"; + version = "2.14.1"; dontConfigure = true; dontBuild = true; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { src = fetchzip { url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip"; - sha256 = "sha256-ogodg7BFacM5gMMB04R7SBPiVGHBea/lwzTZo04jtWY="; + sha256 = "sha256-6gq70bF954CNUS1t38o+1YqWZORGgxM1CWcbUnRyhOU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/azcopy/default.nix b/pkgs/development/tools/azcopy/default.nix index 1dc747d8636..3ab48462dbb 100644 --- a/pkgs/development/tools/azcopy/default.nix +++ b/pkgs/development/tools/azcopy/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "azure-storage-azcopy"; - version = "10.19.0"; + version = "10.20.0"; src = fetchFromGitHub { owner = "Azure"; repo = "azure-storage-azcopy"; rev = "v${version}"; - sha256 = "sha256-NmiLNkecd5u8r1L6e3jdAGP4HCP1udWxM2jRZkFe1qI="; + sha256 = "sha256-0NUOOJu3iuKBlIi4z1Jv8e00BTsgk0dpLOgfpIKSc2A="; }; subPackages = [ "." ]; - vendorHash = "sha256-XurlmsKblDCX3ldFEmYmK24NEfdw9ahiUWgsxYGwz48="; + vendorHash = "sha256-byFroeXRMepN9RYak2++tT9IE8ZbT+0qJAyipHkE5WE="; doCheck = false; diff --git a/pkgs/development/tools/build-managers/buck2/default.nix b/pkgs/development/tools/build-managers/buck2/default.nix index 9a743beb2be..bb4e224f6eb 100644 --- a/pkgs/development/tools/build-managers/buck2/default.nix +++ b/pkgs/development/tools/build-managers/buck2/default.nix @@ -30,7 +30,7 @@ let aarch64-linux = "aarch64-unknown-linux-musl"; }."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); - buck2-version = "2023-07-18"; + buck2-version = "2023-08-01"; src = let hashes = builtins.fromJSON (builtins.readFile ./hashes.json); diff --git a/pkgs/development/tools/build-managers/buck2/hashes.json b/pkgs/development/tools/build-managers/buck2/hashes.json index 3f44cb318aa..69a7a0f72f3 100644 --- a/pkgs/development/tools/build-managers/buck2/hashes.json +++ b/pkgs/development/tools/build-managers/buck2/hashes.json @@ -1,6 +1,6 @@ { "_comment": "@generated by pkgs/development/tools/build-managers/buck2/update.sh" -, "x86_64-linux": "sha256-vYEE1VXzT9qT2ImYYuWPCw/1mTrzngrUzxMBNldaUEo=" -, "x86_64-darwin": "sha256-0S82F2m6CX7ra/uByBuaGMVXP1ECN7Ydi9VEyrxYdTs=" -, "aarch64-linux": "sha256-zghI4zvm/MN8plIB+nuv/tfd8DJ7mEXMc39PW55ieds=" -, "aarch64-darwin": "sha256-euzixGUDb3W9B86HYPAgcNiTu3jxUVULAfNMKkFz5gU=" +, "x86_64-linux": "sha256-wZULK2FPZ4GtQ5MMQmgfmtbMHJ7sPbue2RdVY0dmRuE=" +, "x86_64-darwin": "sha256-FmayArw2gswKjAEv0AzpFZNiXNx3GmJnPwH9g+Y/BGU=" +, "aarch64-linux": "sha256-3M1dRIFU0CwoVCbmq3oghhz51wW37melzt9hdIHqzzY=" +, "aarch64-darwin": "sha256-UAe73UNDSLL8OHqzAd+NOwwtW4bpVBz/aL4wdy3VuYg=" } diff --git a/pkgs/development/tools/convco/default.nix b/pkgs/development/tools/convco/default.nix index 34cc516e0bf..1ac7aaaaf8a 100644 --- a/pkgs/development/tools/convco/default.nix +++ b/pkgs/development/tools/convco/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "convco"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "convco"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Fv1yaBnfn/wik1Ix24shwfritwxno3NoeJgHPsHgZOI="; + sha256 = "sha256-HOHUyO2Ct0BlQtLqqwsQZZPmnLij8AsayX+aIhIpZpw="; }; - cargoHash = "sha256-q0VrN+5Ypq4ga/gI5MlyRaMdD8NxzuaZ804KaRQzpRs="; + cargoHash = "sha256-p8aDqBZ0HpQ4iWG0lAF6KIvE4F5P1myd/Dt/txaoz0k="; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/development/tools/database/litefs/default.nix b/pkgs/development/tools/database/litefs/default.nix index 08f7494ecec..660d06c6366 100644 --- a/pkgs/development/tools/database/litefs/default.nix +++ b/pkgs/development/tools/database/litefs/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "litefs"; - version = "0.5.1"; + version = "0.5.2"; src = fetchFromGitHub { owner = "superfly"; repo = pname; rev = "v${version}"; - sha256 = "sha256-95q10NQer/KPfBVpabupvm3wuhacnqNG3lXc1pzV3Js="; + sha256 = "sha256-EPOOQSjhhUgUcO+edcZIPomd6g/BI9Ee5MsmylKq1Sk="; }; vendorHash = "sha256-4e1tAAXM2EYuqe1AbN1wng/bq1BP7MSOV6woeKjc3x4="; diff --git a/pkgs/development/tools/misc/runme/default.nix b/pkgs/development/tools/misc/runme/default.nix index 033240878c3..60b2fbfe325 100644 --- a/pkgs/development/tools/misc/runme/default.nix +++ b/pkgs/development/tools/misc/runme/default.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "runme"; - version = "1.6.0"; + version = "1.7.0"; src = fetchFromGitHub { owner = "stateful"; repo = "runme"; rev = "v${version}"; - hash = "sha256-WxsMANyxV+ibAf0/TnkVExyC8XgBjtO92GHNztM0GiU="; + hash = "sha256-vtlsa+XdsE33oR5MH1zaHUIJ4Rsn/RqtryTgNGgEHJw="; }; - vendorHash = "sha256-gFe4lfe6M8NF1zzqK+jLmQix/311yWhFccLsOn+LOZc="; + vendorHash = "sha256-5FMrz4I/i/uJDI4vK9hiet4zMRf0CSbc/YJAFi8hlEM="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/development/tools/misc/rustywind/default.nix b/pkgs/development/tools/misc/rustywind/default.nix index e1f39eaaddf..d3ac55b1311 100644 --- a/pkgs/development/tools/misc/rustywind/default.nix +++ b/pkgs/development/tools/misc/rustywind/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "rustywind"; - version = "0.16.0"; + version = "0.17.0"; src = fetchFromGitHub { owner = "avencera"; repo = "rustywind"; rev = "v${version}"; - hash = "sha256-xDpRS8WrFu5uPtbXJGXrxElJinxl1lkpYZ1tGrNrBHA="; + hash = "sha256-cRQdPOiERvxBZzaS26op1bDba9sCn3TyBIhlwI5XCro="; }; - cargoHash = "sha256-2bo6KkHVw1lyLD4iWidAyxZzQMRTO5DWvYmqUQld15g="; + cargoHash = "sha256-hw9DUe4iJ0DLX4P48ZpvZr6Xmq5rQ5rGmT13fO5uRoY="; meta = with lib; { description = "CLI for organizing Tailwind CSS classes"; diff --git a/pkgs/development/tools/misc/texlab/default.nix b/pkgs/development/tools/misc/texlab/default.nix index 879e37cfdb4..4f1334f4dde 100644 --- a/pkgs/development/tools/misc/texlab/default.nix +++ b/pkgs/development/tools/misc/texlab/default.nix @@ -15,16 +15,16 @@ let in rustPlatform.buildRustPackage rec { pname = "texlab"; - version = "5.7.0"; + version = "5.8.0"; src = fetchFromGitHub { owner = "latex-lsp"; repo = "texlab"; rev = "refs/tags/v${version}"; - hash = "sha256-GvORAPbQOdVpz4yY66b3OObewU98V26cZ6nrJ35nlkg="; + hash = "sha256-KjCE7ei01ks4TMYiHE9In2Z3AWOw/4D4kIl0vFA4YKs="; }; - cargoHash = "sha256-b7v3ODOjY5BQCzVqlLCNUOaZS95AvIvyjOeas2XfRjM="; + cargoHash = "sha256-1R9bNyNHDcRwn5nlkEFtSGA4V7Bn1Pq3v0E8njGUAYU="; outputs = [ "out" ] ++ lib.optional (!isCross) "man"; diff --git a/pkgs/development/tools/mysql-shell/default.nix b/pkgs/development/tools/mysql-shell/default.nix index 208c9571480..837d560f4dc 100644 --- a/pkgs/development/tools/mysql-shell/default.nix +++ b/pkgs/development/tools/mysql-shell/default.nix @@ -38,16 +38,16 @@ let in stdenv.mkDerivation rec { pname = "mysql-shell"; - version = "8.0.33"; + version = "8.0.34"; srcs = [ (fetchurl { url = "https://cdn.mysql.com//Downloads/MySQL-Shell/mysql-shell-${version}-src.tar.gz"; - hash = "sha256-ElcAOvyQjXNns35p4J+jnGu8orZR81Itz/fxYh7Usbs="; + hash = "sha256-QY1PmhGw3PhqZ79+H/Xbb9uOvmrBlFQRS7idnV5OXF0="; }) (fetchurl { url = "https://dev.mysql.com/get/Downloads/MySQL-${lib.versions.majorMinor version}/mysql-${version}.tar.gz"; - hash = "sha256-liAC9dkG9C9AsnejnS25OTEkjB8H/49DEsKI5jgD3RI="; + hash = "sha256-5l0Do8QmGLX7+ZBCrtMyCUAumyeqYsfIdD/9R4jY2x0="; }) ]; diff --git a/pkgs/development/tools/ruff/Cargo.lock b/pkgs/development/tools/ruff/Cargo.lock index 86899ddff47..622032c09a2 100644 --- a/pkgs/development/tools/ruff/Cargo.lock +++ b/pkgs/development/tools/ruff/Cargo.lock @@ -134,6 +134,21 @@ dependencies = [ ] [[package]] +name = "arrayvec" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" + +[[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 +185,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 +640,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 +673,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 +708,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 +793,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.282" dependencies = [ "anyhow", "clap", @@ -967,6 +1033,7 @@ dependencies = [ "number_prefix", "portable-atomic", "unicode-width", + "vt100", ] [[package]] @@ -1100,6 +1167,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 +1289,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 +1377,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 +1401,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 +1527,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 +1641,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 +1666,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 +1675,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 +1749,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 +1884,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 +1904,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 +2042,7 @@ dependencies = [ [[package]] name = "ruff" -version = "0.0.280" +version = "0.0.282" dependencies = [ "annotate-snippets 0.9.1", "anyhow", @@ -1909,14 +2063,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 +2079,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 +2119,7 @@ dependencies = [ "ruff", "ruff_python_ast", "ruff_python_formatter", - "rustpython-parser", + "ruff_python_parser", "serde", "serde_json", "tikv-jemallocator", @@ -1988,7 +2141,7 @@ dependencies = [ [[package]] name = "ruff_cli" -version = "0.0.280" +version = "0.0.282" dependencies = [ "annotate-snippets 0.9.1", "anyhow", @@ -2017,11 +2170,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", @@ -2046,7 +2201,6 @@ dependencies = [ "indoc", "itertools", "libcst", - "log", "once_cell", "pretty_assertions", "rayon", @@ -2055,11 +2209,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", @@ -2068,6 +2224,9 @@ dependencies = [ "strum_macros", "tempfile", "toml", + "tracing", + "tracing-indicatif", + "tracing-subscriber", ] [[package]] @@ -2110,7 +2269,7 @@ dependencies = [ "itertools", "proc-macro2", "quote", - "ruff_textwrap", + "ruff_python_trivia", "syn 2.0.23", ] @@ -2118,24 +2277,32 @@ 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", + "static_assertions", +] + +[[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]] @@ -2152,10 +2319,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 +2333,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 +2397,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 +2417,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 +2434,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 +2473,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 +2550,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 +2685,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 +2776,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 +2862,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" @@ -2943,6 +3126,18 @@ dependencies = [ ] [[package]] +name = "tracing-indicatif" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b38ed3722d27705c3bd7ca0ccf29acc3d8e1c717b4cd87f97891a2c1834ea1af" +dependencies = [ + "indicatif", + "tracing", + "tracing-core", + "tracing-subscriber", +] + +[[package]] name = "tracing-log" version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3069,6 +3264,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" @@ -3135,6 +3336,39 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] +name = "vt100" +version = "0.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84cd863bf0db7e392ba3bd04994be3473491b31e66340672af5d11943c6274de" +dependencies = [ + "itoa", + "log", + "unicode-width", + "vte", +] + +[[package]] +name = "vte" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f5022b5fbf9407086c180e9557be968742d839e68346af7792b8592489732197" +dependencies = [ + "arrayvec", + "utf8parse", + "vte_generate_state_changes", +] + +[[package]] +name = "vte_generate_state_changes" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d257817081c7dffcdbab24b9e62d2def62e2ff7d00b1c20062551e6cccc145ff" +dependencies = [ + "proc-macro2", + "quote", +] + +[[package]] name = "wait-timeout" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" diff --git a/pkgs/development/tools/ruff/default.nix b/pkgs/development/tools/ruff/default.nix index 7b1582a5521..96ef5f4d3c7 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.282"; src = fetchFromGitHub { owner = "astral-sh"; repo = pname; rev = "v${version}"; - hash = "sha256-Pp/yurRPUHqrCD3V93z5EGMYf4IyLFQOL9d2sNe3TKs="; + hash = "sha256-CQsgRTpZTBj07/9SYkrQXtb5FOguCtf5LCli65v20YA="; }; 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/development/tools/rust/cargo-all-features/default.nix b/pkgs/development/tools/rust/cargo-all-features/default.nix index a61d5588210..0a7aeb9accb 100644 --- a/pkgs/development/tools/rust/cargo-all-features/default.nix +++ b/pkgs/development/tools/rust/cargo-all-features/default.nix @@ -5,14 +5,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-all-features"; - version = "1.9.0"; + version = "1.10.0"; src = fetchCrate { inherit pname version; - hash = "sha256-OLnz1SmMLs/yats/lZugqNUlBQHSNR1bOuEmnHGdoN8="; + hash = "sha256-/w3Xd7PXUNtqzRYmUqJtth+GDuXSnsk1NiYCTYsHuAQ="; }; - cargoHash = "sha256-Gg5tF8IvbtIoqR0AKRS7IbcCNOCJO8oxwX0KkUr+l/M="; + cargoHash = "sha256-d69jj2FGptjndJG1tq3Fb/8F3kuFXN5otsYGhXYhhZg="; meta = with lib; { description = "A Cargo subcommand to build and test all feature flag combinations"; diff --git a/pkgs/development/tools/typos/default.nix b/pkgs/development/tools/typos/default.nix index 9ab8a36b742..79c8205c3bf 100644 --- a/pkgs/development/tools/typos/default.nix +++ b/pkgs/development/tools/typos/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "typos"; - version = "1.16.1"; + version = "1.16.2"; src = fetchFromGitHub { owner = "crate-ci"; repo = pname; rev = "v${version}"; - hash = "sha256-Hs/fvsQCp3QrkqjYYE5oLYfhuJyvyMKXa/EGDmFL254="; + hash = "sha256-1s9wN72QnlvtcB8W26Mw4uC8c6/txUfv6QBpqcWzYZQ="; }; - cargoHash = "sha256-SgZK8U1j5dNhjueFriVL3Zb4YrnznaqOoEfDZjAKCmE="; + cargoHash = "sha256-0bzW34QuD0OJLXDzrVRPzVTyCZHWiQZh6MUP5Wix+Tg="; meta = with lib; { description = "Source code spell checker"; diff --git a/pkgs/development/web/edge-runtime/default.nix b/pkgs/development/web/edge-runtime/default.nix index 8791eb17108..b5115aca9fb 100644 --- a/pkgs/development/web/edge-runtime/default.nix +++ b/pkgs/development/web/edge-runtime/default.nix @@ -11,7 +11,7 @@ let pname = "edge-runtime"; - version = "1.7.2"; + version = "1.8.1"; in rustPlatform.buildRustPackage { inherit pname version; @@ -20,11 +20,11 @@ rustPlatform.buildRustPackage { owner = "supabase"; repo = pname; rev = "v${version}"; - hash = "sha256-kYV9AUXEytZoP2qUnryUE1jiKei9F8vCPZFF348SwZI="; + hash = "sha256-B8XsH2aOvd87nxUGpSpaNnpTIY0tKDWh7RkXoJcBjrs="; fetchSubmodules = true; }; - cargoHash = "sha256-z/ybs6bfIXi5syRGETmBBML/WEctbCUCkzRX62rUtAk="; + cargoHash = "sha256-I8BC13WUlBdT6OxTD2t0Aw5qYXpUyOa0MYUB8H2XNx8="; nativeBuildInputs = [ pkg-config rustPlatform.bindgenHook ]; diff --git a/pkgs/development/web/mailcatcher/Gemfile.lock b/pkgs/development/web/mailcatcher/Gemfile.lock index 69cc56a0029..b2268cfba6d 100644 --- a/pkgs/development/web/mailcatcher/Gemfile.lock +++ b/pkgs/development/web/mailcatcher/Gemfile.lock @@ -1,35 +1,143 @@ GEM remote: https://rubygems.org/ specs: - daemons (1.3.1) - eventmachine (1.0.9.1) - mail (2.7.1) + addressable (2.8.4) + public_suffix (>= 2.0.2, < 6.0) + capybara (3.39.2) + addressable + matrix + mini_mime (>= 0.1.3) + nokogiri (~> 1.8) + rack (>= 1.6.0) + rack-test (>= 0.6.3) + regexp_parser (>= 1.5, < 3.0) + xpath (~> 3.2) + capybara-screenshot (1.0.26) + capybara (>= 1.0, < 4) + launchy + chunky_png (1.4.0) + coffee-script (2.4.1) + coffee-script-source + execjs + coffee-script-source (1.12.2) + compass (1.0.3) + chunky_png (~> 1.2) + compass-core (~> 1.0.2) + compass-import-once (~> 1.0.5) + rb-fsevent (>= 0.9.3) + rb-inotify (>= 0.9) + sass (>= 3.3.13, < 3.5) + compass-core (1.0.3) + multi_json (~> 1.0) + sass (>= 3.3.0, < 3.5) + compass-import-once (1.0.5) + sass (>= 3.2, < 3.5) + concurrent-ruby (1.2.2) + daemons (1.4.1) + date (3.3.3) + diff-lcs (1.5.0) + eventmachine (1.2.7) + execjs (2.8.1) + faye-websocket (0.11.3) + eventmachine (>= 0.12.0) + websocket-driver (>= 0.5.1) + ffi (1.15.5) + launchy (2.5.2) + addressable (~> 2.8) + mail (2.8.1) mini_mime (>= 0.1.1) - mailcatcher (0.7.1) - eventmachine (= 1.0.9.1) + net-imap + net-pop + net-smtp + mailcatcher (0.9.0) + eventmachine (= 1.2.7) + faye-websocket (~> 0.11.1) mail (~> 2.3) + net-smtp rack (~> 1.5) sinatra (~> 1.2) - skinny (~> 0.2.3) sqlite3 (~> 1.3) - thin (~> 1.5.0) - mini_mime (1.0.1) - rack (1.6.11) + thin (~> 1.8) + matrix (0.4.2) + mini_mime (1.1.2) + mini_portile2 (2.8.4) + multi_json (1.15.0) + net-imap (0.3.7) + date + net-protocol + net-pop (0.1.2) + net-protocol + net-protocol (0.2.1) + timeout + net-smtp (0.3.3) + net-protocol + nokogiri (1.15.3) + mini_portile2 (~> 2.8.2) + racc (~> 1.4) + psych (5.1.0) + stringio + public_suffix (5.0.3) + racc (1.7.1) + rack (1.6.13) rack-protection (1.5.5) rack + rack-test (2.1.0) + rack (>= 1.3) + rake (13.0.6) + rb-fsevent (0.11.2) + rb-inotify (0.10.1) + ffi (~> 1.0) + rdoc (6.5.0) + psych (>= 4.0.0) + regexp_parser (2.8.1) + rexml (3.2.6) + rspec (3.12.0) + rspec-core (~> 3.12.0) + rspec-expectations (~> 3.12.0) + rspec-mocks (~> 3.12.0) + rspec-core (3.12.2) + rspec-support (~> 3.12.0) + rspec-expectations (3.12.3) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.12.0) + rspec-mocks (3.12.6) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.12.0) + rspec-support (3.12.1) + rubyzip (2.3.2) + sass (3.4.25) + selenium-webdriver (4.9.0) + rexml (~> 3.2, >= 3.2.5) + rubyzip (>= 1.2.2, < 3.0) + websocket (~> 1.0) sinatra (1.4.8) rack (~> 1.5) rack-protection (~> 1.4) tilt (>= 1.3, < 3) - skinny (0.2.4) - eventmachine (~> 1.0.0) - thin (>= 1.5, < 1.7) - sqlite3 (1.4.0) - thin (1.5.1) - daemons (>= 1.0.9) - eventmachine (>= 0.12.6) - rack (>= 1.0.0) - tilt (2.0.9) + sprockets (3.7.2) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) + sprockets-helpers (1.4.0) + sprockets (>= 2.2) + sprockets-sass (2.0.0.beta2) + sprockets (>= 2.0, < 4.0) + sqlite3 (1.6.3) + mini_portile2 (~> 2.8.0) + stringio (3.0.7) + thin (1.8.2) + daemons (~> 1.0, >= 1.0.9) + eventmachine (~> 1.0, >= 1.0.4) + rack (>= 1, < 3) + tilt (2.2.0) + timeout (0.4.0) + uglifier (4.2.0) + execjs (>= 0.3.0, < 3) + websocket (1.2.9) + websocket-driver (0.7.6) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.5) + xpath (3.2.0) + nokogiri (~> 1.8) PLATFORMS ruby diff --git a/pkgs/development/web/mailcatcher/default.nix b/pkgs/development/web/mailcatcher/default.nix index 8be3c7ebb93..df6ed0a5233 100644 --- a/pkgs/development/web/mailcatcher/default.nix +++ b/pkgs/development/web/mailcatcher/default.nix @@ -1,9 +1,10 @@ -{ lib, bundlerApp, bundlerUpdateScript }: +{ pkgs, lib, bundlerApp, bundlerUpdateScript }: bundlerApp { pname = "mailcatcher"; gemdir = ./.; exes = [ "mailcatcher" "catchmail" ]; + ruby = pkgs.ruby_3_0; passthru.updateScript = bundlerUpdateScript "mailcatcher"; diff --git a/pkgs/development/web/mailcatcher/gemset.nix b/pkgs/development/web/mailcatcher/gemset.nix index 96d07e2dfce..65595451c5c 100644 --- a/pkgs/development/web/mailcatcher/gemset.nix +++ b/pkgs/development/web/mailcatcher/gemset.nix @@ -1,65 +1,350 @@ { + addressable = { + dependencies = ["public_suffix"]; + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "15s8van7r2ad3dq6i03l3z4hqnvxcq75a3h72kxvf9an53sqma20"; + type = "gem"; + }; + version = "2.8.4"; + }; + capybara = { + dependencies = ["addressable" "matrix" "mini_mime" "nokogiri" "rack" "rack-test" "regexp_parser" "xpath"]; + groups = ["development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "114qm5f5vhwaaw9rj1h2lcamh46zl13v1m18jiw68zl961gwmw6n"; + type = "gem"; + }; + version = "3.39.2"; + }; + capybara-screenshot = { + dependencies = ["capybara" "launchy"]; + groups = ["development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0xqc7hdiw1ql42mklpfvqd2pyfsxmy55cpx0h9y0jlkpl1q96sw1"; + type = "gem"; + }; + version = "1.0.26"; + }; + chunky_png = { + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1znw5x86hmm9vfhidwdsijz8m38pqgmv98l9ryilvky0aldv7mc9"; + type = "gem"; + }; + version = "1.4.0"; + }; + coffee-script = { + dependencies = ["coffee-script-source" "execjs"]; + groups = ["development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0rc7scyk7mnpfxqv5yy4y5q1hx3i7q3ahplcp4bq2g5r24g2izl2"; + type = "gem"; + }; + version = "2.4.1"; + }; + coffee-script-source = { + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1907v9q1zcqmmyqzhzych5l7qifgls2rlbnbhy5vzyr7i7yicaz1"; + type = "gem"; + }; + version = "1.12.2"; + }; + compass = { + dependencies = ["chunky_png" "compass-core" "compass-import-once" "rb-fsevent" "rb-inotify" "sass"]; + groups = ["development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0lfi83w8z75czr0pf0rmj9hda22082h3cmvczl8r1ma9agf88y2c"; + type = "gem"; + }; + version = "1.0.3"; + }; + compass-core = { + dependencies = ["multi_json" "sass"]; + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0yaspqwdmzwdcqviclbs3blq7an16pysrfzylz8q1gxmmd6bpj3a"; + type = "gem"; + }; + version = "1.0.3"; + }; + compass-import-once = { + dependencies = ["sass"]; + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0bn7gwbfz7jvvdd0qdfqlx67fcb83gyvxqc7dr9fhcnks3z8z5rq"; + type = "gem"; + }; + version = "1.0.5"; + }; + concurrent-ruby = { + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0krcwb6mn0iklajwngwsg850nk8k9b35dhmc2qkbdqvmifdi2y9q"; + type = "gem"; + }; + version = "1.2.2"; + }; daemons = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0l5gai3vd4g7aqff0k1mp41j9zcsvm2rbwmqn115a325k9r7pf4w"; + sha256 = "07cszb0zl8mqmwhc8a2yfg36vi6lbgrp4pa5bvmryrpcz9v6viwg"; + type = "gem"; + }; + version = "1.4.1"; + }; + date = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "03skfikihpx37rc27vr3hwrb057gxnmdzxhmzd4bf4jpkl0r55w1"; + type = "gem"; + }; + version = "3.3.3"; + }; + diff-lcs = { + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0rwvjahnp7cpmracd8x732rjgnilqv2sx7d1gfrysslc3h039fa9"; type = "gem"; }; - version = "1.3.1"; + version = "1.5.0"; }; eventmachine = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "17jr1caa3ggg696dd02g2zqzdjqj9x9q2nl7va82l36f7c5v6k4z"; + sha256 = "0wh9aqb0skz80fhfn66lbpr4f86ya2z5rx6gm5xlfhd05bj1ch4r"; + type = "gem"; + }; + version = "1.2.7"; + }; + execjs = { + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "121h6af4i6wr3wxvv84y53jcyw2sk71j5wsncm6wq6yqrwcrk4vd"; + type = "gem"; + }; + version = "2.8.1"; + }; + faye-websocket = { + dependencies = ["eventmachine" "websocket-driver"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "01xkpv5b4fjc5n6n1fq6z1ris991av2fbadvs8r71i9r34b8g48h"; + type = "gem"; + }; + version = "0.11.3"; + }; + ffi = { + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1862ydmclzy1a0cjbvm8dz7847d9rch495ib0zb64y84d3xd4bkg"; + type = "gem"; + }; + version = "1.15.5"; + }; + launchy = { + dependencies = ["addressable"]; + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "06r43899384das2bkbrpsdxsafyyqa94il7111053idfalb4984a"; type = "gem"; }; - version = "1.0.9.1"; + version = "2.5.2"; }; mail = { - dependencies = ["mini_mime"]; + dependencies = ["mini_mime" "net-imap" "net-pop" "net-smtp"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00wwz6ys0502dpk8xprwcqfwyf3hmnx6lgxaiq6vj43mkx43sapc"; + sha256 = "1bf9pysw1jfgynv692hhaycfxa8ckay1gjw5hz3madrbrynryfzc"; type = "gem"; }; - version = "2.7.1"; + version = "2.8.1"; }; mailcatcher = { - dependencies = ["eventmachine" "mail" "rack" "sinatra" "skinny" "sqlite3" "thin"]; + dependencies = ["eventmachine" "faye-websocket" "mail" "net-smtp" "rack" "sinatra" "sqlite3" "thin"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02w1ycyfv7x0sh9799lz7xa65p5qvl5z4pa8a7prb68h2zwkfq0n"; + sha256 = "003d2a6i97syw67jxrjq0p4xm19p9cfqnbmsg4b1c3mdb5c78rfz"; + type = "gem"; + }; + version = "0.9.0"; + }; + matrix = { + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1h2cgkpzkh3dd0flnnwfq6f3nl2b1zff9lvqz8xs853ssv5kq23i"; type = "gem"; }; - version = "0.7.1"; + version = "0.4.2"; }; mini_mime = { + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0lbim375gw2dk6383qirz13hgdmxlan0vc5da2l072j3qw6fqjm5"; + type = "gem"; + }; + version = "1.1.2"; + }; + mini_portile2 = { + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "02mj8mpd6ck5gpcnsimx5brzggw5h5mmmpq2djdypfq16wcw82qq"; + type = "gem"; + }; + version = "2.8.4"; + }; + multi_json = { + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0pb1g1y3dsiahavspyzkdy39j4q377009f6ix0bh1ag4nqw43l0z"; + type = "gem"; + }; + version = "1.15.0"; + }; + net-imap = { + dependencies = ["date" "net-protocol"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1q4pshq387lzv9m39jv32vwb8wrq3wc4jwgl4jk209r4l33v09d3"; + sha256 = "0lf7wqg7czhaj51qsnmn28j7jmcxhkh3m28rl1cjrqsgjxhwj7r3"; type = "gem"; }; - version = "1.0.1"; + version = "0.3.7"; }; - rack = { + net-pop = { + dependencies = ["net-protocol"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1wyz41jd4zpjn0v1xsf9j778qx1vfrl24yc20cpmph8k42c4x2w4"; + type = "gem"; + }; + version = "0.1.2"; + }; + net-protocol = { + dependencies = ["timeout"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0dxckrlw4q1lcn3qg4mimmjazmg9bma5gllv72f8js3p36fb3b91"; + type = "gem"; + }; + version = "0.2.1"; + }; + net-smtp = { + dependencies = ["net-protocol"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1g9926ln2lw12lfxm4ylq1h6nl0rafl10za3xvjzc87qvnqic87f"; + sha256 = "1c6md06hm5bf6rv53sk54dl2vg038pg8kglwv3rayx0vk2mdql9x"; + type = "gem"; + }; + version = "0.3.3"; + }; + nokogiri = { + dependencies = ["mini_portile2" "racc"]; + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1jw8a20a9k05fpz3q24im19b97idss3179z76yn5scc5b8lk2rl7"; + type = "gem"; + }; + version = "1.15.3"; + }; + psych = { + dependencies = ["stringio"]; + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1msambb54r3d1sg6smyj4k2pj9h9lz8jq4jamip7ivcyv32a85vz"; + type = "gem"; + }; + version = "5.1.0"; + }; + public_suffix = { + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0n9j7mczl15r3kwqrah09cxj8hxdfawiqxa60kga2bmxl9flfz9k"; + type = "gem"; + }; + version = "5.0.3"; + }; + racc = { + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "11v3l46mwnlzlc371wr3x6yylpgafgwdf0q7hc7c1lzx6r414r5g"; + type = "gem"; + }; + version = "1.7.1"; + }; + rack = { + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0wr1f3g9rc9i8svfxa9cijajl1661d817s56b2w7rd572zwn0zi0"; type = "gem"; }; - version = "1.6.11"; + version = "1.6.13"; }; rack-protection = { dependencies = ["rack"]; @@ -72,6 +357,164 @@ }; version = "1.5.5"; }; + rack-test = { + dependencies = ["rack"]; + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1ysx29gk9k14a14zsp5a8czys140wacvp91fja8xcja0j1hzqq8c"; + type = "gem"; + }; + version = "2.1.0"; + }; + rake = { + groups = ["development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "15whn7p9nrkxangbs9hh75q585yfn66lv0v2mhj6q6dl6x8bzr2w"; + type = "gem"; + }; + version = "13.0.6"; + }; + rb-fsevent = { + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1zmf31rnpm8553lqwibvv3kkx0v7majm1f341xbxc0bk5sbhp423"; + type = "gem"; + }; + version = "0.11.2"; + }; + rb-inotify = { + dependencies = ["ffi"]; + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1jm76h8f8hji38z3ggf4bzi8vps6p7sagxn3ab57qc0xyga64005"; + type = "gem"; + }; + version = "0.10.1"; + }; + rdoc = { + dependencies = ["psych"]; + groups = ["development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "05r2cxscapr9saqjw8dlp89as7jvc2mlz1h5kssrmkbz105qmfcm"; + type = "gem"; + }; + version = "6.5.0"; + }; + regexp_parser = { + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "136br91alxdwh1s85z912dwz23qlhm212vy6i3wkinz3z8mkxxl3"; + type = "gem"; + }; + version = "2.8.1"; + }; + rexml = { + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "05i8518ay14kjbma550mv0jm8a6di8yp5phzrd8rj44z9qnrlrp0"; + type = "gem"; + }; + version = "3.2.6"; + }; + rspec = { + dependencies = ["rspec-core" "rspec-expectations" "rspec-mocks"]; + groups = ["development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "171rc90vcgjl8p1bdrqa92ymrj8a87qf6w20x05xq29mljcigi6c"; + type = "gem"; + }; + version = "3.12.0"; + }; + rspec-core = { + dependencies = ["rspec-support"]; + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0l95bnjxdabrn79hwdhn2q1n7mn26pj7y1w5660v5qi81x458nqm"; + type = "gem"; + }; + version = "3.12.2"; + }; + rspec-expectations = { + dependencies = ["diff-lcs" "rspec-support"]; + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "05j44jfqlv7j2rpxb5vqzf9hfv7w8ba46wwgxwcwd8p0wzi1hg89"; + type = "gem"; + }; + version = "3.12.3"; + }; + rspec-mocks = { + dependencies = ["diff-lcs" "rspec-support"]; + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1gq7gviwpck7fhp4y5ibljljvxgjklza18j62qf6zkm2icaa8lfy"; + type = "gem"; + }; + version = "3.12.6"; + }; + rspec-support = { + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1ky86j3ksi26ng9ybd7j0qsdf1lpr8mzrmn98yy9gzv801fvhsgr"; + type = "gem"; + }; + version = "3.12.1"; + }; + rubyzip = { + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0grps9197qyxakbpw02pda59v45lfgbgiyw48i0mq9f2bn9y6mrz"; + type = "gem"; + }; + version = "2.3.2"; + }; + sass = { + groups = ["development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0kfpcwh8dgw4lc81qglkvjl73689jy3g7196zkxm4fpskg1p5lkw"; + type = "gem"; + }; + version = "3.4.25"; + }; + selenium-webdriver = { + dependencies = ["rexml" "rubyzip" "websocket"]; + groups = ["development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1kxnv3ywssagv2q453hasrrrvsv68d5f3ccm33pyacdji88w8pqg"; + type = "gem"; + }; + version = "4.9.0"; + }; sinatra = { dependencies = ["rack" "rack-protection" "tilt"]; groups = ["default"]; @@ -83,26 +526,59 @@ }; version = "1.4.8"; }; - skinny = { - dependencies = ["eventmachine" "thin"]; - groups = ["default"]; + sprockets = { + dependencies = ["concurrent-ruby" "rack"]; + groups = ["development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "182jw5a0fbqah5w9jancvfmjbk88h8bxdbwnl4d3q809rpxdg8ay"; + type = "gem"; + }; + version = "3.7.2"; + }; + sprockets-helpers = { + dependencies = ["sprockets"]; + groups = ["development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0513ma356g05lsskhsb363263177h6ccmp475il0p69y18his2ij"; + type = "gem"; + }; + version = "1.4.0"; + }; + sprockets-sass = { + dependencies = ["sprockets"]; + groups = ["development"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1y3yvx88ylgz4d2s1wskjk5rkmrcr15q3ibzp1q88qwzr5y493a9"; + sha256 = "02g153dhzmrlik5dd9kyq0rvr2xjm3fwx8rm7apqfrykc47aizqr"; type = "gem"; }; - version = "0.2.4"; + version = "2.0.0.beta2"; }; sqlite3 = { + dependencies = ["mini_portile2"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0pmgpqx2sg8pms54rk7kjjy8jwsw21g1f7mb02fggbdcqy8jk3fx"; + sha256 = "0h95kr5529qv786mfk8r2jjdsdi6v7v3k3dpz69mrcc9i0vpdd37"; type = "gem"; }; - version = "1.4.0"; + version = "1.6.3"; + }; + stringio = { + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0557v4z7996cgqw7i9197848mymv02krads93dn9lyqa5d7xd0dn"; + type = "gem"; + }; + version = "3.0.7"; }; thin = { dependencies = ["daemons" "eventmachine" "rack"]; @@ -110,19 +586,82 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0hrq9m3hb6pm8yrqshhg0gafkphdpvwcqmr7k722kgdisp3w91ga"; + sha256 = "08g1yq6zzvgndj8fd98ah7pp8g2diw28p8bfjgv7rvjvp8d2am8w"; type = "gem"; }; - version = "1.5.1"; + version = "1.8.2"; }; tilt = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ca4k0clwf0rkvy7726x4nxpjxkpv67w043i39saxgldxd97zmwz"; + sha256 = "0bmjgbv8158klwp2r3klxjwaj93nh1sbl4xvj9wsha0ic478avz7"; + type = "gem"; + }; + version = "2.2.0"; + }; + timeout = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1d9cvm0f4zdpwa795v3zv4973y5zk59j7s1x3yn90jjrhcz1yvfd"; + type = "gem"; + }; + version = "0.4.0"; + }; + uglifier = { + dependencies = ["execjs"]; + groups = ["development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0wgh7bzy68vhv9v68061519dd8samcy8sazzz0w3k8kqpy3g4s5f"; + type = "gem"; + }; + version = "4.2.0"; + }; + websocket = { + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0dib6p55sl606qb4vpwrvj5wh881kk4aqn2zpfapf8ckx7g14jw8"; + type = "gem"; + }; + version = "1.2.9"; + }; + websocket-driver = { + dependencies = ["websocket-extensions"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1nyh873w4lvahcl8kzbjfca26656d5c6z3md4sbqg5y1gfz0157n"; + type = "gem"; + }; + version = "0.7.6"; + }; + websocket-extensions = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0hc2g9qps8lmhibl5baa91b4qx8wqw872rgwagml78ydj8qacsqw"; + type = "gem"; + }; + version = "0.1.5"; + }; + xpath = { + dependencies = ["nokogiri"]; + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0bh8lk9hvlpn7vmi6h4hkcwjzvs2y0cmkk3yjjdr8fxvj6fsgzbd"; type = "gem"; }; - version = "2.0.9"; + version = "3.2.0"; }; } diff --git a/pkgs/servers/code-server/default.nix b/pkgs/servers/code-server/default.nix index 54aca01c1a4..990ab50f28b 100644 --- a/pkgs/servers/code-server/default.nix +++ b/pkgs/servers/code-server/default.nix @@ -70,19 +70,19 @@ let # # To compute the commit when upgrading this derivation, do: # `$ git rev-parse <git-rev>` where <git-rev> is the git revision of the `src` - # Example: `$ git rev-parse v4.14.1` - commit = "e37b35278d4b529fd774469c3e1807ec8f4d1eb0"; + # Example: `$ git rev-parse v4.16.1` + commit = "94ef3776ad7bebfb5780dfc9632e04d20d5c9a6c"; in stdenv.mkDerivation (finalAttrs: { pname = "code-server"; - version = "4.16.0"; + version = "4.16.1"; src = fetchFromGitHub { owner = "coder"; repo = "code-server"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-oGtYrCW9ZweWEkx7uQkQCQx53QoyV5Y3BMsvApGiY9Y="; + hash = "sha256-h4AooHHKV/EfN2S1z7CQKqnYW3uA3sKhSW4senlzjxI="; }; yarnCache = stdenv.mkDerivation { diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index 02679e43e72..56650531a65 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -12,20 +12,20 @@ in with python3.pkgs; buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.88.0"; + version = "1.89.0"; format = "pyproject"; src = fetchFromGitHub { owner = "matrix-org"; repo = "synapse"; rev = "v${version}"; - hash = "sha256-uNk+vyOCbaoy8Jw8W5KyedIw6bJ0ci8NkFTMlBVcxEw="; + hash = "sha256-ywDXjwYYCR0ojemRnShDmeoeUlDkpFH/ajFxV2DrR70="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-ILLZUQjUbLvmNsDpCSqKAYO/PRHTJ/XTDJTo/LCT/mg="; + hash = "sha256-Atwa7yIA9kPsle0/DKQD30PJljVNArqWgau4Ueqzo94="; }; postPatch = '' 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/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index e5305dbe736..2433f92b1cf 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "grafana"; - version = "10.0.2"; + version = "10.0.3"; excludedPackages = [ "alert_webhook_listener" "clean-swagger" "release_publisher" "slow_proxy" "slow_proxy_mac" "macaron" "devenv" ]; @@ -10,15 +10,15 @@ buildGoModule rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - hash = "sha256-Db2j6D2Ds75qDUawOSe5jhtePrbxGq7nWnFooWa2vTI="; + hash = "sha256-2LHCG2x4SJzUgBfYZFQCTlrUGule9j+1x3R1vDmBlAs="; }; srcStatic = fetchurl { url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz"; - hash = "sha256-Mkn9KhyJmOKCuO3gDL+mgKijvResB/4mRAff6grOpuo="; + hash = "sha256-2ut+7hMnttQHzarxojTsnY4q5abQheD9PYxgYhTrYDI="; }; - vendorHash = "sha256-hN4hHJhjlCdQUvxYKHItez9H7/WqCK5Nlog5INO4m/g="; + vendorHash = "sha256-VMy7RGp5F5cc1nBpt5Fm1LbY6IK1/JHLEEGIoYzUvdw="; nativeBuildInputs = [ wire ]; diff --git a/pkgs/servers/monitoring/prometheus/default.nix b/pkgs/servers/monitoring/prometheus/default.nix index 5a3d3657055..e5bb3678a16 100644 --- a/pkgs/servers/monitoring/prometheus/default.nix +++ b/pkgs/servers/monitoring/prometheus/default.nix @@ -31,10 +31,10 @@ }: let - version = "2.45.0"; + version = "2.46.0"; webUiStatic = fetchurl { url = "https://github.com/prometheus/prometheus/releases/download/v${version}/prometheus-web-ui-${version}.tar.gz"; - hash = "sha256-xfIxq1cFkLjSxjPPdCjgv+FOvbUGdeZpRecbSIFUAXo="; + hash = "sha256-H6RRyemawt9NRLTVG0iH4vNFNiuvdPZz7u43Zop0vVI="; }; in buildGoModule rec { @@ -47,10 +47,10 @@ buildGoModule rec { owner = "prometheus"; repo = "prometheus"; rev = "v${version}"; - hash = "sha256-smc51YrWW8jPzmIkOi0kKaAGUS3TUXpzGDLyslhRVUE="; + hash = "sha256-TB4N5aAfNw34HJ1HSt6rHTETTyAgpGA8B5VOFHisZFU="; }; - vendorHash = "sha256-W958ODhmRL4GAM6hZd71BgEmrwrzR2XHoDrc+rBo4TI="; + vendorHash = "sha256-jeGtna7IeKAOiu4FFA2xRv+fwpzCpnqwI5nj641dlM4="; excludedPackages = [ "documentation/prometheus-mixin" ]; diff --git a/pkgs/servers/sql/postgresql/ext/plv8/default.nix b/pkgs/servers/sql/postgresql/ext/plv8/default.nix index e4492c4e518..2c4989711cc 100644 --- a/pkgs/servers/sql/postgresql/ext/plv8/default.nix +++ b/pkgs/servers/sql/postgresql/ext/plv8/default.nix @@ -136,7 +136,7 @@ stdenv.mkDerivation (finalAttrs: { description = "V8 Engine Javascript Procedural Language add-on for PostgreSQL"; homepage = "https://plv8.github.io/"; maintainers = with maintainers; [ marsam ]; - platforms = [ "x86_64-linux" ]; + platforms = [ "x86_64-linux" "aarch64-linux" ]; license = licenses.postgresql; broken = postgresql.jitSupport; }; diff --git a/pkgs/shells/nix-your-shell/default.nix b/pkgs/shells/nix-your-shell/default.nix index 345f917ddcd..87a3c063129 100644 --- a/pkgs/shells/nix-your-shell/default.nix +++ b/pkgs/shells/nix-your-shell/default.nix @@ -5,16 +5,16 @@ }: rustPlatform.buildRustPackage rec { pname = "nix-your-shell"; - version = "1.1.1"; + version = "1.3.0"; src = fetchFromGitHub { owner = "MercuryTechnologies"; repo = pname; rev = "v${version}"; - sha256 = "sha256-g5TC+4DGbTAlG39R8QIM5cB3/mtkp/vz8puB0Kr6aag="; + sha256 = "sha256-5zHjz0NOKcZCuR6QaLrwOXih3Xoqf2uBrJnxTX/TQok="; }; - cargoSha256 = "sha256-AiWKSWwMh6KWCTTRRCBxekv2rukz+ijnRit11K/AnhU="; + cargoSha256 = "sha256-4Z/z4VgnJQd8Uc0tMDnx7sChzXtG5ZDL88jTlhPSonM="; meta = with lib; { description = "A `nix` and `nix-shell` wrapper for shells other than `bash`"; diff --git a/pkgs/tools/admin/copilot-cli/default.nix b/pkgs/tools/admin/copilot-cli/default.nix index b27aa9f5933..bb588a82262 100644 --- a/pkgs/tools/admin/copilot-cli/default.nix +++ b/pkgs/tools/admin/copilot-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "copilot-cli"; - version = "1.28.0"; + version = "1.29.0"; src = fetchFromGitHub { owner = "aws"; repo = pname; rev = "v${version}"; - sha256 = "sha256-KrgPHdYR0kYwyNhO2EwIO00Xnjy0MmrzHb5LDmbrgB0="; + sha256 = "sha256-sXYdP1HvwamKKvCNM5T2vu86y5mQ9MD44SrFgqWfQkE="; }; - vendorHash = "sha256-1YOx7tqPJwCZlJSAG9o+STKRAIR72dptvTOpa9rRt3A="; + vendorHash = "sha256-TbgxXkLIEu7jSnngVRbp4E22GgOkXSB0b8JzHI/pNGk="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/admin/qovery-cli/default.nix b/pkgs/tools/admin/qovery-cli/default.nix index 5b385caae14..9d072d728fe 100644 --- a/pkgs/tools/admin/qovery-cli/default.nix +++ b/pkgs/tools/admin/qovery-cli/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "qovery-cli"; - version = "0.61.0"; + version = "0.63.0"; src = fetchFromGitHub { owner = "Qovery"; repo = pname; - rev = "v${version}"; - hash = "sha256-V3tKUIpSO1oGpkHjkFWAtBoe91va6q2HInZsHrjWhQ0="; + rev = "refs/tagsv${version}"; + hash = "sha256-2w8z6/piPXJ4tGdO1IrzjLcCDGF/C8/Mln+XWu4U2+0="; }; - vendorHash = "sha256-5ikOmjJ2E+Kk8FAl6/Jm+k5HKlZJ1Ik3uZ/2sD5Eqok="; + vendorHash = "sha256-UicCXaKA2xmkcYCz4RNN4kG2Rj0OIrN+IL3UJF97oIo="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/backup/restic/0001-Skip-testing-restore-with-permission-failure.patch b/pkgs/tools/backup/restic/0001-Skip-testing-restore-with-permission-failure.patch index 148b9a1a957..10664b57254 100644 --- a/pkgs/tools/backup/restic/0001-Skip-testing-restore-with-permission-failure.patch +++ b/pkgs/tools/backup/restic/0001-Skip-testing-restore-with-permission-failure.patch @@ -1,18 +1,18 @@ -From 8e6186be04e2819b6e3586e5d1aeb8a824e1979f Mon Sep 17 00:00:00 2001 +From 72f7d8abee34107b815e49540f2fad7f1ab0b2cc Mon Sep 17 00:00:00 2001 From: Simon Bruder <simon@sbruder.de> Date: Thu, 25 Feb 2021 09:20:51 +0100 Subject: [PATCH] Skip testing restore with permission failure The test fails in sandboxed builds. --- - cmd/restic/integration_test.go | 1 + + cmd/restic/cmd_restore_integration_test.go | 1 + 1 file changed, 1 insertion(+) -diff --git a/cmd/restic/integration_test.go b/cmd/restic/integration_test.go -index 7d198d33..1588ccb1 100644 ---- a/cmd/restic/integration_test.go -+++ b/cmd/restic/integration_test.go -@@ -1170,6 +1170,7 @@ func TestRestoreLatest(t *testing.T) { +diff --git a/cmd/restic/cmd_restore_integration_test.go b/cmd/restic/cmd_restore_integration_test.go +index 2c7cbe1fb..f25f13754 100644 +--- a/cmd/restic/cmd_restore_integration_test.go ++++ b/cmd/restic/cmd_restore_integration_test.go +@@ -200,6 +200,7 @@ func TestRestoreLatest(t *testing.T) { } func TestRestoreWithPermissionFailure(t *testing.T) { @@ -21,5 +21,5 @@ index 7d198d33..1588ccb1 100644 defer cleanup() -- -2.29.2 +2.41.0 diff --git a/pkgs/tools/backup/restic/default.nix b/pkgs/tools/backup/restic/default.nix index 28379107ada..9a7e4d676a1 100644 --- a/pkgs/tools/backup/restic/default.nix +++ b/pkgs/tools/backup/restic/default.nix @@ -3,13 +3,13 @@ buildGoModule rec { pname = "restic"; - version = "0.15.2"; + version = "0.16.0"; src = fetchFromGitHub { owner = "restic"; repo = "restic"; rev = "v${version}"; - hash = "sha256-YJBHk/B8+q5f0k5i5hpucsJK4T/cRu9Jv7+O6vlT64Q="; + hash = "sha256-kxxQlU3bKBjCb1aEtcLBmcnPg4KFgFlbFhs9MmbAgk8="; }; patches = [ @@ -17,7 +17,7 @@ buildGoModule rec { ./0001-Skip-testing-restore-with-permission-failure.patch ]; - vendorHash = "sha256-GWFaCfiE8Ph2uBTBI0E47pH+EJsMsMr1NDuaIGvyXRM="; + vendorHash = "sha256-m5smEyAt9RxgvUf1pZqIhgja2h8MWfEgjJ4jUgrPMPY="; subPackages = [ "cmd/restic" ]; @@ -26,7 +26,7 @@ buildGoModule rec { passthru.tests.restic = nixosTests.restic; postPatch = '' - rm cmd/restic/integration_fuse_test.go + rm cmd/restic/cmd_mount_integration_test.go ''; postInstall = '' diff --git a/pkgs/tools/games/dualsensectl/default.nix b/pkgs/tools/games/dualsensectl/default.nix index f08622aa3a7..cb17ba25d7f 100644 --- a/pkgs/tools/games/dualsensectl/default.nix +++ b/pkgs/tools/games/dualsensectl/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "dualsensectl"; - version = "0.3"; + version = "0.4"; src = fetchFromGitHub { owner = "nowrep"; repo = "dualsensectl"; rev = "v${version}"; - hash = "sha256-OZmZ+ENBBKzRZ9jLIn9Bz7oGYrSAjZ5XlOR9fpN0cZs="; + hash = "sha256-DrPVzbaLO2NgjNcEFyCs2W+dlbdpBeRX1ZfFenqz7IY="; }; postPatch = '' diff --git a/pkgs/tools/networking/dnsproxy/default.nix b/pkgs/tools/networking/dnsproxy/default.nix index 47746cd13d4..aaa2ed1459a 100644 --- a/pkgs/tools/networking/dnsproxy/default.nix +++ b/pkgs/tools/networking/dnsproxy/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "dnsproxy"; - version = "0.51.0"; + version = "0.52.0"; src = fetchFromGitHub { owner = "AdguardTeam"; repo = pname; rev = "v${version}"; - sha256 = "sha256-82RBNMCcEe2gB1Ygbm1S6UgMPUQ+Lm37zc1JM3Ca/gg="; + sha256 = "sha256-vHiC7RWPba4LlS0YX088HqS3hLGEt0jHKzL7DcysEkw="; }; vendorHash = null; diff --git a/pkgs/tools/networking/haproxy/default.nix b/pkgs/tools/networking/haproxy/default.nix index 2b69064a141..b7c39d83d89 100644 --- a/pkgs/tools/networking/haproxy/default.nix +++ b/pkgs/tools/networking/haproxy/default.nix @@ -1,21 +1,28 @@ { useLua ? true , usePcre ? true , withPrometheusExporter ? true -, stdenv, lib, fetchurl, nixosTests -, openssl, zlib, libxcrypt -, lua5_3 ? null, pcre ? null, systemd ? null +, stdenv +, lib +, fetchurl +, nixosTests +, openssl +, zlib +, libxcrypt +, lua5_3 ? null +, pcre ? null +, systemd ? null }: assert useLua -> lua5_3 != null; assert usePcre -> pcre != null; -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "haproxy"; version = "2.8.1"; src = fetchurl { - url = "https://www.haproxy.org/download/${lib.versions.majorMinor version}/src/${pname}-${version}.tar.gz"; - sha256 = "sha256-SFVS/NnV1fQarQRvEx/Ap+hJvvJaNJoEB1CvDG/FaAc="; + url = "https://www.haproxy.org/download/${lib.versions.majorMinor finalAttrs.version}/src/haproxy-${finalAttrs.version}.tar.gz"; + hash = "sha256-SFVS/NnV1fQarQRvEx/Ap+hJvvJaNJoEB1CvDG/FaAc="; }; buildInputs = [ openssl zlib libxcrypt ] @@ -26,10 +33,10 @@ stdenv.mkDerivation rec { # TODO: make it work on bsd as well makeFlags = [ "PREFIX=${placeholder "out"}" - ("TARGET=" + (if stdenv.isSunOS then "solaris" - else if stdenv.isLinux then "linux-glibc" - else if stdenv.isDarwin then "osx" - else "generic")) + ("TARGET=" + (if stdenv.isSunOS then "solaris" + else if stdenv.isLinux then "linux-glibc" + else if stdenv.isDarwin then "osx" + else "generic")) ]; buildFlags = [ @@ -54,8 +61,11 @@ stdenv.mkDerivation rec { passthru.tests.haproxy = nixosTests.haproxy; - meta = with lib; { + meta = { + changelog = "https://www.haproxy.org/download/${lib.versions.majorMinor finalAttrs.version}/src/CHANGELOG"; description = "Reliable, high performance TCP/HTTP load balancer"; + homepage = "https://haproxy.org"; + license = with lib.licenses; [ gpl2Plus lgpl21Only ]; longDescription = '' HAProxy is a free, very fast and reliable solution offering high availability, load balancing, and proxying for TCP and HTTP-based @@ -64,10 +74,7 @@ stdenv.mkDerivation rec { tens of thousands of connections is clearly realistic with todays hardware. ''; - homepage = "https://haproxy.org"; - changelog = "https://www.haproxy.org/download/${lib.versions.majorMinor version}/src/CHANGELOG"; - license = with licenses; [ gpl2Plus lgpl21Only ]; - maintainers = with maintainers; [ ]; - platforms = with platforms; linux ++ darwin; + maintainers = with lib.maintainers; [ ]; + platforms = with lib.platforms; linux ++ darwin; }; -} +}) diff --git a/pkgs/tools/networking/proxify/default.nix b/pkgs/tools/networking/proxify/default.nix index 27cc53522b7..331d00cc2c5 100644 --- a/pkgs/tools/networking/proxify/default.nix +++ b/pkgs/tools/networking/proxify/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "proxify"; - version = "0.0.10"; + version = "0.0.11"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "proxify"; rev = "refs/tags/v${version}"; - hash = "sha256-bEAPj72HDiJHTN1WF50ow1OUwwsPhFwAkCvvEqgsVcA="; + hash = "sha256-aoge1K1T4jgh8TFN8nFIjFehmz/o1UefbzEbV85dHTk="; }; - vendorHash = "sha256-ViUMPHj1udvyy19XToq3f7Bj708v6DuBg5k0tMtZmHA="; + vendorHash = "sha256-ingumSn4EDdw1Vgwm/ghQTsErqFVFZtjNfwfDwdJ/2s="; meta = with lib; { description = "Proxy tool for HTTP/HTTPS traffic capture"; diff --git a/pkgs/tools/networking/sing-box/default.nix b/pkgs/tools/networking/sing-box/default.nix index d8f3858d59b..e2f126a0baa 100644 --- a/pkgs/tools/networking/sing-box/default.nix +++ b/pkgs/tools/networking/sing-box/default.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "sing-box"; - version = "1.3.4"; + version = "1.3.5"; src = fetchFromGitHub { owner = "SagerNet"; repo = pname; rev = "v${version}"; - hash = "sha256-0/3y9aIhKzWIvt8iWcrJwQreBkSLcoPQ55gyTp48ysg="; + hash = "sha256-fSQuVvV2dL+cdPIAqyXbDB8OSW77gxaYaOHKElEbq6o="; }; - vendorHash = "sha256-G6//YPNWhgTJf6nv+9KRExCclotsmk7TzzuxXmdiVVU="; + vendorHash = "sha256-AMtDAAKNbKRFcu9OEW9E+S73gGgXK7HaroEdidrXS4Y="; tags = [ "with_quic" diff --git a/pkgs/tools/security/dnsrecon/default.nix b/pkgs/tools/security/dnsrecon/default.nix index a63205d9ba0..65fae4928c6 100644 --- a/pkgs/tools/security/dnsrecon/default.nix +++ b/pkgs/tools/security/dnsrecon/default.nix @@ -5,16 +5,22 @@ python3.pkgs.buildPythonApplication rec { pname = "dnsrecon"; - version = "1.1.4"; + version = "1.1.5"; format = "setuptools"; src = fetchFromGitHub { owner = "darkoperator"; repo = pname; rev = version; - hash = "sha256-DtyYYNtv0Zk8103NN+vlnr3Etv0bAZ6+A2CXeZZgiUg="; + hash = "sha256-W7ZFc+kF00ANoYVTlsY+lJ9FjMEGbqYfNojoZFiRHU8="; }; + postPatch = '' + substituteInPlace requirements.txt \ + --replace "flake8" "" \ + --replace "pytest" "" + ''; + propagatedBuildInputs = with python3.pkgs; [ dnspython netaddr diff --git a/pkgs/tools/security/gopass/default.nix b/pkgs/tools/security/gopass/default.nix index 440ed7fc882..87ea59122bb 100644 --- a/pkgs/tools/security/gopass/default.nix +++ b/pkgs/tools/security/gopass/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { pname = "gopass"; - version = "1.15.5"; + version = "1.15.6"; nativeBuildInputs = [ installShellFiles makeWrapper ]; @@ -21,10 +21,10 @@ buildGoModule rec { owner = "gopasspw"; repo = "gopass"; rev = "v${version}"; - hash = "sha256-0vMzCqH/p0GXtjoSrnSqMsIul9D00fICYb29KY6/Hno="; + hash = "sha256-qhnkU2LuwUWP3Fi/XekFJp3WujeRxF/UHVBiVTfbxJ4="; }; - vendorHash = "sha256-IgfzzwJANUfDToFLHv3BjDfm93KNm5zxQ5GMq7TQP+Q="; + vendorHash = "sha256-FZFN+xy23osgFs7Cm3S+LwKaE9Y94qcDVgv+CxA8J68="; subPackages = [ "." ]; diff --git a/pkgs/tools/security/metasploit/Gemfile b/pkgs/tools/security/metasploit/Gemfile index e5aca4f11ff..d5bfa052916 100644 --- a/pkgs/tools/security/metasploit/Gemfile +++ b/pkgs/tools/security/metasploit/Gemfile @@ -1,4 +1,4 @@ # frozen_string_literal: true source "https://rubygems.org" -gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.3.26" +gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.3.27" diff --git a/pkgs/tools/security/metasploit/Gemfile.lock b/pkgs/tools/security/metasploit/Gemfile.lock index 3bd2348d76f..37e3161509f 100644 --- a/pkgs/tools/security/metasploit/Gemfile.lock +++ b/pkgs/tools/security/metasploit/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://github.com/rapid7/metasploit-framework - revision: dd1f90dd6fd267d8430d8e0299ebcfe6a85327cf - ref: refs/tags/6.3.26 + revision: 53af96320f2fddfc0189ea66fd9db1f87d94eb06 + ref: refs/tags/6.3.27 specs: - metasploit-framework (6.3.26) + metasploit-framework (6.3.27) actionpack (~> 7.0) activerecord (~> 7.0) activesupport (~> 7.0) @@ -131,13 +131,13 @@ GEM arel-helpers (2.14.0) activerecord (>= 3.1.0, < 8) aws-eventstream (1.2.0) - aws-partitions (1.790.0) - aws-sdk-core (3.178.0) + aws-partitions (1.795.0) + aws-sdk-core (3.180.1) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.651.0) aws-sigv4 (~> 1.5) jmespath (~> 1, >= 1.6.1) - aws-sdk-ec2 (1.392.0) + aws-sdk-ec2 (1.395.0) aws-sdk-core (~> 3, >= 3.177.0) aws-sigv4 (~> 1.1) aws-sdk-iam (1.86.0) @@ -146,8 +146,8 @@ GEM aws-sdk-kms (1.71.0) aws-sdk-core (~> 3, >= 3.177.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.131.0) - aws-sdk-core (~> 3, >= 3.177.0) + aws-sdk-s3 (1.132.0) + aws-sdk-core (~> 3, >= 3.179.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.6) aws-sdk-ssm (1.156.0) @@ -190,7 +190,7 @@ GEM faraday-net_http (3.0.2) faraday-retry (2.2.0) faraday (~> 2.0) - faye-websocket (0.11.2) + faye-websocket (0.11.3) eventmachine (>= 0.12.0) websocket-driver (>= 0.5.1) ffi (1.15.5) @@ -259,7 +259,7 @@ GEM metasploit_payloads-mettle (1.0.20) method_source (1.0.0) mini_portile2 (2.8.4) - minitest (5.18.1) + minitest (5.19.0) mqtt (0.6.0) msgpack (1.6.1) multi_json (1.15.0) @@ -271,7 +271,7 @@ GEM timeout net-smtp (0.3.3) net-protocol - net-ssh (7.1.0) + net-ssh (7.2.0) network_interface (0.0.2) nexpose (7.3.0) nio4r (2.5.9) @@ -300,7 +300,7 @@ GEM puma (6.3.0) nio4r (~> 2.0) racc (1.7.1) - rack (2.2.7) + rack (2.2.8) rack-protection (3.0.6) rack rack-test (2.1.0) @@ -326,7 +326,7 @@ GEM recog (3.1.1) nokogiri redcarpet (3.6.0) - reline (0.3.6) + reline (0.3.7) io-console (~> 0.5) rex-arch (0.1.14) rex-text @@ -376,9 +376,9 @@ GEM rex-text (0.2.52) rex-zip (0.1.4) rex-text - rexml (3.2.5) + rexml (3.2.6) rkelly-remix (0.0.7) - ruby-macho (3.0.0) + ruby-macho (4.0.0) ruby-rc4 (0.1.5) ruby2_keywords (0.0.5) ruby_smb (3.2.5) @@ -423,7 +423,7 @@ GEM warden (1.2.9) rack (>= 2.0.9) webrick (1.8.1) - websocket-driver (0.7.5) + websocket-driver (0.7.6) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) win32api (0.1.0) @@ -442,7 +442,7 @@ GEM activesupport (>= 4.2, < 8.0) xmlrpc (0.3.2) webrick - zeitwerk (2.6.8) + zeitwerk (2.6.10) PLATFORMS ruby diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix index 88f25a70657..d1d44595424 100644 --- a/pkgs/tools/security/metasploit/default.nix +++ b/pkgs/tools/security/metasploit/default.nix @@ -15,13 +15,13 @@ let }; in stdenv.mkDerivation rec { pname = "metasploit-framework"; - version = "6.3.26"; + version = "6.3.27"; src = fetchFromGitHub { owner = "rapid7"; repo = "metasploit-framework"; rev = version; - sha256 = "sha256-GSf+GE4LeZxmhTskiwWjWf9rc6K4wg357MuK5cbLuMs="; + sha256 = "sha256-3iNzOLOASz78ZUoShKMH/AYZE+UTu31qU/VjXP677cc="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/metasploit/gemset.nix b/pkgs/tools/security/metasploit/gemset.nix index 6cfc7da1e69..71feb682f9d 100644 --- a/pkgs/tools/security/metasploit/gemset.nix +++ b/pkgs/tools/security/metasploit/gemset.nix @@ -104,30 +104,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mjzb10zyx78hnnz6j4bjv3awpgajfi0nmavrhy9x1qsf7yc9bjd"; + sha256 = "07nz6pdzhrfzyhcnd0slikbw0xpslisis2ab57v83fbmn3rkpwn4"; type = "gem"; }; - version = "1.790.0"; + version = "1.795.0"; }; aws-sdk-core = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1jv5h7n0vkyjq0v3xqad5xhrl4ijnh214zq3xg4ghvsk6ah8a90r"; + sha256 = "1a820i7b3fcpnk0966sp7sdj9mzkazfwjflrd1f3i9qgbabf5li3"; type = "gem"; }; - version = "3.178.0"; + version = "3.180.1"; }; aws-sdk-ec2 = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15vb0gn23xig6alcxh487r0jl5cdxm45b6zihh3wscvfzwqq0n5n"; + sha256 = "01ds6pw1q87mqbyv7v0a444lsifrv6y0sqcw3v5yrng2ap43xby7"; type = "gem"; }; - version = "1.392.0"; + version = "1.395.0"; }; aws-sdk-iam = { groups = ["default"]; @@ -154,10 +154,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1855m1v6lh9rji543nvk0fjn98ma0q2978zc4f5y76qsibl7fg6c"; + sha256 = "0cjb40w8hw4h59bbjidp6hlb1j6akb36d8s5a37vlm6zwq327i7f"; type = "gem"; }; - version = "1.131.0"; + version = "1.132.0"; }; aws-sdk-ssm = { groups = ["default"]; @@ -404,10 +404,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1p4hsz3v75lxyj3ymwjm7pxrrk1997n54lfm51h5laakzxbji421"; + sha256 = "01xkpv5b4fjc5n6n1fq6z1ris991av2fbadvs8r71i9r34b8g48h"; type = "gem"; }; - version = "0.11.2"; + version = "0.11.3"; }; ffi = { groups = ["default"]; @@ -634,12 +634,12 @@ platforms = []; source = { fetchSubmodules = false; - rev = "dd1f90dd6fd267d8430d8e0299ebcfe6a85327cf"; - sha256 = "1jxqrg3fb2nbxkwhvhmql9rnpzsrlc2qn91vhmk9qy8b9qcgw9qr"; + rev = "53af96320f2fddfc0189ea66fd9db1f87d94eb06"; + sha256 = "1izdpgz5qqzmadm7vfqkwl9ij1pw0yiq84jacpy3wjw0ncw768yy"; type = "git"; url = "https://github.com/rapid7/metasploit-framework"; }; - version = "6.3.26"; + version = "6.3.27"; }; metasploit-model = { groups = ["default"]; @@ -706,10 +706,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1kg9wh7jlc9zsr3hkhpzkbn0ynf4np5ap9m2d8xdrb8shy0y6pmb"; + sha256 = "0jnpsbb2dbcs95p4is4431l2pw1l5pn7dfg3vkgb4ga464j0c5l6"; type = "gem"; }; - version = "5.18.1"; + version = "5.19.0"; }; mqtt = { groups = ["default"]; @@ -796,10 +796,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0yx0pb5fmziz92bw8qzbh8vf20lr56nd3s6q8h0gsgr307lki687"; + sha256 = "1jyj6j7w9zpj2zhp4dyhdjiwsn9rqwksj7s7fzpnn7rx2xvz2a1a"; type = "gem"; }; - version = "7.1.0"; + version = "7.2.0"; }; network_interface = { groups = ["default"]; @@ -977,10 +977,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "16w217k9z02c4hqizym8dkj6bqmmzx4qdvqpnskgzf174a5pwdxk"; + sha256 = "15rdwbyk71c9nxvd527bvb8jxkcys8r3dj3vqra5b3sa63qs30vv"; type = "gem"; }; - version = "2.2.7"; + version = "2.2.8"; }; rack-protection = { groups = ["default"]; @@ -1087,10 +1087,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1rgsfxm3sb9mgsxa7gks40wy4sb41w33j30y6izmih70ss34x4dh"; + sha256 = "1n6b6a1b18fscw9ff0fw5jk1l7kzw542r8444mm7d27zyx5v18sj"; type = "gem"; }; - version = "0.3.6"; + version = "0.3.7"; }; rex-arch = { groups = ["default"]; @@ -1277,10 +1277,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08ximcyfjy94pm1rhcx04ny1vx2sk0x4y185gzn86yfsbzwkng53"; + sha256 = "05i8518ay14kjbma550mv0jm8a6di8yp5phzrd8rj44z9qnrlrp0"; type = "gem"; }; - version = "3.2.5"; + version = "3.2.6"; }; rkelly-remix = { groups = ["default"]; @@ -1297,10 +1297,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0sg0kzqrldx9mlpvymif3dcgz8j8q1nc8jaszrd03nfh5bvp3fd5"; + sha256 = "1yf8fq0l5hlqkjklcpxmg6vhzvbyigwd2n441aq42b2wa2f8xj5q"; type = "gem"; }; - version = "3.0.0"; + version = "4.0.0"; }; ruby-rc4 = { groups = ["default"]; @@ -1548,10 +1548,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0a3bwxd9v3ghrxzjc4vxmf4xa18c6m4xqy5wb0yk5c6b9psc7052"; + sha256 = "1nyh873w4lvahcl8kzbjfca26656d5c6z3md4sbqg5y1gfz0157n"; type = "gem"; }; - version = "0.7.5"; + version = "0.7.6"; }; websocket-extensions = { groups = ["default"]; @@ -1618,9 +1618,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ck6bj7wa73dkdh13735jl06k6cfny98glxjkas82aivlmyzqqbk"; + sha256 = "06vf6y5ai20ry3b1h9cl7vsdj6i5valq172zdxpnfhj5zvlp104j"; type = "gem"; }; - version = "2.6.8"; + version = "2.6.10"; }; } diff --git a/pkgs/tools/security/sequoia-sq/default.nix b/pkgs/tools/security/sequoia-sq/default.nix index fbb5ff956a4..d8bac3e7072 100644 --- a/pkgs/tools/security/sequoia-sq/default.nix +++ b/pkgs/tools/security/sequoia-sq/default.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "sequoia-sq"; - version = "0.30.1"; + version = "0.31.0"; src = fetchFromGitLab { owner = "sequoia-pgp"; repo = "sequoia-sq"; rev = "v${version}"; - hash = "sha256-uFcmuyz0JsUTvKqCb+3t8JdB4Dn4hJq00jeEhvMNW18="; + hash = "sha256-rrNN52tDM3CEGyNvsT3x4GmfWIpU8yoT2XsgOhPyLjo="; }; - cargoHash = "sha256-PWqwTGodQ7LBTgHFB2AWX5wIOVJja2GzPoocX59Dr/0="; + cargoHash = "sha256-B+gtUzUB99At+kusupsN/v6sCbpXs36/EbpTL3gUxnc="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/tools/security/terrascan/default.nix b/pkgs/tools/security/terrascan/default.nix index bb71c3134d8..8cc4212fbb2 100644 --- a/pkgs/tools/security/terrascan/default.nix +++ b/pkgs/tools/security/terrascan/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "terrascan"; - version = "1.18.1"; + version = "1.18.2"; src = fetchFromGitHub { owner = "accurics"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-w0ZOkPw8Y6Z1hyZecZfjd/YrTP8v6S0jNhgNzLjMRrY="; + hash = "sha256-ZWkuzblPIvYcOllmIjk2RQZdkcPYZLGOuxwgX3NMydg="; }; - vendorHash = "sha256-0WkOIgIA1fKn2SeS5QFeLGCGMstdlkU+eDRUVAs3ETA="; + vendorHash = "sha256-e09F4dA/uT50Cted3HqE08d04+l0V6U95AdKGKBFDpI="; # Tests want to download a vulnerable Terraform project doCheck = false; diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix index 06e43158190..28e38d6ad1c 100644 --- a/pkgs/tools/security/tor/default.nix +++ b/pkgs/tools/security/tor/default.nix @@ -30,11 +30,11 @@ let in stdenv.mkDerivation rec { pname = "tor"; - version = "0.4.7.13"; + version = "0.4.7.14"; src = fetchurl { url = "https://dist.torproject.org/${pname}-${version}.tar.gz"; - sha256 = "sha256-IHkXLM4DRVbxEASOJgg86b6nUfMVSwrSgJdRgVsR6p0="; + sha256 = "sha256-paxn9kZjgPwF6AQ9AcWB5Oiisi/glDABNHPnEGXmXfg="; }; outputs = [ "out" "geoip" ]; diff --git a/pkgs/tools/security/trufflehog/default.nix b/pkgs/tools/security/trufflehog/default.nix index da9a7334396..2067a358cfc 100644 --- a/pkgs/tools/security/trufflehog/default.nix +++ b/pkgs/tools/security/trufflehog/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "trufflehog"; - version = "3.45.1"; + version = "3.45.3"; src = fetchFromGitHub { owner = "trufflesecurity"; repo = "trufflehog"; rev = "refs/tags/v${version}"; - hash = "sha256-kWEDeFx3ngpL6ySCD5GsJbmtbhv1qCMt9yjrskLmbbg="; + hash = "sha256-ZjoX1E9zusni8ZRaTiaj41wpVP+f7r5PcsgPAnzZF/s="; }; - vendorHash = "sha256-dg29rK5/se2DVhc+GLFeFzh3bqJl3dfC2zjGLX7utDs="; + vendorHash = "sha256-VaNNfdY2CXR0sJb9efxTwkm12l20SbO5Q3OvcBs4cKA="; ldflags = [ "-s" diff --git a/pkgs/tools/system/zx/default.nix b/pkgs/tools/system/zx/default.nix new file mode 100644 index 00000000000..857661c31f2 --- /dev/null +++ b/pkgs/tools/system/zx/default.nix @@ -0,0 +1,25 @@ +{ lib +, buildNpmPackage +, fetchFromGitHub +}: + +buildNpmPackage rec { + pname = "zx"; + version = "7.2.3"; + + src = fetchFromGitHub { + owner = "google"; + repo = "zx"; + rev = version; + hash = "sha256-YMfecNazmL8J+f80FdIRvr2upQ7VgXSkQQnm8z0Swhw="; + }; + + npmDepsHash = "sha256-ywNd2LGjM35ecW4dnj0oNwdSX2CRy8i9OGKPIdI0UEQ="; + + meta = { + description = "Tool for writing scripts using JavaScript"; + homepage = "https://github.com/google/zx"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ hlolli ]; + }; +} 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/aliases.nix b/pkgs/top-level/aliases.nix index 96e2c9da3ee..35988a42b62 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1697,7 +1697,7 @@ mapAliases ({ tex-gyre-pagella-math = throw "'tex-gyre-pagella-math' has been renamed to/replaced by 'tex-gyre-math.pagella'"; # Converted to throw 2022-02-22 tex-gyre-schola-math = throw "'tex-gyre-schola-math' has been renamed to/replaced by 'tex-gyre-math.schola'"; # Converted to throw 2022-02-22 tex-gyre-termes-math = throw "'tex-gyre-termes-math' has been renamed to/replaced by 'tex-gyre-math.termes'"; # Converted to throw 2022-02-22 - textadept11 = textadept; # Added 2022-06-07 + textadept11 = throw "textadept11 has been removed. Please use textadept instead"; # Added 2022-12-23 TODO: UPDATE THE DATE tftp_hpa = throw "'tftp_hpa' has been renamed to/replaced by 'tftp-hpa'"; # Converted to throw 2022-02-22 thunderbird-68 = throw "Thunderbird 68 reached end of life with its final release 68.12.0 on 2020-08-25"; thunderbird-bin-68 = thunderbird-68; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3b27655c631..cc48e816f64 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 { }; @@ -13473,7 +13473,7 @@ with pkgs; texstudio = qt6Packages.callPackage ../applications/editors/texstudio { }; - textadept = callPackage ../applications/editors/textadept { }; + textadept = libsForQt5.callPackage ../applications/editors/textadept { }; texworks = qt6Packages.callPackage ../applications/editors/texworks { }; @@ -30797,7 +30797,7 @@ with pkgs; dnglab = callPackage ../tools/graphics/dnglab { }; inherit (callPackage ../applications/virtualization/docker {}) - docker_20_10; + docker_20_10 docker_24; docker = docker_20_10; docker-client = docker.override { clientOnly = true; }; @@ -36527,7 +36527,7 @@ with pkgs; zsteg = callPackage ../tools/security/zsteg { }; - inherit (nodePackages) zx; + zx = callPackage ../tools/system/zx { }; zxfer = callPackage ../applications/system/zxfer { }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 8193fd271b1..7d5f13dc00b 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6083,6 +6083,9 @@ with self; { url = "mirror://cpan/authors/id/R/RJ/RJBS/Data-UUID-1.226.tar.gz"; hash = "sha256-CT1X/6DUEalLr6+uSVaX2yb1ydAncZj+P3zyviKZZFM="; }; + patches = [ + ../development/perl-modules/Data-UUID-CVE-2013-4184.patch + ]; meta = { description = "Globally/Universally Unique Identifiers (GUIDs/UUIDs)"; license = with lib.licenses; [ bsd0 ]; |