diff options
291 files changed, 4847 insertions, 1647 deletions
diff --git a/.github/labeler.yml b/.github/labeler.yml index 9381ff67226..44e5dcbf657 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -19,6 +19,11 @@ - pkgs/build-support/emacs/**/* - pkgs/top-level/emacs-packages.nix +"6.topic: Enlightenment DE": + - nixos/modules/services/x11/desktop-managers/enlightenment.nix + - pkgs/desktops/enlightenment/**/* + - pkgs/development/python-modules/python-efl/* + "6.topic: erlang": - doc/languages-frameworks/beam.section.md - pkgs/development/beam-modules/**/* @@ -65,6 +70,14 @@ - pkgs/development/lua-modules/**/* - pkgs/top-level/lua-packages.nix +"6.topic: Lumina DE": + - nixos/modules/services/x11/desktop-managers/lumina.nix + - pkgs/desktops/lumina/**/* + +"6.topic: LXQt": + - nixos/modules/services/x11/desktop-managers/lxqt.nix + - pkgs/desktops/lxqt/**/* + "6.topic: mate": - nixos/modules/services/x11/desktop-managers/mate.nix - nixos/tests/mate.nix diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml index d5e78cda086..2e705178464 100644 --- a/.github/workflows/backport.yml +++ b/.github/workflows/backport.yml @@ -24,7 +24,7 @@ jobs: with: ref: ${{ github.event.pull_request.head.sha }} - name: Create backport PRs - uses: korthout/backport-action@v1.0.0 + uses: korthout/backport-action@v1.0.1 with: # Config README: https://github.com/korthout/backport-action#backport-action pull_description: |- diff --git a/doc/preface.chapter.md b/doc/preface.chapter.md index 16f228272b3..7aae7fa9059 100644 --- a/doc/preface.chapter.md +++ b/doc/preface.chapter.md @@ -24,8 +24,8 @@ Packages, including the Nix packages collection, are distributed through [channels](https://nixos.org/nix/manual/#sec-channels). The collection is distributed for users of Nix on non-NixOS distributions through the channel `nixpkgs`. Users of NixOS generally use one of the `nixos-*` channels, e.g. -`nixos-19.09`, which includes all packages and modules for the stable NixOS -19.09. Stable NixOS releases are generally only given +`nixos-22.11`, which includes all packages and modules for the stable NixOS +22.11. Stable NixOS releases are generally only given security updates. More up to date packages and modules are available via the `nixos-unstable` channel. @@ -43,4 +43,4 @@ The binaries are made available via a [binary cache](https://cache.nixos.org). The current Nix expressions of the channels are available in the [`nixpkgs`](https://github.com/NixOS/nixpkgs) repository in branches -that correspond to the channel names (e.g. `nixos-19.09-small`). +that correspond to the channel names (e.g. `nixos-22.11-small`). diff --git a/doc/stdenv/stdenv.chapter.md b/doc/stdenv/stdenv.chapter.md index ceb3bfb5b8d..7d861860a72 100644 --- a/doc/stdenv/stdenv.chapter.md +++ b/doc/stdenv/stdenv.chapter.md @@ -837,6 +837,10 @@ The distribution phase is intended to produce a source distribution of the packa #### Variables controlling the distribution phase {#variables-controlling-the-distribution-phase} +##### `doDist` {#var-stdenv-doDist} + +If set, the distribution phase is executed. + ##### `distTarget` {#var-stdenv-distTarget} The make target that produces the distribution. Defaults to `dist`. diff --git a/lib/path/tests/prop.sh b/lib/path/tests/prop.sh index c956e55bbfa..e48c6667fa0 100755 --- a/lib/path/tests/prop.sh +++ b/lib/path/tests/prop.sh @@ -55,7 +55,7 @@ fi declare -a strings=() mkdir -p "$tmp/strings" while IFS= read -r -d $'\0' str; do - echo -n "$str" > "$tmp/strings/${#strings[@]}" + printf "%s" "$str" > "$tmp/strings/${#strings[@]}" strings+=("$str") done < <(awk \ -f "$SCRIPT_DIR"/generate.awk \ diff --git a/lib/systems/parse.nix b/lib/systems/parse.nix index 43e4473667d..8fb13af1f53 100644 --- a/lib/systems/parse.nix +++ b/lib/systems/parse.nix @@ -91,10 +91,14 @@ rec { microblaze = { bits = 32; significantByte = bigEndian; family = "microblaze"; }; microblazeel = { bits = 32; significantByte = littleEndian; family = "microblaze"; }; - mips = { bits = 32; significantByte = bigEndian; family = "mips"; }; - mipsel = { bits = 32; significantByte = littleEndian; family = "mips"; }; - mips64 = { bits = 64; significantByte = bigEndian; family = "mips"; }; - mips64el = { bits = 64; significantByte = littleEndian; family = "mips"; }; + mips = { bits = 32; significantByte = bigEndian; family = "mips"; }; + mipsel = { bits = 32; significantByte = littleEndian; family = "mips"; }; + mipsisa32r6 = { bits = 32; significantByte = bigEndian; family = "mips"; }; + mipsisa32r6el = { bits = 32; significantByte = littleEndian; family = "mips"; }; + mips64 = { bits = 64; significantByte = bigEndian; family = "mips"; }; + mips64el = { bits = 64; significantByte = littleEndian; family = "mips"; }; + mipsisa64r6 = { bits = 64; significantByte = bigEndian; family = "mips"; }; + mipsisa64r6el = { bits = 64; significantByte = littleEndian; family = "mips"; }; mmix = { bits = 64; significantByte = bigEndian; family = "mmix"; }; diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index d51db1e084e..9998afcd73e 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3475,6 +3475,13 @@ githubId = 10042482; name = "Louis Pearson"; }; + Dettorer = { + name = "Paul Hervot"; + email = "paul.hervot@dettorer.net"; + matrix = "@dettorer:matrix.org"; + github = "Dettorer"; + githubId = 2761682; + }; devhell = { email = ''"^"@regexmail.net''; github = "devhell"; @@ -7868,6 +7875,15 @@ }]; name = "Yaroslav Bolyukin"; }; + lafrenierejm = { + email = "joseph@lafreniere.xyz"; + github = "lafrenierejm"; + githubId = 11155300; + keys = [{ + fingerprint = "0375 DD9A EDD1 68A3 ADA3 9EBA EE23 6AA0 141E FCA3"; + }]; + name = "Joseph LaFreniere"; + }; laikq = { email = "gwen@quasebarth.de"; github = "laikq"; @@ -8013,6 +8029,15 @@ fingerprint = "CC50 F82C 985D 2679 0703 AF15 19B0 82B3 DEFE 5451"; }]; }; + leifhelm = { + email = "jakob.leifhelm@gmail.com"; + github = "leifhelm"; + githubId = 31693262; + name = "Jakob Leifhelm"; + keys =[{ + fingerprint = "4A82 F68D AC07 9FFD 8BF0 89C4 6817 AA02 3810 0822"; + }]; + }; leixb = { email = "abone9999+nixpkgs@gmail.com"; matrix = "@leix_b:matrix.org"; @@ -12727,6 +12752,15 @@ githubId = 893474; name = "Stefan Wiehler"; }; + sephi = { + name = "Sylvain Fankhauser"; + email = "sephi@fhtagn.top"; + github = "sephii"; + githubId = 754333; + keys = [{ + fingerprint = "2A9D 8E76 5EE2 237D 7B6B A2A5 4228 AB9E C061 2ADA"; + }]; + }; sepi = { email = "raffael@mancini.lu"; github = "sepi"; diff --git a/nixos/doc/manual/configuration/x-windows.chapter.md b/nixos/doc/manual/configuration/x-windows.chapter.md index f92403ed1c4..be185cf4c31 100644 --- a/nixos/doc/manual/configuration/x-windows.chapter.md +++ b/nixos/doc/manual/configuration/x-windows.chapter.md @@ -199,9 +199,9 @@ GTK themes can be installed either to user profile or system-wide (via GTK ones, you can use the following configuration: ```nix -qt5.enable = true; -qt5.platformTheme = "gtk2"; -qt5.style = "gtk2"; +qt.enable = true; +qt.platformTheme = "gtk2"; +qt.style = "gtk2"; ``` ## Custom XKB layouts {#custom-xkb-layouts .unnumbered} diff --git a/nixos/doc/manual/from_md/configuration/x-windows.chapter.xml b/nixos/doc/manual/from_md/configuration/x-windows.chapter.xml index c5a8b9bae84..319d3e98018 100644 --- a/nixos/doc/manual/from_md/configuration/x-windows.chapter.xml +++ b/nixos/doc/manual/from_md/configuration/x-windows.chapter.xml @@ -223,9 +223,9 @@ services.xserver.libinput.touchpad.tapping = false; configuration: </para> <programlisting language="nix"> -qt5.enable = true; -qt5.platformTheme = "gtk2"; -qt5.style = "gtk2"; +qt.enable = true; +qt.platformTheme = "gtk2"; +qt.style = "gtk2"; </programlisting> </section> <section xml:id="custom-xkb-layouts"> diff --git a/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml index 68132f5b1c3..dfba0d1c797 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml @@ -62,6 +62,14 @@ </listitem> <listitem> <para> + <link xlink:href="https://github.com/StevenBlack/hosts">stevenblack-blocklist</link>, + A unified hosts file with base extensions for blocking + unwanted websites. Available as + <link xlink:href="options.html#opt-networking.stevenblack.enable">networking.stevenblack</link>. + </para> + </listitem> + <listitem> + <para> <link xlink:href="https://github.com/ellie/atuin">atuin</link>, a sync server for shell history. Available as <link linkend="opt-services.atuin.enable">services.atuin</link>. diff --git a/nixos/doc/manual/release-notes/rl-2305.section.md b/nixos/doc/manual/release-notes/rl-2305.section.md index 1ca8e45918a..d17268fd9e9 100644 --- a/nixos/doc/manual/release-notes/rl-2305.section.md +++ b/nixos/doc/manual/release-notes/rl-2305.section.md @@ -24,6 +24,8 @@ In addition to numerous new and upgraded packages, this release has the followin - [fzf](https://github.com/junegunn/fzf), a command line fuzzyfinder. Available as [programs.fzf](#opt-programs.fzf.fuzzyCompletion). +- [stevenblack-blocklist](https://github.com/StevenBlack/hosts), A unified hosts file with base extensions for blocking unwanted websites. Available as [networking.stevenblack](options.html#opt-networking.stevenblack.enable). + - [atuin](https://github.com/ellie/atuin), a sync server for shell history. Available as [services.atuin](#opt-services.atuin.enable). - [mmsd](https://gitlab.com/kop316/mmsd), a lower level daemon that transmits and recieves MMSes. Available as [services.mmsd](#opt-services.mmsd.enable). diff --git a/nixos/modules/config/qt5.nix b/nixos/modules/config/qt.nix index cb3180d7b96..35defb8fbd9 100644 --- a/nixos/modules/config/qt5.nix +++ b/nixos/modules/config/qt.nix @@ -4,7 +4,7 @@ with lib; let - cfg = config.qt5; + cfg = config.qt; isQGnome = cfg.platformTheme == "gnome" && builtins.elem cfg.style ["adwaita" "adwaita-dark"]; isQtStyle = cfg.platformTheme == "gtk2" && !(builtins.elem cfg.style ["adwaita" "adwaita-dark"]); @@ -12,22 +12,34 @@ let isLxqt = cfg.platformTheme == "lxqt"; isKde = cfg.platformTheme == "kde"; - packages = if isQGnome then [ pkgs.qgnomeplatform pkgs.adwaita-qt ] + packages = + if isQGnome then [ + pkgs.qgnomeplatform + pkgs.adwaita-qt + pkgs.qgnomeplatform-qt6 + pkgs.adwaita-qt6 + ] else if isQtStyle then [ pkgs.libsForQt5.qtstyleplugins ] else if isQt5ct then [ pkgs.libsForQt5.qt5ct ] else if isLxqt then [ pkgs.lxqt.lxqt-qtplugin pkgs.lxqt.lxqt-config ] else if isKde then [ pkgs.libsForQt5.plasma-integration pkgs.libsForQt5.systemsettings ] - else throw "`qt5.platformTheme` ${cfg.platformTheme} and `qt5.style` ${cfg.style} are not compatible."; + else throw "`qt.platformTheme` ${cfg.platformTheme} and `qt.style` ${cfg.style} are not compatible."; in { meta.maintainers = [ maintainers.romildo ]; + imports = [ + (mkRenamedOptionModule ["qt5" "enable" ] ["qt" "enable" ]) + (mkRenamedOptionModule ["qt5" "platformTheme" ] ["qt" "platformTheme" ]) + (mkRenamedOptionModule ["qt5" "style" ] ["qt" "style" ]) + ]; + options = { - qt5 = { + qt = { - enable = mkEnableOption (lib.mdDoc "Qt5 theming configuration"); + enable = mkEnableOption (lib.mdDoc "Qt theming configuration"); platformTheme = mkOption { type = types.enum [ @@ -40,13 +52,14 @@ in example = "gnome"; relatedPackages = [ "qgnomeplatform" + "qgnomeplatform-qt6" ["libsForQt5" "qtstyleplugins"] ["libsForQt5" "qt5ct"] ["lxqt" "lxqt-qtplugin"] ["libsForQt5" "plasma-integration"] ]; description = lib.mdDoc '' - Selects the platform theme to use for Qt5 applications. + Selects the platform theme to use for Qt applications. The options are - `gtk`: Use GTK theme with [qtstyleplugins](https://github.com/qt/qtstyleplugins) @@ -71,10 +84,11 @@ in example = "adwaita"; relatedPackages = [ "adwaita-qt" + "adwaita-qt6" ["libsForQt5" "qtstyleplugins"] ]; description = lib.mdDoc '' - Selects the style to use for Qt5 applications. + Selects the style to use for Qt applications. The options are - `adwaita`, `adwaita-dark`: Use Adwaita Qt style with diff --git a/nixos/modules/config/stevenblack.nix b/nixos/modules/config/stevenblack.nix new file mode 100644 index 00000000000..ec686848494 --- /dev/null +++ b/nixos/modules/config/stevenblack.nix @@ -0,0 +1,34 @@ +{ config, lib, pkgs, ... }: + +let + inherit (lib) optionals mkOption mkEnableOption types mkIf elem concatStringsSep maintainers mdDoc; + cfg = config.networking.stevenblack; + + # needs to be in a specific order + activatedHosts = with cfg; [ ] + ++ optionals (elem "fakenews" block) [ "fakenews" ] + ++ optionals (elem "gambling" block) [ "gambling" ] + ++ optionals (elem "porn" block) [ "porn" ] + ++ optionals (elem "social" block) [ "social" ]; + + hostsPath = "${pkgs.stevenblack-blocklist}/alternates/" + concatStringsSep "-" activatedHosts + "/hosts"; +in +{ + options.networking.stevenblack = { + enable = mkEnableOption (mdDoc "Enable the stevenblack hosts file blocklist."); + + block = mkOption { + type = types.listOf (types.enum [ "fakenews" "gambling" "porn" "social" ]); + default = [ ]; + description = mdDoc "Additional blocklist extensions."; + }; + }; + + config = mkIf cfg.enable { + networking.hostFiles = [ ] + ++ optionals (activatedHosts != [ ]) [ hostsPath ] + ++ optionals (activatedHosts == [ ]) [ "${pkgs.stevenblack-blocklist}/hosts" ]; + }; + + meta.maintainers = [ maintainers.fortuneteller2k maintainers.artturin ]; +} diff --git a/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares-gnome.nix b/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares-gnome.nix index d015e10c11d..12feb2d96ec 100644 --- a/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares-gnome.nix +++ b/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares-gnome.nix @@ -31,7 +31,7 @@ }; # Theme calamares with GNOME theme - qt5 = { + qt = { enable = true; platformTheme = "gnome"; }; diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index dbebca815be..f0ee3fc9397 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -20,9 +20,10 @@ ./config/nsswitch.nix ./config/power-management.nix ./config/pulseaudio.nix - ./config/qt5.nix + ./config/qt.nix ./config/resolvconf.nix ./config/shells-environment.nix + ./config/stevenblack.nix ./config/swap.nix ./config/sysctl.nix ./config/system-environment.nix @@ -1141,6 +1142,7 @@ ./services/web-apps/isso.nix ./services/web-apps/jirafeau.nix ./services/web-apps/jitsi-meet.nix + ./services/web-apps/kasmweb/default.nix ./services/web-apps/keycloak.nix ./services/web-apps/komga.nix ./services/web-apps/lemmy.nix diff --git a/nixos/modules/programs/steam.nix b/nixos/modules/programs/steam.nix index 1b69aac9886..98269f6250d 100644 --- a/nixos/modules/programs/steam.nix +++ b/nixos/modules/programs/steam.nix @@ -12,14 +12,14 @@ in { type = types.package; default = pkgs.steam.override { extraLibraries = pkgs: with config.hardware.opengl; - if pkgs.hostPlatform.is64bit + if pkgs.stdenv.hostPlatform.is64bit then [ package ] ++ extraPackages else [ package32 ] ++ extraPackages32; }; defaultText = literalExpression '' pkgs.steam.override { extraLibraries = pkgs: with config.hardware.opengl; - if pkgs.hostPlatform.is64bit + if pkgs.stdenv.hostPlatform.is64bit then [ package ] ++ extraPackages else [ package32 ] ++ extraPackages32; } diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index 1d115108c30..f37d197f162 100644 --- a/nixos/modules/services/misc/nix-daemon.nix +++ b/nixos/modules/services/misc/nix-daemon.nix @@ -819,10 +819,10 @@ in system-features = mkDefault ( [ "nixos-test" "benchmark" "big-parallel" "kvm" ] ++ - optionals (pkgs.hostPlatform ? gcc.arch) ( + optionals (pkgs.stdenv.hostPlatform ? gcc.arch) ( # a builder can run code for `gcc.arch` and inferior architectures - [ "gccarch-${pkgs.hostPlatform.gcc.arch}" ] ++ - map (x: "gccarch-${x}") (systems.architectures.inferiors.${pkgs.hostPlatform.gcc.arch} or []) + [ "gccarch-${pkgs.stdenv.hostPlatform.gcc.arch}" ] ++ + map (x: "gccarch-${x}") (systems.architectures.inferiors.${pkgs.stdenv.hostPlatform.gcc.arch} or []) ) ); } diff --git a/nixos/modules/services/web-apps/changedetection-io.nix b/nixos/modules/services/web-apps/changedetection-io.nix index fc00aee4351..bbf4c2aed18 100644 --- a/nixos/modules/services/web-apps/changedetection-io.nix +++ b/nixos/modules/services/web-apps/changedetection-io.nix @@ -214,7 +214,7 @@ in }; }) ]; - podman.defaultNetwork.dnsname.enable = true; + podman.defaultNetwork.settings.dns_enabled = true; }; }; } diff --git a/nixos/modules/services/web-apps/kasmweb/default.nix b/nixos/modules/services/web-apps/kasmweb/default.nix new file mode 100644 index 00000000000..0d78025ecf0 --- /dev/null +++ b/nixos/modules/services/web-apps/kasmweb/default.nix @@ -0,0 +1,275 @@ +{ config, lib, pkgs, ... }: + +let + cfg = config.services.kasmweb; +in +{ + options.services.kasmweb = { + enable = lib.mkEnableOption (lib.mdDoc "kasmweb"); + + networkSubnet = lib.mkOption { + default = "172.20.0.0/16"; + type = lib.types.str; + description = lib.mdDoc '' + The network subnet to use for the containers. + ''; + }; + + postgres = { + user = lib.mkOption { + default = "kasmweb"; + type = lib.types.str; + description = lib.mdDoc '' + Username to use for the postgres database. + ''; + }; + password = lib.mkOption { + default = "kasmweb"; + type = lib.types.str; + description = lib.mdDoc '' + password to use for the postgres database. + ''; + }; + }; + + redisPassword = lib.mkOption { + default = "kasmweb"; + type = lib.types.str; + description = lib.mdDoc '' + password to use for the redis cache. + ''; + }; + + defaultAdminPassword = lib.mkOption { + default = "kasmweb"; + type = lib.types.str; + description = lib.mdDoc '' + default admin password to use. + ''; + }; + + defaultUserPassword = lib.mkOption { + default = "kasmweb"; + type = lib.types.str; + description = lib.mdDoc '' + default user password to use. + ''; + }; + + defaultManagerToken = lib.mkOption { + default = "kasmweb"; + type = lib.types.str; + description = lib.mdDoc '' + default manager token to use. + ''; + }; + + defaultGuacToken = lib.mkOption { + default = "kasmweb"; + type = lib.types.str; + description = lib.mdDoc '' + default guac token to use. + ''; + }; + + defaultRegistrationToken = lib.mkOption { + default = "kasmweb"; + type = lib.types.str; + description = lib.mdDoc '' + default registration token to use. + ''; + }; + + datastorePath = lib.mkOption { + type = lib.types.str; + default = "/var/lib/kasmweb"; + description = lib.mdDoc '' + The directory used to store all data for kasmweb. + ''; + }; + + listenAddress = lib.mkOption { + type = lib.types.str; + default = "0.0.0.0"; + description = lib.mdDoc '' + The address on which kasmweb should listen. + ''; + }; + + listenPort = lib.mkOption { + type = lib.types.int; + default = 443; + description = lib.mdDoc '' + The port on which kasmweb should listen. + ''; + }; + + sslCertificate = lib.mkOption { + type = lib.types.nullOr lib.types.path; + default = null; + description = lib.mdDoc '' + The SSL certificate to be used for kasmweb. + ''; + }; + + sslCertificateKey = lib.mkOption { + type = lib.types.nullOr lib.types.path; + default = null; + description = lib.mdDoc '' + The SSL certificate's key to be used for kasmweb. Make sure to specify + this as a string and not a literal path, so that it is not accidentally + included in your nixstore. + ''; + }; + }; + + config = lib.mkIf cfg.enable { + + systemd.services = { + "init-kasmweb" = { + wantedBy = [ + "docker-kasm_db.service" + ]; + before = [ + "docker-kasm_db.service" + "docker-kasm_redis.service" + "docker-kasm_db_init.service" + "docker-kasm_api.service" + "docker-kasm_agent.service" + "docker-kasm_manager.service" + "docker-kasm_share.service" + "docker-kasm_guac.service" + "docker-kasm_proxy.service" + ]; + serviceConfig = { + Type = "oneshot"; + ExecStart = pkgs.substituteAll { + src = ./initialize_kasmweb.sh; + isExecutable = true; + binPath = lib.makeBinPath [ pkgs.docker pkgs.openssl pkgs.gnused ]; + runtimeShell = pkgs.runtimeShell; + kasmweb = pkgs.kasmweb; + postgresUser = cfg.postgres.user; + postgresPassword = cfg.postgres.password; + inherit (cfg) + datastorePath + sslCertificate + sslCertificateKey + redisPassword + defaultUserPassword + defaultAdminPassword + defaultManagerToken + defaultRegistrationToken + defaultGuacToken; + }; + }; + }; + }; + + virtualisation = { + oci-containers.containers = { + kasm_db = { + image = "postgres:12-alpine"; + environment = { + POSTGRES_PASSWORD = cfg.postgres.password; + POSTGRES_USER = cfg.postgres.user; + POSTGRES_DB = "kasm"; + }; + volumes = [ + "${cfg.datastorePath}/conf/database/data.sql:/docker-entrypoint-initdb.d/data.sql" + "${cfg.datastorePath}/conf/database/:/tmp/" + "kasmweb_db:/var/lib/postgresql/data" + ]; + extraOptions = [ "--network=kasm_default_network" ]; + }; + kasm_db_init = { + image = "kasmweb/api:${pkgs.kasmweb.version}"; + user = "root:root"; + volumes = [ + "${cfg.datastorePath}/:/opt/kasm/current/" + "kasmweb_api_data:/tmp" + ]; + dependsOn = [ "kasm_db" ]; + entrypoint = "/bin/bash"; + cmd = [ "/opt/kasm/current/init_seeds.sh" ]; + extraOptions = [ "--network=kasm_default_network" "--userns=host" ]; + }; + kasm_redis = { + image = "redis:5-alpine"; + entrypoint = "/bin/sh"; + cmd = [ + "-c" + "redis-server --requirepass ${cfg.redisPassword}" + ]; + extraOptions = [ "--network=kasm_default_network" "--userns=host" ]; + }; + kasm_api = { + image = "kasmweb/api:${pkgs.kasmweb.version}"; + user = "root:root"; + volumes = [ + "${cfg.datastorePath}/:/opt/kasm/current/" + "kasmweb_api_data:/tmp" + ]; + dependsOn = [ "kasm_db_init" ]; + extraOptions = [ "--network=kasm_default_network" "--userns=host" ]; + }; + kasm_manager = { + image = "kasmweb/manager:${pkgs.kasmweb.version}"; + user = "root:root"; + volumes = [ + "${cfg.datastorePath}/:/opt/kasm/current/" + ]; + dependsOn = [ "kasm_db" "kasm_api" ]; + extraOptions = [ "--network=kasm_default_network" "--userns=host" "--read-only"]; + }; + kasm_agent = { + image = "kasmweb/agent:${pkgs.kasmweb.version}"; + user = "root:root"; + volumes = [ + "${cfg.datastorePath}/:/opt/kasm/current/" + "/var/run/docker.sock:/var/run/docker.sock" + "${pkgs.docker}/bin/docker:/usr/bin/docker" + "${cfg.datastorePath}/conf/nginx:/etc/nginx/conf.d" + ]; + dependsOn = [ "kasm_manager" ]; + extraOptions = [ "--network=kasm_default_network" "--userns=host" "--read-only" ]; + }; + kasm_share = { + image = "kasmweb/share:${pkgs.kasmweb.version}"; + user = "root:root"; + volumes = [ + "${cfg.datastorePath}/:/opt/kasm/current/" + ]; + dependsOn = [ "kasm_db" "kasm_redis" ]; + extraOptions = [ "--network=kasm_default_network" "--userns=host" "--read-only" ]; + }; + kasm_guac = { + image = "kasmweb/kasm-guac:${pkgs.kasmweb.version}"; + user = "root:root"; + volumes = [ + "${cfg.datastorePath}/:/opt/kasm/current/" + ]; + dependsOn = [ "kasm_db" "kasm_redis" ]; + extraOptions = [ "--network=kasm_default_network" "--userns=host" "--read-only" ]; + }; + kasm_proxy = { + image = "kasmweb/nginx:latest"; + ports = [ "${cfg.listenAddress}:${toString cfg.listenPort}:443" ]; + user = "root:root"; + volumes = [ + "${cfg.datastorePath}/conf/nginx:/etc/nginx/conf.d:ro" + "${cfg.datastorePath}/certs/kasm_nginx.key:/etc/ssl/private/kasm_nginx.key" + "${cfg.datastorePath}/certs/kasm_nginx.crt:/etc/ssl/certs/kasm_nginx.crt" + "${cfg.datastorePath}/www:/srv/www:ro" + "${cfg.datastorePath}/log/nginx:/var/log/external/nginx" + "${cfg.datastorePath}/log/logrotate:/var/log/external/logrotate" + ]; + dependsOn = [ "kasm_manager" "kasm_api" "kasm_agent" "kasm_share" + "kasm_guac" ]; + extraOptions = [ "--network=kasm_default_network" "--userns=host" + "--network-alias=proxy"]; + }; + }; + }; + }; +} diff --git a/nixos/modules/services/web-apps/kasmweb/initialize_kasmweb.sh b/nixos/modules/services/web-apps/kasmweb/initialize_kasmweb.sh new file mode 100644 index 00000000000..dbf043b9869 --- /dev/null +++ b/nixos/modules/services/web-apps/kasmweb/initialize_kasmweb.sh @@ -0,0 +1,114 @@ +#! @runtimeShell@ +export PATH=@binPath@:$PATH + +mkdir -p @datastorePath@/log +chmod -R a+rw @datastorePath@ + +ln -sf @kasmweb@/bin @datastorePath@ +rm -r @datastorePath@/conf +cp -r @kasmweb@/conf @datastorePath@ +mkdir -p @datastorePath@/conf/nginx/containers.d +chmod -R a+rw @datastorePath@/conf +ln -sf @kasmweb@/www @datastorePath@ + + +docker network inspect kasm_default_network >/dev/null || docker network create kasm_default_network --subnet @networkSubnet@ +if docker volume inspect kasmweb_db >/dev/null; then + source @datastorePath@/ids.env + echo 'echo "skipping database init"' > @datastorePath@/init_seeds.sh + echo 'while true; do sleep 10 ; done' >> @datastorePath@/init_seeds.sh +else + API_SERVER_ID=$(cat /proc/sys/kernel/random/uuid) + MANAGER_ID=$(cat /proc/sys/kernel/random/uuid) + SHARE_ID=$(cat /proc/sys/kernel/random/uuid) + SERVER_ID=$(cat /proc/sys/kernel/random/uuid) + echo "export API_SERVER_ID=$API_SERVER_ID" > @datastorePath@/ids.env + echo "export MANAGER_ID=$MANAGER_ID" >> @datastorePath@/ids.env + echo "export SHARE_ID=$SHARE_ID" >> @datastorePath@/ids.env + echo "export SERVER_ID=$SERVER_ID" >> @datastorePath@/ids.env + + mkdir -p @datastorePath@/certs + openssl req -x509 -nodes -days 1825 -newkey rsa:2048 -keyout @datastorePath@/certs/kasm_nginx.key -out @datastorePath@/certs/kasm_nginx.crt -subj "/C=US/ST=VA/L=None/O=None/OU=DoFu/CN=$(hostname)/emailAddress=none@none.none" 2> /dev/null + + docker volume create kasmweb_db + rm @datastorePath@/.done_initing_data + cat >@datastorePath@/init_seeds.sh <<EOF +#!/bin/bash +if [ ! -e /opt/kasm/current/.done_initing_data ]; then + sleep 4 + /usr/bin/kasm_server.so --initialize-database --cfg \ + /opt/kasm/current/conf/app/api.app.config.yaml \ + --populate-production \ + --seed-file \ + /opt/kasm/current/conf/database/seed_data/default_properties.yaml \ + 2>&1 | grep -v UserWarning + /usr/bin/kasm_server.so --cfg \ + /opt/kasm/current/conf/app/api.app.config.yaml \ + --populate-production \ + --seed-file \ + /opt/kasm/current/conf/database/seed_data/default_agents.yaml \ + 2>&1 | grep -v UserWarning + /usr/bin/kasm_server.so --cfg \ + /opt/kasm/current/conf/app/api.app.config.yaml \ + --populate-production \ + --seed-file \ + /opt/kasm/current/conf/database/seed_data/default_connection_proxies.yaml \ + 2>&1 | grep -v UserWarning + /usr/bin/kasm_server.so --cfg \ + /opt/kasm/current/conf/app/api.app.config.yaml \ + --populate-production \ + --seed-file \ + /opt/kasm/current/conf/database/seed_data/default_images_amd64.yaml \ + 2>&1 | grep -v UserWarning + touch /opt/kasm/current/.done_initing_data + while true; do sleep 10 ; done +else + echo "skipping database init" + while true; do sleep 10 ; done +fi +EOF +fi + +chmod +x @datastorePath@/init_seeds.sh +chmod a+w @datastorePath@/init_seeds.sh + +if [ -e @sslCertificate@ ]; then + cp @sslCertificate@ @datastorePath@/certs/kasm_nginx.crt + cp @sslCertificateKey@ @datastorePath@/certs/kasm_nginx.key +fi + +sed -i -e "s/username.*/username: @postgresUser@/g" \ + -e "s/password.*/password: @postgresPassword@/g" \ + -e "s/host.*db/host: kasm_db/g" \ + -e "s/ssl: true/ssl: false/g" \ + -e "s/redisPassword.*/redisPassword: @redisPassword@/g" \ + -e "s/server_hostname.*/server_hostname: kasm_api/g" \ + -e "s/server_id.*/server_id: $API_SERVER_ID/g" \ + -e "s/manager_id.*/manager_id: $MANAGER_ID/g" \ + -e "s/share_id.*/share_id: $SHARE_ID/g" \ + @datastorePath@/conf/app/api.app.config.yaml + +sed -i -e "s/ token:.*/ token: \"@defaultManagerToken@\"/g" \ + -e "s/hostnames: \['proxy.*/hostnames: \['kasm_proxy'\]/g" \ + -e "s/server_id.*/server_id: $SERVER_ID/g" \ + @datastorePath@/conf/app/agent.app.config.yaml + + +sed -i -e "s/password: admin.*/password: \"@defaultAdminPassword@\"/g" \ + -e "s/password: user.*/password: \"@defaultUserPassword@\"/g" \ + -e "s/default-manager-token/@defaultManagerToken@/g" \ + -e "s/default-registration-token/@defaultRegistrationToken@/g" \ + -e "s/upstream_auth_address:.*/upstream_auth_address: 'proxy'/g" \ + @datastorePath@/conf/database/seed_data/default_properties.yaml + +sed -i -e "s/GUACTOKEN/@defaultGuacToken@/g" \ + -e "s/APIHOSTNAME/proxy/g" \ + @datastorePath@/conf/app/kasmguac.app.config.yaml + +sed -i -e "s/GUACTOKEN/@defaultGuacToken@/g" \ + -e "s/APIHOSTNAME/proxy/g" \ + @datastorePath@/conf/database/seed_data/default_connection_proxies.yaml + +sed -i "s/00000000-0000-0000-0000-000000000000/$SERVER_ID/g" \ + @datastorePath@/conf/database/seed_data/default_agents.yaml + diff --git a/nixos/modules/services/web-apps/mastodon.nix b/nixos/modules/services/web-apps/mastodon.nix index b6e2309555f..cc30896c80b 100644 --- a/nixos/modules/services/web-apps/mastodon.nix +++ b/nixos/modules/services/web-apps/mastodon.nix @@ -95,7 +95,6 @@ let ) env)))); mastodonTootctl = pkgs.writeShellScriptBin "mastodon-tootctl" '' - #! ${pkgs.runtimeShell} set -a export RAILS_ROOT="${cfg.package}" source "${envFile}" diff --git a/nixos/modules/services/x11/desktop-managers/cinnamon.nix b/nixos/modules/services/x11/desktop-managers/cinnamon.nix index df1b6f731a4..a693f3e2379 100644 --- a/nixos/modules/services/x11/desktop-managers/cinnamon.nix +++ b/nixos/modules/services/x11/desktop-managers/cinnamon.nix @@ -198,10 +198,10 @@ in programs.bash.vteIntegration = mkDefault true; programs.zsh.vteIntegration = mkDefault true; - # Harmonize Qt5 applications under Cinnamon - qt5.enable = true; - qt5.platformTheme = "gnome"; - qt5.style = "adwaita"; + # Harmonize Qt applications under Cinnamon + qt.enable = true; + qt.platformTheme = "gnome"; + qt.style = "adwaita"; # Default Fonts fonts.fonts = with pkgs; [ diff --git a/nixos/modules/services/x11/desktop-managers/gnome.nix b/nixos/modules/services/x11/desktop-managers/gnome.nix index 9c1978e362b..dadfb421d3a 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome.nix @@ -352,8 +352,8 @@ in }) ]; - # Harmonize Qt5 application style and also make them use the portal for file chooser dialog. - qt5 = { + # Harmonize Qt application style and also make them use the portal for file chooser dialog. + qt = { enable = mkDefault true; platformTheme = mkDefault "gnome"; style = mkDefault "adwaita"; diff --git a/nixos/modules/services/x11/desktop-managers/pantheon.nix b/nixos/modules/services/x11/desktop-managers/pantheon.nix index 5c0203224e1..f5cc2d8187d 100644 --- a/nixos/modules/services/x11/desktop-managers/pantheon.nix +++ b/nixos/modules/services/x11/desktop-managers/pantheon.nix @@ -250,10 +250,10 @@ in programs.bash.vteIntegration = mkDefault true; programs.zsh.vteIntegration = mkDefault true; - # Harmonize Qt5 applications under Pantheon - qt5.enable = true; - qt5.platformTheme = "gnome"; - qt5.style = "adwaita"; + # Harmonize Qt applications under Pantheon + qt.enable = true; + qt.platformTheme = "gnome"; + qt.style = "adwaita"; # Default Fonts fonts.fonts = with pkgs; [ diff --git a/nixos/modules/system/boot/kernel.nix b/nixos/modules/system/boot/kernel.nix index b13e50cb17d..272f1b95fe6 100644 --- a/nixos/modules/system/boot/kernel.nix +++ b/nixos/modules/system/boot/kernel.nix @@ -73,8 +73,45 @@ in boot.kernelPatches = mkOption { type = types.listOf types.attrs; default = []; - example = literalExpression "[ pkgs.kernelPatches.ubuntu_fan_4_4 ]"; - description = lib.mdDoc "A list of additional patches to apply to the kernel."; + example = literalExpression '' + [ + { + name = "foo"; + patch = ./foo.patch; + structuredExtraConfig.FOO = lib.kernel.yes; + features.foo = true; + } + ] + ''; + description = lib.mdDoc '' + A list of additional patches to apply to the kernel. + + Every item should be an attribute set with the following attributes: + + ```nix + { + name = "foo"; # descriptive name, required + + patch = ./foo.patch; # path or derivation that contains the patch source + # (required, but can be null if only config changes + # are needed) + + structuredExtraConfig = { # attrset of extra configuration parameters + FOO = lib.kernel.yes; # (without the CONFIG_ prefix, optional) + }; # values should generally be lib.kernel.yes or lib.kernel.no + + features = { # attrset of extra "features" the kernel is considered to have + foo = true; # (may be checked by other NixOS modules, optional) + }; + + extraConfig = "CONFIG_FOO y"; # extra configuration options in string form + # (deprecated, use structuredExtraConfig instead, optional) + } + ``` + + There's a small set of existing kernel patches in Nixpkgs, available as `pkgs.kernelPatches`, + that follow this format and can be used directly. + ''; }; boot.kernel.randstructSeed = mkOption { diff --git a/nixos/modules/virtualisation/azure-agent-entropy.patch b/nixos/modules/virtualisation/azure-agent-entropy.patch deleted file mode 100644 index 2a7ad08a4af..00000000000 --- a/nixos/modules/virtualisation/azure-agent-entropy.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- a/waagent 2016-03-12 09:58:15.728088851 +0200 -+++ a/waagent 2016-03-12 09:58:43.572680025 +0200 -@@ -6173,10 +6173,10 @@ - Log("MAC address: " + ":".join(["%02X" % Ord(a) for a in mac])) - - # Consume Entropy in ACPI table provided by Hyper-V -- try: -- SetFileContents("/dev/random", GetFileContents("/sys/firmware/acpi/tables/OEM0")) -- except: -- pass -+ #try: -+ # SetFileContents("/dev/random", GetFileContents("/sys/firmware/acpi/tables/OEM0")) -+ #except: -+ # pass - - Log("Probing for Azure environment.") - self.Endpoint = self.DoDhcpWork() diff --git a/nixos/modules/virtualisation/azure-agent.nix b/nixos/modules/virtualisation/azure-agent.nix index abe6455a1a6..6e6021cf80f 100644 --- a/nixos/modules/virtualisation/azure-agent.nix +++ b/nixos/modules/virtualisation/azure-agent.nix @@ -1,51 +1,10 @@ { config, lib, pkgs, ... }: with lib; - let cfg = config.virtualisation.azure.agent; - waagent = with pkgs; stdenv.mkDerivation rec { - name = "waagent-2.0"; - src = pkgs.fetchFromGitHub { - owner = "Azure"; - repo = "WALinuxAgent"; - rev = "1b3a8407a95344d9d12a2a377f64140975f1e8e4"; - sha256 = "10byzvmpgrmr4d5mdn2kq04aapqb3sgr1admk13wjmy5cd6bwd2x"; - }; - - patches = [ ./azure-agent-entropy.patch ]; - - nativeBuildInputs = [ makeWrapper python pythonPackages.wrapPython ]; - runtimeDeps = [ findutils gnugrep gawk coreutils openssl openssh - nettools # for hostname - procps # for pidof - shadow # for useradd, usermod - util-linux # for (u)mount, fdisk, sfdisk, mkswap - parted - ]; - pythonPath = [ pythonPackages.pyasn1 ]; - - configurePhase = false; - buildPhase = false; - - installPhase = '' - substituteInPlace config/99-azure-product-uuid.rules \ - --replace /bin/chmod "${coreutils}/bin/chmod" - mkdir -p $out/lib/udev/rules.d - cp config/*.rules $out/lib/udev/rules.d - - mkdir -p $out/bin - cp waagent $out/bin/ - chmod +x $out/bin/waagent - - wrapProgram "$out/bin/waagent" \ - --prefix PYTHONPATH : $PYTHONPATH \ - --prefix PATH : "${makeBinPath runtimeDeps}" - ''; - }; - provisionedHook = pkgs.writeScript "provisioned-hook" '' #!${pkgs.runtimeShell} /run/current-system/systemd/bin/systemctl start provisioned.target @@ -74,14 +33,15 @@ in ###### implementation - config = mkIf cfg.enable { - assertions = [ { + config = lib.mkIf cfg.enable { + assertions = [{ assertion = pkgs.stdenv.hostPlatform.isx86; message = "Azure not currently supported on ${pkgs.stdenv.hostPlatform.system}"; - } { - assertion = config.networking.networkmanager.enable == false; - message = "Windows Azure Linux Agent is not compatible with NetworkManager"; - } ]; + } + { + assertion = config.networking.networkmanager.enable == false; + message = "Windows Azure Linux Agent is not compatible with NetworkManager"; + }]; boot.initrd.kernelModules = [ "ata_piix" ]; networking.firewall.allowedUDPPorts = [ 68 ]; @@ -89,13 +49,19 @@ in environment.etc."waagent.conf".text = '' # - # Windows Azure Linux Agent Configuration + # Microsoft Azure Linux Agent Configuration # - Role.StateConsumer=${provisionedHook} + # Enable extension handling. Do not disable this unless you do not need password reset, + # backup, monitoring, or any extension handling whatsoever. + Extensions.Enabled=y - # Enable instance creation - Provisioning.Enabled=y + # How often (in seconds) to poll for new goal states + Extensions.GoalStatePeriod=6 + + # Which provisioning agent to use. Supported values are "auto" (default), "waagent", + # "cloud-init", or "disabled". + Provisioning.Agent=disabled # Password authentication for root account will be unavailable. Provisioning.DeleteRootPassword=n @@ -103,18 +69,31 @@ in # Generate fresh host key pair. Provisioning.RegenerateSshHostKeyPair=n - # Supported values are "rsa", "dsa" and "ecdsa". + # Supported values are "rsa", "dsa", "ecdsa", "ed25519", and "auto". + # The "auto" option is supported on OpenSSH 5.9 (2011) and later. Provisioning.SshHostKeyPairType=ed25519 # Monitor host name changes and publish changes via DHCP requests. Provisioning.MonitorHostName=y + # How often (in seconds) to monitor host name changes. + Provisioning.MonitorHostNamePeriod=30 + # Decode CustomData from Base64. Provisioning.DecodeCustomData=n # Execute CustomData after provisioning. Provisioning.ExecuteCustomData=n + # Algorithm used by crypt when generating password hash. + #Provisioning.PasswordCryptId=6 + + # Length of random salt used when generating password hash. + #Provisioning.PasswordCryptSaltLength=10 + + # Allow reset password of sys user + Provisioning.AllowResetSysUser=n + # Format if unformatted. If 'n', resource disk will not be mounted. ResourceDisk.Format=${if cfg.mountResourceDisk then "y" else "n"} @@ -125,22 +104,103 @@ in # Mount point for the resource disk ResourceDisk.MountPoint=/mnt/resource - # Respond to load balancer probes if requested by Windows Azure. - LBProbeResponder=y + # Create and use swapfile on resource disk. + ResourceDisk.EnableSwap=n + + # Size of the swapfile. + ResourceDisk.SwapSizeMB=0 - # Enable logging to serial console (y|n) - # When stdout is not enough... - # 'y' if not set - Logs.Console=y + # Comma-separated list of mount options. See mount(8) for valid options. + ResourceDisk.MountOptions=None # Enable verbose logging (y|n) Logs.Verbose=${if cfg.verboseLogging then "y" else "n"} + # Enable Console logging, default is y + # Logs.Console=y + + # Enable periodic log collection, default is n + Logs.Collect=n + + # How frequently to collect logs, default is each hour + Logs.CollectPeriod=3600 + + # Is FIPS enabled + OS.EnableFIPS=n + # Root device timeout in seconds. OS.RootDeviceScsiTimeout=300 + + # How often (in seconds) to set the root device timeout. + OS.RootDeviceScsiTimeoutPeriod=30 + + # If "None", the system default version is used. + OS.OpensslPath=${pkgs.openssl_3.bin}/bin/openssl + + # Set the SSH ClientAliveInterval + # OS.SshClientAliveInterval=180 + + # Set the path to SSH keys and configuration files + OS.SshDir=/etc/ssh + + # If set, agent will use proxy server to access internet + #HttpProxy.Host=None + #HttpProxy.Port=None + + # Detect Scvmm environment, default is n + # DetectScvmmEnv=n + + # + # Lib.Dir=/var/lib/waagent + + # + # DVD.MountPoint=/mnt/cdrom/secure + + # + # Pid.File=/var/run/waagent.pid + + # + # Extension.LogDir=/var/log/azure + + # + # Home.Dir=/home + + # Enable RDMA management and set up, should only be used in HPC images + OS.EnableRDMA=n + + # Enable checking RDMA driver version and update + # OS.CheckRdmaDriver=y + + # Enable or disable goal state processing auto-update, default is enabled + AutoUpdate.Enabled=n + + # Determine the update family, this should not be changed + # AutoUpdate.GAFamily=Prod + + # Determine if the overprovisioning feature is enabled. If yes, hold extension + # handling until inVMArtifactsProfile.OnHold is false. + # Default is enabled + EnableOverProvisioning=n + + # Allow fallback to HTTP if HTTPS is unavailable + # Note: Allowing HTTP (vs. HTTPS) may cause security risks + # OS.AllowHTTP=n + + # Add firewall rules to protect access to Azure host node services + OS.EnableFirewall=n + + # How often (in seconds) to check the firewall rules + OS.EnableFirewallPeriod=30 + + # How often (in seconds) to remove the udev rules for persistent network interface + # names (75-persistent-net-generator.rules and /etc/udev/rules.d/70-persistent-net.rules) + OS.RemovePersistentNetRulesPeriod=30 + + # How often (in seconds) to monitor for DHCP client restarts + OS.MonitorDhcpClientRestartPeriod=30 ''; - services.udev.packages = [ waagent ]; + services.udev.packages = [ pkgs.waagent ]; networking.dhcpcd.persistent = true; @@ -157,23 +217,24 @@ in description = "Services Requiring Azure VM provisioning to have finished"; }; - systemd.services.consume-hypervisor-entropy = - { description = "Consume entropy in ACPI table provided by Hyper-V"; - - wantedBy = [ "sshd.service" "waagent.service" ]; - before = [ "sshd.service" "waagent.service" ]; - - path = [ pkgs.coreutils ]; - script = - '' - echo "Fetching entropy..." - cat /sys/firmware/acpi/tables/OEM0 > /dev/random - ''; - serviceConfig.Type = "oneshot"; - serviceConfig.RemainAfterExit = true; - serviceConfig.StandardError = "journal+console"; - serviceConfig.StandardOutput = "journal+console"; - }; + systemd.services.consume-hypervisor-entropy = + { + description = "Consume entropy in ACPI table provided by Hyper-V"; + + wantedBy = [ "sshd.service" "waagent.service" ]; + before = [ "sshd.service" "waagent.service" ]; + + path = [ pkgs.coreutils ]; + script = + '' + echo "Fetching entropy..." + cat /sys/firmware/acpi/tables/OEM0 > /dev/random + ''; + serviceConfig.Type = "oneshot"; + serviceConfig.RemainAfterExit = true; + serviceConfig.StandardError = "journal+console"; + serviceConfig.StandardOutput = "journal+console"; + }; systemd.services.waagent = { wantedBy = [ "multi-user.target" ]; @@ -184,11 +245,10 @@ in description = "Windows Azure Agent Service"; unitConfig.ConditionPathExists = "/etc/waagent.conf"; serviceConfig = { - ExecStart = "${waagent}/bin/waagent -daemon"; + ExecStart = "${pkgs.waagent}/bin/waagent -daemon"; Type = "simple"; }; }; }; - } diff --git a/nixos/tests/keepassxc.nix b/nixos/tests/keepassxc.nix index 303be133040..debb469032a 100644 --- a/nixos/tests/keepassxc.nix +++ b/nixos/tests/keepassxc.nix @@ -17,7 +17,7 @@ import ./make-test-python.nix ({ pkgs, ...} : services.xserver.enable = true; # Regression test for https://github.com/NixOS/nixpkgs/issues/163482 - qt5 = { + qt = { enable = true; platformTheme = "gnome"; style = "adwaita-dark"; diff --git a/nixos/tests/libvirtd.nix b/nixos/tests/libvirtd.nix index 49258fcb93e..b6e60407599 100644 --- a/nixos/tests/libvirtd.nix +++ b/nixos/tests/libvirtd.nix @@ -21,7 +21,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { }; testScript = let - nixosInstallISO = (import ../release.nix {}).iso_minimal.${pkgs.hostPlatform.system}; + nixosInstallISO = (import ../release.nix {}).iso_minimal.${pkgs.stdenv.hostPlatform.system}; virshShutdownCmd = if pkgs.stdenv.isx86_64 then "shutdown" else "destroy"; in '' start_all() diff --git a/pkgs/applications/audio/strawberry/default.nix b/pkgs/applications/audio/strawberry/default.nix index 303e0e265f8..9e356de8f71 100644 --- a/pkgs/applications/audio/strawberry/default.nix +++ b/pkgs/applications/audio/strawberry/default.nix @@ -42,13 +42,13 @@ let in stdenv.mkDerivation rec { pname = "strawberry"; - version = "1.0.11"; + version = "1.0.12"; src = fetchFromGitHub { owner = "jonaski"; repo = pname; rev = version; - hash = "sha256-w2KOZwxPpe/yQw2RBeTEYueeq7m5ZCQXlUH/f52GiyI="; + hash = "sha256-XJCU9cGhmwJ6f79y3tAW1qfJKO7YESVpHY/1FmPQ/Mo="; }; # the big strawberry shown in the context menu is *very* much in your face, so use the grey version instead diff --git a/pkgs/applications/blockchains/btcpayserver/default.nix b/pkgs/applications/blockchains/btcpayserver/default.nix index 17d6704644f..fb3912ab4db 100644 --- a/pkgs/applications/blockchains/btcpayserver/default.nix +++ b/pkgs/applications/blockchains/btcpayserver/default.nix @@ -6,13 +6,13 @@ buildDotnetModule rec { pname = "btcpayserver"; - version = "1.7.2"; + version = "1.7.3"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-EZ8gfpTBmTB/lGtexZYbD9x1F7rFXIEaEhhwS6gOEV4="; + sha256 = "sha256-wjtiircPPQgWg1GGQsesEEeOF+h1+tc591YI0l/JlwQ="; }; projectFile = "BTCPayServer/BTCPayServer.csproj"; diff --git a/pkgs/applications/blockchains/btcpayserver/deps.nix b/pkgs/applications/blockchains/btcpayserver/deps.nix index 29bf9844b17..6b67883226f 100644 --- a/pkgs/applications/blockchains/btcpayserver/deps.nix +++ b/pkgs/applications/blockchains/btcpayserver/deps.nix @@ -8,15 +8,15 @@ (fetchNuGet { pname = "AWSSDK.S3"; version = "3.3.110.10"; sha256 = "1lf1hfbx792dpa1hxgn0a0jrrvldd16hgbxx229dk2qcz5qlnc38"; }) (fetchNuGet { pname = "BIP78.Sender"; version = "0.2.2"; sha256 = "12pm2s35c0qzc06099q2z1pxwq94rq85n74yz8fs8gwvm2ksgp4p"; }) (fetchNuGet { pname = "BTCPayServer.Hwi"; version = "2.0.2"; sha256 = "0lh3n1qncqs4kbrmx65xs271f0d9c7irrs9qnsa9q51cbbqbljh9"; }) - (fetchNuGet { pname = "BTCPayServer.Lightning.All"; version = "1.4.12"; sha256 = "1n7yv6q8fbk02d334a19zyicvlammjhfrg9rf18jyb3szj8g36k7"; }) - (fetchNuGet { pname = "BTCPayServer.Lightning.Charge"; version = "1.3.16"; sha256 = "050wh5gw3hgql8191z0yv7sj06wg5da6kvkbcg9hq3ildj0fdj67"; }) - (fetchNuGet { pname = "BTCPayServer.Lightning.CLightning"; version = "1.3.19"; sha256 = "1jx9233apry0kb54df7k0p7vrsp3hp27f5d0j2802gry04sihrl7"; }) + (fetchNuGet { pname = "BTCPayServer.Lightning.All"; version = "1.4.14"; sha256 = "1k5m6jc585hnkkl019diz2gycfnsv2kx4g4cfs4awlpr42k8s3ph"; }) + (fetchNuGet { pname = "BTCPayServer.Lightning.Charge"; version = "1.3.18"; sha256 = "0zpqi8dpk91sqg7njxbs64m9598fmmalcc1w97v60xlhp9afjmdb"; }) + (fetchNuGet { pname = "BTCPayServer.Lightning.CLightning"; version = "1.3.21"; sha256 = "0qq6ppr5vw4k8hjnz5xp29fc82z32vh6bc389dnr439gw7hmwkp9"; }) (fetchNuGet { pname = "BTCPayServer.Lightning.Common"; version = "1.3.16"; sha256 = "1g37736b4k0ncpyy2qycbk4l85fqvgwac3k98nbdj0dvhfghp1dn"; }) - (fetchNuGet { pname = "BTCPayServer.Lightning.Common"; version = "1.3.17"; sha256 = "1bb8q57lnqnp3wijw41vvbwgz8rgg4g9pw8qhd4iiqi1w94q1bkz"; }) - (fetchNuGet { pname = "BTCPayServer.Lightning.Eclair"; version = "1.3.16"; sha256 = "1q109kmzj99axk35l68z3gi29ww1xd62zaxj1f39myvlcv9ncb41"; }) - (fetchNuGet { pname = "BTCPayServer.Lightning.LNBank"; version = "1.3.18"; sha256 = "166v6mhmy47fgny55c4mzqb2x7anqyxnd0g409vfgyg5fq4gc15v"; }) - (fetchNuGet { pname = "BTCPayServer.Lightning.LND"; version = "1.4.9"; sha256 = "0ya365w3i3sjv7wafm6wmasf9mpfsh0fcbhawsv5br7m7lpppwhh"; }) - (fetchNuGet { pname = "BTCPayServer.Lightning.LNDhub"; version = "1.0.12"; sha256 = "1gb61a5mdmyigy7ps2c8n4iig6i32rdsif9kwn35yxx25zbnmbk2"; }) + (fetchNuGet { pname = "BTCPayServer.Lightning.Common"; version = "1.3.19"; sha256 = "046vvlxlg8div4a2v6pnxz4iwji93s688jgnvav3hl6c22b9lvs0"; }) + (fetchNuGet { pname = "BTCPayServer.Lightning.Eclair"; version = "1.3.18"; sha256 = "04lp90rr61p7n39bfmia6jamgr0jjfns9987py64iazi236dl74g"; }) + (fetchNuGet { pname = "BTCPayServer.Lightning.LNBank"; version = "1.3.20"; sha256 = "1kwyh71zzfij07r6nvcf7k2gdpjdhh90imwh6s255ws13m1fj3sn"; }) + (fetchNuGet { pname = "BTCPayServer.Lightning.LND"; version = "1.4.11"; sha256 = "0zm0b45npacknir6b6a6v717kp3yz8hxv1qy2v65g2zp3ad2wij4"; }) + (fetchNuGet { pname = "BTCPayServer.Lightning.LNDhub"; version = "1.0.14"; sha256 = "1hhznv07bd1f3rn9d1rpg61ln68vqfjg7ypxif9lx4l3vfcj5j04"; }) (fetchNuGet { pname = "BTCPayServer.NETCore.Plugins"; version = "1.4.4"; sha256 = "0rk0prmb0539ji5fd33cqy3yvw51i5i8m5hb43admr5z8960dd6l"; }) (fetchNuGet { pname = "BTCPayServer.NETCore.Plugins.Mvc"; version = "1.4.4"; sha256 = "1kmmj5m7s41wc1akpqw1b1j7pp4c0vn6sqxb487980ibpj6hyisl"; }) (fetchNuGet { pname = "CsvHelper"; version = "15.0.5"; sha256 = "01y8bhsnxghn3flz0pr11vj6wjrpmia8rpdrsp7kjfc1zmhqlgma"; }) @@ -125,7 +125,6 @@ (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "1.0.0"; sha256 = "1sh9bidmhy32gkz6fkli79mxv06546ybrzppfw5v2aq0bda1ghka"; }) (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "2.0.0"; sha256 = "1x5isi71z02khikzvm7vaschb006pqqrsv86ky1x08a4hir4s43h"; }) (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "2.1.0"; sha256 = "1gvgif1wcx4k6pv7gc00qv1hid945jdywy1s50s33q0hfd91hbnj"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "3.1.10"; sha256 = "1571q9iznbsmd7p87w420parmpdgi8zfjcs4kynmwv344dwdismz"; }) (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "3.1.5"; sha256 = "0lr22hlf52csrna9ly2lbz3y1agfgdlg7rvsqjg7ik488dhkmhji"; }) (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "6.0.0"; sha256 = "0b75fmins171zi6bfdcq1kcvyrirs8n91mknjnxy4c3ygi1rrnj0"; }) (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "2.0.0"; sha256 = "0g4zadlg73f507krilhaaa7h0jdga216syrzjlyf5fdk25gxmjqh"; }) @@ -158,7 +157,7 @@ (fetchNuGet { pname = "NBitcoin"; version = "6.0.8"; sha256 = "1f90zyrd35fzx0vgvd83jhd6hczd4037h2k198xiyxj04l4m3wm5"; }) (fetchNuGet { pname = "NBitcoin"; version = "7.0.1"; sha256 = "05kqpjyp3ckb2183g9vfsdv362y5xg5j21p36zls0x3b0jgrwxw7"; }) (fetchNuGet { pname = "NBitcoin"; version = "7.0.18"; sha256 = "02kkgymdb80cidibrs6qpy1zjwcfbkwv9zqz9s0swf5zp7qvcakn"; }) - (fetchNuGet { pname = "NBitcoin"; version = "7.0.20"; sha256 = "0gl39v1mvnhdrqn8dmmslsyj4w4yc4l447zp62bfnwm5ppcwda9z"; }) + (fetchNuGet { pname = "NBitcoin"; version = "7.0.23"; sha256 = "10dy58gq644561svc67pm37rlb44mymbnlfz409dhclmfhmqmd5s"; }) (fetchNuGet { pname = "NBitcoin.Altcoins"; version = "3.0.17"; sha256 = "1rqcfpcs3c7zqlw3fnvnyw3d3mmplg5nsaikm50lnzpl8z3cq936"; }) (fetchNuGet { pname = "NBitpayClient"; version = "1.0.0.39"; sha256 = "1sgwradg7jnb4n3chwqfkximj1qhgl3r23p0sifmaa0kql2hlira"; }) (fetchNuGet { pname = "NBXplorer.Client"; version = "4.2.2"; sha256 = "0a8zy9iasgmr7mqhjrbxa2shnygpp97pbg5qnk7ix50y01k9blyw"; }) diff --git a/pkgs/applications/blockchains/btcpayserver/update.sh b/pkgs/applications/blockchains/btcpayserver/update.sh index 082911b42a3..9debe6780f2 100755 --- a/pkgs/applications/blockchains/btcpayserver/update.sh +++ b/pkgs/applications/blockchains/btcpayserver/update.sh @@ -8,5 +8,4 @@ echo "Updating nbxplorer" ../nbxplorer/update.sh echo echo "Updating btcpayserver" -# Include Razor SDK packages in deps.nix -../nbxplorer/util/update-common.sh btcpayserver deps.nix '"/p:Configuration="Altcoins-Release" /p:RazorCompileOnBuild=false' +../nbxplorer/util/update-common.sh btcpayserver deps.nix diff --git a/pkgs/applications/blockchains/nbxplorer/update.sh b/pkgs/applications/blockchains/nbxplorer/update.sh index caab20c928f..5db2723ef8e 100755 --- a/pkgs/applications/blockchains/nbxplorer/update.sh +++ b/pkgs/applications/blockchains/nbxplorer/update.sh @@ -3,4 +3,4 @@ set -euo pipefail scriptDir=$(cd "${BASH_SOURCE[0]%/*}" && pwd) -getVersionFromTags=1 "$scriptDir"/util/update-common.sh nbxplorer "$scriptDir"/deps.nix '' +getVersionFromTags=1 "$scriptDir"/util/update-common.sh nbxplorer "$scriptDir"/deps.nix diff --git a/pkgs/applications/blockchains/nbxplorer/util/create-deps.sh b/pkgs/applications/blockchains/nbxplorer/util/create-deps.sh deleted file mode 100755 index 2a862c31c88..00000000000 --- a/pkgs/applications/blockchains/nbxplorer/util/create-deps.sh +++ /dev/null @@ -1,46 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p dotnet-sdk_6 -set -euo pipefail - -# Writes deps for dotnet package in $pkgSrc to $depsFile. -# Expects $pkgSrc to contain a single .sln file. - -pkgSrc=$1 -depsFile=$(realpath "$2") -customFlags=$3 - -sln=$(cd "$pkgSrc"; find * -maxdepth 0 -name '*.sln' | head -1) -[[ $sln ]] || { echo "No .sln file in $pkgSrc" ; exit 1; } - -tmpdir=$(mktemp -d /tmp/$pkgName-src.XXX) -echo "Using tmp dir: $tmpdir" -cp -rT "$pkgSrc" "$tmpdir" -chmod -R +w "$tmpdir" - -pushd "$tmpdir" > /dev/null -mkdir home -echo "Running dotnet restore for $sln" -HOME=home DOTNET_CLI_TELEMETRY_OPTOUT=1 \ - dotnet restore $customFlags -v normal --no-cache "$sln" > restore_log - -echo "{ fetchNuGet }: [" > "$depsFile" -while read pkgSpec; do - { read pname; read version; } < <( - # Ignore build version part: 1.0.0-beta2+77df2220 -> 1.0.0-beta2 - sed -nE 's/.*<id>([^<]*).*/\1/p; s/.*<version>([^<+]*).*/\1/p' "$pkgSpec" - ) - sha256=$(nix-hash --type sha256 --flat --base32 "$(dirname "$pkgSpec")"/*.nupkg) - cat >> "$depsFile" <<EOF - (fetchNuGet { - pname = "$pname"; - version = "$version"; - sha256 = "$sha256"; - }) -EOF -done < <(find home/.nuget/packages -name '*.nuspec' | LC_ALL=C sort) -echo "]" >> "$depsFile" - -echo "Created $depsFile" - -popd > /dev/null -rm -r $tmpdir diff --git a/pkgs/applications/blockchains/nbxplorer/util/update-common.sh b/pkgs/applications/blockchains/nbxplorer/util/update-common.sh index ee523894486..6346c2fa9f4 100755 --- a/pkgs/applications/blockchains/nbxplorer/util/update-common.sh +++ b/pkgs/applications/blockchains/nbxplorer/util/update-common.sh @@ -10,7 +10,6 @@ trap 'echo "Error at ${BASH_SOURCE[0]}:$LINENO"' ERR pkgName=$1 depsFile=$2 -customFlags=$3 : ${getVersionFromTags:=} : ${refetch:=} @@ -75,5 +74,4 @@ fi echo # Create deps file -storeSrc="$(nix-build "$nixpkgs" -A $pkgName.src --no-out-link)" -. "$scriptDir"/create-deps.sh "$storeSrc" "$depsFile" "$customFlags" +$(nix-build "$nixpkgs" -A $pkgName.fetch-deps --no-out-link) "$depsFile" diff --git a/pkgs/applications/blockchains/zcash/default.nix b/pkgs/applications/blockchains/zcash/default.nix index 7466ff31d58..04340e75a7a 100644 --- a/pkgs/applications/blockchains/zcash/default.nix +++ b/pkgs/applications/blockchains/zcash/default.nix @@ -1,5 +1,5 @@ { autoreconfHook, boost180, cargo, coreutils, curl, cxx-rs, db62, fetchFromGitHub -, hexdump, hostPlatform, lib, libevent, libsodium, makeWrapper, rust, rustPlatform +, hexdump, lib, libevent, libsodium, makeWrapper, rust, rustPlatform , pkg-config, Security, stdenv, testers, utf8cpp, util-linux, zcash, zeromq }: @@ -82,6 +82,6 @@ rustPlatform.buildRustPackage.override { inherit stdenv; } rec { license = licenses.mit; # https://github.com/zcash/zcash/issues/4405 - broken = hostPlatform.isAarch64 && hostPlatform.isDarwin; + broken = stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/applications/editors/emacs/generic.nix b/pkgs/applications/editors/emacs/generic.nix index d6ce650fb8a..cd68f0dbf5f 100644 --- a/pkgs/applications/editors/emacs/generic.nix +++ b/pkgs/applications/editors/emacs/generic.nix @@ -13,7 +13,7 @@ , alsa-lib, cairo, acl, gpm, m17n_lib, libotf , sigtool, jansson, harfbuzz, sqlite, nixosTests , recurseIntoAttrs, emacsPackagesFor -, libgccjit, targetPlatform, makeWrapper # native-comp params +, libgccjit, makeWrapper # native-comp params , fetchFromSavannah, fetchFromBitbucket # macOS dependencies for NS and macPort diff --git a/pkgs/applications/editors/rednotebook/default.nix b/pkgs/applications/editors/rednotebook/default.nix index c323a10e9b2..3f560d17e53 100644 --- a/pkgs/applications/editors/rednotebook/default.nix +++ b/pkgs/applications/editors/rednotebook/default.nix @@ -5,13 +5,13 @@ buildPythonApplication rec { pname = "rednotebook"; - version = "2.26"; + version = "2.29"; src = fetchFromGitHub { owner = "jendrikseipp"; repo = "rednotebook"; rev = "refs/tags/v${version}"; - sha256 = "sha256-QKK0bHy6pe+elPhnQlYAwmFP93LwCGxqRtBy10vj4i4="; + sha256 = "sha256-gRmSxWAVF61svlZ0/IMTrWCmwin+uPONLBlcJOYcp2w="; }; # We have not packaged tests. diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 51b9107d3e7..6481c992e22 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -29,12 +29,12 @@ final: prev: ChatGPT-nvim = buildVimPluginFrom2Nix { pname = "ChatGPT.nvim"; - version = "2022-12-28"; + version = "2023-01-08"; src = fetchFromGitHub { owner = "jackMort"; repo = "ChatGPT.nvim"; - rev = "6c7e326add8fbb8c6662d92dd6bd9e1eb15f7c5a"; - sha256 = "1lfq402h6z9y371yi11k2q19kii72xvfl540h2931w0hwdq6w5vj"; + rev = "c33babb015005cda6042f908ac587e4bc498d041"; + sha256 = "1hi5g82xr7vvlzwlwa2l1a4ji9ic7y3jzp76fqahsksmc9c9qqxh"; }; meta.homepage = "https://github.com/jackMort/ChatGPT.nvim/"; }; @@ -353,12 +353,12 @@ final: prev: SpaceVim = buildVimPluginFrom2Nix { pname = "SpaceVim"; - version = "2022-12-28"; + version = "2023-01-08"; src = fetchFromGitHub { owner = "SpaceVim"; repo = "SpaceVim"; - rev = "9e80d9bbfad057cd8c056523ac18571083461ef0"; - sha256 = "0488ps030wvjpx99dxnw53867cd86pb073c5f5aynhyc5l0rlgwj"; + rev = "14d66bdb96c610f40d7a4265aadecd6f584fc76b"; + sha256 = "0vfxd29c0a0yqbhpplppbp511hy2xidss29zcd5kqii0s43cbc04"; }; meta.homepage = "https://github.com/SpaceVim/SpaceVim/"; }; @@ -449,12 +449,12 @@ final: prev: YouCompleteMe = buildVimPluginFrom2Nix { pname = "YouCompleteMe"; - version = "2023-01-03"; + version = "2023-01-09"; src = fetchFromGitHub { owner = "ycm-core"; repo = "YouCompleteMe"; - rev = "6cc453397564164b7cdb341cd73f55a3aaf465c4"; - sha256 = "0kxzhywk4zksyvkx73vhzjazyd7dfymryzaxm8g97xxr0xd2970m"; + rev = "7620d87fe1a1632c620921cb0989d358638fb324"; + sha256 = "19kmfq9kaxlpcznb65nh726axica9b8177ax863n6nbg0z52dvvr"; fetchSubmodules = true; }; meta.homepage = "https://github.com/ycm-core/YouCompleteMe/"; @@ -835,12 +835,12 @@ final: prev: barbecue-nvim = buildVimPluginFrom2Nix { pname = "barbecue.nvim"; - version = "2023-01-07"; + version = "2023-01-09"; src = fetchFromGitHub { owner = "utilyre"; repo = "barbecue.nvim"; - rev = "fc72ed04e87df12efbdcea25e6f0dce9d5229b6b"; - sha256 = "0cfa2cqvscaai26yfjmxnv740p351v1dgqdg1v3snrmhj3m5i7bw"; + rev = "51e6be4c0836b5fa9a9e6f679589f0e3cf90ec93"; + sha256 = "09yl34b4qiv87rl88daa258443rgcxb6kx9yrhkc6ssalkh1a3gp"; }; meta.homepage = "https://github.com/utilyre/barbecue.nvim/"; }; @@ -895,12 +895,12 @@ final: prev: better-escape-nvim = buildVimPluginFrom2Nix { pname = "better-escape.nvim"; - version = "2022-03-28"; + version = "2023-01-09"; src = fetchFromGitHub { owner = "max397574"; repo = "better-escape.nvim"; - rev = "d5ee0cef56a7e41a86048c14f25e964876ac20c1"; - sha256 = "04hi2zmaz02fiyvjs94lqn7imp20fn2vpwww37sg7gim18b1mpl4"; + rev = "6fed33809cde3b416087fc540ad9eb17ec470193"; + sha256 = "1wqps75qkr7rqdvrsn6f8m02nkqap9g6cca1jqf53y9476jsbml7"; }; meta.homepage = "https://github.com/max397574/better-escape.nvim/"; }; @@ -967,12 +967,12 @@ final: prev: bufexplorer = buildVimPluginFrom2Nix { pname = "bufexplorer"; - version = "2022-09-20"; + version = "2023-01-07"; src = fetchFromGitHub { owner = "jlanzarotta"; repo = "bufexplorer"; - rev = "e782dab0fe9523ac65d9fe4f726f2efe924e3f43"; - sha256 = "1zbaqs96rimwawcf6nhxi3l02gs1yzdr4qk5aqh2ka0g6mx8mldn"; + rev = "5a830d5d2d7417bf02339ec279c90e98dde822f8"; + sha256 = "1vcfz4ngk5jsh66l74na9r0z2d3y6annb518kv0lgv76z99g5vy8"; }; meta.homepage = "https://github.com/jlanzarotta/bufexplorer/"; }; @@ -1351,12 +1351,12 @@ final: prev: cmp-git = buildVimPluginFrom2Nix { pname = "cmp-git"; - version = "2022-08-08"; + version = "2023-01-09"; src = fetchFromGitHub { owner = "petertriho"; repo = "cmp-git"; - rev = "fae6cdb407ad6c63a0b1928670bad1a67a55b887"; - sha256 = "1iz6jkwk6fpn8vpqn8nvxrn35bbx6q2ssgycsrpny5293dkyiwgx"; + rev = "6bcb61c0a5ec2e0d522ece7c8fb3e009f1c79261"; + sha256 = "0n00apdpm920hjddmyhzynqxzdqz1scmqays9p4c4b6dq06jblbr"; }; meta.homepage = "https://github.com/petertriho/cmp-git/"; }; @@ -2047,12 +2047,12 @@ final: prev: copilot-cmp = buildVimPluginFrom2Nix { pname = "copilot-cmp"; - version = "2022-10-12"; + version = "2023-01-07"; src = fetchFromGitHub { owner = "zbirenbaum"; repo = "copilot-cmp"; - rev = "84d5a0e8e4d1638e7554899cb7b642fa24cf463f"; - sha256 = "180y6d89bldlpilhfz7dakyaml6mfhspnxjn4jliwql4k45xckbi"; + rev = "b732a58ac8b7287b981cd9f0d9c0f61e5e9d5760"; + sha256 = "0l05mrkc5v04nmrnazlqsb8p5ibv6p8lzy4ywvfrask14ajlfmz3"; }; meta.homepage = "https://github.com/zbirenbaum/copilot-cmp/"; }; @@ -2083,24 +2083,24 @@ final: prev: coq-artifacts = buildVimPluginFrom2Nix { pname = "coq.artifacts"; - version = "2022-12-25"; + version = "2023-01-08"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq.artifacts"; - rev = "9d90bbff10171fcd9c6c4598e2cc7de1e6101463"; - sha256 = "1pchn21aq8chrlk16qkwxc8q63bccysqk2lnz5gc5j3gnnlx3asm"; + rev = "53cac5a2cc6f64765b658114efb50d62d7497ff4"; + sha256 = "16z4g42h4mi3bvm7aj3c0jxv0r4vyb8a6z2fh1wlrbsgihk34nfw"; }; meta.homepage = "https://github.com/ms-jpq/coq.artifacts/"; }; coq-thirdparty = buildVimPluginFrom2Nix { pname = "coq.thirdparty"; - version = "2022-12-25"; + version = "2023-01-08"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq.thirdparty"; - rev = "48c0b049999549c18365fc4d7bb23ecbae58b47d"; - sha256 = "0y4rwr4vfacvmj5bnia3s4h51fk73cay4kmwaajp1r1gbsxxiynq"; + rev = "af94c7ad7ca379a68db0fef12622f8066248f2d3"; + sha256 = "1msc60984zfwpvv3wx279bkjk4xy9hnf0mamaq1nvn6zh7dnsk5f"; }; meta.homepage = "https://github.com/ms-jpq/coq.thirdparty/"; }; @@ -2119,12 +2119,12 @@ final: prev: coq_nvim = buildVimPluginFrom2Nix { pname = "coq_nvim"; - version = "2022-12-25"; + version = "2023-01-08"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq_nvim"; - rev = "6ca864153bab793b5d75c8af1b8e2195145dba80"; - sha256 = "1mqciqyd4fjdrssf07mi3wk4qgvf48khpzgqzbsbv6c0g1k4pmn4"; + rev = "8fe777d9ce4eb8519bef208f92e0843ddf2b2a1a"; + sha256 = "1n7dlp712k92sh74c53g71d461vjll8pr4hdy15ksskh8j4i337s"; }; meta.homepage = "https://github.com/ms-jpq/coq_nvim/"; }; @@ -2637,24 +2637,24 @@ final: prev: dial-nvim = buildVimPluginFrom2Nix { pname = "dial.nvim"; - version = "2022-12-20"; + version = "2023-01-09"; src = fetchFromGitHub { owner = "monaqa"; repo = "dial.nvim"; - rev = "61afb28f61ba090a67a88186f7bc8a94212e509a"; - sha256 = "0zzmgyl0j9ajmmyiwbpyp5js0ssz8gnlll6kbyk421jybjy17l6n"; + rev = "1bf15b96126711424918cc66ccbbd53c4c1cec19"; + sha256 = "1i97b2n2xyvj4a4abnnf3l98q341v7knalpibhl2byfwps7q2igc"; }; meta.homepage = "https://github.com/monaqa/dial.nvim/"; }; diffview-nvim = buildVimPluginFrom2Nix { pname = "diffview.nvim"; - version = "2023-01-03"; + version = "2023-01-09"; src = fetchFromGitHub { owner = "sindrets"; repo = "diffview.nvim"; - rev = "e3e15d8f1d727056185fc1696be1554837dec897"; - sha256 = "134dxj758afq42kfhkd94scb70x6a8m4rb6f39cj1c2xyzfkrsa4"; + rev = "18d88c86a1d7b5256f96694bd41aaee7037a6cc1"; + sha256 = "048iwz14sf69y65lwwgbhmvg70g69rjg6mfjn42n6055lwz0djh9"; }; meta.homepage = "https://github.com/sindrets/diffview.nvim/"; }; @@ -2673,12 +2673,12 @@ final: prev: doki-theme-vim = buildVimPluginFrom2Nix { pname = "doki-theme-vim"; - version = "2022-12-06"; + version = "2023-01-07"; src = fetchFromGitHub { owner = "doki-theme"; repo = "doki-theme-vim"; - rev = "a83452264666eeb966b7fd5f48ddf15b8ca05450"; - sha256 = "1v84dz04xbwwhh61fvpmfvydpvj5wkqskml908rgjzmk6y3hp8wq"; + rev = "407c75de0049a184d6eb09ad415d2ccbc22ba612"; + sha256 = "1f38pgfwfa114f768f77fdy733nbn12ch33q7gskji28mwmdp8yy"; }; meta.homepage = "https://github.com/doki-theme/doki-theme-vim/"; }; @@ -2939,12 +2939,12 @@ final: prev: firenvim = buildVimPluginFrom2Nix { pname = "firenvim"; - version = "2023-01-05"; + version = "2023-01-09"; src = fetchFromGitHub { owner = "glacambre"; repo = "firenvim"; - rev = "d1909c7abbc1857cc8b67e0234d7932ad7825644"; - sha256 = "1z43p3whs5hfmdda7ck36n1s34w3k20k093m9asgdd6cv5bj7p96"; + rev = "b6be2e074b8f62815a45e31eb0966b4dd5e57810"; + sha256 = "0jhb91wfkz3jr1hxhigb551gg4c0gv8hdj9avyd5kj5lqwmy1j4q"; }; meta.homepage = "https://github.com/glacambre/firenvim/"; }; @@ -3156,24 +3156,24 @@ final: prev: fzf-lua = buildVimPluginFrom2Nix { pname = "fzf-lua"; - version = "2023-01-06"; + version = "2023-01-09"; src = fetchFromGitHub { owner = "ibhagwan"; repo = "fzf-lua"; - rev = "a5cf6e1debc9805f25443fab9cb0684c2507341e"; - sha256 = "1x8bb2pkp4dcr3jvhkbcblgxg7h2siv63iqv2hzdk5klrgmajqh9"; + rev = "632dbf6407b95cfa7995765f44d16c8d1663a04c"; + sha256 = "0j4p73mcqllbr7rivcqlcc1zk7x67z04dkyww60ibbnzfzins4gr"; }; meta.homepage = "https://github.com/ibhagwan/fzf-lua/"; }; fzf-vim = buildVimPluginFrom2Nix { pname = "fzf.vim"; - version = "2022-12-31"; + version = "2023-01-08"; src = fetchFromGitHub { owner = "junegunn"; repo = "fzf.vim"; - rev = "0f03107bc94b31a9c7adcee6da8e5de7492e4b0b"; - sha256 = "1fql2wcmc7c6lh2vsbb199q4isjz8ghd5a5fhcyiay5fl9rwgzw9"; + rev = "9c37e6801b432a4046511b14414f488487b61973"; + sha256 = "0f6c632k49xs0c8gbrd0bddrlbjyaw75vgjxszwd3x1cbl2mbk7c"; }; meta.homepage = "https://github.com/junegunn/fzf.vim/"; }; @@ -3312,12 +3312,12 @@ final: prev: gitsigns-nvim = buildNeovimPluginFrom2Nix { pname = "gitsigns.nvim"; - version = "2023-01-04"; + version = "2023-01-09"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "d4f8c01280413919349f5df7daccd0c172143d7c"; - sha256 = "114c7yjgi6d9mhr1c94n73msr3204idvcbh6y7i8y0853aan0jiz"; + rev = "114362a85e51918ab2965181ffa31932c181f32f"; + sha256 = "047gb4m4xzf34lsbax3fvb77gklig1p5k1srq5kxp1xn5vyl2w74"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -3563,12 +3563,12 @@ final: prev: haskell-tools-nvim = buildVimPluginFrom2Nix { pname = "haskell-tools.nvim"; - version = "2023-01-06"; + version = "2023-01-09"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "haskell-tools.nvim"; - rev = "cc6e727b7e605ddd63fd4f482755e8d8198289fa"; - sha256 = "0pml2n16zrw4fmkd455fjmh9vxbwsqdwzip69gxlcgck0rraqirh"; + rev = "7104fbe396f479db9d644c990669ed8b21024d70"; + sha256 = "088mzb5y79afrn5in8g3wkii6izy86z1n66w94mrcl59dffcgzn3"; }; meta.homepage = "https://github.com/MrcJkb/haskell-tools.nvim/"; }; @@ -4103,12 +4103,12 @@ final: prev: lazy-nvim = buildVimPluginFrom2Nix { pname = "lazy.nvim"; - version = "2023-01-07"; + version = "2023-01-09"; src = fetchFromGitHub { owner = "folke"; repo = "lazy.nvim"; - rev = "8798ccc95031225e3b2241bd8b2d26c2452b06c4"; - sha256 = "0n5ga8nfh5qc0abd6zwj4bibk72wpjkqx76qx5aw9r69w70mjqnq"; + rev = "e6ee0fa6103e9514e85a96fc16902ad7f777b53f"; + sha256 = "1463an1sdccsnxk8hlcxl3zb6bmwwd2mgqmdbixn5v33ijncjsr4"; }; meta.homepage = "https://github.com/folke/lazy.nvim/"; }; @@ -4355,12 +4355,12 @@ final: prev: lir-nvim = buildVimPluginFrom2Nix { pname = "lir.nvim"; - version = "2022-12-24"; + version = "2023-01-09"; src = fetchFromGitHub { owner = "tamago324"; repo = "lir.nvim"; - rev = "84af01547e51e15fc97e878330414385eeb825e8"; - sha256 = "1idk82wyzwr1qk4waj8hik5jcv2zgbyc7zbb2bxl2vj0pdij8knw"; + rev = "1fb0c78906677ec67493ffc3b4b6f7d584d25498"; + sha256 = "0pf5ik5yma1j2w32gx4kb6s3p0hh0rhh0w9hkks7670jwib9sg3g"; }; meta.homepage = "https://github.com/tamago324/lir.nvim/"; }; @@ -4511,12 +4511,12 @@ final: prev: lsp-zero-nvim = buildVimPluginFrom2Nix { pname = "lsp-zero.nvim"; - version = "2023-01-07"; + version = "2023-01-09"; src = fetchFromGitHub { owner = "VonHeikemen"; repo = "lsp-zero.nvim"; - rev = "6224e879acc5ec25e2baae2a1c3d3cfe804e2486"; - sha256 = "177gkyd7dyw24yrv3mfb6aip63nrxqf45vlrksl67bbq0q6kkak9"; + rev = "b3d60f170a23ba52cfd56fd6f8ce70a38e853330"; + sha256 = "1xhdqc16qyhkp9gp2lgqx3y7ayssnwcmy48m0s4phw7hkmjf4g6r"; }; meta.homepage = "https://github.com/VonHeikemen/lsp-zero.nvim/"; }; @@ -4618,12 +4618,12 @@ final: prev: luasnip = buildVimPluginFrom2Nix { pname = "luasnip"; - version = "2022-12-20"; + version = "2023-01-09"; src = fetchFromGitHub { owner = "l3mon4d3"; repo = "luasnip"; - rev = "5570fd797eae0790affb54ea669a150cad76db5d"; - sha256 = "0052rkqyhniz6djz7gkblmdlndllwv9jhcl6kh973qq23pdb00n4"; + rev = "5d57303efde86fcb0959c52b1a6d40f923940f34"; + sha256 = "16ajdq0m3msn1y7j8iqi9r9i297g9vvidff63xzk8jkw2h8frizn"; fetchSubmodules = true; }; meta.homepage = "https://github.com/l3mon4d3/luasnip/"; @@ -4679,24 +4679,24 @@ final: prev: marks-nvim = buildVimPluginFrom2Nix { pname = "marks.nvim"; - version = "2022-11-24"; + version = "2023-01-07"; src = fetchFromGitHub { owner = "chentoast"; repo = "marks.nvim"; - rev = "a69253e4b471a2421f9411bc5bba127eef878dc0"; - sha256 = "1df3c2apc4gsgrysdya99294c5h5lxibr9xifnv26rgbcqqk7njh"; + rev = "c3b18b97912720a6586fb537c5c0dfc9e06a68f1"; + sha256 = "1qgzvqzlnnb6axlcnyzw8lmafx8absv7dprqxkbgk5fkrdlcd9mm"; }; meta.homepage = "https://github.com/chentoast/marks.nvim/"; }; mason-lspconfig-nvim = buildVimPluginFrom2Nix { pname = "mason-lspconfig.nvim"; - version = "2023-01-06"; + version = "2023-01-09"; src = fetchFromGitHub { owner = "williamboman"; repo = "mason-lspconfig.nvim"; - rev = "33a198bc5ee0215ae8ab3f61781b29103cf4ca5a"; - sha256 = "0rv8vy9gswqq76857xbanlw0l2mvls39qgsd2whnwz118gf92jh2"; + rev = "3751eb5c56c67b51e68a1f4a0da28ae74ab771c1"; + sha256 = "077pgksadar290n6zhgna6c42cvqj966sb3lb7l05xfd4m88ajn0"; }; meta.homepage = "https://github.com/williamboman/mason-lspconfig.nvim/"; }; @@ -4715,12 +4715,12 @@ final: prev: mason-nvim = buildVimPluginFrom2Nix { pname = "mason.nvim"; - version = "2023-01-07"; + version = "2023-01-09"; src = fetchFromGitHub { owner = "williamboman"; repo = "mason.nvim"; - rev = "369d520350b4c1af40630f90c3703444c40c065a"; - sha256 = "1335n3jplxirwg1dyn52lzsni0dw7viv9sm3bqa8ib7fn051f4fx"; + rev = "a4ebe1f14ba31242cd09f9e0709d5b1f9d2bcecb"; + sha256 = "0jwqfmd89dghfrmfp7srcahxz5c7rkafyzd056s7qiwpciqi7hbn"; }; meta.homepage = "https://github.com/williamboman/mason.nvim/"; }; @@ -5147,12 +5147,12 @@ final: prev: neoconf-nvim = buildVimPluginFrom2Nix { pname = "neoconf.nvim"; - version = "2023-01-07"; + version = "2023-01-09"; src = fetchFromGitHub { owner = "folke"; repo = "neoconf.nvim"; - rev = "2b873a75159ec0c8d160da029392b1c4e31e1927"; - sha256 = "0mvgwysgb78hxa80zik7nxfbagvhm6gwkclaq62vr7iyjsy4ranx"; + rev = "4b4e539325db1d939be5a1d7a4b2d5644c59eda2"; + sha256 = "1gdpiakgwn7f8lfx2hfvr4vaxnczni6i6yxfkc7hzf0r6h64q4h0"; }; meta.homepage = "https://github.com/folke/neoconf.nvim/"; }; @@ -5195,12 +5195,12 @@ final: prev: neogit = buildVimPluginFrom2Nix { pname = "neogit"; - version = "2023-01-05"; + version = "2023-01-09"; src = fetchFromGitHub { owner = "TimUntersberger"; repo = "neogit"; - rev = "84cf7efba6e4daed11a1185ea09fa553a3ca3d4f"; - sha256 = "17ywbfg0shi8mjpfscrsqgm644nvayaycggza5sm0r4224rcvdjc"; + rev = "a364c3da583a78f707aac761f5927967a0165143"; + sha256 = "1y9vn5a35kq9imvp57gdal2pi2vhrv27l2vc5xzsa8clvcd05jxy"; }; meta.homepage = "https://github.com/TimUntersberger/neogit/"; }; @@ -5327,12 +5327,12 @@ final: prev: neotest-haskell = buildVimPluginFrom2Nix { pname = "neotest-haskell"; - version = "2023-01-06"; + version = "2023-01-08"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "neotest-haskell"; - rev = "b8310d053c8859a159828054f930be8fdb18eb2d"; - sha256 = "1hbrbxvs990a6fg3qr3mis8d9wpg9az675wx9yj0dlaisb0sq7kf"; + rev = "132615d26f21dc3390a6c1f9f693dcad4be0c2b7"; + sha256 = "0pgbh9jzva3bvzav33xz39fr4x4jqgqnyha44ff2hhdda3ba0b6m"; }; meta.homepage = "https://github.com/MrcJkb/neotest-haskell/"; }; @@ -5481,14 +5481,26 @@ final: prev: meta.homepage = "https://github.com/zah/nim.vim/"; }; + nix-develop-nvim = buildVimPluginFrom2Nix { + pname = "nix-develop.nvim"; + version = "2023-01-10"; + src = fetchFromGitHub { + owner = "figsoda"; + repo = "nix-develop.nvim"; + rev = "456f0b202cc179390bc9ed84fbd589832849e983"; + sha256 = "0yk7661336sjlvmsk7p7v6ssr5242r6xy5cm4d22pvk9zz5yzxwc"; + }; + meta.homepage = "https://github.com/figsoda/nix-develop.nvim/"; + }; + nlsp-settings-nvim = buildVimPluginFrom2Nix { pname = "nlsp-settings.nvim"; - version = "2023-01-07"; + version = "2023-01-09"; src = fetchFromGitHub { owner = "tamago324"; repo = "nlsp-settings.nvim"; - rev = "47a3e92a9b3a2f7604d4a9eefd1d55518554a89d"; - sha256 = "1b7a5al09bnq1a3315gmg5dwxsw560dksqg3kqrphbx80g6v3f74"; + rev = "ce9c4b5869e6ff2714812ada81553e9aa063e3ef"; + sha256 = "1k0cjkvlfk5x92v5gcrcla3kj6r6kb5ygbm02jpr8ypraasy57nm"; }; meta.homepage = "https://github.com/tamago324/nlsp-settings.nvim/"; }; @@ -5639,12 +5651,12 @@ final: prev: nvim-autopairs = buildVimPluginFrom2Nix { pname = "nvim-autopairs"; - version = "2022-12-24"; + version = "2023-01-08"; src = fetchFromGitHub { owner = "windwp"; repo = "nvim-autopairs"; - rev = "03580d758231956d33c8dd91e2be195106a79fa4"; - sha256 = "1qc7i1q4mkxqqmmcn22aig3sagg8g3qn6iw7xy56lv8dxk8yml9d"; + rev = "f00eb3b766c370cb34fdabc29c760338ba9e4c6c"; + sha256 = "147s9mq3vlvsf4wzm0x5aiwr374zhi3d6d2b9y52iwndwjvjkh0b"; }; meta.homepage = "https://github.com/windwp/nvim-autopairs/"; }; @@ -5663,12 +5675,12 @@ final: prev: nvim-biscuits = buildVimPluginFrom2Nix { pname = "nvim-biscuits"; - version = "2022-12-26"; + version = "2023-01-09"; src = fetchFromGitHub { owner = "code-biscuits"; repo = "nvim-biscuits"; - rev = "e58b47d7ff6bded07f30f51ca1fa4855a1a6dfb1"; - sha256 = "1as4c9ahmdvfnrsa3ih3dzz2pk8y00fyss1m61cs1q1l9j0cnc7j"; + rev = "25a880605fa4533b7075c54a0fdb5f0a25bc4f84"; + sha256 = "12lij0yv3n596yp2jbrdh17awrgvsm8gfyrafgvdzj4jibn16c68"; }; meta.homepage = "https://github.com/code-biscuits/nvim-biscuits/"; }; @@ -5819,12 +5831,12 @@ final: prev: nvim-dap = buildVimPluginFrom2Nix { pname = "nvim-dap"; - version = "2023-01-05"; + version = "2023-01-08"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap"; - rev = "1077a86c83f75a6eec36c91f91d6b728e2b02130"; - sha256 = "17l45nyd7285w20l22s4m09hjck5nwmdjkbmc1cr7lrv8yiv5j1i"; + rev = "700a3c7d6fbe5b07bee74e9952b456120d355c47"; + sha256 = "16hrqqa6577lq51hcx048j8rwa6aqdb6dz9b94rv1ki0jy52cx00"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap/"; }; @@ -6047,12 +6059,12 @@ final: prev: nvim-lint = buildVimPluginFrom2Nix { pname = "nvim-lint"; - version = "2023-01-05"; + version = "2023-01-08"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-lint"; - rev = "9c9490f63428f667fd3fcc7025947323653e17cc"; - sha256 = "1igqy3dharnypk4wxdgkkjy99rs8rlilkzwk7hx4x5bc50h20n7q"; + rev = "28af70fe2d410cb202a8a6a0c014184f2b12da61"; + sha256 = "0as30f6f2whgzj911ac8gdrd2i7y0w9r4j0vq3j027wf6sx6i6zg"; }; meta.homepage = "https://github.com/mfussenegger/nvim-lint/"; }; @@ -6071,12 +6083,12 @@ final: prev: nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2023-01-07"; + version = "2023-01-09"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "41dc4e017395d73af0333705447e858b7db1f75e"; - sha256 = "1vpxgnid3a66b1bh6zk3l2h014bbykvpzz9s9d55cb6591kmbsa1"; + rev = "7b98aadc6e85db4fc3af6c1ec22c4774d965506e"; + sha256 = "1b0ygz9jyaj0i993qnjvfnr6yxf65sa8vkfjg2qh2gh1dphsvhfp"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -6311,24 +6323,24 @@ final: prev: nvim-tree-lua = buildVimPluginFrom2Nix { pname = "nvim-tree.lua"; - version = "2023-01-07"; + version = "2023-01-09"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-tree.lua"; - rev = "f2ee30998eb4e191ed9931719a4e3b28be35494b"; - sha256 = "0881z195zzqm5lp9q1vas5dzi54qxrhd91gd9fz06w77c3ki5spa"; + rev = "87961d38a7b6cd799ebe193946e86a1037ba66e8"; + sha256 = "0ch5df2x39knvjs0j5vkbxlkl8md218ghdhms1gykj57074jsc2x"; }; meta.homepage = "https://github.com/nvim-tree/nvim-tree.lua/"; }; nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2023-01-07"; + version = "2023-01-09"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "ef0cd56e482bf82be82afd6afc69268fc6037475"; - sha256 = "1pwydn801jvvahy491zhisfkmyk7n96lxvyj5msch3jjfg14whqw"; + rev = "5fb315df12a3091f241b0326aed0ec70381adbd8"; + sha256 = "00cpr1qalmgp6qbs0nhyj082dpndyir0ck2i3p09qqah2bfb1sy8"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; @@ -6419,11 +6431,11 @@ final: prev: nvim-ts-rainbow2 = buildVimPluginFrom2Nix { pname = "nvim-ts-rainbow2"; - version = "2023-01-06"; + version = "2023-01-08"; src = fetchgit { url = "https://gitlab.com/HiPhish/nvim-ts-rainbow2"; - rev = "8b027039f2e3e735b8d7b8d22c5e04b56832e972"; - sha256 = "1l6q16jjn88x0kv56lrp5x1ik7kmbd0zcgkdg34wkmcnky8jq6ms"; + rev = "09dcb851701747b3f4c5c1088befc88e1601942d"; + sha256 = "0a905qsy01wyyxsgcy354mfn7039dy3ib82yzixacdbwzmng1kcz"; }; meta.homepage = "https://gitlab.com/HiPhish/nvim-ts-rainbow2"; }; @@ -6574,12 +6586,12 @@ final: prev: onedarkpro-nvim = buildVimPluginFrom2Nix { pname = "onedarkpro.nvim"; - version = "2023-01-04"; + version = "2023-01-09"; src = fetchFromGitHub { owner = "olimorris"; repo = "onedarkpro.nvim"; - rev = "335166c57b37e81989c0e3826e9f03759d64f39c"; - sha256 = "1gc40qdxa012zbr1f94wwwss9bszngp4yd4hm0k4jg02gi8k16wg"; + rev = "61b4f4509a59247118ff93f1707f41d4674a5ac2"; + sha256 = "154r8gibyjzb8cp34xpz00l71f1drixvcsvsrw8lp1hqaak3hywd"; }; meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/"; }; @@ -6598,12 +6610,12 @@ final: prev: onenord-nvim = buildVimPluginFrom2Nix { pname = "onenord.nvim"; - version = "2023-01-03"; + version = "2023-01-07"; src = fetchFromGitHub { owner = "rmehri01"; repo = "onenord.nvim"; - rev = "fadf6d43c0c9014443e62857284169567a879bbf"; - sha256 = "1b6fhlkl9i73vq744b8r1l815lj57mz41n2qd21sgx6mfc427mh4"; + rev = "b05d57d04445836e6b9235e1937bf0a3ba42506b"; + sha256 = "1n92ajibyz9w1iyyndkjzk6vzk3vz0wam1h39990c7fl4jj74is1"; }; meta.homepage = "https://github.com/rmehri01/onenord.nvim/"; }; @@ -7188,12 +7200,12 @@ final: prev: rust-tools-nvim = buildVimPluginFrom2Nix { pname = "rust-tools.nvim"; - version = "2022-11-06"; + version = "2023-01-08"; src = fetchFromGitHub { owner = "simrat39"; repo = "rust-tools.nvim"; - rev = "99fd1238c6068d0637df30b6cee9a264334015e9"; - sha256 = "0y95kj77p4zjskn6j7bp04scrlgg5l8827zc3m6f18cgcy1qnngf"; + rev = "df584e84393ef255f5b8cbd709677d6a3a5bf42f"; + sha256 = "1h2p6xdv4bxphn98iwjzk9fh54lh1ff41smp2n0j84inqpl0mygv"; }; meta.homepage = "https://github.com/simrat39/rust-tools.nvim/"; }; @@ -9030,12 +9042,12 @@ final: prev: vim-airline = buildVimPluginFrom2Nix { pname = "vim-airline"; - version = "2023-01-02"; + version = "2023-01-09"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "0913c0a3b6fc256e6de8dff00dfd1c9388cad9a6"; - sha256 = "0bvyr49shcqbdmcp0q06nfbay5cff11r80nhis3p3gdccik74zv7"; + rev = "4f5b641710bc8cffddb28c6821b2ee7abaafefe6"; + sha256 = "1pbg094i8s314f4ffa3ppcdycp1ylzd6z29xhvcsf4q83ji212r4"; }; meta.homepage = "https://github.com/vim-airline/vim-airline/"; }; @@ -9174,12 +9186,12 @@ final: prev: vim-autoformat = buildVimPluginFrom2Nix { pname = "vim-autoformat"; - version = "2022-09-10"; + version = "2023-01-09"; src = fetchFromGitHub { owner = "vim-autoformat"; repo = "vim-autoformat"; - rev = "63866f84095888d69af4e03d04ee6384fb93ef9b"; - sha256 = "0501jskp4yxva9h12awmkk50hj8l8yxkqrbm362hgji7gh5n3za8"; + rev = "d529e3e09a378695367969bf01735b9b997014ec"; + sha256 = "06p0246rw4cra2c9zr6bml9ylflyb4kcx4h5nfcriz0rsqgph0ha"; }; meta.homepage = "https://github.com/vim-autoformat/vim-autoformat/"; }; @@ -9426,12 +9438,12 @@ final: prev: vim-clap = buildVimPluginFrom2Nix { pname = "vim-clap"; - version = "2023-01-06"; + version = "2023-01-09"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-clap"; - rev = "ea2bebd2aa8c6fd677537fe0ef54b8c29a337e89"; - sha256 = "0yww0igh798aqs8rfbrvsvc1yigaf1gl1ib0gi8gs4qv269dbsdj"; + rev = "d388abc011762b01a0b31cb07a37e4da7f594eeb"; + sha256 = "03ik7icaal6i6w3pdizkip0l7cjgz9hfm6y6dhlrgq1szf5mnq6c"; }; meta.homepage = "https://github.com/liuchengxu/vim-clap/"; }; @@ -11457,12 +11469,12 @@ final: prev: vim-nixhash = buildVimPluginFrom2Nix { pname = "vim-nixhash"; - version = "2022-09-01"; + version = "2023-01-09"; src = fetchFromGitHub { owner = "symphorien"; repo = "vim-nixhash"; - rev = "e03af8d0c1bae3c015ffdb45ce79556c0561e59d"; - sha256 = "1kdg84666gf1d3qiwwqmk7nwshspr2kpb8hjyh2m0nx0zmjji2ij"; + rev = "71676294bcb22c52d372bd8850b1bd3d7173bfac"; + sha256 = "14chq3c5dhkvllkmrrnpd8lbmlbm8ji1gqxn686bnh0d1w2r9hyk"; }; meta.homepage = "https://github.com/symphorien/vim-nixhash/"; }; @@ -12838,12 +12850,12 @@ final: prev: vim-tmux-navigator = buildVimPluginFrom2Nix { pname = "vim-tmux-navigator"; - version = "2023-01-07"; + version = "2023-01-08"; src = fetchFromGitHub { owner = "christoomey"; repo = "vim-tmux-navigator"; - rev = "7073840ab137c9f09d3d1a835d765e40faf715e3"; - sha256 = "1bz37lxnx97l2zdvjm0dgjs0rdlyw9hbaxwzf1cxzwsv4x46rx9n"; + rev = "9337b6d5d417e8006c09f1faadb5069296c8da02"; + sha256 = "14wj5jqhyjpsdnlvx34fvk7zax6w2appi6rg7mc91z2z7gmrzf8q"; }; meta.homepage = "https://github.com/christoomey/vim-tmux-navigator/"; }; @@ -13511,12 +13523,12 @@ final: prev: which-key-nvim = buildVimPluginFrom2Nix { pname = "which-key.nvim"; - version = "2023-01-07"; + version = "2023-01-09"; src = fetchFromGitHub { owner = "folke"; repo = "which-key.nvim"; - rev = "802219ba26409f325a5575e3b684b6cb054e2cc5"; - sha256 = "0flj4bq58s57wdf2x81lqsdpzm3h263s6v6xi76kisj7k3ykwiw0"; + rev = "85f69b07afce4ea77c58ae9a3aeb4e6c918b4d34"; + sha256 = "11ffalyyl29jk9h29vmg5vj9jil4brpjxa8rsys6n6zc1gydis8n"; }; meta.homepage = "https://github.com/folke/which-key.nvim/"; }; @@ -13812,12 +13824,12 @@ final: prev: chad = buildVimPluginFrom2Nix { pname = "chad"; - version = "2022-12-25"; + version = "2023-01-08"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "0deeed4aef43b249650cf4fc57722d5a4905703f"; - sha256 = "1b98v4jzinf2hwdfhijl4qh12gvg3pr86w3j27wazlhb86wqlmi5"; + rev = "6bdd731301e546e133c7c3e52bf31e7594394e27"; + sha256 = "17lws3h29mkirsvq8v6ydc6isqkkg0zaw4p6g7hwpndf9pv8mb12"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix index 44ad038ede7..9717e2014ff 100644 --- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix +++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix @@ -115,23 +115,23 @@ }; c_sharp = buildGrammar { language = "c_sharp"; - version = "1bd772f"; + version = "f076a8e"; source = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-c-sharp"; - rev = "1bd772f69b0db577122533514a239b184650adf2"; - hash = "sha256-ySgSavQflqFXHY25DjX16aP4KgK2HFdsQ6HeYaerxNI="; + rev = "f076a8efe30a0b8c249eeb61383f6d914376114c"; + hash = "sha256-CFqVngYaGe+ZFwpMaQI5HKAioJPmciBDhHxfO3yjKuE="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-c-sharp"; }; clojure = buildGrammar { language = "clojure"; - version = "8c23e0e"; + version = "50468d3"; source = fetchFromGitHub { owner = "sogaiu"; repo = "tree-sitter-clojure"; - rev = "8c23e0ec078af461ccad43fffbbfc204aa6bc238"; - hash = "sha256-rbR5/f9Cznl4AFybmpKgEcjKBw4GrUVP67tf4UT6/ZE="; + rev = "50468d3dc38884caa682800343d9a1d0fda46c9b"; + hash = "sha256-JOqkgsefFp+nvRijPsd+/01w1JsXeW5cNcZNow0ZRyY="; }; meta.homepage = "https://github.com/sogaiu/tree-sitter-clojure"; }; @@ -181,12 +181,12 @@ }; cpp = buildGrammar { language = "cpp"; - version = "5ead1e2"; + version = "2d2c4ae"; source = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-cpp"; - rev = "5ead1e26c6ab71919db0f1880c46a278a93bc5ea"; - hash = "sha256-h6mJdmQzJlxYIcY+d5IiaFghraUgBGZwqFPKwB3E4pQ="; + rev = "2d2c4aee8672af4c7c8edff68e7dd4c07e88d2b1"; + hash = "sha256-BjNWSTpwytOSYw32lYFItNI4t3xw+uJUx/0htYo7aLs="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-cpp"; }; @@ -203,12 +203,12 @@ }; cuda = buildGrammar { language = "cuda"; - version = "7f1a79e"; + version = "0091006"; source = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-cuda"; - rev = "7f1a79e612160aa02be87f1a24469ae3655fe818"; - hash = "sha256-zBlv/KyUPNHRA8fKWaDgCeE1AX3EYTkwjo/RYHaKjK0="; + rev = "0091006d6498ee5647f080ef6c09e5b95e481078"; + hash = "sha256-t1wd32UE2Kz1VkIM4HfFFSDnttdCPGm1xOH9ZP+ATxc="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-cuda"; }; @@ -393,12 +393,12 @@ }; fortran = buildGrammar { language = "fortran"; - version = "f0f2f10"; + version = "edcb337"; source = fetchFromGitHub { owner = "stadelmanma"; repo = "tree-sitter-fortran"; - rev = "f0f2f100952a353e64e26b0fa710b4c296d7af13"; - hash = "sha256-ylQLalRFqRu5N/lUxvwOds/UbLH2JJ7T/rOpo9H4MZ4="; + rev = "edcb3374f4698aaedf24bc572f6b2f5ef0e89ac7"; + hash = "sha256-xZfWtRHWy3MQtkzN9jSwx+sAwLlcRiVLTJjYXyWEIs8="; }; meta.homepage = "https://github.com/stadelmanma/tree-sitter-fortran"; }; @@ -448,12 +448,12 @@ }; gitcommit = buildGrammar { language = "gitcommit"; - version = "74b4077"; + version = "0ef7dd0"; source = fetchFromGitHub { owner = "gbprod"; repo = "tree-sitter-gitcommit"; - rev = "74b40770e6299564f0b7ca474105d7d5238d0583"; - hash = "sha256-WpPJ1EfTd5QavXiEtBIu6RBCtzN9MoklyU+/055NfOI="; + rev = "0ef7dd07236141a878b4cc2c488375baa5cc9d5d"; + hash = "sha256-8OyjmnCLR14ivJBf/9KO4rmc99xL818iMY8uxkjtVGw="; }; meta.homepage = "https://github.com/gbprod/tree-sitter-gitcommit"; }; @@ -626,12 +626,12 @@ }; hlsl = buildGrammar { language = "hlsl"; - version = "39c822b"; + version = "bd0d463"; source = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-hlsl"; - rev = "39c822b795bd6533815d100b5e7d1ec7778a1c2a"; - hash = "sha256-WXlOl+aopL332rW2c2dYyf/xoYx9g7BfkdMUIFJbxzg="; + rev = "bd0d463d1380816240a8cb1fd747fc0d3fed24aa"; + hash = "sha256-0Dafbn0+8N1MBRyOhiaZBo7KZqm8YpFzg/ZwT3SLq+g="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-hlsl"; }; @@ -659,12 +659,12 @@ }; http = buildGrammar { language = "http"; - version = "30a9c17"; + version = "2c6c445"; source = fetchFromGitHub { owner = "rest-nvim"; repo = "tree-sitter-http"; - rev = "30a9c1789d64429a830802cde5b1760ff1064312"; - hash = "sha256-XpKw6v6fnowdJmoIZGn3N1r9JXdJnNifgj+DPNFuoz0="; + rev = "2c6c44574031263326cb1e51658bbc0c084326e7"; + hash = "sha256-R81n6vb7JzZlnK17SkiwYeJeMs0xYTXx/qFdTvT8V5c="; }; meta.homepage = "https://github.com/rest-nvim/tree-sitter-http"; }; @@ -1060,12 +1060,12 @@ }; prisma = buildGrammar { language = "prisma"; - version = "17a5923"; + version = "eca2596"; source = fetchFromGitHub { owner = "victorhqc"; repo = "tree-sitter-prisma"; - rev = "17a59236ac25413b81b1613ea6ba5d8d52d7cd6c"; - hash = "sha256-EdeKTmai/OM0WzCjcLmzHI41EqJWH/dOJJxvCE2sid8="; + rev = "eca2596a355b1a9952b4f80f8f9caed300a272b5"; + hash = "sha256-MOqkM7DCQl1L8Jn9nyw89EoAr0ez4+d39HeKy2cb66c="; }; meta.homepage = "https://github.com/victorhqc/tree-sitter-prisma"; }; @@ -1236,12 +1236,12 @@ }; scala = buildGrammar { language = "scala"; - version = "314bc06"; + version = "c4c7d2e"; source = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-scala"; - rev = "314bc06e59b3e0a37f224b1d391fd764757abd70"; - hash = "sha256-+qR4bOhJOUDBudR9LlLvH5a4W7jRgCV1XrxxFwHf+Fs="; + rev = "c4c7d2e454014659be7383a582bd84456688bb1c"; + hash = "sha256-weAn9/X63M0ZOYv2eCgDblR5b9fUvdIFQ8sWcnrApGw="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-scala"; }; @@ -1278,6 +1278,17 @@ }; meta.homepage = "https://github.com/jrmoulton/tree-sitter-slint"; }; + smali = buildGrammar { + language = "smali"; + version = "d7f535e"; + source = fetchFromGitHub { + owner = "amaanq"; + repo = "tree-sitter-smali"; + rev = "d7f535e176c928d33b0e202dd808ac247cacf2ff"; + hash = "sha256-wSUHzQdpWtIXuqfFvqMNJPQjvdRZ29PBcwtMnyKwRR4="; + }; + meta.homepage = "https://github.com/amaanq/tree-sitter-smali"; + }; solidity = buildGrammar { language = "solidity"; version = "52ed088"; @@ -1347,12 +1358,12 @@ }; swift = buildGrammar { language = "swift"; - version = "f94e1d6"; + version = "5f0ffaf"; source = fetchFromGitHub { owner = "alex-pinkus"; repo = "tree-sitter-swift"; - rev = "f94e1d6dd8f4df6c7c8aa07da625e498ebb27d09"; - hash = "sha256-DtcGcywpwCZoGNllZEetE+s1bwMNrRdooGdttAG3Ra0="; + rev = "5f0ffaf21c7fda4d758d9ef5b20d563271653ce0"; + hash = "sha256-tPcCa3hqWN2NuQZOJXnB10h0m1MzRL4M+dvrtlpkAGs="; }; generate = true; meta.homepage = "https://github.com/alex-pinkus/tree-sitter-swift"; @@ -1496,12 +1507,12 @@ }; v = buildGrammar { language = "v"; - version = "e5ec6a4"; + version = "497563e"; source = fetchFromGitHub { owner = "vlang"; repo = "vls"; - rev = "e5ec6a42f1af42d4101fb226a98b8db0f4f21c88"; - hash = "sha256-Nl2c18MFhqbHp2jkUfUSCB6DwBoQD34AhKz6IQcSvKM="; + rev = "497563e140bf17d73f28e20b5a65e72740c2dc65"; + hash = "sha256-2AU/QGAroq5NReGhCbSJkAnGvftubtCG4hnnBjPKbdY="; }; location = "tree_sitter_v"; meta.homepage = "https://github.com/vlang/vls"; @@ -1563,23 +1574,23 @@ }; wgsl = buildGrammar { language = "wgsl"; - version = "61d2604"; + version = "4c03f73"; source = fetchFromGitHub { owner = "szebniok"; repo = "tree-sitter-wgsl"; - rev = "61d2604525d47238ecbce8aa38f10cb81ba68fd3"; - hash = "sha256-dSWQAJN9+EyqPbGZv9wTR8upsK56ZWu9jOpJkJtkabs="; + rev = "4c03f73822c72130c63c385a112e44ad5a69f3e9"; + hash = "sha256-YqGrjtWmBHthV6c9WvCUT2Q13vQJGpvWPR6DTwHMEr4="; }; meta.homepage = "https://github.com/szebniok/tree-sitter-wgsl"; }; wgsl_bevy = buildGrammar { language = "wgsl_bevy"; - version = "c81dc77"; + version = "2475727"; source = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-wgsl-bevy"; - rev = "c81dc770310795caea5e00996505deba024ec698"; - hash = "sha256-CNEZ8GKfcT5YOdlrqEFE8q2FF0Zs+GsWisd1DA6mnUk="; + rev = "24757275fa01e813ebfdb6acab85862ced9405d7"; + hash = "sha256-Zevra1HCnQWyx5zZ2m9P/qEGnmpptTnwXyttNiciKCA="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-wgsl-bevy"; }; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 0c816a1867b..fa25a8c0e23 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -1052,7 +1052,7 @@ self: super: { libiconv ]; - cargoSha256 = "sha256-UCf5Jya1ATYgCggS/5SitLuQZwtMjrIY9qcBL4RDRAc="; + cargoSha256 = "sha256-5hez6snn0neQEE3W8PbwUoGeSj8Bvu23Ftxz5T0iPAw="; }; in '' diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 07fc87a7172..36ef070fb76 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -461,6 +461,7 @@ https://github.com/fiatjaf/neuron.vim/,, https://github.com/chr4/nginx.vim/,, https://github.com/EdenEast/nightfox.nvim/,, https://github.com/zah/nim.vim/,, +https://github.com/figsoda/nix-develop.nvim/,HEAD, https://github.com/tamago324/nlsp-settings.nvim/,main, https://github.com/tjdevries/nlua.nvim/,, https://github.com/mcchrish/nnn.vim/,, diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 71067fe2ccc..45e006854e2 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1483,8 +1483,8 @@ let mktplcRef = { name = "latex-workshop"; publisher = "James-Yu"; - version = "9.2.1"; - sha256 = "sha256-0+Kp0B56Z2ITx42+cgBkbOZMo9X0cJkPVypFXX8JXRI="; + version = "9.4.4"; + sha256 = "sha256-EA3OABn80GciNecXwLcorWP7K3+jI+wgujpmvvFcNOA="; }; meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/James-Yu.latex-workshop/changelog"; diff --git a/pkgs/applications/emulators/duckstation/default.nix b/pkgs/applications/emulators/duckstation/default.nix index fffbb3ac932..0f48dd71e6c 100644 --- a/pkgs/applications/emulators/duckstation/default.nix +++ b/pkgs/applications/emulators/duckstation/default.nix @@ -15,6 +15,7 @@ , qtbase , qtsvg , qttools +, qtwayland , vulkan-loader , wayland , wrapQtAppsHook @@ -23,23 +24,25 @@ stdenv.mkDerivation { pname = "duckstation"; - version = "unstable-2022-12-08"; + version = "unstable-2023-01-01"; src = fetchFromGitHub { owner = "stenzek"; repo = "duckstation"; - rev = "1905ce3e0163fd53e56cc949379f74a2e1c6228d"; - sha256 = "sha256-q6r9VCGwYCTzyZ3s1BAhQiA8FKsue7QUcErGtuLJbCg="; + rev = "06d6447e59f208f21ba42f4df1665b789db13fb7"; + sha256 = "sha256-DyuQ7J7MVSQHpvPZhMtwqNM8ifjI8UFYQ9SxY5kikBI="; }; nativeBuildInputs = [ cmake - extra-cmake-modules copyDesktopItems ninja pkg-config qttools wrapQtAppsHook + ] + ++ lib.optionals enableWayland [ + extra-cmake-modules ]; buildInputs = [ @@ -52,7 +55,10 @@ stdenv.mkDerivation { qtsvg vulkan-loader ] - ++ lib.optionals enableWayland [ wayland ]; + ++ lib.optionals enableWayland [ + qtwayland + wayland + ]; cmakeFlags = [ "-DUSE_DRMKMS=ON" @@ -93,9 +99,7 @@ stdenv.mkDerivation { runHook postCheck ''; - # Libpulseaudio fixes https://github.com/NixOS/nixpkgs/issues/171173 qtWrapperArgs = [ - "--set QT_QPA_PLATFORM xcb" "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libpulseaudio vulkan-loader ]}" ]; diff --git a/pkgs/applications/emulators/ppsspp/default.nix b/pkgs/applications/emulators/ppsspp/default.nix index 1d3e0bb126e..b300dc08268 100644 --- a/pkgs/applications/emulators/ppsspp/default.nix +++ b/pkgs/applications/emulators/ppsspp/default.nix @@ -38,14 +38,14 @@ in + lib.optionalString enableQt "-qt" + lib.optionalString (!enableQt) "-sdl" + lib.optionalString forceWayland "-wayland"; - version = "1.14.1"; + version = "1.14.4"; src = fetchFromGitHub { owner = "hrydgard"; repo = "ppsspp"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - sha256 = "sha256-WGTPd3xcFk4E/Wf+DEv4pzGYf0dppzV3vUTwrYmZ2YM="; + sha256 = "sha256-7xzhN8JIQD4LZg8sQ8rLNYZrW0nCNBfZFgzoKdoWbKc="; }; postPatch = '' diff --git a/pkgs/applications/graphics/rnote/default.nix b/pkgs/applications/graphics/rnote/default.nix index a7b96c4227e..8da308ba617 100644 --- a/pkgs/applications/graphics/rnote/default.nix +++ b/pkgs/applications/graphics/rnote/default.nix @@ -23,20 +23,19 @@ stdenv.mkDerivation rec { pname = "rnote"; - version = "0.5.10"; + version = "0.5.12"; src = fetchFromGitHub { owner = "flxzt"; repo = "rnote"; rev = "v${version}"; - fetchSubmodules = true; - hash = "sha256-k1Ov35cz2U39yuIYIr9MW6M/A8MNasoybELC4U3xok0="; + hash = "sha256-wrx8+18jVDIhYhxD8VgU8wlRDLoUwMWIBOzSUozjUII="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-MsLpZl8AvF2BJU6PfC8BmTADR7T3e7+HstHQa+YYJFo="; + hash = "sha256-t0nmfM6Z30c+n0iANjMBVifOhYMXdBqgjxYdhOPOhYQ="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/vkdt/default.nix b/pkgs/applications/graphics/vkdt/default.nix new file mode 100644 index 00000000000..757bf7cb7b5 --- /dev/null +++ b/pkgs/applications/graphics/vkdt/default.nix @@ -0,0 +1,64 @@ +{ lib +, stdenv +, fetchurl +, vulkan-headers +, vulkan-tools +, vulkan-loader +, glslang +, glfw +, libjpeg +, pkg-config +, rsync +, cmake +, clang +, llvm +, llvmPackages +, pugixml +, freetype +, exiv2 +, ffmpeg +, libvorbis +, libmad +}: + +stdenv.mkDerivation rec { + pname = "vkdt"; + version = "0.5.1"; + + src = fetchurl { + url = "https://github.com/hanatos/${pname}/releases/download/${version}/${pname}-${version}.tar.xz"; + sha256 = "sha256-IMCS6bJqOzPeAFZyQtjzd1rQ5ugIevqoFUW6Y0w1Pzs="; + }; + + buildInputs = [ + vulkan-headers + vulkan-tools + vulkan-loader + glslang + glfw + libjpeg + pkg-config + rsync + cmake + clang + llvm + llvmPackages.openmp + pugixml + freetype + exiv2 + ffmpeg + libvorbis + libmad + ]; + + dontUseCmakeConfigure = true; + + makeFlags = [ "DESTDIR=$(out)" "prefix=" ]; + + meta = with lib; { + description = "A vulkan-powered raw image processor"; + homepage = "https://github.com/hanatos/vkdt"; + license = licenses.bsd2; + maintainers = with maintainers; [ paperdigits ]; + }; +} diff --git a/pkgs/applications/misc/HentaiAtHome/default.nix b/pkgs/applications/misc/HentaiAtHome/default.nix index 4932379ef02..4c94fa83485 100644 --- a/pkgs/applications/misc/HentaiAtHome/default.nix +++ b/pkgs/applications/misc/HentaiAtHome/default.nix @@ -1,5 +1,4 @@ { buildPackages -, buildPlatform , fetchzip , javaOpts ? "-XX:+UseZGC" , jdk @@ -23,7 +22,7 @@ stdenvNoCC.mkDerivation rec { nativeBuildInputs = [ jdk makeWrapper ]; LANG = "en_US.UTF-8"; - LOCALE_ARCHIVE = lib.optionalString (buildPlatform.libc == "glibc") + LOCALE_ARCHIVE = lib.optionalString (stdenvNoCC.buildPlatform.libc == "glibc") "${buildPackages.glibcLocales}/lib/locale/locale-archive"; buildPhase = '' diff --git a/pkgs/applications/misc/ausweisapp2/default.nix b/pkgs/applications/misc/ausweisapp2/default.nix index 85579f05219..eb773b3c812 100644 --- a/pkgs/applications/misc/ausweisapp2/default.nix +++ b/pkgs/applications/misc/ausweisapp2/default.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "AusweisApp2"; - version = "1.24.4"; + version = "1.26.1"; src = fetchFromGitHub { owner = "Governikus"; repo = "AusweisApp2"; rev = version; - sha256 = "sha256-YO0K8L03n/KQcINRKwls8BxG8nv5k3Myd95AU8agigI="; + sha256 = "sha256-Q+ZWnbYH80FMazKB1iSTh9cuYvuPom+qDjMZvC1gUoY="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/applications/misc/dialect/default.nix b/pkgs/applications/misc/dialect/default.nix index 6e504ab7173..8c04161844b 100644 --- a/pkgs/applications/misc/dialect/default.nix +++ b/pkgs/applications/misc/dialect/default.nix @@ -14,11 +14,12 @@ , gst_all_1 , libsoup_3 , libadwaita +, nix-update-script }: python3.pkgs.buildPythonApplication rec { pname = "dialect"; - version = "2.0.2"; + version = "2.1.1"; format = "other"; @@ -27,7 +28,7 @@ python3.pkgs.buildPythonApplication rec { repo = pname; rev = version; fetchSubmodules = true; - hash = "sha256-55vqxS0ySV8lItxLl1J+wLvPtmR87HzGfAiOKuhigFA="; + hash = "sha256-ytZnolQTOj0dpv+ouN1N7sypr1LxSN/Uhp7qP0ZOTHE="; }; nativeBuildInputs = [ @@ -69,6 +70,10 @@ python3.pkgs.buildPythonApplication rec { # handle setup hooks better strictDeps = false; + passthru.updateScript = nix-update-script { + attrPath = pname; + }; + meta = with lib; { homepage = "https://github.com/dialect-app/dialect"; description = "A translation app for GNOME"; diff --git a/pkgs/applications/misc/k40-whisperer/default.nix b/pkgs/applications/misc/k40-whisperer/default.nix index 429d798210e..720536b18e5 100644 --- a/pkgs/applications/misc/k40-whisperer/default.nix +++ b/pkgs/applications/misc/k40-whisperer/default.nix @@ -23,12 +23,12 @@ let in stdenv.mkDerivation rec { pname = "k40-whisperer"; - version = "0.60"; + version = "0.62"; src = fetchzip { url = "https://www.scorchworks.com/K40whisperer/K40_Whisperer-${version}_src.zip"; stripRoot = true; - sha256 = "sha256-Nr7WYVu78msn5HuDNtSSvkdU6iCWtbiYZmh0rnMiyEg="; + sha256 = "sha256-3O+lCpmsCCu61REuxhrV8Uy01AgEGq/1DlMhjo45URM="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/misc/keepass/default.nix b/pkgs/applications/misc/keepass/default.nix index f9c78dfc6fb..e062c35e80a 100644 --- a/pkgs/applications/misc/keepass/default.nix +++ b/pkgs/applications/misc/keepass/default.nix @@ -4,11 +4,11 @@ let inherit (builtins) add length readFile replaceStrings unsafeDiscardStringContext toString map; in buildDotnetPackage rec { pname = "keepass"; - version = "2.49"; + version = "2.52"; src = fetchurl { url = "mirror://sourceforge/keepass/KeePass-${version}-Source.zip"; - sha256 = "sha256-1hg4bRuQSG+UzEQGeQcSURTmTxt5ITGQqfg0IS7RWt0="; + sha256 = "sha256-6dGCfysen26VGHIHETuNGkqHbPyeWRIEopqJa6AMzXA="; }; sourceRoot = "."; diff --git a/pkgs/applications/misc/keepass/fix-paths.patch b/pkgs/applications/misc/keepass/fix-paths.patch index 5ff36a21c00..5d367b0a826 100644 --- a/pkgs/applications/misc/keepass/fix-paths.patch +++ b/pkgs/applications/misc/keepass/fix-paths.patch @@ -43,15 +43,15 @@ diff --git a/KeePass/Util/AppLocator.cs b/KeePass/Util/AppLocator.cs index af02803..8a32c9d 100644 --- a/KeePass/Util/AppLocator.cs +++ b/KeePass/Util/AppLocator.cs -@@ -429,7 +429,7 @@ namespace KeePass.Util +@@ -468,7 +468,7 @@ namespace KeePass.Util if(NativeLib.GetPlatformID() == PlatformID.MacOSX) - strArgPrefix = string.Empty; // FR 3535696 + strOpt = string.Empty; // FR 3535696 -- string str = NativeLib.RunConsoleApp("whereis", strArgPrefix + strApp); -+ string str = NativeLib.RunConsoleApp("@whereis@", strArgPrefix + strApp); - if(str == null) return null; +- string str = NativeLib.RunConsoleApp("whereis", strOpt + strApp); ++ string str = NativeLib.RunConsoleApp("@whereis@", strOpt + strApp); + if(string.IsNullOrEmpty(str)) return null; - str = str.Trim(); + int iSep = str.IndexOf(':'); diff --git a/KeePass/Util/ClipboardUtil.Unix.cs b/KeePass/Util/ClipboardUtil.Unix.cs index ab49ee2..7f6c50f 100644 --- a/KeePass/Util/ClipboardUtil.Unix.cs @@ -108,14 +108,14 @@ diff --git a/KeePassLib/Native/NativeLib.cs b/KeePassLib/Native/NativeLib.cs index 2d227a3..243f4ee 100644 --- a/KeePassLib/Native/NativeLib.cs +++ b/KeePassLib/Native/NativeLib.cs -@@ -145,7 +145,7 @@ namespace KeePassLib.Native - // Mono returns PlatformID.Unix on Mac OS X, workaround this - if(m_platID.Value == PlatformID.Unix) +@@ -143,7 +143,7 @@ namespace KeePassLib.Native + // Mono returns PlatformID.Unix on MacOS, workaround this + if(g_platID.Value == PlatformID.Unix) { - if((RunConsoleApp("uname", null) ?? string.Empty).Trim().Equals( + if((RunConsoleApp("@uname@", null) ?? string.Empty).Trim().Equals( "Darwin", StrUtil.CaseIgnoreCmp)) - m_platID = PlatformID.MacOSX; + g_platID = PlatformID.MacOSX; } diff --git a/KeePassLib/Utility/MonoWorkarounds.cs b/KeePassLib/Utility/MonoWorkarounds.cs index e20bb3a..4fd875b 100644 @@ -130,7 +130,7 @@ index e20bb3a..4fd875b 100644 private static Dictionary<uint, bool> g_dForceReq = new Dictionary<uint, bool>(); private static Thread g_thFixClip = null; -@@ -335,7 +335,7 @@ namespace KeePassLib.Utility +@@ -356,7 +356,7 @@ namespace KeePassLib.Utility // } // else { Debug.Assert(false); } diff --git a/pkgs/applications/misc/keepass/keepass-plugins.patch b/pkgs/applications/misc/keepass/keepass-plugins.patch index 891be1ffa31..978387eb991 100644 --- a/pkgs/applications/misc/keepass/keepass-plugins.patch +++ b/pkgs/applications/misc/keepass/keepass-plugins.patch @@ -9,17 +9,17 @@ Subject: [PATCH] loadplugin diff --git a/KeePass/Forms/MainForm.cs b/KeePass/Forms/MainForm.cs index 347eaf5..b92e1e2 100644 ---- a/KeePass/Forms/MainForm.cs -+++ b/KeePass/Forms/MainForm.cs -@@ -440,7 +440,$OUTPUT_LC$ @@ namespace KeePass.Forms - ToolStripItemCollection tsicT = m_ctxTray.Items; - ToolStripItem tsiPrevT = m_ctxTrayOptions; - -- m_pluginManager.LoadAllPlugins(); +--- a/KeePass/Forms/MainForm_Functions.cs ++++ b/KeePass/Forms/MainForm_Functions.cs +@@ -312,7 +312,$OUTPUT_LC$ @@ namespace KeePass.Forms + ToolStripItemCollection tsicT = m_ctxTray.Items; + ToolStripItem tsiPrevT = m_ctxTrayOptions; + +- m_pluginManager.LoadAllPlugins(); $DO_LOADS$+ - - m_pluginManager.AddMenuItems(PluginMenuType.Main, tsicM, tsiPrevM); - m_pluginManager.AddMenuItems(PluginMenuType.Group, tsicGM, tsiPrevGM); + + m_pluginManager.AddMenuItems(PluginMenuType.Main, tsicM, tsiPrevM); + m_pluginManager.AddMenuItems(PluginMenuType.Group, tsicGM, tsiPrevGM); -- 2.25.4 diff --git a/pkgs/applications/misc/metadata-cleaner/default.nix b/pkgs/applications/misc/metadata-cleaner/default.nix index 4366576ccbb..39849f6827e 100644 --- a/pkgs/applications/misc/metadata-cleaner/default.nix +++ b/pkgs/applications/misc/metadata-cleaner/default.nix @@ -18,7 +18,7 @@ python3.pkgs.buildPythonApplication rec { pname = "metadata-cleaner"; - version = "2.2.8"; + version = "2.3.1"; format = "other"; @@ -26,7 +26,7 @@ python3.pkgs.buildPythonApplication rec { owner = "rmnvgr"; repo = pname; rev = "v${version}"; - hash = "sha256-646jGcgcEbhHk3PWdkKHWLVX8bNIB3BmYVMoXaGxHUw="; + hash = "sha256-nH2BsfXFwBdu7/YH2OuG90HxYgiuqKJqMC4p0PRlgPw="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/polybar/default.nix b/pkgs/applications/misc/polybar/default.nix index b670f85f7a6..9ecced78440 100644 --- a/pkgs/applications/misc/polybar/default.nix +++ b/pkgs/applications/misc/polybar/default.nix @@ -28,7 +28,6 @@ , wirelesstools , libnl , i3 -, i3-gaps , jsoncpp # override the variables ending in 'Support' to enable or disable modules @@ -39,7 +38,6 @@ , iwSupport ? false , nlSupport ? true , i3Support ? false -, i3GapsSupport ? false }: stdenv.mkDerivation rec { @@ -59,7 +57,7 @@ stdenv.mkDerivation rec { pkg-config python3Packages.sphinx removeReferencesTo - ] ++ lib.optional (i3Support || i3GapsSupport) makeWrapper; + ] ++ lib.optional i3Support makeWrapper; buildInputs = [ cairo @@ -82,9 +80,7 @@ stdenv.mkDerivation rec { ++ lib.optional pulseSupport libpulseaudio ++ lib.optional iwSupport wirelesstools ++ lib.optional nlSupport libnl - ++ lib.optional (i3Support || i3GapsSupport) jsoncpp - ++ lib.optional i3Support i3 - ++ lib.optional i3GapsSupport i3-gaps; + ++ lib.optionals i3Support [ jsoncpp i3 ]; patches = [ ./remove-hardcoded-etc.diff ]; @@ -95,16 +91,10 @@ stdenv.mkDerivation rec { ''; postInstall = - if i3Support then '' + lib.optionalString i3Support '' wrapProgram $out/bin/polybar \ --prefix PATH : "${i3}/bin" - '' - else if i3GapsSupport - then '' - wrapProgram $out/bin/polybar \ - --prefix PATH : "${i3-gaps}/bin" - '' - else ""; + ''; postFixup = '' remove-references-to -t ${stdenv.cc} $out/bin/polybar diff --git a/pkgs/applications/misc/process-compose/default.nix b/pkgs/applications/misc/process-compose/default.nix index 0a6c0d05668..36e95ee8f09 100644 --- a/pkgs/applications/misc/process-compose/default.nix +++ b/pkgs/applications/misc/process-compose/default.nix @@ -4,21 +4,39 @@ , installShellFiles }: +let config-module = "github.com/f1bonacc1/process-compose/src/config"; +in buildGoModule rec { pname = "process-compose"; - version = "0.29.1"; + version = "0.29.7"; src = fetchFromGitHub { owner = "F1bonacc1"; repo = pname; rev = "v${version}"; - hash = "sha256-FB0PjvPBfbytIXwYs+eT9PMnKX/yymrajlJ42FDlMFs="; + hash = "sha256-gVXil6Gc65/6VMuONfVyxU6SSV0vCbJKXDvtG4a+pbU="; + # populate values that require us to use git. By doing this in postFetch we + # can delete .git afterwards and maintain better reproducibility of the src. + leaveDotGit = true; + postFetch = '' + cd "$out" + git rev-parse --short HEAD > $out/COMMIT + # in format of 0000-00-00T00:00:00Z + date -u -d "@$(git log -1 --pretty=%ct)" "+%Y-%m-%dT%H:%M:%SZ" > $out/SOURCE_DATE_EPOCH + find "$out" -name .git -print0 | xargs -0 rm -rf + ''; }; + # ldflags based on metadata from git and source + preBuild = '' + ldflags+=" -X ${config-module}.Commit=$(cat COMMIT)" + ldflags+=" -X ${config-module}.Date=$(cat SOURCE_DATE_EPOCH)" + ''; + ldflags = [ + "-X ${config-module}.Version=v${version}" "-s" "-w" - "-X main.version=v${version}" ]; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/safeeyes/default.nix b/pkgs/applications/misc/safeeyes/default.nix index e7a21fab1f4..9506825a2ff 100644 --- a/pkgs/applications/misc/safeeyes/default.nix +++ b/pkgs/applications/misc/safeeyes/default.nix @@ -15,11 +15,11 @@ with python3.pkgs; buildPythonApplication rec { pname = "safeeyes"; - version = "2.1.4"; + version = "2.1.5"; src = fetchPypi { inherit pname version; - sha256 = "sha256-SsZRyODeYRQk2pVspKzfJbSRX/zjD+M+aaK+YXPu6CE="; + sha256 = "sha256-IjFDhkqtMitdcQORerRqwty3ZMP8jamPtb9oMHdre4I="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/sioyek/default.nix b/pkgs/applications/misc/sioyek/default.nix index bfa0fb1d505..6c809ef2af2 100644 --- a/pkgs/applications/misc/sioyek/default.nix +++ b/pkgs/applications/misc/sioyek/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "sioyek"; - version = "unstable-2022-08-30"; + version = "2.0.0"; src = fetchFromGitHub { owner = "ahrm"; repo = "sioyek"; - rev = "8d0a63484334e2cb2b0571a07a3875e6ab6c8916"; - sha256 = "sha256-29Wxg/VVQPDDzzxKcvMa1+rtiP4bDkPAB/JJsj+F+WQ="; + rev = "v${finalAttrs.version}"; + sha256 = "sha256-GFZaTXJhoBB+rSe7Qk6H6FZJVXr3nO9XgM+LAbS4te4="; }; buildInputs = [ @@ -74,7 +74,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { homepage = "https://sioyek.info/"; description = "A PDF viewer designed for research papers and technical books"; - changelog = "https://github.com/ahrm/sioyek/releases/tag/v1.5.0"; + changelog = "https://github.com/ahrm/sioyek/releases/tag/v${finalAttrs.version}"; license = licenses.gpl3Only; maintainers = with maintainers; [ podocarp ]; platforms = platforms.unix; diff --git a/pkgs/applications/networking/browsers/links2/default.nix b/pkgs/applications/networking/browsers/links2/default.nix index 4dc06cd466b..d1631feb879 100644 --- a/pkgs/applications/networking/browsers/links2/default.nix +++ b/pkgs/applications/networking/browsers/links2/default.nix @@ -8,12 +8,12 @@ }: stdenv.mkDerivation rec { - version = "2.27"; + version = "2.28"; pname = "links2"; src = fetchurl { url = "${meta.homepage}/download/links-${version}.tar.bz2"; - sha256 = "sha256-2N3L/O3nzd6Aq+sKI2NY9X+mvrK8+S4QliTpuJb567Q="; + sha256 = "sha256-L9VJmxPe5ZRXwTLBZ7hJXEDe2nU4lInGzMtoMZP0VLQ="; }; buildInputs = with lib; diff --git a/pkgs/applications/networking/cluster/atlantis/default.nix b/pkgs/applications/networking/cluster/atlantis/default.nix index e76b7fc1575..ee0b82c0b69 100644 --- a/pkgs/applications/networking/cluster/atlantis/default.nix +++ b/pkgs/applications/networking/cluster/atlantis/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "atlantis"; - version = "0.21.0"; + version = "0.22.2"; src = fetchFromGitHub { owner = "runatlantis"; repo = "atlantis"; rev = "v${version}"; - sha256 = "sha256-wDyRXdlkZEzdqVSGYSzLroqMWZDTpPzsu94Mx7lvh2I="; + sha256 = "sha256-na/RYFl3g7/jOtmCeG/xQcmvDdxUqD17SLzdxJ0bYN4="; }; - vendorSha256 = "sha256-I3fKo4lsNGQTTi8a6de85rVGoTEvr8wwE2y4OQHks7o="; + vendorHash = "sha256-Gg6HxL2ptCE0hXG/dCuaxcnO16htLNPsuH4QAgCQa64="; subPackages = [ "." ]; diff --git a/pkgs/applications/networking/cluster/clusterctl/default.nix b/pkgs/applications/networking/cluster/clusterctl/default.nix index ba8a98d3400..fb755ac6793 100644 --- a/pkgs/applications/networking/cluster/clusterctl/default.nix +++ b/pkgs/applications/networking/cluster/clusterctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "clusterctl"; - version = "1.3.1"; + version = "1.3.2"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = "cluster-api"; rev = "v${version}"; - sha256 = "sha256-Qaq0I7ZCXRXIWtUN3fcpoN4SURq/OfH+u73nyWYmJOY="; + sha256 = "sha256-NmTMpTaekUTSMnIFn5e1DnuHehJLM5YToY+QK0hnvXk="; }; - vendorSha256 = "sha256-VDSMXE+Vlgmo7T1b+A7uW9BqSDBDyhrneJX1yH+XfDc="; + vendorSha256 = "sha256-0C3tQgmu7YQgHyXh8lIYTrLFksCvFQp0uvIhQRuqbYM="; subPackages = [ "cmd/clusterctl" ]; diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 2a23deef72f..b5fb3ac193a 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -30,13 +30,13 @@ "vendorHash": "sha256-jK7JuARpoxq7hvq5+vTtUwcYot0YqlOZdtDwq4IqKvk=" }, "aiven": { - "hash": "sha256-6HZHDqdYeIthzqMwTEpYTyjh624tifhoAFOXIh8xqMg=", + "hash": "sha256-8kTT1tD88UZc/ZbunFDF+SlTYM5E3jyQgaBcRBULYlY=", "homepage": "https://registry.terraform.io/providers/aiven/aiven", "owner": "aiven", "repo": "terraform-provider-aiven", - "rev": "v3.10.0", + "rev": "v3.11.0", "spdx": "MIT", - "vendorHash": "sha256-J/x5oc4Qr4c/K5RKswFeWgUDE+ns1bUxfpRlj29uCY0=" + "vendorHash": "sha256-pCWrJPW39J2SE1U1nQ61XI8/WtB+hqQGu9wKkRNkS1k=" }, "akamai": { "hash": "sha256-vna0TVanrfhbELwpD3ZidwkBfB20dM+11Gq6qdZ0MmA=", @@ -103,11 +103,11 @@ "vendorHash": "sha256-yDkox74g0N8iniWHSNk6KjfM0HJa8H2HUxm6RxrdhkE=" }, "aviatrix": { - "hash": "sha256-2KJVXIThZ3g1++y5fhKLQjeXZ9r685B8stmWfs2MAs0=", + "hash": "sha256-jZXTsCa1TDwdOFGJKX4xM3sB0zfix5nTBuBdBGtwOOs=", "homepage": "https://registry.terraform.io/providers/AviatrixSystems/aviatrix", "owner": "AviatrixSystems", "repo": "terraform-provider-aviatrix", - "rev": "v3.0.0", + "rev": "v3.0.1", "spdx": "MPL-2.0", "vendorHash": null }, @@ -213,11 +213,11 @@ "vendorHash": null }, "cloudamqp": { - "hash": "sha256-gT6Ik4okCAH8555KSGv0wmca0n0NFumRSkQrSvrGit4=", + "hash": "sha256-1T9ylCTG2wV5FmL6S5+t19H3Xct57WlLpbr6zMj5vwE=", "homepage": "https://registry.terraform.io/providers/cloudamqp/cloudamqp", "owner": "cloudamqp", "repo": "terraform-provider-cloudamqp", - "rev": "v1.21.0", + "rev": "v1.22.0", "spdx": "MPL-2.0", "vendorHash": "sha256-PALZGyGZ6Ggccl4V9gG+gsEdNipYG+DCaZkqF0W1IMQ=" }, @@ -368,11 +368,11 @@ "vendorHash": "sha256-NLvw606QxUwCDViLbR5LjoWGZnk48/zG0NownEATYKM=" }, "exoscale": { - "hash": "sha256-pJ9bbI7y6iOzJ8qPIw8SUOj8yLotRig6cmDsvLfc+6U=", + "hash": "sha256-F1tYiEy9eQ7GcgVPNfe6Jy6hXEWdFHGXA6esAnOgiQE=", "homepage": "https://registry.terraform.io/providers/exoscale/exoscale", "owner": "exoscale", "repo": "terraform-provider-exoscale", - "rev": "v0.41.1", + "rev": "v0.43.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -386,11 +386,11 @@ "vendorHash": "sha256-0t+2ixMSsgDK9zzst3s0YWdnS6p7jO0stHnaKio5lvY=" }, "fastly": { - "hash": "sha256-AlEO9isKHdOxhI7M7Egxv7lmrQ066s2zcIz9fm5dobM=", + "hash": "sha256-SaihRh+DuMY9Mcx+PBAUPv0vrWeKGqx437ayLT3kdjI=", "homepage": "https://registry.terraform.io/providers/fastly/fastly", "owner": "fastly", "repo": "terraform-provider-fastly", - "rev": "v3.0.3", + "rev": "v3.0.4", "spdx": "MPL-2.0", "vendorHash": null }, @@ -442,24 +442,24 @@ "vendorHash": "sha256-7XiZP51K/S5Al+VNJw4NcqzkMeqs2iSHCOlNAI4+id4=" }, "google": { - "hash": "sha256-eF7y62pHjQ5YBs/M3Fh4h0qHyrTs6FyiPQ2hD+oHaVI=", + "hash": "sha256-g572Q+HasthrS6i7KXEmcY7HeQ7T4IYAXIikQKlkEHI=", "homepage": "https://registry.terraform.io/providers/hashicorp/google", "owner": "hashicorp", "proxyVendor": true, "repo": "terraform-provider-google", - "rev": "v4.47.0", + "rev": "v4.48.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-kyE1MPc1CofhngsMYLIPaownEZQmHc9UMSegwVZ8zIA=" + "vendorHash": "sha256-xi/OCf82RdoL46em7BaWylnD3eo4VGIWxtj+HdtYUKk=" }, "google-beta": { - "hash": "sha256-DcqVJ5qZIw/qUsZkbhcPiM2gSRpEOyn1irv9kbG5aCs=", + "hash": "sha256-YN0UOz6AG2hERKGrJ/38nagqYu+Uy/aJYLb/SbbfWwY=", "homepage": "https://registry.terraform.io/providers/hashicorp/google-beta", "owner": "hashicorp", "proxyVendor": true, "repo": "terraform-provider-google-beta", - "rev": "v4.47.0", + "rev": "v4.48.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-kyE1MPc1CofhngsMYLIPaownEZQmHc9UMSegwVZ8zIA=" + "vendorHash": "sha256-xi/OCf82RdoL46em7BaWylnD3eo4VGIWxtj+HdtYUKk=" }, "googleworkspace": { "hash": "sha256-dedYnsKHizxJZibuvJOMbJoux0W6zgKaK5fxIofKqCY=", @@ -788,13 +788,13 @@ "vendorHash": "sha256-3t8pUAwuVeZN5cYGs72YsdRvJunudSmKSldFWEFVA/4=" }, "ns1": { - "hash": "sha256-qHR3KJa1y10B+iQPgH6lTt/JUqTmiK/60rPCa3gQDP8=", + "hash": "sha256-2w9x/FTtieWB88CIEkP7BH5saC6dt4IxdROBucczios=", "homepage": "https://registry.terraform.io/providers/ns1-terraform/ns1", "owner": "ns1-terraform", "repo": "terraform-provider-ns1", - "rev": "v1.13.0", + "rev": "v1.13.4", "spdx": "MPL-2.0", - "vendorHash": "sha256-6ePPxdULuTzLdVzzr12BjLu/lBN+5yIUq8U8FVUw/PM=" + "vendorHash": "sha256-/Rgerbd8c6Owo79LrYsR9O0JNBrDOODFD+k1Yd5G6cY=" }, "null": { "hash": "sha256-ExXDbAXMVCTZBlYmi4kD/7JFB1fCFAoPL637+1N6rEI=", @@ -879,20 +879,20 @@ "vendorHash": null }, "ovh": { - "hash": "sha256-vYOL9FeYzUWt09rg2GkLDnOCNp6GPXOFv8OhXtUvRUY=", + "hash": "sha256-LcSrs4FUrtp/4tp1xlBPKkfQ3J8FlZ/peL9NcC7XQy4=", "homepage": "https://registry.terraform.io/providers/ovh/ovh", "owner": "ovh", "repo": "terraform-provider-ovh", - "rev": "v0.25.0", + "rev": "v0.26.0", "spdx": "MPL-2.0", "vendorHash": null }, "pagerduty": { - "hash": "sha256-RKIKE+kOe1obxzloFzhPZpEk1kVL8Un+fV3of9/AAxQ=", + "hash": "sha256-mJnhjSkJDLMlZAKLfU9HbaHidEGGgPJq+g1vdvBVeKY=", "homepage": "https://registry.terraform.io/providers/PagerDuty/pagerduty", "owner": "PagerDuty", "repo": "terraform-provider-pagerduty", - "rev": "v2.8.1", + "rev": "v2.9.1", "spdx": "MPL-2.0", "vendorHash": null }, diff --git a/pkgs/applications/networking/cluster/waagent/default.nix b/pkgs/applications/networking/cluster/waagent/default.nix new file mode 100644 index 00000000000..a1a72a69885 --- /dev/null +++ b/pkgs/applications/networking/cluster/waagent/default.nix @@ -0,0 +1,67 @@ +{ fetchFromGitHub, + findutils, + gnugrep, + gnused, + iproute2, + iptables, + lib, + nettools, # for hostname + openssh, + openssl, + parted, + procps, # for pidof, + python3, + shadow, # for useradd, usermod + util-linux, # for (u)mount, fdisk, sfdisk, mkswap +}: + +let + inherit (lib) makeBinPath; + +in +python3.pkgs.buildPythonPackage rec { + pname = "waagent"; + version = "2.8.0.11"; + src = fetchFromGitHub { + owner = "Azure"; + repo = "WALinuxAgent"; + rev = "04ded9f0b708cfaf4f9b68eead1aef4cc4f32eeb"; + sha256 = "0fvjanvsz1zyzhbjr2alq5fnld43mdd776r2qid5jy5glzv0xbhf"; + }; + doCheck = false; + + buildInputs = with python3.pkgs; [ distro ]; + runtimeDeps = [ + findutils + gnugrep + gnused + iproute2 + iptables + nettools # for hostname + openssh + openssl + parted + procps # for pidof + shadow # for useradd, usermod + util-linux # for (u)mount, fdisk, sfdisk, mkswap + ]; + + fixupPhase = '' + mkdir -p $out/bin/ + WAAGENT=$(find $out -name waagent | grep sbin) + cp $WAAGENT $out/bin/waagent + wrapProgram "$out/bin/waagent" \ + --prefix PYTHONPATH : $PYTHONPATH \ + --prefix PATH : "${makeBinPath runtimeDeps}" + patchShebangs --build "$out/bin/" + ''; + + meta = { + description = "The Microsoft Azure Linux Agent (waagent) + manages Linux provisioning and VM interaction with the Azure + Fabric Controller"; + homepage = "https://github.com/Azure/WALinuxAgent"; + license = with lib.licenses; [ asl20 ]; + }; + +} diff --git a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix index 97fb6dfc2e3..446c483f5bc 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 @@ stdenv.mkDerivation rec { pname = "signalbackup-tools"; - version = "20221227-1"; + version = "20230109-1"; src = fetchFromGitHub { owner = "bepaald"; repo = pname; rev = version; - sha256 = "sha256-yOOKgB7MO9LW6qkr/JZOYtteQTW/Yms4CMAg4EIJGc8="; + sha256 = "sha256-wPx1W0eaQHpA/jcZ+A7YFL5FwPqz12j/jPgxa1JeEM8="; }; postPatch = '' diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index 10f06393bfc..b8892113900 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -47,23 +47,23 @@ let # and often with different versions. We write them on three lines # like this (rather than using {}) so that the updater script can # find where to edit them. - versions.aarch64-darwin = "5.12.9.13190"; - versions.x86_64-darwin = "5.12.9.13190"; - versions.x86_64-linux = "5.12.9.367"; + versions.aarch64-darwin = "5.13.4.14461"; + versions.x86_64-darwin = "5.13.4.14461"; + versions.x86_64-linux = "5.13.4.711"; srcs = { aarch64-darwin = fetchurl { url = "https://zoom.us/client/${versions.aarch64-darwin}/zoomusInstallerFull.pkg?archType=arm64"; name = "zoomusInstallerFull.pkg"; - hash = "sha256-Htug/hmp0OjysUY4q8RO1oqjSsa2sgpqiAERr6ahBuw="; + hash = "sha256-gNlY7Cocv6t406o1biZj6UAiP5fwF+g/G2P2uN5bF7I="; }; x86_64-darwin = fetchurl { url = "https://zoom.us/client/${versions.x86_64-darwin}/zoomusInstallerFull.pkg"; - hash = "sha256-nl+hrAZECaC5uceK8OZ/em3rY9pK4VrtezT6qCNmbCA="; + hash = "sha256-T5s8ERMNkdvIzsBq8ZtOUKu084/8uBjIoYgopkM09cI="; }; x86_64-linux = fetchurl { url = "https://zoom.us/client/${versions.x86_64-linux}/zoom_x86_64.pkg.tar.xz"; - hash = "sha256-7B9wS0myf6QkDq4ooqWen03s/36BeF7cSsOzjDdIw8g="; + hash = "sha256-sQk5fS/bS7e0T0IJ7+UB956XmCAbeMYfS8BVwncpoy0="; }; }; diff --git a/pkgs/applications/networking/irc/kirc/default.nix b/pkgs/applications/networking/irc/kirc/default.nix index 71bd96d3b70..b0e771a80f4 100644 --- a/pkgs/applications/networking/irc/kirc/default.nix +++ b/pkgs/applications/networking/irc/kirc/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "kirc"; - version = "0.3.1"; + version = "0.3.2"; src = fetchFromGitHub { owner = "mcpcpc"; repo = pname; rev = version; - hash = "sha256-bLBrkbW/Iv1v9z5NOiMAA/dH5/9FlqusRV5rSqjdlPw="; + hash = "sha256-SXPtSFjGPLgORG9OCSCEStzNzdGZFzCx72YOrW288MU="; }; dontConfigure = true; diff --git a/pkgs/applications/networking/mailreaders/mailspring/default.nix b/pkgs/applications/networking/mailreaders/mailspring/default.nix index 9e5dab93747..6e694d01b46 100644 --- a/pkgs/applications/networking/mailreaders/mailspring/default.nix +++ b/pkgs/applications/networking/mailreaders/mailspring/default.nix @@ -22,11 +22,11 @@ stdenv.mkDerivation rec { pname = "mailspring"; - version = "1.10.7"; + version = "1.10.8"; src = fetchurl { url = "https://github.com/Foundry376/Mailspring/releases/download/${version}/mailspring-${version}-amd64.deb"; - sha256 = "sha256-r/xutH3BLYCsFmmYJ1hdphLLktCzdAeM1Uwp1l1C1LQ="; + sha256 = "sha256-aXpPn6tpSOwWL/34qlpJ+on/H+X7303J1jwvwcVOTNs="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index ff2467167da..ed5c9843f28 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix @@ -1,665 +1,665 @@ { - version = "102.6.0"; + version = "102.6.1"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/af/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/af/thunderbird-102.6.1.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "ddc531e03819b6f1407dd8c91c65216bd85c977d217bd459f410a66ad586ba16"; + sha256 = "417eb44163275bceea7251e544499f56056a16aa3defe97f9f26df0abaa8fe8b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/ar/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/ar/thunderbird-102.6.1.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "144a7ef7722ff71c30eaa8fc55bcca548863dfb33198da57a47709cb5415666f"; + sha256 = "9717df3c3020d2b6814eb8ce99eafa62f71f56cbe0d7515044b7ff88c763cf44"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/ast/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/ast/thunderbird-102.6.1.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "f10c3787459c203ae60fdc1a3390a29be22634c42b8a9a67743fa87824f16e98"; + sha256 = "b6984f90666a29a922e098635504786716c38c0cafe243b5a1d43b64af64d0ee"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/be/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/be/thunderbird-102.6.1.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "e7ffc96e12f3edad721e9349606ccbdd38364a91833541f15d38d2437e8c6a2a"; + sha256 = "d9060ad38fc5da77c9c709dbc498ce656d20668b16d2c811dc400bf9170aceee"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/bg/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/bg/thunderbird-102.6.1.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "0afd93bc311d2069ca0cf87779e525ee735821f7e28791210bd169393eb69331"; + sha256 = "936c52b46c7671a3328e6ebdd9d0ff0e61e761efc0210f0c470893072d04d7a8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/br/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/br/thunderbird-102.6.1.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "cf0ebba13d341a56e455308ac856c8f67d2aee5b566dd4f6534e0c7c298c5b7e"; + sha256 = "5c82a79835dd1f94b54113c9982e01c1a5cbce09c89a8ca5783407669de35665"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/ca/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/ca/thunderbird-102.6.1.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "6034897c6ca24a27caf91671851a1e022d807eb4e0bfe747f79e8d56a7f29f68"; + sha256 = "4461d13cef193613c490eb3194e4a49c8273cd18a6802450c1bec7a239ff3236"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/cak/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/cak/thunderbird-102.6.1.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "cceb7e008a4db037430fb14c2530f81acf406214c84f053872f36ce7ce632919"; + sha256 = "3382850dab21c32bf31b1ba10474a2cb017c16af5d3fc3697fe15dc39ccd9b40"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/cs/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/cs/thunderbird-102.6.1.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "a02cef9419a94aec3aac68f484ff042344b9c714d5443d8017e517e6a36315f7"; + sha256 = "1d9f24e160547e4af0d6420b443e2c36762a13bfe7a0c552162fac05c08d8b1b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/cy/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/cy/thunderbird-102.6.1.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "91088a138f0d66d4cc9cf7cccfd1668d744de0d6e9199ed74d7139aec20e95a8"; + sha256 = "dcb3a9894021d08f31dc9b5eb14bff17bd4e0ae8009c9f65b444c1ff0aca4d91"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/da/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/da/thunderbird-102.6.1.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "3d610380be8097f949f9c7baa83d4b4c8514065bc0b5d18b3a2b979931b1f5c3"; + sha256 = "0fed9e8faebbeadbeae53aa06a773b412d45adafde237742b93dfd9196c9e9e4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/de/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/de/thunderbird-102.6.1.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "c9fb5d6952bf580f0a83667d8111ee0bf7a0f424d70d678bdc4551a7314784b5"; + sha256 = "dd9a22884495c0d1ebb18fd7721688a2e14917684bc176c90578c8008d3836e8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/dsb/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/dsb/thunderbird-102.6.1.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "aebb4617fbee83e88873b49726c63adbff9613628dc5c0115da6eea16f2f15e2"; + sha256 = "2a84bf4e6862346bd03a05be6fdbeeb79347890294ec6f93809bedfa089005dd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/el/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/el/thunderbird-102.6.1.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "20cd55bfb8608ba906ab72536f1beae8c1b04efc1bc8608c898e6a7c45c3d7d4"; + sha256 = "f758bd822941145ba0da6e296f12264329a30c3f1cb5b8ce16f9887ad89caf8b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/en-CA/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/en-CA/thunderbird-102.6.1.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "80240a7fd45975fb05387eb5b6c17073b4d5b152907273a2e6c54e690b42e285"; + sha256 = "4f0edd405507b23fac31461f9511f35aacd096d92a4b598801f021ac5d3021a8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/en-GB/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/en-GB/thunderbird-102.6.1.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "efc3fc6e571b21ddbd2fefc04adc1a646c667531f6a04366a1f08fb442c3252d"; + sha256 = "15443e7ed39849346c562a67a673fb4bd39e05f8bf616fd7170e9352ea4b5404"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/en-US/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/en-US/thunderbird-102.6.1.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "6c889cf71cf02cc703f9c6d20278b5f2394669c7f6dbf86d1cd8413c46ea0dfa"; + sha256 = "501c5f0c97e89d5b5fb066b5f480cc3598a1bdc86dfc32482d3bf2c453ed29c3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/es-AR/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/es-AR/thunderbird-102.6.1.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "fa9dd4eb3895c4507ef064e0aced1b0259f50e4dacc63d3f1fb9b45926be3e6d"; + sha256 = "c228716b6c6bf78efdbfe877a01d98a697c048ba36b5b692d4a9e4f35c5c8359"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/es-ES/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/es-ES/thunderbird-102.6.1.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "85bff3585cb72f8b2aeebb0fe987e73bbdadc8b30b1e745a48663f7d81a3f533"; + sha256 = "35ff4ab3acdacaa17c31577f34e791f805f039fff636f696f483e0e77a13cdce"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/es-MX/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/es-MX/thunderbird-102.6.1.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "981f4e582b42a2b3c5bb04554fe333ed7b46e3741248c73f33a1bd6da41e1b01"; + sha256 = "da0dac340fe0467d48c75ca25a0f0c6ca40e7904969aff5efac7d14b8e2a790e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/et/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/et/thunderbird-102.6.1.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "cc43f9a48515ebb7e5f5dc3a98f09889222c7403fd3a7a678825cf70cf52b496"; + sha256 = "840bef653741da3b19b85c645fed1375ba706dee4bf2e6c8684b9f50a2d54a35"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/eu/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/eu/thunderbird-102.6.1.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "2a1ad9ff0a1b129cc1553c5324d1a20bcf7a2f07fdfff1b73deb7be7b1c8aa7c"; + sha256 = "397a1a04b45f4035338328a52baa2bfc30be9f48fcc76137122d18e0a350fcd3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/fi/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/fi/thunderbird-102.6.1.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "58b0dbc3f5a108bb17d447b3de43281f96ec2c402eb95494fbd80202f414bc56"; + sha256 = "9af605e6b57db7d2c661ecd95f422b613f1819110bd9ceee7b8d4da546fbe069"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/fr/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/fr/thunderbird-102.6.1.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "8a23d307f6092dd319c0c406ac75bf60a98c000a233e59f7126552e98b335579"; + sha256 = "44c4a26ba5da3ddd8fb5368529279a50ffc3593f3b7cef35eb903d915d7720c1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/fy-NL/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/fy-NL/thunderbird-102.6.1.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "de1a19d8a0e0058470e5aca0261737ec640386fe776a9f388f88eff4244f17fd"; + sha256 = "74023e7e027554a79362cdaeb8921393e55d902c10653221c7edc9c245646f99"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/ga-IE/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/ga-IE/thunderbird-102.6.1.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "76887469f4f639db0d1a4c30ac7b362482c9aaae1e6de061c266977d1ab2c2ff"; + sha256 = "04f6ea825e23b89ea5f55d5fdf86c11ed7c4f224df2f5fbcb1b800a5f45b22f1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/gd/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/gd/thunderbird-102.6.1.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "9ad8fcf191ea18e7b6bcefe87f68cc508b01f7f412f60345a3430ab65b03b468"; + sha256 = "fb428e74e80863cc6a69b2f9ede1694daa490637c166c5aacc041fa70943b5b2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/gl/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/gl/thunderbird-102.6.1.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "070160bd3423f38790210120d34dc6be5173fbf5277c1f274309d36045dd565b"; + sha256 = "c548d0f51b881b220dbc8c93a69add3f1b19579236b3e47d0bb3cccdb7d8647d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/he/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/he/thunderbird-102.6.1.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "d49d7d5460a7d26abf6da98e4dcb892318555cd240c9b5af0882da03cde6a81f"; + sha256 = "b22faa9d7646eb8efa3fc0e15c966f7286b53c12d72baa534a92ba20432ff8b7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/hr/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/hr/thunderbird-102.6.1.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "ac786d73b7b532f2173e45cffd19f2f6fba69be7d75bbda4a2b1a3504a03f425"; + sha256 = "05571451a11e827ba451354f97695e449afe85d7c7dcd2c0ff3aea24727272c5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/hsb/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/hsb/thunderbird-102.6.1.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "e58b0dd020e85badaae1121e4bae2e7863f96faadc70aa5571f6b4eaea4c325e"; + sha256 = "a3c0f43e1db05456aea23dc1f17b1057eb86124cc14a1ca5e80b71b1518a1fda"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/hu/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/hu/thunderbird-102.6.1.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "4e593b2a9356260208f97a7900745e56183d57d0aa0a1c496e010bc833a12d23"; + sha256 = "6b0f9ac8947699adc325435be839cb0c08052db330d0d2c8327fce5f4cc2eb22"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/hy-AM/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/hy-AM/thunderbird-102.6.1.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "eca558fec17b96795eb21c53c62c59bf5a523bb60ef4c893569b2feb8255945e"; + sha256 = "0150496630287f01ed05dcf9e3dda88a923936e77cac41e2df856d8f4298f240"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/id/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/id/thunderbird-102.6.1.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "5d85920ab3def7b3cb72f12bff40c39ae59df39a03b86e245e7c07fa298b7dd8"; + sha256 = "0a2946beef4068a760f139f32782cea1f7ed20d8d577448bed785146394094ed"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/is/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/is/thunderbird-102.6.1.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "024af862706817bfd66ccdf0f9e86196a08cdd21fb6b7cee095dd6a52170c35c"; + sha256 = "9e876cd8b01e9ec4c77311c325b807d3318a17c7d4943a42dd1faf6500f222fe"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/it/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/it/thunderbird-102.6.1.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "eb928588955c211ee43b784205653608aa6a7566d16ac698cab0f95849d7cab7"; + sha256 = "92a90f181df2b5ef167a0b2fcbc5169615a39287b75a7428650bc679e211c755"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/ja/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/ja/thunderbird-102.6.1.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "289741d28748595dd3d4cf3a02cecbd90c4e362384e413a8fa29ffd712ac43c6"; + sha256 = "a90c125ee302827c11ba1ec41f6548c7c42c88041713747aa7ecfdb84b307d92"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/ka/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/ka/thunderbird-102.6.1.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "5fada9a77a88fe4fd26d264f0a67e4f63ec8879a11fa56a3ff2f5e3bce9f29a1"; + sha256 = "a26c7070396101c94c35a35aada3869309d19e060f8c4e44ffa77a9cb6d291e4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/kab/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/kab/thunderbird-102.6.1.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "9961ea98641b279f09bb6bf45c9ff3f85eeec29673ea8227c23f95dbc8329d01"; + sha256 = "4596eec5222f4fc3c9f27c3af1426880ec3846b981b5719bf97decde06f14580"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/kk/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/kk/thunderbird-102.6.1.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "e0f18494421c61f61b47b33a30101a63925e093e24d89aeb8e295ea5457057e7"; + sha256 = "957df20187a944e587f16426b975e0b25dc274ac6ff0112f8ad96f7b520f35f3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/ko/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/ko/thunderbird-102.6.1.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "01b452e1b2f980228a72c3529e89db3c5357a1b5603e5578af1e32c3a3a52307"; + sha256 = "77cb35952ebd1b14e661d6c67933fe5c28e5670e2a08399227e90e0d1665a149"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/lt/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/lt/thunderbird-102.6.1.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "96cf9f188946695becc4022f3ebbe04138259d878a3702c8dac260daa2e41b87"; + sha256 = "fda5d9ee40b2a9266a14969187fe54f5dfa97b3029cd23bb4f74dba31139cb9b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/lv/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/lv/thunderbird-102.6.1.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "4504a245d791c6cc5c5f372fad8f208846ae697e32dd9462b2c1a539ebea1a00"; + sha256 = "088a7b5746926614ce27ec42ac8e50dfa573006e76bc2cb2cab8d94b820ed3db"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/ms/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/ms/thunderbird-102.6.1.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "23e14058f426497aebfe4ee38ba627b485012271c018b4a2c86ec9cda4a41c94"; + sha256 = "827c08cdc65fbd81bdd326b2036071d2174d469c72224929af899c3af90cbb1b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/nb-NO/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/nb-NO/thunderbird-102.6.1.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "93c7b7084ebd270a2e1f85d60d0a9f59afe8cf29c364eb99ca0c658520d6f9f3"; + sha256 = "f049be571b8d9b39dae313d370e2510251a0521ab64cb82cb432843fb26c407b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/nl/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/nl/thunderbird-102.6.1.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "7ad0aee2c5b35953edcb8dc0f1b90e55bba13e03e47b7504b320bf4d706b9066"; + sha256 = "26fb69eceb626eb7482f67ef0043dd9fa58003b534bf4066aef3d51792ea1834"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/nn-NO/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/nn-NO/thunderbird-102.6.1.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "3cd1127e6eff5462716812d06b36ee5ba4ea8ac78608ac5aaf806f8561d3244d"; + sha256 = "4e586bda023baecaee92853a4e6e993e35ce193ca2770071bc22ba2006109898"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/pa-IN/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/pa-IN/thunderbird-102.6.1.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "72aabe72bd1bffb4cd8666296a7069ba91ffbe89ac753e52645957352cd679eb"; + sha256 = "8fad3effac8d00d5a07466b94b8d51ad6ecc23552ffec658fef6d127b0b80e4b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/pl/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/pl/thunderbird-102.6.1.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "64bd01b72b38eb81025425a64495aeb1405e6c75c6a140ee75cb2a433f09b73d"; + sha256 = "7dc544a10b244425e76e341fc1164b52e915fb5e6c12fc755bcca173810827b7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/pt-BR/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/pt-BR/thunderbird-102.6.1.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "98af0995d54f5ec6acf67b5cd7542f96778bfe8a28f2092d90033196bf5c7bc3"; + sha256 = "7b38735922511f3a03febc10e98fced7880a8874ccb53c3c946d4db225d02823"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/pt-PT/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/pt-PT/thunderbird-102.6.1.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "df9930a733b6a29cf9043241322469fbbf07b3c36c933b1f1ed2caa31ac64369"; + sha256 = "4baa786ae442af119a3c9d794a31aedee06839b8dc9551b46028a4578c4086bc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/rm/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/rm/thunderbird-102.6.1.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "a7f6ca7d64d4eb821d070753662928b7f830ba53ac5c05d5cc973d74d71bc833"; + sha256 = "087b4ecbbf95853ca6937a828f4f806d32f8c56d0feaf0f5e05628e2ca2e3ace"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/ro/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/ro/thunderbird-102.6.1.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "9e4f65dca7ce9cfd42fff95a6cff6f094f43bd4a0dacd6fe0ad2645d162140e1"; + sha256 = "d3324a4fc7ab8e00d35fb7d1a4c6567a3a3f1b4c50590ca206eb6d5a6b950842"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/ru/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/ru/thunderbird-102.6.1.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "d71164338b7b42f31b4af3fb8b29253353d215c5bbb25622b0626d28ce31f4e1"; + sha256 = "6a2d2daf0f325f8f033869b3fe4e644ba5022244bff1031b35a439e43999cf44"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/sk/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/sk/thunderbird-102.6.1.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "bc785d8712dbb1539cf7be4ec04c928e8565f36154702f97628dd6f61db9f2ac"; + sha256 = "275785c953e5c88adf3b234c604ded4b04a087f28f32bfbf39e0b3a8e1e64c82"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/sl/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/sl/thunderbird-102.6.1.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "d19966328e1e1205cdf1bd104361325e988e3a0e5ba0d9780f7b32cd9b76f296"; + sha256 = "398725e455f26782f3d44a8165897bc375a9d0b7544e1ee37f70b77898ee4ff9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/sq/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/sq/thunderbird-102.6.1.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "bbe4c32736b85079d8f1615861500c51ef4b03a88d729064a2f10dba7ce3480b"; + sha256 = "cd2c03610f93518a95bd75cc0c7fc867b3922aaaf7e891d67dd6562aa4bc3064"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/sr/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/sr/thunderbird-102.6.1.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "ee6e9940fe94a8518c001caff24aeaa7de87802a6969af2013f92326d7dd4304"; + sha256 = "bf380394a724353bf91fae056a00e1e8238a14bd1d221bb47cc2ad6247ec721f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/sv-SE/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/sv-SE/thunderbird-102.6.1.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "51a16521bc656b71831ab1cfdfa3a477c6c991182d83aff9dfc479d0f8e64db3"; + sha256 = "8b57f7ed92a353a970c063c9374303c273a190fcc04045a7fb9ed7774a2bbfb6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/th/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/th/thunderbird-102.6.1.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "3d7e5bdbe8e4cf0cf24dc2dbff38eee869ed102ffcd6f5656bacf79047ff4ef0"; + sha256 = "99abebff09161c06c5985e74e5e1337153d99d13fa8661abf8e4f1895c12d1ff"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/tr/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/tr/thunderbird-102.6.1.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "a6abcf600cf36226bdddda04d082a0501afa44032f14d73e33a6534b24309afe"; + sha256 = "b17a54aab88fc7c13c3e5551f9b9a14153e124b19d58fef3da28392dd1a18157"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/uk/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/uk/thunderbird-102.6.1.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "48b179d8039612f3609c0245d7911727118c31f2b4bbe9954f04a7ea36410d2b"; + sha256 = "63565388a50fe92887ec6adbbcb9a2ee9835873fbaee782901b7f7fd8e35500f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/uz/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/uz/thunderbird-102.6.1.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "62857d7add0bc98051360c59ba8eccd469523d54c5435bc35ec5d73831323354"; + sha256 = "ad501a7dd6f98f5b263fd7c71572632088a4801b52ccb6ee37ebf235162fddb1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/vi/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/vi/thunderbird-102.6.1.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "ec10fa8d9aad1682a63e2a7aaf67ab7b3e07a67d3723fe28b4e07a8e4d8a7b92"; + sha256 = "fd5d17c2965a94fcc0e2d167d5f202a67a024c0797afcc92481a3413d6445ffe"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/zh-CN/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/zh-CN/thunderbird-102.6.1.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "9e61c0470df8111a51cd89039ad552bd02918a072064d71417ab83e9fff98d4e"; + sha256 = "e666ac3bd0f75b3f7915bfade39b044b69af7f3d5901c0f48311ff614f4d710b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-x86_64/zh-TW/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/zh-TW/thunderbird-102.6.1.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "b613f0257d6856b3ead2bc20a21b9e0d392f5640d8c3a90b398dd526edb1bb19"; + sha256 = "5c85008c1974b961e08065976a28b0897ff9d5199bc69e1c3c403a10d546156b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/af/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/af/thunderbird-102.6.1.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "fba04abef7dc96e031a41f468b92655c1c1a623f50413c2b7005497bae60b882"; + sha256 = "e8c7b235b856b7c3ff1859acf856c8917d5a1dfc7e4a6d2b9d4736b3709f9150"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/ar/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/ar/thunderbird-102.6.1.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "1ac92219e3158d2740347c5446d2ff3d1c7cfa0076793a3942e219df7827c37d"; + sha256 = "8594ee599a9bcd600b679e762956042e71cfcc60d6942f22ec9c3a25a0790f78"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/ast/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/ast/thunderbird-102.6.1.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "18b3131e47297d5bc6dc8cc686702a8b2cbcafa7453ce3ad04423516b5f9c338"; + sha256 = "15d81d66cee46104d0ba9af9dd6704b1dfde2c3720a68fd23fe5181b56b2942d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/be/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/be/thunderbird-102.6.1.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "2a39fa0aa407865e1e071ba265bc67a7ac1cbcc177ec03fbc57a55e29ea6c6e6"; + sha256 = "07bc7abcc461b68d4bd7015518a4ab0f00486c3104ff04fb195244af826ce99e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/bg/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/bg/thunderbird-102.6.1.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "eaea602188d3cb3b5d6d9527ee4e4941693cf8ac88be7385226e29074c399a20"; + sha256 = "3c3995a3c75d7100d3b5a37de7d96032b41365cc27337af3f90bc01c318c621b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/br/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/br/thunderbird-102.6.1.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "48e6754fd590cf9a49e13e7bf5b3d608b62e0b62c9ee574a4642ddd57e1ed2d3"; + sha256 = "a390683e704cafa6b594028c02db0729519688b14284cbf4e23af06d797030b6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/ca/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/ca/thunderbird-102.6.1.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "ba3ae39cb7817a87f478167739de71b6195852d91b501a55a5185812a0bce3bf"; + sha256 = "bae799d097b2a072b4f8ecee6dd18b91a07d08f070da39a22dbd669bffa9cb33"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/cak/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/cak/thunderbird-102.6.1.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "7e18692b7b408fd0ccb35595423da99ffd2bcccb112fe8cfa5c120f2d696fb08"; + sha256 = "68af639a2d228cc8925702ab32c8f7e6fd9ed48c83111325d93b477811177f80"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/cs/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/cs/thunderbird-102.6.1.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "31037a48c2646569f4b0d160dbd84d9db541f59b78545c52c4c4a4f5c961532f"; + sha256 = "191ec59655ec025ca02360710b180899bb3486910b5c6721165b4cc8ec78f9b2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/cy/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/cy/thunderbird-102.6.1.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "a309dc3c9b7717433af192b3ac41ade7882f7422bd875ae85837b9a66d75a31c"; + sha256 = "a65d91c31430b9b0b138014135d23d56e4ecd849aec398539c6dadb63fdbf03c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/da/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/da/thunderbird-102.6.1.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "5b42f683b415c4235d216d35cc0489bd38087bf59d0bf8bedbf3980dd5460767"; + sha256 = "9306558c123903497e2e5ad7968aa69e94b9c4e809f6f5b4d35b9aafcbc75ed0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/de/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/de/thunderbird-102.6.1.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "90e11c7e2be2a1137c6db78e9bf3da6c3d09a41f3b0bf40338ddc8b64432fef2"; + sha256 = "ab06a47e5472db33702187a88bd8a794632809977632bf129f3d980b8a06ceb5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/dsb/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/dsb/thunderbird-102.6.1.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "c5f61a10c59ff0b4d65e60b83a6f0fb11ed3045b40ca4bdc583a7de04ceb5108"; + sha256 = "05adea0c112d5d481990a7960de93c7a61d055f8268cbf617b295f86daaeb5b9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/el/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/el/thunderbird-102.6.1.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "31f20c16f2d9d430615058b2fc7f1f49e0c39fcec71429d179f583750d3bb316"; + sha256 = "6d4d1913ae19fa528aa6986c617226d30cd46099825afb2bae83b052f5aac490"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/en-CA/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/en-CA/thunderbird-102.6.1.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "dd1bdc4cd28ddced917ffde9f598ff33760a148126e262127084732d0d50b4df"; + sha256 = "9919702fe73038c05cbcdf747126b22b7b4fd62549ad4d1361ef85fe6aa92f71"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/en-GB/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/en-GB/thunderbird-102.6.1.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "7248388e91e24538e5bd8c3d877711e4f8794bd4ad2ab8f5eb71c31fa0d7423d"; + sha256 = "5d8b8bcf27c67d6a0c70bb6754167474e9bd9fb7489f1fd21f3754d27d872326"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/en-US/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/en-US/thunderbird-102.6.1.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "754f3e6bebc1f36bf76d0cecb08bcd9a7dc4d43bb2467c69d3f4611b79358131"; + sha256 = "b24ea963c7e09d1f69b1297a6f86a7d0462403a9172d81ef47c375141d54cce9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/es-AR/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/es-AR/thunderbird-102.6.1.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "bf6852b5e907117b60cd5325f8571e8b287a1ddf6a5ec7f93cc667adec647969"; + sha256 = "1617dc229307d42e1a60ea44f359a62f042f53064360dac7ffd59b6a7c90da41"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/es-ES/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/es-ES/thunderbird-102.6.1.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "9df45a34e94952bac3b84eb633177e88a420863a8049b7f417db539114ab9bdf"; + sha256 = "9f19e6654ff4e2eab1d9f7ee555da87c270e60cffb820b000b7892583f4faf6f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/es-MX/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/es-MX/thunderbird-102.6.1.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "da66de3a423965bae1825bf863864d3bad4b91759ab4392f825586ec9abfe00e"; + sha256 = "7b055cfb21573399df99e4d6884cb4c61ce2221ac8ea463d1d2b7115d97ece2a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/et/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/et/thunderbird-102.6.1.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "c1954615d54c66e20687485ad3eb68aee68559670ac84f37ad83169dd5c6ea0f"; + sha256 = "cbeef98898969cd7b858bb127c6ca8b6b9888cda0e230e303a8c4c777a30d151"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/eu/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/eu/thunderbird-102.6.1.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "02e4f09053b0af0f16b573539cff6fb4a0670e8c63413d34b13bfbaa1ccc1851"; + sha256 = "5e8160115595350cf5b0a44e71c09d32fbac65ffda9ac6f22cb5e910d18462c1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/fi/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/fi/thunderbird-102.6.1.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "0687aa8b0c694de151bea3cbb669a3e9e492ce7e35ae15f284a3612ccf3a1274"; + sha256 = "291883c64f376bad4b6345864d10f0e067123589a2b30f38dc24a99b25854949"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/fr/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/fr/thunderbird-102.6.1.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "06469b90502e9779c71785c0296f16dc8ef53d7a7dfb44acfab106d6a492d657"; + sha256 = "7b57f6a1f499a009176cd894df6fa9fd151b707b63aec8dfb62e426a294c53d4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/fy-NL/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/fy-NL/thunderbird-102.6.1.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "0f9d43cc9415f7e56c110e555f8bb07a0fccc1b470b3e580213f813ef612c36b"; + sha256 = "6e355a646c8dd77c72fe16c896c25572c9b87c4806364836b3681407bf7941b7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/ga-IE/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/ga-IE/thunderbird-102.6.1.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "e8d61bea673be01ff4ee5dca08aa323815f768ea5b7aa7039943ff0d9a07c750"; + sha256 = "fc2b1fbfc5aeb15082e656c01a71943045233ee593c3e1710440a79f50d4c0cc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/gd/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/gd/thunderbird-102.6.1.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "a39df1bfef807166c8df652e307a57007b1605bc3a4c8322bb012b05dc64d994"; + sha256 = "e8be8dba1751fb4633dc5bef4a047b3ff85ed9e799b89669f26f8e0e3125e30a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/gl/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/gl/thunderbird-102.6.1.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "a40c0ea5adac744b654ba6af033b9319dd3d9e8d7741e93a641d30254bacef16"; + sha256 = "78ffb29b73629b7d319bf752471608e3d44624b5b99b6eaea7f241901d623a05"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/he/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/he/thunderbird-102.6.1.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "4279dedfd093231c88cfb716d22c1977e20b067d00327777d90cf862fc8a2ba7"; + sha256 = "3bb4469702756c39cb70b0639b825e922d769a9aae7e78f296d8188b039499b6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/hr/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/hr/thunderbird-102.6.1.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "ca0b0d3f5dddbfbe3a08ab2e1a0db1e04f86ec96d3666f93e6bf03ea2186c045"; + sha256 = "acd95b3717e6b617212c75be3b9e0b193f33cf5e5636d2ea535a720006f7cfe8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/hsb/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/hsb/thunderbird-102.6.1.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "dc03a363f9740fb0d2aadc916d2145261ecb10969fd2d2fc0135e03f30a2c2a2"; + sha256 = "7c65d7f28c713723c58ed62715404224b8f4163a1915f702d125f827e642b509"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/hu/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/hu/thunderbird-102.6.1.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "24db5084de2564550f2053e676d51251a98de4c6c580daca27490e6474614fcc"; + sha256 = "6d206289e4e8ef8db85c29ec001b91add5eac67bca3d7f5eb42099cdc9934c6b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/hy-AM/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/hy-AM/thunderbird-102.6.1.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "9f8688668f29e7016a2ec3a076c3dbe8ff69f36abfd4e071dcdf896a8b108801"; + sha256 = "8823ea085d97bedddb4ea16517626dae9747db2450900eaa102139121eacc5fb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/id/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/id/thunderbird-102.6.1.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "a7c2d0baac5cfade4c1d1f3988af42d4082030297dd4a6f6d31d08effee9b533"; + sha256 = "e6fc35cb393f7a0cd63625700e11c313124a2542cebd431159e065c826581176"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/is/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/is/thunderbird-102.6.1.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "3328640fc5a720928e6ac9fa0dfa8b62df2a395e542e36dbd1f4a07155a6607c"; + sha256 = "f92db50f2f743436373da51e2f3b9bba7c4f6943254a70e7459ebb7d90dba3a0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/it/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/it/thunderbird-102.6.1.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "881b13cab011b635f78ff748066b2efe187ef2bf71303630fc10aa01a057ddb0"; + sha256 = "9cbf3eeb035ddd0f60c3404efc79faccb454fe406467a3c66d71b6ad4e87389e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/ja/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/ja/thunderbird-102.6.1.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "64abc0dcec7166e70f40e33c4fbd7bf36f65996494f0f73928a6fcc097fa73b0"; + sha256 = "38c5621f8b32d55b67a79103704541b14599bc67090216a9561ac1cb4c311bd8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/ka/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/ka/thunderbird-102.6.1.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "04aa0ef70410afba51d380389a77edb0fe3f2701a78c4c70c972c57cefea81d1"; + sha256 = "05b906fba741580368f52b7ddbc4772181f4d1fb4ecca20c94bfa0d41364383b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/kab/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/kab/thunderbird-102.6.1.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "f86ba0cf6a1c8f046bb6af07e969ef8252afafde7e44e8fc3417099b681d7cd4"; + sha256 = "a225ab4d086e1b21afa6d0d1d8b33434832f37c7bfc4982d2024783111cd7d01"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/kk/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/kk/thunderbird-102.6.1.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "0486501081c34771d4a0a5743409493031be5a9b72ab660b280f1e5478f0c253"; + sha256 = "38f0349f890702adf3f6854893e3a8bec5d6244ecbd69b86fa839f417a9e86c8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/ko/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/ko/thunderbird-102.6.1.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "f02ae10df782f6a0c31e6ae72f59d0a8a0f9399cc631188ed0840eed99059ef1"; + sha256 = "d838976ac2902cd6cd055480a1f4b7510abb83cb2448b64fb36d600525a90a88"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/lt/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/lt/thunderbird-102.6.1.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "aa07291e95cab61e73bf763f4f76578b662e6114dd0b2e5f950bcb2dd1c06dee"; + sha256 = "14e66fca1018cdc74b7bb50c46def97b0c6f25d667f869fc0c17d8ac16d7cc5d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/lv/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/lv/thunderbird-102.6.1.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "03b9cbe138ec34997a35fd4b948cf0e3a2e171b1d05615835604c448284f4d2b"; + sha256 = "6b7fa2d6c712b373f5013f3acf875f8ea8b8fdb582b6759e96469094b375540f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/ms/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/ms/thunderbird-102.6.1.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "e435619639653789ddac471343008a21b09a7dcd70af4997566b820f3b93b16b"; + sha256 = "fc42cae3d6ba0910df7aaa2c1df8391e70da60a093aaff60287503feaae37260"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/nb-NO/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/nb-NO/thunderbird-102.6.1.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "b23fdc44c0aab4ff6656898e4134c3d05c8b612174acff0ac09dc4dbe2599240"; + sha256 = "0ffb1b18c916f9c27e5ba3ab8bb5ee3107e37f983c2645a1955e9a4904cd8c47"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/nl/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/nl/thunderbird-102.6.1.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "ef56023d4cf3fd8b1aa8f325782d32123715a544c43a0369d6f002ad257af639"; + sha256 = "fcd3a85abbff759ed27c314f0b9d47d1a216ebe9bdaa3926885be81b31fdcc5a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/nn-NO/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/nn-NO/thunderbird-102.6.1.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "6667688821f43d9a1e3984479abb286b56c9ba42a25785231f4832ed232cd6aa"; + sha256 = "affde5a378f0ac70d48d7e4c75f6b2f680517cb2106a28aa4a53e376349b43d3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/pa-IN/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/pa-IN/thunderbird-102.6.1.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "ceafa5a4b290ae439eb65cc409dcfa67606d71e9a66b0ea968845ed965d7d850"; + sha256 = "81984847af5c43eeb35870d39eb6e006d8b9df35b5e03135670973ae6f5f7d1d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/pl/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/pl/thunderbird-102.6.1.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "dab264929f800384c4e44daf5a3bf0dddcdb5786ad8bff0fb68683bb5cc1929b"; + sha256 = "4710f6042126da09159cb5d465909bea3dff62753b6c5811f8920ca7782bcf73"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/pt-BR/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/pt-BR/thunderbird-102.6.1.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "0d2bd65dd8551e72e7b0d905450596d9fd35eb7f72478f7dc7ac7e44d1cca9e4"; + sha256 = "92c564bb0623a9a258fefdacd7a76a3e636ca5211f962c3b3a68cfb16cc5217a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/pt-PT/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/pt-PT/thunderbird-102.6.1.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "e4310e455f2843a2ef23dd2be75bc43babdfb82b222b0f7e7c04648f0dc7ef45"; + sha256 = "37fb096c984cd78174def41da70d0c352536b1780a817731759f35ac3554e330"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/rm/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/rm/thunderbird-102.6.1.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "fce4a2d49f35d18a68fb59a7ca65550d09267919218281d9a26f5272a7cb5fbe"; + sha256 = "b72355afb5333ef44336d4686141a44b4f291edf110c75168070959380bbac58"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/ro/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/ro/thunderbird-102.6.1.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "41c342b6148eb75608c4d5a8e38ef1e4522a5fd755d1aeda0f59e038ce596d3a"; + sha256 = "8536fa781ea743fce1379137da66394ce1f79ccce4daf4f9d5e2c28432c94466"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/ru/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/ru/thunderbird-102.6.1.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "5804852fae2c30d9f19418cf4138c0ebcf66effae30db3af5ad96b8554b768ce"; + sha256 = "69b0d192d7cb04aedff4f356e9520ef6ce5f8125fc2309c60a1e6073dee64cc3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/sk/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/sk/thunderbird-102.6.1.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "5a5ed95e6ce2a8f37580177813d0e3586ba71bbb8a52cf242b8f83f6ce236565"; + sha256 = "0a1c3955f1ccd027a45249b7d0d44f40fa8a47c680dcd0411d04cf8dacfacad2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/sl/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/sl/thunderbird-102.6.1.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "93c06443cb2df81f62fb43347a7b023c7122914a733e9e9f3d267f325c8ab7e7"; + sha256 = "e9659cb2099dd02c1a990914383f75569b01a1f39f1f79c1dd60b24129c0986c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/sq/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/sq/thunderbird-102.6.1.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "91e395232f22abf530b729347798544feeeca02fad6ccc36cfad827ab7393c60"; + sha256 = "080493bf33a13e2e705d8200f8b6edf4f85ba292881d71df4dd38600fee105da"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/sr/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/sr/thunderbird-102.6.1.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "d5e2bcfe948a1cac8df11905a57fa6706a7e8e85d7be12d3bcb7f7b54e53f2ec"; + sha256 = "dd1efccc8bfba45aef4e25d872652b39a05de669e57aa30827b09574968f4ab7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/sv-SE/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/sv-SE/thunderbird-102.6.1.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "96e07de3298723d7cab43b804aabe6187c15ea89252d1344abf4bbd25cb9b9f2"; + sha256 = "f04fee4bbcdcf35c18be80c3a0d5cfde8cd3c918854c254f775272a3a005e2e6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/th/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/th/thunderbird-102.6.1.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "67cce516f665cfd559867e5e00931ba540ad63f2906ec511d8c855806fe3ab01"; + sha256 = "841d28387ddcc3fdbaec217a8bc987bbed43a735b1d0ffe2eeb8b6fa58458f47"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/tr/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/tr/thunderbird-102.6.1.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "c1de3a1814d76a4c8d72b6f3df2a9e601e07b0cdbdcc4813a20c97c1874a712a"; + sha256 = "e4d793ff7e738389aabc7ec9d6893e2e4162e63996c36341f64af570b26f5f6a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/uk/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/uk/thunderbird-102.6.1.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "308bbd7f01a30f9663d5cd68dfbf167395fcfafe24ea400033bed4f7e96328d6"; + sha256 = "03fecaf497d2a4188474e4ee6a0fcf084a32d0903fa041cbe39eab29421f7276"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/uz/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/uz/thunderbird-102.6.1.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "858c07c3f2c1ce396d9ab11a4081e35f878deb24b3e6acd9ca1e29bf011f8140"; + sha256 = "d463b9108838a61c153ae4a8fc69fb805881589b441206c08e583289ef18c314"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/vi/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/vi/thunderbird-102.6.1.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "d7897016c1ad4cd7f7f97953dd5cfd752c035d1047fe769cb9ad40a3d37cb9b9"; + sha256 = "8f7cb20aa60e27c1b776ea03842f38629044b6ee1c3c49df172c774cc387f409"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/zh-CN/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/zh-CN/thunderbird-102.6.1.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "aea218e4dedca2ffa80b9003c50e018e40675c9cce5d2d3cebef31ff82a789d6"; + sha256 = "90d52ae6329d04ddfa8f37d5f54f98ee0893ece5a7c73c550fbea568538c7485"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.0/linux-i686/zh-TW/thunderbird-102.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/zh-TW/thunderbird-102.6.1.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "942333eec6039114389721fc0681f9f11f6958b6e3dea9a3ab914f09fee50a7a"; + sha256 = "35b625402841a21a128eaf7c92ff277c996d6ff07f269fdf92f0d6cb3e04876c"; } ]; } diff --git a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix index fabf52f8c68..49985ac7bdb 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix @@ -5,13 +5,13 @@ rec { thunderbird-102 = (buildMozillaMach rec { pname = "thunderbird"; - version = "102.6.0"; + version = "102.6.1"; application = "comm/mail"; applicationName = "Mozilla Thunderbird"; binaryName = pname; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; - sha512 = "34f79068685ace75ca65141d8165138d25326e9d0a1c25b0463ea69c64a7240dd19c6c894c875c5429cf7b40344fbd32b1ba0412bf8893c4bb744c83f8bc25ad"; + sha512 = "06ea2fce76c08609d638435869fddc1c4d7f4b748951ebfb2476b4dba9f1f76d3de2c11e5f62540f297a5d30bb0fc637852d8e57f4fadc2c905f299757949d83"; }; extraPatches = [ # The file to be patched is different from firefox's `no-buildconfig-ffx90.patch`. diff --git a/pkgs/applications/networking/newsreaders/raven-reader/default.nix b/pkgs/applications/networking/newsreaders/raven-reader/default.nix index 360a93b5edd..4cfcfabe3d8 100644 --- a/pkgs/applications/networking/newsreaders/raven-reader/default.nix +++ b/pkgs/applications/networking/newsreaders/raven-reader/default.nix @@ -2,10 +2,10 @@ let pname = "raven-reader"; - version = "1.0.74"; + version = "1.0.78"; src = fetchurl { url = "https://github.com/hello-efficiency-inc/raven-reader/releases/download/v${version}/Raven-Reader-${version}.AppImage"; - sha256 = "sha256-BwJK0V19aLpTRa/7wzlWdALiJrOhfejCkKCGrZyA5EQ="; + sha256 = "sha256-H9V2zTD80fBuIuNZnGDR21IYAAl/b6iYrde5rfsMECQ="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; diff --git a/pkgs/applications/networking/p2p/transmission/default.nix b/pkgs/applications/networking/p2p/transmission/default.nix index 2bb2967ec74..f3a33c2194c 100644 --- a/pkgs/applications/networking/p2p/transmission/default.nix +++ b/pkgs/applications/networking/p2p/transmission/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchFromGitHub -, fetchurl , cmake , pkg-config , openssl @@ -47,14 +46,6 @@ in stdenv.mkDerivation { fetchSubmodules = true; }; - patches = [ - # fix build with openssl 3.0 - (fetchurl { - url = "https://salsa.debian.org/debian/transmission/-/raw/debian/3.00-2.1/debian/patches/openssl3-compat.patch"; - hash = "sha256-v+SDTW/lCtc8B3TuhQB1pmjW/QRAGLtYncaImNNwpes="; - }) - ]; - outputs = [ "out" "apparmor" ]; cmakeFlags = diff --git a/pkgs/applications/networking/pjsip/default.nix b/pkgs/applications/networking/pjsip/default.nix index 96d0c60df14..eae9a8a3d87 100644 --- a/pkgs/applications/networking/pjsip/default.nix +++ b/pkgs/applications/networking/pjsip/default.nix @@ -1,4 +1,12 @@ -{ lib, stdenv, fetchFromGitHub, openssl, libsamplerate, alsa-lib, AppKit }: +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, openssl +, libsamplerate +, alsa-lib +, AppKit +}: stdenv.mkDerivation rec { pname = "pjsip"; @@ -13,6 +21,16 @@ stdenv.mkDerivation rec { patches = [ ./fix-aarch64.patch + (fetchpatch { + name = "CVE-2022-23537.patch"; + url = "https://github.com/pjsip/pjproject/commit/d8440f4d711a654b511f50f79c0445b26f9dd1e1.patch"; + sha256 = "sha256-7ueQCHIiJ7MLaWtR4+GmBc/oKaP+jmEajVnEYqiwLRA="; + }) + (fetchpatch { + name = "CVE-2022-23547.patch"; + url = "https://github.com/pjsip/pjproject/commit/bc4812d31a67d5e2f973fbfaf950d6118226cf36.patch"; + sha256 = "sha256-bpc8e8VAQpfyl5PX96G++6fzkFpw3Or1PJKNPKl7N5k="; + }) ]; buildInputs = [ openssl libsamplerate ] diff --git a/pkgs/applications/office/treesheets/default.nix b/pkgs/applications/office/treesheets/default.nix index e7ea4620742..bdedb717d03 100644 --- a/pkgs/applications/office/treesheets/default.nix +++ b/pkgs/applications/office/treesheets/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "treesheets"; - version = "unstable-2022-12-30"; + version = "unstable-2023-01-04"; src = fetchFromGitHub { owner = "aardappel"; repo = "treesheets"; - rev = "9607a9a05b20e0c0246358aa90643b5b9699377e"; - sha256 = "Bg82vZXGTkFLf0cBtPHUEXHuH9rpYYqydWyuEbJm9Gk="; + rev = "fad7747720a602268525d5a900c03c252c9070dd"; + sha256 = "2n8AEK2YZd+zZjYiDNFe45ACW2cl7YMoOpGIidsKLZU="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/radio/gqrx/default.nix b/pkgs/applications/radio/gqrx/default.nix index 8dcc9ca65d4..2ccc2c73771 100644 --- a/pkgs/applications/radio/gqrx/default.nix +++ b/pkgs/applications/radio/gqrx/default.nix @@ -2,7 +2,9 @@ , fetchFromGitHub , cmake , pkg-config -, qt5 +, qtbase +, qtsvg +, qtwayland , gnuradio3_8Minimal , thrift , mpir @@ -10,6 +12,7 @@ , alsa-lib , libjack2 , wrapGAppsHook +, wrapQtAppsHook # drivers (optional): , rtl-sdr , hackrf @@ -30,13 +33,13 @@ gnuradio3_8Minimal.pkgs.mkDerivation rec { owner = "gqrx-sdr"; repo = "gqrx"; rev = "v${version}"; - sha256 = "sha256-KQBtYVEfOXpzfxNMgTu6Hup7XpjubrpvZazcFlml4Kg="; + hash = "sha256-KQBtYVEfOXpzfxNMgTu6Hup7XpjubrpvZazcFlml4Kg="; }; nativeBuildInputs = [ cmake pkg-config - qt5.wrapQtAppsHook + wrapQtAppsHook wrapGAppsHook ]; buildInputs = [ @@ -46,8 +49,9 @@ gnuradio3_8Minimal.pkgs.mkDerivation rec { alsa-lib libjack2 gnuradio3_8Minimal.unwrapped.boost - qt5.qtbase - qt5.qtsvg + qtbase + qtsvg + qtwayland gnuradio3_8Minimal.pkgs.osmosdr rtl-sdr hackrf diff --git a/pkgs/applications/radio/sdrangel/default.nix b/pkgs/applications/radio/sdrangel/default.nix index 45f609c08f2..cac4144f544 100644 --- a/pkgs/applications/radio/sdrangel/default.nix +++ b/pkgs/applications/radio/sdrangel/default.nix @@ -42,14 +42,13 @@ mkDerivation rec { pname = "sdrangel"; - version = "7.8.3"; + version = "7.8.5"; src = fetchFromGitHub { owner = "f4exb"; repo = "sdrangel"; rev = "v${version}"; - sha256 = "sha256-zP3Ic0mru0FcX7ZuE/IKGmHA596lq5Y1cWdBESzzU0U="; - fetchSubmodules = false; + sha256 = "sha256-m5b51rR2l4EdF2kMogHIi1ojoy3UwuU0Q3pfB1ev300="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/applications/science/chemistry/jmol/default.nix b/pkgs/applications/science/chemistry/jmol/default.nix index c72a4ace248..b5b5be84c8e 100644 --- a/pkgs/applications/science/chemistry/jmol/default.nix +++ b/pkgs/applications/science/chemistry/jmol/default.nix @@ -25,14 +25,14 @@ let }; in stdenv.mkDerivation rec { - version = "14.32.76"; + version = "14.32.83"; pname = "jmol"; src = let baseVersion = "${lib.versions.major version}.${lib.versions.minor version}"; in fetchurl { url = "mirror://sourceforge/jmol/Jmol/Version%20${baseVersion}/Jmol%20${version}/Jmol-${version}-binary.tar.gz"; - sha256 = "sha256-KdQZKiAJFKE2PW0/DdZGIOC8QQ1icQR+TY4hoXCQdxg="; + sha256 = "sha256-otvaDPdGRmtUfWfy7m+CJOyDOFuW/AExbskYnYEikY8="; }; patchPhase = '' diff --git a/pkgs/applications/science/electronics/digital/default.nix b/pkgs/applications/science/electronics/digital/default.nix new file mode 100644 index 00000000000..0515809dffe --- /dev/null +++ b/pkgs/applications/science/electronics/digital/default.nix @@ -0,0 +1,99 @@ +{ lib, stdenv, fetchFromGitHub, makeDesktopItem, copyDesktopItems, makeWrapper +, jre, maven, git +}: + +let + pkgDescription = "A digital logic designer and circuit simulator."; + version = "0.29"; + buildDate = "2022-02-11T18:10:34+01:00"; # v0.29 commit date + + desktopItem = makeDesktopItem { + type = "Application"; + name = "Digital"; + desktopName = pkgDescription; + comment = "Easy-to-use digital logic designer and circuit simulator"; + exec = "digital"; + icon = "digital"; + categories = [ "Education" "Electronics" ]; + mimeTypes = [ "text/x-digital" ]; + terminal = false; + keywords = [ "simulator" "digital" "circuits" ]; + }; + + # Use the "no-git-rev" maven profile, which deactivates the plugin that + # inspect the .git folder to find the version number we are building, we then + # provide that version number manually as a property. + # (see https://github.com/hneemann/Digital/issues/289#issuecomment-513721481) + mvnOptions = "-Pno-git-rev -Dgit.commit.id.describe=${version} -Dproject.build.outputTimestamp=${buildDate}"; +in +stdenv.mkDerivation rec { + pname = "digital"; + inherit version jre; + + src = fetchFromGitHub { + owner = "hneemann"; + repo = "Digital"; + rev = "287dd939d6f2d4d02c0d883c6178c3425c28d39c"; + sha256 = "o5gaExUTTbk6WgQVw7/IeXhpNkj1BLkwD752snQqjIg="; + }; + + # Use fixed dates in the pom.xml and upgrade the jar and assembly plugins to + # a version where they support reproducible builds + patches = [ ./pom.xml.patch ]; + + # Fetching maven dependencies from "central" needs the network at build phase, + # we do that in this extra derivation that explicitely specifies its + # outputHash to ensure determinism. + mavenDeps = stdenv.mkDerivation { + name = "${pname}-${version}-maven-deps"; + inherit src nativeBuildInputs version patches postPatch; + dontFixup = true; + buildPhase = '' + mvn package ${mvnOptions} -Dmaven.repo.local=$out + ''; + # keep only *.{pom,jar,sha1,nbm} and delete all ephemeral files with + # lastModified timestamps inside + installPhase = '' + find $out -type f \ + -name \*.lastUpdated -or \ + -name resolver-status.properties -or \ + -name _remote.repositories \ + -delete + ''; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "X5ppGUVwNQrMnjzD4Kin1Xmt4O3x+qr7jK4jr6E8tCI="; + }; + + nativeBuildInputs = [ copyDesktopItems maven makeWrapper ]; + + postPatch = '' + substituteInPlace pom.xml --subst-var-by buildDate "${buildDate}" + ''; + + buildPhase = '' + mvn package --offline ${mvnOptions} -Dmaven.repo.local=${mavenDeps} + ''; + + installPhase = '' + mkdir -p $out/bin + mkdir -p $out/share/java + + classpath=$(find ${mavenDeps} -name "*.jar" -printf ':%h/%f'); + install -Dm644 target/Digital.jar $out/share/java + + makeWrapper ${jre}/bin/java $out/bin/${pname} \ + --add-flags "-classpath $out/share/java/${pname}-${version}.jar:''${classpath#:}" \ + --add-flags "-jar $out/share/java/Digital.jar" + ''; + + desktopItems = [ desktopItem ]; + + meta = with lib; { + homepage = "https://github.com/hneemann/Digital"; + description = pkgDescription; + license = licenses.gpl3Only; + platforms = [ "x86_64-linux" "x86_64-darwin" ]; + maintainers = with maintainers; [ Dettorer ]; + }; +} diff --git a/pkgs/applications/science/electronics/digital/pom.xml.patch b/pkgs/applications/science/electronics/digital/pom.xml.patch new file mode 100644 index 00000000000..cdc5a777c49 --- /dev/null +++ b/pkgs/applications/science/electronics/digital/pom.xml.patch @@ -0,0 +1,30 @@ +diff --git a/pom.xml b/pom.xml +index d5f8330b4..58ed18b63 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -129,7 +130,7 @@ + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> +- <version>2.5</version> ++ <version>3.2.0</version> + <configuration> + <archive> + <manifest> +@@ -188,6 +189,7 @@ + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-assembly-plugin</artifactId> ++ <version>3.2.0</version> + <configuration> + <finalName>Digital</finalName> + <appendAssemblyId>false</appendAssemblyId> +@@ -202,7 +204,7 @@ + </manifest> + <manifestEntries> + <Build-SCM-Revision>${git.commit.id.describe}</Build-SCM-Revision> +- <Build-Time>${maven.build.timestamp}</Build-Time> ++ <Build-Time>@buildDate@</Build-Time> + <SplashScreen-Image>icons/splash.png</SplashScreen-Image> + </manifestEntries> + </archive> diff --git a/pkgs/applications/science/logic/cbmc/default.nix b/pkgs/applications/science/logic/cbmc/default.nix index ddee2351f6f..4009761e8dc 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.71.0"; + version = "5.74.0"; src = fetchFromGitHub { owner = "diffblue"; repo = pname; rev = "${pname}-${version}"; - sha256 = "sha256-GApVmLTa1GsZNhwVW6R0KsNJOQH/2qP1CfR7VyP+o8I="; + sha256 = "sha256-n4a/0Ak2psHDCXykVSPYavuIl22uq2ZP7LUcdSzg1ow="; }; nativeBuildInputs = [ @@ -78,5 +78,7 @@ stdenv.mkDerivation rec { license = licenses.bsdOriginal; maintainers = with maintainers; [ jiegec ]; platforms = platforms.unix; + # https://github.com/diffblue/cbmc/issues/7423 + broken = stdenv.isLinux && stdenv.isAarch64; }; } diff --git a/pkgs/applications/science/logic/cedille/default.nix b/pkgs/applications/science/logic/cedille/default.nix index 611bbbe979f..4d026a2d9c7 100644 --- a/pkgs/applications/science/logic/cedille/default.nix +++ b/pkgs/applications/science/logic/cedille/default.nix @@ -4,7 +4,6 @@ , alex , happy , Agda -, buildPlatform , buildPackages , ghcWithPackages }: @@ -30,7 +29,7 @@ stdenv.mkDerivation rec { LANG = "en_US.UTF-8"; LOCALE_ARCHIVE = - lib.optionalString (buildPlatform.libc == "glibc") + lib.optionalString (stdenv.buildPlatform.libc == "glibc") "${buildPackages.glibcLocales}/lib/locale/locale-archive"; postPatch = '' diff --git a/pkgs/applications/science/logic/satallax/default.nix b/pkgs/applications/science/logic/satallax/default.nix index 7a523bbf24e..648ebee6550 100644 --- a/pkgs/applications/science/logic/satallax/default.nix +++ b/pkgs/applications/science/logic/satallax/default.nix @@ -1,10 +1,10 @@ -{lib, stdenv, fetchurl, ocaml, zlib, which, eprover, makeWrapper, coq}: +{ lib, stdenv, fetchurl, ocaml, zlib, which, eprover, makeWrapper, coq }: stdenv.mkDerivation rec { pname = "satallax"; version = "2.7"; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ocaml zlib which eprover coq]; + buildInputs = [ ocaml zlib which eprover coq ]; src = fetchurl { url = "https://www.ps.uni-saarland.de/~cebrown/satallax/downloads/${pname}-${version}.tar.gz"; sha256 = "1kvxn8mc35igk4vigi5cp7w3wpxk2z3bgwllfm4n3h2jfs0vkpib"; @@ -15,6 +15,10 @@ stdenv.mkDerivation rec { ./fix-declaration-gcc9.patch ]; + prePatch = '' + patch -p1 -i ${../avy/minisat-fenv.patch} -d minisat + ''; + preConfigure = '' mkdir fake-tools echo "echo 'Nix-build-host.localdomain'" > fake-tools/hostname @@ -41,7 +45,8 @@ stdenv.mkDerivation rec { ) ''; - postBuild = "echo testing; ! (bash ./test | grep ERROR)"; + # error: invalid suffix on literal; C++11 requires a space between literal and identifier + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-Wno-reserved-user-defined-literal"; installPhase = '' mkdir -p "$out/share/doc/satallax" "$out/bin" "$out/lib" "$out/lib/satallax" @@ -59,11 +64,22 @@ stdenv.mkDerivation rec { cp -r coq* "$out/lib/satallax/" ''; + doCheck = stdenv.isLinux; + + checkPhase = '' + runHook preCheck + if bash ./test | grep ERROR; then + echo "Tests failed" + exit 1 + fi + runHook postCheck + ''; + meta = { description = "Automated theorem prover for higher-order logic"; - license = lib.licenses.mit ; - maintainers = [lib.maintainers.raskin]; - platforms = lib.platforms.linux; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.raskin ]; + platforms = lib.platforms.unix; downloadPage = "http://www.ps.uni-saarland.de/~cebrown/satallax/downloads.php"; homepage = "http://www.ps.uni-saarland.de/~cebrown/satallax/index.php"; }; diff --git a/pkgs/applications/science/math/gmsh/default.nix b/pkgs/applications/science/math/gmsh/default.nix index 22eee8b305a..4d9b3afe31c 100644 --- a/pkgs/applications/science/math/gmsh/default.nix +++ b/pkgs/applications/science/math/gmsh/default.nix @@ -1,15 +1,17 @@ { lib, stdenv, fetchurl, cmake, blas, lapack, gfortran, gmm, fltk, libjpeg -, zlib, libGL, libGLU, xorg, opencascade-occt }: +, zlib, libGL, libGLU, xorg, opencascade-occt +, python ? null, enablePython ? false }: assert (!blas.isILP64) && (!lapack.isILP64); +assert enablePython -> (python != null); stdenv.mkDerivation rec { pname = "gmsh"; - version = "4.11.0"; + version = "4.11.1"; src = fetchurl { url = "https://gmsh.info/src/gmsh-${version}-source.tgz"; - sha256 = "sha256-PPLyRFXuCSUsmeZNTmRilW5o8P8fN7rKC3jICdbMVXo="; + sha256 = "sha256-xf4bfL1AOIioFJKfL9D11p4nYAIioYx4bbW3boAFs2U="; }; buildInputs = [ @@ -18,10 +20,31 @@ stdenv.mkDerivation rec { libGL libGLU xorg.libXrender xorg.libXcursor xorg.libXfixes xorg.libXext xorg.libXft xorg.libXinerama xorg.libX11 xorg.libSM xorg.libICE + ] ++ lib.optional enablePython python; + + enableParallelBuilding = true; + + patches = [ ./fix-python.patch ]; + + postPatch = '' + substituteInPlace api/gmsh.py --subst-var-by LIBPATH ${placeholder "out"}/lib/libgmsh.so + ''; + + # N.B. the shared object is used by bindings + cmakeFlags = [ + "-DENABLE_BUILD_SHARED=ON" + "-DENABLE_BUILD_DYNAMIC=ON" + "-DENABLE_OPENMP=ON" ]; nativeBuildInputs = [ cmake gfortran ]; + postFixup = lib.optionalString enablePython '' + mkdir -p $out/lib/python${python.pythonVersion}/site-packages + mv $out/lib/gmsh.py $out/lib/python${python.pythonVersion}/site-packages + mv $out/lib/*.dist-info $out/lib/python${python.pythonVersion}/site-packages + ''; + doCheck = true; meta = { diff --git a/pkgs/applications/science/math/gmsh/fix-python.patch b/pkgs/applications/science/math/gmsh/fix-python.patch new file mode 100644 index 00000000000..ac07c169c99 --- /dev/null +++ b/pkgs/applications/science/math/gmsh/fix-python.patch @@ -0,0 +1,50 @@ +diff --git a/api/gmsh.py b/api/gmsh.py +index 747acb203..02004da5d 100644 +--- a/api/gmsh.py ++++ b/api/gmsh.py +@@ -44,44 +44,7 @@ moduledir = os.path.dirname(os.path.realpath(__file__)) + parentdir1 = os.path.dirname(moduledir) + parentdir2 = os.path.dirname(parentdir1) + +-if platform.system() == "Windows": +- libname = "gmsh-4.11.dll" +-elif platform.system() == "Darwin": +- libname = "libgmsh.4.11.dylib" +-else: +- libname = "libgmsh.so.4.11" +- +-# check if the library is in the same directory as the module... +-libpath = os.path.join(moduledir, libname) +- +-# ... or in the parent directory or its lib or Lib subdirectory +-if not os.path.exists(libpath): +- libpath = os.path.join(parentdir1, libname) +-if not os.path.exists(libpath): +- libpath = os.path.join(parentdir1, "lib", libname) +-if not os.path.exists(libpath): +- libpath = os.path.join(parentdir1, "Lib", libname) +- +-# ... or in the parent of the parent directory or its lib or Lib subdirectory +-if not os.path.exists(libpath): +- libpath = os.path.join(parentdir2, libname) +-if not os.path.exists(libpath): +- libpath = os.path.join(parentdir2, "lib", libname) +-if not os.path.exists(libpath): +- libpath = os.path.join(parentdir2, "Lib", libname) +- +-# if we couldn't find it, use ctype's find_library utility... +-if not os.path.exists(libpath): +- if platform.system() == "Windows": +- libpath = find_library("gmsh-4.11") +- if not libpath: +- libpath = find_library("gmsh") +- else: +- libpath = find_library("gmsh") +- +-# ... and print a warning if everything failed +-if not os.path.exists(libpath): +- print("Warning: could not find Gmsh shared library " + libname) ++libpath = "@LIBPATH@" + + lib = CDLL(libpath) + diff --git a/pkgs/applications/science/medicine/xmedcon/default.nix b/pkgs/applications/science/medicine/xmedcon/default.nix index 2050517894b..5a0f3877cdb 100644 --- a/pkgs/applications/science/medicine/xmedcon/default.nix +++ b/pkgs/applications/science/medicine/xmedcon/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "xmedcon"; - version = "0.22.0"; + version = "0.23.0"; src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-Ui7XoLSzTMPIFW/3nARCmvlGF+1l7pmcnKsnvn3NFJE="; + sha256 = "sha256-g1CRJDokLDzB+1YIuVQNByBLx01CI47EwGeluqVDujk="; }; buildInputs = [ diff --git a/pkgs/applications/science/physics/sherpa/default.nix b/pkgs/applications/science/physics/sherpa/default.nix index ff44fb34374..c9911c5b999 100644 --- a/pkgs/applications/science/physics/sherpa/default.nix +++ b/pkgs/applications/science/physics/sherpa/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "sherpa"; - version = "2.2.12"; + version = "2.2.13"; src = fetchurl { url = "https://www.hepforge.org/archive/sherpa/SHERPA-MC-${version}.tar.gz"; - sha256 = "sha256-UpRkd1yoKLncllEQUm80DedDtgA8Hm+Kvi/BRVCu0AE="; + sha256 = "sha256-FIozm2AmxaELIDiLBNx8RtUCy1fIjTGtnpFiAcKcZXE="; }; postPatch = lib.optionalString (stdenv.hostPlatform.libc == "glibc") '' diff --git a/pkgs/applications/system/mgmt/default.nix b/pkgs/applications/system/mgmt/default.nix new file mode 100644 index 00000000000..0bc65dc9505 --- /dev/null +++ b/pkgs/applications/system/mgmt/default.nix @@ -0,0 +1,67 @@ +{ augeas +, buildGoModule +, fetchFromGitHub +, gotools +, lib +, libvirt +, libxml2 +, nex +, pkg-config +, ragel +}: +buildGoModule rec { + pname = "mgmt"; + version = "unstable-2022-10-24"; + + src = fetchFromGitHub { + owner = "purpleidea"; + repo = pname; + rev = "d8820fa1855668d9e0f7a7829d9dd0d122b2c5a9"; + hash = "sha256-jurZvEtiaTjWeDkmCJDIFlTzR5EVglfoDxkFgOilo8s="; + }; + + # patching must be done in prebuild, so it is shared with go-modules + # see https://github.com/NixOS/nixpkgs/issues/208036 + preBuild = '' + for file in `find -name Makefile -type f`; do + substituteInPlace $file --replace "/usr/bin/env " "" + done + + substituteInPlace lang/types/Makefile \ + --replace "unset GOCACHE && " "" + patchShebangs misc/header.sh + make lang funcgen + ''; + + buildInputs = [ + augeas + libvirt + libxml2 + ]; + + nativeBuildInputs = [ + gotools + nex + pkg-config + ragel + ]; + + + ldflags = [ + "-s" + "-w" + "-X main.program=${pname}" + "-X main.version=${version}" + ]; + + subPackages = [ "." ]; + + vendorHash = "sha256-Dtqy4TILN+7JXiHKHDdjzRTsT8jZYG5sPudxhd8znXY="; + + meta = with lib; { + description = "Next generation distributed, event-driven, parallel config management!"; + homepage = "https://mgmtconfig.com"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ urandom ]; + }; +} diff --git a/pkgs/applications/version-management/git-cliff/default.nix b/pkgs/applications/version-management/git-cliff/default.nix index c159d95fad0..ff4f91cacbd 100644 --- a/pkgs/applications/version-management/git-cliff/default.nix +++ b/pkgs/applications/version-management/git-cliff/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "git-cliff"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "orhun"; repo = "git-cliff"; rev = "v${version}"; - hash = "sha256-2EaPVNRcSiXN43iazK5MkZ8ytiALlnYRCH2gEtlqBW0="; + hash = "sha256-WpLg9kBJnEEzWIx3dJN++Np1jUkYnFGlgCrUdvz2/3w="; }; - cargoSha256 = "sha256-kWWg3Ul6SzULdW7oOmkz5Lm2FK1vF/TkggrZcNbIzck="; + cargoHash = "sha256-UN5X+rvL7nsFkIj+XZSdZ/qmHlkVVJy1BA2zSVQxqPw="; # attempts to run the program on .git in src which is not deterministic doCheck = false; diff --git a/pkgs/applications/video/davinci-resolve/default.nix b/pkgs/applications/video/davinci-resolve/default.nix index f931e905127..42c1d40b612 100644 --- a/pkgs/applications/video/davinci-resolve/default.nix +++ b/pkgs/applications/video/davinci-resolve/default.nix @@ -3,7 +3,6 @@ , cacert , curl , runCommandLocal -, targetPlatform , unzip , appimage-run , addOpenGLRunpath @@ -49,7 +48,7 @@ let SITEURL = "https://www.blackmagicdesign.com/api/register/us/download/${DOWNLOADID}"; USERAGENT = builtins.concatStringsSep " " [ - "User-Agent: Mozilla/5.0 (X11; Linux ${targetPlatform.linuxArch})" + "User-Agent: Mozilla/5.0 (X11; Linux ${stdenv.targetPlatform.linuxArch})" "AppleWebKit/537.36 (KHTML, like Gecko)" "Chrome/77.0.3865.75" "Safari/537.36" diff --git a/pkgs/applications/video/glaxnimate/default.nix b/pkgs/applications/video/glaxnimate/default.nix index 2fdb82869f3..a688e047625 100644 --- a/pkgs/applications/video/glaxnimate/default.nix +++ b/pkgs/applications/video/glaxnimate/default.nix @@ -13,7 +13,7 @@ , testers , qtsvg , qtimageformats -# For the tests + # For the tests , glaxnimate # Call itself, for the tests , xvfb-run }: @@ -67,10 +67,10 @@ stdenv.mkDerivation rec { qtWrapperArgs = [ ''--prefix PATH : ${python3WithLibs}/bin'' ]; - passthru.tests.version = testers.testVersion { + passthru.tests.version = lib.optionalAttrs stdenv.isLinux (testers.testVersion { package = glaxnimate; command = "${xvfb-run}/bin/xvfb-run glaxnimate --version"; - }; + }); meta = with lib; { homepage = "https://gitlab.com/mattbas/glaxnimate"; diff --git a/pkgs/applications/video/losslesscut-bin/default.nix b/pkgs/applications/video/losslesscut-bin/default.nix index 267393ad054..02f71a94db5 100644 --- a/pkgs/applications/video/losslesscut-bin/default.nix +++ b/pkgs/applications/video/losslesscut-bin/default.nix @@ -1,7 +1,7 @@ { lib +, stdenv , callPackage , buildPackages -, hostPlatform }: let @@ -34,9 +34,9 @@ let }; in ( - if hostPlatform.system == "aarch64-darwin" then aarch64-dmg - else if hostPlatform.isDarwin then x86_64-dmg - else if hostPlatform.isCygwin then x86_64-windows + if stdenv.hostPlatform.system == "aarch64-darwin" then aarch64-dmg + else if stdenv.hostPlatform.isDarwin then x86_64-dmg + else if stdenv.hostPlatform.isCygwin then x86_64-windows else x86_64-appimage ).overrideAttrs (oldAttrs: { diff --git a/pkgs/applications/video/makemkv/default.nix b/pkgs/applications/video/makemkv/default.nix index 9c370741cde..d083f1eda20 100644 --- a/pkgs/applications/video/makemkv/default.nix +++ b/pkgs/applications/video/makemkv/default.nix @@ -55,7 +55,7 @@ in mkDerivation { installPhase = '' runHook preInstall - install -Dm555 -t $out/bin out/makemkv out/mmccextr ../makemkv-bin-${version}/bin/amd64/makemkvcon + install -Dm555 -t $out/bin out/makemkv out/mmccextr out/mmgplsrv ../makemkv-bin-${version}/bin/amd64/makemkvcon install -D -t $out/lib out/lib{driveio,makemkv,mmbd}.so.* install -D -t $out/share/MakeMKV ../makemkv-bin-${version}/src/share/* install -Dm444 -t $out/share/applications ../makemkv-oss-${version}/makemkvgui/share/makemkv.desktop diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index abc88910c36..33455efd525 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -73,6 +73,7 @@ let # older compilers (for example bootstrap's GCC 5) fail with -march=too-modern-cpu isGccArchSupported = arch: + if targetPlatform.isPower then false else # powerpc does not allow -march= if isGNU then { # Intel skylake = versionAtLeast ccVersion "6.0"; @@ -433,8 +434,9 @@ stdenv.mkDerivation { echo "-march=${targetPlatform.gcc.arch}" >> $out/nix-support/cc-cflags-before '' - # -mcpu is not very useful. You should use mtune and march - # instead. It’s provided here for backwards compatibility. + # -mcpu is not very useful, except on PowerPC where it is used + # instead of march. On all other platforms you should use mtune + # and march instead. # TODO: aarch64-darwin has mcpu incompatible with gcc + optionalString ((targetPlatform ? gcc.cpu) && (isClang || !(stdenv.isDarwin && stdenv.isAarch64))) '' echo "-mcpu=${targetPlatform.gcc.cpu}" >> $out/nix-support/cc-cflags-before diff --git a/pkgs/build-support/flutter/default.nix b/pkgs/build-support/flutter/default.nix index 68a6675cf54..a5d6108513c 100644 --- a/pkgs/build-support/flutter/default.nix +++ b/pkgs/build-support/flutter/default.nix @@ -26,7 +26,6 @@ , git , dart , nukeReferences -, targetPlatform , bash , curl , unzip @@ -57,7 +56,7 @@ let self = (self: llvmPackages_13.stdenv.mkDerivation (args // { deps = stdenvNoCC.mkDerivation (lib.recursiveUpdate (getAttrsOrNull fetchAttrs args) { - name = "${self.name}-deps-flutter-v${flutter.unwrapped.version}-${targetPlatform.system}.tar.gz"; + name = "${self.name}-deps-flutter-v${flutter.unwrapped.version}-${stdenvNoCC.targetPlatform.system}.tar.gz"; nativeBuildInputs = flutterDeps ++ [ nukeReferences diff --git a/pkgs/build-support/rust/build-rust-crate/test/brotli-crates.nix b/pkgs/build-support/rust/build-rust-crate/test/brotli-crates.nix index ab9b0a13ae7..4831c106271 100644 --- a/pkgs/build-support/rust/build-rust-crate/test/brotli-crates.nix +++ b/pkgs/build-support/rust/build-rust-crate/test/brotli-crates.nix @@ -1,6 +1,6 @@ -{ lib, buildPlatform, buildRustCrate, fetchgit }: -let kernel = buildPlatform.parsed.kernel.name; - abi = buildPlatform.parsed.abi.name; +{ lib, stdenv, buildRustCrate, fetchgit }: +let kernel = stdenv.buildPlatform.parsed.kernel.name; + abi = stdenv.buildPlatform.parsed.abi.name; include = includedFiles: src: builtins.filterSource (path: type: lib.lists.any (f: let p = toString (src + ("/" + f)); in diff --git a/pkgs/data/icons/whitesur-icon-theme/default.nix b/pkgs/data/icons/whitesur-icon-theme/default.nix index d665c9f2b0d..8733d20e9fa 100644 --- a/pkgs/data/icons/whitesur-icon-theme/default.nix +++ b/pkgs/data/icons/whitesur-icon-theme/default.nix @@ -27,13 +27,13 @@ lib.checkListOfEnum "${pname}: theme variants" [ stdenvNoCC.mkDerivation rec { inherit pname; - version = "2022-11-17"; + version = "2023-01-08"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - hash = "sha256-crZ6JQeXeSjTHGIBptioNiFZas7MksJcjaKGlMP4fo0="; + hash = "sha256-xqKGZPlGl8kNZ4AQYZWAywL+6UxwGzYOZ9WvB85JKZk="; }; nativeBuildInputs = [ gtk3 jdupes ]; diff --git a/pkgs/data/themes/adwaita-qt/default.nix b/pkgs/data/themes/adwaita-qt/default.nix index 79690fa4e6a..2a5d768b1ae 100644 --- a/pkgs/data/themes/adwaita-qt/default.nix +++ b/pkgs/data/themes/adwaita-qt/default.nix @@ -1,16 +1,17 @@ -{ mkDerivation -, stdenv +{ stdenv , lib , fetchFromGitHub , nix-update-script , cmake , ninja , qtbase +, qtwayland , qt5 , xorg +, useQt6 ? false }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "adwaita-qt"; version = "1.4.1"; @@ -30,9 +31,19 @@ mkDerivation rec { buildInputs = [ qtbase - qt5.qtx11extras ] ++ lib.optionals stdenv.isLinux [ xorg.libxcb + ] ++ lib.optionals (!useQt6) [ + qt5.qtx11extras + ] ++ lib.optionals useQt6 [ + qtwayland + ]; + + # Qt setup hook complains about missing `wrapQtAppsHook` otherwise. + dontWrapQtApps = true; + + cmakeFlags = lib.optionals useQt6 [ + "-DUSE_QT6=true" ]; postPatch = '' diff --git a/pkgs/desktops/lxqt/libfm-qt/default.nix b/pkgs/desktops/lxqt/libfm-qt/default.nix index 1d3c29802e3..20ededd3dc2 100644 --- a/pkgs/desktops/lxqt/libfm-qt/default.nix +++ b/pkgs/desktops/lxqt/libfm-qt/default.nix @@ -16,13 +16,13 @@ mkDerivation rec { pname = "libfm-qt"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "lxqt"; repo = "libfm-qt"; rev = version; - sha256 = "Lg+BQ0VFLF5Nhxzr4eeaDVWQG/pC1/w60pQg+lTddHY="; + sha256 = "CrCLwAdkSIhEKJtVJdtHvwEUNKhcvF22p3OOWOuxBAk="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/lxqt/lxqt-panel/default.nix b/pkgs/desktops/lxqt/lxqt-panel/default.nix index 21292e15ac1..d1b10f4f91f 100644 --- a/pkgs/desktops/lxqt/lxqt-panel/default.nix +++ b/pkgs/desktops/lxqt/lxqt-panel/default.nix @@ -30,13 +30,13 @@ mkDerivation rec { pname = "lxqt-panel"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "A/zoK6V+4tFeu8mSFukLeKnFVKl66QtKLtu7N7Z2P2w="; + sha256 = "TwVM0JY+BMvw6e/mzy82AH5E6pPsffE6oadd0BuCZk0="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/lxqt/pcmanfm-qt/default.nix b/pkgs/desktops/lxqt/pcmanfm-qt/default.nix index 2f61efa31c7..ed3eed1b422 100644 --- a/pkgs/desktops/lxqt/pcmanfm-qt/default.nix +++ b/pkgs/desktops/lxqt/pcmanfm-qt/default.nix @@ -17,13 +17,13 @@ mkDerivation rec { pname = "pcmanfm-qt"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "3N+4rhmvVUvQ6svtyOMY0+eP2Kz7EpkmZ3Ua+W4gg0Y="; + sha256 = "HzA6+dOxXyeKrzYaR5Xwqj91rivc66ObjTLKHUay61A="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/xfce/applications/xfce4-screenshooter/default.nix b/pkgs/desktops/xfce/applications/xfce4-screenshooter/default.nix index 00c06455519..8e08a2baa4f 100644 --- a/pkgs/desktops/xfce/applications/xfce4-screenshooter/default.nix +++ b/pkgs/desktops/xfce/applications/xfce4-screenshooter/default.nix @@ -12,10 +12,10 @@ mkXfceDerivation { category = "apps"; pname = "xfce4-screenshooter"; - version = "1.10.1"; + version = "1.10.2"; odd-unstable = false; - sha256 = "sha256-TKtEKjRmrdhi1nFRo1OovmPndT2RTYV9kt7auBDESmE="; + sha256 = "sha256-UpfQgKcrxFm7VvMEVV4fsvRnJPZSLJWexx9lZlFWJW8="; buildInputs = [ exo diff --git a/pkgs/desktops/xfce/core/libxfce4ui/default.nix b/pkgs/desktops/xfce/core/libxfce4ui/default.nix index e664ae77882..56172917df7 100644 --- a/pkgs/desktops/xfce/core/libxfce4ui/default.nix +++ b/pkgs/desktops/xfce/core/libxfce4ui/default.nix @@ -4,9 +4,9 @@ mkXfceDerivation { category = "xfce"; pname = "libxfce4ui"; - version = "4.18.0"; + version = "4.18.1"; - sha256 = "sha256-AYjnIi9l3l4g+wqGrPhS2AEsYNJwK1KMofCeyEz+VHs="; + sha256 = "sha256-1kzvFr/WeTl3HpVMJZRBgsvmG8VtYkdEbIQSniJIaHA="; nativeBuildInputs = [ gobject-introspection vala ]; buildInputs = [ gtk3 libstartup_notification libgtop libepoxy xfconf ]; diff --git a/pkgs/development/compilers/asn1c/default.nix b/pkgs/development/compilers/asn1c/default.nix new file mode 100644 index 00000000000..bcaab6fae86 --- /dev/null +++ b/pkgs/development/compilers/asn1c/default.nix @@ -0,0 +1,33 @@ +{ lib, stdenv, fetchurl, perl }: + +stdenv.mkDerivation rec { + pname = "asn1c"; + version = "0.9.28"; + + src = fetchurl { + url = "https://lionet.info/soft/asn1c-${version}.tar.gz"; + sha256 = "1fc64g45ykmv73kdndr4zdm4wxhimhrir4rxnygxvwkych5l81w0"; + }; + + outputs = [ "out" "doc" "man" ]; + + buildInputs = [ perl ]; + + preConfigure = '' + patchShebangs examples/crfc2asn1.pl + ''; + + postInstall = '' + cp -r skeletons/standard-modules $out/share/asn1c + ''; + + doCheck = true; + + meta = with lib; { + homepage = "http://lionet.info/asn1c/compiler.html"; + description = "Open Source ASN.1 Compiler"; + license = licenses.bsd2; + platforms = platforms.unix; + maintainers = [ maintainers.numinit ]; + }; +} diff --git a/pkgs/development/compilers/cmdstan/default.nix b/pkgs/development/compilers/cmdstan/default.nix index c82fc654b47..2d445d94f68 100644 --- a/pkgs/development/compilers/cmdstan/default.nix +++ b/pkgs/development/compilers/cmdstan/default.nix @@ -1,25 +1,18 @@ -{ lib, stdenv, fetchurl, python3, runtimeShell }: +{ lib, stdenv, fetchFromGitHub, stanc, python3, buildPackages, runtimeShell }: -let - # FIXME: remove conditional on future release - version = if stdenv.isx86_64 then "2.31.0" else "2.30.1"; - # includes stanc binaries needed to build cmdstand - srcs = rec { - aarch64-linux = fetchurl { - url = "https://github.com/stan-dev/cmdstan/releases/download/v${version}/cmdstan-${version}-linux-arm64.tar.gz"; - sha256 = "sha256-oj/7JHT4LZcRAHiA2KbM6pZbOe6C98Ff//cNsG9DIm8="; - }; - x86_64-darwin = fetchurl { - url = "https://github.com/stan-dev/cmdstan/releases/download/v${version}/cmdstan-${version}.tar.gz"; - sha256 = "sha256-BMqRRWIC/Z7It2qkESJd9L3ycyxvA6NHiWbAvzVMzIQ="; - }; - x86_64-linux = x86_64-darwin; - }; - src = srcs.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); -in stdenv.mkDerivation rec { pname = "cmdstan"; - inherit version src; + version = "2.31.0"; + + src = fetchFromGitHub { + owner = "stan-dev"; + repo = pname; + rev = "v${version}"; + fetchSubmodules = true; + sha256 = "sha256-Uh/ZhEnbhQwC8xGFjDzH9No3VRgVbHYk2KoC+e3YhJw="; + }; + + nativeBuildInputs = [ stanc ]; buildFlags = [ "build" ]; enableParallelBuilding = true; @@ -38,6 +31,13 @@ stdenv.mkDerivation rec { src/test/interface/stansummary_test.cpp ''; + preConfigure = '' + mkdir -p bin + ln -s ${buildPackages.stanc}/bin/stanc bin/stanc + ''; + + makeFlags = lib.optional stdenv.isDarwin "arch=${stdenv.hostPlatform.darwinArch}"; + checkPhase = '' ./runCmdStanTests.py -j$NIX_BUILD_CORES src/test/interface ''; @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { # Hack to ensure that patchelf --shrink-rpath get rids of a $TMPDIR reference. preFixup = "rm -rf stan"; - meta = { + meta = with lib; { description = "Command-line interface to Stan"; longDescription = '' Stan is a probabilistic programming language implementing full Bayesian @@ -66,7 +66,8 @@ stdenv.mkDerivation rec { likelihood estimation with Optimization (L-BFGS). ''; homepage = "https://mc-stan.org/interfaces/cmdstan.html"; - license = lib.licenses.bsd3; - platforms = [ "aarch64-linux" "x86_64-darwin" "x86_64-linux" ]; + license = licenses.bsd3; + maintainers = with maintainers; [ wegank ]; + platforms = platforms.unix; }; } diff --git a/pkgs/development/compilers/cudatoolkit/common.nix b/pkgs/development/compilers/cudatoolkit/common.nix index 6375c513f41..a98e188271c 100644 --- a/pkgs/development/compilers/cudatoolkit/common.nix +++ b/pkgs/development/compilers/cudatoolkit/common.nix @@ -20,7 +20,7 @@ args@ , makeWrapper , ncurses5 , perl -, python27 +, python3 , requireFile , stdenv , unixODBC @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ perl makeWrapper addOpenGLRunpath ]; buildInputs = [ gdk-pixbuf ]; # To get $GDK_PIXBUF_MODULE_FILE via setup-hook runtimeDependencies = [ - ncurses5 expat python27 zlib glibc + ncurses5 expat python3 zlib glibc xorg.libX11 xorg.libXext xorg.libXrender xorg.libXt xorg.libXtst xorg.libXi xorg.libXext gtk2 glib fontconfig freetype unixODBC alsa-lib ]; diff --git a/pkgs/development/compilers/kotlin/default.nix b/pkgs/development/compilers/kotlin/default.nix index bd3cd5a7573..cb78eb5c6b3 100644 --- a/pkgs/development/compilers/kotlin/default.nix +++ b/pkgs/development/compilers/kotlin/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "kotlin"; - version = "1.7.20"; + version = "1.8.0"; src = fetchurl { url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip"; - hash = "sha256-XjyND5ZUEP8S6Q1vjcXfL8Cf1ZWmhNUUYWhRzn6Urn0="; + hash = "sha256-C7lBn6yYMqVqOhnK0oL48tbxI30tRn3I3+m9SipDxC4="; }; propagatedBuildInputs = [ jre ] ; diff --git a/pkgs/development/compilers/stanc/default.nix b/pkgs/development/compilers/stanc/default.nix new file mode 100644 index 00000000000..e3df16230a7 --- /dev/null +++ b/pkgs/development/compilers/stanc/default.nix @@ -0,0 +1,41 @@ +{ lib +, fetchFromGitHub +, ocamlPackages +}: + +ocamlPackages.buildDunePackage rec { + pname = "stanc"; + version = "2.31.0"; + + minimalOCamlVersion = "4.12"; + + src = fetchFromGitHub { + owner = "stan-dev"; + repo = "stanc3"; + rev = "v${version}"; + hash = "sha256-5GOyKVt3LHN1D6UysOZT8isVQLKexwEcK0rwI45dDcg="; + }; + + # Error: This expression has type [ `Use_Sys_unix ] + postPatch = '' + substituteInPlace test/integration/run_bin_on_args.ml \ + --replace "if Sys.file_exists (to_windows path) then to_windows cmd else cmd" "cmd" + ''; + + buildInputs = with ocamlPackages; [ + core_unix + menhir + menhirLib + ppx_deriving + fmt + yojson + ]; + + meta = with lib; { + homepage = "https://github.com/stan-dev/stanc3"; + description = "The Stan compiler and utilities"; + license = licenses.bsd3; + maintainers = with maintainers; [ wegank ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/embedded/avrdude/default.nix b/pkgs/development/embedded/avrdude/default.nix index a6ddb17f928..fd54383f9ef 100644 --- a/pkgs/development/embedded/avrdude/default.nix +++ b/pkgs/development/embedded/avrdude/default.nix @@ -7,13 +7,13 @@ assert docSupport -> texLive != null && texinfo != null && texi2html != null; stdenv.mkDerivation rec { pname = "avrdude"; - version = "7.0"; + version = "7.1"; src = fetchFromGitHub { owner = "avrdudes"; repo = pname; rev = "v${version}"; - sha256 = "sha256-T8MKrvBvFF3WFwBMIN75vCOS0khliHQI+GGQvCk7T1o="; + sha256 = "sha256-pGjOefWnf11kG/zFGwYGet1OjAhKsULNGgh6vqvIQ7c="; }; nativeBuildInputs = [ cmake bison flex ]; diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 5af3c76a9e3..39ce0f254a5 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -448,7 +448,7 @@ self: super: { # # # Depends on itself for testing # doctest-discover = addBuildTool super.doctest-discover - # (if pkgs.buildPlatform != pkgs.hostPlatform + # (if pkgs.stdenv.buildPlatform != pkgs.stdenv.hostPlatform # then self.buildHaskellPackages.doctest-discover # else dontCheck super.doctest-discover); doctest-discover = dontCheck super.doctest-discover; diff --git a/pkgs/development/interpreters/janet/default.nix b/pkgs/development/interpreters/janet/default.nix index 292a143a67f..b29a9cb5451 100644 --- a/pkgs/development/interpreters/janet/default.nix +++ b/pkgs/development/interpreters/janet/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "janet"; - version = "1.25.1"; + version = "1.26.0"; src = fetchFromGitHub { owner = "janet-lang"; repo = pname; rev = "v${version}"; - sha256 = "sha256-TWKiSE8mqXz5i4vd32WylTsyxMXXKGmVl3U2q2sMwDQ="; + sha256 = "sha256-o5+gVRYJCkzoEejJoPwkNRawj2BO6fjdBloy2D1kHb4="; }; postPatch = '' diff --git a/pkgs/development/libraries/assimp/default.nix b/pkgs/development/libraries/assimp/default.nix index 804c97ffd74..81d9e54de43 100644 --- a/pkgs/development/libraries/assimp/default.nix +++ b/pkgs/development/libraries/assimp/default.nix @@ -1,29 +1,28 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, boost, zlib }: +{ lib +, stdenv +, fetchFromGitHub +, cmake +, boost +, zlib +}: stdenv.mkDerivation rec { pname = "assimp"; - version = "5.1.3"; + version = "5.2.5"; outputs = [ "out" "lib" "dev" ]; src = fetchFromGitHub{ owner = "assimp"; repo = "assimp"; rev = "v${version}"; - hash = "sha256-GNSfaP8O5IsjGwtC3DFaV4OiMMUXIcmHmz+5TCT/HP8="; + hash = "sha256-vQx+PaET5mlvvIGHk6pEnZvM3qw8DiC3hd1Po6OAHxQ="; }; - patches = [ - # Fix include directory with split outputs - # https://github.com/assimp/assimp/pull/4337 - (fetchpatch { - url = "https://github.com/assimp/assimp/commit/5dcaf445c3da079cf43890a0688428a7e1de0b30.patch"; - sha256 = "sha256-KwqTAoDPkhFq469+VaUuGoqfymu2bWLG9W3BvFvyU5I="; - }) - ]; - nativeBuildInputs = [ cmake ]; buildInputs = [ boost zlib ]; + cmakeFlags = [ "-DASSIMP_BUILD_ASSIMP_TOOLS=ON" ]; + meta = with lib; { description = "A library to import various 3D model formats"; homepage = "https://www.assimp.org/"; diff --git a/pkgs/development/libraries/aws-c-io/default.nix b/pkgs/development/libraries/aws-c-io/default.nix index 3f3ade4065e..f047200fb15 100644 --- a/pkgs/development/libraries/aws-c-io/default.nix +++ b/pkgs/development/libraries/aws-c-io/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "aws-c-io"; - version = "0.13.11"; + version = "0.13.12"; src = fetchFromGitHub { owner = "awslabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-3HNfEZ/PMHLhPp7boYyY/x5wXN9Eg+G1400q1riG2oI="; + sha256 = "sha256-4HPFTTnrk1Ro934iS2hacBKCTz4e6Thurjl1P621ZLg="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/cdk/default.nix b/pkgs/development/libraries/cdk/default.nix index 2700a9cbad8..27b7b9b9c8c 100644 --- a/pkgs/development/libraries/cdk/default.nix +++ b/pkgs/development/libraries/cdk/default.nix @@ -2,23 +2,18 @@ stdenv.mkDerivation rec { pname = "cdk"; - version ="5.0-20210109"; - - buildInputs = [ - ncurses - ]; + version = "5.0-20221025"; src = fetchurl { urls = [ "ftp://ftp.invisible-island.net/cdk/cdk-${version}.tgz" "https://invisible-mirror.net/archives/cdk/cdk-${version}.tgz" ]; - sha256 = "sha256-xBbJh793tPGycD18XkM7qUWMi+Uma/RUy/gBrYfnKTY="; + hash = "sha256-A8z6Icn8PWHd0P2hnaVFNZBVu+71ociC37n/SPN0avI="; }; - patches = [ - # Proposed upstream as https://lists.gnu.org/archive/html/bug-ncurses/2021-12/msg00004.html - ./parallel.patch + buildInputs = [ + ncurses ]; enableParallelBuilding = true; @@ -26,8 +21,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Curses development kit"; homepage = "https://invisible-island.net/cdk/"; - license = licenses.bsdOriginal ; - maintainers = [ maintainers.raskin ]; + changelog = "https://invisible-island.net/cdk/CHANGES"; + license = licenses.mit; + maintainers = with maintainers; [ raskin ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/cdk/parallel.patch b/pkgs/development/libraries/cdk/parallel.patch deleted file mode 100644 index 729c71e96af..00000000000 --- a/pkgs/development/libraries/cdk/parallel.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/Makefile.in -+++ b/Makefile.in -@@ -296,7 +296,9 @@ LIB_OBJECT = @LIB_OBJECT@ - - all sources :: $(AUTO_SRC) - --$(OBJECTS) : include/cdk_config.h -+# make sure we generate all headers before trying -+# to build first source file. -+$(OBJECTS) : $(MY_HDR) - - # - # Standard library directive. diff --git a/pkgs/development/libraries/cgreen/default.nix b/pkgs/development/libraries/cgreen/default.nix index 164a010669d..b677bf69fe6 100644 --- a/pkgs/development/libraries/cgreen/default.nix +++ b/pkgs/development/libraries/cgreen/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "cgreen"; - version = "1.6.0"; + version = "1.6.1"; src = fetchFromGitHub { owner = "cgreen-devs"; repo = "cgreen"; rev = version; - sha256 = "sha256-BXch/V73a35Y6MqUlmR8mDp3ttwEAQTnqDC+ygLbIPY="; + sha256 = "sha256-uyw5beBZ3MnDyaxBWIDGl/L/0yv0ROafXwgxhQ+A+n4="; }; postPatch = '' diff --git a/pkgs/development/libraries/fplll/default.nix b/pkgs/development/libraries/fplll/default.nix index 8f1bc88d7fb..8d1c19a48ac 100644 --- a/pkgs/development/libraries/fplll/default.nix +++ b/pkgs/development/libraries/fplll/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "fplll"; - version = "5.4.3"; + version = "5.4.4"; src = fetchFromGitHub { owner = "fplll"; repo = "fplll"; rev = version; - sha256 = "sha256-utME3hZ3p2tx7vmp5dlAJ6J9MFEhFm/qbscGu1t9jnc="; + sha256 = "sha256-+1EdNdmEk5tQDd1DXklPbEKC/Dr2yV2gwbtwBtZxpNM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix index 689b38c6aa2..4d342f61ecc 100644 --- a/pkgs/development/libraries/gdal/default.nix +++ b/pkgs/development/libraries/gdal/default.nix @@ -61,13 +61,13 @@ stdenv.mkDerivation rec { pname = "gdal"; - version = "3.6.1"; + version = "3.6.2"; src = fetchFromGitHub { owner = "OSGeo"; repo = "gdal"; rev = "v${version}"; - hash = "sha256-hWuV73b7czmbxpnd82V2FHM+ak9JviDHVodVXAHh/pc="; + hash = "sha256-fdj/o+dm7V8QLrjnaQobaFX80+penn+ohx/yNmUryRA="; }; nativeBuildInputs = [ @@ -199,7 +199,7 @@ stdenv.mkDerivation rec { meta = { description = "Translator library for raster geospatial data formats"; homepage = "https://www.gdal.org/"; - changelog = "https://docs.unidata.ucar.edu/netcdf-c/${src.rev}/RELEASE_NOTES.html"; + changelog = "https://github.com/OSGeo/gdal/blob/${src.rev}/NEWS.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ marcweber dotlambda ]; platforms = lib.platforms.unix; diff --git a/pkgs/development/libraries/imgui/default.nix b/pkgs/development/libraries/imgui/default.nix index ab3a9faca00..f656288443b 100644 --- a/pkgs/development/libraries/imgui/default.nix +++ b/pkgs/development/libraries/imgui/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "imgui"; - version = "1.89.1"; + version = "1.89.2"; src = fetchFromGitHub { owner = "ocornut"; repo = "imgui"; rev = "v${version}"; - sha256 = "sha256-wIkbluNGiK5HPmFaS5o2tZt/kPcqcXup+V2jnQQDSd0="; + sha256 = "sha256-NJRDVNnOCJ0lfxSXxzVpSo2m6DCppgdoRRGDYoRcajs="; }; dontBuild = true; diff --git a/pkgs/development/libraries/libargs/default.nix b/pkgs/development/libraries/libargs/default.nix index 3b27df77211..419cbfdb9f5 100644 --- a/pkgs/development/libraries/libargs/default.nix +++ b/pkgs/development/libraries/libargs/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "args"; - version = "6.3.0"; + version = "6.4.4"; src = fetchFromGitHub { owner = "Taywee"; repo = pname; rev = version; - sha256 = "sha256-fEM9KNqqxYbafMcHCW46Y//8Hrvd7gZrCIQhH5lhpFc="; + sha256 = "sha256-niuBM8tPCedFNCrkgvLE7PZu411sKgcvovr++6dIaus="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/libb2/default.nix b/pkgs/development/libraries/libb2/default.nix index b142a0a4156..a461f5039aa 100644 --- a/pkgs/development/libraries/libb2/default.nix +++ b/pkgs/development/libraries/libb2/default.nix @@ -1,4 +1,10 @@ -{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config }: +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, libtool +, pkg-config +}: stdenv.mkDerivation rec { pname = "libb2"; @@ -7,18 +13,19 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "BLAKE2"; repo = "libb2"; - rev = "v${version}"; + rev = "refs/tags/v${version}"; sha256 = "0qj8aaqvfcavj1vj5asm4pqm03ap7q8x4c2fy83cqggvky0frgya"; }; - preConfigure = '' - patchShebangs autogen.sh - ./autogen.sh - ''; + nativeBuildInputs = [ + autoreconfHook + libtool + pkg-config + ]; configureFlags = lib.optional stdenv.hostPlatform.isx86 "--enable-fat=yes"; - nativeBuildInputs = [ autoconf automake libtool pkg-config ]; + enableParallelBuilding = true; doCheck = true; diff --git a/pkgs/development/libraries/libcotp/default.nix b/pkgs/development/libraries/libcotp/default.nix index 6fb7b3879c2..980b01549a2 100644 --- a/pkgs/development/libraries/libcotp/default.nix +++ b/pkgs/development/libraries/libcotp/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libcotp"; - version = "1.2.6"; + version = "1.2.8"; src = fetchFromGitHub { owner = "paolostivanin"; repo = pname; rev = "v${version}"; - sha256 = "sha256-AMLnUFLDL592zcbVN8yaQeOJQWDLUUG+6aKh4paPGlE="; + sha256 = "sha256-XWrLtWoYIEyGSwc1Qq1Q2NTn0USm1ekVyLWuwvppOZE="; }; buildInputs = [ libbaseencode libgcrypt ]; diff --git a/pkgs/development/libraries/libdeltachat/default.nix b/pkgs/development/libraries/libdeltachat/default.nix index 0f4bed9c39d..b359ce44b03 100644 --- a/pkgs/development/libraries/libdeltachat/default.nix +++ b/pkgs/development/libraries/libdeltachat/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "libdeltachat"; - version = "1.104.0"; + version = "1.105.0"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-core-rust"; rev = version; - hash = "sha256-+FQ6XE+CtvSNSgpEr8h0mcr9DCC6TvGgLrYGdw0Ve2o="; + hash = "sha256-WdTCMuGlg072j6fNZ1sey8EKL47BsdKh3SQ5a++Y34I="; }; patches = [ @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-c3tt+nYZksI/VhJk4bNHu9ZXeDTaA2aLAQo1BmuF+2g="; + hash = "sha256-K1DMQ0FHUbyn/cVHKuTBusve0f5SIq1YuGH3cZYealE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/protobuf/3.17.nix b/pkgs/development/libraries/protobuf/3.17.nix index d869b9ce76e..36198b5d337 100644 --- a/pkgs/development/libraries/protobuf/3.17.nix +++ b/pkgs/development/libraries/protobuf/3.17.nix @@ -1,6 +1,6 @@ -{ callPackage, ... }: +{ callPackage, ... } @ args: -callPackage ./generic-v3.nix { +callPackage ./generic-v3.nix ({ version = "3.17.3"; sha256 = "08644kaxhpjs38q5q4fp01yr0wakg1ijha4g3lzp2ifg7y3c465d"; -} +} // args) diff --git a/pkgs/development/libraries/protobuf/3.19.nix b/pkgs/development/libraries/protobuf/3.19.nix index c62e4d46ce8..7ee378d8ed3 100644 --- a/pkgs/development/libraries/protobuf/3.19.nix +++ b/pkgs/development/libraries/protobuf/3.19.nix @@ -1,6 +1,6 @@ -{ callPackage, ... }: +{ callPackage, ... } @ args: -callPackage ./generic-v3.nix { +callPackage ./generic-v3.nix ({ version = "3.19.6"; sha256 = "sha256-+ul9F8tyrwk2p25Dd9ragqwpYzdxdeGjpXhLAwKYWfM="; -} +} // args) diff --git a/pkgs/development/libraries/protobuf/3.20.nix b/pkgs/development/libraries/protobuf/3.20.nix index 818e65639e5..bae3550f8f0 100644 --- a/pkgs/development/libraries/protobuf/3.20.nix +++ b/pkgs/development/libraries/protobuf/3.20.nix @@ -1,6 +1,6 @@ -{ callPackage, abseil-cpp, ... }: +{ callPackage, ... } @ args: -callPackage ./generic-v3.nix { +callPackage ./generic-v3.nix ({ version = "3.20.3"; sha256 = "sha256-u/1Yb8+mnDzc3OwirpGESuhjkuKPgqDAvlgo3uuzbbk="; -} +} // args) diff --git a/pkgs/development/libraries/protobuf/3.21.nix b/pkgs/development/libraries/protobuf/3.21.nix index f5797ea7f9f..fe85be8cf02 100644 --- a/pkgs/development/libraries/protobuf/3.21.nix +++ b/pkgs/development/libraries/protobuf/3.21.nix @@ -1,6 +1,6 @@ -{ callPackage, abseil-cpp, ... }: +{ callPackage, ... } @ args: -callPackage ./generic-v3-cmake.nix { +callPackage ./generic-v3-cmake.nix ({ version = "3.21.12"; sha256 = "sha256-VZQEFHq17UsTH5CZZOcJBKiScGV2xPJ/e6gkkVliRCU="; -} +} // args) diff --git a/pkgs/development/libraries/protobuf/3.8.nix b/pkgs/development/libraries/protobuf/3.8.nix index 2ea03643b3a..fe5ad4b4e02 100644 --- a/pkgs/development/libraries/protobuf/3.8.nix +++ b/pkgs/development/libraries/protobuf/3.8.nix @@ -1,6 +1,6 @@ -{ callPackage, ... }: +{ callPackage, ... } @ args: -callPackage ./generic-v3.nix { +callPackage ./generic-v3.nix ({ version = "3.8.0"; sha256 = "0vll02a6k46k720wfh25sl4hdai0130s3ix2l1wh6j1lm9pi7bm8"; -} +} // args) diff --git a/pkgs/development/libraries/qgnomeplatform/default.nix b/pkgs/development/libraries/qgnomeplatform/default.nix index 7f03baba0f4..12a41104cfd 100644 --- a/pkgs/development/libraries/qgnomeplatform/default.nix +++ b/pkgs/development/libraries/qgnomeplatform/default.nix @@ -1,19 +1,22 @@ -{ mkDerivation +{ stdenv , lib , fetchFromGitHub , nix-update-script , cmake , pkg-config , adwaita-qt +, adwaita-qt6 , glib , gtk3 , qtbase +, qtwayland , pantheon , substituteAll , gsettings-desktop-schemas +, useQt6 ? false }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "qgnomeplatform"; version = "0.8.4"; @@ -38,15 +41,24 @@ mkDerivation rec { ]; buildInputs = [ - adwaita-qt glib gtk3 qtbase + ] ++ lib.optionals (!useQt6) [ + adwaita-qt + ] ++ lib.optionals useQt6 [ + adwaita-qt6 + qtwayland ]; + # Qt setup hook complains about missing `wrapQtAppsHook` otherwise. + dontWrapQtApps = true; + cmakeFlags = [ "-DGLIB_SCHEMAS_DIR=${glib.getSchemaPath gsettings-desktop-schemas}" "-DQT_PLUGINS_DIR=${placeholder "out"}/${qtbase.qtPluginPrefix}" + ] ++ lib.optionals useQt6 [ + "-DUSE_QT6=true" ]; passthru = { diff --git a/pkgs/development/libraries/science/math/tensorflow-lite/default.nix b/pkgs/development/libraries/science/math/tensorflow-lite/default.nix index cf2346bad27..a15b3512aec 100644 --- a/pkgs/development/libraries/science/math/tensorflow-lite/default.nix +++ b/pkgs/development/libraries/science/math/tensorflow-lite/default.nix @@ -6,7 +6,6 @@ , fetchpatch , fetchurl , flatbuffers -, hostPlatform , lib , zlib }: @@ -160,7 +159,7 @@ stdenv.mkDerivation rec { mkdir "$out" # copy the static lib and binaries into the output dir - cp -r ./tensorflow/lite/tools/make/gen/linux_${hostPlatform.uname.processor}/{bin,lib} "$out" + cp -r ./tensorflow/lite/tools/make/gen/linux_${stdenv.hostPlatform.uname.processor}/{bin,lib} "$out" find ./tensorflow/lite -type f -name '*.h' | while read f; do path="$out/include/''${f/.\//}" diff --git a/pkgs/development/libraries/vtk/generic.nix b/pkgs/development/libraries/vtk/generic.nix index 327e848d89e..235202284bc 100644 --- a/pkgs/development/libraries/vtk/generic.nix +++ b/pkgs/development/libraries/vtk/generic.nix @@ -92,7 +92,7 @@ in stdenv.mkDerivation rec { postInstall = optionalString enablePython '' substitute \ ${./vtk.egg-info} \ - $out/lib/python${python.pythonVersion}/site-packages/vtk-${version}.egg-info \ + $out/${python.sitePackages}/vtk-${version}.egg-info \ --subst-var-by VTK_VER "${version}" ''; diff --git a/pkgs/development/libraries/xgboost/default.nix b/pkgs/development/libraries/xgboost/default.nix index ec862f3899d..bf2825b5967 100644 --- a/pkgs/development/libraries/xgboost/default.nix +++ b/pkgs/development/libraries/xgboost/default.nix @@ -15,14 +15,14 @@ assert ncclSupport -> cudaSupport; stdenv.mkDerivation rec { pname = "xgboost"; - version = "1.7.2"; + version = "1.7.3"; src = fetchFromGitHub { owner = "dmlc"; repo = pname; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-nXF6IYaK13n8fuNt1wOXoJCVNve/lwUROV7UE5W3RKA="; + hash = "sha256-unTss2byytG8KUQfg5s34YpRuHHDLo7D/ZickHhz1AE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/ocaml-modules/biniou/default.nix b/pkgs/development/ocaml-modules/biniou/default.nix index ff3b8769935..22d2b643b27 100644 --- a/pkgs/development/ocaml-modules/biniou/default.nix +++ b/pkgs/development/ocaml-modules/biniou/default.nix @@ -1,29 +1,21 @@ -{ lib, fetchFromGitHub, buildDunePackage, easy-format }: +{ lib, fetchurl, buildDunePackage, camlp-streams, easy-format }: buildDunePackage rec { pname = "biniou"; - version = "1.2.1"; + version = "1.2.2"; - useDune2 = true; - - src = fetchFromGitHub { - owner = "ocaml-community"; - repo = pname; - rev = version; - sha256 = "0x2kiy809n1j0yf32l7hj102y628jp5jdrkbi3z7ld8jq04h1790"; + src = fetchurl { + url = "https://github.com/ocaml-community/biniou/releases/download/${version}/biniou-${version}.tbz"; + hash = "sha256-i/P/F80Oyy1rbR2UywjvCJ1Eyu+W6brmvmg51Cj6MY8="; }; - propagatedBuildInputs = [ easy-format ]; + propagatedBuildInputs = [ camlp-streams easy-format ]; strictDeps = true; - postPatch = '' - patchShebangs . - ''; - meta = { description = "Binary data format designed for speed, safety, ease of use and backward compatibility as protocols evolve"; - inherit (src.meta) homepage; + homepage = "https://github.com/ocaml-community/biniou"; license = lib.licenses.bsd3; maintainers = [ lib.maintainers.vbgl ]; mainProgram = "bdump"; diff --git a/pkgs/development/python-modules/adafruit-platformdetect/default.nix b/pkgs/development/python-modules/adafruit-platformdetect/default.nix index 6876727a0c2..01eeba71fa0 100644 --- a/pkgs/development/python-modules/adafruit-platformdetect/default.nix +++ b/pkgs/development/python-modules/adafruit-platformdetect/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "adafruit-platformdetect"; - version = "3.38.0"; + version = "3.39.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "Adafruit-PlatformDetect"; inherit version; - hash = "sha256-USnOf/nwuAyZpvy/cXpQtkWKXPKu0hj1HFwolrpecQM="; + hash = "sha256-l5upg3Jux+HHtiYM95+5qL05kzmVHrzPYrqIejbaVZY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/ailment/default.nix b/pkgs/development/python-modules/ailment/default.nix index 00b2df62563..241f46b0d68 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.32"; + version = "9.2.33"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-JHKF1uTzAzYrVx1iOtOjJYFbnvFeTzUjTmm24leHIMs="; + hash = "sha256-PngFhzeBm3lm69KKjcj4NvFb1DVspdkQaiVSg0FZnV4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/aioridwell/default.nix b/pkgs/development/python-modules/aioridwell/default.nix index 1f817b54b39..b63c59728cc 100644 --- a/pkgs/development/python-modules/aioridwell/default.nix +++ b/pkgs/development/python-modules/aioridwell/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "aioridwell"; - version = "2022.11.0"; + version = "2023.01.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-KxT3Se27b+XoTETXCljOVGVmEuXcpYxOhIBs1xAdtZ8="; + hash = "sha256-enNYzU65QBT/ryCUNwB08U+QiFvVb03fbYzZ5Qk6GTk="; }; nativeBuildInputs = [ @@ -66,6 +66,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library for interacting with Ridwell waste recycling"; homepage = "https://github.com/bachya/aioridwell"; + changelog = "https://github.com/bachya/aioridwell/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/aiorun/default.nix b/pkgs/development/python-modules/aiorun/default.nix index bc6954900ae..d40c8de96af 100644 --- a/pkgs/development/python-modules/aiorun/default.nix +++ b/pkgs/development/python-modules/aiorun/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "aiorun"; - version = "2021.10.1"; + version = "2022.11.1"; format = "flit"; disabled = pythonOlder "3.5"; @@ -17,8 +17,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "cjrh"; repo = pname; - rev = "v${version}"; - hash = "sha256-9e1vUWDBv3BYWuKR/rZUvaIxFFetzBQaygXKnl4PDd8="; + rev = "refs/tags/v${version}"; + hash = "sha256-1qXt3HT/0sECOqPRwc0p+5+YZh1kyHSbkZHajcrjvZc="; }; propagatedBuildInputs = [ @@ -42,6 +42,7 @@ buildPythonPackage rec { meta = with lib; { description = "Boilerplate for asyncio applications"; homepage = "https://github.com/cjrh/aiorun"; + changelog = "https://github.com/cjrh/aiorun/blob/v${version}/CHANGES"; license = licenses.asl20; maintainers = with maintainers; [ costrouc ]; }; diff --git a/pkgs/development/python-modules/aioshelly/default.nix b/pkgs/development/python-modules/aioshelly/default.nix index c1a611505ae..511b1c5f84c 100644 --- a/pkgs/development/python-modules/aioshelly/default.nix +++ b/pkgs/development/python-modules/aioshelly/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "aioshelly"; - version = "5.2.0"; + version = "5.2.1"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-pa7ijfT/VbXNxwf9RITWxhUVUbimuBEjlU3xnDm3Zzk="; + hash = "sha256-rz8r+FieBQAZKxZR741CffuEyGcLe6ghdEKFGfeD6vg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/angr/default.nix b/pkgs/development/python-modules/angr/default.nix index 0646d10a137..d56a99685cd 100644 --- a/pkgs/development/python-modules/angr/default.nix +++ b/pkgs/development/python-modules/angr/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pname = "angr"; - version = "9.2.32"; + version = "9.2.33"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -40,7 +40,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-nyFEyOo4qtkyjAmkOV0JEOKAKWJKwjRrywKqP2yoJ54="; + hash = "sha256-Uq/weFiqbfGLqYlu5hH/l++YglqCGpL2NtNccI3gOqQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/archinfo/default.nix b/pkgs/development/python-modules/archinfo/default.nix index bc1b290a1f2..1ef304b1bf1 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.32"; + version = "9.2.33"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-LChk65iM238jB1jwgEis5Wfz8YGmb9UCOdmQcU+3bFA="; + hash = "sha256-6y5GkoC/U2tNHnKxLPyDxrf3zZkDNPbje0RQRkaKDuY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/bellows/default.nix b/pkgs/development/python-modules/bellows/default.nix index 041af30ddfd..a7121a2a18c 100644 --- a/pkgs/development/python-modules/bellows/default.nix +++ b/pkgs/development/python-modules/bellows/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "bellows"; - version = "0.34.5"; + version = "0.34.6"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "bellows"; rev = "refs/tags/${version}"; - hash = "sha256-GJG3rmJoBxDrqzsNY2r1cEywRfB4tlLn2DDsaDEI3Bo="; + hash = "sha256-J6PUVdIs9adRdFbw9yzu1Y9jU9Ge0hGxueXbE1b03og="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/claripy/default.nix b/pkgs/development/python-modules/claripy/default.nix index 9c7bb0898d8..8e508bbe8b6 100644 --- a/pkgs/development/python-modules/claripy/default.nix +++ b/pkgs/development/python-modules/claripy/default.nix @@ -5,17 +5,15 @@ , decorator , fetchFromGitHub , future -, nose , pysmt , pythonOlder , pytestCheckHook -, six , z3 }: buildPythonPackage rec { pname = "claripy"; - version = "9.2.32"; + version = "9.2.33"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -23,8 +21,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "angr"; repo = pname; - rev = "v${version}"; - hash = "sha256-Cf56Q2ZqBq3uoCGqG5pYxA6ANP8VLC6pAMZIL5ubq30="; + rev = "refs/tags/v${version}"; + hash = "sha256-ItWL2DGoMkOMOMsTTfal8W9DZCmXMuZs0cZbYESlFU4="; }; nativeBuildInputs = [ @@ -40,15 +38,13 @@ buildPythonPackage rec { ]; checkInputs = [ - nose pytestCheckHook - six ]; postPatch = '' # Use upstream z3 implementation substituteInPlace setup.cfg \ - --replace "z3-solver == 4.10.2.0" "" + --replace "z3-solver==4.10.2.0" "" ''; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/cle/default.nix b/pkgs/development/python-modules/cle/default.nix index 3e876db6d66..aa713ed4a76 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.32"; + version = "9.2.33"; # 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 = "v${version}"; - hash = "sha256-KYWhwL3DAa/2Hb4I1NfYWA5gXrwEeMpDpAWCWGLqFeE="; + hash = "sha256-Abh6kSHnTtz/pz5xPJeg0UZcRQDah4D0tlsLnkyI2lE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/datadiff/default.nix b/pkgs/development/python-modules/datadiff/default.nix index 4b633841267..446fdaf07b3 100644 --- a/pkgs/development/python-modules/datadiff/default.nix +++ b/pkgs/development/python-modules/datadiff/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "datadiff"; - version = "2.0.0"; + version = "2.1.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-VASUQKiW3lJH7i57eqVCX5OayDLDftshAfjTA26Jyqg="; + hash = "sha256-I9QpQyW3sHyUgCYZYfJecTJDNHLaQtqnXG4WeA4p5VE="; }; # Tests are not part of the PyPI releases diff --git a/pkgs/development/python-modules/django-admin-sortable2/default.nix b/pkgs/development/python-modules/django-admin-sortable2/default.nix new file mode 100644 index 00000000000..6301348e60e --- /dev/null +++ b/pkgs/development/python-modules/django-admin-sortable2/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, django_4 +, fetchPypi +, pythonOlder +}: + +buildPythonPackage rec { + pname = "django-admin-sortable2"; + version = "2.1.4"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit version pname; + sha256 = "sha256-fcCP8PvOWFlQL4CdEIwElfOw2UYJJp6u27EjfgMISss="; + }; + + propagatedBuildInputs = [ + django_4 + ]; + + pythonImportsCheck = [ + "adminsortable2" + ]; + + # Tests are very slow (end-to-end with playwright) + doCheck = false; + + meta = with lib; { + description = "Generic drag-and-drop ordering for objects in the Django admin interface"; + homepage = "https://github.com/jrief/django-admin-sortable2"; + changelog = "https://github.com/jrief/django-admin-sortable2/blob/${version}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ sephi ]; + }; +} diff --git a/pkgs/development/python-modules/django-import-export/default.nix b/pkgs/development/python-modules/django-import-export/default.nix new file mode 100644 index 00000000000..8c0fbf647b2 --- /dev/null +++ b/pkgs/development/python-modules/django-import-export/default.nix @@ -0,0 +1,55 @@ +{ lib +, buildPythonPackage +, chardet +, diff-match-patch +, django +, fetchFromGitHub +, python +, pythonOlder +, pytz +, tablib +}: + +buildPythonPackage rec { + pname = "django-import-export"; + version = "2.8.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "django-import-export"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-km6TQq4OZZtx9/lgBzS3tEifAYjkkUX//9FRATDLX/0="; + }; + + propagatedBuildInputs = [ + diff-match-patch + django + tablib + ] ++ (with tablib.optional-dependencies; html ++ ods ++ xls ++ xlsx ++ yaml); + + checkInputs = [ + chardet + pytz + ]; + + checkPhase = '' + runHook preCheck + ${python.interpreter} tests/manage.py test core --settings=settings + runHook postCheck + ''; + + pythonImportsCheck = [ + "import_export" + ]; + + meta = with lib; { + description = "Django application and library for importing and exporting data with admin integration"; + homepage = "https://github.com/django-import-export/django-import-export"; + changelog = "https://github.com/django-import-export/django-import-export/blob/${version}/docs/changelog.rst"; + license = licenses.bsd2; + maintainers = with maintainers; [ sephi ]; + }; +} diff --git a/pkgs/development/python-modules/django-phonenumber-field/default.nix b/pkgs/development/python-modules/django-phonenumber-field/default.nix new file mode 100644 index 00000000000..8af5e8fee89 --- /dev/null +++ b/pkgs/development/python-modules/django-phonenumber-field/default.nix @@ -0,0 +1,58 @@ +{ lib +, babel +, buildPythonPackage +, django +, djangorestframework +, fetchFromGitHub +, phonenumbers +, python +, pythonOlder +, setuptools-scm +}: + +buildPythonPackage rec { + pname = "django-phonenumber-field"; + version = "6.4.0"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "stefanfoulis"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-rrJTCWn1mFV4QQu8wyLDxheHkZQ/FIE7mRC/9nXNSaM="; + }; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + django + phonenumbers + babel + ]; + + checkInputs = [ + djangorestframework + ]; + + pythonImportsCheck = [ + "phonenumber_field" + ]; + + checkPhase = '' + ${python.interpreter} -m django test --settings tests.settings + ''; + + meta = with lib; { + description = "A django model and form field for normalised phone numbers using python-phonenumbers"; + homepage = "https://github.com/stefanfoulis/django-phonenumber-field/"; + changelog = "https://github.com/stefanfoulis/django-phonenumber-field/releases/tag/${version}"; + license = licenses.mit; + maintainers = with maintainers; [ sephi ]; + }; +} diff --git a/pkgs/development/python-modules/django-rest-registration/default.nix b/pkgs/development/python-modules/django-rest-registration/default.nix new file mode 100644 index 00000000000..c1605a93d39 --- /dev/null +++ b/pkgs/development/python-modules/django-rest-registration/default.nix @@ -0,0 +1,53 @@ +{ lib +, buildPythonPackage +, django +, djangorestframework +, fetchFromGitHub +, pytest-django +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "django-rest-registration"; + version = "0.7.3"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "apragacz"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-JoIeVjl5s60ilq9kU28Jo+GaYRKU61hoqy1GzYmMdZQ="; + }; + + propagatedBuildInputs = [ + django + djangorestframework + ]; + + checkInputs = [ + pytestCheckHook + pytest-django + ]; + + pythonImportsCheck = [ + "rest_registration" + ]; + + disabledTests = [ + # This test fails on Python 3.10 + "test_convert_html_to_text_fails" + # This test is broken and was removed after 0.7.3. Remove this line once version > 0.7.3 + "test_coreapi_autoschema_success" + ]; + + meta = with lib; { + description = "User-related REST API based on the awesome Django REST Framework"; + homepage = "https://github.com/apragacz/django-rest-registration/"; + changelog = "https://github.com/apragacz/django-rest-registration/releases/tag/${version}"; + license = licenses.mit; + maintainers = with maintainers; [ sephi ]; + }; +} diff --git a/pkgs/development/python-modules/django-vite/default.nix b/pkgs/development/python-modules/django-vite/default.nix new file mode 100644 index 00000000000..9a8a7c5e461 --- /dev/null +++ b/pkgs/development/python-modules/django-vite/default.nix @@ -0,0 +1,40 @@ +{ lib +, fetchFromGitHub +, buildPythonPackage +, django +, pythonOlder +}: + +buildPythonPackage rec { + pname = "django-vite"; + version = "2.0.2"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "MrBin99"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-lYRFNHTIQBn7CDnWFxSzXELzqEtQcbwHedSZnR7ZtbE="; + }; + + propagatedBuildInputs = [ + django + ]; + + # Package doesn’t have any tests + doCheck = false; + + pythonImportsCheck = [ + "django_vite" + ]; + + meta = with lib; { + description = "Integration of ViteJS in a Django project"; + homepage = "https://github.com/MrBin99/django-vite"; + changelog = "https://github.com/MrBin99/django-vite/releases/tag/${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ sephi ]; + }; +} diff --git a/pkgs/development/python-modules/duckdb-engine/default.nix b/pkgs/development/python-modules/duckdb-engine/default.nix index 04c0c84315f..1eb8e73e61f 100644 --- a/pkgs/development/python-modules/duckdb-engine/default.nix +++ b/pkgs/development/python-modules/duckdb-engine/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "duckdb-engine"; - version = "0.6.7"; + version = "0.6.8"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { repo = "duckdb_engine"; owner = "Mause"; rev = "refs/tags/v${version}"; - hash = "sha256-ZbdrqR1apeZMnJb2hzvPyCKWl+0A9ROMZJXIshPVGW0="; + hash = "sha256-Vb2sXZjhBZpZdemtGZ8dajB9Ziu/obLv80R63IH/hJg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/easy-thumbnails/default.nix b/pkgs/development/python-modules/easy-thumbnails/default.nix index 8572a5f1030..97afb19058f 100644 --- a/pkgs/development/python-modules/easy-thumbnails/default.nix +++ b/pkgs/development/python-modules/easy-thumbnails/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "easy-thumbnails"; - version = "2.8.4"; + version = "2.8.5"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-aqR3zg9zvtopOzTGMUo/K3jBtFzK6a2fqknjncfzQ2k="; + hash = "sha256-fk6RJgn8m2Czof72VX7BXd+cT5RiZ6kuaSDf1N12XjU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-dataproc/default.nix b/pkgs/development/python-modules/google-cloud-dataproc/default.nix index 7d11b2b3c1c..d1ed5572ff1 100644 --- a/pkgs/development/python-modules/google-cloud-dataproc/default.nix +++ b/pkgs/development/python-modules/google-cloud-dataproc/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-dataproc"; - version = "5.0.3"; + version = "5.1.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-gE4PyJCrgEekqR3S4YNUtp3yd2AOt7TmKvvDaJ4stk0="; + hash = "sha256-0SFlDmAxvgZCJSFIrXXEjpJ4D0GRJQ0nkBv9D9EpC2g="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/graphtage/default.nix b/pkgs/development/python-modules/graphtage/default.nix index a1bec8f3a1f..063cece8a38 100644 --- a/pkgs/development/python-modules/graphtage/default.nix +++ b/pkgs/development/python-modules/graphtage/default.nix @@ -1,9 +1,8 @@ -{ buildPythonPackage +{ lib +, buildPythonPackage , fetchFromGitHub -, lib , pytestCheckHook , pythonOlder - # Python dependencies , colorama , intervaltree , json5 @@ -15,16 +14,22 @@ buildPythonPackage rec { pname = "graphtage"; - version = "0.2.6"; + version = "0.2.7"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "trailofbits"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-ZazqtrrCsoeJK7acj7Unpl+ZI2JL/khMN2aOSHdCHl0="; + hash = "sha256-3PJSjK8citdsfTyTLtDOlLeXWhkOW/4ajLC+j8F0BZw="; }; + postPatch = '' + substituteInPlace setup.py \ + --replace "json5==0.9.5" "json5>=0.9.5" + ''; + propagatedBuildInputs = [ colorama intervaltree @@ -35,18 +40,18 @@ buildPythonPackage rec { typing-extensions ]; - checkInputs = [ pytestCheckHook ]; - - postPatch = '' - substituteInPlace setup.py \ - --replace "json5==0.9.5" "json5>=0.9.5" - ''; + checkInputs = [ + pytestCheckHook + ]; - pythonImportsCheck = [ "graphtage" ]; + pythonImportsCheck = [ + "graphtage" + ]; meta = with lib; { - homepage = "https://github.com/trailofbits/graphtage"; description = "A utility to diff tree-like files such as JSON and XML"; + homepage = "https://github.com/trailofbits/graphtage"; + changelog = "https://github.com/trailofbits/graphtage/releases/tag/v${version}"; license = licenses.lgpl3Plus; maintainers = with maintainers; [ veehaitch ]; }; diff --git a/pkgs/development/python-modules/hstspreload/default.nix b/pkgs/development/python-modules/hstspreload/default.nix index 30b0085ff7f..eacca2b8514 100644 --- a/pkgs/development/python-modules/hstspreload/default.nix +++ b/pkgs/development/python-modules/hstspreload/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { pname = "hstspreload"; - version = "2022.12.1"; + version = "2023.1.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -14,8 +14,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "sethmlarson"; repo = pname; - rev = version; - sha256 = "sha256-W1WJWG5R7Sucdw6TzsGFs5mH6BoUfA8URTgWlnRXa14="; + rev = "refs/tags/${version}"; + hash = "sha256-MF+pRP0KluF7LrSkfxs6ZSEXyqmr51mUqUn01dLdUdQ="; }; # Tests require network connection diff --git a/pkgs/development/python-modules/huawei-lte-api/default.nix b/pkgs/development/python-modules/huawei-lte-api/default.nix index 4843ad39fd4..f55c3e88ab0 100644 --- a/pkgs/development/python-modules/huawei-lte-api/default.nix +++ b/pkgs/development/python-modules/huawei-lte-api/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "huawei-lte-api"; - version = "1.6.10"; + version = "1.6.11"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "Salamek"; repo = "huawei-lte-api"; rev = "refs/tags/${version}"; - hash = "sha256-dYYZxG5vAR5JT5HIr4jGWYxpy+tGYYXwhB4bzb27ON0="; + hash = "sha256-pOBYMSORgT8WOnhCdazuKucjPoOywnrWa+qCYR5qSls="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix b/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix index c1e70fbf990..f7bccb3b84f 100644 --- a/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix +++ b/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "ibm-cloud-sdk-core"; - version = "3.16.0"; + version = "3.16.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-MfWZGWbU0k586EYY0uhHHo2LuhQSmCfgs9Lz50Ds5Hc="; + hash = "sha256-TsM56eE2qCJsr+ZHTaY7Wd/ZjhFqWJXA7Z3O+2MCgPc="; }; propagatedBuildInputs = [ @@ -56,6 +56,7 @@ buildPythonPackage rec { meta = with lib; { description = "Client library for the IBM Cloud services"; homepage = "https://github.com/IBM/python-sdk-core"; + changelog = "https://github.com/IBM/python-sdk-core/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ globin ]; }; diff --git a/pkgs/development/python-modules/ijson/default.nix b/pkgs/development/python-modules/ijson/default.nix index 3211aed644e..6d32ee9660a 100644 --- a/pkgs/development/python-modules/ijson/default.nix +++ b/pkgs/development/python-modules/ijson/default.nix @@ -1,23 +1,42 @@ -{ lib, buildPythonPackage, fetchPypi, yajl, cffi, pytestCheckHook }: +{ lib +, buildPythonPackage +, fetchPypi +, yajl +, cffi +, pytestCheckHook +}: buildPythonPackage rec { pname = "ijson"; - version = "3.1.4"; + version = "3.2.0.post0"; src = fetchPypi { inherit pname version; - sha256 = "1d1003ae3c6115ec9b587d29dd136860a81a23c7626b682e2b5b12c9fd30e4ea"; + hash = "sha256-gKW9fpkjyrIAcB9nrSNyEEMouZ3fJJ276INBAshS0xY="; }; - buildInputs = [ yajl ]; - propagatedBuildInputs = [ cffi ]; - checkInputs = [ pytestCheckHook ]; + buildInputs = [ + yajl + ]; + + propagatedBuildInputs = [ + cffi + ]; + + checkInputs = [ + pytestCheckHook + ]; doCheck = true; + pythonImportsCheck = [ + "ijson" + ]; + meta = with lib; { description = "Iterative JSON parser with a standard Python iterator interface"; homepage = "https://github.com/ICRAR/ijson"; + changelog = "https://github.com/ICRAR/ijson/blob/v${version}/CHANGELOG.md"; license = licenses.bsd3; maintainers = with maintainers; [ rvl ]; }; diff --git a/pkgs/development/python-modules/jaxlib/default.nix b/pkgs/development/python-modules/jaxlib/default.nix index 4018655cc48..baa9a0dc1ab 100644 --- a/pkgs/development/python-modules/jaxlib/default.nix +++ b/pkgs/development/python-modules/jaxlib/default.nix @@ -234,11 +234,13 @@ let fetchAttrs = { sha256 = if cudaSupport then - "sha256-Z9GDWGv+1YFyJjudyshZfeRJsKShoA1kIbNR3h3GxPQ=" - else if stdenv.isDarwin then - "sha256-i3wiJHD4+pgTvDMhnYiQo9pdxxKItgYnc4/4wGt2NXM=" - else - "sha256-liRxmjwm0OmVMfgoGXx+nGBdW2fzzP/d4zmK6A59HAM="; + "sha256-n8wo+hD9ZYO1SsJKgyJzUmjRlsz45WT6tt5ZLleGvGY=" + else { + x86_64-linux = "sha256-A0A18kxgGNGHNQ67ZPUzh3Yq2LEcRV7CqR9EfP80NQk="; + aarch64-linux = "sha256-mU2jzuDu89jVmaG/M5bA3jSd7n7lDi+h8sdhs1z8p1A="; + x86_64-darwin = "sha256-9nNTpetvjyipD/l8vKlregl1j/OnZKAcOCoZQeRBvts="; + aarch64-darwin = "sha256-dOGUsdFImeOLcZ3VtgrNnd8A/HgIs/LYuH9GQV7A+78="; + }.${stdenv.system} or (throw "unsupported system ${stdenv.system}"); }; buildAttrs = { diff --git a/pkgs/development/python-modules/liquidctl/default.nix b/pkgs/development/python-modules/liquidctl/default.nix index 8093c949d39..2e9f2ba3648 100644 --- a/pkgs/development/python-modules/liquidctl/default.nix +++ b/pkgs/development/python-modules/liquidctl/default.nix @@ -17,15 +17,16 @@ buildPythonPackage rec { pname = "liquidctl"; - version = "1.11.1"; - disabled = pythonOlder "3.6"; + version = "1.12.0"; format = "pyproject"; + disabled = pythonOlder "3.7"; + src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-9g6h8GMOcICiry9M9b/Tt0ONsTxuJI/duprUkxB1Gr0="; + hash = "sha256-5apn+8X7si8jniHSjt7sveqIuzeuI4uXllR627aT2vI="; }; nativeBuildInputs = [ @@ -48,7 +49,10 @@ buildPythonPackage rec { smbus-cffi ]; - outputs = [ "out" "man" ]; + outputs = [ + "out" + "man" + ]; postInstall = '' installManPage liquidctl.8 @@ -58,19 +62,23 @@ buildPythonPackage rec { cp extra/linux/71-liquidctl.rules $out/lib/udev/rules.d/. ''; - checkInputs = [ pytestCheckHook ]; + checkInputs = [ + pytestCheckHook + ]; postBuild = '' # needed for pythonImportsCheck export XDG_RUNTIME_DIR=$TMPDIR ''; - pythonImportsCheck = [ "liquidctl" ]; + pythonImportsCheck = [ + "liquidctl" + ]; meta = with lib; { description = "Cross-platform CLI and Python drivers for AIO liquid coolers and other devices"; homepage = "https://github.com/liquidctl/liquidctl"; - changelog = "https://github.com/liquidctl/liquidctl/blob/master/CHANGELOG.md"; + changelog = "https://github.com/liquidctl/liquidctl/blob/v${version}/CHANGELOG.md"; license = licenses.gpl3Plus; maintainers = with maintainers; [ arturcygan evils ]; }; diff --git a/pkgs/development/python-modules/mailmanclient/default.nix b/pkgs/development/python-modules/mailmanclient/default.nix index e7a752663c6..6c52490dc0e 100644 --- a/pkgs/development/python-modules/mailmanclient/default.nix +++ b/pkgs/development/python-modules/mailmanclient/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "mailmanclient"; - version = "3.3.4"; + version = "3.3.5"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-0y31HXjvU/bwy0s0PcDOlrX1RdyTTnk41ceD4A0R4p4="; + hash = "sha256-Y1gcYEyn6sAhSJwVqsygaklY63b2ZXTG+rBerGVN2Fc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/markuppy/default.nix b/pkgs/development/python-modules/markuppy/default.nix new file mode 100644 index 00000000000..e10b7b4bb1d --- /dev/null +++ b/pkgs/development/python-modules/markuppy/default.nix @@ -0,0 +1,24 @@ +{ lib, fetchPypi, buildPythonPackage }: + +buildPythonPackage rec { + pname = "markuppy"; + version = "1.14"; + + src = fetchPypi { + pname = "MarkupPy"; + inherit version; + sha256 = "sha256-Gt7iwKVCrzeP6EVI/29rAWjzy39Ca0aWEDiivPqtDV8="; + }; + + # has no tests + doCheck = false; + + pythonImportsCheck = [ "MarkupPy" ]; + + meta = with lib; { + description = "An HTML/XML generator"; + homepage = "https://github.com/tylerbakke/MarkupPy"; + license = licenses.mit; + maintainers = with maintainers; [ sephi ]; + }; +} diff --git a/pkgs/development/python-modules/meshtastic/default.nix b/pkgs/development/python-modules/meshtastic/default.nix index b58c6207a96..2c1d7766b2c 100644 --- a/pkgs/development/python-modules/meshtastic/default.nix +++ b/pkgs/development/python-modules/meshtastic/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "meshtastic"; - version = "2.0.8"; + version = "2.0.9"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "meshtastic"; repo = "Meshtastic-python"; rev = "refs/tags/${version}"; - hash = "sha256-4zhwMCEIVYHrf9gT6Eoiw9huR5D2njDo62L0MvXqrgE="; + hash = "sha256-3OA61cuj9u6ejkQJgCjnu8ERjACKXz2hUekbvZqiPJ8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/motioneye-client/default.nix b/pkgs/development/python-modules/motioneye-client/default.nix index f1ba9ee7330..ba635c62f7a 100644 --- a/pkgs/development/python-modules/motioneye-client/default.nix +++ b/pkgs/development/python-modules/motioneye-client/default.nix @@ -1,5 +1,5 @@ -{ stdenv -, lib +{ lib +, stdenv , aiohttp , buildPythonPackage , fetchFromGitHub @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "motioneye-client"; - version = "0.3.12"; + version = "0.3.14"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -21,9 +21,15 @@ buildPythonPackage rec { owner = "dermotduffy"; repo = pname; rev = "v${version}"; - sha256 = "sha256-vEB9ztz0RTGoolFUVQcMV7DUthCEAx1kpwkAS2186OU="; + hash = "sha256-kgFSd5RjO+OtnPeAOimPTDVEfJ47rXh2Ku5xEYStHv8="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'aiohttp = "^3.8.1,!=3.8.2,!=3.8.3"' 'aiohttp = "*"' \ + --replace " --cov-report=html:htmlcov --cov-report=xml:coverage.xml --cov-report=term-missing --cov=motioneye_client --cov-fail-under=100" "" + ''; + nativeBuildInputs = [ poetry-core ]; @@ -38,20 +44,15 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace " --cov-report=html:htmlcov --cov-report=xml:coverage.xml --cov-report=term-missing --cov=motioneye_client --cov-fail-under=100" "" - ''; - pythonImportsCheck = [ "motioneye_client" ]; meta = with lib; { - broken = stdenv.isDarwin; description = "Python library for motionEye"; homepage = "https://github.com/dermotduffy/motioneye-client"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; + broken = stdenv.isDarwin; }; } diff --git a/pkgs/development/python-modules/neo4j/default.nix b/pkgs/development/python-modules/neo4j/default.nix index 0f95c059d86..ea3558ab0bd 100644 --- a/pkgs/development/python-modules/neo4j/default.nix +++ b/pkgs/development/python-modules/neo4j/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "neo4j"; - version = "5.3.0"; + version = "5.4.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "neo4j"; repo = "neo4j-python-driver"; rev = "refs/tags/${version}"; - hash = "sha256-x67zkQTUhGS5LIVOW2F+OJxnUPwsH1/bX42RArNscUc="; + hash = "sha256-emUz6DHnrDBOu9Wlhum7ntK3JIt94/05tuBAT2x4Bjs="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/nix-prefetch-github/default.nix b/pkgs/development/python-modules/nix-prefetch-github/default.nix index 42533cfcacd..bfeb3a58eff 100644 --- a/pkgs/development/python-modules/nix-prefetch-github/default.nix +++ b/pkgs/development/python-modules/nix-prefetch-github/default.nix @@ -9,15 +9,15 @@ buildPythonPackage rec { pname = "nix-prefetch-github"; - version = "5.2.2"; + version = "6.0.0"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "seppeljordan"; repo = "nix-prefetch-github"; rev = "v${version}"; - sha256 = "sha256-+0s47YhpMojxmRHKC7kazov2ZUsOs2/Y2EmHAAcARf0="; + sha256 = "YobBihNPbqYYWhe3x0p+BIlEK8R62s/dDFWUzP7fCTI="; }; checkInputs = [ unittestCheckHook git which ]; diff --git a/pkgs/development/python-modules/ocrmypdf/default.nix b/pkgs/development/python-modules/ocrmypdf/default.nix index f61f94f00c2..54643bc7f0a 100644 --- a/pkgs/development/python-modules/ocrmypdf/default.nix +++ b/pkgs/development/python-modules/ocrmypdf/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { pname = "ocrmypdf"; - version = "14.0.1"; + version = "14.0.2"; disabled = pythonOlder "3.8"; @@ -45,7 +45,7 @@ buildPythonPackage rec { postFetch = '' rm "$out/.git_archival.txt" ''; - hash = "sha256-eYn24FkAXj/ESCoC0QaLY+wRhkxZP1KnuY4VU1WiG24="; + hash = "sha256-s2G+ZNMEF3ZB1+ibPiYPuqdypoYFdFPpASeqFReR8/g="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/oralb-ble/default.nix b/pkgs/development/python-modules/oralb-ble/default.nix index 47e649ae3f7..256057393e7 100644 --- a/pkgs/development/python-modules/oralb-ble/default.nix +++ b/pkgs/development/python-modules/oralb-ble/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "oralb-ble"; - version = "0.15.0"; + version = "0.16.1"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-c5bsynNozFkY1VtAesKFXpwC81d8iZd48kFBHPRf43M="; + hash = "sha256-BbIgsIzvkUlH8JrD42Afy0U5GSk9H3ut48/XPYUZSew="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/persistent/default.nix b/pkgs/development/python-modules/persistent/default.nix index e1f92f30730..6a20154da38 100644 --- a/pkgs/development/python-modules/persistent/default.nix +++ b/pkgs/development/python-modules/persistent/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "persistent"; - version = "4.9.3"; + version = "5.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-piFSIf6zlV1IX6kMe87E+yllDOOco9DBEmcQOS4Nwtw="; + hash = "sha256-hx5jxSExFgeVzcjpw90xP4bg3/NMFRyY3NkSPG2M5nM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pikepdf/default.nix b/pkgs/development/python-modules/pikepdf/default.nix index 6fbd87ead77..f1cd028c520 100644 --- a/pkgs/development/python-modules/pikepdf/default.nix +++ b/pkgs/development/python-modules/pikepdf/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "pikepdf"; - version = "6.2.6"; + version = "6.2.8"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -39,7 +39,7 @@ buildPythonPackage rec { postFetch = '' rm "$out/.git_archival.txt" ''; - hash = "sha256-SqGWXuRwz79ZoDFL6sU9hX3FG/VLwLhQYzZOtT3tqvE="; + hash = "sha256-0E+kkvxT1jLfoBg3C9BfbSqfIX3K/Z5kK1kCdOks2Hk="; }; patches = [ diff --git a/pkgs/development/python-modules/playwright/default.nix b/pkgs/development/python-modules/playwright/default.nix index 66a249a3d35..e57655c2227 100644 --- a/pkgs/development/python-modules/playwright/default.nix +++ b/pkgs/development/python-modules/playwright/default.nix @@ -193,6 +193,8 @@ buildPythonPackage rec { ln -s ${driver} $out/${python.sitePackages}/playwright/driver ''; + SETUPTOOLS_SCM_PRETEND_VERSION = version; + # Skip tests because they require network access. doCheck = false; diff --git a/pkgs/development/python-modules/pontos/default.nix b/pkgs/development/python-modules/pontos/default.nix index 9fd494ede2f..74a34ae60b3 100644 --- a/pkgs/development/python-modules/pontos/default.nix +++ b/pkgs/development/python-modules/pontos/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "pontos"; - version = "22.12.3"; + version = "23.1.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "greenbone"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-RzNc8clL6kqJuC0+KJLtgby/6Bn/CS3QLfx7Ug6TX3M="; + hash = "sha256-2ca+VGylu4Km7M2Oz76ljbhSIDehVfviwVXnV+pXFRE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/precis-i18n/default.nix b/pkgs/development/python-modules/precis-i18n/default.nix index f6e0459139a..8d5969d18f0 100644 --- a/pkgs/development/python-modules/precis-i18n/default.nix +++ b/pkgs/development/python-modules/precis-i18n/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { pname = "precis-i18n"; - version = "1.0.4"; + version = "1.0.5"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -14,8 +14,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "byllyfish"; repo = "precis_i18n"; - rev = "v${version}"; - hash = "sha256-90yNusUyz8qJi7WWYIFhHzrpvu1TqxfpT+lv2CVhSR8="; + rev = "refs/tags/v${version}"; + hash = "sha256-DSm+KomveGs9ZzNFiT0B1gAjx2fh0BaUdKW0J+kW24U="; }; pythonImportsCheck = [ @@ -23,8 +23,9 @@ buildPythonPackage rec { ]; meta = with lib; { - homepage = "https://github.com/byllyfish/precis_i18n"; description = "Internationalized usernames and passwords"; + homepage = "https://github.com/byllyfish/precis_i18n"; + changelog = "https://github.com/byllyfish/precis_i18n/blob/v${version}/CHANGELOG.rst"; license = licenses.mit; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/pybotvac/default.nix b/pkgs/development/python-modules/pybotvac/default.nix index 394ea6e3fb0..004572279ab 100644 --- a/pkgs/development/python-modules/pybotvac/default.nix +++ b/pkgs/development/python-modules/pybotvac/default.nix @@ -1,22 +1,22 @@ { lib , buildPythonPackage , fetchPypi +, pythonOlder , requests , requests-oauthlib , voluptuous -, pythonOlder }: buildPythonPackage rec { pname = "pybotvac"; - version = "0.0.23"; + version = "0.0.24"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-VLT+VlwQAAxU1WRNCB4t4fhQ2u+6w5zqdM6mSbR7+xI="; + hash = "sha256-SXIs9AUXWm1H49MVDT4z6msNPaW5sAU20rcsWZ7ERdU="; }; propagatedBuildInputs = [ @@ -25,7 +25,7 @@ buildPythonPackage rec { voluptuous ]; - # no tests + # Module no tests doCheck = false; pythonImportsCheck = [ @@ -35,7 +35,8 @@ buildPythonPackage rec { meta = with lib; { description = "Python module for interacting with Neato Botvac Connected vacuum robots"; homepage = "https://github.com/stianaske/pybotvac"; + changelog = "https://github.com/stianaske/pybotvac/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/pycoolmasternet-async/default.nix b/pkgs/development/python-modules/pycoolmasternet-async/default.nix index 909feb94432..d8aa5760d5d 100644 --- a/pkgs/development/python-modules/pycoolmasternet-async/default.nix +++ b/pkgs/development/python-modules/pycoolmasternet-async/default.nix @@ -1,12 +1,13 @@ { lib , buildPythonPackage -, pythonOlder , fetchFromGitHub +, pythonOlder }: buildPythonPackage rec { pname = "pycoolmasternet-async"; - version = "0.1.3"; + version = "0.1.6"; + format = "setuptools"; disabled = pythonOlder "3.7"; @@ -14,13 +15,15 @@ buildPythonPackage rec { owner = "OnFreund"; repo = "pycoolmasternet-async"; rev = "v${version}"; - hash = "sha256-1Xd8OdN8d3g23kQZqihZrNLKoqLCbu5BvAMNitg8aDA="; + hash = "sha256-7RYKZWs8SCXCBgjbiTLSRUPujeraxiOE6MHENPmhimg="; }; # no tests implemented doCheck = false; - pythonImportsCheck = [ "pycoolmasternet_async" ]; + pythonImportsCheck = [ + "pycoolmasternet_async" + ]; meta = with lib; { description = "Python library to control CoolMasterNet HVAC bridges over asyncio"; diff --git a/pkgs/development/python-modules/pyisy/default.nix b/pkgs/development/python-modules/pyisy/default.nix index f2263a99dff..d0f4437cddb 100644 --- a/pkgs/development/python-modules/pyisy/default.nix +++ b/pkgs/development/python-modules/pyisy/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pyisy"; - version = "3.0.11"; + version = "3.0.12"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "automicus"; repo = "PyISY"; rev = "refs/tags/v${version}"; - hash = "sha256-oJ6Y4Bo4OLPVEy8vygU1FeRpZskfkCFBObvzTMuif5M="; + hash = "sha256-i9xC1Vijf/pU7WmRaosdEs5tPNos2hq3cGkT8MGM1Ro="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pylitterbot/default.nix b/pkgs/development/python-modules/pylitterbot/default.nix index 704c2526328..91f09cc531f 100644 --- a/pkgs/development/python-modules/pylitterbot/default.nix +++ b/pkgs/development/python-modules/pylitterbot/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pylitterbot"; - version = "2022.12.0"; + version = "2023.1.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "natekspencer"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-uqiSNqM1HKNAipIKKsUHv9mPfdk01ZrNWMXIzhgxxjU="; + hash = "sha256-XUiDZW3r8I8Vyx30UhopQ6S0HpSi0VNgvyu2RMNt2Eg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pysdl2/default.nix b/pkgs/development/python-modules/pysdl2/default.nix index 04a59fa5df9..90202829fc6 100644 --- a/pkgs/development/python-modules/pysdl2/default.nix +++ b/pkgs/development/python-modules/pysdl2/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "PySDL2"; - version = "0.9.14"; + version = "0.9.15"; # The tests use OpenGL using find_library, which would have to be # patched; also they seem to actually open X windows and test stuff @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-JAkfjZ5DdkZZHH921bru49OqbNiuSSpRxwJuUzifGHo="; + sha256 = "sha256-kIp946iMKyKiwhppkXxTIVKJW9GkkFJ6Jw7hTK1A5kc="; }; # Deliberately not in propagated build inputs; users can decide diff --git a/pkgs/development/python-modules/pysolcast/default.nix b/pkgs/development/python-modules/pysolcast/default.nix index 596c3a64cd7..726b37946b9 100644 --- a/pkgs/development/python-modules/pysolcast/default.nix +++ b/pkgs/development/python-modules/pysolcast/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pysolcast"; - version = "1.0.12"; + version = "1.0.13"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -20,8 +20,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mcaulifn"; repo = "solcast"; - rev = "v${version}"; - hash = "sha256-azcEbv/4M3UqRyV30yld+6pWbSxbGXiJJHWMDL4xgOM="; + rev = "refs/tags/v${version}"; + hash = "sha256-peoC6NrenfQYqr1hgPth8pqyTRZb+phD6UQhjnZF92U="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -53,6 +53,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library for interacting with the Solcast API"; homepage = "https://github.com/mcaulifn/solcast"; + changelog = "https://github.com/mcaulifn/solcast/releases/tag/v${version}"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/pysoma/default.nix b/pkgs/development/python-modules/pysoma/default.nix index beba5130578..d62afa64686 100644 --- a/pkgs/development/python-modules/pysoma/default.nix +++ b/pkgs/development/python-modules/pysoma/default.nix @@ -1,20 +1,27 @@ { lib , buildPythonPackage , fetchPypi +, pythonOlder }: buildPythonPackage rec { pname = "pysoma"; - version = "0.0.11"; + version = "0.0.12"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-U/kLaO/GBpOa9mHHlYQiWSw7sVNPaMneDURoJBqqojo="; + hash = "sha256-me/A3BIAFJ8CxyiF5RvANdC/NbSYGmcjCFbpybkTxKM="; }; # Project has no test doCheck = false; - pythonImportsCheck = [ "api" ]; + + pythonImportsCheck = [ + "api" + ]; meta = with lib; { description = "Python wrapper for the HTTP API provided by SOMA Connect"; diff --git a/pkgs/development/python-modules/pyswitchbee/default.nix b/pkgs/development/python-modules/pyswitchbee/default.nix index 01bf784e385..4ee6f81ac31 100644 --- a/pkgs/development/python-modules/pyswitchbee/default.nix +++ b/pkgs/development/python-modules/pyswitchbee/default.nix @@ -4,11 +4,12 @@ , fetchFromGitHub , setuptools , pythonOlder +, packaging }: buildPythonPackage rec { pname = "pyswitchbee"; - version = "1.7.16"; + version = "1.7.18"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -17,21 +18,16 @@ buildPythonPackage rec { owner = "jafar-atili"; repo = "pySwitchbee"; rev = "refs/tags/${version}"; - hash = "sha256-n04N7wfCBJIbwEEHJ6I1Lt3rpZg46umGPawShlXDuZ8="; + hash = "sha256-LQjtePFSMvZdAGH6f8CveaE7ASm/x9GuFj9s3TipYHQ="; }; - postPatch = '' - # https://github.com/jafar-atili/pySwitchbee/pull/2 - substituteInPlace pyproject.toml \ - --replace '"asyncio",' "" - ''; - nativeBuildInputs = [ setuptools ]; propagatedBuildInputs = [ aiohttp + packaging ]; # Module doesn't have tests diff --git a/pkgs/development/python-modules/pytest-base-url/default.nix b/pkgs/development/python-modules/pytest-base-url/default.nix new file mode 100644 index 00000000000..d388c840a00 --- /dev/null +++ b/pkgs/development/python-modules/pytest-base-url/default.nix @@ -0,0 +1,58 @@ +{ lib +, fetchFromGitHub +, buildPythonPackage +, poetry-core +, pytest +, pytest-localserver +, requests +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "pytest-base-url"; + version = "2.0.0"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "pytest-dev"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-v6pLejWNeb9Do6x2EJqmLKj8DNqcMtmYIs+7iDYsbjk="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + buildInputs = [ + pytest + ]; + + propagatedBuildInputs = [ + requests + ]; + + checkInputs = [ + pytestCheckHook + pytest-localserver + ]; + + pytestFlagsArray = [ + "tests" + ]; + + pythonImportsCheck = [ + "pytest_base_url" + ]; + + meta = with lib; { + description = "pytest plugin for URL based tests"; + homepage = "https://github.com/pytest-dev/pytest-base-url"; + changelog = "https://github.com/pytest-dev/pytest-base-url/blob/v${version}/CHANGES.rst"; + license = licenses.mpl20; + maintainers = with maintainers; [ sephi ]; + }; +} diff --git a/pkgs/development/python-modules/pytest-playwright/default.nix b/pkgs/development/python-modules/pytest-playwright/default.nix new file mode 100644 index 00000000000..9e620a6210a --- /dev/null +++ b/pkgs/development/python-modules/pytest-playwright/default.nix @@ -0,0 +1,63 @@ +{ lib +, fetchFromGitHub +, buildPythonPackage +, playwright +, pytest +, pytest-base-url +, pytestCheckHook +, python-slugify +, pythonOlder +, setuptools-scm +, django +}: + +buildPythonPackage rec { + pname = "pytest-playwright"; + version = "0.3.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "microsoft"; + repo = "playwright-pytest"; + rev = "refs/tags/v${version}"; + hash = "sha256-fHzQxbQBSEkCFu/ualjzSmIt3SiEa2ktTvIJKPZLT9Q="; + }; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + setuptools-scm + ]; + + buildInputs = [ + pytest + ]; + + propagatedBuildInputs = [ + playwright + pytest-base-url + python-slugify + ]; + + # Most of the tests rely on network access, or on unavailable browsers such as + # msedge, chrome or webkit + doCheck = false; + + preCheck = '' + export PLAYWRIGHT_BROWSERS_PATH=${playwright.browsers} + ''; + + pythonImportsCheck = [ + "pytest_playwright" + ]; + + meta = with lib; { + description = "Pytest plugin to write end-to-end browser tests with Playwright"; + homepage = "https://github.com/microsoft/playwright-pytest"; + changelog = "https://github.com/microsoft/playwright-pytest/releases/tag/v${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ sephi ]; + }; +} diff --git a/pkgs/development/python-modules/python-lsp-server/default.nix b/pkgs/development/python-modules/python-lsp-server/default.nix index 67119cdda52..01dc904293e 100644 --- a/pkgs/development/python-modules/python-lsp-server/default.nix +++ b/pkgs/development/python-modules/python-lsp-server/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { owner = "python-lsp"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-9cyzJxyCris7FsVni5IZCCL6IAcsN8tMakNoKPeWv7s="; + hash = "sha256-9cyzJxyCris7FsVni5IZCCL6IAcsN8tMakNoKPeWv7s="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -51,10 +51,10 @@ buildPythonPackage rec { --replace "--cov-report html --cov-report term --junitxml=pytest.xml" "" \ --replace "--cov pylsp --cov test" "" \ --replace "autopep8>=1.6.0,<1.7.0" "autopep8" \ - --replace "flake8>=5.0.0,<5.1.0" "flake8" \ + --replace "flake8>=5.0.0,<7" "flake8" \ --replace "mccabe>=0.7.0,<0.8.0" "mccabe" \ - --replace "pycodestyle>=2.9.0,<2.10.0" "pycodestyle" \ - --replace "pyflakes>=2.5.0,<2.6.0" "pyflakes" + --replace "pycodestyle>=2.9.0,<2.11.0" "pycodestyle" \ + --replace "pyflakes>=2.5.0,<3.1.0" "pyflakes" ''; nativeBuildInputs = [ @@ -150,6 +150,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python implementation of the Language Server Protocol"; homepage = "https://github.com/python-lsp/python-lsp-server"; + changelog = "https://github.com/python-lsp/python-lsp-server/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/pytoolconfig/default.nix b/pkgs/development/python-modules/pytoolconfig/default.nix index c3d1d66f7bc..529d0d2a361 100644 --- a/pkgs/development/python-modules/pytoolconfig/default.nix +++ b/pkgs/development/python-modules/pytoolconfig/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchFromGitHub -, fetchpatch , pythonOlder # build @@ -29,14 +28,16 @@ buildPythonPackage rec { pname = "pytoolconfig"; - version = "1.2.4"; + version = "1.2.5"; format = "pyproject"; + disabled = pythonOlder "3.8"; + src = fetchFromGitHub { owner = "bagel897"; repo = "pytoolconfig"; rev = "refs/tags/v${version}"; - hash = "sha256-UdBPp9Ur3+hYn2CBY91jK1hT/GHyA8qbQ3w0OuLBrFU="; + hash = "sha256-b7er/IgXr2j9dSnI87669BXWA5CXNTzwa1DTpl8PBZ4="; }; outputs = [ @@ -56,14 +57,6 @@ buildPythonPackage rec { sphinxHook ] ++ passthru.optional-dependencies.doc; - patches = [ - (fetchpatch { - # Fix documentation build - url = "https://github.com/bagel897/pytoolconfig/commit/c8a010842d738242d6bb8deb28ecd62342a60e03.patch"; - hash = "sha256-hYcPjQeHYGtSPy363RVS5YgQ+obJQuC+Q9ZuOGvKRAY="; - }) - ]; - postPatch = '' substituteInPlace pyproject.toml \ --replace "packaging>=22.0" "packaging" @@ -76,9 +69,16 @@ buildPythonPackage rec { ]; passthru.optional-dependencies = { - validation = [ pydantic ]; - global = [ platformdirs ]; - doc = [ sphinx tabulate ]; + validation = [ + pydantic + ]; + global = [ + platformdirs + ]; + doc = [ + sphinx + tabulate + ]; }; pythonImportsCheck = [ @@ -93,7 +93,7 @@ buildPythonPackage rec { changelog = "https://github.com/bagel897/pytoolconfig/releases/tag/v${version}"; description = "Python tool configuration"; homepage = "https://github.com/bagel897/pytoolconfig"; - license = licenses.lgpl3Only; - maintainers = with maintainers; [ hexa ]; + license = licenses.lgpl3Plus; + maintainers = with maintainers; [ fab hexa ]; }; } diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix index 12cfd4e7177..35610559020 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.32"; + version = "9.2.33"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-5ZCFAEHcM+3yH9pFyrduG8Uo1Ofr4JkvcXjJEi5KRMc="; + hash = "sha256-RDCNoP3B1+kyyEBszAbAm9G+G+4LE3ceojB5uQup7Ng="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/reolink-aio/default.nix b/pkgs/development/python-modules/reolink-aio/default.nix index c554f9febf4..f29ecc171b8 100644 --- a/pkgs/development/python-modules/reolink-aio/default.nix +++ b/pkgs/development/python-modules/reolink-aio/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "reolink-aio"; - version = "0.1.3"; + version = "0.2.1"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "starkillerOG"; repo = "reolink_aio"; rev = "refs/tags/${version}"; - sha256 = "sha256-4qg43qxrgBSES2ng7DbjgWrsXY+3+olvUe19zW2UXCE="; + sha256 = "sha256-AscfyYURP91aDoPo/ii3uEHQL82DAHpBHlGm1MjLx8c="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/restrictedpython/default.nix b/pkgs/development/python-modules/restrictedpython/default.nix index 4d8c10e97ca..e6e31041c2f 100644 --- a/pkgs/development/python-modules/restrictedpython/default.nix +++ b/pkgs/development/python-modules/restrictedpython/default.nix @@ -3,6 +3,7 @@ , fetchPypi , pytest-mock , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { @@ -10,10 +11,12 @@ buildPythonPackage rec { version = "6.0"; format = "setuptools"; + disabled = pythonOlder "3.7"; + src = fetchPypi { pname = "RestrictedPython"; inherit version; - sha256 = "sha256-QFzwvZ7sLxmxMmtfSCKO/lbWWQtOkYJrjMOyzUAKlq0="; + hash = "sha256-QFzwvZ7sLxmxMmtfSCKO/lbWWQtOkYJrjMOyzUAKlq0="; }; checkInputs = [ @@ -28,6 +31,7 @@ buildPythonPackage rec { meta = with lib; { description = "Restricted execution environment for Python to run untrusted code"; homepage = "https://github.com/zopefoundation/RestrictedPython"; + changelog = "https://github.com/zopefoundation/RestrictedPython/blob/${version}/CHANGES.rst"; license = licenses.zpl21; maintainers = with maintainers; [ juaningan ]; }; diff --git a/pkgs/development/python-modules/rfcat/default.nix b/pkgs/development/python-modules/rfcat/default.nix index da4f3699a76..5648d3efdde 100644 --- a/pkgs/development/python-modules/rfcat/default.nix +++ b/pkgs/development/python-modules/rfcat/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildPythonPackage , fetchFromGitHub , future @@ -6,7 +7,6 @@ , numpy , pyserial , pyusb -, hostPlatform , pytestCheckHook , pythonOlder }: @@ -33,7 +33,7 @@ buildPythonPackage rec { pyusb ]; - postInstall = lib.optionalString hostPlatform.isLinux '' + postInstall = lib.optionalString stdenv.hostPlatform.isLinux '' mkdir -p $out/etc/udev/rules.d cp etc/udev/rules.d/20-rfcat.rules $out/etc/udev/rules.d ''; diff --git a/pkgs/development/python-modules/rope/default.nix b/pkgs/development/python-modules/rope/default.nix index 89772638ae3..2c91bdf72b6 100644 --- a/pkgs/development/python-modules/rope/default.nix +++ b/pkgs/development/python-modules/rope/default.nix @@ -1,8 +1,10 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , pytoolconfig +, pytest-timeout , pytestCheckHook +, pythonOlder , setuptools }: @@ -11,9 +13,13 @@ buildPythonPackage rec { version = "1.6.0"; format = "pyproject"; - src = fetchPypi { - inherit pname version; - hash = "sha256-kxrqFUNlVWp9qsAcvOzgycEYdVv/98ZaskK2lYUWfso="; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "python-rope"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-avNCti288dY9pl5AVTmUzZU/vb6WDkXEtELNlEi6L/o="; }; nativeBuildInputs = [ @@ -25,6 +31,7 @@ buildPythonPackage rec { ] ++ pytoolconfig.optional-dependencies.global; checkInputs = [ + pytest-timeout pytestCheckHook ]; @@ -37,7 +44,8 @@ buildPythonPackage rec { meta = with lib; { description = "Python refactoring library"; homepage = "https://github.com/python-rope/rope"; - maintainers = with maintainers; [ goibhniu ]; + changelog = "https://github.com/python-rope/rope/blob/${version}/CHANGELOG.md"; license = licenses.gpl3Plus; + maintainers = with maintainers; [ goibhniu ]; }; } diff --git a/pkgs/development/python-modules/sfrbox-api/default.nix b/pkgs/development/python-modules/sfrbox-api/default.nix new file mode 100644 index 00000000000..1780d94ded9 --- /dev/null +++ b/pkgs/development/python-modules/sfrbox-api/default.nix @@ -0,0 +1,62 @@ +{ lib +, buildPythonPackage +, click +, defusedxml +, fetchFromGitHub +, httpx +, poetry-core +, pydantic +, pytest-asyncio +, pytestCheckHook +, pythonOlder +, respx +}: + +buildPythonPackage rec { + pname = "sfrbox-api"; + version = "0.0.2"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "hacf-fr"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-kXM+Y7ZKKczVdKTXqmbgSxlFfHx3hAvT9nkF3Ex7ChY="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'pydantic = ">=1.10.2"' 'pydantic = "*"' + ''; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + click + defusedxml + httpx + pydantic + ]; + + checkInputs = [ + pytest-asyncio + pytestCheckHook + respx + ]; + + pythonImportsCheck = [ + "sfrbox_api" + ]; + + meta = with lib; { + description = "Module for the SFR Box API"; + homepage = "https://github.com/hacf-fr/sfrbox-api"; + changelog = "https://github.com/hacf-fr/sfrbox-api/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/shapely/default.nix b/pkgs/development/python-modules/shapely/default.nix index 260a2723650..f23cc45ebe1 100644 --- a/pkgs/development/python-modules/shapely/default.nix +++ b/pkgs/development/python-modules/shapely/default.nix @@ -1,28 +1,35 @@ { lib , stdenv , buildPythonPackage -, fetchPypi -, substituteAll , pythonOlder -, geos -, pytestCheckHook +, fetchPypi , cython +, geos +, setuptools , numpy +, pytestCheckHook }: buildPythonPackage rec { pname = "shapely"; version = "2.0.0"; - disabled = pythonOlder "3.6"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-EfGxIxpsBCE/sSJsaWjRsbOzaexC0ellUGavh2MYYOo="; + hash = "sha256-EfGxIxpsBCE/sSJsaWjRsbOzaexC0ellUGavh2MYYOo="; }; nativeBuildInputs = [ - geos # for geos-config cython + geos # for geos-config + setuptools + ]; + + buildInputs = [ + geos ]; propagatedBuildInputs = [ @@ -33,9 +40,6 @@ buildPythonPackage rec { pytestCheckHook ]; - # Environment variable used in setup.py - GEOS_LIBRARY_PATH = "${geos}/lib/libgeos_c${stdenv.hostPlatform.extensions.sharedLibrary}"; - preCheck = '' rm -r shapely # prevent import of local shapely ''; @@ -54,9 +58,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "shapely" ]; meta = with lib; { - description = "Geometric objects, predicates, and operations"; - homepage = "https://pypi.python.org/pypi/Shapely/"; - license = with licenses; [ bsd3 ]; + changelog = "https://github.com/shapely/shapely/blob/${version}/CHANGES.txt"; + description = "Manipulation and analysis of geometric objects"; + homepage = "https://github.com/shapely/shapely"; + license = licenses.bsd3; maintainers = with maintainers; [ knedlsepp ]; }; } diff --git a/pkgs/development/python-modules/spacy/legacy.nix b/pkgs/development/python-modules/spacy/legacy.nix index 3ee2feeaa96..87523b7f629 100644 --- a/pkgs/development/python-modules/spacy/legacy.nix +++ b/pkgs/development/python-modules/spacy/legacy.nix @@ -14,11 +14,15 @@ buildPythonPackage rec { # checkInputs = [ pytestCheckHook spacy ]; doCheck = false; - pythonImportsCheck = [ "spacy_legacy" ]; + + pythonImportsCheck = [ + "spacy_legacy" + ]; meta = with lib; { - description = "A Path interface for local and cloud bucket storage"; - homepage = "https://github.com/justindujardin/pathy"; + description = "Legacy registered functions for spaCy backwards compatibility"; + homepage = "https://github.com/explosion/spacy-legacy"; + changelog = "https://github.com/explosion/spacy-legacy/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ melling ]; }; diff --git a/pkgs/development/python-modules/svglib/default.nix b/pkgs/development/python-modules/svglib/default.nix index 97e03ad4b03..2affcdd4af7 100644 --- a/pkgs/development/python-modules/svglib/default.nix +++ b/pkgs/development/python-modules/svglib/default.nix @@ -12,15 +12,14 @@ buildPythonPackage rec { pname = "svglib"; - version = "1.4.1"; + version = "1.5.1"; + format = "setuptools"; disabled = pythonOlder "3.7"; - format = "setuptools"; - src = fetchPypi { inherit pname version; - sha256 = "sha256-SMJHBsI7tCYhc7b6Seq7EK+hW4QS8UKDEgVJUXzPoxQ="; + hash = "sha256-Oudl06lAnuYMD7TSTC3raoBheqknBU9bzX/JjwaV5Yc="; }; propagatedBuildInputs = [ @@ -35,18 +34,23 @@ buildPythonPackage rec { pytestCheckHook ]; - # Ignore tests that require network access (TestWikipediaFlags and TestW3CSVG), and tests that - # require files missing in the 1.0.0 PyPI release (TestOtherFiles). - pytestFlagsArray = [ - "-k 'not TestWikipediaFlags and not TestW3CSVG and not TestOtherFiles'" + disabledTests = [ + # Ignore tests that require network access (TestWikipediaFlags and TestW3CSVG), and tests that + # require files missing in the 1.0.0 PyPI release (TestOtherFiles). + "TestWikipediaFlags" + "TestW3CSVG" + "TestOtherFiles" ]; - pythonImportsCheck = [ "svglib.svglib" ]; + pythonImportsCheck = [ + "svglib.svglib" + ]; meta = with lib; { - homepage = "https://github.com/deeplook/svglib"; description = "A pure-Python library for reading and converting SVG"; - license = licenses.lgpl3; + homepage = "https://github.com/deeplook/svglib"; + changelog = "https://github.com/deeplook/svglib/blob/v${version}/CHANGELOG.rst"; + license = licenses.lgpl3Only; maintainers = with maintainers; [ trepetti ]; }; } diff --git a/pkgs/development/python-modules/tablib/default.nix b/pkgs/development/python-modules/tablib/default.nix index 39ca2941c03..b2d789683fd 100644 --- a/pkgs/development/python-modules/tablib/default.nix +++ b/pkgs/development/python-modules/tablib/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, markuppy , odfpy , openpyxl , pandas @@ -37,7 +38,7 @@ buildPythonPackage rec { passthru.optional-dependencies = { all = [ - # markuppy + markuppy odfpy openpyxl pandas @@ -50,7 +51,7 @@ buildPythonPackage rec { tabulate ]; html = [ - # markuppy + markuppy ]; ods = [ odfpy diff --git a/pkgs/development/python-modules/tailscale/default.nix b/pkgs/development/python-modules/tailscale/default.nix index e3210b44325..63858112ced 100644 --- a/pkgs/development/python-modules/tailscale/default.nix +++ b/pkgs/development/python-modules/tailscale/default.nix @@ -21,10 +21,17 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "frenck"; repo = "python-tailscale"; - rev = "v${version}"; - sha256 = "sha256-gGDsVGsCBZi/pxD0cyH3+xrvHVBC+wJCcl/NGqsTqiE="; + rev = "refs/tags/v${version}"; + hash = "sha256-gGDsVGsCBZi/pxD0cyH3+xrvHVBC+wJCcl/NGqsTqiE="; }; + postPatch = '' + # Upstream doesn't set a version for the pyproject.toml + substituteInPlace pyproject.toml \ + --replace "0.0.0" "${version}" \ + --replace "--cov" "" + ''; + nativeBuildInputs = [ poetry-core ]; @@ -41,13 +48,6 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - # Upstream doesn't set a version for the pyproject.toml - substituteInPlace pyproject.toml \ - --replace "0.0.0" "${version}" \ - --replace "--cov" "" - ''; - pythonImportsCheck = [ "tailscale" ]; @@ -55,6 +55,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python client for the Tailscale API"; homepage = "https://github.com/frenck/python-tailscale"; + changelog = "https://github.com/frenck/python-tailscale/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix index a549fe393b9..d5aa29b23ae 100644 --- a/pkgs/development/python-modules/tensorflow/default.nix +++ b/pkgs/development/python-modules/tensorflow/default.nix @@ -372,11 +372,11 @@ let fetchAttrs = { sha256 = { x86_64-linux = if cudaSupport - then "sha256-SudzMTxfifKJJso6haCgOD2dXeAhYSXHA2nzq1ErTHg=" - else "sha256-bwZwK24DlUevN5gIdKmBkq1dJpn0i2H4hq+IN77BzjE="; - aarch64-linux = "sha256-ZbCNZSHF9of+KGTNEqFdKQ44MVNto/rTyo2XEsKXISg="; - x86_64-darwin = "sha256-ZfZQjLdqo8VVlfKfkdolvSHQvKe4IbQSLc/4cNzHr3E="; - aarch64-darwin = "sha256-u+ODHAZDlGe06PUWId4sNKyl60vhAPMd01jMm2EvN8E="; + then "sha256-Q6a/Q4fr5cmqqkIoL8ZBJOKfF4NXnrhqFi2VgUpHC3E=" + else "sha256-RBrmxWBn5Yj5fIHlPYXuWOFMTqDGbgk+IvUXk7kIXHM="; + aarch64-linux = "sha256-MEkn2DplUW1R95q+A6uuIKNtMEBv08jU8kvTbMgIKJU="; + x86_64-darwin = "sha256-bqZTu0AABeg6M2IVwlkUPuF8EMsbQXurcmjWZY0EN9E="; + aarch64-darwin = "sha256-q1PfVqyZ3KG65aKw6l9vhxCfPoxH6Nb5y1Eh9P8Ovqk="; }.${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}"); }; diff --git a/pkgs/development/python-modules/tpm2-pytss/default.nix b/pkgs/development/python-modules/tpm2-pytss/default.nix index 0f67fe231a3..45ac7a9e877 100644 --- a/pkgs/development/python-modules/tpm2-pytss/default.nix +++ b/pkgs/development/python-modules/tpm2-pytss/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "tpm2-pytss"; - version = "2.0.0"; + version = "2.1.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-iN5ePKMnYh1VzGbKtwdIx1tG74T+8ax/AqDGgermr90="; + hash = "sha256-W1tLFFb9wa7vPSw5cL6qB4yPfyZIyXppvPYMWi+VyJc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/types-redis/default.nix b/pkgs/development/python-modules/types-redis/default.nix index 5a0907adc60..3a970d42d05 100644 --- a/pkgs/development/python-modules/types-redis/default.nix +++ b/pkgs/development/python-modules/types-redis/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-redis"; - version = "4.3.21.7"; + version = "4.4.0.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-+bqsQfyvsLjsZViT/uvF2L0YnaBQYtA7RWahbAkvwIw="; + sha256 = "sha256-fYJtRY6abb19TyH99tfDm6Li80dMijSAACQZZYYKDt8="; }; # Module doesn't have tests diff --git a/pkgs/development/python-modules/zigpy/default.nix b/pkgs/development/python-modules/zigpy/default.nix index 5fd59516d49..893a59dffae 100644 --- a/pkgs/development/python-modules/zigpy/default.nix +++ b/pkgs/development/python-modules/zigpy/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "zigpy"; - version = "0.52.3"; + version = "0.53.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zigpy"; rev = "refs/tags/${version}"; - hash = "sha256-axk6C8RLuoKWUdJ3sOklWqnlYTWKTaQh51eWZm2Dy+0="; + hash = "sha256-9KTBzPklQpqzLOQYRz6Kd0wUSHr2sfypvTu0X7om31Y="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix index 72562d4935b..94165d992d8 100644 --- a/pkgs/development/tools/analysis/radare2/default.nix +++ b/pkgs/development/tools/analysis/radare2/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , buildPackages , pkg-config , meson @@ -56,6 +57,14 @@ stdenv.mkDerivation rec { hash = "sha256-9bDwtMNru7tG0L735y+Vrcg7Htk/TV9SVZn7WP4Ap4c="; }; + patches = [ + (fetchpatch { + name = "CVE-2022-4843.patch"; + url = "https://github.com/radareorg/radare2/commit/842f809d4ec6a12af2906f948657281c9ebc8a24.patch"; + sha256 = "sha256-asEXW9Ox48w9WQhOA9tleXIvynIjsWb6ItKmFTojgbQ="; + }) + ]; + preBuild = '' pushd ../libr/arch/p/arm/v35arm64 cp -r ${arm64} arch-arm64 diff --git a/pkgs/development/tools/analysis/randoop/default.nix b/pkgs/development/tools/analysis/randoop/default.nix index 6c37a5dca42..f5936704e30 100644 --- a/pkgs/development/tools/analysis/randoop/default.nix +++ b/pkgs/development/tools/analysis/randoop/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, unzip }: stdenv.mkDerivation rec { - version = "4.3.1"; + version = "4.3.2"; pname = "randoop"; src = fetchurl { url = "https://github.com/randoop/randoop/releases/download/v${version}/${pname}-${version}.zip"; - sha256 = "sha256-GWg3W/jjDKH6BcvjGt215J03NiDVWihU/m+2kejPVPA="; + sha256 = "sha256-lcYI0Yns/R5VeOUG68Xe8h1BO8wlKvL1CZIqzWkgsqo="; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/development/tools/bazel-watcher/default.nix b/pkgs/development/tools/bazel-watcher/default.nix index 816326489d8..a109fe44039 100644 --- a/pkgs/development/tools/bazel-watcher/default.nix +++ b/pkgs/development/tools/bazel-watcher/default.nix @@ -81,7 +81,7 @@ buildBazelPackage rec { rm -rf $bazelOut/external/com_google_protobuf ''; - sha256 = "sha256-R+Hc9ldYcKgAXETKr2+Hk7IrjJ93WkrjyJ1SQRoM9V4="; + sha256 = "sha256-tRtlwv38bExvtHaCbRUp1kLgxvZSNaYCpFG/wwrkFrk="; }; buildAttrs = { diff --git a/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix index 7b2bef113b3..e00e2d4b271 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix @@ -26,12 +26,12 @@ }: let - version = "5.2.0"; + version = "5.4.0"; sourceRoot = "."; src = fetchurl { url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip"; - sha256 = "sha256-ggqU27FAce1tjCZs8MCA7LJlpe6mUwdXlInEZiwtWCo="; + hash = "sha256-ocYtm8tOAxBt3wt72WGWuiRuHJt6k12vjZvtqLvcuKE="; }; # Update with `eval $(nix-build -A bazel_5.updater)`, diff --git a/pkgs/development/tools/build-managers/bazel/bazel_5/src-deps.json b/pkgs/development/tools/build-managers/bazel/bazel_5/src-deps.json index 9ca98f1132a..fc6895e047e 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_5/src-deps.json +++ b/pkgs/development/tools/build-managers/bazel/bazel_5/src-deps.json @@ -1129,18 +1129,18 @@ "generator_function": "dist_http_archive", "generator_name": "platforms", "name": "platforms", - "sha256": "079945598e4b6cc075846f7fd6a9d0857c33a7afc0de868c2ccb96405225135d", + "sha256": "379113459b0feaf6bfbb584a91874c065078aa673222846ac765f86661c27407", "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/platforms/releases/download/0.0.4/platforms-0.0.4.tar.gz", - "https://github.com/bazelbuild/platforms/releases/download/0.0.4/platforms-0.0.4.tar.gz" + "https://mirror.bazel.build/github.com/bazelbuild/platforms/releases/download/0.0.5/platforms-0.0.5.tar.gz", + "https://github.com/bazelbuild/platforms/releases/download/0.0.5/platforms-0.0.5.tar.gz" ] }, - "platforms-0.0.4.tar.gz": { - "name": "platforms-0.0.4.tar.gz", - "sha256": "079945598e4b6cc075846f7fd6a9d0857c33a7afc0de868c2ccb96405225135d", + "platforms-0.0.5.tar.gz": { + "name": "platforms-0.0.5.tar.gz", + "sha256": "379113459b0feaf6bfbb584a91874c065078aa673222846ac765f86661c27407", "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/platforms/releases/download/0.0.4/platforms-0.0.4.tar.gz", - "https://github.com/bazelbuild/platforms/releases/download/0.0.4/platforms-0.0.4.tar.gz" + "https://mirror.bazel.build/github.com/bazelbuild/platforms/releases/download/0.0.5/platforms-0.0.5.tar.gz", + "https://github.com/bazelbuild/platforms/releases/download/0.0.5/platforms-0.0.5.tar.gz" ] }, "remote_coverage_tools": { diff --git a/pkgs/development/tools/fastddsgen/default.nix b/pkgs/development/tools/fastddsgen/default.nix index e56b621610a..cbe00b1ad51 100644 --- a/pkgs/development/tools/fastddsgen/default.nix +++ b/pkgs/development/tools/fastddsgen/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, runtimeShell, writeText, fetchFromGitHub, gradle, openjdk17, git, perl, cmake }: let pname = "fastddsgen"; - version = "2.2.0"; + version = "2.3.0"; src = fetchFromGitHub { owner = "eProsima"; repo = "Fast-DDS-Gen"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-P0Fj8znhky8mTebnoNyojKDdnDowQaGXpX5L0CHcEeU="; + hash = "sha256-lxMv1hXjHFslJts63/FJPjj0mAKTluY/pNTvf15Oo9o="; }; # fake build to pre-download deps into fixed-output derivation diff --git a/pkgs/development/tools/gore/default.nix b/pkgs/development/tools/gore/default.nix index a8e393a050e..87b86b9b023 100644 --- a/pkgs/development/tools/gore/default.nix +++ b/pkgs/development/tools/gore/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gore"; - version = "0.5.5"; + version = "0.5.6"; src = fetchFromGitHub { owner = "motemen"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ZNv3sqwOEtxjvyqC9oR8xYwo8sywU2MF8ngBw407/ko="; + sha256 = "sha256-Z2WOgkgi/JK/s0961FvgboJwYtxbFdRSzzPiE74SVaY="; }; - vendorSha256 = "sha256-HrdNWsUVz5G5tG/ZFz2z1Vt4kM12I088/6OIkRFyDl8="; + vendorHash = "sha256-1ftO+Bjc+vqB/azn4K6iRNrCLrz+QjpPzNfja3yvOrs="; doCheck = false; diff --git a/pkgs/development/tools/jqp/default.nix b/pkgs/development/tools/jqp/default.nix index 519bef162ac..8491900b2c1 100644 --- a/pkgs/development/tools/jqp/default.nix +++ b/pkgs/development/tools/jqp/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "jqp"; - version = "0.3.0"; + version = "0.4.0"; src = fetchFromGitHub { owner = "noahgorstein"; repo = pname; rev = "v${version}"; - sha256 = "sha256-f1HSwo0TwNpw02bNT1dzfovXcRQuP/IxAmomBgKuQxQ="; + sha256 = "sha256-qN248U4Fx4IAjJegCUj98PzrypMp9PQEr2RUaKX3yE4="; }; - vendorSha256 = "sha256-cx5esdxAJInxXHXx0xeKQNGTDBjKD3GhnY0Fu/Tzy9U="; + vendorHash = "sha256-qZTqqSANg0FpupWXTrHuYmnaTE387FhC40ZrZ9tlfew="; subPackages = [ "." ]; diff --git a/pkgs/development/tools/just/default.nix b/pkgs/development/tools/just/default.nix index bff6f36c805..002dffd05f7 100644 --- a/pkgs/development/tools/just/default.nix +++ b/pkgs/development/tools/just/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "just"; - version = "1.9.0"; + version = "1.11.0"; src = fetchFromGitHub { owner = "casey"; repo = pname; rev = version; - hash = "sha256-qoKmYFwGgJrv39g6XvcUkYkjjfrfcxAztjsuTxwnVBM="; + hash = "sha256-TYw2YrilrEUCvyT9VvzrQnHcSnhPrNiAMRjLEk/QjgU="; }; - cargoSha256 = "sha256-XJkcwaDgorRwKmMTMGN2z9ONTlO0ftjP9V4/OPpDClc="; + cargoHash = "sha256-pgktCRxYlxo/kMdBm3/dzdU3rOXSNFY9IIE8j8Dgro0="; nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; diff --git a/pkgs/development/tools/mani/default.nix b/pkgs/development/tools/mani/default.nix index e9261c06258..66fbb4dc731 100644 --- a/pkgs/development/tools/mani/default.nix +++ b/pkgs/development/tools/mani/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "mani"; - version = "0.22.0"; + version = "0.23.0"; src = fetchFromGitHub { owner = "alajmo"; repo = "mani"; rev = "v${version}"; - sha256 = "sha256-2WuUQt9q19JYlfAyoGFRVpiLmsMbN45cYdF16j+jhhk="; + sha256 = "sha256-PuoGuweuDcSM1qfjXABSdoqbMLc5a+lYGFr0kZZkgVE="; }; - vendorSha256 = "sha256-9DP6SRcvHtZhkk2XoYesC1mhfq06KsLs0X02AG9vwJ8="; + vendorHash = "sha256-9DP6SRcvHtZhkk2XoYesC1mhfq06KsLs0X02AG9vwJ8="; nativeBuildInputs = [ installShellFiles makeWrapper ]; diff --git a/pkgs/development/tools/mask/default.nix b/pkgs/development/tools/mask/default.nix index 343d41be6f1..0856a837388 100644 --- a/pkgs/development/tools/mask/default.nix +++ b/pkgs/development/tools/mask/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "mask"; - version = "0.11.2"; + version = "0.11.3"; src = fetchFromGitHub { owner = "jacobdeichert"; repo = pname; rev = "v${version}"; - sha256 = "sha256-mlARZ05xppPvr6Z5uoveYt3Y3LtdMkbFqxW1EkX+ud0="; + sha256 = "sha256-mPnykI3scTBzGjDa8nawWYRvZBkq74/t5WMbMbs3zVE="; }; - cargoSha256 = "sha256-EulRz/IjLLvNT9YxyNjJynFEGyQ/Q2Out984xS9Wp5o="; + cargoSha256 = "sha256-h58MA3F4UA4gp64UPnK6Tvlvr4PFvrVKmjp48lZjH68="; # tests require mask to be installed doCheck = false; @@ -19,6 +19,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "A CLI task runner defined by a simple markdown file"; homepage = "https://github.com/jacobdeichert/mask"; + changelog = "https://github.com/jacobdeichert/mask/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ figsoda ]; }; diff --git a/pkgs/development/tools/misc/act/default.nix b/pkgs/development/tools/misc/act/default.nix index 3489ce3d1f7..dedbb8e300c 100644 --- a/pkgs/development/tools/misc/act/default.nix +++ b/pkgs/development/tools/misc/act/default.nix @@ -1,21 +1,28 @@ -{ lib, fetchFromGitHub, buildGoModule }: +{ lib +, fetchFromGitHub +, buildGoModule +}: buildGoModule rec { pname = "act"; - version = "0.2.34"; + version = "0.2.35"; src = fetchFromGitHub { owner = "nektos"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-75gUiFDKpIfl9xU9MAb/JkTof5NakPHR0lEaMJpSYZQ="; + rev = "refs/tags/v${version}"; + hash = "sha256-igmxiPVq9aWntIkBSl7crrbXM9N9Iv4KULsj5Q2ZL2I="; }; - vendorSha256 = "sha256-4r25EqpnCWfJmidWZlerbNaUnDCMPMCcsGRluwHQyvY="; + vendorHash = "sha256-FKpNMZrME3HqqVlp09O3Ppb/MjEzYFuawA+WlKFUfME="; doCheck = false; - ldflags = [ "-s" "-w" "-X main.version=${version}" ]; + ldflags = [ + "-s" + "-w" + "-X main.version=${version}" + ]; meta = with lib; { description = "Run your GitHub Actions locally"; diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix index 53b02cc16ea..667acd91f34 100644 --- a/pkgs/development/tools/misc/gdb/default.nix +++ b/pkgs/development/tools/misc/gdb/default.nix @@ -147,7 +147,8 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl3Plus; - platforms = with platforms; linux ++ cygwin ++ darwin; + # GDB upstream does not support ARM darwin + platforms = with platforms; linux ++ cygwin ++ ["x86_64-darwin"]; maintainers = with maintainers; [ pierron globin lsix ]; }; } diff --git a/pkgs/development/tools/okteto/default.nix b/pkgs/development/tools/okteto/default.nix index 14b0ce8b922..b7337e11998 100644 --- a/pkgs/development/tools/okteto/default.nix +++ b/pkgs/development/tools/okteto/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "okteto"; - version = "2.10.3"; + version = "2.11.0"; src = fetchFromGitHub { owner = "okteto"; repo = "okteto"; rev = version; - hash = "sha256-6dpEWODqxafMLzUzJgTI9y1nV67GyUihbQB6UHAYStY="; + hash = "sha256-BKDjtC3NDazFsvX/FM0qXpHd1muXUQDgzBMSLipA4/U="; }; vendorHash = "sha256-Yi+4fGCHLH/kA4DuPI2uQ/27xhMd4cPFkTWlI6Bc13A="; diff --git a/pkgs/development/tools/parsing/nex/default.nix b/pkgs/development/tools/parsing/nex/default.nix new file mode 100644 index 00000000000..287098ed8d3 --- /dev/null +++ b/pkgs/development/tools/parsing/nex/default.nix @@ -0,0 +1,27 @@ +{ buildGoPackage +, fetchFromGitHub +, lib +}: +# upstream is pretty stale, but it still works, so until they merge module +# support we have to use gopath: see blynn/nex#57 +buildGoPackage rec { + pname = "nex"; + version = "unstable-2021-03-30"; + + src = fetchFromGitHub { + owner = "blynn"; + repo = pname; + rev = "1a3320dab988372f8910ccc838a6a7a45c8980ff"; + hash = "sha256-DtJkV380T2B5j0+u7lYZfbC0ej0udF4GW2lbRmmbjAM="; + }; + + goPackagePath = "github.com/blynn/nex"; + subPackages = [ "." ]; + + meta = with lib; { + description = "Lexer for Go"; + homepage = "https://github.com/blynn/nex"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ urandom ]; + }; +} diff --git a/pkgs/development/tools/parsing/tree-sitter/grammar.nix b/pkgs/development/tools/parsing/tree-sitter/grammar.nix index e819a55eef3..5b62959db0f 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammar.nix +++ b/pkgs/development/tools/parsing/tree-sitter/grammar.nix @@ -46,6 +46,7 @@ stdenv.mkDerivation ({ $CC -fPIC -c src/scanner.c -o scanner.o $CFLAGS fi $CC -fPIC -c src/parser.c -o parser.o $CFLAGS + rm -rf parser $CXX -shared -o parser *.o runHook postBuild ''; diff --git a/pkgs/development/tools/ruff/default.nix b/pkgs/development/tools/ruff/default.nix index 5246f13e564..2e8ffcd1a8f 100644 --- a/pkgs/development/tools/ruff/default.nix +++ b/pkgs/development/tools/ruff/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "ruff"; - version = "0.0.215"; + version = "0.0.217"; src = fetchFromGitHub { owner = "charliermarsh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-f/ZqHPZ1lhYn1iPz0dwIQQpjWmZj1fxBiVMTbT8bTRo="; + sha256 = "sha256-/nZtq1FSOsB0OX0lVFY3o0F/1ZobM8iW+3zp4muhtfU="; }; - cargoSha256 = "sha256-o3W0yyqGh3CDgymISsJyxLolxwOAY4p8ldrCwU8qwiA="; + cargoSha256 = "sha256-mSDr2ywrk2cPp2NrvjaxU//+ZYQZe05XF5Ny8Bkx7uA="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreServices diff --git a/pkgs/development/tools/rust/cargo-guppy/default.nix b/pkgs/development/tools/rust/cargo-guppy/default.nix index 479c5d6cef7..e484f930c1e 100644 --- a/pkgs/development/tools/rust/cargo-guppy/default.nix +++ b/pkgs/development/tools/rust/cargo-guppy/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-guppy"; - version = "unstable-2022-12-05"; + version = "unstable-2023-01-08"; src = fetchFromGitHub { owner = "guppy-rs"; repo = "guppy"; - rev = "4dad33053d3047293da35ade33158b709fe8bb23"; - sha256 = "sha256-CWyXNBBo+yyF2s6BT6FFu6CI7xId38vsyg0uSezsusc="; + rev = "81753212702ca2b11b65ac8b98db6c9e4f4d278f"; + sha256 = "sha256-fCZlnE+/U+Z+X9n6x6qWHxODH5ESV0cM+hwxeyUZs6c="; }; - cargoSha256 = "sha256-jwfZ5FH2qlzmxKT9LTXkmvwL5fhKljUPYwYXXqDRDXc="; + cargoSha256 = "sha256-H2voc37Ywmi8oy15UY9J3hW6sbqc3RZuelxWJxrwZKg="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/tools/rust/cargo-hakari/default.nix b/pkgs/development/tools/rust/cargo-hakari/default.nix index c596e61586c..c8d3f360da2 100644 --- a/pkgs/development/tools/rust/cargo-hakari/default.nix +++ b/pkgs/development/tools/rust/cargo-hakari/default.nix @@ -1,15 +1,20 @@ -{ lib, rustPlatform, fetchCrate }: +{ lib, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "cargo-hakari"; - version = "0.9.17"; + version = "0.9.18"; - src = fetchCrate { - inherit pname version; - sha256 = "sha256-FgG9sdXZhSlX4p3I9WL5ORN7FCg4Zgt/Y+GRCWhIoP8="; + src = fetchFromGitHub { + owner = "guppy-rs"; + repo = "guppy"; + rev = "cargo-hakari-${version}"; + sha256 = "sha256-ZjU+0e0GmLCC9cha1RcTV0vEbuRi/SmU9qaNONIB7nI="; }; - cargoHash = "sha256-pYjjiQUnBfZ9wQgXhm4c+A7zMAF9k/Mzl5ccPX407/A="; + cargoHash = "sha256-/KH+h+4xfU2fitWv+IrLkwgiQ8tVjm41DiZtbrerRZ4="; + + cargoBuildFlags = [ "-p" "cargo-hakari" ]; + cargoTestFlags = [ "-p" "cargo-hakari" ]; meta = with lib; { description = "Manage workspace-hack packages to speed up builds in large workspaces."; diff --git a/pkgs/development/tools/rust/cargo-llvm-cov/default.nix b/pkgs/development/tools/rust/cargo-llvm-cov/default.nix index df204220b5b..7089a574748 100644 --- a/pkgs/development/tools/rust/cargo-llvm-cov/default.nix +++ b/pkgs/development/tools/rust/cargo-llvm-cov/default.nix @@ -6,13 +6,13 @@ rustPlatform.buildRustPackage rec { pname = "cargo-llvm-cov"; - version = "0.5.4"; + version = "0.5.5"; src = fetchzip { url = "https://crates.io/api/v1/crates/${pname}/${version}/download#${pname}-${version}.tar.gz"; - sha256 = "sha256-xBWp9+Vv1Ho63WWlvbvLU+h0dh5CpUamlRQtmX6rOeY="; + sha256 = "sha256-L+byatz2Pq30+Gw0lq1/7Q1FJXi6z+J/nhySFBAfoMo="; }; - cargoSha256 = "sha256-GKrqB6BtRbhtOlD2YeEMh6aqblPNEJjkR+tAsSpOFig="; + cargoSha256 = "sha256-/8kza5fW23UYlebchYtgo2GU8M7LXNXSKV2dQ6xZllw="; # skip tests which require llvm-tools-preview checkFlags = [ diff --git a/pkgs/development/tools/supabase-cli/default.nix b/pkgs/development/tools/supabase-cli/default.nix index a5facfee823..800d610a6d7 100644 --- a/pkgs/development/tools/supabase-cli/default.nix +++ b/pkgs/development/tools/supabase-cli/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "supabase-cli"; - version = "1.27.7"; + version = "1.29.3"; src = fetchFromGitHub { owner = "supabase"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-3IHKFO/P5TdD8ujFUuJj0xZsJDIUSmKjy7j6BefPK58="; + sha256 = "sha256-VA2OU2lnrbqNrQgyxYz2fh+jrJkHWTIOVrdYBwaK2kI="; }; - vendorSha256 = "sha256-RO9dZP236Kt8SSpZFF7KRksrjgwiEkPxE5DIMUK69Kw="; + vendorSha256 = "sha256-pzbwHnUCZkHmj+ZKJJ3zGG1pVHYlvoMMF3jx9FYg01U="; ldflags = [ "-s" "-w" "-X" "github.com/supabase/cli/cmd.version=${version}" ]; diff --git a/pkgs/development/tools/wabt/default.nix b/pkgs/development/tools/wabt/default.nix index 31fc7270c23..673c3dbbdad 100644 --- a/pkgs/development/tools/wabt/default.nix +++ b/pkgs/development/tools/wabt/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "wabt"; - version = "1.0.31"; + version = "1.0.32"; src = fetchFromGitHub { owner = "WebAssembly"; repo = "wabt"; rev = version; - sha256 = "sha256-EChOQTWGt/LUfwCxmMmYC+zHjW9hVvghhOGr4DfpNtQ="; + sha256 = "sha256-kLPs/9tQtvUEOGsLtnK0uqJnCWTHR6JU7BCwtFEmIlQ="; fetchSubmodules = true; }; diff --git a/pkgs/development/tools/zq/default.nix b/pkgs/development/tools/zq/default.nix index 06e055d9182..c62de54360f 100644 --- a/pkgs/development/tools/zq/default.nix +++ b/pkgs/development/tools/zq/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "zq"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "brimdata"; repo = "zed"; rev = "v${version}"; - hash = "sha256-DVQoWam5szELJ3OeIKHYF0CBZ0AJlhuIJRrdhqmyhQM="; + hash = "sha256-ias2HKwZo5Q/0M4YZI4wLgzMVWmannruXlhp8IsOuyU="; }; - vendorSha256 = "sha256-2zSSjAoeb+7Nk/dxpvp5P2/bSJXgkA0TieTQHK4ym1Y="; + vendorHash = "sha256-h5NYx6xhIh4i/tS5cGHXBomnVZCUn8jJuzL6k1+IdKk="; subPackages = [ "cmd/zq" ]; diff --git a/pkgs/games/BeatSaberModManager/default.nix b/pkgs/games/BeatSaberModManager/default.nix index ceef75f4585..614733e549a 100644 --- a/pkgs/games/BeatSaberModManager/default.nix +++ b/pkgs/games/BeatSaberModManager/default.nix @@ -1,7 +1,7 @@ { lib, dotnet-sdk, - targetPlatform, + stdenv, substituteAll, buildDotnetModule, @@ -34,7 +34,7 @@ buildDotnetModule rec { patches = [ (substituteAll { src = ./add-runtime-identifier.patch; - runtimeIdentifier = dotnetCorePackages.systemToDotnetRid targetPlatform.system; + runtimeIdentifier = dotnetCorePackages.systemToDotnetRid stdenv.targetPlatform.system; }) ]; diff --git a/pkgs/games/anki/bin.nix b/pkgs/games/anki/bin.nix index cdec20572bd..9523a228f87 100644 --- a/pkgs/games/anki/bin.nix +++ b/pkgs/games/anki/bin.nix @@ -3,22 +3,22 @@ let pname = "anki-bin"; # Update hashes for both Linux and Darwin! - version = "2.1.55"; + version = "2.1.56"; sources = { linux = fetchurl { url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-linux-qt6.tar.zst"; - sha256 = "sha256-fi7efWBZZnqOEztVOhOsfspcTBDxqw2Rr/eAGMFYbAU="; + sha256 = "sha256-bois8+W/Jvte0HqC6Vi8WcXzrc8y8fKoW3ttbPb/v14="; }; # For some reason anki distributes completely separate dmg-files for the aarch64 version and the x86_64 version darwin-x86_64 = fetchurl { url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-mac-intel-qt6.dmg"; - sha256 = "sha256-+Ceo03bMNnDQWgDmF1MIlrTQyHaJUKG8gF1/+ZEFCYw="; + sha256 = "sha256-xd96wG+dElf6kSJ3jtdwfDhxJIv2r/o/JF2RcIwaZkg="; }; darwin-aarch64 = fetchurl { url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-mac-apple-qt6.dmg"; - sha256 = "sha256-3ppE+APPUJ6H/ud67KNwfQJnFCa7g7Hdxx4oZD0ip6E="; + sha256 = "sha256-dYYgKEN6ytZ1CIH2+hK7H7xs3ISMbZGDv3w+Ie+ISlw="; }; }; diff --git a/pkgs/games/eduke32/default.nix b/pkgs/games/eduke32/default.nix index d5656d0d5c3..a25c6fa9050 100644 --- a/pkgs/games/eduke32/default.nix +++ b/pkgs/games/eduke32/default.nix @@ -18,13 +18,13 @@ let in stdenv.mkDerivation rec { pname = "eduke32"; - version = "20221026"; - rev = "10165"; - revExtra = "a9c797dcb"; + version = "20221225"; + rev = "10166"; + revExtra = "122aee012"; src = fetchurl { url = "https://dukeworld.com/eduke32/synthesis/${version}-${rev}-${revExtra}/eduke32_src_${version}-${rev}-${revExtra}.tar.xz"; - sha256 = "sha256-8xvIe+kVOu2VIZACHis04tvyrl1IRrt0tY8D04n6ZjU="; + sha256 = "sha256-3pBYZJqoH7XBkJ537wPwBSmNaZprvOlVtAKTo8EOT3Q="; }; buildInputs = [ @@ -48,7 +48,12 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper pkg-config ] ++ lib.optional (stdenv.hostPlatform.system == "i686-linux") nasm; - postPatch = lib.optionalString stdenv.isLinux '' + postPatch = '' + substituteInPlace source/imgui/src/imgui_impl_sdl.cpp \ + --replace '#include <SDL.h>' '#include <SDL2/SDL.h>' \ + --replace '#include <SDL_syswm.h>' '#include <SDL2/SDL_syswm.h>' \ + --replace '#include <SDL_vulkan.h>' '#include <SDL2/SDL_vulkan.h>' + '' + lib.optionalString stdenv.isLinux '' substituteInPlace source/build/src/glbuild.cpp \ --replace libGLU.so ${libGLU}/lib/libGLU.so @@ -56,11 +61,6 @@ in stdenv.mkDerivation rec { substituteInPlace source/glad/src/$f \ --replace libGL.so ${libGL}/lib/libGL.so done - - substituteInPlace source/imgui/src/imgui_impl_sdl.cpp \ - --replace '#include <SDL.h>' '#include <SDL2/SDL.h>' \ - --replace '#include <SDL_syswm.h>' '#include <SDL2/SDL_syswm.h>' \ - --replace '#include <SDL_vulkan.h>' '#include <SDL2/SDL_vulkan.h>' ''; makeFlags = [ diff --git a/pkgs/misc/dxvk/default.nix b/pkgs/misc/dxvk/default.nix index 7d5af28d810..b93c46f0910 100644 --- a/pkgs/misc/dxvk/default.nix +++ b/pkgs/misc/dxvk/default.nix @@ -1,6 +1,5 @@ { lib , pkgs -, hostPlatform , stdenvNoCC , fetchFromGitHub , pkgsCross @@ -8,7 +7,7 @@ stdenvNoCC.mkDerivation (finalAttrs: let - inherit (hostPlatform.uname) system; + inherit (stdenvNoCC.hostPlatform.uname) system; # DXVK needs to be a separate derivation because it’s actually a set of DLLs for Windows that # needs to be built with a cross-compiler. dxvk32 = pkgsCross.mingw32.callPackage ./dxvk.nix { diff --git a/pkgs/misc/fastly/default.nix b/pkgs/misc/fastly/default.nix index 081a063cdba..0a888acd9bb 100644 --- a/pkgs/misc/fastly/default.nix +++ b/pkgs/misc/fastly/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "fastly"; - version = "4.5.0"; + version = "4.6.1"; src = fetchFromGitHub { owner = "fastly"; repo = "cli"; rev = "refs/tags/v${version}"; - hash = "sha256-l/EnlyrSofuk4/69R2VUdP6MyKOVAOI7cIOW1TLeBww="; + hash = "sha256-r8k8fB40WQoLWtw+6RCsAOSKDJhN967uNAwbT137rQs="; # The git commit is part of the `fastly version` original output; # leave that output the same in nixpkgs. Use the `.git` directory # to retrieve the commit SHA, and remove the directory afterwards, @@ -31,7 +31,7 @@ buildGoModule rec { "cmd/fastly" ]; - vendorHash = "sha256-cXO5zhc9RZlweoU6pva2sBvcjNWBeFSUz+k9BbQpUX0="; + vendorHash = "sha256-lfypuPCLBBekFWwocdFLUw5sONCBM8clnwHVAebAkZ8="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/os-specific/darwin/xcode/default.nix b/pkgs/os-specific/darwin/xcode/default.nix index 2ce607896b5..6d1929ef982 100644 --- a/pkgs/os-specific/darwin/xcode/default.nix +++ b/pkgs/os-specific/darwin/xcode/default.nix @@ -1,10 +1,10 @@ -{ buildPlatform, requireFile, targetPlatform, lib }: +{ stdenv, requireFile, lib }: let requireXcode = version: sha256: let xip = "Xcode_" + version + ".xip"; # TODO(alexfmpe): Find out how to validate the .xip signature in Linux - unxip = if buildPlatform.isDarwin + unxip = if stdenv.buildPlatform.isDarwin then '' open -W ${xip} rm -rf ${xip} @@ -66,6 +66,6 @@ in lib.makeExtensible (self: { xcode_12_1 = requireXcode "12.1" "1widy74dk43wx8iqgd7arzf6q4kzdmaz8pfwymzs8chnq9dqr3wp"; xcode_12_2 = requireXcode "12.2" "17i0wf4pwrxwfgjw7rpw9mcd59nkmys1k5h2rqsw81snzyxy9j0v"; xcode_12_3 = requireXcode "12.3" "0kwf1y4llysf1p0nsbqyzccn7d77my0ldagr5fi3by4k0xy3d189"; - xcode = self."xcode_${lib.replaceStrings ["."] ["_"] (if (targetPlatform ? xcodeVer) then targetPlatform.xcodeVer else "12.3")}"; + xcode = self."xcode_${lib.replaceStrings ["."] ["_"] (if (stdenv.targetPlatform ? xcodeVer) then stdenv.targetPlatform.xcodeVer else "12.3")}"; }) diff --git a/pkgs/os-specific/darwin/xcode/sdk-pkgs.nix b/pkgs/os-specific/darwin/xcode/sdk-pkgs.nix index 0512d9dd46a..50eb50ea6b7 100644 --- a/pkgs/os-specific/darwin/xcode/sdk-pkgs.nix +++ b/pkgs/os-specific/darwin/xcode/sdk-pkgs.nix @@ -1,4 +1,4 @@ -{ targetPlatform +{ stdenv , clang-unwrapped , binutils-unwrapped , runCommand @@ -12,7 +12,7 @@ let -minSdkVersion = targetPlatform.minSdkVersion or "9.0"; +minSdkVersion = stdenv.targetPlatform.minSdkVersion or "9.0"; in @@ -22,8 +22,8 @@ rec { type = "derivation"; outPath = xcode + "/Contents/Developer/Platforms/${platform}.platform/Developer/SDKs/${platform}${version}.sdk"; - platform = targetPlatform.xcodePlatform; - version = targetPlatform.sdkVer; + platform = stdenv.targetPlatform.xcodePlatform; + version = stdenv.targetPlatform.sdkVer; }; binutils = wrapBintoolsWith { @@ -39,7 +39,7 @@ rec { extraBuildCommands = '' tr '\n' ' ' < $out/nix-support/cc-cflags > cc-cflags.tmp mv cc-cflags.tmp $out/nix-support/cc-cflags - echo "-target ${targetPlatform.config}" >> $out/nix-support/cc-cflags + echo "-target ${stdenv.targetPlatform.config}" >> $out/nix-support/cc-cflags echo "-isystem ${sdk}/usr/include${lib.optionalString (lib.versionAtLeast "10" sdk.version) " -isystem ${sdk}/usr/include/c++/4.2.1/ -stdlib=libstdc++"}" >> $out/nix-support/cc-cflags ${lib.optionalString (lib.versionAtLeast sdk.version "14") "echo -isystem ${xcode}/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1 >> $out/nix-support/cc-cflags"} ''; diff --git a/pkgs/os-specific/linux/firmware/ath9k/default.nix b/pkgs/os-specific/linux/firmware/ath9k/default.nix new file mode 100644 index 00000000000..63c49c0a088 --- /dev/null +++ b/pkgs/os-specific/linux/firmware/ath9k/default.nix @@ -0,0 +1,147 @@ +{ lib +, stdenv +, fetchurl +, fetchFromGitHub +, m4 +, cmake +, perl +, writeScript +, enableUnstable ? false +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "ath9k-htc-blobless-firmware"; + version = if enableUnstable then "unstable-2022-05-22" else "1.4.0"; + + src = fetchFromGitHub ({ + owner = "qca"; + repo = "open-ath9k-htc-firmware"; + } // (if enableUnstable then { + rev = "d856466a068afe4069335257c0d28295ff777d92"; + hash = "sha256-9OE6qYGABeXjf1r/Depd+811EJ2e8I0Ni5ePHSOh9G4="; + } else { + rev = finalAttrs.version; + hash = "sha256-Q/A0ryIC5E1pt2Sh7o79gxHbe4OgdlrwflOWtxWSS5o="; + })); + + postPatch = '' + patchShebangs target_firmware/firmware-crc.pl + ''; + + nativeBuildInputs = [ m4 cmake perl ]; + + NIX_CFLAGS_COMPILE = "-w"; # old libiberty emits fatal warnings + + dontUseCmakeConfigure = true; + enableParallelBuilding = true; + + # The firmware repository builds its own toolchain, with patches + # applied to the xtensa support in both gcc and binutils. + preBuild = + let + inherit (lib) toUpper splitString last listToAttrs pipe; + inherit (builtins) map; + urls-and-hashes = import ./urls-and-hashes-${finalAttrs.version}.nix; + make-links = pipe + [ "gcc" "binutils" "gmp" "mpfr" "mpc" ] + [ (map (vname: fetchurl rec { + url = urls-and-hashes."${(toUpper vname) + "_URL"}"; + sha256 = urls-and-hashes."${(toUpper vname) + "_SUM"}" or ""; + name = last (splitString "/" url); + })) + (map (v: "ln -sT ${v} toolchain/dl/${v.name}")) + (lib.concatStringsSep "\n") + ]; + in '' + mkdir -p toolchain/dl + ${make-links} + ''; + + makeTargets = [ "toolchain" "firmware" ]; + + installPhase = '' + runHook preInstall + install -Dt $out/lib/firmware/ath9k_htc/ target_firmware/*.fw + runHook postInstall + ''; + + passthru = { + inherit (finalAttrs) src; + updateScript = writeScript "${finalAttrs.pname}-${finalAttrs.version}-updateScript" '' + nix-shell '<nixpkgs>' -A ${finalAttrs.pname}${lib.optionalString enableUnstable "-unstable"}.passthru.update \ + > pkgs/os-specific/linux/firmware/ath9k/urls-and-hashes-${finalAttrs.version}.nix + ''; + update = stdenv.mkDerivation { + name = "${finalAttrs.pname}-${finalAttrs.version}-update"; + shellHook = '' + echo 'rec {' + echo ' BASEDIR="$NIX_BUILD_TOP";' + make --dry-run --print-data-base -f ${finalAttrs.src}/Makefile download \ + | egrep '^[A-Z]+_(VER|URL|SUM|DIR) = ' \ + | sed 's_\([^ ]*\) = \(.*\)_\1 = "\2\";_' \ + | tr \( \{ \ + | tr \) \} + '' + # sha256 checksums were not added to upstream's Makefile until + # after the 1.4.0 release. The following line is needed for + # the `enableUnstable==false` build but not for the + # `enableUnstable==true` build. We can remove the lines below + # as soon as `enableUnstable==false` points to a version + # greater than 1.4.0. + + lib.optionalString (finalAttrs.version == "1.4.0") '' + echo 'GCC_SUM = "sha256-kuYcbcOgpEnmLXKjgYX9pVAWioZwLeoHEl69PsOZYoI=";' + echo 'MPFR_SUM = "sha256-e2bD8T3IOF8IJkyAWFPz4aju2rgHHVgvPmYZccms1f0=";' + echo 'MPC_SUM = "sha256-7VqBXP6lJdx3jfDLN0aLnBtVSq8w2TKLFDHKcFt0AP8=";' + echo 'GMP_SUM = "sha256-H1iKrMxBu5rtlG+f44Uhwm2LKQ0APF34B/ZWkPKq3sk=";' + echo 'BINUTILS_SUM = "sha256-KrLlsD4IbRLGKV+DGtrUaz4UEKOiNJM6Lo+sZssuehk=";' + '' + '' + echo '}' + exit + ''; + }; + }; + + meta = { + description = "Blobless, open source wifi firmware for ath9k_htc.ko"; + longDescription = '' + Firmware for Qualcomm Atheros cards which use the ath9k_htc.ko + Linux driver, supporting 802.11 abgn on both 2.4ghz and 5ghz + bands, 3x3-antenna MIMO, up to 600mbit/sec. + + Most devices which use this driver are based on the Qualcomm + Atheros AR9271 chip, which is a PCIe device. If your device + is connected via USB, it will also include a Qualcomm Atheros + AR7010, which bridges from a USB gadget interface to a PCIe + host interface. This repository includes the firmware for + both chips. + + This firmware is completely open source with no blobs, which + is quite rare in the wifi world. Wifi chips have their own + dedicated general-purpose CPUs. This source code allows you + to see what those CPUs are doing and modify their behavior. + ''; + license = with lib.licenses; [ # see NOTICE.txt for details + bsd3 # almost everything; "the ClearBSD licence" + gpl2ClasspathPlus # **/*cmnos_printf.c, only three files + mit # **/xtos, **/xtensa + ]; + + # release 1.4.0 vendors a GMP which uses an ancient version of + # autotools that does not work on aarch64 or powerpc. + # However, enableUnstable (unreleased upstream) works. + /* + # disabled until #195294 is merged + badPlatforms = + with lib.systems.inspect.patterns; + lib.optionals (!enableUnstable && lib.versionOlder finalAttrs.version "1.4.1") [ + isAarch64 + isPower64 + ]; + */ + + sourceProvenance = [ lib.sourceTypes.fromSource ]; + homepage = "http://lists.infradead.org/mailman/listinfo/ath9k_htc_fw"; + downloadPage = "https://github.com/qca/open-ath9k-htc-firmware"; + changelog = "https://github.com/qca/open-ath9k-htc-firmware/tags"; + }; +}) diff --git a/pkgs/os-specific/linux/firmware/ath9k/urls-and-hashes-1.4.0.nix b/pkgs/os-specific/linux/firmware/ath9k/urls-and-hashes-1.4.0.nix new file mode 100644 index 00000000000..d67669c93b3 --- /dev/null +++ b/pkgs/os-specific/linux/firmware/ath9k/urls-and-hashes-1.4.0.nix @@ -0,0 +1,26 @@ +rec { + BASEDIR="$NIX_BUILD_TOP"; +BINUTILS_URL = "https://ftp.gnu.org/gnu/binutils/binutils-${BINUTILS_VER}.tar.bz2"; +DL_DIR = "${TOOLCHAIN_DIR}/dl"; +GMP_URL = "https://ftp.gnu.org/gnu/gmp/gmp-${GMP_VER}.tar.bz2"; +GCC_URL = "https://ftp.gnu.org/gnu/gcc/gcc-${GCC_VER}/gcc-${GCC_VER}.tar.bz2"; +BINUTILS_DIR = "binutils-${BINUTILS_VER}"; +GCC_VER = "4.7.4"; +MPFR_URL = "https://ftp.gnu.org/gnu/mpfr/mpfr-${MPFR_VER}.tar.bz2"; +MPC_VER = "1.0.1"; +GMP_DIR = "gmp-${GMP_VER}"; +MPC_URL = "https://ftp.gnu.org/gnu/mpc/mpc-${MPC_VER}.tar.gz"; +GCC_DIR = "gcc-${GCC_VER}"; +MPFR_DIR = "mpfr-${MPFR_VER}"; +MPC_DIR = "mpc-${MPC_VER}"; +MPFR_VER = "3.1.1"; +GMP_VER = "5.0.5"; +BINUTILS_VER = "2.23.1"; +BUILD_DIR = "${TOOLCHAIN_DIR}/build"; +TOOLCHAIN_DIR = "${BASEDIR}/toolchain"; +GCC_SUM = "sha256-kuYcbcOgpEnmLXKjgYX9pVAWioZwLeoHEl69PsOZYoI="; +MPFR_SUM = "sha256-e2bD8T3IOF8IJkyAWFPz4aju2rgHHVgvPmYZccms1f0="; +MPC_SUM = "sha256-7VqBXP6lJdx3jfDLN0aLnBtVSq8w2TKLFDHKcFt0AP8="; +GMP_SUM = "sha256-H1iKrMxBu5rtlG+f44Uhwm2LKQ0APF34B/ZWkPKq3sk="; +BINUTILS_SUM = "sha256-KrLlsD4IbRLGKV+DGtrUaz4UEKOiNJM6Lo+sZssuehk="; +} diff --git a/pkgs/os-specific/linux/firmware/ath9k/urls-and-hashes-unstable-2022-05-22.nix b/pkgs/os-specific/linux/firmware/ath9k/urls-and-hashes-unstable-2022-05-22.nix new file mode 100644 index 00000000000..4234f91ef97 --- /dev/null +++ b/pkgs/os-specific/linux/firmware/ath9k/urls-and-hashes-unstable-2022-05-22.nix @@ -0,0 +1,26 @@ +rec { + BASEDIR="$NIX_BUILD_TOP"; +BINUTILS_URL = "https://ftp.gnu.org/gnu/binutils/binutils-${BINUTILS_VER}.tar.bz2"; +DL_DIR = "${TOOLCHAIN_DIR}/dl"; +GMP_SUM = "f51c99cb114deb21a60075ffb494c1a210eb9d7cb729ed042ddb7de9534451ea"; +GMP_URL = "https://ftp.gnu.org/gnu/gmp/gmp-${GMP_VER}.tar.bz2"; +GCC_URL = "https://ftp.gnu.org/gnu/gcc/gcc-${GCC_VER}/gcc-${GCC_VER}.tar.gz"; +BINUTILS_DIR = "binutils-${BINUTILS_VER}"; +GCC_VER = "10.2.0"; +MPFR_URL = "https://ftp.gnu.org/gnu/mpfr/mpfr-${MPFR_VER}.tar.bz2"; +MPC_VER = "1.1.0"; +GMP_DIR = "gmp-${GMP_VER}"; +MPC_URL = "https://ftp.gnu.org/gnu/mpc/mpc-${MPC_VER}.tar.gz"; +GCC_DIR = "gcc-${GCC_VER}"; +MPC_SUM = "6985c538143c1208dcb1ac42cedad6ff52e267b47e5f970183a3e75125b43c2e"; +GCC_SUM = "27e879dccc639cd7b0cc08ed575c1669492579529b53c9ff27b0b96265fa867d"; +BINUTILS_SUM = "7d24660f87093670738e58bcc7b7b06f121c0fcb0ca8fc44368d675a5ef9cff7"; +MPFR_DIR = "mpfr-${MPFR_VER}"; +MPC_DIR = "mpc-${MPC_VER}"; +MPFR_VER = "4.1.0"; +GMP_VER = "6.2.0"; +BINUTILS_VER = "2.35"; +BUILD_DIR = "${TOOLCHAIN_DIR}/build"; +MPFR_SUM = "feced2d430dd5a97805fa289fed3fc8ff2b094c02d05287fd6133e7f1f0ec926"; +TOOLCHAIN_DIR = "${BASEDIR}/toolchain"; +} diff --git a/pkgs/os-specific/linux/musl/default.nix b/pkgs/os-specific/linux/musl/default.nix index bef1fa6e33a..c8ed8283ab3 100644 --- a/pkgs/os-specific/linux/musl/default.nix +++ b/pkgs/os-specific/linux/musl/default.nix @@ -85,7 +85,7 @@ stdenv.mkDerivation rec { "--syslibdir=${placeholder "out"}/lib" ]; - outputs = [ "out" "dev" ]; + outputs = [ "out" "bin" "dev" ]; dontDisableStatic = true; dontAddStaticConfigureFlags = true; @@ -108,15 +108,12 @@ stdenv.mkDerivation rec { # Apparently glibc provides scsi itself? (cd $dev/include && ln -s $(ls -d ${linuxHeaders}/include/* | grep -v "scsi$") .) - mkdir -p $out/bin - - ${lib.optionalString (stdenv.targetPlatform.libc == "musl" && stdenv.targetPlatform.isx86_32) "install -D libssp_nonshared.a $out/lib/libssp_nonshared.a" } # Create 'ldd' symlink, builtin - ln -rs $out/lib/libc.so $out/bin/ldd + ln -s $out/lib/libc.so $bin/bin/ldd # (impure) cc wrapper around musl for interactive usuage for i in musl-gcc musl-clang ld.musl-clang; do @@ -127,7 +124,7 @@ stdenv.mkDerivation rec { --replace $out/lib/musl-gcc.specs $dev/lib/musl-gcc.specs # provide 'iconv' utility, using just-built headers, libc/ldso - $CC ${iconv_c} -o $out/bin/iconv \ + $CC ${iconv_c} -o $bin/bin/iconv \ -I$dev/include \ -L$out/lib -Wl,-rpath=$out/lib \ -lc \ diff --git a/pkgs/os-specific/linux/uclibc-ng/default.nix b/pkgs/os-specific/linux/uclibc-ng/default.nix index f7cd34a458c..b357bc50e58 100644 --- a/pkgs/os-specific/linux/uclibc-ng/default.nix +++ b/pkgs/os-specific/linux/uclibc-ng/default.nix @@ -58,11 +58,11 @@ let in stdenv.mkDerivation rec { pname = "uclibc-ng"; - version = "1.0.41"; + version = "1.0.42"; src = fetchurl { url = "https://downloads.uclibc-ng.org/releases/${version}/uClibc-ng-${version}.tar.xz"; - sha256 = "sha256-syqSoCGNlZItaXZGTm71Hi66z7zbYFggRY2du4ph4CU="; + sha256 = "sha256-7G2uRM6GVYiF5WvDvva9TQgjlxFObh/BV5X3HoBNcBY="; }; # 'ftw' needed to build acl, a coreutils dependency diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 332d3ebe965..00fd11e3be3 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2023.1.1"; + version = "2023.1.2"; components = { "3_day_blinds" = ps: with ps; [ ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index e75049f4cf9..ba1f69e8dd5 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -205,7 +205,7 @@ let extraPackagesFile = writeText "home-assistant-packages" (lib.concatMapStringsSep "\n" (pkg: pkg.pname) extraBuildInputs); # Don't forget to run parse-requirements.py after updating - hassVersion = "2023.1.1"; + hassVersion = "2023.1.2"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -223,7 +223,7 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = "refs/tags/${version}"; - hash = "sha256-qgrUVPh/lSOwRm0FIU6kLuj591XdtNCtA2IMOfhKw/0="; + hash = "sha256-eryqGO2zGm/Up06sG9/flvqA2pVh4Zylvl6Y8g8IvpU="; }; # leave this in, so users don't have to constantly update their downstream patch handling diff --git a/pkgs/servers/http/envoy/default.nix b/pkgs/servers/http/envoy/default.nix index 298e05fedb5..709726bc846 100644 --- a/pkgs/servers/http/envoy/default.nix +++ b/pkgs/servers/http/envoy/default.nix @@ -83,8 +83,8 @@ buildBazelPackage rec { fetchAttrs = { sha256 = { - x86_64-linux = "sha256-zEebnLFGLUy6UR5Uf2f6s23s6tXYccp5SHzTcldDKwQ="; - aarch64-linux = "sha256-UfowJD9uUBimRbIaSq2US6BpEVDDqSLchSDJ1k0Cfwk="; + x86_64-linux = "sha256-drgZSTCDcef9jNZ6E8KtqxqkxhnQ+UiYo5CeUPBPryE="; + aarch64-linux = "sha256-FJwLUT3NVEH6u9756n2+J83FiKGsvIvlllbDvW+wpSI="; }.${stdenv.system} or (throw "unsupported system ${stdenv.system}"); dontUseCmakeConfigure = true; dontUseGnConfigure = true; diff --git a/pkgs/servers/icingaweb2/default.nix b/pkgs/servers/icingaweb2/default.nix index 712a41f966c..875744898f6 100644 --- a/pkgs/servers/icingaweb2/default.nix +++ b/pkgs/servers/icingaweb2/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "icingaweb2"; - version = "2.11.1"; + version = "2.11.3"; src = fetchFromGitHub { owner = "Icinga"; repo = "icingaweb2"; rev = "v${version}"; - hash = "sha256-MRk+ZshdOUg311+FNuEM+jspYM4ZqqQLx5dRBM1KNpI="; + hash = "sha256-DxAWSU6nleTRkgtU6cW5KEJ0aQuzom+kGwTOk1Kg8CI="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/icingaweb2/ipl.nix b/pkgs/servers/icingaweb2/ipl.nix index 8159b97686e..06e545ed960 100644 --- a/pkgs/servers/icingaweb2/ipl.nix +++ b/pkgs/servers/icingaweb2/ipl.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "icingaweb2-ipl"; - version = "0.10.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = "Icinga"; repo = "icinga-php-library"; rev = "v${version}"; - sha256 = "sha256-nwS7mK46KSBNHdjIfzUMR4xFcHJjpNXhLYBdM7TwgNQ="; + hash = "sha256-zeKI8D9anPYYvNTNyl1Ej9NT7eoM4KgX5Oto783kYoI="; }; installPhase = '' diff --git a/pkgs/servers/monitoring/thanos/default.nix b/pkgs/servers/monitoring/thanos/default.nix index beb0aca4dcf..969292d6700 100644 --- a/pkgs/servers/monitoring/thanos/default.nix +++ b/pkgs/servers/monitoring/thanos/default.nix @@ -1,16 +1,16 @@ { lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "thanos"; - version = "0.29.0"; + version = "0.30.1"; src = fetchFromGitHub { rev = "v${version}"; owner = "thanos-io"; repo = "thanos"; - sha256 = "sha256-hGIhjv3q9zovEqPlC/xHg9Df2VxTL7QvC5ve6kodsks="; + sha256 = "sha256-fCH1smkgqDqs6N3ibBob5R1wsltwC3HV1elI37nfq0g="; }; - vendorSha256 = "sha256-5Zj3m8RYFci0nTTeWP5mW5fGTN1hJ5R+ZblKuozACfs="; + vendorHash = "sha256-OEOlyExgJoEUY2qygBbrxKRkh26sXDX/gAKReeA6Du4="; doCheck = false; diff --git a/pkgs/servers/nextcloud/packages/24.json b/pkgs/servers/nextcloud/packages/24.json index 5c4885a58fc..0b775a81e88 100644 --- a/pkgs/servers/nextcloud/packages/24.json +++ b/pkgs/servers/nextcloud/packages/24.json @@ -10,9 +10,9 @@ ] }, "calendar": { - "sha256": "d6edc166d63204e39135c0e9f00c0f7a6875db89d34a936e16b513c749ac8b8d", - "url": "https://github.com/nextcloud-releases/calendar/releases/download/v3.5.2/calendar-v3.5.2.tar.gz", - "version": "3.5.2", + "sha256": "0zlpm7vgsh96wn7pnya04ylfhakvywwdq4605i6vssbw96ibg18d", + "url": "https://github.com/nextcloud-releases/calendar/releases/download/v3.5.4/calendar-v3.5.4.tar.gz", + "version": "3.5.4", "description": "The Calendar app is a user interface for Nextcloud's CalDAV server. Easily sync events from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Contacts - more to come.\n* 🌐 **WebCal Support!** Want to see your favorite team’s matchdays in your calendar? No problem!\n* 🙋 **Attendees!** Invite people to your events\n* ⌚️ **Free/Busy!** See when your attendees are available to meet\n* ⏰ **Reminders!** Get alarms for events inside your browser and via email\n* 🔍 Search! Find your events at ease\n* ☑️ Tasks! See tasks with a due date directly in the calendar\n* 🙈 **We’re not reinventing the wheel!** Based on the great [c-dav library](https://github.com/nextcloud/cdav-library), [ical.js](https://github.com/mozilla-comm/ical.js) and [fullcalendar](https://github.com/fullcalendar/fullcalendar) libraries.", "homepage": "https://github.com/nextcloud/calendar/", "licenses": [ @@ -20,9 +20,9 @@ ] }, "contacts": { - "sha256": "1938b266c5070573e0435ec31c08a19add96fd99c08c3c1f8309ee8e447093a0", - "url": "https://github.com/nextcloud-releases/contacts/releases/download/v4.2.2/contacts-v4.2.2.tar.gz", - "version": "4.2.2", + "sha256": "0qv3c7wmf9j74562xbjvhk6kbpna6ansiw3724dh4w8j5sldqysd", + "url": "https://github.com/nextcloud-releases/contacts/releases/download/v4.2.3/contacts-v4.2.3.tar.gz", + "version": "4.2.3", "description": "The Nextcloud contacts app is a user interface for Nextcloud's CardDAV server. Easily sync contacts from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Mail and Calendar – more to come.\n* 🎉 **Never forget a birthday!** You can sync birthdays and other recurring events with your Nextcloud Calendar.\n* 👥 **Sharing of Adressbooks!** You want to share your contacts with your friends or coworkers? No problem!\n* 🙈 **We’re not reinventing the wheel!** Based on the great and open SabreDAV library.", "homepage": "https://github.com/nextcloud/contacts#readme", "licenses": [ @@ -30,15 +30,65 @@ ] }, "deck": { - "sha256": "82d8816595a89e3d11be3e076d6d26ad75f0c9e31d91b89df5fb34acdc111aab", - "url": "https://github.com/nextcloud-releases/deck/releases/download/v1.7.2/deck-v1.7.2.tar.gz", - "version": "1.7.2", - "description": "Deck is a kanban style organization tool aimed at personal planning and project organization for teams integrated with Nextcloud.\n\n\n- 📥 Add your tasks to cards and put them in order\n- 📄 Write down additional notes in markdown\n- 🔖 Assign labels for even better organization\n- 👥 Share with your team, friends or family\n- 📎 Attach files and embed them in your markdown description\n- 💬 Discuss with your team using comments\n- ⚡ Keep track of changes in the activity stream\n- 🚀 Get your project organized", + "sha256": "1q21vpq9fv6p9harn96fq7cn68qixw3d08s9yf25mnxzpynrwv50", + "url": "https://github.com/nextcloud-releases/deck/releases/download/v1.7.3/deck-v1.7.3.tar.gz", + "version": "1.7.3", + "description": "Deck is a kanban style organization tool aimed at personal planning and project organization for teams integrated with Nextcloud.\n\n\n- 📥 Add your tasks to cards and put them in order\n- 📄 Write down additional notes in Markdown\n- 🔖 Assign labels for even better organization\n- 👥 Share with your team, friends or family\n- 📎 Attach files and embed them in your Markdown description\n- 💬 Discuss with your team using comments\n- ⚡ Keep track of changes in the activity stream\n- 🚀 Get your project organized", "homepage": "https://github.com/nextcloud/deck", "licenses": [ "agpl" ] }, + "files_markdown": { + "sha256": "1dhl83vxk6aznakmvbcx52gl8slhy6jz1vqwiv8nwfjh75aczzxy", + "url": "https://github.com/icewind1991/files_markdown/releases/download/v2.3.6/files_markdown.tar.gz", + "version": "2.3.6", + "description": "Markdown Editor extends the Nextcloud text editor with a live preview for markdown files.\n\nA full list of features can be found [in the README](https://github.com/icewind1991/files_markdown)", + "homepage": "https://github.com/icewind1991/files_markdown", + "licenses": [ + "agpl" + ] + }, + "files_texteditor": { + "sha256": "0rmk14iw34pd81snp3lm01k07wm5j2nh9spcd4j0m43l20b7kxss", + "url": "https://github.com/nextcloud-releases/files_texteditor/releases/download/v2.15.0/files_texteditor.tar.gz", + "version": "2.15.0", + "description": "This application enables Nextcloud users to open, save and edit text files in the web browser. If enabled, an entry called \"Text file\" in the \"New\" button menu at the top of the web browser appears. When clicked, a new text file opens in the browser and the file can be saved into the current Nextcloud directory. Further, when a text file is clicked in the web browser, it will be opened and editable. If the privileges allow, a user can also edit shared files and save these changes back into the web browser.\nMore information is available in the text editor documentation.", + "homepage": "https://github.com/nextcloud/files_texteditor", + "licenses": [ + "agpl" + ] + }, + "forms": { + "sha256": "1cwf3445qivig293m6yqr92r25hwjyif5sgw0b6nvccqqpyk6vdd", + "url": "https://github.com/nextcloud/forms/releases/download/v2.5.1/forms.tar.gz", + "version": "2.5.1", + "description": "**Simple surveys and questionnaires, self-hosted!**\n\n- **📝 Simple design:** No mass of options, only the essentials. Works well on mobile of course.\n- **📊 View & export results:** Results are visualized and can also be exported as CSV in the same format used by Google Forms.\n- **🔒 Data under your control!** Unlike in Google Forms, Typeform, Doodle and others, the survey info and responses are kept private on your instance.\n- **🙋 Get involved!** We have lots of stuff planned like more question types, collaboration on forms, [and much more](https://github.com/nextcloud/forms/milestones)!", + "homepage": "https://github.com/nextcloud/forms", + "licenses": [ + "agpl" + ] + }, + "groupfolders": { + "sha256": "0i7jp351lpxx7jv5rj47gkfrs2915nj6fwni919nniqqnz4yml7p", + "url": "https://github.com/nextcloud/groupfolders/releases/download/v12.0.2/groupfolders.tar.gz", + "version": "12.0.2", + "description": "Admin configured folders shared with everyone in a group.\n\nFolders can be configured from *Group folders* in the admin settings.\n\nAfter a folder is created, the admin can give access to the folder to one or more groups, control their write/sharing permissions and assign a quota for the folder.\n\nNote: Encrypting the contents of group folders is currently not supported.", + "homepage": "https://github.com/nextcloud/groupfolders", + "licenses": [ + "agpl" + ] + }, + "impersonate": { + "sha256": "1k1qm3jilys548g813y179x6rs8aglkvss8b0cmfvjlpmlaxpssx", + "url": "https://github.com/nextcloud-releases/impersonate/releases/download/v1.11.0/impersonate-v1.11.0.tar.gz", + "version": "1.11.0", + "description": "By installing the impersonate app of your Nextcloud you enable administrators to impersonate other users on the Nextcloud server. This is especially useful for debugging issues reported by users.\n\nTo impersonate a user an administrator has to simply follow the following four steps:\n\n1. Login as administrator to Nextcloud\n2. Open the user administration interface\n3. Select the impersonate button on the affected user\n4. Confirm the impersonation\n\nThe administrator is then logged-in as the user, to switch back to the regular user account they simply have to press the logout button.\n\n**Note:**\n\n- This app is not compatible with instances that have encryption enabled.\n- While impersonate actions are logged note that actions performed impersonated will be logged as the impersonated user.\n- Impersonating a user is only possible after their first login.", + "homepage": "https://github.com/nextcloud/impersonate", + "licenses": [ + "agpl" + ] + }, "keeweb": { "sha256": "a3281fcfdb4058971a3b5c838870a8d5b533445c999b8e921fb8758b216dadbc", "url": "https://github.com/jhass/nextcloud-keeweb/releases/download/v0.6.10/keeweb-0.6.10.tar.gz", @@ -50,9 +100,9 @@ ] }, "mail": { - "sha256": "0e2c5465436b894ac916222391d94d364592c18b4258fd3aa4b760afa8fa6ad7", - "url": "https://github.com/nextcloud-releases/mail/releases/download/v1.14.3.alpha.1/mail-v1.14.3.alpha.1.tar.gz", - "version": "1.14.3-alpha.1", + "sha256": "10wbi0q23a5qqc7a0ppqi71qrimczay2s5pzl7r94z5c715ag0yv", + "url": "https://github.com/nextcloud-releases/mail/releases/download/v1.15.1/mail-v1.15.1.tar.gz", + "version": "1.15.1", "description": "**💌 A mail app for Nextcloud**\n\n- **🚀 Integration with other Nextcloud apps!** Currently Contacts, Calendar & Files – more to come.\n- **📥 Multiple mail accounts!** Personal and company account? No problem, and a nice unified inbox. Connect any IMAP account.\n- **🔒 Send & receive encrypted mails!** Using the great [Mailvelope](https://mailvelope.com) browser extension.\n- **🙈 We’re not reinventing the wheel!** Based on the great [Horde](https://horde.org) libraries.\n- **📬 Want to host your own mail server?** We do not have to reimplement this as you could set up [Mail-in-a-Box](https://mailinabox.email)!", "homepage": "https://github.com/nextcloud/mail#readme", "licenses": [ @@ -60,9 +110,9 @@ ] }, "news": { - "sha256": "9551781fdbfb6d2c3cd77ee57eae0fb1583c7b54e9720bc955053f51541f4a86", - "url": "https://github.com/nextcloud/news/releases/download/19.0.0/news.tar.gz", - "version": "19.0.0", + "sha256": "0pnriarr2iqci2v2hn6vpvszf4m4pkcxsd2i13bp7n1zqkg6swd7", + "url": "https://github.com/nextcloud/news/releases/download/20.0.0/news.tar.gz", + "version": "20.0.0", "description": "📰 A RSS/Atom Feed reader App for Nextcloud\n\n- 📲 Synchronize your feeds with multiple mobile or desktop [clients](https://nextcloud.github.io/news/clients/)\n- 🔄 Automatic updates of your news feeds\n- 🆓 Free and open source under AGPLv3, no ads or premium functions\n\n**System Cron is currently required for this app to work**\n\nRequirements can be found [here](https://nextcloud.github.io/news/install/#dependencies)\n\nThe Changelog is available [here](https://github.com/nextcloud/news/blob/master/CHANGELOG.md)\n\nCreate a [bug report](https://github.com/nextcloud/news/issues/new/choose)\n\nCreate a [feature request](https://github.com/nextcloud/news/discussions/new)\n\nReport a [feed issue](https://github.com/nextcloud/news/discussions/new)", "homepage": "https://github.com/nextcloud/news", "licenses": [ @@ -99,6 +149,26 @@ "agpl" ] }, + "registration": { + "sha256": "0m45limwsk8a86fqjxj2w1753hd2vc5icpv0wcbwrlr0mxxdc46f", + "url": "https://github.com/nextcloud-releases/registration/releases/download/v1.5.0/registration-v1.5.0.tar.gz", + "version": "1.5.0", + "description": "User registration\n\nThis app allows users to register a new account.\n\n# Features\n\n- Add users to a given group\n- Allow-list with email domains (including wildcard) to register with\n- Administrator will be notified via email for new user creation or require approval\n- Supports Nextcloud's Client Login Flow v1 and v2 - allowing registration in the mobile Apps and Desktop clients\n\n# Web form registration flow\n\n1. User enters their email address\n2. Verification link is sent to the email address\n3. User clicks on the verification link\n4. User is lead to a form where they can choose their username and password\n5. New account is created and is logged in automatically", + "homepage": "https://github.com/nextcloud/registration", + "licenses": [ + "agpl" + ] + }, + "spreed": { + "sha256": "0frilxny4mvp34fxw0k8al3r5apy3q6vq7z35jkph3vaq1889m9k", + "url": "https://github.com/nextcloud-releases/spreed/releases/download/v14.0.7/spreed-v14.0.7.tar.gz", + "version": "14.0.7", + "description": "Chat, video & audio-conferencing using WebRTC\n\n* 💬 **Chat integration!** Nextcloud Talk comes with a simple text chat. Allowing you to share files from your Nextcloud and mentioning other participants.\n* 👥 **Private, group, public and password protected calls!** Just invite somebody, a whole group or send a public link to invite to a call.\n* 💻 **Screen sharing!** Share your screen with participants of your call. You just need to use Firefox version 66 (or newer), latest Edge or Chrome 72 (or newer, also possible using Chrome 49 with this [Chrome extension](https://chrome.google.com/webstore/detail/screensharing-for-nextclo/kepnpjhambipllfmgmbapncekcmabkol)).\n* 🚀 **Integration with other Nextcloud apps** like Files, Contacts and Deck. More to come.\n\nAnd in the works for the [coming versions](https://github.com/nextcloud/spreed/milestones/):\n* ✋ [Federated calls](https://github.com/nextcloud/spreed/issues/21), to call people on other Nextclouds", + "homepage": "https://github.com/nextcloud/spreed", + "licenses": [ + "agpl" + ] + }, "tasks": { "sha256": "fdfa3168ac80eaef3e2de5009eee02a369acc8d35dfd8283d1f25423bdf3c532", "url": "https://github.com/nextcloud/tasks/releases/download/v0.14.5/tasks.tar.gz", @@ -109,6 +179,26 @@ "agpl" ] }, + "twofactor_nextcloud_notification": { + "sha256": "1zdx7khsa22k6g9zhcxrgr1mykl16064z0scr5jbgq5ms3hh2q9w", + "url": "https://github.com/nextcloud-releases/twofactor_nextcloud_notification/releases/download/v3.4.0/twofactor_nextcloud_notification-v3.4.0.tar.gz", + "version": "3.4.0", + "description": "Allows using any of your logged in devices as second factor", + "homepage": "https://github.com/nextcloud/twofactor_nextcloud_notification", + "licenses": [ + "agpl" + ] + }, + "twofactor_totp": { + "sha256": "189cwq78dqanqxhsl69dahdkh230zhz2r285lvf0b7pg0sxcs0yc", + "url": "https://github.com/nextcloud-releases/twofactor_totp/releases/download/v6.4.1/twofactor_totp-v6.4.1.tar.gz", + "version": "6.4.1", + "description": "A Two-Factor-Auth Provider for TOTP (RFC 6238)", + "homepage": "https://github.com/nextcloud/twofactor_totp#readme", + "licenses": [ + "agpl" + ] + }, "twofactor_webauthn": { "sha256": "291c20032cfc1f2fb081cc8721e272bc503d103987c6abb7ce442e497d278d0a", "url": "https://github.com/nextcloud-releases/twofactor_webauthn/releases/download/v0.3.3/twofactor_webauthn-v0.3.3.tar.gz", @@ -118,5 +208,15 @@ "licenses": [ "agpl" ] + }, + "unsplash": { + "sha256": "1xlqpzry2qq0msrq8alg0mywlhjh09m3z5glh4rgwmh3p5b0777c", + "url": "https://github.com/nextcloud/unsplash/releases/download/v2.0.1/unsplash.tar.gz", + "version": "2.0.1", + "description": "Show a new random featured nature photo in your nextcloud. Now with choosable motives!", + "homepage": "https://github.com/nextcloud/unsplash/", + "licenses": [ + "agpl" + ] } } diff --git a/pkgs/servers/nextcloud/packages/25.json b/pkgs/servers/nextcloud/packages/25.json index 697ef31b548..98ab7ebe3e2 100644 --- a/pkgs/servers/nextcloud/packages/25.json +++ b/pkgs/servers/nextcloud/packages/25.json @@ -1,8 +1,8 @@ { "bookmarks": { - "sha256": "1jkbwzig4xd042jcbdbdh4whkpxb87f7ba0c89c78bdgcqzjv1a3", - "url": "https://github.com/nextcloud/bookmarks/releases/download/v11.0.4/bookmarks-11.0.4.tar.gz", - "version": "11.0.4", + "sha256": "0dkfjafbynkrymsq183sad7zynqr2qls0cld73nvzn3smnvdl2xx", + "url": "https://github.com/nextcloud/bookmarks/releases/download/v12.0.0/bookmarks-12.0.0.tar.gz", + "version": "12.0.0", "description": "- 📂 Sort bookmarks into folders\n- 🏷 Add tags and personal notes\n- 🔍 Full-text search\n- 📲 Synchronize with all your browsers and devices\n- 👪 Share bookmarks with other users and publicly\n- ☠ Find broken links\n- ⚛ Generate RSS feeds of your collections\n- 📔 Read archived versions of your links in case they are depublished\n- 💬 Create new bookmarks directly from within Nextcloud Talk\n- 💼 Built-in Dashboard widgets for frequent and recent links\n\nRequirements:\n - PHP v7.4+\n - PHP extensions:\n - intl: *\n - mbstring: *\n - when using MySQL, use at least v8.0", "homepage": "https://github.com/nextcloud/bookmarks", "licenses": [ @@ -10,9 +10,9 @@ ] }, "calendar": { - "sha256": "00rw09g2az0vly1lf1p67yl72cniigydwvvv698g38b34f2ca0i8", - "url": "https://github.com/nextcloud-releases/calendar/releases/download/v4.1.0/calendar-v4.1.0.tar.gz", - "version": "4.1.0", + "sha256": "04g1xm3q46j7harxr0n56r7kkkqjxvah7xijddyq5fj7icr6qf5d", + "url": "https://github.com/nextcloud-releases/calendar/releases/download/v4.2.1/calendar-v4.2.1.tar.gz", + "version": "4.2.1", "description": "The Calendar app is a user interface for Nextcloud's CalDAV server. Easily sync events from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Contacts - more to come.\n* 🌐 **WebCal Support!** Want to see your favorite team’s matchdays in your calendar? No problem!\n* 🙋 **Attendees!** Invite people to your events\n* ⌚️ **Free/Busy!** See when your attendees are available to meet\n* ⏰ **Reminders!** Get alarms for events inside your browser and via email\n* 🔍 Search! Find your events at ease\n* ☑️ Tasks! See tasks with a due date directly in the calendar\n* 🙈 **We’re not reinventing the wheel!** Based on the great [c-dav library](https://github.com/nextcloud/cdav-library), [ical.js](https://github.com/mozilla-comm/ical.js) and [fullcalendar](https://github.com/fullcalendar/fullcalendar) libraries.", "homepage": "https://github.com/nextcloud/calendar/", "licenses": [ @@ -20,9 +20,9 @@ ] }, "contacts": { - "sha256": "1mg714j8fjrgp80xzdygh313kvsag47ihckzrz95vzqkiq32la3b", - "url": "https://github.com/nextcloud-releases/contacts/releases/download/v5.0.1/contacts-v5.0.1.tar.gz", - "version": "5.0.1", + "sha256": "097a71if6kkc7nphfc8b6llqlsskjwp1vg83134hzgfscvllvaj8", + "url": "https://github.com/nextcloud-releases/contacts/releases/download/v5.0.2/contacts-v5.0.2.tar.gz", + "version": "5.0.2", "description": "The Nextcloud contacts app is a user interface for Nextcloud's CardDAV server. Easily sync contacts from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Mail and Calendar – more to come.\n* 🎉 **Never forget a birthday!** You can sync birthdays and other recurring events with your Nextcloud Calendar.\n* 👥 **Sharing of Adressbooks!** You want to share your contacts with your friends or coworkers? No problem!\n* 🙈 **We’re not reinventing the wheel!** Based on the great and open SabreDAV library.", "homepage": "https://github.com/nextcloud/contacts#readme", "licenses": [ @@ -30,15 +30,45 @@ ] }, "deck": { - "sha256": "0lgbi8ha31zrc2sjqd3yrb9ms1jlmkcvrkvgapw4n932m4mvsrvs", - "url": "https://github.com/nextcloud-releases/deck/releases/download/v1.8.1/deck-v1.8.1.tar.gz", - "version": "1.8.1", - "description": "Deck is a kanban style organization tool aimed at personal planning and project organization for teams integrated with Nextcloud.\n\n\n- 📥 Add your tasks to cards and put them in order\n- 📄 Write down additional notes in markdown\n- 🔖 Assign labels for even better organization\n- 👥 Share with your team, friends or family\n- 📎 Attach files and embed them in your markdown description\n- 💬 Discuss with your team using comments\n- ⚡ Keep track of changes in the activity stream\n- 🚀 Get your project organized", + "sha256": "0r0kymlfbgbss7888rbi8z67ww5yxc8xvwhk7niaqhi8aggzxgn0", + "url": "https://github.com/nextcloud-releases/deck/releases/download/v1.8.3/deck-v1.8.3.tar.gz", + "version": "1.8.3", + "description": "Deck is a kanban style organization tool aimed at personal planning and project organization for teams integrated with Nextcloud.\n\n\n- 📥 Add your tasks to cards and put them in order\n- 📄 Write down additional notes in Markdown\n- 🔖 Assign labels for even better organization\n- 👥 Share with your team, friends or family\n- 📎 Attach files and embed them in your Markdown description\n- 💬 Discuss with your team using comments\n- ⚡ Keep track of changes in the activity stream\n- 🚀 Get your project organized", "homepage": "https://github.com/nextcloud/deck", "licenses": [ "agpl" ] }, + "files_texteditor": { + "sha256": "0rmk14iw34pd81snp3lm01k07wm5j2nh9spcd4j0m43l20b7kxss", + "url": "https://github.com/nextcloud-releases/files_texteditor/releases/download/v2.15.0/files_texteditor.tar.gz", + "version": "2.15.0", + "description": "This application enables Nextcloud users to open, save and edit text files in the web browser. If enabled, an entry called \"Text file\" in the \"New\" button menu at the top of the web browser appears. When clicked, a new text file opens in the browser and the file can be saved into the current Nextcloud directory. Further, when a text file is clicked in the web browser, it will be opened and editable. If the privileges allow, a user can also edit shared files and save these changes back into the web browser.\nMore information is available in the text editor documentation.", + "homepage": "https://github.com/nextcloud/files_texteditor", + "licenses": [ + "agpl" + ] + }, + "forms": { + "sha256": "1400gfgmqyrhakb5p8csb794cap9f9gn385mrsgw2i241lfv8iqw", + "url": "https://github.com/nextcloud/forms/releases/download/v3.0.3/forms.tar.gz", + "version": "3.0.3", + "description": "**Simple surveys and questionnaires, self-hosted!**\n\n- **📝 Simple design:** No mass of options, only the essentials. Works well on mobile of course.\n- **📊 View & export results:** Results are visualized and can also be exported as CSV in the same format used by Google Forms.\n- **🔒 Data under your control!** Unlike in Google Forms, Typeform, Doodle and others, the survey info and responses are kept private on your instance.\n- **🙋 Get involved!** We have lots of stuff planned like more question types, collaboration on forms, [and much more](https://github.com/nextcloud/forms/milestones)!", + "homepage": "https://github.com/nextcloud/forms", + "licenses": [ + "agpl" + ] + }, + "groupfolders": { + "sha256": "0g9czmhh5pvs120827b1cbzk58kq30s4269c4y79lx1k07jssq88", + "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v13.1.0/groupfolders-v13.1.0.tar.gz", + "version": "13.1.0", + "description": "Admin configured folders shared with everyone in a group.\n\nFolders can be configured from *Group folders* in the admin settings.\n\nAfter a folder is created, the admin can give access to the folder to one or more groups, control their write/sharing permissions and assign a quota for the folder.\n\nNote: Encrypting the contents of group folders is currently not supported.", + "homepage": "https://github.com/nextcloud/groupfolders", + "licenses": [ + "agpl" + ] + }, "keeweb": { "sha256": "1g6bjbzk7rf9x7cblwsc7cmd3fx5zrkib5ra5xzsmqc9aqpy22zh", "url": "https://github.com/jhass/nextcloud-keeweb/releases/download/v0.6.10/keeweb-0.6.10.tar.gz", @@ -50,9 +80,9 @@ ] }, "mail": { - "sha256": "1c2ddi49p4wni51sp6n9wb7jh42glgjbhsiabqbk2c0krpwwrcbh", - "url": "https://github.com/nextcloud-releases/mail/releases/download/v2.1.0/mail-v2.1.0.tar.gz", - "version": "2.1.0", + "sha256": "09ymxs6g9p2398k4aff5f1iq5a0r5mid83yg9y9k1k0msqac94zg", + "url": "https://github.com/nextcloud-releases/mail/releases/download/v2.2.2/mail-v2.2.2.tar.gz", + "version": "2.2.2", "description": "**💌 A mail app for Nextcloud**\n\n- **🚀 Integration with other Nextcloud apps!** Currently Contacts, Calendar & Files – more to come.\n- **📥 Multiple mail accounts!** Personal and company account? No problem, and a nice unified inbox. Connect any IMAP account.\n- **🔒 Send & receive encrypted mails!** Using the great [Mailvelope](https://mailvelope.com) browser extension.\n- **🙈 We’re not reinventing the wheel!** Based on the great [Horde](https://horde.org) libraries.\n- **📬 Want to host your own mail server?** We do not have to reimplement this as you could set up [Mail-in-a-Box](https://mailinabox.email)!", "homepage": "https://github.com/nextcloud/mail#readme", "licenses": [ @@ -60,9 +90,9 @@ ] }, "news": { - "sha256": "1afpszalvrqkaij6yp45y6a2skbhvqlp50fsb9f0ha6l3wli07qp", - "url": "https://github.com/nextcloud/news/releases/download/19.0.0/news.tar.gz", - "version": "19.0.0", + "sha256": "0pnriarr2iqci2v2hn6vpvszf4m4pkcxsd2i13bp7n1zqkg6swd7", + "url": "https://github.com/nextcloud/news/releases/download/20.0.0/news.tar.gz", + "version": "20.0.0", "description": "📰 A RSS/Atom Feed reader App for Nextcloud\n\n- 📲 Synchronize your feeds with multiple mobile or desktop [clients](https://nextcloud.github.io/news/clients/)\n- 🔄 Automatic updates of your news feeds\n- 🆓 Free and open source under AGPLv3, no ads or premium functions\n\n**System Cron is currently required for this app to work**\n\nRequirements can be found [here](https://nextcloud.github.io/news/install/#dependencies)\n\nThe Changelog is available [here](https://github.com/nextcloud/news/blob/master/CHANGELOG.md)\n\nCreate a [bug report](https://github.com/nextcloud/news/issues/new/choose)\n\nCreate a [feature request](https://github.com/nextcloud/news/discussions/new)\n\nReport a [feed issue](https://github.com/nextcloud/news/discussions/new)", "homepage": "https://github.com/nextcloud/news", "licenses": [ @@ -90,15 +120,35 @@ ] }, "polls": { - "sha256": "07jcw9hzn4b1h35d1yk2dvvsva8xw9cbl12g0n2frjmpzkiayc1r", - "url": "https://github.com/nextcloud/polls/releases/download/v4.0.0/polls.tar.gz", - "version": "4.0.0", + "sha256": "1amywiw91acp4g90wazmqmnw51s7z6rf27bdrzxrcqryd8igsniq", + "url": "https://github.com/nextcloud/polls/releases/download/v4.1.0-beta4/polls.tar.gz", + "version": "4.1.0-beta4", "description": "A polls app, similar to Doodle/Dudle with the possibility to restrict access (members, certain groups/users, hidden and public).", "homepage": "https://github.com/nextcloud/polls", "licenses": [ "agpl" ] }, + "registration": { + "sha256": "0gx5hr2k42bj5mxfnkx0ny8p6nbdy84hzq2cg106w0lj4d7kgkl5", + "url": "https://github.com/nextcloud-releases/registration/releases/download/v2.0.0/registration-v2.0.0.tar.gz", + "version": "2.0.0", + "description": "User registration\n\nThis app allows users to register a new account.\n\n# Features\n\n- Add users to a given group\n- Allow-list with email domains (including wildcard) to register with\n- Administrator will be notified via email for new user creation or require approval\n- Supports Nextcloud's Client Login Flow v1 and v2 - allowing registration in the mobile Apps and Desktop clients\n\n# Web form registration flow\n\n1. User enters their email address\n2. Verification link is sent to the email address\n3. User clicks on the verification link\n4. User is lead to a form where they can choose their username and password\n5. New account is created and is logged in automatically", + "homepage": "https://github.com/nextcloud/registration", + "licenses": [ + "agpl" + ] + }, + "spreed": { + "sha256": "1w5v866lkd0skv666vhz75zwalr2w83shrhdvv354kill9k53awh", + "url": "https://github.com/nextcloud-releases/spreed/releases/download/v15.0.2/spreed-v15.0.2.tar.gz", + "version": "15.0.2", + "description": "Chat, video & audio-conferencing using WebRTC\n\n* 💬 **Chat integration!** Nextcloud Talk comes with a simple text chat. Allowing you to share files from your Nextcloud and mentioning other participants.\n* 👥 **Private, group, public and password protected calls!** Just invite somebody, a whole group or send a public link to invite to a call.\n* 💻 **Screen sharing!** Share your screen with participants of your call. You just need to use Firefox version 66 (or newer), latest Edge or Chrome 72 (or newer, also possible using Chrome 49 with this [Chrome extension](https://chrome.google.com/webstore/detail/screensharing-for-nextclo/kepnpjhambipllfmgmbapncekcmabkol)).\n* 🚀 **Integration with other Nextcloud apps** like Files, Contacts and Deck. More to come.\n\nAnd in the works for the [coming versions](https://github.com/nextcloud/spreed/milestones/):\n* ✋ [Federated calls](https://github.com/nextcloud/spreed/issues/21), to call people on other Nextclouds", + "homepage": "https://github.com/nextcloud/spreed", + "licenses": [ + "agpl" + ] + }, "tasks": { "sha256": "0jm13d6nm7cfsw27yfiq1il9xjlh0qrq8xby2yz9dmggn7lk1dx5", "url": "https://github.com/nextcloud/tasks/releases/download/v0.14.5/tasks.tar.gz", @@ -109,6 +159,26 @@ "agpl" ] }, + "twofactor_nextcloud_notification": { + "sha256": "0941h1l8clrb4brmrn214r33m49iqzanahm1d2gx171f5hbr7bp0", + "url": "https://github.com/nextcloud-releases/twofactor_nextcloud_notification/releases/download/v3.5.0/twofactor_nextcloud_notification-v3.5.0.tar.gz", + "version": "3.5.0", + "description": "Allows using any of your logged in devices as second factor", + "homepage": "https://github.com/nextcloud/twofactor_nextcloud_notification", + "licenses": [ + "agpl" + ] + }, + "twofactor_totp": { + "sha256": "189cwq78dqanqxhsl69dahdkh230zhz2r285lvf0b7pg0sxcs0yc", + "url": "https://github.com/nextcloud-releases/twofactor_totp/releases/download/v6.4.1/twofactor_totp-v6.4.1.tar.gz", + "version": "6.4.1", + "description": "A Two-Factor-Auth Provider for TOTP (RFC 6238)", + "homepage": "https://github.com/nextcloud/twofactor_totp#readme", + "licenses": [ + "agpl" + ] + }, "twofactor_webauthn": { "sha256": "06ip0ks2ngpxirfybkc6j7nlnwsx2kf7f0rl855j648zf1y369hp", "url": "https://github.com/nextcloud-releases/twofactor_webauthn/releases/download/v1.0.0/twofactor_webauthn-v1.0.0.tar.gz", @@ -118,5 +188,15 @@ "licenses": [ "agpl" ] + }, + "unsplash": { + "sha256": "17qqn6kwpvkq21c92jyy3pfvjaj5xms1hr07fnn39zxg0nmwjdd8", + "url": "https://github.com/nextcloud/unsplash/releases/download/v2.1.1/unsplash.tar.gz", + "version": "2.1.1", + "description": "Show a new random featured nature photo in your nextcloud. Now with choosable motives!", + "homepage": "https://github.com/nextcloud/unsplash/", + "licenses": [ + "agpl" + ] } } diff --git a/pkgs/servers/nextcloud/packages/nextcloud-apps.json b/pkgs/servers/nextcloud/packages/nextcloud-apps.json index 7494c784307..a8375789023 100644 --- a/pkgs/servers/nextcloud/packages/nextcloud-apps.json +++ b/pkgs/servers/nextcloud/packages/nextcloud-apps.json @@ -3,12 +3,22 @@ , "calendar" , "contacts" , "deck" +, "files_texteditor" +, "files_markdown" +, "forms" +, "groupfolders" +, "impersonate" , "keeweb" , "mail" , "news" , "notes" , "onlyoffice" , "polls" +, "registration" +, "spreed" , "tasks" +, "twofactor_nextcloud_notification" +, "twofactor_totp" , "twofactor_webauthn" +, "unsplash" ] diff --git a/pkgs/servers/rtsp-simple-server/default.nix b/pkgs/servers/rtsp-simple-server/default.nix index fc6f97d4988..09412c8858f 100644 --- a/pkgs/servers/rtsp-simple-server/default.nix +++ b/pkgs/servers/rtsp-simple-server/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "rtsp-simple-server"; - version = "0.21.0"; + version = "0.21.1"; src = fetchFromGitHub { owner = "aler9"; repo = pname; rev = "v${version}"; - hash = "sha256-iLNdl6V+px/ri9uJzOrxktxJYqAJA5JWBd18ZHSLQjQ="; + hash = "sha256-hYO/MMZBb9YczvIq4mn1XE9rhnaTg9t35by/GHtvdJQ="; }; - vendorSha256 = "sha256-48i0hsAho4dI79a/i24GlKAaC/yNGKt0uA+qCy5QTok="; + vendorHash = "sha256-Q1zeKGu20kOpjqdLCB7stuWBqi/2EyWK7vMRAYUCJKg="; # Tests need docker doCheck = false; diff --git a/pkgs/servers/spicedb/default.nix b/pkgs/servers/spicedb/default.nix index a7da457ea38..0f5a700f71b 100644 --- a/pkgs/servers/spicedb/default.nix +++ b/pkgs/servers/spicedb/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "spicedb"; - version = "1.11.0"; + version = "1.15.0"; src = fetchFromGitHub { owner = "authzed"; repo = "spicedb"; rev = "v${version}"; - hash = "sha256-X52sf21IMr5muEx9SUoYQmFonXDPeW8NKylPmoAZYjw"; + hash = "sha256-ecwLiIqmRgJqzr3BvXnlD+wYcA0IfurK6q57t2G8/I4="; }; - vendorHash = "sha256-lO4H2DlMfYuV2BYPnMV3Ynx0khFE6KDxf/aXA53pBpU"; + vendorHash = "sha256-5UiW7a/3PQrVsHhLWs9Odo16IeGil6YMdiUU12h6ohk="; subPackages = [ "cmd/spicedb" ]; diff --git a/pkgs/servers/sql/proxysql/default.nix b/pkgs/servers/sql/proxysql/default.nix index b40d0c1af3c..a2d48d388c2 100644 --- a/pkgs/servers/sql/proxysql/default.nix +++ b/pkgs/servers/sql/proxysql/default.nix @@ -1,5 +1,6 @@ { stdenv , lib +, applyPatches , fetchFromGitHub , autoconf , automake @@ -23,9 +24,10 @@ , openssl , pcre , perl -, python2 +, python3 , re2 , zlib +, texinfo }: stdenv.mkDerivation rec { @@ -50,7 +52,8 @@ stdenv.mkDerivation rec { cmake libtool perl - python2 + python3 + texinfo # for makeinfo ]; buildInputs = [ @@ -65,6 +68,10 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + # otherwise, it looks for …-1.15 + ACLOCAL = "aclocal"; + AUTOMAKE = "automake"; + GIT_VERSION = version; dontConfigure = true; @@ -94,18 +101,27 @@ stdenv.mkDerivation rec { } ${lib.concatMapStringsSep "\n" - (x: ''replace_dep "${x.f}" "${x.p.src}" "${x.p.pname or (builtins.parseDrvName x.p.name).name}" "${x.p.name}"'') [ - { f = "curl"; p = curl; } - { f = "libconfig"; p = libconfig; } - { f = "libdaemon"; p = libdaemon; } - { f = "libev"; p = libev; } - { f = "libinjection"; p = libinjection; } - { f = "libmicrohttpd"; p = libmicrohttpd_0_9_69; } - { f = "libssl"; p = openssl; } - { f = "lz4"; p = lz4; } - { f = "pcre"; p = pcre; } - { f = "re2"; p = re2; } - ]} + (x: ''replace_dep "${x.f}" "${x.p.src}" "${x.p.pname or (builtins.parseDrvName x.p.name).name}" "${x.p.name}"'') ( + map (x: { + inherit (x) f; + p = x.p // { + src = applyPatches { + inherit (x.p) src patches; + }; + }; + }) [ + { f = "curl"; p = curl; } + { f = "libconfig"; p = libconfig; } + { f = "libdaemon"; p = libdaemon; } + { f = "libev"; p = libev; } + { f = "libinjection"; p = libinjection; } + { f = "libmicrohttpd"; p = libmicrohttpd_0_9_69; } + { f = "libssl"; p = openssl; } + { f = "lz4"; p = lz4; } + { f = "pcre"; p = pcre; } + { f = "re2"; p = re2; } + ] + )} pushd libhttpserver tar xf libhttpserver-0.18.1.tar.gz diff --git a/pkgs/servers/web-apps/kasmweb/default.nix b/pkgs/servers/web-apps/kasmweb/default.nix new file mode 100644 index 00000000000..f83db6baddc --- /dev/null +++ b/pkgs/servers/web-apps/kasmweb/default.nix @@ -0,0 +1,36 @@ +{ stdenv +, lib +, fetchzip +}: + +stdenv.mkDerivation rec { + pname = "kasmweb"; + version = "1.12.0"; + build = "d4fd8a"; + + src = fetchzip { + url = "https://kasm-static-content.s3.amazonaws.com/kasm_release_${version}.${build}.tar.gz"; + sha256 = "sha256-dCjWmI8gYtoMiMHVNgTg2ZROHXvT4ulynNvnKfMxURo="; + }; + + dontConfigure = true; + dontBuild = true; + + installPhase = '' + runHook preInstall + + mkdir $out + rm bin/utils/yq* + cp -r bin conf www $out/ + + runHook postInstall + ''; + + + meta = with lib; { + homepage = "https://www.kasmweb.com/"; + description = "Streaming containerized apps and desktops to end-users"; + license = licenses.unfree; + maintainers = with maintainers; [ s1341 ]; + }; +} diff --git a/pkgs/servers/zigbee2mqtt/default.nix b/pkgs/servers/zigbee2mqtt/default.nix index 8aacff0d58e..f94feb4918d 100644 --- a/pkgs/servers/zigbee2mqtt/default.nix +++ b/pkgs/servers/zigbee2mqtt/default.nix @@ -8,16 +8,16 @@ buildNpmPackage rec { pname = "zigbee2mqtt"; - version = "1.29.0"; + version = "1.29.1"; src = fetchFromGitHub { owner = "Koenkk"; repo = "zigbee2mqtt"; rev = version; - hash = "sha256-WN8dLqHbx/NydGwYeksrfSHs9kpRWj1FY/t+/Noux+g="; + hash = "sha256-ZfJR8n4hPExi7x1lcQ3WDLYm4+AO4HMpMfKS110csR4="; }; - npmDepsHash = "sha256-PAUdNCZ5YgEyz72rjUz3gdUkjDxLTC3yh3kv4Vtix3Q="; + npmDepsHash = "sha256-Hr4jcPORHEp4U26MK1WtcaLcP7kIal0yzcHS7DzPENI="; nativeBuildInputs = [ python3 diff --git a/pkgs/shells/zsh/zsh-forgit/default.nix b/pkgs/shells/zsh/zsh-forgit/default.nix index ce99b5e3448..ff1a5f7d9c7 100644 --- a/pkgs/shells/zsh/zsh-forgit/default.nix +++ b/pkgs/shells/zsh/zsh-forgit/default.nix @@ -1,14 +1,25 @@ -{ stdenv, lib, bash, fetchFromGitHub, makeWrapper, fzf, git }: +{ stdenv +, lib +, bash +, coreutils +, findutils +, fetchFromGitHub +, fzf +, git +, gnugrep +, gnused +, makeWrapper +}: stdenv.mkDerivation rec { pname = "zsh-forgit"; - version = "22.12.0"; + version = "23.01.0"; src = fetchFromGitHub { owner = "wfxr"; repo = "forgit"; rev = version; - sha256 = "0juBNUJW4SU3Cl6ouD+xMYzlCJOL7NAYpueZ6V56/ck="; + sha256 = "sha256-guAjxFhtybbRyRRXDELDHrM2Xzmi96wPxD2nhL9Ifmk="; }; strictDeps = true; @@ -16,9 +27,6 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace forgit.plugin.zsh \ --replace "\$INSTALL_DIR/bin/git-forgit" "$out/bin/git-forgit" - - substituteInPlace bin/git-forgit \ - --replace "/bin/bash" "${bash}/bin/bash" ''; dontBuild = true; @@ -31,7 +39,7 @@ stdenv.mkDerivation rec { install -D bin/git-forgit $out/bin/git-forgit install -D forgit.plugin.zsh $out/share/zsh/${pname}/forgit.plugin.zsh wrapProgram $out/bin/git-forgit \ - --prefix PATH : ${lib.makeBinPath [ fzf git ]} + --prefix PATH : ${lib.makeBinPath [ bash coreutils findutils fzf git gnugrep gnused ]} runHook postInstall ''; diff --git a/pkgs/test/cross/default.nix b/pkgs/test/cross/default.nix index c5a24143773..beb64df1957 100644 --- a/pkgs/test/cross/default.nix +++ b/pkgs/test/cross/default.nix @@ -8,7 +8,7 @@ let ) lib.systems.examples; getExecutable = pkgs: pkgFun: exec: - "${pkgFun pkgs}${exec}${pkgs.hostPlatform.extensions.executable}"; + "${pkgFun pkgs}${exec}${pkgs.stdenv.hostPlatform.extensions.executable}"; compareTest = { emulator, pkgFun, hostPkgs, crossPkgs, exec, args ? [] }: let pkgName = (pkgFun hostPkgs).name; @@ -55,7 +55,7 @@ let mapMultiPlatformTest = crossSystemFun: test: lib.mapAttrs (name: system: test rec { crossPkgs = import pkgs.path { - localSystem = { inherit (pkgs.hostPlatform) config; }; + localSystem = { inherit (pkgs.stdenv.hostPlatform) config; }; crossSystem = crossSystemFun system; }; diff --git a/pkgs/tools/admin/auth0-cli/default.nix b/pkgs/tools/admin/auth0-cli/default.nix index 65e093c2c3e..b94955f611d 100644 --- a/pkgs/tools/admin/auth0-cli/default.nix +++ b/pkgs/tools/admin/auth0-cli/default.nix @@ -1,17 +1,20 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib +, buildGoModule +, fetchFromGitHub +}: buildGoModule rec { pname = "auth0-cli"; - version = "0.11.10"; + version = "0.13.1"; src = fetchFromGitHub { owner = "auth0"; repo = "auth0-cli"; - rev = "v${version}"; - hash = "sha256-1/T2hpSNamorWFuaSBoLsGpe9I06HGew9S3yJsDLmLQ="; + rev = "tags/release/v${version}"; + hash = "sha256-FotjdMbQXDwkURSeye86sIFN60V//UlF7kZrwfkvTGY="; }; - vendorHash = "sha256-d9ZwK/LAZGgeagGsg3bGYnVykfQcCLUex0pe/PUCtkA="; + vendorHash = "sha256-2lu8mlADpTjp11S/chz9Ow5W5dw5l6llitJxamNiyLg="; ldflags = [ "-s" "-w" @@ -31,6 +34,7 @@ buildGoModule rec { meta = with lib; { description = "Supercharge your developer workflow"; homepage = "https://auth0.github.io/auth0-cli"; + changelog = "https://github.com/auth0/auth0-cli/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ matthewcroughan ]; mainProgram = "auth0"; diff --git a/pkgs/tools/admin/aws-sso-creds/default.nix b/pkgs/tools/admin/aws-sso-creds/default.nix new file mode 100644 index 00000000000..ec91c33a044 --- /dev/null +++ b/pkgs/tools/admin/aws-sso-creds/default.nix @@ -0,0 +1,33 @@ +{ buildGoModule +, fetchFromGitHub +, lib +, makeWrapper +, xdg-utils +}: +buildGoModule rec { + pname = "aws-sso-creds"; + version = "1.4.0"; + + src = fetchFromGitHub { + owner = "jaxxstorm"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-iyTdVvbqewLPLJB0LjeMB0HvLTi4B3B/HDCvgSlZoNE="; + }; + vendorSha256 = "sha256-SIsM3S9i5YKj8DvE90DxxinqZkav+1gIha1xZiDBuHQ="; + + nativeBuildInputs = [ makeWrapper ]; + + postInstall = '' + wrapProgram $out/bin/aws-sso-creds \ + --suffix PATH : ${lib.makeBinPath [ xdg-utils ]} + ''; + + meta = with lib; { + homepage = "https://github.com/jaxxstorm/aws-sso-creds"; + description = "Get AWS SSO temporary creds from an SSO profile"; + license = licenses.mit; + maintainers = with maintainers; [ lafrenierejm ]; + mainProgram = "aws-sso-creds"; + }; +} diff --git a/pkgs/tools/admin/awscli2/default.nix b/pkgs/tools/admin/awscli2/default.nix index b208e27cfb1..81ee4f449c3 100644 --- a/pkgs/tools/admin/awscli2/default.nix +++ b/pkgs/tools/admin/awscli2/default.nix @@ -25,14 +25,14 @@ let in with py.pkgs; buildPythonApplication rec { pname = "awscli2"; - version = "2.9.11"; # N.B: if you change this, check if overrides are still up-to-date + version = "2.9.13"; # N.B: if you change this, check if overrides are still up-to-date format = "pyproject"; src = fetchFromGitHub { owner = "aws"; repo = "aws-cli"; rev = version; - hash = "sha256-udqc1a8xtIVn+vl4UQ8b5Gtcpdns2r3KEo2e0Nd+dBs="; + hash = "sha256-XI2cgyqdy1e/+khyu1QPwekkGRAZLn10yfHO3J528IA="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/admin/trivy/default.nix b/pkgs/tools/admin/trivy/default.nix index 14e62fa0612..c162521870b 100644 --- a/pkgs/tools/admin/trivy/default.nix +++ b/pkgs/tools/admin/trivy/default.nix @@ -5,17 +5,17 @@ buildGoModule rec { pname = "trivy"; - version = "0.36.0"; + version = "0.36.1"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "sha256-5yAfF/iRAbCJFXEcdhg7vqiMTpw7NNixFaQU93uSv6I="; + sha256 = "sha256-V6x7xILG2/mg95S3qv8pM6ZVXWmh1iHMvDVEfidHau4="; }; # hash missmatch on across linux and darwin proxyVendor = true; - vendorSha256 = "sha256-9oG6xJ0D6SulN6ErC/F5Ycmly4wp+GCF8lftu+xoagE="; + vendorSha256 = "sha256-qTtx8+D288RT3wOdmvUXVeHx4GwIyCyCnO/sQW0blIU="; excludedPackages = "misc"; diff --git a/pkgs/tools/backup/borgbackup/default.nix b/pkgs/tools/backup/borgbackup/default.nix index 84083c0db2d..9dbc3c8f98f 100644 --- a/pkgs/tools/backup/borgbackup/default.nix +++ b/pkgs/tools/backup/borgbackup/default.nix @@ -7,21 +7,32 @@ , openssh , openssl , python3 +, xxHash , zstd , installShellFiles , nixosTests +, fetchpatch }: python3.pkgs.buildPythonApplication rec { pname = "borgbackup"; - version = "1.2.2"; + version = "1.2.3"; format = "pyproject"; src = python3.pkgs.fetchPypi { inherit pname version; - sha256 = "sha256-1zBodEPxvrYCsdcrrjYxj2+WVIGPzcUEWFQOxXnlcmA="; + hash = "sha256-4yQY+GM8lvqWgTUqVutjuY4pQgNHLBFKUkJwnTaWZ4U="; }; + patches = [ + (fetchpatch { + # Fix HashIndexSizeTestCase.test_size_on_disk_accurate problems on ZFS, + # see https://github.com/borgbackup/borg/issues/7250 + url = "https://github.com/borgbackup/borg/pull/7252/commits/537a814e53e20013a041faa7192da005f137cf5b.patch"; + hash = "sha256-dnF/FW8pS4Ub9aAL4b7zf6ZNjMZaiMqdtl5R+DlAZTM="; + }) + ]; + postPatch = '' # sandbox does not support setuid/setgid/sticky bits substituteInPlace src/borg/testsuite/archiver.py \ @@ -31,6 +42,7 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = with python3.pkgs; [ cython setuptools-scm + pkgconfig # docs sphinxHook @@ -45,6 +57,7 @@ python3.pkgs.buildPythonApplication rec { buildInputs = [ libb2 lz4 + xxHash zstd openssl ] ++ lib.optionals stdenv.isLinux [ @@ -57,13 +70,6 @@ python3.pkgs.buildPythonApplication rec { (if stdenv.isLinux then pyfuse3 else llfuse) ]; - preConfigure = '' - export BORG_OPENSSL_PREFIX="${openssl.dev}" - export BORG_LZ4_PREFIX="${lz4.dev}" - export BORG_LIBB2_PREFIX="${libb2}" - export BORG_LIBZSTD_PREFIX="${zstd.dev}" - ''; - makeWrapperArgs = [ ''--prefix PATH ':' "${openssh}/bin"'' ]; diff --git a/pkgs/tools/backup/burp/default.nix b/pkgs/tools/backup/burp/default.nix index 187fe71896d..eef8491b383 100644 --- a/pkgs/tools/backup/burp/default.nix +++ b/pkgs/tools/backup/burp/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "burp"; - version = "2.2.18"; + version = "2.4.0"; src = fetchFromGitHub { owner = "grke"; repo = "burp"; rev = version; - sha256 = "1zhq240kz881vs2s620qp0kifmgr582caalm85ls789w9rmdkhjl"; + sha256 = "sha256-y6kRd1jD6t+Q6d5t7W9MDuk+m2Iq1THQkP50PJwI7Nc="; }; patches = [ @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { description = "BURP - BackUp and Restore Program"; homepage = "https://burp.grke.org"; license = licenses.agpl3; - maintainers = with maintainers; [ tokudan ]; + maintainers = with maintainers; [ arjan-s ]; platforms = platforms.all; }; } diff --git a/pkgs/tools/backup/partclone/default.nix b/pkgs/tools/backup/partclone/default.nix index d8e845b5795..ccf74e46aeb 100644 --- a/pkgs/tools/backup/partclone/default.nix +++ b/pkgs/tools/backup/partclone/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "partclone"; - version = "0.3.20"; + version = "0.3.21"; src = fetchFromGitHub { owner = "Thomas-Tsai"; repo = "partclone"; rev = version; - sha256 = "sha256-LuAK3atyu9olsrSw25Y7aKBiOpEV709nu+pZhVAjGfY="; + sha256 = "sha256-QAvZzu63TSj/kRYd60q2lpxU92xTV8T8jXdtZvrxX+I="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/pkgs/tools/cd-dvd/ventoy-bin/default.nix b/pkgs/tools/cd-dvd/ventoy-bin/default.nix index e8f733ab511..a1fab735072 100644 --- a/pkgs/tools/cd-dvd/ventoy-bin/default.nix +++ b/pkgs/tools/cd-dvd/ventoy-bin/default.nix @@ -51,13 +51,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "ventoy-bin"; - version = "1.0.86"; + version = "1.0.87"; src = let inherit (finalAttrs) version; in fetchurl { url = "https://github.com/ventoy/Ventoy/releases/download/v${version}/ventoy-${version}-linux.tar.gz"; - hash = "sha256-ksxXMA7GPlFrPi1oJa+Yg4my6qMGwVrhOL7pLruXiNA="; + hash = "sha256-0m7MXLtSuq8GdDFXzKeY86DIglgeQ6wyEtpOyB/thkc="; }; patches = [ diff --git a/pkgs/tools/compression/zfp/default.nix b/pkgs/tools/compression/zfp/default.nix index 1b943b3e41a..2d3890484e7 100644 --- a/pkgs/tools/compression/zfp/default.nix +++ b/pkgs/tools/compression/zfp/default.nix @@ -1,7 +1,7 @@ -{ cmake, cudatoolkit, fetchFromGitHub, gfortran, lib, llvmPackages, python3Packages, stdenv, targetPlatform +{ cmake, cudatoolkit, fetchFromGitHub, gfortran, lib, llvmPackages, python3Packages, stdenv , enableCfp ? true , enableCuda ? false -, enableFortran ? builtins.elem targetPlatform.system gfortran.meta.platforms +, enableFortran ? builtins.elem stdenv.targetPlatform.system gfortran.meta.platforms , enableOpenMP ? true , enablePython ? true , enableUtilities ? true }: diff --git a/pkgs/tools/misc/barman/default.nix b/pkgs/tools/misc/barman/default.nix index 70d8e98b8f7..8e149838837 100644 --- a/pkgs/tools/misc/barman/default.nix +++ b/pkgs/tools/misc/barman/default.nix @@ -5,13 +5,13 @@ }: python3Packages.buildPythonApplication rec { pname = "barman"; - version = "3.1.0"; + version = "3.3.0"; src = fetchFromGitHub { owner = "EnterpriseDB"; repo = pname; rev = "refs/tags/release/${version}"; - sha256 = "sha256-xRyKCpO2eBe5lI0pQW8wUee/5ZMDEo7/FLORrp3Sduk="; + sha256 = "sha256-4mbu3Z48jZQqRft4vkz/x4a7kAOiTrQfnyQpXl3MJn0="; }; patches = [ diff --git a/pkgs/tools/misc/cfonts/default.nix b/pkgs/tools/misc/cfonts/default.nix new file mode 100644 index 00000000000..d04e88bded8 --- /dev/null +++ b/pkgs/tools/misc/cfonts/default.nix @@ -0,0 +1,24 @@ +{ lib +, stdenv +, rustPlatform +, fetchCrate +}: +rustPlatform.buildRustPackage rec { + pname = "cfonts"; + version = "1.1.0"; + + src = fetchCrate { + inherit pname version; + sha256 = "sha256-STeLEHgggshhyLCfqiJmDcmwxqQ1AOGHj2ATliEY+DA="; + }; + + cargoHash = "sha256-GGi4OduO9FPIWllxlx4tK3lix36zF0FNDyptzftV0GY="; + + meta = with lib; { + homepage = "https://github.com/dominikwilkowski/cfonts"; + description = + "A silly little command line tool for sexy ANSI fonts in the console"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ leifhelm ]; + }; +} diff --git a/pkgs/tools/misc/cowsay/default.nix b/pkgs/tools/misc/cowsay/default.nix index 095c8bab48f..87457e0a63d 100644 --- a/pkgs/tools/misc/cowsay/default.nix +++ b/pkgs/tools/misc/cowsay/default.nix @@ -1,47 +1,47 @@ -{ lib, stdenv, perl, installShellFiles, fetchFromGitHub }: +{ lib, stdenv, perl, fetchFromGitHub, fetchpatch, nix-update-script, testers, cowsay }: stdenv.mkDerivation rec { pname = "cowsay"; - version = "3.04"; + version = "3.7.0"; + + outputs = [ "out" "man" ]; src = fetchFromGitHub { - owner = "tnalpgge"; - repo = "rank-amateur-cowsay"; - rev = "cowsay-${version}"; - sha256 = "sha256-9jCaQ6Um6Nl9j0/urrMCRcsGeubRN3VWD3jDM/AshRg="; + owner = "cowsay-org"; + repo = "cowsay"; + rev = "v${version}"; + hash = "sha256-t1grmCPQhRgwS64RjEwkK61F2qxxMBKuv0/DzBTnL3s="; }; - buildInputs = [ perl ]; - - nativeBuildInputs = [ installShellFiles ]; - - # overriding buildPhase because we don't want to use the install.sh script - buildPhase = '' - runHook preBuild; - substituteInPlace cowsay --replace "%BANGPERL%" "!${perl}/bin/perl" \ - --replace "%PREFIX%" "$out" - runHook postBuild; - ''; + patches = [ + # Install cowthink as a symlink, not a copy + # See https://github.com/cowsay-org/cowsay/pull/18 + (fetchpatch { + url = "https://github.com/cowsay-org/cowsay/commit/9e129fa0933cf1837672c97f5ae5ad4a1a10ec11.patch"; + hash = "sha256-zAYEUAM5MkyMONAl5BXj8hBHRalQVAOdpxgiM+Ewmlw="; + }) + ]; - installPhase = '' - runHook preInstall - install -Dm755 cowsay $out/bin/cowsay - ln -s $out/bin/cowsay $out/bin/cowthink - - installManPage cowsay.1 - ln -s $man/share/man/man1/cowsay.1.gz $man/share/man/man1/cowthink.1.gz + buildInputs = [ perl ]; - install -Dm644 cows/* -t $out/share/cows/ - runHook postInstall - ''; + makeFlags = [ + "prefix=${placeholder "out"}" + ]; - outputs = [ "out" "man" ]; + passthru = { + updateScript = nix-update-script { }; + tests.version = testers.testVersion { + package = cowsay; + command = "cowsay --version"; + }; + }; meta = with lib; { description = "A program which generates ASCII pictures of a cow with a message"; - homepage = "https://github.com/tnalpgge/rank-amateur-cowsay"; + homepage = "https://cowsay.diamonds"; + changelog = "https://github.com/cowsay-org/cowsay/releases/tag/v${version}"; license = licenses.gpl3Only; platforms = platforms.all; - maintainers = [ maintainers.rob ]; + maintainers = with maintainers; [ rob anthonyroussel ]; }; } diff --git a/pkgs/tools/misc/ea/default.nix b/pkgs/tools/misc/ea/default.nix index cbef6caebbb..22d4fa7a207 100644 --- a/pkgs/tools/misc/ea/default.nix +++ b/pkgs/tools/misc/ea/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, rustPlatform, installShellFiles, libiconv }: rustPlatform.buildRustPackage rec { - pname = "dduan"; + pname = "ea"; version = "0.2.1"; src = fetchFromGitHub { @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "VXSSe5d7VO3LfjumzN9a7rrKRedOtOzTdLVQWgV1ED8="; }; - cargoSha256 = "sha256-QNj24qKZFqG4QXG6rIFV2Y/BNPTXt7HaX7smsJRrdzg="; + cargoSha256 = "sha256-YP7OJaIWTXJHe3qF+a3zCFnCHnELX0rAWqnJPaC1T7I="; nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optionals stdenv.isDarwin [ diff --git a/pkgs/tools/misc/macchina/default.nix b/pkgs/tools/misc/macchina/default.nix index 9342acdee78..099bb35b58a 100644 --- a/pkgs/tools/misc/macchina/default.nix +++ b/pkgs/tools/misc/macchina/default.nix @@ -1,21 +1,33 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub, installShellFiles -, libiconv, Foundation }: +{ lib +, stdenv +, rustPlatform +, fetchFromGitHub +, installShellFiles +, libiconv +, Foundation +}: rustPlatform.buildRustPackage rec { pname = "macchina"; - version = "6.1.6"; + version = "6.1.7"; src = fetchFromGitHub { owner = "Macchina-CLI"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-0wPMx3IMYhB3XxSsTRqKIsNCGghnRcpwZloHjLxjlMo="; + rev = "tags/release/v${version}"; + hash = "sha256-zbQOmlFWpoQwf4rlDLn1V0vj1c66pVWrMROGANRDl9s="; }; - cargoSha256 = "sha256-QaqRIc3eKp7Wy5798wCCA4hk9Twa5Nr1mXTIxf+Hy/Q="; + cargoHash = "sha256-BYUGtaMG/fvQHYJgeSQcW+ZJOrm3N9g6m0c5TX9psJU="; - nativeBuildInputs = [ installShellFiles ]; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv Foundation ]; + nativeBuildInputs = [ + installShellFiles + ]; + + buildInputs = lib.optionals stdenv.isDarwin [ + libiconv + Foundation + ]; postInstall = '' installShellCompletion target/completions/*.{bash,fish} diff --git a/pkgs/tools/misc/opentelemetry-collector/contrib.nix b/pkgs/tools/misc/opentelemetry-collector/contrib.nix index 9be8b531a65..f5e3e8891d8 100644 --- a/pkgs/tools/misc/opentelemetry-collector/contrib.nix +++ b/pkgs/tools/misc/opentelemetry-collector/contrib.nix @@ -6,17 +6,17 @@ buildGoModule rec { pname = "opentelemetry-collector-contrib"; - version = "0.65.0"; + version = "0.66.0"; src = fetchFromGitHub { owner = "open-telemetry"; repo = "opentelemetry-collector-contrib"; rev = "v${version}"; - sha256 = "sha256-c5N/3HAkragpR/vgh909VYu4vpUFe1An+B20SY0C1Rs="; + sha256 = "sha256-FT5AoqCHNf2sdKyejALOsL/zHrrxP7vdntagR9vA00I="; }; # proxy vendor to avoid hash missmatches between linux and macOS proxyVendor = true; - vendorSha256 = "sha256-aXbrm3iKmc+03BZWkRDt47LJP6JT92uH3EyEVQHByj8="; + vendorSha256 = "sha256-65bfTCMRJ8iL5ABGPqvkayw4zSn4KkCriEkWYa0Pe68="; subPackages = [ "cmd/otelcontribcol" ]; diff --git a/pkgs/tools/misc/opentelemetry-collector/default.nix b/pkgs/tools/misc/opentelemetry-collector/default.nix index 028ee081f46..42f127836e4 100644 --- a/pkgs/tools/misc/opentelemetry-collector/default.nix +++ b/pkgs/tools/misc/opentelemetry-collector/default.nix @@ -12,17 +12,17 @@ let in buildGoModule rec { pname = "opentelemetry-collector"; - version = "0.66.0"; + version = "0.68.0"; src = fetchFromGitHub { owner = "open-telemetry"; repo = "opentelemetry-collector"; rev = "v${version}"; - sha256 = "sha256-EvDdZTMq2Z8nFlQCiIuF+9SSnj4Lfsa03a7luzc9ynU="; + sha256 = "sha256-hb+T4sEYagraqiAHjoy6rp+wFtsyuYmK+biX78TV7cA="; }; # there is a nested go.mod sourceRoot = "source/cmd/otelcorecol"; - vendorSha256 = "sha256-D2/7Ubt1Zpb60CNRRQiMbxJXGF2CWmdeBc/XRxFzIjs="; + vendorSha256 = "sha256-WvZzAZtkkzWjE1TBzR4bCUdux6YyZ1VUl15hKRjNPyE="; preBuild = '' # set the build version, can't be done via ldflags diff --git a/pkgs/tools/misc/rcm/default.nix b/pkgs/tools/misc/rcm/default.nix index bd03b591b17..3aa8ba412e1 100644 --- a/pkgs/tools/misc/rcm/default.nix +++ b/pkgs/tools/misc/rcm/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "rcm"; - version = "1.3.5"; + version = "1.3.6"; src = fetchurl { url = "https://thoughtbot.github.io/rcm/dist/rcm-${version}.tar.gz"; - sha256 = "sha256-JHQefybxagSTJLqoavcARDxCgeLN4JlynXTE1LKevi0="; + sha256 = "sha256-9P37xFHR+1dkUxKQogKgqHH2uBujwBprdsSUNchQgKU="; }; patches = [ ./fix-rcmlib-path.patch ]; diff --git a/pkgs/tools/misc/tere/default.nix b/pkgs/tools/misc/tere/default.nix index ce0d0368f92..216a0db0c83 100644 --- a/pkgs/tools/misc/tere/default.nix +++ b/pkgs/tools/misc/tere/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "tere"; - version = "1.3.1"; + version = "1.4.0"; src = fetchFromGitHub { owner = "mgunyho"; repo = "tere"; rev = "v${version}"; - sha256 = "sha256-/712LB7oc27BP5WM20Pk3AucjwDJeBgH7udTgA+jFKc="; + sha256 = "sha256-gEoy7pwZxlCIPTQZVPSo5TIdmSliSSePunXO3hD3Ryo="; }; - cargoSha256 = "sha256-Z+qOID2/GRJTzAEWlUUTv6LAKLALu2Vn1umvrAgem00="; + cargoSha256 = "sha256-4XvVisRLSHw4jz+nUndWzS1IK2tnzmxdcgqNHHOvkQg="; postPatch = '' rm .cargo/config.toml; diff --git a/pkgs/tools/misc/trdl-client/default.nix b/pkgs/tools/misc/trdl-client/default.nix index 5a683ef2020..9b60199c9eb 100644 --- a/pkgs/tools/misc/trdl-client/default.nix +++ b/pkgs/tools/misc/trdl-client/default.nix @@ -7,18 +7,18 @@ buildGoModule rec { pname = "trdl-client"; - version = "0.5.0"; + version = "0.6.3"; src = fetchFromGitHub { owner = "werf"; repo = "trdl"; rev = "v${version}"; - hash = "sha256-6bJoM0s0lIZewERCNnm5+J5O+Tkzp+Pv2l4vvOSxIz8="; + hash = "sha256-mmhbcBNHvx14Ihzq8UemPU8oYi/Gn3NK0FDZRVJvvfQ="; }; sourceRoot = "source/client"; - vendorHash = "sha256-j3WekQpnwbh+XiFgJlEr/Cw+2WloIw+iELsqk5Cy69g="; + vendorHash = "sha256-3B4MYj1jlovjWGIVK233t+e/mP8eEdHHv2M3xXSHaaM="; subPackages = [ "cmd/trdl" ]; diff --git a/pkgs/tools/networking/easyrsa/2.x.nix b/pkgs/tools/networking/easyrsa/2.x.nix deleted file mode 100644 index b88aeda0fc5..00000000000 --- a/pkgs/tools/networking/easyrsa/2.x.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, autoreconfHook -, makeWrapper -, gnugrep -, openssl -}: - -stdenv.mkDerivation rec { - pname = "easyrsa"; - version = "2.2.0"; - - src = fetchFromGitHub { - owner = "OpenVPN"; - repo = "easy-rsa"; - rev = "v${version}"; - sha256 = "sha256-zTdk8mv+gC/SHK813wZ6CWZf9Jm2XkKfAPU3feFpAkY="; - }; - - preBuild = '' - mkdir -p $out/share/easy-rsa - ''; - - nativeBuildInputs = [ autoreconfHook makeWrapper ]; - buildInputs = [ gnugrep openssl ]; - - # Make sane defaults and patch default config vars - postInstall = '' - cp $out/share/easy-rsa/openssl-1.0.0.cnf $out/share/easy-rsa/openssl.cnf - for prog in $(find "$out/share/easy-rsa" -executable -type f); do - makeWrapper "$prog" "$out/bin/$(basename $prog)" \ - --set EASY_RSA "$out/share/easy-rsa" \ - --set OPENSSL "${openssl.bin}/bin/openssl" \ - --set GREP "${gnugrep}/bin/grep" - done - sed -i "/EASY_RSA=\|OPENSSL=\|GREP=/d" $out/share/easy-rsa/vars - ''; - - meta = with lib; { - description = "Simple shell based CA utility"; - homepage = "https://openvpn.net/"; - license = licenses.gpl2; - maintainers = [ maintainers.offline ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/tools/networking/easyrsa/default.nix b/pkgs/tools/networking/easyrsa/default.nix index 34e326858fd..bcc0a81d5e1 100644 --- a/pkgs/tools/networking/easyrsa/default.nix +++ b/pkgs/tools/networking/easyrsa/default.nix @@ -1,33 +1,37 @@ -{ lib, stdenv, fetchFromGitHub, openssl, runtimeShell }: +{ lib, stdenv, fetchFromGitHub, openssl, makeWrapper, runtimeShell }: -let - version = "3.0.8"; -in stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "easyrsa"; - inherit version; + version = "3.1.1"; src = fetchFromGitHub { owner = "OpenVPN"; repo = "easy-rsa"; rev = "v${version}"; - sha256 = "05q60s343ydh9j6hzj0840qdcq8fkyz06q68yw4pqgqg4w68rbgs"; + sha256 = "sha256-errF7bNhX3oYEMDwB/B1W5hBWhOD+GCgET3lA121PHc="; }; - patches = [ ./fix-paths.patch ]; + nativeBuildInputs = [ makeWrapper ]; installPhase = '' - mkdir -p $out/share/easyrsa - cp -r easyrsa3/{*.cnf,x509-types,vars.example} $out/share/easyrsa - cp easyrsa3/openssl-easyrsa.cnf $out/share/easyrsa/safessl-easyrsa.cnf + mkdir -p $out/share/easy-rsa + cp -r easyrsa3/{*.cnf,x509-types,vars.example} $out/share/easy-rsa install -D -m755 easyrsa3/easyrsa $out/bin/easyrsa + substituteInPlace $out/bin/easyrsa \ - --subst-var out \ - --subst-var-by openssl ${openssl.bin}/bin/openssl + --replace /usr/ $out/ \ + --replace '~VER~' '${version}' \ + --replace '~GITHEAD~' 'v${version}' \ + --replace '~DATE~' '1970-01-01' + + # Wrap it with the correct OpenSSL binary. + wrapProgram $out/bin/easyrsa \ + --set EASYRSA_OPENSSL ${openssl.bin}/bin/openssl # Helper utility cat > $out/bin/easyrsa-init <<EOF #!${runtimeShell} -e - cp -r $out/share/easyrsa/* . + cp -r $out/share/easy-rsa/* . EOF chmod +x $out/bin/easyrsa-init ''; diff --git a/pkgs/tools/networking/easyrsa/fix-paths.patch b/pkgs/tools/networking/easyrsa/fix-paths.patch deleted file mode 100644 index 7891adcb20c..00000000000 --- a/pkgs/tools/networking/easyrsa/fix-paths.patch +++ /dev/null @@ -1,49 +0,0 @@ -diff --git a/easyrsa3/easyrsa b/easyrsa3/easyrsa -index 261336f..7b9a79b 100755 ---- a/easyrsa3/easyrsa -+++ b/easyrsa3/easyrsa -@@ -1661,7 +1661,7 @@ Note: using Easy-RSA configuration from: $vars" - - # Set defaults, preferring existing env-vars if present - set_var EASYRSA "$prog_dir" -- set_var EASYRSA_OPENSSL openssl -+ set_var EASYRSA_OPENSSL "@openssl@" - set_var EASYRSA_PKI "$PWD/pki" - set_var EASYRSA_DN cn_only - set_var EASYRSA_REQ_COUNTRY "US" -@@ -1683,16 +1683,31 @@ Note: using Easy-RSA configuration from: $vars" - set_var EASYRSA_TEMP_DIR "$EASYRSA_PKI" - set_var EASYRSA_REQ_CN ChangeMe - set_var EASYRSA_DIGEST sha256 -- set_var EASYRSA_SSL_CONF "$EASYRSA_PKI/openssl-easyrsa.cnf" -- set_var EASYRSA_SAFE_CONF "$EASYRSA_PKI/safessl-easyrsa.cnf" - set_var EASYRSA_KDC_REALM "CHANGEME.EXAMPLE.COM" - -+ if [ -f "$EASYRSA_PKI/safessl-easyrsa.conf" ]; then -+ set_var EASYRSA_SAFE_CONF "$EASYRSA_PKI/safessl-easyrsa.cnf" -+ elif [ -f "$EASYRSA/safessl-easyrsa.conf" ]; then -+ set_var EASYRSA_SAFE_CONF "$EASYRSA/safessl-easyrsa.cnf" -+ elif [ -f "@out@/share/easyrsa/safessl-easyrsa.cnf" ]; then -+ set_var EASYRSA_SAFE_CONF "@out@/share/easyrsa/safessl-easyrsa.cnf" -+ fi -+ -+ if [ -f "$EASYRSA_PKI/openssl-easyrsa.conf" ]; then -+ set_var EASYRSA_SSL_CONF "$EASYRSA_PKI/openssl-easyrsa.cnf" -+ elif [ -f "$EASYRSA/openssl-easyrsa.conf" ]; then -+ set_var EASYRSA_SSL_CONF "$EASYRSA/openssl-easyrsa.cnf" -+ elif [ -f "@out@/share/easyrsa/openssl-easyrsa.cnf" ]; then -+ set_var EASYRSA_SSL_CONF "@out@/share/easyrsa/openssl-easyrsa.cnf" -+ fi -+ - # Same as above for the x509-types extensions dir - if [ -d "$EASYRSA_PKI/x509-types" ]; then - set_var EASYRSA_EXT_DIR "$EASYRSA_PKI/x509-types" -- else -- #TODO: This should be removed. Not really suitable for packaging. -+ elif [ -d "$EASYRSA/x509-types" ]; then - set_var EASYRSA_EXT_DIR "$EASYRSA/x509-types" -+ else -+ set_var EASYRSA_EXT_DIR "@out@/share/easyrsa/x509-types" - fi - - # EASYRSA_ALGO_PARAMS must be set depending on selected algo diff --git a/pkgs/tools/networking/godns/default.nix b/pkgs/tools/networking/godns/default.nix index c2886c1235f..f8274f98cc3 100644 --- a/pkgs/tools/networking/godns/default.nix +++ b/pkgs/tools/networking/godns/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "godns"; - version = "2.9.0"; + version = "2.9.1"; src = fetchFromGitHub { owner = "TimothyYe"; repo = "godns"; rev = "v${version}"; - sha256 = "sha256-FxVvqZMB9UGryNEbBFaxpK+VgrMH73x0fseU0dgCH0o="; + sha256 = "sha256-ZTp7MQTl1FbahmnStXFML4KeL736CXY5rE2gilP3txg="; }; vendorSha256 = "sha256-PGqknRGtN0XRGPnAsWzQrlJZG5BzQIhlSysGefkxysE="; diff --git a/pkgs/tools/networking/kail/default.nix b/pkgs/tools/networking/kail/default.nix index 7777c129dbf..d8b16aa4f27 100644 --- a/pkgs/tools/networking/kail/default.nix +++ b/pkgs/tools/networking/kail/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "kail"; - version = "0.15.0"; + version = "0.16.1"; ldflags = [ "-s" @@ -14,10 +14,10 @@ buildGoModule rec { owner = "boz"; repo = "kail"; rev = "v${version}"; - sha256 = "0b4abzk8lc5qa04ywkl8b5hb9jmxhyi2dpgbl27gmw81525wjnj7"; + sha256 = "sha256-x9m0NoZjCf/lBWcSGFbjlJIukL6KIYt56Q1hADS8N9I="; }; - vendorSha256 = "09s7sq23hglcb2rsi9igzql39zs4238f3jfmvxz9a8v41da225np"; + vendorHash = "sha256-W+/vIq7qC+6apk+1GOWvmcwyyjFRkndq8X5m/lRYOu4="; meta = with lib; { description = "Kubernetes log viewer"; diff --git a/pkgs/tools/networking/rewrk/Cargo.lock b/pkgs/tools/networking/rewrk/Cargo.lock new file mode 100644 index 00000000000..b477a88c23b --- /dev/null +++ b/pkgs/tools/networking/rewrk/Cargo.lock @@ -0,0 +1,988 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "aho-corasick" +version = "0.7.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" +dependencies = [ + "memchr", +] + +[[package]] +name = "ansi_term" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" +dependencies = [ + "winapi", +] + +[[package]] +name = "anyhow" +version = "1.0.68" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2cb2f989d18dd141ab8ae82f64d1a8cdd37e0840f73a406896cf5e99502fab61" + +[[package]] +name = "atty" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" +dependencies = [ + "hermit-abi 0.1.19", + "libc", + "winapi", +] + +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "base64" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bumpalo" +version = "3.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "572f695136211188308f16ad2ca5c851a712c464060ae6974944458eb83880ba" + +[[package]] +name = "bytes" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfb24e866b15a1af2a1b663f10c6b6b8f397a84aadb828f12e5b289ec23a3a3c" + +[[package]] +name = "cc" +version = "1.0.78" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a20104e2335ce8a659d6dd92a51a767a0c062599c73b343fd152cb401e828c3d" + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "clap" +version = "2.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" +dependencies = [ + "ansi_term", + "atty", + "bitflags", + "strsim", + "textwrap", + "unicode-width", + "vec_map", +] + +[[package]] +name = "colored" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3616f750b84d8f0de8a58bda93e08e2a81ad3f523089b05f1dffecab48c6cbd" +dependencies = [ + "atty", + "lazy_static", + "winapi", +] + +[[package]] +name = "core-foundation" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "futures-channel" +version = "0.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52ba265a92256105f45b719605a571ffe2d1f0fea3807304b522c1d778f79eed" +dependencies = [ + "futures-core", +] + +[[package]] +name = "futures-core" +version = "0.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04909a7a7e4633ae6c4a9ab280aeb86da1236243a77b694a49eacd659a4bd3ac" + +[[package]] +name = "futures-sink" +version = "0.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39c15cf1a4aa79df40f1bb462fb39676d0ad9e366c2a33b590d7c66f4f81fcf9" + +[[package]] +name = "futures-task" +version = "0.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ffb393ac5d9a6eaa9d3fdf37ae2776656b706e200c8e16b1bdb227f5198e6ea" + +[[package]] +name = "futures-util" +version = "0.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "197676987abd2f9cadff84926f410af1c183608d36641465df73ae8211dc65d6" +dependencies = [ + "futures-core", + "futures-task", + "pin-project-lite", + "pin-utils", +] + +[[package]] +name = "getrandom" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" +dependencies = [ + "cfg-if", + "libc", + "wasi", +] + +[[package]] +name = "h2" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f9f29bc9dda355256b2916cf526ab02ce0aeaaaf2bad60d65ef3f12f11dd0f4" +dependencies = [ + "bytes", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http", + "indexmap", + "slab", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" + +[[package]] +name = "hermit-abi" +version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" +dependencies = [ + "libc", +] + +[[package]] +name = "hermit-abi" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" +dependencies = [ + "libc", +] + +[[package]] +name = "http" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + +[[package]] +name = "http-body" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" +dependencies = [ + "bytes", + "http", + "pin-project-lite", +] + +[[package]] +name = "httparse" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" + +[[package]] +name = "httpdate" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" + +[[package]] +name = "hyper" +version = "0.14.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "034711faac9d2166cb1baf1a2fb0b60b1f277f8492fd72176c17f3515e1abd3c" +dependencies = [ + "bytes", + "futures-channel", + "futures-core", + "futures-util", + "h2", + "http", + "http-body", + "httparse", + "httpdate", + "itoa", + "pin-project-lite", + "socket2", + "tokio", + "tower-service", + "tracing", + "want", +] + +[[package]] +name = "indexmap" +version = "1.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" +dependencies = [ + "autocfg", + "hashbrown", +] + +[[package]] +name = "itoa" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440" + +[[package]] +name = "js-sys" +version = "0.3.60" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49409df3e3bf0856b916e2ceaca09ee28e6871cf7d9ce97a692cacfdb2a25a47" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] +name = "libc" +version = "0.2.139" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79" + +[[package]] +name = "log" +version = "0.4.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "memchr" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" + +[[package]] +name = "mio" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5d732bc30207a6423068df043e3d02e0735b155ad7ce1a6f76fe2baa5b158de" +dependencies = [ + "libc", + "log", + "wasi", + "windows-sys 0.42.0", +] + +[[package]] +name = "num_cpus" +version = "1.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" +dependencies = [ + "hermit-abi 0.2.6", + "libc", +] + +[[package]] +name = "once_cell" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f61fba1741ea2b3d6a1e3178721804bb716a68a6aeba1149b5d52e3d464ea66" + +[[package]] +name = "openssl-probe" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" + +[[package]] +name = "pin-project" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad29a609b6bcd67fee905812e544992d216af9d755757c05ed2d0e15a74c6ecc" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "pin-project-lite" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "ppv-lite86" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" + +[[package]] +name = "proc-macro2" +version = "1.0.49" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57a8eca9f9c4ffde41714334dee777596264c7825420f521abc92b5b5deb63a5" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quote" +version = "1.0.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "rand" +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", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom", +] + +[[package]] +name = "regex" +version = "1.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a26af418b574bd56588335b3a3659a65725d4e636eb1016c2f9e3b38c7cc759" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.6.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" + +[[package]] +name = "rewrk" +version = "0.3.2" +dependencies = [ + "anyhow", + "clap", + "colored", + "http", + "hyper", + "rand", + "regex", + "rustls", + "rustls-native-certs", + "serde_json", + "tokio", + "tokio-rustls", + "tower", +] + +[[package]] +name = "ring" +version = "0.16.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" +dependencies = [ + "cc", + "libc", + "once_cell", + "spin", + "untrusted", + "web-sys", + "winapi", +] + +[[package]] +name = "rustls" +version = "0.19.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35edb675feee39aec9c99fa5ff985081995a06d594114ae14cbe797ad7b7a6d7" +dependencies = [ + "base64", + "log", + "ring", + "sct", + "webpki", +] + +[[package]] +name = "rustls-native-certs" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a07b7c1885bd8ed3831c289b7870b13ef46fe0e856d288c30d9cc17d75a2092" +dependencies = [ + "openssl-probe", + "rustls", + "schannel", + "security-framework", +] + +[[package]] +name = "ryu" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b4b9743ed687d4b4bcedf9ff5eaa7398495ae14e61cba0a295704edbc7decde" + +[[package]] +name = "schannel" +version = "0.1.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88d6731146462ea25d9244b2ed5fd1d716d25c52e4d54aa4fb0f3c4e9854dbe2" +dependencies = [ + "lazy_static", + "windows-sys 0.36.1", +] + +[[package]] +name = "sct" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b362b83898e0e69f38515b82ee15aa80636befe47c3b6d3d89a911e78fc228ce" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] +name = "security-framework" +version = "2.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2bc1bb97804af6631813c55739f771071e0f2ed33ee20b68c86ec505d906356c" +dependencies = [ + "bitflags", + "core-foundation", + "core-foundation-sys", + "libc", + "security-framework-sys", +] + +[[package]] +name = "security-framework-sys" +version = "2.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0160a13a177a45bfb43ce71c01580998474f556ad854dcbca936dd2841a5c556" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "serde" +version = "1.0.152" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb" + +[[package]] +name = "serde_json" +version = "1.0.91" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "877c235533714907a8c2464236f5c4b2a17262ef1bd71f38f35ea592c8da6883" +dependencies = [ + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "slab" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef" +dependencies = [ + "autocfg", +] + +[[package]] +name = "socket2" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02e2d2db9033d13a1567121ddd7a095ee144db4e1ca1b1bda3419bc0da294ebd" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "spin" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" + +[[package]] +name = "strsim" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" + +[[package]] +name = "syn" +version = "1.0.107" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "textwrap" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" +dependencies = [ + "unicode-width", +] + +[[package]] +name = "tokio" +version = "1.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d9f76183f91ecfb55e1d7d5602bd1d979e38a3a522fe900241cf195624d67ae" +dependencies = [ + "autocfg", + "bytes", + "libc", + "memchr", + "mio", + "num_cpus", + "pin-project-lite", + "socket2", + "tokio-macros", + "windows-sys 0.42.0", +] + +[[package]] +name = "tokio-macros" +version = "1.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d266c00fde287f55d3f1c3e96c500c362a2b8c695076ec180f27918820bc6df8" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "tokio-rustls" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc6844de72e57df1980054b38be3a9f4702aba4858be64dd700181a8a6d0e1b6" +dependencies = [ + "rustls", + "tokio", + "webpki", +] + +[[package]] +name = "tokio-util" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bb2e075f03b3d66d8d8785356224ba688d2906a371015e225beeb65ca92c740" +dependencies = [ + "bytes", + "futures-core", + "futures-sink", + "pin-project-lite", + "tokio", + "tracing", +] + +[[package]] +name = "tower" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" +dependencies = [ + "futures-core", + "futures-util", + "pin-project", + "pin-project-lite", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "tower-layer" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" + +[[package]] +name = "tower-service" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" + +[[package]] +name = "tracing" +version = "0.1.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" +dependencies = [ + "cfg-if", + "log", + "pin-project-lite", + "tracing-core", +] + +[[package]] +name = "tracing-core" +version = "0.1.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a" +dependencies = [ + "once_cell", +] + +[[package]] +name = "try-lock" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" + +[[package]] +name = "unicode-ident" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc" + +[[package]] +name = "unicode-width" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" + +[[package]] +name = "untrusted" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" + +[[package]] +name = "vec_map" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" + +[[package]] +name = "want" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0" +dependencies = [ + "log", + "try-lock", +] + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "wasm-bindgen" +version = "0.2.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268" +dependencies = [ + "cfg-if", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c8ffb332579b0557b52d268b91feab8df3615f265d5270fec2a8c95b17c1142" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "052be0f94026e6cbc75cdefc9bae13fd6052cdcaf532fa6c45e7ae33a1e6c810" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f" + +[[package]] +name = "web-sys" +version = "0.3.60" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bcda906d8be16e728fd5adc5b729afad4e444e106ab28cd1c7256e54fa61510f" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "webpki" +version = "0.21.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8e38c0608262c46d4a56202ebabdeb094cef7e560ca7a226c6bf055188aa4ea" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows-sys" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2" +dependencies = [ + "windows_aarch64_msvc 0.36.1", + "windows_i686_gnu 0.36.1", + "windows_i686_msvc 0.36.1", + "windows_x86_64_gnu 0.36.1", + "windows_x86_64_msvc 0.36.1", +] + +[[package]] +name = "windows-sys" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc 0.42.0", + "windows_i686_gnu 0.42.0", + "windows_i686_msvc 0.42.0", + "windows_x86_64_gnu 0.42.0", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc 0.42.0", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4" + +[[package]] +name = "windows_i686_gnu" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" + +[[package]] +name = "windows_i686_gnu" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7" + +[[package]] +name = "windows_i686_msvc" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" + +[[package]] +name = "windows_i686_msvc" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5" diff --git a/pkgs/tools/networking/rewrk/default.nix b/pkgs/tools/networking/rewrk/default.nix new file mode 100644 index 00000000000..6b48ce95b42 --- /dev/null +++ b/pkgs/tools/networking/rewrk/default.nix @@ -0,0 +1,36 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, stdenv +, darwin +}: + +rustPlatform.buildRustPackage rec { + pname = "rewrk"; + version = "0.3.2"; + + src = fetchFromGitHub { + owner = "lnx-search"; + repo = "rewrk"; + rev = version; + hash = "sha256-Bqr5kmIIx+12hW4jpINcv0GBJBbMAkd4di/hZSXlT18="; + }; + + cargoLock.lockFile = ./Cargo.lock; + + postPatch = '' + ln -s ${./Cargo.lock} Cargo.lock + ''; + + buildInputs = lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Security + ]; + + meta = with lib; { + description = "A more modern http framework benchmarker supporting HTTP/1 and HTTP/2 benchmarks"; + homepage = "https://github.com/lnx-search/rewrk"; + changelog = "https://github.com/lnx-search/rewrk/releases/tag/${version}"; + license = licenses.mit; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/tools/package-management/nix-index/default.nix b/pkgs/tools/package-management/nix-index/default.nix index 57ebcfec26d..b63d8491641 100644 --- a/pkgs/tools/package-management/nix-index/default.nix +++ b/pkgs/tools/package-management/nix-index/default.nix @@ -1,22 +1,22 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub, pkg-config, openssl, curl +{ lib, stdenv, rustPlatform, fetchFromGitHub, pkg-config, openssl, curl, sqlite , Security }: rustPlatform.buildRustPackage rec { pname = "nix-index"; - version = "unstable-2022-03-07"; + version = "0.1.3"; src = fetchFromGitHub { owner = "bennofs"; repo = "nix-index"; - rev = "f09548f66790d2d7d53f07ad2af62993d7cabb08"; - sha256 = "sha256-xIJCzEHQJ2kHRbT4Ejrb5R5e/VqjKrklV7XneZIiyUg="; + rev = "v${version}"; + sha256 = "sha256-UbM4041AiYUOcj8e5dJ5HmD26Db3szs6dABVCwseliU="; }; - cargoSha256 = "sha256-2Yhnacsx8EWsfZfcfKhV687cblyFDmsfdqGZoK6Lulo="; + cargoSha256 = "sha256-TMfnjtUo7Kxx/kWnc0scC8qU6vi+E+TL0hE73NNIyjk="; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl curl ] + buildInputs = [ openssl curl sqlite ] ++ lib.optional stdenv.isDarwin Security; postInstall = '' diff --git a/pkgs/tools/security/knockpy/default.nix b/pkgs/tools/security/knockpy/default.nix index d9b708bc380..8f0cd43bd16 100644 --- a/pkgs/tools/security/knockpy/default.nix +++ b/pkgs/tools/security/knockpy/default.nix @@ -5,13 +5,13 @@ python3.pkgs.buildPythonApplication rec { pname = "knockpy"; - version = "5.3.0"; + version = "5.4.0"; src = fetchFromGitHub { owner = "guelfoweb"; repo = "knock"; - rev = version; - hash = "sha256-aM78If4/zW/0CqVjZHDbHrrWDuU1VSVhX7dfy9FR098="; + rev = "refs/tags/${version}"; + hash = "sha256-If8w6Z75nQsayJBqJs+D9++7kqCbkmwkszOaMATDTpY="; }; propagatedBuildInputs = with python3.pkgs; [ @@ -33,6 +33,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "Tool to scan subdomains"; homepage = "https://github.com/guelfoweb/knock"; + changelog = "https://github.com/guelfoweb/knock/releases/tag/${version}"; license = with licenses; [ gpl3Only ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/tools/security/modsecurity/default.nix b/pkgs/tools/security/modsecurity/default.nix index 431a6f9338e..be9b2f8c28d 100644 --- a/pkgs/tools/security/modsecurity/default.nix +++ b/pkgs/tools/security/modsecurity/default.nix @@ -11,13 +11,13 @@ in stdenv.mkDerivation rec { pname = "modsecurity"; - version = "2.9.6"; + version = "2.9.7"; src = fetchFromGitHub { owner = "SpiderLabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-C/D/UWaI4GsXjfhLmNnYhRJoUvlsps1551SqhmZUc/4="; + sha256 = "sha256-hJ8wYeC83dl85bkUXGZKHpHzw9QRgtusj1/+Coxsx0k="; }; nativeBuildInputs = [ pkg-config autoreconfHook ]; diff --git a/pkgs/tools/security/pdfcrack/default.nix b/pkgs/tools/security/pdfcrack/default.nix index 451cdd5591b..0aa94c4e8ab 100644 --- a/pkgs/tools/security/pdfcrack/default.nix +++ b/pkgs/tools/security/pdfcrack/default.nix @@ -1,12 +1,15 @@ -{ stdenv, lib, fetchurl }: +{ lib +, stdenv +, fetchurl +}: stdenv.mkDerivation rec { pname = "pdfcrack"; - version = "0.19"; + version = "0.20"; src = fetchurl { url = "mirror://sourceforge/pdfcrack/pdfcrack/pdfcrack-${version}.tar.gz"; - sha256 = "1vf0l83xk627fg0a3b10wabgqxy08q4vbm0xjw9xzkdpk1lj059i"; + hash = "sha256-e4spsY/NXLmErrZA7gbt8J/t5HCbWcMv7k8thoYN5bQ="; }; installPhase = '' @@ -16,7 +19,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "http://pdfcrack.sourceforge.net/"; description = "Small command line driven tool for recovering passwords and content from PDF files"; - license = with licenses; [ gpl2 ]; + license = with licenses; [ gpl2Plus ]; platforms = platforms.all; maintainers = with maintainers; [ qoelet ]; }; diff --git a/pkgs/tools/security/prs/default.nix b/pkgs/tools/security/prs/default.nix index 8d0fe229fc7..9f4b58c2d69 100644 --- a/pkgs/tools/security/prs/default.nix +++ b/pkgs/tools/security/prs/default.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage rec { pname = "prs"; - version = "0.3.5"; + version = "0.4.0"; src = fetchFromGitLab { owner = "timvisee"; repo = "prs"; - rev = "v${version}"; - hash = "sha256-PNmbWynEO8XcE7lLqfjJdCRnvRdCR8+stdwqRIKQfqM="; + rev = "refs/tags/v${version}"; + hash = "sha256-cmk3OubuiAf8UhfP+ZQbFqUXrve8zNHk5wS9/NKFoM8="; }; - cargoHash = "sha256-DSQDsgx608NUSi/KNwtntav7FTdnXGeIBzCkma5Tjts="; + cargoHash = "sha256-2tOEfGKRekbN8n3678AR9qEbRYwm0jB4BsAAdKTx/mA="; postPatch = '' # The GPGME backend is recommended diff --git a/pkgs/tools/security/ssh-to-age/default.nix b/pkgs/tools/security/ssh-to-age/default.nix index 8f8e50f3ca0..1745c716780 100644 --- a/pkgs/tools/security/ssh-to-age/default.nix +++ b/pkgs/tools/security/ssh-to-age/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "ssh-to-age"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "Mic92"; repo = "ssh-to-age"; rev = version; - sha256 = "sha256-KdPeV4j9x/nQtvmw90wvf62VxwXPGtKg8aSOM3YBT64="; + sha256 = "sha256-S7iWwRyJfxG38ym5j0b9xwC0tCNhQE+X/UuHG1wFVXo="; }; - vendorSha256 = "sha256-1iDFM6KNsvvwOTg05TAJZvHVTv+Gc0nG0STzNdk0NB4="; + vendorHash = "sha256-ZOa352gtigbuEQHw6i9Mnh2MD6+8IHOJOg7WJCH+Q88="; checkPhase = '' runHook preCheck diff --git a/pkgs/tools/security/trufflehog/default.nix b/pkgs/tools/security/trufflehog/default.nix index 39cd2d2f6c6..09dc5a1dfaa 100644 --- a/pkgs/tools/security/trufflehog/default.nix +++ b/pkgs/tools/security/trufflehog/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "trufflehog"; - version = "3.23.1"; + version = "3.24.0"; src = fetchFromGitHub { owner = "trufflesecurity"; repo = "trufflehog"; rev = "refs/tags/v${version}"; - hash = "sha256-dCjFMcLFOoAiOXRp0jhBTqYembLLsvDWMetGjRF083k="; + hash = "sha256-MFGOw7SuTCf4no5iUxppaNjsDvhsuQQXcXutE3L7iRk="; }; - vendorHash = "sha256-KyyJ7hUWF29L8oB9GkJ918/BQoLMsz+tStT2T9Azunk="; + vendorHash = "sha256-UqoFEvixSk42UTMswc8tUDVxYVkfgkern3NeDyiUMMw="; # Test cases run git clone and require network access doCheck = false; diff --git a/pkgs/tools/text/colordiff/default.nix b/pkgs/tools/text/colordiff/default.nix index df5b35dd9be..4146429e283 100644 --- a/pkgs/tools/text/colordiff/default.nix +++ b/pkgs/tools/text/colordiff/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "colordiff"; - version = "1.0.20"; + version = "1.0.21"; src = fetchFromGitHub { owner = "daveewart"; repo = "colordiff"; rev = "v${version}"; - sha256 = "sha256-+TtVnUX88LMd8zmhLsKTyR9JlgR7IkUB18PF3LRgPB0="; + sha256 = "sha256-TNOw6dqsT0dOIddRoGwEF85CaQF8ICMFUi+GiG5WWpk="; }; nativeBuildInputs = [ docbook_xml_dtd_412 docbook_xsl perl w3m-batch xmlto ]; diff --git a/pkgs/tools/text/difftastic/default.nix b/pkgs/tools/text/difftastic/default.nix index 581f441202e..fda81b589cd 100644 --- a/pkgs/tools/text/difftastic/default.nix +++ b/pkgs/tools/text/difftastic/default.nix @@ -9,13 +9,13 @@ rustPlatform.buildRustPackage rec { pname = "difftastic"; - version = "0.40.0"; + version = "0.41.0"; src = fetchFromGitHub { owner = "wilfred"; repo = pname; rev = version; - sha256 = "sha256-zLps/R3KMx51eGdHINmvq9Cv4JTkVSont3Gktwgxsrg="; + sha256 = "sha256-S2x4B/fQu8pmU3N+enkjv5L9SFRpu4buIiDX3nSFUk8="; }; depsExtraArgs = { @@ -40,7 +40,7 @@ rustPlatform.buildRustPackage rec { popd ''; }; - cargoSha256 = "sha256-kVJwGEY0TvsKzTbcSgOSWIhx8MbH/KNB3Q8KvQfhCac="; + cargoSha256 = "sha256-ZoduT/SzuSdwz0GJsSdEOabZyUYXpjjdahtwmKcpIT8="; passthru.tests.version = testers.testVersion { package = difftastic; }; diff --git a/pkgs/tools/text/mdbook-cmdrun/default.nix b/pkgs/tools/text/mdbook-cmdrun/default.nix new file mode 100644 index 00000000000..07252461336 --- /dev/null +++ b/pkgs/tools/text/mdbook-cmdrun/default.nix @@ -0,0 +1,26 @@ +{ lib, rustPlatform, fetchFromGitHub }: + +rustPlatform.buildRustPackage rec { + pname = "mdbook-cmdrun"; + version = "unstable-2023-01-10"; + + src = fetchFromGitHub { + owner = "FauconFan"; + repo = pname; + rev = "3f6d243cd9de5659f166a5642eb46b2a6d8384e7"; + hash = "sha256-JuKMAb3vwGTju9U1vaS9I39gObTz0JQQV4uol9SmsfM="; + }; + + # Tests are outdated currently, application works fine + # See for more info: https://github.com/FauconFan/mdbook-cmdrun/issues/2 + doCheck = false; + + cargoHash = "sha256-h3xCnx6byToZx83uWNLz05F3VIDR0D1NVtSOKPuYeG4="; + + meta = with lib; { + description = "mdbook preprocessor to run arbitrary commands"; + homepage = "https://github.com/FauconFan/mdbook-cmdrun"; + license = licenses.mit; + maintainers = with maintainers; [ pinpox ]; + }; +} diff --git a/pkgs/tools/text/mdbook-pdf/default.nix b/pkgs/tools/text/mdbook-pdf/default.nix index ca24909ed1d..020ebdc0ca3 100644 --- a/pkgs/tools/text/mdbook-pdf/default.nix +++ b/pkgs/tools/text/mdbook-pdf/default.nix @@ -1,28 +1,41 @@ -{ lib, stdenv, fetchCrate, rustPlatform, pkg-config, openssl, CoreServices }: +{ lib +, stdenv +, fetchCrate +, rustPlatform +, pkg-config +, openssl +, CoreServices +}: rustPlatform.buildRustPackage rec { pname = "mdbook-pdf"; - version = "0.1.3"; + version = "0.1.4"; src = fetchCrate { inherit pname version; - sha256 = "sha256-zFeEmIv3DIYKmhVYO9cJwRQbSP8yELaJjVjP7hYegco="; + hash = "sha256-v57Geqd1YCzR9oM97K+Y9OdeokzNc4Kbh0sDP0+vxjU="; }; - cargoHash = "sha256-pB7NEloeow4TE1Y1EMUZzeCJ/f4DnCS+sQlyN49gqzA="; + cargoHash = "sha256-mZUif1qBREM/5GYJU9m20p3rC3fnbZELcEKatwhoQEU="; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ + pkg-config + ]; - buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ CoreServices ]; + buildInputs = [ + openssl + ] ++ lib.optionals stdenv.isDarwin [ + CoreServices + ]; # No test. doCheck = false; meta = with lib; { description = "A backend for mdBook written in Rust for generating PDF"; + homepage = "https://github.com/HollowMan6/mdbook-pdf"; + changelog = "https://github.com/HollowMan6/mdbook-pdf/releases/tag/v${version}"; license = licenses.gpl3Plus; maintainers = with maintainers; [ hollowman6 ]; - homepage = "https://github.com/HollowMan6/mdbook-pdf"; }; } diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 6d5015876f5..ae689d89366 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -91,7 +91,6 @@ mapAliases ({ arduino_core = throw "'arduino_core' has been renamed to/replaced by 'arduino-core'"; # Converted to throw 2022-02-22 arora = throw "arora has been removed"; # Added 2020-09-09 asciidocFull = throw "'asciidocFull' has been renamed to/replaced by 'asciidoc-full'"; # Converted to throw 2022-02-22 - asn1c = throw "asn1c has been removed: deleted by upstream"; # Added 2022-01-07 asterisk_13 = throw "asterisk_13: Asterisk 13 is end of life and has been removed"; # Added 2022-04-06 asterisk_15 = throw "asterisk_15: Asterisk 15 is end of life and has been removed"; # Added 2020-10-07 asterisk_17 = throw "asterisk_17: Asterisk 17 is end of life and has been removed"; # Added 2022-04-06 @@ -1774,6 +1773,7 @@ mapAliases ({ zyn-fusion = zynaddsubfx; # Added 2022-08-05 inherit (stdenv.hostPlatform) system; # Added 2021-10-22 + inherit (stdenv) buildPlatform hostPlatform targetPlatform; # Added 2023-01-09 # LLVM packages for (integration) testing that should not be used inside Nixpkgs: llvmPackages_git = recurseIntoAttrs (callPackage ../development/compilers/llvm/git { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5e1d17b31f9..89ff4abfbfe 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -280,6 +280,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreServices; }; + asn1c = callPackage ../development/compilers/asn1c { }; + authy = callPackage ../applications/misc/authy { }; authz0 = callPackage ../tools/security/authz0 { }; @@ -1329,6 +1331,8 @@ with pkgs; cf-vault = callPackage ../tools/admin/cf-vault { }; + cfonts = callPackage ../tools/misc/cfonts { }; + bikeshed = python3Packages.callPackage ../applications/misc/bikeshed { }; cie-middleware-linux = callPackage ../tools/security/cie-middleware-linux { }; @@ -1429,6 +1433,8 @@ with pkgs; mnc = callPackage ../tools/misc/mnc { }; + mgmt = callPackage ../applications/system/mgmt {}; + mprocs = callPackage ../tools/misc/mprocs { }; nominatim = callPackage ../servers/nominatim { }; @@ -2682,6 +2688,8 @@ with pkgs; aws-sso-cli = callPackage ../tools/admin/aws-sso-cli { }; + aws-sso-creds = callPackage ../tools/admin/aws-sso-creds { }; + aws-vault = callPackage ../tools/admin/aws-vault { }; aws-workspaces = callPackage ../applications/networking/remote/aws-workspaces { }; @@ -6572,8 +6580,6 @@ with pkgs; easyrsa = callPackage ../tools/networking/easyrsa { }; - easyrsa2 = callPackage ../tools/networking/easyrsa/2.x.nix { }; - easysnap = callPackage ../tools/backup/easysnap { }; ebook_tools = callPackage ../tools/text/ebook-tools { }; @@ -8872,6 +8878,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreServices; }; + mdbook-cmdrun = callPackage ../tools/text/mdbook-cmdrun { }; + mdbook-graphviz = callPackage ../tools/text/mdbook-graphviz { inherit (darwin.apple_sdk.frameworks) CoreServices; }; @@ -11176,6 +11184,8 @@ with pkgs; retext = qt6Packages.callPackage ../applications/editors/retext { }; + rewrk = callPackage ../tools/networking/rewrk { }; + inherit (callPackage ../tools/security/rekor { }) rekor-cli rekor-server; @@ -15750,6 +15760,8 @@ with pkgs; stalin = callPackage ../development/compilers/stalin { }; + stanc = callPackage ../development/compilers/stanc { }; + metaBuildEnv = callPackage ../development/compilers/meta-environment/meta-build-env { }; svd2rust = callPackage ../development/tools/rust/svd2rust { }; @@ -16536,6 +16548,8 @@ with pkgs; trealla = callPackage ../development/interpreters/trealla { }; + waagent = callPackage ../applications/networking/cluster/waagent { }; + wapm-cli = callPackage ../tools/package-management/wapm/cli { inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; }; @@ -16923,7 +16937,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreServices; }; - buildBazelPackage = callPackage ../build-support/build-bazel-package { }; + buildBazelPackage = darwin.apple_sdk_11_0.callPackage ../build-support/build-bazel-package { }; bear = callPackage ../development/tools/build-managers/bear { }; @@ -17923,6 +17937,8 @@ with pkgs; nap = callPackage ../development/tools/nap { }; + nex = callPackage ../development/tools/parsing/nex {}; + ninja = callPackage ../development/tools/build-managers/ninja { }; nimbo = with python3Packages; callPackage ../applications/misc/nimbo { }; @@ -22631,6 +22647,10 @@ with pkgs; qgnomeplatform = libsForQt5.callPackage ../development/libraries/qgnomeplatform { }; + qgnomeplatform-qt6 = qt6Packages.callPackage ../development/libraries/qgnomeplatform { + useQt6 = true; + }; + randomx = darwin.apple_sdk_11_0.callPackage ../development/libraries/randomx { }; remodel = callPackage ../development/tools/remodel { @@ -23285,6 +23305,8 @@ with pkgs; vkdisplayinfo = callPackage ../tools/graphics/vkdisplayinfo { }; + vkdt = callPackage ../applications/graphics/vkdt { }; + vlock = callPackage ../misc/screensavers/vlock { }; virtualpg = callPackage ../development/libraries/virtualpg { }; @@ -25224,6 +25246,10 @@ with pkgs; audit = callPackage ../os-specific/linux/audit { }; + ath9k-htc-blobless-firmware = callPackage ../os-specific/linux/firmware/ath9k { }; + ath9k-htc-blobless-firmware-unstable = + callPackage ../os-specific/linux/firmware/ath9k { enableUnstable = true; }; + b43Firmware_5_1_138 = callPackage ../os-specific/linux/firmware/b43-firmware/5.1.138.nix { }; b43Firmware_6_30_163_46 = callPackage ../os-specific/linux/firmware/b43-firmware/6.30.163.46.nix { }; @@ -26489,6 +26515,10 @@ with pkgs; adwaita-qt = libsForQt5.callPackage ../data/themes/adwaita-qt { }; + adwaita-qt6 = qt6Packages.callPackage ../data/themes/adwaita-qt { + useQt6 = true; + }; + adw-gtk3 = callPackage ../data/themes/adw-gtk3 { }; agave = callPackage ../data/fonts/agave { }; @@ -28402,6 +28432,8 @@ with pkgs; dia = callPackage ../applications/graphics/dia { }; + digital = callPackage ../applications/science/electronics/digital {}; + direwolf = callPackage ../applications/radio/direwolf { hamlib = hamlib_4; }; @@ -29063,12 +29095,12 @@ with pkgs; gpx = callPackage ../applications/misc/gpx { }; - gqrx = callPackage ../applications/radio/gqrx { }; - gqrx-portaudio = callPackage ../applications/radio/gqrx { + gqrx = qt6Packages.callPackage ../applications/radio/gqrx { }; + gqrx-portaudio = qt6Packages.callPackage ../applications/radio/gqrx { portaudioSupport = true; pulseaudioSupport = false; }; - gqrx-gr-audio = callPackage ../applications/radio/gqrx { + gqrx-gr-audio = qt6Packages.callPackage ../applications/radio/gqrx { portaudioSupport = false; pulseaudioSupport = false; }; @@ -31221,7 +31253,6 @@ with pkgs; iwSupport = false; nlSupport = true; i3Support = true; - i3GapsSupport = false; }; yambar = callPackage ../applications/misc/yambar { }; @@ -32909,7 +32940,10 @@ with pkgs; transcribe = callPackage ../applications/audio/transcribe { }; - transmission = callPackage ../applications/networking/p2p/transmission { }; + transmission = callPackage ../applications/networking/p2p/transmission { + # https://github.com/NixOS/nixpkgs/issues/207047 + openssl = openssl_legacy; + }; libtransmission = transmission.override { installLib = true; enableDaemon = false; @@ -33965,6 +33999,8 @@ with pkgs; btcpayserver = callPackage ../applications/blockchains/btcpayserver { }; + btcpayserver-altcoins = callPackage ../applications/blockchains/btcpayserver { altcoinSupport = true; }; + charge-lnd = callPackage ../applications/blockchains/charge-lnd { }; cryptop = python3.pkgs.callPackage ../applications/blockchains/cryptop { }; @@ -35740,6 +35776,8 @@ with pkgs; autoconf = buildPackages.autoconf269; }; + kasmweb = callPackage ../servers/web-apps/kasmweb { }; + kssd = callPackage ../applications/science/biology/kssd { }; last = callPackage ../applications/science/biology/last { }; @@ -36335,9 +36373,7 @@ with pkgs; proverif = callPackage ../applications/science/logic/proverif { }; - satallax = callPackage ../applications/science/logic/satallax { - ocaml = ocaml-ng.ocamlPackages_4_01_0.ocaml; - }; + satallax = callPackage ../applications/science/logic/satallax { }; saw-tools = callPackage ../applications/science/logic/saw-tools {}; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4b89b98c0dc..e33fa5c4ca7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2481,6 +2481,8 @@ self: super: with self; { # Current latest django_4 = callPackage ../development/python-modules/django/4.nix { }; + django-admin-sortable2 = callPackage ../development/python-modules/django-admin-sortable2 { }; + django-allauth = callPackage ../development/python-modules/django-allauth { }; django-anymail = callPackage ../development/python-modules/django-anymail { }; @@ -2556,6 +2558,8 @@ self: super: with self; { django_hijack = callPackage ../development/python-modules/django-hijack { }; # This package may need an older version of Django. Override the package set and set e.g. `django = super.django_1_9`. See the Nixpkgs manual for examples on how to override the package set. + django-import-export = callPackage ../development/python-modules/django-import-export { }; + django-ipware = callPackage ../development/python-modules/django-ipware { }; django-jinja = callPackage ../development/python-modules/django-jinja2 { }; @@ -2588,6 +2592,8 @@ self: super: with self; { django-pglocks = callPackage ../development/python-modules/django-pglocks { }; + django-phonenumber-field = callPackage ../development/python-modules/django-phonenumber-field { }; + django-picklefield = callPackage ../development/python-modules/django-picklefield { }; django-polymorphic = callPackage ../development/python-modules/django-polymorphic { }; @@ -2614,6 +2620,8 @@ self: super: with self; { django-rest-polymorphic = callPackage ../development/python-modules/django-rest-polymorphic { }; + django-rest-registration = callPackage ../development/python-modules/django-rest-registration { }; + django-rq = callPackage ../development/python-modules/django-rq { }; djangorestframework = callPackage ../development/python-modules/djangorestframework { }; @@ -2662,6 +2670,8 @@ self: super: with self; { django-versatileimagefield = callPackage ../development/python-modules/django-versatileimagefield { }; + django-vite = callPackage ../development/python-modules/django-vite { }; + django-webpack-loader = callPackage ../development/python-modules/django-webpack-loader { }; django-widget-tweaks = callPackage ../development/python-modules/django-widget-tweaks { }; @@ -3819,6 +3829,10 @@ self: super: with self; { gmpy = callPackage ../development/python-modules/gmpy { }; + gmsh = toPythonModule (callPackage ../applications/science/math/gmsh { + enablePython = true; + }); + gntp = callPackage ../development/python-modules/gntp { }; gnureadline = callPackage ../development/python-modules/gnureadline { }; @@ -5164,8 +5178,6 @@ self: super: with self; { lcov_cobertura = callPackage ../development/python-modules/lcov_cobertura { }; - ld2410-ble = callPackage ../development/python-modules/ld2410-ble { }; - ldap3 = callPackage ../development/python-modules/ldap3 { }; ldapdomaindump = callPackage ../development/python-modules/ldapdomaindump { }; @@ -5624,6 +5636,8 @@ self: super: with self; { markupsafe = callPackage ../development/python-modules/markupsafe { }; + markuppy = callPackage ../development/python-modules/markuppy { }; + markups = callPackage ../development/python-modules/markups { }; marshmallow = callPackage ../development/python-modules/marshmallow { }; @@ -8480,8 +8494,6 @@ self: super: with self; { pypykatz = callPackage ../development/python-modules/pypykatz { }; - pytoolconfig = callPackage ../development/python-modules/pytoolconfig { }; - pypytools = callPackage ../development/python-modules/pypytools { }; pyqldb = callPackage ../development/python-modules/pyqldb { }; @@ -8874,6 +8886,8 @@ self: super: with self; { pytest-cache = self.pytestcache; # added 2021-01-04 pytestcache = callPackage ../development/python-modules/pytestcache { }; + pytest-base-url = callPackage ../development/python-modules/pytest-base-url { }; + pytest-cases = callPackage ../development/python-modules/pytest-cases{ }; pytest-catchlog = callPackage ../development/python-modules/pytest-catchlog { }; @@ -8976,6 +8990,8 @@ self: super: with self; { pytest-param-files = callPackage ../development/python-modules/pytest-param-files { }; + pytest-playwright = callPackage ../development/python-modules/pytest-playwright {}; + pytest-plt = callPackage ../development/python-modules/pytest-plt { }; pytest-pylint = callPackage ../development/python-modules/pytest-pylint { }; @@ -9395,6 +9411,8 @@ self: super: with self; { pytomlpp = callPackage ../development/python-modules/pytomlpp { }; + pytoolconfig = callPackage ../development/python-modules/pytoolconfig { }; + pytools = callPackage ../development/python-modules/pytools { }; pytorch-lightning = callPackage ../development/python-modules/pytorch-lightning { }; @@ -10334,6 +10352,8 @@ self: super: with self; { sfepy = callPackage ../development/python-modules/sfepy { }; + sfrbox-api = callPackage ../development/python-modules/sfrbox-api { }; + sgmllib3k = callPackage ../development/python-modules/sgmllib3k { }; sgp4 = callPackage ../development/python-modules/sgp4 { }; diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix index 3669b622e71..e5412c409ed 100644 --- a/pkgs/top-level/stage.nix +++ b/pkgs/top-level/stage.nix @@ -138,14 +138,6 @@ let inherit stdenv; }; - # The old identifiers for cross-compiling. These should eventually be removed, - # and the packages that rely on them refactored accordingly. - platformCompat = self: super: let - inherit (super.stdenv) buildPlatform hostPlatform targetPlatform; - in { - inherit buildPlatform hostPlatform targetPlatform; - }; - splice = self: super: import ./splice.nix lib self (adjacentPackages != null); allPackages = self: super: @@ -282,7 +274,6 @@ let # previous bootstrapping phases which have already been overlayed. toFix = lib.foldl' (lib.flip lib.extends) (self: {}) ([ stdenvBootstappingAndPlatforms - platformCompat stdenvAdapters trivialBuilders splice |