diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-08-18 00:01:46 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-08-18 00:01:46 +0000 |
commit | f1d7a13229bdf135d2701848045d846f83b77524 (patch) | |
tree | 95415eb78a9afb99b9c9e92c0fcb116d33268418 | |
parent | fbb4f932eeb6b4458051cd51001bf6c508eebfc3 (diff) | |
parent | 52042e1e9b1fb43a80d261e157cd6894aa1f88f2 (diff) |
Merge master into staging-next
41 files changed, 232 insertions, 845 deletions
diff --git a/nixos/modules/services/web-apps/photoprism.nix b/nixos/modules/services/web-apps/photoprism.nix index d5ca6014780ab..423ad5375baab 100644 --- a/nixos/modules/services/web-apps/photoprism.nix +++ b/nixos/modules/services/web-apps/photoprism.nix @@ -123,7 +123,7 @@ in RestrictNamespaces = true; RestrictRealtime = true; SystemCallArchitectures = "native"; - SystemCallFilter = [ "@system-service" "~@privileged @setuid @keyring" ]; + SystemCallFilter = [ "@system-service" "~@setuid @keyring" ]; UMask = "0066"; } // lib.optionalAttrs (cfg.port < 1024) { AmbientCapabilities = [ "CAP_NET_BIND_SERVICE" ]; diff --git a/nixos/modules/services/x11/window-managers/dwm.nix b/nixos/modules/services/x11/window-managers/dwm.nix index 1881826944aac..e114f2e26b170 100644 --- a/nixos/modules/services/x11/window-managers/dwm.nix +++ b/nixos/modules/services/x11/window-managers/dwm.nix @@ -24,7 +24,7 @@ in patches = [ (super.fetchpatch { url = "https://dwm.suckless.org/patches/steam/dwm-steam-6.2.diff"; - sha256 = "1ld1z3fh6p5f8gr62zknx3axsinraayzxw3rz1qwg73mx2zk5y1f"; + sha256 = "sha256-f3lffBjz7+0Khyn9c9orzReoLTqBb/9gVGshYARGdVc="; }) ]; }) diff --git a/nixos/tests/web-apps/mastodon/remote-postgresql.nix b/nixos/tests/web-apps/mastodon/remote-postgresql.nix index 2fd3983e13ec3..715477191bfbc 100644 --- a/nixos/tests/web-apps/mastodon/remote-postgresql.nix +++ b/nixos/tests/web-apps/mastodon/remote-postgresql.nix @@ -13,7 +13,7 @@ let in { name = "mastodon-remote-postgresql"; - meta.maintainers = with pkgs.lib.maintainers; [ erictapen izorkin turion ]; + meta.maintainers = with pkgs.lib.maintainers; [ erictapen izorkin ]; nodes = { database = { diff --git a/pkgs/applications/audio/musescore/default.nix b/pkgs/applications/audio/musescore/default.nix index ebfb7debfaeda..6c5b772521136 100644 --- a/pkgs/applications/audio/musescore/default.nix +++ b/pkgs/applications/audio/musescore/default.nix @@ -162,7 +162,7 @@ in stdenv'.mkDerivation rec { description = "Music notation and composition software"; homepage = "https://musescore.org/"; license = licenses.gpl3Only; - maintainers = with maintainers; [ vandenoever turion doronbehar ]; + maintainers = with maintainers; [ vandenoever doronbehar ]; # on aarch64-linux: # error: cannot convert '<brace-enclosed initializer list>' to 'float32x4_t' in assignment broken = (stdenv.isLinux && stdenv.isAarch64); diff --git a/pkgs/applications/editors/glow/default.nix b/pkgs/applications/editors/glow/default.nix index 5472b28b62b9f..cbd63c0ffcd08 100644 --- a/pkgs/applications/editors/glow/default.nix +++ b/pkgs/applications/editors/glow/default.nix @@ -1,5 +1,7 @@ -{ lib, buildGoModule, fetchFromGitHub }: - +{ lib +, buildGoModule +, fetchFromGitHub +}: buildGoModule rec { pname = "glow"; version = "1.5.0"; @@ -23,5 +25,6 @@ buildGoModule rec { changelog = "https://github.com/charmbracelet/glow/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ Br1ght0ne penguwin ]; + mainProgram = "glow"; }; } diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index e29227d11d609..f714e709f69b4 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -61,7 +61,7 @@ in downloadPage = "https://github.com/VSCodium/vscodium/releases"; license = licenses.mit; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - maintainers = with maintainers; [ synthetica turion bobby285271 ]; + maintainers = with maintainers; [ synthetica bobby285271 ]; mainProgram = "codium"; platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" "armv7l-linux" ]; }; diff --git a/pkgs/applications/file-managers/krusader/default.nix b/pkgs/applications/file-managers/krusader/default.nix index a8635a4163960..b2639fe849846 100644 --- a/pkgs/applications/file-managers/krusader/default.nix +++ b/pkgs/applications/file-managers/krusader/default.nix @@ -42,7 +42,7 @@ mkDerivation rec { homepage = "http://www.krusader.org"; description = "Norton/Total Commander clone for KDE"; license = licenses.gpl2Only; - maintainers = with maintainers; [ sander turion ]; + maintainers = with maintainers; [ sander ]; mainProgram = "krusader"; }; } diff --git a/pkgs/applications/kde/konsole.nix b/pkgs/applications/kde/konsole.nix index 9771e269faafd..1ef8da3d385d0 100644 --- a/pkgs/applications/kde/konsole.nix +++ b/pkgs/applications/kde/konsole.nix @@ -13,7 +13,7 @@ mkDerivation { homepage = "https://apps.kde.org/konsole/"; description = "KDE terminal emulator"; license = with lib.licenses; [ gpl2Plus lgpl21Plus fdl12Plus ]; - maintainers = with lib.maintainers; [ ttuegel turion ]; + maintainers = with lib.maintainers; [ ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ diff --git a/pkgs/applications/kde/okular.nix b/pkgs/applications/kde/okular.nix index 727fc673b1745..8079232b926cd 100644 --- a/pkgs/applications/kde/okular.nix +++ b/pkgs/applications/kde/okular.nix @@ -35,7 +35,7 @@ mkDerivation { homepage = "http://www.kde.org"; description = "KDE document viewer"; license = with licenses; [ gpl2Plus lgpl21Plus fdl12Plus bsd3 ]; - maintainers = with maintainers; [ ttuegel turion ]; + maintainers = with maintainers; [ ttuegel ]; platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/misc/keepassxc/default.nix b/pkgs/applications/misc/keepassxc/default.nix index 5b5ed2326d887..277a1b99cc1e8 100644 --- a/pkgs/applications/misc/keepassxc/default.nix +++ b/pkgs/applications/misc/keepassxc/default.nix @@ -129,7 +129,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://keepassxc.org/"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ jonafato turion srapenne ]; + maintainers = with maintainers; [ jonafato srapenne ]; platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/applications/misc/seatd/default.nix b/pkgs/applications/misc/seatd/default.nix index faf4dfb8b01ee..7cc2c967fe019 100644 --- a/pkgs/applications/misc/seatd/default.nix +++ b/pkgs/applications/misc/seatd/default.nix @@ -47,5 +47,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.mit; maintainers = with lib.maintainers; [ emantor ]; platforms = with lib.platforms; freebsd ++ linux ++ netbsd; + mainProgram = "seatd"; }; }) diff --git a/pkgs/applications/misc/tofi/default.nix b/pkgs/applications/misc/tofi/default.nix index 76c5b2047e30a..076a5af3cf1c8 100644 --- a/pkgs/applications/misc/tofi/default.nix +++ b/pkgs/applications/misc/tofi/default.nix @@ -38,5 +38,6 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = with maintainers; [ fbergroth ]; platforms = platforms.linux; + mainProgram = "tofi"; }; } diff --git a/pkgs/applications/science/logic/cvc5/default.nix b/pkgs/applications/science/logic/cvc5/default.nix index 23310163f279e..5357e1df54542 100644 --- a/pkgs/applications/science/logic/cvc5/default.nix +++ b/pkgs/applications/science/logic/cvc5/default.nix @@ -2,19 +2,19 @@ stdenv.mkDerivation rec { pname = "cvc5"; - version = "1.0.5"; + version = "1.0.6"; src = fetchFromGitHub { owner = "cvc5"; repo = "cvc5"; rev = "cvc5-${version}"; - hash = "sha256-l+L59QLLrAEVkAZjhxICJpa+j+jr1k/7B61JlapXGRI="; + hash = "sha256-pZiXAO92cwnYtaVMDFBEmk+NzDf4eKdc0eY0RltofPA="; }; nativeBuildInputs = [ pkg-config cmake flex ]; buildInputs = [ cadical.dev symfpu gmp gtest libantlr3c antlr3_4 boost jdk - (python3.withPackages (ps: with ps; [ pyparsing toml ])) + (python3.withPackages (ps: with ps; [ pyparsing tomli ])) ]; preConfigure = '' diff --git a/pkgs/applications/terminal-emulators/rxvt-unicode/default.nix b/pkgs/applications/terminal-emulators/rxvt-unicode/default.nix index 47cd84d948252..e932fcdea05f3 100644 --- a/pkgs/applications/terminal-emulators/rxvt-unicode/default.nix +++ b/pkgs/applications/terminal-emulators/rxvt-unicode/default.nix @@ -73,7 +73,12 @@ stdenv.mkDerivation { ./patches/9.06-font-width.patch ]) ++ [ ./patches/256-color-resources.patch - ]++ optional stdenv.isDarwin ./patches/makefile-phony.patch; + ] ++ optional (perlSupport && versionAtLeast perl.version "5.38") (fetchpatch { + name = "perl538-locale-c.patch"; + url = "https://github.com/exg/rxvt-unicode/commit/16634bc8dd5fc4af62faf899687dfa8f27768d15.patch"; + excludes = [ "Changes" ]; + sha256 = "sha256-JVqzYi3tcWIN2j5JByZSztImKqbbbB3lnfAwUXrumHM="; + }) ++ optional stdenv.isDarwin ./patches/makefile-phony.patch; configureFlags = [ "--with-terminfo=${placeholder "terminfo"}/share/terminfo" diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index ef2f132a2f2f2..6ccd9b7e125f4 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -40,14 +40,17 @@ in mapAliases { "@antora/cli" = pkgs.antora; # Added 2023-05-06 "@bitwarden/cli" = pkgs.bitwarden-cli; # added 2023-07-25 + "@emacs-eask/cli" = pkgs.eask; # added 2023-08-17 "@githubnext/github-copilot-cli" = pkgs.github-copilot-cli; # Added 2023-05-02 "@google/clasp" = pkgs.google-clasp; # Added 2023-05-07 + "@maizzle/cli" = pkgs.maizzle; # added 2023-08-17 "@nestjs/cli" = pkgs.nest-cli; # Added 2023-05-06 antennas = pkgs.antennas; # added 2023-07-30 balanceofsatoshis = pkgs.balanceofsatoshis; # added 2023-07-31 bibtex-tidy = pkgs.bibtex-tidy; # added 2023-07-30 bitwarden-cli = pkgs.bitwarden-cli; # added 2023-07-25 castnow = pkgs.castnow; # added 2023-07-30 + eask = pkgs.eask; # added 2023-08-17 eslint_d = pkgs.eslint_d; # Added 2023-05-26 flood = pkgs.flood; # Added 2023-07-25 gtop = pkgs.gtop; # added 2023-07-31 diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 16bde703ebbaf..3cf0e5e9c6074 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -5,9 +5,7 @@ , "@babel/cli" , "@commitlint/cli" , "@commitlint/config-conventional" -, "@emacs-eask/cli" , "@forge/cli" -, "@maizzle/cli" , "@medable/mdctl-cli" , "@mermaid-js/mermaid-cli" , "@microsoft/rush" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 153b9e23f41c4..cdf9b904fcfea 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -81163,42 +81163,6 @@ in bypassCache = true; reconstructLock = true; }; - "@emacs-eask/cli" = nodeEnv.buildNodePackage { - name = "_at_emacs-eask_slash_cli"; - packageName = "@emacs-eask/cli"; - version = "0.8.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@emacs-eask/cli/-/cli-0.8.1.tgz"; - sha512 = "+Z54Sh/vHWOXcbb495SjH5+4h9D3c5wNPebz83yfZIUHQ4DqxSB53l//Dse5P3UVt3okQeXdwGNuRN1VBf3brg=="; - }; - dependencies = [ - sources."ansi-regex-5.0.1" - sources."ansi-styles-4.3.0" - sources."cliui-8.0.1" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."emoji-regex-8.0.0" - sources."escalade-3.1.1" - sources."get-caller-file-2.0.5" - sources."is-fullwidth-code-point-3.0.0" - sources."require-directory-2.1.1" - sources."string-width-4.2.3" - sources."strip-ansi-6.0.1" - sources."wrap-ansi-7.0.0" - sources."y18n-5.0.8" - sources."yargs-17.7.2" - sources."yargs-parser-21.1.1" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "A set of command-line tools to build Emacs packages"; - homepage = "https://github.com/emacs-eask/cli#readme"; - license = "GPL-3.0"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; "@forge/cli" = nodeEnv.buildNodePackage { name = "_at_forge_slash_cli"; packageName = "@forge/cli"; @@ -82373,725 +82337,6 @@ in bypassCache = true; reconstructLock = true; }; - "@maizzle/cli" = nodeEnv.buildNodePackage { - name = "_at_maizzle_slash_cli"; - packageName = "@maizzle/cli"; - version = "1.5.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@maizzle/cli/-/cli-1.5.6.tgz"; - sha512 = "S+NzmN4VSmIu6vHVJ6hYUQj3xsksOpE82SGP97nMimabR282BM1l/FT71jOqbf+UAgjm2Q9TyIOeGtsWDsW+CQ=="; - }; - dependencies = [ - (sources."@babel/code-frame-7.22.10" // { - dependencies = [ - sources."ansi-styles-3.2.1" - sources."chalk-2.4.2" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."has-flag-3.0.0" - sources."supports-color-5.5.0" - ]; - }) - sources."@babel/helper-validator-identifier-7.22.5" - (sources."@babel/highlight-7.22.10" // { - dependencies = [ - sources."ansi-styles-3.2.1" - sources."chalk-2.4.2" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."has-flag-3.0.0" - sources."supports-color-5.5.0" - ]; - }) - (sources."@bconnorwhite/module-2.0.2" // { - dependencies = [ - sources."find-up-5.0.0" - sources."locate-path-6.0.0" - sources."p-limit-3.1.0" - sources."p-locate-5.0.0" - sources."path-exists-4.0.0" - ]; - }) - sources."@ljharb/through-2.3.9" - sources."@nodelib/fs.scandir-2.1.5" - sources."@nodelib/fs.stat-2.0.5" - sources."@nodelib/fs.walk-1.2.8" - sources."@pnpm/config.env-replace-1.1.0" - (sources."@pnpm/network.ca-file-1.0.2" // { - dependencies = [ - sources."graceful-fs-4.2.10" - ]; - }) - sources."@pnpm/npm-conf-2.2.2" - sources."@samverschueren/stream-to-observable-0.3.1" - sources."@sindresorhus/is-4.6.0" - sources."@szmarczak/http-timer-4.0.6" - sources."@types/cacheable-request-6.0.3" - sources."@types/http-cache-semantics-4.0.1" - sources."@types/keyv-3.1.4" - sources."@types/minimist-1.2.2" - sources."@types/node-20.4.9" - sources."@types/normalize-package-data-2.4.1" - sources."@types/responselike-1.0.0" - sources."aggregate-error-4.0.1" - sources."all-package-names-2.0.711" - sources."ansi-align-3.0.1" - sources."ansi-escapes-4.3.2" - sources."ansi-regex-5.0.1" - sources."ansi-styles-4.3.0" - sources."any-observable-0.3.0" - sources."argparse-2.0.1" - sources."arrify-1.0.1" - sources."balanced-match-1.0.2" - sources."base64-js-1.5.1" - sources."big-integer-1.6.51" - sources."bl-4.1.0" - (sources."boxen-7.1.1" // { - dependencies = [ - sources."ansi-regex-6.0.1" - sources."ansi-styles-6.2.1" - sources."chalk-5.3.0" - sources."emoji-regex-9.2.2" - sources."string-width-5.1.2" - sources."strip-ansi-7.1.0" - sources."type-fest-2.19.0" - sources."wrap-ansi-8.1.0" - ]; - }) - sources."bplist-parser-0.2.0" - sources."brace-expansion-1.1.11" - sources."braces-3.0.2" - sources."buffer-5.7.1" - sources."builtins-1.0.3" - sources."bundle-name-3.0.0" - sources."cacheable-lookup-5.0.4" - (sources."cacheable-request-7.0.4" // { - dependencies = [ - sources."get-stream-5.2.0" - ]; - }) - sources."callsites-3.1.0" - sources."camelcase-7.0.1" - (sources."camelcase-keys-8.0.2" // { - dependencies = [ - sources."type-fest-2.19.0" - ]; - }) - sources."chalk-4.1.2" - sources."chardet-0.7.0" - sources."ci-info-3.8.0" - (sources."clean-stack-4.2.0" // { - dependencies = [ - sources."escape-string-regexp-5.0.0" - ]; - }) - sources."cli-boxes-3.0.0" - sources."cli-cursor-3.1.0" - sources."cli-spinners-2.9.0" - (sources."cli-truncate-0.2.1" // { - dependencies = [ - sources."ansi-regex-2.1.1" - sources."is-fullwidth-code-point-1.0.0" - sources."string-width-1.0.2" - sources."strip-ansi-3.0.1" - ]; - }) - sources."cli-width-3.0.0" - sources."clone-1.0.4" - sources."clone-response-1.0.3" - sources."code-point-at-1.1.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."commander-10.0.1" - (sources."commander-version-1.1.0" // { - dependencies = [ - sources."commander-6.2.1" - ]; - }) - sources."concat-map-0.0.1" - (sources."config-chain-1.1.13" // { - dependencies = [ - sources."ini-1.3.8" - ]; - }) - (sources."configstore-6.0.0" // { - dependencies = [ - sources."dot-prop-6.0.1" - ]; - }) - sources."cosmiconfig-8.2.0" - sources."cross-spawn-7.0.3" - (sources."crypto-random-string-4.0.0" // { - dependencies = [ - sources."type-fest-1.4.0" - ]; - }) - sources."date-fns-1.30.1" - sources."decamelize-6.0.0" - (sources."decamelize-keys-2.0.1" // { - dependencies = [ - sources."type-fest-3.13.1" - ]; - }) - (sources."decompress-response-6.0.0" // { - dependencies = [ - sources."mimic-response-3.1.0" - ]; - }) - sources."deep-extend-0.6.0" - (sources."default-browser-4.0.0" // { - dependencies = [ - sources."execa-7.2.0" - sources."human-signals-4.3.1" - sources."is-stream-3.0.0" - sources."mimic-fn-4.0.0" - sources."npm-run-path-5.1.0" - sources."onetime-6.0.0" - sources."path-key-4.0.0" - sources."strip-final-newline-3.0.0" - ]; - }) - sources."default-browser-id-3.0.0" - sources."defaults-1.0.4" - sources."defer-to-connect-2.0.1" - sources."define-lazy-prop-3.0.0" - sources."del-7.0.0" - sources."dir-glob-3.0.1" - (sources."dot-prop-7.2.0" // { - dependencies = [ - sources."type-fest-2.19.0" - ]; - }) - sources."duplexer3-0.1.5" - sources."eastasianwidth-0.2.0" - sources."elegant-spinner-1.0.1" - sources."emoji-regex-8.0.0" - sources."end-of-stream-1.4.4" - sources."error-ex-1.3.2" - sources."escape-goat-4.0.0" - sources."escape-string-regexp-1.0.5" - sources."execa-5.1.1" - sources."exit-hook-3.2.0" - sources."external-editor-3.1.0" - sources."fast-glob-3.3.1" - sources."fastq-1.15.0" - sources."figures-3.2.0" - sources."fill-range-7.0.1" - (sources."find-up-4.1.0" // { - dependencies = [ - sources."path-exists-4.0.0" - ]; - }) - sources."form-data-encoder-2.1.4" - sources."fs-extra-10.1.0" - sources."fs.realpath-1.0.0" - sources."function-bind-1.1.1" - sources."get-stream-6.0.1" - sources."github-url-from-git-1.5.0" - sources."glob-7.2.3" - sources."glob-parent-5.1.2" - sources."global-dirs-3.0.1" - sources."globby-13.2.2" - sources."got-11.8.6" - sources."graceful-fs-4.2.11" - sources."hard-rejection-2.1.0" - sources."has-1.0.3" - (sources."has-ansi-2.0.0" // { - dependencies = [ - sources."ansi-regex-2.1.1" - ]; - }) - sources."has-flag-4.0.0" - sources."has-yarn-3.0.0" - sources."hosted-git-info-6.1.1" - sources."http-cache-semantics-4.1.1" - (sources."http2-wrapper-1.0.3" // { - dependencies = [ - sources."quick-lru-5.1.1" - ]; - }) - sources."human-signals-2.1.0" - sources."iconv-lite-0.4.24" - sources."ieee754-1.2.1" - sources."ignore-5.2.4" - (sources."ignore-walk-6.0.3" // { - dependencies = [ - sources."brace-expansion-2.0.1" - sources."minimatch-9.0.3" - ]; - }) - sources."import-cwd-3.0.0" - (sources."import-fresh-3.3.0" // { - dependencies = [ - sources."resolve-from-4.0.0" - ]; - }) - sources."import-from-3.0.0" - sources."import-lazy-4.0.0" - (sources."import-local-3.1.0" // { - dependencies = [ - sources."pkg-dir-4.2.0" - ]; - }) - sources."imurmurhash-0.1.4" - sources."indent-string-5.0.0" - sources."inflight-1.0.6" - sources."inherits-2.0.4" - sources."ini-2.0.0" - sources."inquirer-8.2.6" - (sources."inquirer-autosubmit-prompt-0.2.0" // { - dependencies = [ - sources."ansi-escapes-3.2.0" - sources."ansi-regex-3.0.1" - sources."ansi-styles-3.2.1" - sources."chalk-2.4.2" - sources."cli-cursor-2.1.0" - sources."cli-width-2.2.1" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."figures-2.0.0" - sources."has-flag-3.0.0" - sources."inquirer-6.5.2" - sources."is-fullwidth-code-point-2.0.0" - sources."mimic-fn-1.2.0" - sources."mute-stream-0.0.7" - sources."onetime-2.0.1" - sources."restore-cursor-2.0.0" - sources."rxjs-6.6.7" - (sources."string-width-2.1.1" // { - dependencies = [ - sources."strip-ansi-4.0.0" - ]; - }) - (sources."strip-ansi-5.2.0" // { - dependencies = [ - sources."ansi-regex-4.1.1" - ]; - }) - sources."supports-color-5.5.0" - sources."tslib-1.14.1" - ]; - }) - sources."is-arrayish-0.2.1" - sources."is-ci-3.0.1" - sources."is-core-module-2.13.0" - sources."is-docker-3.0.0" - sources."is-extglob-2.1.1" - sources."is-fullwidth-code-point-3.0.0" - sources."is-glob-4.0.3" - sources."is-inside-container-1.0.0" - (sources."is-installed-globally-0.4.0" // { - dependencies = [ - sources."is-path-inside-3.0.3" - ]; - }) - sources."is-interactive-2.0.0" - sources."is-name-taken-2.0.0" - sources."is-npm-6.0.0" - sources."is-number-7.0.0" - sources."is-obj-2.0.0" - (sources."is-observable-1.1.0" // { - dependencies = [ - sources."symbol-observable-1.2.0" - ]; - }) - sources."is-path-cwd-3.0.0" - sources."is-path-inside-4.0.0" - sources."is-plain-obj-1.1.0" - sources."is-promise-2.2.2" - sources."is-scoped-3.0.0" - sources."is-stream-2.0.1" - sources."is-typedarray-1.0.0" - sources."is-unicode-supported-1.3.0" - sources."is-url-superb-6.1.0" - (sources."is-wsl-2.2.0" // { - dependencies = [ - sources."is-docker-2.2.1" - ]; - }) - sources."is-yarn-global-0.4.1" - sources."isexe-2.0.0" - sources."issue-regex-4.1.0" - sources."js-tokens-4.0.0" - sources."js-yaml-4.1.0" - sources."json-buffer-3.0.1" - sources."json-parse-even-better-errors-2.3.1" - sources."jsonfile-6.1.0" - sources."keyv-4.5.3" - sources."kind-of-6.0.3" - sources."latest-version-7.0.0" - sources."lines-and-columns-1.2.4" - (sources."listr-0.14.3" // { - dependencies = [ - sources."is-stream-1.1.0" - sources."p-map-2.1.0" - sources."rxjs-6.6.7" - sources."tslib-1.14.1" - ]; - }) - (sources."listr-input-0.2.1" // { - dependencies = [ - sources."inquirer-7.3.3" - sources."rxjs-6.6.7" - sources."tslib-1.14.1" - ]; - }) - sources."listr-silent-renderer-1.1.1" - (sources."listr-update-renderer-0.5.0" // { - dependencies = [ - sources."ansi-regex-2.1.1" - sources."ansi-styles-2.2.1" - sources."chalk-1.1.3" - sources."figures-1.7.0" - sources."indent-string-3.2.0" - sources."log-symbols-1.0.2" - sources."strip-ansi-3.0.1" - sources."supports-color-2.0.0" - ]; - }) - (sources."listr-verbose-renderer-0.5.0" // { - dependencies = [ - sources."ansi-styles-3.2.1" - sources."chalk-2.4.2" - sources."cli-cursor-2.1.0" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."figures-2.0.0" - sources."has-flag-3.0.0" - sources."mimic-fn-1.2.0" - sources."onetime-2.0.1" - sources."restore-cursor-2.0.0" - sources."supports-color-5.5.0" - ]; - }) - sources."locate-path-5.0.0" - sources."lodash-4.17.21" - sources."lodash.isequal-4.5.0" - sources."lodash.zip-4.2.0" - (sources."log-symbols-5.1.0" // { - dependencies = [ - sources."chalk-5.3.0" - ]; - }) - (sources."log-update-2.3.0" // { - dependencies = [ - sources."ansi-escapes-3.2.0" - sources."ansi-regex-3.0.1" - sources."cli-cursor-2.1.0" - sources."is-fullwidth-code-point-2.0.0" - sources."mimic-fn-1.2.0" - sources."onetime-2.0.1" - sources."restore-cursor-2.0.0" - sources."string-width-2.1.1" - sources."strip-ansi-4.0.0" - sources."wrap-ansi-3.0.1" - ]; - }) - sources."lowercase-keys-2.0.0" - sources."lru-cache-7.18.3" - (sources."make-dir-3.1.0" // { - dependencies = [ - sources."semver-6.3.1" - ]; - }) - sources."map-obj-4.3.0" - (sources."meow-12.0.1" // { - dependencies = [ - sources."type-fest-3.13.1" - ]; - }) - sources."merge-stream-2.0.0" - sources."merge2-1.4.1" - sources."micromatch-4.0.5" - sources."mimic-fn-2.1.0" - sources."mimic-response-1.0.1" - sources."min-indent-1.0.1" - sources."minimatch-3.1.2" - sources."minimist-1.2.8" - sources."minimist-options-4.1.0" - sources."mute-stream-0.0.8" - (sources."new-github-release-url-2.0.0" // { - dependencies = [ - sources."type-fest-2.19.0" - ]; - }) - sources."normalize-package-data-5.0.0" - sources."normalize-url-6.1.0" - (sources."np-8.0.4" // { - dependencies = [ - sources."chalk-5.3.0" - sources."cli-width-4.1.0" - sources."escape-string-regexp-5.0.0" - sources."execa-7.2.0" - sources."figures-5.0.0" - sources."human-signals-4.3.1" - sources."inquirer-9.2.10" - sources."is-stream-3.0.0" - sources."mimic-fn-4.0.0" - sources."mute-stream-1.0.0" - sources."npm-run-path-5.1.0" - sources."onetime-6.0.0" - sources."path-key-4.0.0" - sources."run-async-3.0.0" - sources."strip-final-newline-3.0.0" - sources."update-notifier-6.0.2" - ]; - }) - sources."npm-name-7.1.0" - sources."npm-run-path-4.0.1" - sources."number-is-nan-1.0.1" - sources."object-assign-4.1.1" - sources."once-1.4.0" - sources."onetime-5.1.2" - sources."open-9.1.0" - (sources."ora-5.4.1" // { - dependencies = [ - sources."is-interactive-1.0.0" - sources."is-unicode-supported-0.1.0" - sources."log-symbols-4.1.0" - ]; - }) - sources."org-regex-1.0.0" - sources."os-tmpdir-1.0.2" - (sources."ow-1.1.1" // { - dependencies = [ - sources."@sindresorhus/is-5.6.0" - sources."callsites-4.0.0" - ]; - }) - sources."p-cancelable-2.1.1" - sources."p-limit-2.3.0" - sources."p-locate-4.1.0" - sources."p-lock-2.1.0" - sources."p-map-5.5.0" - (sources."p-memoize-7.1.1" // { - dependencies = [ - sources."mimic-fn-4.0.0" - sources."type-fest-3.13.1" - ]; - }) - sources."p-timeout-6.1.2" - sources."p-try-2.2.0" - (sources."package-json-8.1.1" // { - dependencies = [ - sources."@sindresorhus/is-5.6.0" - sources."@szmarczak/http-timer-5.0.1" - sources."cacheable-lookup-7.0.0" - sources."cacheable-request-10.2.13" - sources."got-12.6.1" - sources."http2-wrapper-2.2.0" - sources."lowercase-keys-3.0.0" - sources."mimic-response-4.0.0" - sources."normalize-url-8.0.0" - sources."p-cancelable-3.0.0" - sources."quick-lru-5.1.1" - sources."registry-auth-token-5.0.2" - sources."responselike-3.0.0" - ]; - }) - sources."package-name-conflict-1.0.3" - sources."parent-module-1.0.1" - sources."parse-json-5.2.0" - sources."parse-json-object-2.0.1" - sources."path-exists-5.0.0" - sources."path-is-absolute-1.0.1" - sources."path-key-3.1.1" - sources."path-type-4.0.0" - sources."picomatch-2.3.1" - (sources."pkg-dir-7.0.0" // { - dependencies = [ - sources."find-up-6.3.0" - sources."locate-path-7.2.0" - sources."p-limit-4.0.0" - sources."p-locate-6.0.0" - sources."yocto-queue-1.0.0" - ]; - }) - sources."prepend-http-2.0.0" - sources."progress-2.0.3" - sources."proto-list-1.2.4" - sources."pump-3.0.0" - sources."pupa-3.1.0" - sources."queue-microtask-1.2.3" - sources."quick-lru-6.1.1" - (sources."rc-1.2.8" // { - dependencies = [ - sources."ini-1.3.8" - ]; - }) - sources."read-file-safe-1.0.10" - (sources."read-json-safe-1.0.5" // { - dependencies = [ - sources."parse-json-object-1.1.0" - ]; - }) - (sources."read-pkg-7.1.0" // { - dependencies = [ - sources."hosted-git-info-4.1.0" - sources."lru-cache-6.0.0" - sources."normalize-package-data-3.0.3" - sources."type-fest-2.19.0" - ]; - }) - (sources."read-pkg-up-9.1.0" // { - dependencies = [ - sources."find-up-6.3.0" - sources."locate-path-7.2.0" - sources."p-limit-4.0.0" - sources."p-locate-6.0.0" - sources."type-fest-2.19.0" - sources."yocto-queue-1.0.0" - ]; - }) - sources."readable-stream-3.6.2" - sources."redent-4.0.0" - sources."registry-auth-token-4.2.2" - sources."registry-url-6.0.1" - sources."resolve-alpn-1.2.1" - sources."resolve-cwd-3.0.0" - sources."resolve-from-5.0.0" - sources."responselike-2.0.1" - sources."restore-cursor-3.1.0" - sources."reusify-1.0.4" - sources."rimraf-3.0.2" - sources."run-applescript-5.0.0" - sources."run-async-2.4.1" - sources."run-parallel-1.2.0" - sources."rxjs-7.8.1" - sources."safe-buffer-5.2.1" - sources."safer-buffer-2.1.2" - sources."scoped-regex-3.0.0" - (sources."semver-7.5.4" // { - dependencies = [ - sources."lru-cache-6.0.0" - ]; - }) - sources."semver-diff-4.0.0" - sources."shebang-command-2.0.0" - sources."shebang-regex-3.0.0" - sources."signal-exit-3.0.7" - sources."slash-4.0.0" - sources."slice-ansi-0.0.4" - sources."spdx-correct-3.2.0" - sources."spdx-exceptions-2.3.0" - sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.13" - sources."string-width-4.2.3" - sources."string_decoder-1.3.0" - sources."strip-ansi-6.0.1" - sources."strip-final-newline-2.0.0" - sources."strip-indent-4.0.0" - sources."strip-json-comments-2.0.1" - sources."supports-color-7.2.0" - sources."supports-hyperlinks-2.3.0" - sources."symbol-observable-4.0.0" - (sources."terminal-link-3.0.0" // { - dependencies = [ - sources."ansi-escapes-5.0.0" - sources."type-fest-1.4.0" - ]; - }) - sources."through-2.3.8" - sources."titleize-3.0.0" - sources."tmp-0.0.33" - sources."to-readable-stream-1.0.0" - sources."to-regex-range-5.0.1" - sources."trim-newlines-5.0.0" - sources."tslib-2.6.1" - sources."type-fest-0.21.3" - sources."typedarray-to-buffer-3.1.5" - sources."types-eslintrc-1.0.3" - sources."types-json-1.2.2" - sources."types-pkg-json-1.2.1" - sources."unique-string-3.0.0" - sources."universalify-2.0.0" - sources."untildify-4.0.0" - (sources."update-notifier-5.1.0" // { - dependencies = [ - sources."@sindresorhus/is-0.14.0" - sources."@szmarczak/http-timer-1.1.2" - sources."boxen-5.1.2" - (sources."cacheable-request-6.1.0" // { - dependencies = [ - sources."get-stream-5.2.0" - sources."lowercase-keys-2.0.0" - ]; - }) - sources."camelcase-6.3.0" - sources."ci-info-2.0.0" - sources."cli-boxes-2.2.1" - sources."configstore-5.0.1" - sources."crypto-random-string-2.0.0" - sources."decompress-response-3.3.0" - sources."defer-to-connect-1.1.3" - sources."dot-prop-5.3.0" - sources."escape-goat-2.1.1" - sources."get-stream-4.1.0" - sources."got-9.6.0" - sources."has-yarn-2.1.0" - sources."import-lazy-2.1.0" - sources."is-ci-2.0.0" - sources."is-npm-5.0.0" - sources."is-yarn-global-0.3.0" - sources."json-buffer-3.0.0" - sources."keyv-3.1.0" - sources."latest-version-5.1.0" - sources."lowercase-keys-1.0.1" - sources."normalize-url-4.5.1" - sources."p-cancelable-1.1.0" - (sources."package-json-6.5.0" // { - dependencies = [ - sources."semver-6.3.1" - ]; - }) - sources."pupa-2.1.1" - sources."registry-url-5.1.0" - sources."responselike-1.0.2" - (sources."semver-diff-3.1.1" // { - dependencies = [ - sources."semver-6.3.1" - ]; - }) - sources."type-fest-0.20.2" - sources."unique-string-2.0.0" - sources."widest-line-3.1.0" - sources."wrap-ansi-7.0.0" - sources."xdg-basedir-4.0.0" - ]; - }) - sources."url-parse-lax-3.0.0" - sources."util-deprecate-1.0.2" - sources."vali-date-1.0.0" - sources."validate-npm-package-license-3.0.4" - sources."validate-npm-package-name-3.0.0" - sources."wcwidth-1.0.1" - sources."which-2.0.2" - (sources."widest-line-4.0.1" // { - dependencies = [ - sources."ansi-regex-6.0.1" - sources."emoji-regex-9.2.2" - sources."string-width-5.1.2" - sources."strip-ansi-7.1.0" - ]; - }) - sources."wrap-ansi-6.2.0" - sources."wrappy-1.0.2" - sources."write-file-atomic-3.0.3" - sources."xdg-basedir-5.1.0" - sources."yallist-4.0.0" - sources."yargs-parser-21.1.1" - sources."yocto-queue-0.1.0" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "CLI tool for the Maizzle Email Framework"; - homepage = "https://maizzle.com"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; "@medable/mdctl-cli" = nodeEnv.buildNodePackage { name = "_at_medable_slash_mdctl-cli"; packageName = "@medable/mdctl-cli"; diff --git a/pkgs/development/node-packages/overrides.nix b/pkgs/development/node-packages/overrides.nix index c32ce3868047e..c4ddc2a40a591 100644 --- a/pkgs/development/node-packages/overrides.nix +++ b/pkgs/development/node-packages/overrides.nix @@ -112,9 +112,6 @@ final: prev: { meta = oldAttrs.meta // { broken = since "12"; }; }); - eask = prev."@emacs-eask/cli".override { - name = "eask"; - }; expo-cli = prev."expo-cli".override (oldAttrs: { # The traveling-fastlane-darwin optional dependency aborts build on Linux. diff --git a/pkgs/development/python-modules/cassandra-driver/default.nix b/pkgs/development/python-modules/cassandra-driver/default.nix index 9b8d0fcd5ff85..5d6c520ad3c16 100644 --- a/pkgs/development/python-modules/cassandra-driver/default.nix +++ b/pkgs/development/python-modules/cassandra-driver/default.nix @@ -110,6 +110,6 @@ buildPythonPackage rec { homepage = "http://datastax.github.io/python-driver"; changelog = "https://github.com/datastax/python-driver/blob/${version}/CHANGELOG.rst"; license = licenses.asl20; - maintainers = with maintainers; [ turion ris ]; + maintainers = with maintainers; [ ris ]; }; } diff --git a/pkgs/development/python-modules/ecs-logging/default.nix b/pkgs/development/python-modules/ecs-logging/default.nix index 0b5ed781c1a96..07def603cb706 100644 --- a/pkgs/development/python-modules/ecs-logging/default.nix +++ b/pkgs/development/python-modules/ecs-logging/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "ecs-logging"; - version = "2.0.2"; + version = "2.1.0"; format = "flit"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "elastic"; repo = "ecs-logging-python"; rev = "refs/tags/${version}"; - hash = "sha256-CfPpUpzNfPuCAiuNsJrJ1nVLiUCPvclfrK7tByytoQE="; + hash = "sha256-Gf44bT3/gmHy+yaQ1+bhCFB33ym2G14tzNqTQyC3BJU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/elasticsearch8/default.nix b/pkgs/development/python-modules/elasticsearch8/default.nix index ead2f6b07ee61..6893a8353dff4 100644 --- a/pkgs/development/python-modules/elasticsearch8/default.nix +++ b/pkgs/development/python-modules/elasticsearch8/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "elasticsearch8"; - version = "8.7.0"; + version = "8.9.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-mRy48OYsm+0M1/D+abs83RiqN8wQr/Z6SZUY4TNg190="; + hash = "sha256-9j71MX3ITwfwFfIVvQIbXHu4r/3qz9SNAz8XfeAyWTc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/es-client/default.nix b/pkgs/development/python-modules/es-client/default.nix index 5e43edc6da6b6..ffa9d07f495d6 100644 --- a/pkgs/development/python-modules/es-client/default.nix +++ b/pkgs/development/python-modules/es-client/default.nix @@ -10,6 +10,7 @@ , pytest-asyncio , pytestCheckHook , pythonOlder +, pythonRelaxDepsHook , pyyaml , requests , six @@ -18,7 +19,7 @@ buildPythonPackage rec { pname = "es-client"; - version = "8.7.0"; + version = "8.9.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -27,11 +28,14 @@ buildPythonPackage rec { owner = "untergeek"; repo = "es_client"; rev = "refs/tags/v${version}"; - hash = "sha256-DJIo0yFJGR9gw5UJnmgnBFZx0uXUEW3rWT49jhfnXkQ="; + hash = "sha256-pzCjVkZ/NmHSe6X8dNH1YvjTu3njQaJe4CuguqrJNs8="; }; + pythonRelaxDeps = true; + nativeBuildInputs = [ hatchling + pythonRelaxDepsHook ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/gremlinpython/default.nix b/pkgs/development/python-modules/gremlinpython/default.nix index de5e03d613211..49401b44532ac 100644 --- a/pkgs/development/python-modules/gremlinpython/default.nix +++ b/pkgs/development/python-modules/gremlinpython/default.nix @@ -79,6 +79,6 @@ buildPythonPackage rec { description = "Gremlin-Python implements Gremlin, the graph traversal language of Apache TinkerPop, within the Python language"; homepage = "https://tinkerpop.apache.org/"; license = licenses.asl20; - maintainers = with maintainers; [ turion ris ]; + maintainers = with maintainers; [ ris ]; }; } diff --git a/pkgs/development/python-modules/irc/default.nix b/pkgs/development/python-modules/irc/default.nix index e252987e3fb01..a068d26695e53 100644 --- a/pkgs/development/python-modules/irc/default.nix +++ b/pkgs/development/python-modules/irc/default.nix @@ -1,51 +1,55 @@ { lib , buildPythonPackage , fetchPypi -, isPy3k -, six +, jaraco-collections +, jaraco-itertools , jaraco-logging -, jaraco-text , jaraco-stream +, jaraco-text +, pytestCheckHook +, pythonOlder , pytz -, jaraco-itertools , setuptools-scm -, jaraco-collections -, importlib-metadata }: buildPythonPackage rec { pname = "irc"; - version = "20.1.0"; + version = "20.3.0"; format = "pyproject"; - disabled = !isPy3k; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-tvc3ky3UeR87GOMZ3nt9rwLSKFpr6iY9EB9NjlU4B+w="; + hash = "sha256-JFteqYqwAlZnYx53alXjGRfmDvcIxgEC8hmLyfURMjY="; }; - nativeBuildInputs = [ setuptools-scm ]; + nativeBuildInputs = [ + setuptools-scm + ]; propagatedBuildInputs = [ - six - importlib-metadata + jaraco-collections + jaraco-itertools jaraco-logging - jaraco-text jaraco-stream + jaraco-text pytz - jaraco-itertools - jaraco-collections ]; - doCheck = false; + nativeCheckInputs = [ + pytestCheckHook + ]; - pythonImportsCheck = [ "irc" ]; + pythonImportsCheck = [ + "irc" + ]; meta = with lib; { description = "IRC (Internet Relay Chat) protocol library for Python"; homepage = "https://github.com/jaraco/irc"; + changelog = "https://github.com/jaraco/irc/blob/v${version}/NEWS.rst"; license = licenses.mit; - maintainers = with maintainers; []; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/jupyterhub-tmpauthenticator/default.nix b/pkgs/development/python-modules/jupyterhub-tmpauthenticator/default.nix index 2aef23fe4a4ab..0c18569c4b5c5 100644 --- a/pkgs/development/python-modules/jupyterhub-tmpauthenticator/default.nix +++ b/pkgs/development/python-modules/jupyterhub-tmpauthenticator/default.nix @@ -7,25 +7,32 @@ buildPythonPackage rec { pname = "jupyterhub-tmpauthenticator"; - version = "0.6"; - disabled = pythonOlder "3.5"; + version = "1.0.0"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - sha256 = "064x1ypxwx1l270ic97p8czbzb7swl9758v40k3w2gaqf9762f0l"; + hash = "sha256-7TuAYP6mRffsZL+O+AMgt5HBu6PhwLYj5A8X8DnMfl0="; }; - propagatedBuildInputs = [ jupyterhub ]; + propagatedBuildInputs = [ + jupyterhub + ]; # No tests available in the package doCheck = false; - pythonImportsCheck = [ "tmpauthenticator" ]; + pythonImportsCheck = [ + "tmpauthenticator" + ]; meta = with lib; { - description = "Simple Jupyterhub authenticator that allows anyone to log in."; - license = with licenses; [ bsd3 ]; + description = "Simple Jupyterhub authenticator that allows anyone to log in"; homepage = "https://github.com/jupyterhub/tmpauthenticator"; + changelog = "https://github.com/jupyterhub/tmpauthenticator/blob/v${version}/CHANGELOG.md"; + license = with licenses; [ bsd3 ]; maintainers = with maintainers; [ chiroptical ]; }; } diff --git a/pkgs/development/python-modules/mkdocs-mermaid2-plugin/default.nix b/pkgs/development/python-modules/mkdocs-mermaid2-plugin/default.nix index 8202b769415e3..2058bd71db6dd 100644 --- a/pkgs/development/python-modules/mkdocs-mermaid2-plugin/default.nix +++ b/pkgs/development/python-modules/mkdocs-mermaid2-plugin/default.nix @@ -1,4 +1,6 @@ -{ lib, buildPythonPackage, fetchFromGitHub +{ lib +, buildPythonPackage +, fetchFromGitHub , beautifulsoup4 , jsbeautifier , mkdocs @@ -6,17 +8,21 @@ , pymdown-extensions , pyyaml , requests +, pythonOlder }: buildPythonPackage rec { pname = "mkdocs-mermaid2-plugin"; - version = "0.6.0"; + version = "1.0.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "fralau"; repo = "mkdocs-mermaid2-plugin"; - rev = "v${version}"; - hash = "sha256-Oe6wkVrsB0NWF+HHeifrEogjxdGPINRDJGkh9p+GoHs="; + rev = "refs/tags/v${version}"; + hash = "sha256-8/5lltOT78VSMxunIfCeGSBQ7VIRVnk3cHIzd7S+c00="; }; propagatedBuildInputs = [ @@ -32,11 +38,14 @@ buildPythonPackage rec { # non-traditional python tests (e.g. nodejs based tests) doCheck = false; - pythonImportsCheck = [ "mermaid2" ]; + pythonImportsCheck = [ + "mermaid2" + ]; meta = with lib; { description = "A MkDocs plugin for including mermaid graphs in markdown sources"; homepage = "https://github.com/fralau/mkdocs-mermaid2-plugin"; + changelog = "https://github.com/fralau/mkdocs-mermaid2-plugin/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ jonringer ]; }; diff --git a/pkgs/development/python-modules/opower/default.nix b/pkgs/development/python-modules/opower/default.nix index dc9b5c1d9c5fc..226c506300f85 100644 --- a/pkgs/development/python-modules/opower/default.nix +++ b/pkgs/development/python-modules/opower/default.nix @@ -51,6 +51,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module for getting historical and forecasted usage/cost from utilities that use opower.com"; homepage = "https://github.com/tronikos/opower"; + changelog = "https://github.com/tronikos/opower/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/pex/default.nix b/pkgs/development/python-modules/pex/default.nix index cafca7c29e099..ad8de4b2d1380 100644 --- a/pkgs/development/python-modules/pex/default.nix +++ b/pkgs/development/python-modules/pex/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pex"; - version = "2.1.141"; + version = "2.1.142"; format = "flit"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-EsIurZNgWslUciz5Pc2hj2F4tAJ8hQydRWnVIWdryDc="; + hash = "sha256-+2WJEOL+rtdl9dZmXqkaRRuj7TzDZn93tyZXxPWRaBM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/progressbar2/default.nix b/pkgs/development/python-modules/progressbar2/default.nix index 29b361344b626..349757bcffb01 100644 --- a/pkgs/development/python-modules/progressbar2/default.nix +++ b/pkgs/development/python-modules/progressbar2/default.nix @@ -40,6 +40,6 @@ buildPythonPackage rec { description = "Text progressbar library"; homepage = "https://progressbar-2.readthedocs.io/"; license = licenses.bsd3; - maintainers = with maintainers; [ ashgillman turion ]; + maintainers = with maintainers; [ ashgillman ]; }; } diff --git a/pkgs/development/python-modules/types-redis/default.nix b/pkgs/development/python-modules/types-redis/default.nix index e191d56d69d56..8275ed31f9443 100644 --- a/pkgs/development/python-modules/types-redis/default.nix +++ b/pkgs/development/python-modules/types-redis/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "types-redis"; - version = "4.6.0.3"; + version = "4.6.0.4"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-797zfcDAS/V4YZVlH9aU+L/daT6sCexK9G2Q9yZSVY8="; + hash = "sha256-xHWp089z3WlsOIfTBkQyP8VvXgCvlhUQNbO1tSh1ybM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/tools/eask/default.nix b/pkgs/development/tools/eask/default.nix new file mode 100644 index 0000000000000..799a507fee353 --- /dev/null +++ b/pkgs/development/tools/eask/default.nix @@ -0,0 +1,29 @@ +{ lib +, buildNpmPackage +, fetchFromGitHub +}: + +buildNpmPackage rec { + pname = "eask"; + version = "0.8.1"; + + src = fetchFromGitHub { + owner = "emacs-eask"; + repo = "cli"; + rev = version; + hash = "sha256-NoYWRIkJEOUsHsjBYTtCNrCmAGG0pqaAHDOc9VcaRwk="; + }; + + npmDepsHash = "sha256-ctIVBrx9fagSX3f2/wn5wWkReOYK0nldFoxTJWVsx0g="; + + dontBuild = true; + + meta = { + changelog = "https://github.com/emacs-eask/cli/blob/${src.rev}/CHANGELOG.md"; + description = "CLI for building, runing, testing, and managing your Emacs Lisp dependencies"; + homepage = "https://emacs-eask.github.io/"; + license = lib.licenses.gpl3Plus; + mainProgram = "eask"; + maintainers = with lib.maintainers; [ jcs090218 ]; + }; +} diff --git a/pkgs/development/tools/eslint_d/default.nix b/pkgs/development/tools/eslint_d/default.nix index abaf5857cf791..a49dbfdefc7ad 100644 --- a/pkgs/development/tools/eslint_d/default.nix +++ b/pkgs/development/tools/eslint_d/default.nix @@ -20,5 +20,6 @@ buildNpmPackage rec { homepage = "github.com/mantoni/eslint_d.js"; license = licenses.mit; maintainers = [ maintainers.ehllie ]; + mainProgram = "eslint_d"; }; } diff --git a/pkgs/development/tools/maizzle/default.nix b/pkgs/development/tools/maizzle/default.nix new file mode 100644 index 0000000000000..11279b98de801 --- /dev/null +++ b/pkgs/development/tools/maizzle/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildNpmPackage +, fetchFromGitHub +}: + +buildNpmPackage rec { + pname = "maizzle"; + version = "1.5.6"; + + src = fetchFromGitHub { + owner = "maizzle"; + repo = "cli"; + rev = "v${version}"; + hash = "sha256-HGoqwqO50Y1oZBCVXkgM3NyZu+vPz/iniEH9mm/SQ1I="; + }; + + npmDepsHash = "sha256-vqhuoTtrZYmxameaoOfA9N5QGXzdhT1/tWx70KBk5aI="; + + dontNpmBuild = true; + + meta = { + description = "CLI tool for the Maizzle Email Framework"; + homepage = "https://github.com/maizzle/cli"; + license = lib.licenses.mit; + mainProgram = "maizzle"; + maintainers = with lib.maintainers; [ happysalada ]; + }; +} diff --git a/pkgs/servers/http/dufs/default.nix b/pkgs/servers/http/dufs/default.nix index b139577a86644..65582acd9cab3 100644 --- a/pkgs/servers/http/dufs/default.nix +++ b/pkgs/servers/http/dufs/default.nix @@ -1,17 +1,24 @@ -{ stdenv, lib, fetchFromGitHub, rustPlatform, Security, openssl, pkg-config }: +{ lib +, rustPlatform +, fetchFromGitHub +, stdenv +, pkg-config +, openssl +, darwin +}: rustPlatform.buildRustPackage rec { pname = "dufs"; - version = "0.34.2"; + version = "0.35.0"; src = fetchFromGitHub { owner = "sigoden"; repo = pname; rev = "v${version}"; - sha256 = "sha256-NkH7w5HEQFhnovUmjN/qW5QZwO8mVQZMbhpNFkKtLTI="; + sha256 = "sha256-FrLvwXEnNEKi8FvPIs6A52WpSUT+pUCc61JBi9M/PPw="; }; - cargoHash = "sha256-bUznaVyhZswLaXUgC+GUh5ZpJQW7Vkcoui6CO9ds22g="; + cargoHash = "sha256-YHFEjs8a1QJHWYVjAQxmpMIQ2aDbu6mxeuNqcvReYR0="; nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config @@ -20,7 +27,7 @@ rustPlatform.buildRustPackage rec { buildInputs = lib.optionals stdenv.isLinux [ openssl ] ++ lib.optionals stdenv.isDarwin [ - Security + darwin.apple_sdk.frameworks.Security ]; # FIXME: checkPhase on darwin will leave some zombie spawn processes @@ -34,7 +41,8 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "A file server that supports static serving, uploading, searching, accessing control, webdav"; homepage = "https://github.com/sigoden/dufs"; + changelog = "https://github.com/sigoden/dufs/blob/${src.rev}/CHANGELOG.md"; license = with licenses; [ asl20 /* or */ mit ]; - maintainers = [ maintainers.holymonson ]; + maintainers = with maintainers; [ figsoda holymonson ]; }; } diff --git a/pkgs/tools/admin/elasticsearch-curator/default.nix b/pkgs/tools/admin/elasticsearch-curator/default.nix index 77acc590e1d48..f09aad4a93e3a 100644 --- a/pkgs/tools/admin/elasticsearch-curator/default.nix +++ b/pkgs/tools/admin/elasticsearch-curator/default.nix @@ -5,27 +5,27 @@ python3.pkgs.buildPythonApplication rec { pname = "elasticsearch-curator"; - version = "8.0.4"; + version = "8.0.8"; format = "pyproject"; src = fetchFromGitHub { owner = "elastic"; repo = "curator"; rev = "refs/tags/v${version}"; - hash = "sha256-FPp2BpfYsmNwwevYQ6EH3N1q0TjyeEsBeDM9EUbLl+Q="; + hash = "sha256-G8wKeEr7TuUWlqz9hJmnJW7yxn+4WPoStVC0AX5jdHI="; }; - pythonRelaxDeps = [ - "click" - "ecs-logging" - "elasticsearch8" - "es_client" - "pyyaml" - ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "elasticsearch8==" "elasticsearch8>=" \ + --replace "es_client==" "es_client>=" \ + --replace "ecs-logging==" "ecs-logging>=" \ + --replace "click==" "click>="\ + --replace "pyyaml==" "pyyaml>=" + ''; nativeBuildInputs = with python3.pkgs; [ hatchling - pythonRelaxDepsHook ]; propagatedBuildInputs = with python3.pkgs; [ @@ -77,8 +77,9 @@ python3.pkgs.buildPythonApplication rec { ]; meta = with lib; { - homepage = "https://github.com/elastic/curator"; description = "Curate, or manage, your Elasticsearch indices and snapshots"; + homepage = "https://github.com/elastic/curator"; + changelog = "https://github.com/elastic/curator/releases/tag/v${version}"; license = licenses.asl20; longDescription = '' Elasticsearch Curator helps you curate, or manage, your Elasticsearch @@ -92,7 +93,6 @@ python3.pkgs.buildPythonApplication rec { * Perform various actions on the items which remain in the actionable list. ''; - changelog = "https://github.com/elastic/curator/releases/tag/v${version}"; maintainers = with maintainers; [ basvandijk ]; }; } diff --git a/pkgs/tools/archivers/zip/default.nix b/pkgs/tools/archivers/zip/default.nix index 75a7c81f3276c..1ac615a3d90ff 100644 --- a/pkgs/tools/archivers/zip/default.nix +++ b/pkgs/tools/archivers/zip/default.nix @@ -44,5 +44,6 @@ stdenv.mkDerivation rec { license = licenses.bsdOriginal; platforms = platforms.all; maintainers = [ ]; + mainProgram = "zip"; }; } diff --git a/pkgs/tools/misc/catimg/default.nix b/pkgs/tools/misc/catimg/default.nix index 6230b21c3872a..9edfc576837d9 100644 --- a/pkgs/tools/misc/catimg/default.nix +++ b/pkgs/tools/misc/catimg/default.nix @@ -19,6 +19,7 @@ stdenv.mkDerivation rec { description = "Insanely fast image printing in your terminal"; maintainers = with maintainers; [ ryantm ]; platforms = platforms.unix; + mainProgram = "catimg"; }; } diff --git a/pkgs/tools/misc/staruml/default.nix b/pkgs/tools/misc/staruml/default.nix index 72d3e64214d90..e3ce070894139 100644 --- a/pkgs/tools/misc/staruml/default.nix +++ b/pkgs/tools/misc/staruml/default.nix @@ -6,7 +6,8 @@ , atk, at-spi2-atk, dbus , gdk-pixbuf, pango, cairo , expat, libdrm, mesa -, alsa-lib, at-spi2-core, cups }: +, alsa-lib, at-spi2-core, cups +, libxkbcommon }: let LD_LIBRARY_PATH = lib.makeLibraryPath [ @@ -14,21 +15,22 @@ let xorg.libX11 xorg.libxcb xorg.libXcomposite xorg.libXcursor xorg.libXext xorg.libXfixes xorg.libXi xorg.libXrender xorg.libXtst - nss nspr atk at-spi2-atk dbus - gdk-pixbuf pango cairo + xorg.libxshmfence libxkbcommon nss + nspr atk at-spi2-atk + dbus gdk-pixbuf pango cairo xorg.libXrandr expat libdrm mesa alsa-lib at-spi2-core cups ]; in stdenv.mkDerivation rec { - version = "4.1.6"; + version = "5.1.0"; pname = "staruml"; src = fetchurl { - url = "https://staruml.io/download/releases-v4/StarUML_${version}_amd64.deb"; - sha256 = "sha256-CUOdpR8RExMLeOX8469egENotMNuPU4z8S1IGqA21z0="; + url = "https://staruml-7a0.kxcdn.com/releases-v5/StarUML_${version}_amd64.deb"; + sha256 = "sha256-da1mY3OW24g6Ix0L57CBPbaMeSLzhOOjoBsyZszmNOc="; }; nativeBuildInputs = [ wrapGAppsHook dpkg ]; diff --git a/pkgs/tools/misc/ulid/default.nix b/pkgs/tools/misc/ulid/default.nix new file mode 100644 index 0000000000000..f2ff23addfe75 --- /dev/null +++ b/pkgs/tools/misc/ulid/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "ulid"; + version = "2.1.0"; + + src = fetchFromGitHub { + owner = "oklog"; + repo = "ulid"; + rev = "v${version}"; + hash = "sha256-/oQPgcO1xKbHXutxz0WPfIduShPrfH1l+7/mj8jLst8="; + }; + + vendorHash = "sha256-s1YkEwFxE1zpUUCgwOAl8i6/9HB2rcGG+4kqnixTit0="; + + ldflags = [ "-s" "-w" ]; + + checkFlags = [ + # skip flaky test + "-skip=TestMonotonicSafe" + ]; + + meta = with lib; { + description = "Universally Unique Lexicographically Sortable Identifier (ULID) in Go"; + homepage = "https://github.com/oklog/ulid"; + changelog = "https://github.com/oklog/ulid/blob/${src.rev}/CHANGELOG.md"; + license = licenses.asl20; + maintainers = with maintainers; [ figsoda ]; + mainProgram = "ulid"; + }; +} diff --git a/pkgs/tools/wayland/cliphist/default.nix b/pkgs/tools/wayland/cliphist/default.nix index 9ca747ca46baf..163a15d2adc1d 100644 --- a/pkgs/tools/wayland/cliphist/default.nix +++ b/pkgs/tools/wayland/cliphist/default.nix @@ -19,5 +19,6 @@ buildGoModule rec { license = licenses.gpl3Only; platforms = platforms.linux; maintainers = with maintainers; [ dit7ya ]; + mainProgram = "cliphist"; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0ed3d17d78599..b750d1c3d852a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -597,9 +597,7 @@ with pkgs; dtv-scan-tables = callPackage ../data/misc/dtv-scan-tables { }; - dufs = callPackage ../servers/http/dufs { - inherit (darwin.apple_sdk.frameworks) Security; - }; + dufs = callPackage ../servers/http/dufs { }; dynein = callPackage ../development/tools/database/dynein { inherit (darwin.apple_sdk.frameworks) Security; @@ -14049,6 +14047,8 @@ with pkgs; uivonim = callPackage ../applications/editors/uivonim { }; + ulid = callPackage ../tools/misc/ulid { }; + umlet = callPackage ../tools/misc/umlet { }; unetbootin = libsForQt5.callPackage ../tools/cd-dvd/unetbootin { }; @@ -19047,6 +19047,8 @@ with pkgs; dwz = callPackage ../development/tools/misc/dwz { }; + eask = callPackage ../development/tools/eask { }; + easypdkprog = callPackage ../development/embedded/easypdkprog { }; eclint = callPackage ../development/tools/eclint { }; @@ -19532,6 +19534,8 @@ with pkgs; lurk = callPackage ../development/tools/lurk { }; + maizzle = callPackage ../development/tools/maizzle { }; + malt = callPackage ../development/tools/profiling/malt { }; marksman = callPackage ../development/tools/marksman { }; |