From bd50b5fcf5bd8b14a58beb96d92efeb3e455a965 Mon Sep 17 00:00:00 2001 From: Isa Date: Mon, 7 Aug 2023 19:49:48 +0200 Subject: [PATCH 01/35] graylog-5_1: init at 5.1.4 --- nixos/modules/services/logging/graylog.nix | 4 ++-- pkgs/tools/misc/graylog/5.1.nix | 9 +++++++++ pkgs/tools/misc/graylog/plugins.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 ++ 4 files changed, 15 insertions(+), 4 deletions(-) create mode 100644 pkgs/tools/misc/graylog/5.1.nix diff --git a/nixos/modules/services/logging/graylog.nix b/nixos/modules/services/logging/graylog.nix index 1eb51c50ff79..673930c4cb5c 100644 --- a/nixos/modules/services/logging/graylog.nix +++ b/nixos/modules/services/logging/graylog.nix @@ -37,8 +37,8 @@ in package = mkOption { type = types.package; - default = if versionOlder config.system.stateVersion "23.05" then pkgs.graylog-3_3 else pkgs.graylog-5_0; - defaultText = literalExpression (if versionOlder config.system.stateVersion "23.05" then "pkgs.graylog-3_3" else "pkgs.graylog-5_0"); + default = if versionOlder config.system.stateVersion "23.05" then pkgs.graylog-3_3 else pkgs.graylog-5_1; + defaultText = literalExpression (if versionOlder config.system.stateVersion "23.05" then "pkgs.graylog-3_3" else "pkgs.graylog-5_1"); description = lib.mdDoc "Graylog package to use."; }; diff --git a/pkgs/tools/misc/graylog/5.1.nix b/pkgs/tools/misc/graylog/5.1.nix new file mode 100644 index 000000000000..3dc849eaeec7 --- /dev/null +++ b/pkgs/tools/misc/graylog/5.1.nix @@ -0,0 +1,9 @@ +{ callPackage, lib, ...}: +let + buildGraylog = callPackage ./graylog.nix {}; +in buildGraylog { + version = "5.1.4"; + sha256 = "sha256-ZuzmNbc+qB6oYCnR5iAsSEQGTB+pk+ghF0/+O3BTLkA="; + maintainers = [ lib.maintainers.f2k1de ]; + license = lib.licenses.sspl; +} diff --git a/pkgs/tools/misc/graylog/plugins.nix b/pkgs/tools/misc/graylog/plugins.nix index 27d555afcf24..8601d2c6e805 100644 --- a/pkgs/tools/misc/graylog/plugins.nix +++ b/pkgs/tools/misc/graylog/plugins.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, unzip, graylog-5_0 }: +{ lib, stdenv, fetchurl, unzip, graylog-5_1 }: with lib; @@ -17,7 +17,7 @@ let dontUnpack = true; nativeBuildInputs = [ unzip ]; meta = a.meta // { - platforms = graylog-5_0.meta.platforms; + platforms = graylog-5_1.meta.platforms; maintainers = (a.meta.maintainers or []) ++ [ maintainers.fadenb ]; sourceProvenance = with sourceTypes; [ binaryBytecode ]; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 86a49cf828e1..f367feafebe8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8622,6 +8622,8 @@ with pkgs; graylog-5_0 = callPackage ../tools/misc/graylog/5.0.nix { }; + graylog-5_1 = callPackage ../tools/misc/graylog/5.1.nix { }; + graylogPlugins = recurseIntoAttrs ( callPackage ../tools/misc/graylog/plugins.nix { } ); From b5fdf795672904240490c82fb61dd96ef8717020 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 15 Aug 2023 19:44:46 +0000 Subject: [PATCH 02/35] vengi-tools: 0.0.25 -> 0.0.26 --- pkgs/applications/graphics/vengi-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/vengi-tools/default.nix b/pkgs/applications/graphics/vengi-tools/default.nix index 995f682d81a2..66ed4b4fa54f 100644 --- a/pkgs/applications/graphics/vengi-tools/default.nix +++ b/pkgs/applications/graphics/vengi-tools/default.nix @@ -29,13 +29,13 @@ stdenv.mkDerivation rec { pname = "vengi-tools"; - version = "0.0.25"; + version = "0.0.26"; src = fetchFromGitHub { owner = "mgerhardy"; repo = "vengi"; rev = "v${version}"; - hash = "sha256-ZY0HG1BpRQV7+RzdXUhKV6JRa/1RIYmCuhnYCZapG8w="; + hash = "sha256-p+ZL3oxzwKhh+j1bxakgyStH+1GAu2aEwNmsqo6fNFo="; }; nativeBuildInputs = [ From b35440bfcf536d1043dc04356c9f021bddc68256 Mon Sep 17 00:00:00 2001 From: Viktor Kronvall Date: Sun, 13 Aug 2023 00:25:29 +0900 Subject: [PATCH 03/35] dockerTools: replace --no-clobber with --update=none Since coreutils v9.2 the `--no-clobber` flag results in a non-zero exit code when the destination files exist. Using `--update=none` will now reproduce the old behavior of `--no-clobber`. However, the `--update=none` flag was introduced in coreutils v9.3 and thus `mergeImages` will fail if you have an older version than v9.3 in stdenv after applying this commit. [coreutils v9.3 changelog](https://github.com/coreutils/coreutils/blob/f386722dc0d996d5379f12b4a8d4dd15ca7df4b5/NEWS#L48) --- pkgs/build-support/docker/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index b74d7885d54a..f6416c81cc0a 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -777,7 +777,7 @@ rec { fi done # Copy all layers from input images to output image directory - cp -R --no-clobber inputs/*/* image/ + cp -R --update=none inputs/*/* image/ # Merge repositories objects and manifests jq -s add "''${repos[@]}" > repositories jq -s add "''${manifests[@]}" > manifest.json From de230eeb8e1f07cbd8a12afd7b53ca0d86e5cac4 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Wed, 16 Aug 2023 20:42:20 +0200 Subject: [PATCH 04/35] talloc: 2.4.0 -> 2.4.1 Signed-off-by: Matthias Beyer --- pkgs/development/libraries/talloc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/talloc/default.nix b/pkgs/development/libraries/talloc/default.nix index cf29e432e226..8f75f25aa02b 100644 --- a/pkgs/development/libraries/talloc/default.nix +++ b/pkgs/development/libraries/talloc/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "talloc"; - version = "2.4.0"; + version = "2.4.1"; src = fetchurl { url = "mirror://samba/talloc/${pname}-${version}.tar.gz"; - sha256 = "sha256-bfNoYsQkZu+I82BERROHDvRpNPkBbIQ4PMQAin0MRro="; + sha256 = "sha256-QQpUfwhVcAe+DogZTyGIaDWO3Aq5jJi6jBZ5MNs9M/k="; }; nativeBuildInputs = [ From 93692e3f5f0b3a85a9e2113a60744b7b9b3f9384 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Wed, 16 Aug 2023 20:42:48 +0200 Subject: [PATCH 05/35] talloc: Add myself as maintainer Signed-off-by: Matthias Beyer --- pkgs/development/libraries/talloc/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/talloc/default.nix b/pkgs/development/libraries/talloc/default.nix index 8f75f25aa02b..bfe38fd4719a 100644 --- a/pkgs/development/libraries/talloc/default.nix +++ b/pkgs/development/libraries/talloc/default.nix @@ -71,5 +71,6 @@ stdenv.mkDerivation rec { homepage = "https://tdb.samba.org/"; license = licenses.gpl3; platforms = platforms.all; + maintainers = [ maintainers.matthiasbeyer ]; }; } From 5462f67cc8d1d9efa9ddc75c34e22a6e9405d9ee Mon Sep 17 00:00:00 2001 From: natsukium Date: Fri, 18 Aug 2023 00:17:15 +0900 Subject: [PATCH 06/35] bamtools: init at 2.5.2 --- .../science/biology/bamtools/default.nix | 41 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 43 insertions(+) create mode 100644 pkgs/applications/science/biology/bamtools/default.nix diff --git a/pkgs/applications/science/biology/bamtools/default.nix b/pkgs/applications/science/biology/bamtools/default.nix new file mode 100644 index 000000000000..05373dafd381 --- /dev/null +++ b/pkgs/applications/science/biology/bamtools/default.nix @@ -0,0 +1,41 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, jsoncpp +, pkg-config +, zlib +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "bamtools"; + version = "2.5.2"; + + src = fetchFromGitHub { + owner = "pezmaster31"; + repo = "bamtools"; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-l2DmA4P1kPneTCL9YVACE6LcQHT0F+mufPyM69VkksE="; + }; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = [ + jsoncpp + zlib + ]; + + doCheck = true; + + meta = with lib; { + description = "C++ API & command-line toolkit for working with BAM data"; + homepage = "https://github.com/pezmaster31/bamtools"; + changelog = "https://github.com/pezmaster31/bamtools/releases/tag/${finalAttrs.src.rev}"; + license = licenses.mit; + maintainers = with maintainers; [ natsukium ]; + platforms = platforms.unix; + }; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e84c8e7d19d2..d94b06b4515f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -38663,6 +38663,8 @@ with pkgs; archimedes = callPackage ../applications/science/electronics/archimedes { }; + bamtools = callPackage ../applications/science/biology/bamtools { }; + bayescan = callPackage ../applications/science/biology/bayescan { }; bedops = callPackage ../applications/science/biology/bedops { }; From 41af82a5c75c0143f4cb2152c02aebd24475016d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 18 Aug 2023 12:08:58 -0700 Subject: [PATCH 07/35] nodePackages.vue-cli: make alias of @vue/cli --- pkgs/development/node-packages/aliases.nix | 1 + .../node-packages/main-programs.nix | 1 - .../node-packages/node-packages.json | 1 - .../node-packages/node-packages.nix | 283 ------------------ 4 files changed, 1 insertion(+), 285 deletions(-) diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index 6ccd9b7e125f..c48a6fb787c9 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -64,5 +64,6 @@ mapAliases { triton = pkgs.triton; # Added 2023-05-06 typescript = pkgs.typescript; # Added 2023-06-21 vscode-langservers-extracted = pkgs.vscode-langservers-extracted; # Added 2023-05-27 + vue-cli = self."@vue/cli"; # added 2023-08-18 zx = pkgs.zx; # added 2023-08-01 } diff --git a/pkgs/development/node-packages/main-programs.nix b/pkgs/development/node-packages/main-programs.nix index d9d52c777b45..254247eb19c7 100644 --- a/pkgs/development/node-packages/main-programs.nix +++ b/pkgs/development/node-packages/main-programs.nix @@ -7,7 +7,6 @@ "@squoosh/cli" = "squoosh-cli"; "@webassemblyjs/cli-1.11.1" = "wasm2wast"; coffee-script = "coffee"; - vue-cli = "vue"; "@withgraphite/graphite-cli" = "gt"; # Packages that provide a single executable. diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 3cf0e5e9c607..767b338e0671 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -366,7 +366,6 @@ , "vscode-html-languageserver-bin" , "vscode-json-languageserver" , "vscode-json-languageserver-bin" -, "vue-cli" , "vue-language-server" , "wavedrom-cli" , "web-ext" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index cdf9b904fcfe..15ee8e8e757a 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -139329,289 +139329,6 @@ in bypassCache = true; reconstructLock = true; }; - vue-cli = nodeEnv.buildNodePackage { - name = "vue-cli"; - packageName = "vue-cli"; - version = "2.9.6"; - src = fetchurl { - url = "https://registry.npmjs.org/vue-cli/-/vue-cli-2.9.6.tgz"; - sha512 = "swQ0bfyJSWfFr42IXr8A774yA1n+YudhzsaHBKhWSkczSqjvgZvSvM8NEnx6QKnfOHBXbdNR5vhahjNUMlftQQ=="; - }; - dependencies = [ - sources."ajv-6.12.6" - sources."ansi-escapes-3.2.0" - sources."ansi-regex-3.0.1" - sources."ansi-styles-3.2.1" - sources."anymatch-3.1.3" - sources."argparse-1.0.10" - sources."array-differ-1.0.0" - sources."array-union-1.0.2" - sources."array-uniq-1.0.3" - sources."arrify-1.0.1" - sources."asn1-0.2.6" - sources."assert-plus-1.0.0" - sources."async-2.6.4" - sources."asynckit-0.4.0" - sources."aws-sign2-0.7.0" - sources."aws4-1.12.0" - sources."balanced-match-1.0.2" - sources."base64-js-1.5.1" - sources."bcrypt-pbkdf-1.0.2" - sources."binary-extensions-2.2.0" - sources."bl-1.2.3" - sources."bluebird-3.7.2" - sources."brace-expansion-1.1.11" - sources."braces-3.0.2" - sources."buffer-5.7.1" - sources."buffer-alloc-1.2.0" - sources."buffer-alloc-unsafe-1.1.0" - sources."buffer-crc32-0.2.13" - sources."buffer-fill-1.0.0" - sources."builtins-1.0.3" - sources."capture-stack-trace-1.0.2" - sources."caseless-0.12.0" - sources."caw-2.0.1" - sources."chalk-2.4.2" - sources."chardet-0.7.0" - sources."chokidar-3.5.3" - sources."cli-cursor-2.1.0" - sources."cli-spinners-1.3.1" - sources."cli-width-2.2.1" - sources."co-3.1.0" - sources."coffee-script-1.12.7" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."combined-stream-1.0.8" - sources."commander-2.20.3" - sources."concat-map-0.0.1" - sources."config-chain-1.1.13" - sources."consolidate-0.14.5" - sources."core-util-is-1.0.3" - sources."create-error-class-3.0.2" - sources."dashdash-1.14.1" - sources."debug-4.3.4" - sources."decompress-4.2.1" - sources."decompress-tar-4.1.1" - (sources."decompress-tarbz2-4.1.1" // { - dependencies = [ - sources."file-type-6.2.0" - ]; - }) - sources."decompress-targz-4.1.1" - (sources."decompress-unzip-4.0.1" // { - dependencies = [ - sources."file-type-3.9.0" - sources."get-stream-2.3.1" - ]; - }) - sources."delayed-stream-1.0.0" - sources."download-5.0.3" - sources."download-git-repo-1.1.0" - sources."duplexer3-0.1.5" - sources."ecc-jsbn-0.1.2" - sources."end-of-stream-1.4.4" - sources."escape-string-regexp-1.0.5" - sources."esprima-4.0.1" - sources."extend-3.0.2" - sources."extend-shallow-2.0.1" - sources."external-editor-3.1.0" - sources."extsprintf-1.3.0" - sources."fast-deep-equal-3.1.3" - sources."fast-json-stable-stringify-2.1.0" - sources."fd-slicer-1.1.0" - sources."figures-2.0.0" - sources."file-type-5.2.0" - sources."filename-reserved-regex-2.0.0" - sources."filenamify-2.1.0" - sources."fill-range-7.0.1" - sources."forever-agent-0.6.1" - sources."form-data-2.3.3" - sources."fs-constants-1.0.0" - sources."fs.realpath-1.0.0" - sources."fsevents-2.3.2" - sources."get-proxy-2.1.0" - sources."get-stream-3.0.0" - sources."getpass-0.1.7" - sources."git-clone-0.1.0" - sources."glob-7.2.3" - sources."glob-parent-5.1.2" - sources."got-6.7.1" - sources."graceful-fs-4.2.11" - sources."gray-matter-4.0.3" - sources."handlebars-4.7.8" - sources."har-schema-2.0.0" - sources."har-validator-5.1.5" - sources."has-flag-3.0.0" - sources."has-symbol-support-x-1.4.2" - sources."has-to-string-tag-x-1.4.1" - sources."http-signature-1.2.0" - sources."iconv-lite-0.4.24" - sources."ieee754-1.2.1" - sources."inflight-1.0.6" - sources."inherits-2.0.4" - sources."ini-1.3.8" - sources."inquirer-6.5.2" - sources."is-binary-path-2.1.0" - sources."is-extendable-0.1.1" - sources."is-extglob-2.1.1" - sources."is-fullwidth-code-point-2.0.0" - sources."is-glob-4.0.3" - sources."is-natural-number-4.0.1" - sources."is-number-7.0.0" - sources."is-object-1.0.2" - sources."is-redirect-1.0.0" - sources."is-retry-allowed-1.2.0" - sources."is-stream-1.1.0" - sources."is-typedarray-1.0.0" - sources."is-utf8-0.2.1" - sources."isarray-1.0.0" - sources."isstream-0.1.2" - sources."isurl-1.0.0" - sources."js-yaml-3.14.1" - sources."jsbn-0.1.1" - sources."json-schema-0.4.0" - sources."json-schema-traverse-0.4.1" - sources."json-stringify-safe-5.0.1" - sources."jsprim-1.4.2" - sources."kind-of-6.0.3" - sources."lodash-4.17.21" - sources."lodash.clonedeepwith-4.5.0" - sources."log-symbols-2.2.0" - sources."lowercase-keys-1.0.1" - (sources."make-dir-1.3.0" // { - dependencies = [ - sources."pify-3.0.0" - ]; - }) - (sources."metalsmith-2.6.1" // { - dependencies = [ - sources."commander-10.0.1" - ]; - }) - sources."micromatch-4.0.5" - sources."mime-db-1.52.0" - sources."mime-types-2.1.35" - sources."mimic-fn-1.2.0" - sources."minimatch-3.1.2" - sources."minimist-1.2.8" - sources."mkdirp-0.5.6" - sources."ms-2.1.2" - sources."multimatch-2.1.0" - sources."mute-stream-0.0.7" - sources."neo-async-2.6.2" - sources."normalize-path-3.0.0" - (sources."npm-conf-1.1.3" // { - dependencies = [ - sources."pify-3.0.0" - ]; - }) - sources."oauth-sign-0.9.0" - sources."object-assign-4.1.1" - sources."once-1.4.0" - sources."onetime-2.0.1" - sources."ora-1.4.0" - sources."os-homedir-1.0.2" - sources."os-tmpdir-1.0.2" - sources."path-is-absolute-1.0.1" - sources."pend-1.2.0" - sources."performance-now-2.1.0" - sources."picomatch-2.3.1" - sources."pify-2.3.0" - sources."pinkie-2.0.4" - sources."pinkie-promise-2.0.1" - sources."prepend-http-1.0.4" - sources."process-nextick-args-2.0.1" - sources."proto-list-1.2.4" - sources."psl-1.9.0" - sources."punycode-2.3.0" - sources."qs-6.5.3" - sources."read-metadata-1.0.0" - (sources."readable-stream-2.3.8" // { - dependencies = [ - sources."safe-buffer-5.1.2" - ]; - }) - sources."readdirp-3.6.0" - sources."request-2.88.2" - sources."restore-cursor-2.0.0" - sources."rimraf-2.7.1" - sources."run-async-2.4.1" - sources."rxjs-6.6.7" - sources."safe-buffer-5.2.1" - sources."safer-buffer-2.1.2" - sources."section-matter-1.0.0" - sources."seek-bzip-1.0.6" - sources."semver-5.7.2" - sources."signal-exit-3.0.7" - sources."source-map-0.6.1" - sources."sprintf-js-1.0.3" - sources."sshpk-1.17.0" - sources."stat-mode-1.0.0" - (sources."string-width-2.1.1" // { - dependencies = [ - sources."strip-ansi-4.0.0" - ]; - }) - (sources."string_decoder-1.1.1" // { - dependencies = [ - sources."safe-buffer-5.1.2" - ]; - }) - (sources."strip-ansi-5.2.0" // { - dependencies = [ - sources."ansi-regex-4.1.1" - ]; - }) - sources."strip-bom-string-1.0.0" - sources."strip-dirs-2.1.0" - sources."strip-outer-1.0.1" - sources."supports-color-5.5.0" - sources."tar-stream-1.6.2" - sources."through-2.3.8" - sources."tildify-1.2.0" - sources."timed-out-4.0.1" - sources."tmp-0.0.33" - sources."to-buffer-1.1.1" - sources."to-regex-range-5.0.1" - sources."tough-cookie-2.5.0" - sources."trim-repeated-1.0.0" - sources."tslib-1.14.1" - sources."tunnel-agent-0.6.0" - sources."tweetnacl-0.14.5" - sources."uglify-js-3.17.4" - sources."uid-0.0.2" - sources."unbzip2-stream-1.4.3" - sources."unzip-response-2.0.1" - sources."uri-js-4.4.1" - sources."url-parse-lax-1.0.0" - sources."url-to-options-1.0.1" - sources."user-home-2.0.0" - sources."util-deprecate-1.0.2" - sources."uuid-3.4.0" - sources."validate-npm-package-name-3.0.0" - (sources."verror-1.10.0" // { - dependencies = [ - sources."core-util-is-1.0.2" - ]; - }) - sources."ware-1.3.0" - sources."wordwrap-1.0.0" - sources."wrap-fn-0.1.5" - sources."wrappy-1.0.2" - sources."xtend-4.0.2" - sources."yaml-js-0.0.8" - sources."yauzl-2.10.0" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "A simple CLI for scaffolding Vue.js projects."; - homepage = "https://github.com/vuejs/vue-cli#readme"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; vue-language-server = nodeEnv.buildNodePackage { name = "vue-language-server"; packageName = "vue-language-server"; From 5fc085988400e9723b81b5d13423bb8ed030334d Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Sat, 19 Aug 2023 01:58:57 +0400 Subject: [PATCH 08/35] =?UTF-8?q?osm2pgsql:=201.8.1=20=E2=86=92=201.9.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/tools/misc/osm2pgsql/default.nix | 34 +++++++++++++++++---------- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/pkgs/tools/misc/osm2pgsql/default.nix b/pkgs/tools/misc/osm2pgsql/default.nix index 1fa26d1f6d0c..5f4ff20e5d9b 100644 --- a/pkgs/tools/misc/osm2pgsql/default.nix +++ b/pkgs/tools/misc/osm2pgsql/default.nix @@ -2,40 +2,34 @@ , fetchFromGitHub , cmake , expat -, fetchpatch , fmt , proj , bzip2 , zlib , boost +, cimg , postgresql , withLuaJIT ? false , lua , luajit , libosmium +, nlohmann_json +, potrace , protozero , testers }: stdenv.mkDerivation (finalAttrs: { pname = "osm2pgsql"; - version = "1.8.1"; + version = "1.9.0"; src = fetchFromGitHub { owner = "openstreetmap"; repo = "osm2pgsql"; rev = finalAttrs.version; - hash = "sha256-8Jefd8dfoh/an7wd+8iTM0uOKA4UiUo8t2WzZs4r/Ck="; + hash = "sha256-ZIjT4uKJas5RgxcMSoR8hWCM9pdu3hSzWwfIn1ZvU8Y="; }; - patches = [ - # Fix compatiblity with fmt 10.0. Remove with the next release - (fetchpatch { - url = "https://github.com/openstreetmap/osm2pgsql/commit/37aae6c874b58cd5cd27e70b2b433d6624fd7498.patch"; - hash = "sha256-Fv2zPqhRDoJXlqB1Q9q5iskn28iqq3TYPcdqfu/pvD4="; - }) - ]; - postPatch = '' # Remove bundled libraries rm -r contrib @@ -43,8 +37,20 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake ]; - buildInputs = [ expat fmt proj bzip2 zlib boost postgresql libosmium protozero ] - ++ lib.optional withLuaJIT luajit + buildInputs = [ + boost + bzip2 + cimg + expat + fmt + libosmium + nlohmann_json + postgresql + potrace + proj + protozero + zlib + ] ++ lib.optional withLuaJIT luajit ++ lib.optional (!withLuaJIT) lua; cmakeFlags = [ @@ -53,6 +59,8 @@ stdenv.mkDerivation (finalAttrs: { "-DEXTERNAL_FMT=ON" ] ++ lib.optional withLuaJIT "-DWITH_LUAJIT:BOOL=ON"; + installFlags = [ "install-gen" ]; + passthru.tests.version = testers.testVersion { package = finalAttrs.finalPackage; }; From 6c20535ffb77a32164cedacab6debe0117eab4cf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 19 Aug 2023 03:10:24 +0000 Subject: [PATCH 09/35] abuild: 3.11.9 -> 3.11.21 --- pkgs/development/tools/abuild/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/abuild/default.nix b/pkgs/development/tools/abuild/default.nix index c08a6f60a5dd..c3c3fbcafcd7 100644 --- a/pkgs/development/tools/abuild/default.nix +++ b/pkgs/development/tools/abuild/default.nix @@ -14,14 +14,14 @@ stdenv.mkDerivation rec { pname = "abuild"; - version = "3.11.9"; + version = "3.11.21"; src = fetchFromGitLab { domain = "gitlab.alpinelinux.org"; owner = "alpine"; repo = pname; rev = version; - sha256 = "sha256-lp2+38eJLp0SU34pywrrXVON0PW2NvgaIO4n/KChMro="; + sha256 = "sha256-M88JPQKBkixAsWfGUirFsjFwB7m8/x63dpnoEHZpQTE="; }; buildInputs = [ From b413d3d1898a38152cedbd8cce1bdb9a86130301 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 19 Aug 2023 11:19:24 +0800 Subject: [PATCH 10/35] pantheon.elementary-default-settings: 7.0.2 -> 7.1.0 https://github.com/elementary/default-settings/releases/tag/7.1.0 --- .../elementary-default-settings/default.nix | 29 ++----------------- 1 file changed, 2 insertions(+), 27 deletions(-) diff --git a/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix b/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix index e3fd576a14e0..9b832ccde44a 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , nix-update-script , meson , ninja @@ -11,37 +10,19 @@ , dbus , polkit , accountsservice -, python3 }: stdenv.mkDerivation rec { pname = "elementary-default-settings"; - version = "7.0.2"; + version = "7.1.0"; src = fetchFromGitHub { owner = "elementary"; repo = "default-settings"; rev = version; - sha256 = "sha256-YFI1UM7CxjYkoIhSg9Fn81Ze6DX7D7p89xibk7ik8bI="; + sha256 = "sha256-j4K8qYwfu6/s4qnTSzwv6KRsk9f+Qr/l1bhLywKMHMU="; }; - patches = [ - # Don't set picture-uri-dark. elementary-gsettings-schemas won't - # aware of our custom remove-backgrounds.gschema.override so it - # will be a confusing invalid value otherwise (though gala actually - # can handle it well). - # https://github.com/elementary/default-settings/pull/282 - (fetchpatch { - url = "https://github.com/elementary/default-settings/commit/881f84b8316e549ab627b7ac9acf352e0346a1a4.patch"; - sha256 = "sha256-zf2Anr+ljLjHbn5ZmRj3nCRVJ52rwe4EkwdIfSOGeLQ="; - }) - # https://github.com/elementary/default-settings/pull/283 - (fetchpatch { - url = "https://github.com/elementary/default-settings/commit/37ef6062a8651875dd9d927c5730155c8b26e953.patch"; - sha256 = "sha256-u7rrwuHgMPn1eIyIuwJcBgy8SshaXgrgFTSNm8IHbaY="; - }) - ]; - nativeBuildInputs = [ accountsservice dbus @@ -50,7 +31,6 @@ stdenv.mkDerivation rec { ninja pkg-config polkit - python3 ]; mesonFlags = [ @@ -59,11 +39,6 @@ stdenv.mkDerivation rec { "-Dplank-dockitems=false" ]; - postPatch = '' - chmod +x meson/post_install.py - patchShebangs meson/post_install.py - ''; - preInstall = '' # Install our override for plank dockitems as the desktop file path is different. schema_dir=$out/share/glib-2.0/schemas From eb4f817aba9961f16a13725b19e8f6fd3c3910e3 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 19 Aug 2023 04:20:00 +0000 Subject: [PATCH 11/35] vale: 2.28.1 -> 2.28.2 Diff: https://github.com/errata-ai/vale/compare/v2.28.1...v2.28.2 Changelog: https://github.com/errata-ai/vale/releases/tag/v2.28.2 --- pkgs/tools/text/vale/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/vale/default.nix b/pkgs/tools/text/vale/default.nix index 4fc1c8c52f61..48508f2e7186 100644 --- a/pkgs/tools/text/vale/default.nix +++ b/pkgs/tools/text/vale/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "vale"; - version = "2.28.1"; + version = "2.28.2"; subPackages = [ "cmd/vale" ]; outputs = [ "out" "data" ]; @@ -11,7 +11,7 @@ buildGoModule rec { owner = "errata-ai"; repo = "vale"; rev = "v${version}"; - hash = "sha256-40JCZo7wxI2ysquW/r+LEcC+TUdmBEHak8b3AcmNq4c="; + hash = "sha256-T5CV7IlyZUfl3qUIUaLaisnFJ5fQ0de0KGQvuINx7TY="; }; vendorHash = "sha256-KB1mRWDYejc38tUv316MiGfmq2riNnpEMIUpjgfSasU="; From 5ccab0268b5e317ccb34c9539ac31c0f31b6fce8 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 19 Aug 2023 04:20:00 +0000 Subject: [PATCH 12/35] buildpack: 0.29.0 -> 0.30.0 Diff: https://github.com/buildpacks/pack/compare/v0.29.0...v0.30.0 Changelog: https://github.com/buildpacks/pack/releases/tag/v0.30.0 --- pkgs/development/tools/buildpack/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/buildpack/default.nix b/pkgs/development/tools/buildpack/default.nix index 0b702582cfec..6756fe150893 100644 --- a/pkgs/development/tools/buildpack/default.nix +++ b/pkgs/development/tools/buildpack/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "pack"; - version = "0.29.0"; + version = "0.30.0"; src = fetchFromGitHub { owner = "buildpacks"; repo = pname; rev = "v${version}"; - hash = "sha256-A/LGn+CiqDja0gDuvydvu/fRJozrlnSV62kPjUdwEH8="; + hash = "sha256-o9c1MUxyZpqk10UbW5y9JqX2Z62K7hDeSEiFGIUnoAs="; }; - vendorHash = "sha256-tiYF5Ni6GHRV3JdUkP6155lDN3NGId9/sA/iZSiD1II="; + vendorHash = "sha256-k2ZgFjSO3yHS0pO7xZx6a5E4J35ou2AmjbiV2M9OGTk="; nativeBuildInputs = [ installShellFiles ]; From cb0c5de164202fab1676e555d9372d5a4493487b Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 19 Aug 2023 04:20:00 +0000 Subject: [PATCH 13/35] luau: 0.590 -> 0.591 Diff: https://github.com/Roblox/luau/compare/0.590...0.591 Changelog: https://github.com/Roblox/luau/releases/tag/0.591 --- pkgs/development/interpreters/luau/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/luau/default.nix b/pkgs/development/interpreters/luau/default.nix index 067e488f739a..4bacb15a79d9 100644 --- a/pkgs/development/interpreters/luau/default.nix +++ b/pkgs/development/interpreters/luau/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "luau"; - version = "0.590"; + version = "0.591"; src = fetchFromGitHub { owner = "Roblox"; repo = "luau"; rev = version; - hash = "sha256-ZVe4SCx6/IC039CL+ngNIQShNi9V6XQh62gpbcoK/tM="; + hash = "sha256-eCYB+B5bglUcF+xAAHBWwwgDrvY9NatmcwL/GUnIhOk="; }; nativeBuildInputs = [ cmake ]; From 41a9cc792fd8278f2ec9ee421df7e9235e1e4e76 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 19 Aug 2023 04:20:00 +0000 Subject: [PATCH 14/35] flexget: 3.8.7 -> 3.9.1 Diff: https://github.com/Flexget/Flexget/compare/refs/tags/v3.8.7...v3.9.1 Changelog: https://github.com/Flexget/Flexget/releases/tag/v3.9.1 --- pkgs/applications/networking/flexget/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index 0aba0169fb28..547ffa814c87 100644 --- a/pkgs/applications/networking/flexget/default.nix +++ b/pkgs/applications/networking/flexget/default.nix @@ -6,7 +6,7 @@ python3.pkgs.buildPythonApplication rec { pname = "flexget"; - version = "3.8.7"; + version = "3.9.1"; format = "pyproject"; # Fetch from GitHub in order to use `requirements.in` @@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec { owner = "Flexget"; repo = "Flexget"; rev = "refs/tags/v${version}"; - hash = "sha256-WfOLDTwmHPfg4UkrPC7gvDNJtAorrateQ4W59NmhdHc="; + hash = "sha256-XXmqDZJ5rjoBarhIYlzC2O9jf97SWJiILWLsHDgM78Q="; }; postPatch = '' From 20e210273476f81990751ae1f91ff1b28244d585 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 19 Aug 2023 04:20:00 +0000 Subject: [PATCH 15/35] python310Packages.tubeup: 2023.8.10 -> 2023.8.17 Changelog: https://github.com/bibanon/tubeup/releases/tag/2023.8.17 --- pkgs/development/python-modules/tubeup/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tubeup/default.nix b/pkgs/development/python-modules/tubeup/default.nix index 9b4139821cf4..58ae2d387b44 100644 --- a/pkgs/development/python-modules/tubeup/default.nix +++ b/pkgs/development/python-modules/tubeup/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "tubeup"; - version = "2023.8.10"; + version = "2023.8.17"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-9jSPFKS1+mGprgGj1c6hOrOo/w2e7A+OXSUjQUm+NCg="; + sha256 = "sha256-nL0oXI06qH0K0LLlrT/jdJ+76ZPMUhaFfOYGi71M3PM="; }; nativeBuildInputs = [ From b20e9c52c54d5dbd9f397f4b3e709aff5c1624e4 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Sat, 19 Aug 2023 14:10:49 +0800 Subject: [PATCH 16/35] packer: 1.9.3 -> 1.9.4 --- pkgs/development/tools/packer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/packer/default.nix b/pkgs/development/tools/packer/default.nix index 45a0bcb56b32..18dd6370bc78 100644 --- a/pkgs/development/tools/packer/default.nix +++ b/pkgs/development/tools/packer/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "packer"; - version = "1.9.3"; + version = "1.9.4"; src = fetchFromGitHub { owner = "hashicorp"; repo = "packer"; rev = "v${version}"; - hash = "sha256-aRzTx3XFkC3brbKBntQ82xFeafZhFEV52pjByonOfug="; + hash = "sha256-oGEG9uGjZTpJjQBnVlffFpNc5sb7HyD/ibpnQUhtTH4="; }; vendorHash = "sha256-vHVx9vFPvctWNzibfZlN7mEYngYd6q7s9gMIM0FX0Ao="; From b5d3deb2391d0de553d746e7edbf875ef3965f8a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 19 Aug 2023 06:12:57 +0000 Subject: [PATCH 17/35] bluez-alsa: 4.1.0 -> 4.1.1 --- pkgs/tools/bluetooth/bluez-alsa/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/bluetooth/bluez-alsa/default.nix b/pkgs/tools/bluetooth/bluez-alsa/default.nix index 1d663b81c299..30ef73228b31 100644 --- a/pkgs/tools/bluetooth/bluez-alsa/default.nix +++ b/pkgs/tools/bluetooth/bluez-alsa/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "bluez-alsa"; - version = "4.1.0"; + version = "4.1.1"; src = fetchFromGitHub { owner = "Arkq"; repo = "bluez-alsa"; rev = "v${version}"; - sha256 = "sha256-qoG1hTVuSFbccfct9DqSI0BBPJwSFlhPPtv87ThtSBk="; + sha256 = "sha256-oGaYiSkOhqfjUl+mHTs3gqFcxli3cgkRtT6tbjy3ht0="; }; nativeBuildInputs = [ pkg-config autoreconfHook ]; From 129b54bc6bdcd6c191b3a94f72c7f9017547e33e Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Sat, 19 Aug 2023 08:22:59 +0200 Subject: [PATCH 18/35] staticjinja: 4.1.3 -> 5.0.0 Diff: https://github.com/staticjinja/staticjinja/compare/4.1.3...5.0.0 --- pkgs/development/python-modules/staticjinja/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/staticjinja/default.nix b/pkgs/development/python-modules/staticjinja/default.nix index db22d41f5741..54a93398e1ff 100644 --- a/pkgs/development/python-modules/staticjinja/default.nix +++ b/pkgs/development/python-modules/staticjinja/default.nix @@ -11,13 +11,14 @@ , markdown , testers , tomlkit +, typing-extensions , staticjinja , callPackage }: buildPythonPackage rec { pname = "staticjinja"; - version = "4.1.3"; + version = "5.0.0"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -27,7 +28,7 @@ buildPythonPackage rec { owner = "staticjinja"; repo = pname; rev = version; - hash = "sha256-w6ge5MQXNRHCM43jKnagTlbquJJys7mprgBOS2uuwHQ="; + hash = "sha256-LfJTQhZtnTOm39EWF1m2MP5rxz/5reE0G1Uk9L7yx0w="; }; nativeBuildInputs = [ @@ -45,6 +46,7 @@ buildPythonPackage rec { pytest-check markdown tomlkit + typing-extensions ]; # The tests need to find and call the installed staticjinja executable From 59b54837c4de915dbe732295c4cee941bfd89593 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 19 Aug 2023 09:59:44 +0200 Subject: [PATCH 19/35] chisel: 1.8.1 -> 1.9.0 Diff: https://github.com/jpillora/chisel/compare/refs/tags/v1.8.1...v1.9.0 Changelog: https://github.com/jpillora/chisel/releases/tag/v1.9.0 --- pkgs/tools/networking/chisel/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/networking/chisel/default.nix b/pkgs/tools/networking/chisel/default.nix index d14dd66e1407..a6b6d266cb4d 100644 --- a/pkgs/tools/networking/chisel/default.nix +++ b/pkgs/tools/networking/chisel/default.nix @@ -5,21 +5,21 @@ buildGoModule rec { pname = "chisel"; - version = "1.8.1"; + version = "1.9.0"; src = fetchFromGitHub { owner = "jpillora"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-N2voSclNH7lGbUkZo2gkrEb6XoA5f0BzNgAzQs1lOKQ="; + hash = "sha256-Rq8IBT29K3QiaYXFaARg5ak9llcNS/9laal/LrHM4zY="; }; - vendorHash = "sha256-p/5g4DLoUhEPFBtAbMiIgc6O4eAfbiqBjCqYkyUHy70="; + vendorHash = "sha256-i6Fb+jSP6LzZoPTHhjQi3YbPBWY6OmsORV8ATcLrHG0="; ldflags = [ "-s" "-w" - "-X github.com/jpillora/chisel/share.BuildVersion=${version}" + "-X=github.com/jpillora/chisel/share.BuildVersion=${version}" ]; # Tests require access to the network From 756b379235399cd9cc5457b2543040571752817f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 19 Aug 2023 10:00:56 +0200 Subject: [PATCH 20/35] python311Packages.caio: 0.9.12 -> 0.9.13 Diff: https://github.com/mosquito/caio/compare/refs/tags/0.9.12...0.9.13 Changelog: https://github.com/mosquito/caio/releases/tag/0.9.13 --- pkgs/development/python-modules/caio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/caio/default.nix b/pkgs/development/python-modules/caio/default.nix index b34bebb57e82..ee1bdc8dc62f 100644 --- a/pkgs/development/python-modules/caio/default.nix +++ b/pkgs/development/python-modules/caio/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "caio"; - version = "0.9.12"; + version = "0.9.13"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "mosquito"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-uMq/3yWP9OwaVxixGAFCLMsDPoJhmIuG0I7hO7AnIOk="; + hash = "sha256-Q87NuL6yZ5uKImQqqdKTMWNyfUOb4NaZDEvNdqZbHDk="; }; nativeCheckInputs = [ From d932fc01631d0853c1233aa3a5a1c69b1ad84e7a Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 19 Aug 2023 09:11:35 +0100 Subject: [PATCH 21/35] bind: 9.18.17 -> 9.18.18 While at it added trivial updater. Changes: https://bind9.readthedocs.io/en/v9.18.18/notes.html#notes-for-bind-9-18-18 --- pkgs/servers/dns/bind/default.nix | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix index fcda25cabfdc..a162bd1558fb 100644 --- a/pkgs/servers/dns/bind/default.nix +++ b/pkgs/servers/dns/bind/default.nix @@ -5,15 +5,16 @@ , enableGSSAPI ? true, libkrb5 , buildPackages, nixosTests , cmocka, tzdata +, gitUpdater }: stdenv.mkDerivation rec { pname = "bind"; - version = "9.18.17"; + version = "9.18.18"; src = fetchurl { url = "https://downloads.isc.org/isc/bind9/${version}/${pname}-${version}.tar.xz"; - hash = "sha256-veHFAXuB0decaeuPU38uUDL9NiOs3V7oMNT3S8JINFg="; + hash = "sha256-1zXNwSemxXCb3kdbW/FvohM/Nv26IC98PDfRNOUZIWA="; }; outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ]; @@ -75,11 +76,21 @@ stdenv.mkDerivation rec { sed -i '/^ISC_TEST_ENTRY(isc_time_formatISO8601L/d' tests/isc/time_test.c ''; - passthru.tests = { - inherit (nixosTests) bind; - prometheus-exporter = nixosTests.prometheus-exporters.bind; - kubernetes-dns-single-node = nixosTests.kubernetes.dns-single-node; - kubernetes-dns-multi-node = nixosTests.kubernetes.dns-multi-node; + passthru = { + tests = { + inherit (nixosTests) bind; + prometheus-exporter = nixosTests.prometheus-exporters.bind; + kubernetes-dns-single-node = nixosTests.kubernetes.dns-single-node; + kubernetes-dns-multi-node = nixosTests.kubernetes.dns-multi-node; + }; + + updateScript = gitUpdater { + # No nicer place to find latest stable release. + url = "https://gitlab.isc.org/isc-projects/bind9.git"; + rev-prefix = "v"; + # Avoid unstable 9.19 releases. + odd-unstable = true; + }; }; meta = with lib; { From 28281b5914ba48ada8bc2bbe9e57afcf6d8249a9 Mon Sep 17 00:00:00 2001 From: Keegan Carruthers-Smith Date: Fri, 18 Aug 2023 16:55:55 +0200 Subject: [PATCH 22/35] qutebrowser: update pdfjs to 3.9.179 --- pkgs/applications/networking/browsers/qutebrowser/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index 47721f183412..db17f9f6d081 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -19,11 +19,11 @@ python3Packages = python3.pkgs; pdfjs = let - version = "2.14.305"; + version = "3.9.179"; in fetchzip { url = "https://github.com/mozilla/pdf.js/releases/download/v${version}/pdfjs-${version}-dist.zip"; - hash = "sha256-E7t+0AUndrgi4zfJth0w28RmWLqLyXMUCnueNf/gNi4="; + hash = "sha256-QoJFb7MlZN6lDe2Yalsd10sseukL6+tNRi6JzLPVBYw="; stripRoot = false; }; From dc56ec16cd0900131279a62c5d7b335d6cd1f752 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Fri, 11 Aug 2023 16:17:01 +0200 Subject: [PATCH 23/35] rofi-rbw: 1.1.0 -> 1.2.0 Co-authored-by: Bruno BELANYI Co-authored-by: Anderson Torres --- pkgs/applications/misc/rofi-rbw/default.nix | 47 +++++++++++++++++++-- pkgs/top-level/all-packages.nix | 13 +++++- 2 files changed, 55 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/rofi-rbw/default.nix b/pkgs/applications/misc/rofi-rbw/default.nix index 0aac8045023c..337cd54d5c23 100644 --- a/pkgs/applications/misc/rofi-rbw/default.nix +++ b/pkgs/applications/misc/rofi-rbw/default.nix @@ -1,15 +1,30 @@ -{ lib, buildPythonApplication, fetchFromGitHub, configargparse, setuptools, poetry-core, rbw }: +{ lib +, buildPythonApplication +, fetchFromGitHub +, configargparse +, setuptools +, poetry-core +, rbw + +, waylandSupport ? false +, wl-clipboard +, wtype + +, x11Support ? false +, xclip +, xdotool +}: buildPythonApplication rec { pname = "rofi-rbw"; - version = "1.1.0"; + version = "1.2.0"; format = "pyproject"; src = fetchFromGitHub { owner = "fdw"; repo = "rofi-rbw"; rev = "refs/tags/${version}"; - hash = "sha256-5K6tofC1bIxxNOQ0jk6NbVoaGGyQImYiUZAaAmkwiTA="; + hash = "sha256-6ZM+qJvVny/h5W/+7JqD/CCf9eayExvZfC/z9rHssVU="; }; nativeBuildInputs = [ @@ -17,12 +32,36 @@ buildPythonApplication rec { poetry-core ]; + buildInputs = [ + rbw + ] ++ lib.optionals waylandSupport [ + wl-clipboard + wtype + ] ++ lib.optionals x11Support [ + xclip + xdotool + ]; + propagatedBuildInputs = [ configargparse ]; pythonImportsCheck = [ "rofi_rbw" ]; + wrapper_paths = [ + rbw + ] ++ lib.optionals waylandSupport [ + wl-clipboard + wtype + ] ++ lib.optionals x11Support [ + xclip + xdotool + ]; + + wrapper_flags = + lib.optionalString waylandSupport "--typer wtype --clipboarder wl-copy" + + lib.optionalString x11Support "--typer xdotool --clipboarder xclip"; + preFixup = '' - makeWrapperArgs+=(--prefix PATH : ${lib.makeBinPath [ rbw ]}) + makeWrapperArgs+=(--prefix PATH : ${lib.makeBinPath wrapper_paths} --add-flags "${wrapper_flags}") ''; meta = with lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6388f139a201..b3d03c8cbb87 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -33783,7 +33783,18 @@ with pkgs; rofi-pulse-select = callPackage ../applications/audio/rofi-pulse-select { }; - rofi-rbw = python3Packages.callPackage ../applications/misc/rofi-rbw { }; + rofi-rbw = python3Packages.callPackage ../applications/misc/rofi-rbw { + waylandSupport = false; + x11Support = false; + }; + + rofi-rbw-wayland = python3Packages.callPackage ../applications/misc/rofi-rbw { + waylandSupport = true; + }; + + rofi-rbw-x11 = python3Packages.callPackage ../applications/misc/rofi-rbw { + x11Support = true; + }; rofi-screenshot = callPackage ../applications/misc/rofi-screenshot { }; From cdba0c3cfc019266112b8c40b6e68b3de93036ec Mon Sep 17 00:00:00 2001 From: Alejandro Sanchez Medina Date: Fri, 11 Aug 2023 20:15:05 +0200 Subject: [PATCH 24/35] wpm: init at 1.51.5 --- pkgs/applications/misc/wpm/default.nix | 28 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/applications/misc/wpm/default.nix diff --git a/pkgs/applications/misc/wpm/default.nix b/pkgs/applications/misc/wpm/default.nix new file mode 100644 index 000000000000..b6db073eb945 --- /dev/null +++ b/pkgs/applications/misc/wpm/default.nix @@ -0,0 +1,28 @@ +{ lib +, python3 +, fetchPypi +}: + +python3.pkgs.buildPythonApplication rec { + pname = "wpm"; + version = "1.51.5"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-swT9E5Tto4yWnm0voowcJXtY3cIY3MNqAdfrTnuGbdg="; + }; + + propagatedBuildInputs = with python3.pkgs; [ + setuptools + ]; + + pythonImportsCheck = [ "wpm" ]; + + meta = with lib; { + description = "Console app for measuring typing speed in words per minute (WPM)"; + homepage = "https://pypi.org/project/wpm"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ alejandrosame ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b3d03c8cbb87..dd1eabd27ac9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -41899,4 +41899,6 @@ with pkgs; gitrs = callPackage ../tools/misc/gitrs { }; wttrbar = callPackage ../applications/misc/wttrbar { }; + + wpm = callPackage ../applications/misc/wpm { }; } From f0918acbaabff659fd4d2b10e860e127864d22e9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 19 Aug 2023 15:06:26 +0200 Subject: [PATCH 25/35] python311Packages.coinmetrics-api-client: 2023.8.2.13 -> 2023.8.10.19 --- .../python-modules/coinmetrics-api-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/coinmetrics-api-client/default.nix b/pkgs/development/python-modules/coinmetrics-api-client/default.nix index c9837a57fcdb..ca1dd48a9df5 100644 --- a/pkgs/development/python-modules/coinmetrics-api-client/default.nix +++ b/pkgs/development/python-modules/coinmetrics-api-client/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "coinmetrics-api-client"; - version = "2023.8.2.13"; + version = "2023.8.10.19"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -27,7 +27,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "coinmetrics_api_client"; - hash = "sha256-R7EbzH8ftHqoCbe8plXPOmTL01mow7t+zgVfL4+bZXQ="; + hash = "sha256-sXWcnl6E2Aw78Y4JPpTQlRmhRP6egl6eo81N2PIhi34="; }; pythonRelaxDeps = [ From 7334ff95e00148a12bd6419a20831743b8d24d69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Federico=20Dami=C3=A1n=20Schonborn?= Date: Tue, 15 Aug 2023 21:52:43 -0300 Subject: [PATCH 26/35] yyjson: init at 0.7.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Federico Damián Schonborn --- pkgs/development/libraries/yyjson/default.nix | 29 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/development/libraries/yyjson/default.nix diff --git a/pkgs/development/libraries/yyjson/default.nix b/pkgs/development/libraries/yyjson/default.nix new file mode 100644 index 000000000000..48b10368aee5 --- /dev/null +++ b/pkgs/development/libraries/yyjson/default.nix @@ -0,0 +1,29 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "yyjson"; + version = "0.7.0"; + + src = fetchFromGitHub { + owner = "ibireme"; + repo = "yyjson"; + rev = finalAttrs.version; + hash = "sha256-Cz8K+cWuDpoMY6d+ecuOvXIMc4wtx15LLvxpFibkNyw="; + }; + + nativeBuildInputs = [ + cmake + ]; + + meta = with lib; { + description = "The fastest JSON library in C"; + homepage = "https://github.com/ibireme/yyjson"; + changelog = "https://github.com/ibireme/yyjson/blob/${finalAttrs.src.rev}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ federicoschonborn ]; + }; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dd1eabd27ac9..1a5dde7985f2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25619,6 +25619,8 @@ with pkgs; yubioath-flutter = callPackage ../applications/misc/yubioath-flutter { }; + yyjson = callPackage ../development/libraries/yyjson { }; + zchunk = callPackage ../development/libraries/zchunk { }; zeitgeist = callPackage ../development/libraries/zeitgeist { }; From 287354eb815a0acb6a905e68526efb86631412d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Federico=20Dami=C3=A1n=20Schonborn?= Date: Tue, 15 Aug 2023 21:56:57 -0300 Subject: [PATCH 27/35] fastfetch: 1.12.2 -> 2.0.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Federico Damián Schonborn --- pkgs/tools/misc/fastfetch/default.nix | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/fastfetch/default.nix b/pkgs/tools/misc/fastfetch/default.nix index 39250dfca49b..722f81cb751c 100644 --- a/pkgs/tools/misc/fastfetch/default.nix +++ b/pkgs/tools/misc/fastfetch/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , chafa , cmake , dbus @@ -24,6 +25,7 @@ , vulkan-loader , wayland , xfce +, yyjson , zlib , AppKit , Cocoa @@ -40,15 +42,23 @@ stdenv.mkDerivation (finalAttrs: { pname = "fastfetch"; - version = "1.12.2"; + version = "2.0.0"; src = fetchFromGitHub { owner = "fastfetch-cli"; repo = "fastfetch"; rev = finalAttrs.version; - hash = "sha256-l9fIm7+dBsOqGoFUYtpYESAjDy3496rDTUDQjbNU4U0="; + hash = "sha256-mXbkzPlX1OsK+ahUSJWktV5D7Mo2zkhXgXP54QjbIR4="; }; + patches = [ + # Don't fetch yyjson. + (fetchpatch { + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/app-misc/fastfetch/files/fastfetch-2.0.0-dont-fetch-yyjson.patch"; + hash = "sha256-mOykwXSuad8BrUBmjX39EmQb0/hnKezgmWe8cpAybsw="; + }) + ]; + nativeBuildInputs = [ cmake makeBinaryWrapper @@ -59,6 +69,7 @@ stdenv.mkDerivation (finalAttrs: { chafa imagemagick_light sqlite + yyjson ] ++ lib.optionals stdenv.isLinux [ dbus @@ -114,7 +125,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Like neofetch, but much faster because written in C"; - inherit (finalAttrs.src.meta) homepage; + homepage = "https://github.com/fastfetch-cli/fastfetch"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ gerg-l khaneliman ]; platforms = lib.platforms.all; From ca072c08a2543b4a7a107ebbfbb03ab23426f6ed Mon Sep 17 00:00:00 2001 From: Viktor Kronvall Date: Thu, 17 Aug 2023 00:50:10 +0900 Subject: [PATCH 28/35] dockerTools: replace fakechroot with proot The command `fakechroot` errored with buffer overflows. The `proot` command doesn't seem to suffer from the same problem. The tar command creating the layer errors with "permission denied" on a bunch of paths in /proc but the layer seems to get built anyway. --- pkgs/build-support/docker/default.nix | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index f6416c81cc0a..9f57804e957d 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -5,7 +5,7 @@ , closureInfo , coreutils , e2fsprogs -, fakechroot +, proot , fakeNss , fakeroot , go @@ -887,6 +887,13 @@ rec { }); contentsList = if builtins.isList contents then contents else [ contents ]; + bind-paths = builtins.toString (builtins.map (path: "--bind=${path}:${path}!") [ + "/dev/" + "/proc/" + "/sys/" + "${builtins.storeDir}/" + "$out/layer.tar" + ]); # We store the customisation layer as a tarball, to make sure that # things like permissions set on 'extraCommands' are not overridden @@ -898,21 +905,14 @@ rec { nativeBuildInputs = [ fakeroot ] ++ optionals enableFakechroot [ - fakechroot - # for chroot - coreutils - # fakechroot needs getopt, which is provided by util-linux - util-linux + proot ]; postBuild = '' mv $out old_out (cd old_out; eval "$extraCommands" ) mkdir $out - ${optionalString enableFakechroot '' - export FAKECHROOT_EXCLUDE_PATH=/dev:/proc:/sys:${builtins.storeDir}:$out/layer.tar - ''} - ${optionalString enableFakechroot ''fakechroot chroot $PWD/old_out ''}fakeroot bash -c ' + ${optionalString enableFakechroot ''proot -r $PWD/old_out ${bind-paths} --pwd=/ ''}fakeroot bash -c ' source $stdenv/setup ${optionalString (!enableFakechroot) ''cd old_out''} eval "$fakeRootCommands" From 6b3dc26f7182dc225918f1ab994bf52579bbeb89 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Sat, 19 Aug 2023 22:41:47 +0800 Subject: [PATCH 29/35] iroh: 0.4.1 -> 0.5.1 --- pkgs/applications/networking/iroh/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/iroh/default.nix b/pkgs/applications/networking/iroh/default.nix index d899a62288ed..a260bca6a55d 100644 --- a/pkgs/applications/networking/iroh/default.nix +++ b/pkgs/applications/networking/iroh/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "iroh"; - version = "0.4.1"; + version = "0.5.1"; src = fetchFromGitHub { owner = "n0-computer"; repo = pname; - rev = "v${version}"; - sha256 = "bNuTEsbOx7ERH/TigLKVOV6eUF+5C2w3PDH9KkfajBo="; + rev = "${pname}-v${version}"; + hash = "sha256-p1OvXso5szo8ZCnCTKgDzCEMJgiePXQMhVYOkWVZrbE="; }; - cargoSha256 = "WgpX8hz19mnmDmqErSuNDUiFUpr7/K46g4ylhvDIqVw="; + cargoHash = "sha256-QqMBEYaIQ6PqO7w7Yd1jVr0zHARsVaJtZzWytmDksZQ="; buildInputs = lib.optionals stdenv.isDarwin ( with darwin.apple_sdk.frameworks; [ From 7856dba9225d8d30505f1d8a87e3d6c6fdbf76bc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 19 Aug 2023 15:02:23 +0000 Subject: [PATCH 30/35] urn-timer: unstable-2023-07-31 -> unstable-2023-08-07 --- pkgs/tools/misc/urn-timer/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/urn-timer/default.nix b/pkgs/tools/misc/urn-timer/default.nix index 8af36c2bca18..24b9e8849fac 100644 --- a/pkgs/tools/misc/urn-timer/default.nix +++ b/pkgs/tools/misc/urn-timer/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation { pname = "urn-timer"; - version = "unstable-2023-07-31"; + version = "unstable-2023-08-07"; src = fetchFromGitHub { owner = "paoloose"; repo = "urn"; - rev = "2dad51949aa21e0e66a3d34e916fb66689c6be2e"; - hash = "sha256-0pZjgKW4kyBgMGKEa8ZMhKtzbJX2MoXKID++iy16m2A="; + rev = "3468e297ee67aa83e6c26529acd35142ade5c6ff"; + hash = "sha256-e9u/bjFjwgF5QciiqB3AWhyYj7eCstzkpSR9+xNA+4I="; }; nativeBuildInputs = [ From cb5b2bdbfced0b81b0b0dadab353d009156ccee3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 19 Aug 2023 15:36:41 +0000 Subject: [PATCH 31/35] python310Packages.pysigma-backend-insightidr: 0.2.1 -> 0.2.2 --- .../python-modules/pysigma-backend-insightidr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pysigma-backend-insightidr/default.nix b/pkgs/development/python-modules/pysigma-backend-insightidr/default.nix index 87612e80eb52..1fef60d8acf5 100644 --- a/pkgs/development/python-modules/pysigma-backend-insightidr/default.nix +++ b/pkgs/development/python-modules/pysigma-backend-insightidr/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pysigma-backend-insightidr"; - version = "0.2.1"; + version = "0.2.2"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "SigmaHQ"; repo = "pySigma-backend-insightidr"; rev = "refs/tags/v${version}"; - hash = "sha256-0VBnbThEkGhpxkGNBop0rPYn0NujyrK+ei/2+2f3Wno="; + hash = "sha256-B42MADteF0+GC/CPJPLaTGdGcQjC8KEsK9u3tBmtObg="; }; nativeBuildInputs = [ From fd4c28c894fa99855cf2404103e6eb370e70334c Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Fri, 18 Aug 2023 20:06:58 +0100 Subject: [PATCH 32/35] python3Packages.snowflake-connector-python: 3.0.0 -> 3.0.2 still appears to need setuptools present despite switching to `packaging` --- .../python-modules/snowflake-connector-python/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/snowflake-connector-python/default.nix b/pkgs/development/python-modules/snowflake-connector-python/default.nix index f5c929581a1c..f250907999dd 100644 --- a/pkgs/development/python-modules/snowflake-connector-python/default.nix +++ b/pkgs/development/python-modules/snowflake-connector-python/default.nix @@ -10,6 +10,7 @@ , idna , keyring , oscrypto +, packaging , pycryptodomex , pyjwt , pyopenssl @@ -23,14 +24,14 @@ buildPythonPackage rec { pname = "snowflake-connector-python"; - version = "3.0.0"; + version = "3.0.2"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-F0EbgRSS/kYKUDPhf6euM0eLqIqVjQsHC6C9ZZSRCIE="; + hash = "sha256-wMLn7PMcnmaRzn/VbcLVw60dOzJAWTpkEw5HFrCncLY="; }; # snowflake-connector-python requires arrow 10.0.1, which we don't have in @@ -67,12 +68,12 @@ buildPythonPackage rec { filelock idna oscrypto + packaging pycryptodomex pyjwt pyopenssl pytz requests - setuptools typing-extensions ]; From f58f03daea6eb305c94ee021cef533d7f7dc2663 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Fri, 18 Aug 2023 20:20:25 +0100 Subject: [PATCH 33/35] python3Packages.snowflake-connector-python: 3.0.2 -> 3.1.0 --- .../snowflake-connector-python/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/snowflake-connector-python/default.nix b/pkgs/development/python-modules/snowflake-connector-python/default.nix index f250907999dd..a85fc4029fea 100644 --- a/pkgs/development/python-modules/snowflake-connector-python/default.nix +++ b/pkgs/development/python-modules/snowflake-connector-python/default.nix @@ -11,6 +11,7 @@ , keyring , oscrypto , packaging +, platformdirs , pycryptodomex , pyjwt , pyopenssl @@ -18,20 +19,22 @@ , pytz , requests , setuptools +, sortedcontainers +, tomlkit , typing-extensions , wheel }: buildPythonPackage rec { pname = "snowflake-connector-python"; - version = "3.0.2"; + version = "3.1.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-wMLn7PMcnmaRzn/VbcLVw60dOzJAWTpkEw5HFrCncLY="; + hash = "sha256-+sUfxc72+dV5iqRg9ObePlPhoPx7kT0r2Yta6Aa8yDs="; }; # snowflake-connector-python requires arrow 10.0.1, which we don't have in @@ -58,6 +61,7 @@ buildPythonPackage rec { "pyOpenSSL" "charset-normalizer" "cryptography" + "platformdirs" ]; propagatedBuildInputs = [ @@ -69,11 +73,14 @@ buildPythonPackage rec { idna oscrypto packaging + platformdirs pycryptodomex pyjwt pyopenssl pytz requests + sortedcontainers + tomlkit typing-extensions ]; From 710f512b0b83f77e0bf7f5f33a09908dd7c8b818 Mon Sep 17 00:00:00 2001 From: Alexandre Acebedo Date: Mon, 14 Aug 2023 17:00:55 +0200 Subject: [PATCH 34/35] remontoire: init at unstable-2022-06-19 --- pkgs/applications/misc/remontoire/default.nix | 58 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 60 insertions(+) create mode 100644 pkgs/applications/misc/remontoire/default.nix diff --git a/pkgs/applications/misc/remontoire/default.nix b/pkgs/applications/misc/remontoire/default.nix new file mode 100644 index 000000000000..fdabc149d6db --- /dev/null +++ b/pkgs/applications/misc/remontoire/default.nix @@ -0,0 +1,58 @@ +{ lib +, stdenv +, fetchFromGitHub +, wrapGAppsHook +, desktop-file-utils +, glib +, gtk3 +, json-glib +, libgee +, librsvg +, meson +, ninja +, pkg-config +, python3 +, vala +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "remontoire"; + version = "unstable-2022-06-19"; + + src = fetchFromGitHub { + owner = "regolith-linux"; + repo = "remontoire"; + rev = "68d562c78d6e0094ca744bd7161c308f583e93e"; + hash = "sha256-Cb6tzTGZdQA9oA04DO/xLBw5F+FRj5BM2Aa62YWGmZA="; + }; + + nativeBuildInputs = [ + glib + meson + ninja + pkg-config + python3 + vala + wrapGAppsHook + desktop-file-utils + ]; + + buildInputs = [ + gtk3 + json-glib + libgee + ]; + + postPatch = '' + chmod +x build-aux/meson/postinstall.py + patchShebangs build-aux/meson/postinstall.py + ''; + + meta = with lib; { + description = "A small GTK app for presenting keybinding hints"; + homepage = "https://github.com/regolith-linux/remontoire"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ aacebedo ]; + }; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1a5dde7985f2..f725f82b1fe4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32554,6 +32554,8 @@ with pkgs; rlaunch = callPackage ../applications/misc/rlaunch { }; + remontoire = callPackage ../applications/misc/remontoire { }; + rootbar = callPackage ../applications/misc/rootbar { }; waybar = callPackage ../applications/misc/waybar { }; From edf73b45fe60905c6b3aa75e731a023f12fa602a Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sat, 19 Aug 2023 01:29:42 -0300 Subject: [PATCH 35/35] waybar: refactor - Reorder argument list - Use rec-less, overlay-style overridable recursive attributes (in effect since NixOS#119942); - Use pushd/popd instead of subshell - Use lib.mesonEnable and lib.mesonBool - Indentation - Remove nested `with` --- pkgs/applications/misc/waybar/default.nix | 248 +++++++++++++--------- 1 file changed, 145 insertions(+), 103 deletions(-) diff --git a/pkgs/applications/misc/waybar/default.nix b/pkgs/applications/misc/waybar/default.nix index dd1be1bf6284..eca16f3d7dbd 100644 --- a/pkgs/applications/misc/waybar/default.nix +++ b/pkgs/applications/misc/waybar/default.nix @@ -1,69 +1,92 @@ { lib , stdenv , fetchFromGitHub -, meson -, pkg-config -, ninja -, wrapGAppsHook -, wayland -, wlroots -, gtkmm3 -, libsigcxx -, jsoncpp -, scdoc -, spdlog +, SDL2 +, alsa-lib +, catch2_3 +, fftw +, glib +, gobject-introspection , gtk-layer-shell +, gtkmm3 , howard-hinnant-date +, hyprland +, iniparser +, jsoncpp +, libdbusmenu-gtk3 +, libevdev , libinotify-kqueue +, libinput +, libjack2 +, libmpdclient +, libnl +, libpulseaudio +, libsigcxx , libxkbcommon -, cavaSupport ? true, alsa-lib, fftw, iniparser, ncurses, pipewire, portaudio, SDL2 -, evdevSupport ? true, libevdev -, hyprlandSupport ? false, hyprland -, inputSupport ? true, libinput -, jackSupport ? true, libjack2 -, mpdSupport ? true, libmpdclient -, mprisSupport ? stdenv.isLinux, playerctl ? false -, nlSupport ? true, libnl -, pulseSupport ? true, libpulseaudio -, rfkillSupport ? true -, runTests ? true, catch2_3 -, sndioSupport ? true, sndio -, swaySupport ? true, sway -, traySupport ? true, libdbusmenu-gtk3 -, udevSupport ? true, udev -, upowerSupport ? true, upower -, wireplumberSupport ? true, wireplumber -, withMediaPlayer ? mprisSupport && false, glib, gobject-introspection, python3 +, meson +, ncurses +, ninja +, pipewire +, pkg-config +, playerctl +, portaudio +, python3 +, scdoc +, sndio +, spdlog +, sway +, udev +, upower +, wayland +, wireplumber +, wlroots +, wrapGAppsHook + +, cavaSupport ? true +, evdevSupport ? true +, hyprlandSupport ? false +, inputSupport ? true +, jackSupport ? true +, mpdSupport ? true +, mprisSupport ? stdenv.isLinux +, nlSupport ? true +, pulseSupport ? true +, rfkillSupport ? true +, runTests ? true +, sndioSupport ? true +, swaySupport ? true +, traySupport ? true +, udevSupport ? true +, upowerSupport ? true +, wireplumberSupport ? true +, withMediaPlayer ? mprisSupport && false }: + let # Derived from subprojects/cava.wrap - libcava = rec { - version = "0.8.5"; - src = fetchFromGitHub { - owner = "LukashonakV"; - repo = "cava"; - rev = version; - hash = "sha256-b/XfqLh8PnW018sGVKRRlFvBpo2Ru1R2lUeTR7pugBo="; - }; + libcava.src = fetchFromGitHub { + owner = "LukashonakV"; + repo = "cava"; + rev = "0.8.5"; + hash = "sha256-b/XfqLh8PnW018sGVKRRlFvBpo2Ru1R2lUeTR7pugBo="; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "waybar"; version = "0.9.22"; src = fetchFromGitHub { owner = "Alexays"; repo = "Waybar"; - rev = version; + rev = finalAttrs.version; hash = "sha256-9LJDA+zrHF9Mn8+W9iUw50LvO+xdT7/l80KdltPrnDo="; }; postUnpack = lib.optional cavaSupport '' - ( - cd "$sourceRoot" - cp -R --no-preserve=mode,ownership ${libcava.src} subprojects/cava-0.8.5 - patchShebangs . - ) + pushd "$sourceRoot" + cp -R --no-preserve=mode,ownership ${libcava.src} subprojects/cava-0.8.5 + patchShebangs . + popd ''; # Patch for workspaces support in wlr/workspaces @@ -71,7 +94,11 @@ stdenv.mkDerivation rec { patches = lib.optional hyprlandSupport [ ./hyprland.diff ]; nativeBuildInputs = [ - meson ninja pkg-config scdoc wrapGAppsHook + meson + ninja + pkg-config + scdoc + wrapGAppsHook ] ++ lib.optional withMediaPlayer gobject-introspection; propagatedBuildInputs = lib.optionals withMediaPlayer [ @@ -82,72 +109,87 @@ stdenv.mkDerivation rec { strictDeps = false; - buildInputs = with lib; - [ wayland wlroots gtkmm3 libsigcxx jsoncpp spdlog gtk-layer-shell howard-hinnant-date libxkbcommon ] - ++ optional (!stdenv.isLinux) libinotify-kqueue - ++ optional cavaSupport alsa-lib - ++ optional cavaSupport iniparser - ++ optional cavaSupport fftw - ++ optional cavaSupport ncurses - ++ optional cavaSupport pipewire - ++ optional cavaSupport portaudio - ++ optional cavaSupport SDL2 - ++ optional evdevSupport libevdev - ++ optional hyprlandSupport hyprland - ++ optional inputSupport libinput - ++ optional jackSupport libjack2 - ++ optional mpdSupport libmpdclient - ++ optional mprisSupport playerctl - ++ optional nlSupport libnl - ++ optional pulseSupport libpulseaudio - ++ optional sndioSupport sndio - ++ optional swaySupport sway - ++ optional traySupport libdbusmenu-gtk3 - ++ optional udevSupport udev - ++ optional upowerSupport upower - ++ optional wireplumberSupport wireplumber; + buildInputs = [ + gtk-layer-shell + gtkmm3 + howard-hinnant-date + jsoncpp + libsigcxx + libxkbcommon + spdlog + wayland + wlroots + ] + ++ lib.optionals cavaSupport [ + SDL2 + alsa-lib + fftw + iniparser + ncurses + pipewire + portaudio + ] + ++ lib.optional evdevSupport libevdev + ++ lib.optional hyprlandSupport hyprland + ++ lib.optional inputSupport libinput + ++ lib.optional jackSupport libjack2 + ++ lib.optional mpdSupport libmpdclient + ++ lib.optional mprisSupport playerctl + ++ lib.optional nlSupport libnl + ++ lib.optional pulseSupport libpulseaudio + ++ lib.optional sndioSupport sndio + ++ lib.optional swaySupport sway + ++ lib.optional traySupport libdbusmenu-gtk3 + ++ lib.optional udevSupport udev + ++ lib.optional upowerSupport upower + ++ lib.optional wireplumberSupport wireplumber + ++ lib.optional (!stdenv.isLinux) libinotify-kqueue; nativeCheckInputs = [ catch2_3 ]; doCheck = runTests; - mesonFlags = (lib.mapAttrsToList - (option: enable: "-D${option}=${if enable then "enabled" else "disabled"}") - { - cava = cavaSupport; - dbusmenu-gtk = traySupport; - jack = jackSupport; - libinput = inputSupport; - libnl = nlSupport; - libudev = udevSupport; - mpd = mpdSupport; - mpris = mprisSupport; - pulseaudio = pulseSupport; - rfkill = rfkillSupport; - sndio = sndioSupport; - tests = runTests; - upower_glib = upowerSupport; - wireplumber = wireplumberSupport; - } - ) ++ [ - "-Dsystemd=disabled" - "-Dgtk-layer-shell=enabled" - "-Dman-pages=enabled" - ] ++ lib.optional hyprlandSupport "-Dexperimental=true"; + mesonFlags = (lib.mapAttrsToList lib.mesonEnable { + "cava" = cavaSupport; + "dbusmenu-gtk" = traySupport; + "gtk-layer-shell" = true; + "jack" = jackSupport; + "libinput" = inputSupport; + "libnl" = nlSupport; + "libudev" = udevSupport; + "man-pages" = true; + "mpd" = mpdSupport; + "mpris" = mprisSupport; + "pulseaudio" = pulseSupport; + "rfkill" = rfkillSupport; + "sndio" = sndioSupport; + "systemd" = false; + "tests" = runTests; + "upower_glib" = upowerSupport; + "wireplumber" = wireplumberSupport; + }) + ++ lib.optional hyprlandSupport (lib.mesonBool "experimental" true); preFixup = lib.optionalString withMediaPlayer '' - cp $src/resources/custom_modules/mediaplayer.py $out/bin/waybar-mediaplayer.py + cp $src/resources/custom_modules/mediaplayer.py $out/bin/waybar-mediaplayer.py - wrapProgram $out/bin/waybar-mediaplayer.py \ - --prefix PYTHONPATH : "$PYTHONPATH:$out/${python3.sitePackages}" - ''; + wrapProgram $out/bin/waybar-mediaplayer.py \ + --prefix PYTHONPATH : "$PYTHONPATH:$out/${python3.sitePackages}" + ''; - meta = with lib; { - changelog = "https://github.com/alexays/waybar/releases/tag/${version}"; - description = "Highly customizable Wayland bar for Sway and Wlroots based compositors"; - license = licenses.mit; - maintainers = with maintainers; [ FlorianFranzen minijackson synthetica lovesegfault rodrgz jtbx ]; - platforms = platforms.unix; + meta = { homepage = "https://github.com/alexays/waybar"; + description = "Highly customizable Wayland bar for Sway and Wlroots based compositors"; + changelog = "https://github.com/alexays/waybar/releases/tag/${finalAttrs.version}"; + license = lib.licenses.mit; mainProgram = "waybar"; + maintainers = with lib.maintainers; [ + FlorianFranzen + jtbx + lovesegfault + minijackson + rodrgz + synthetica + ]; + inherit (wlroots.meta) platforms; }; -} +})