From 916b3f3bbea4efa5acdbfdc605d62b9eb4dfb2b5 Mon Sep 17 00:00:00 2001 From: Philip Wilk Date: Thu, 3 Jul 2025 17:16:50 +0100 Subject: [PATCH 01/97] nixos/hddtemp: allow use of command substitutions in drives option --- nixos/modules/hardware/sensor/hddtemp.nix | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/nixos/modules/hardware/sensor/hddtemp.nix b/nixos/modules/hardware/sensor/hddtemp.nix index 4c89eac56ddf..2d7ef17f7ae9 100644 --- a/nixos/modules/hardware/sensor/hddtemp.nix +++ b/nixos/modules/hardware/sensor/hddtemp.nix @@ -9,21 +9,26 @@ let cfg = config.hardware.sensor.hddtemp; - wrapper = pkgs.writeShellScript "hddtemp-wrapper" '' + script = '' set -eEuo pipefail file=/var/lib/hddtemp/hddtemp.db - drives=(${toString (map (e: ''$(realpath ${lib.escapeShellArg e}) '') cfg.drives)}) + raw_drives="" + ${lib.concatStringsSep "\n" (map (drives: "raw_drives+=\"${drives} \"") cfg.drives)} + drives="" + for i in $raw_drives; do + drives+=" $(realpath $i)" + done cp ${pkgs.hddtemp}/share/hddtemp/hddtemp.db $file ${lib.concatMapStringsSep "\n" (e: "echo ${lib.escapeShellArg e} >> $file") cfg.dbEntries} - exec ${pkgs.hddtemp}/bin/hddtemp ${lib.escapeShellArgs cfg.extraArgs} \ + ${pkgs.hddtemp}/bin/hddtemp ${lib.escapeShellArgs cfg.extraArgs} \ --daemon \ --unit=${cfg.unit} \ --file=$file \ - ''${drives[@]} + $drives ''; in @@ -77,9 +82,9 @@ in description = "HDD/SSD temperature"; documentation = [ "man:hddtemp(8)" ]; wantedBy = [ "multi-user.target" ]; + inherit script; serviceConfig = { Type = "forking"; - ExecStart = wrapper; StateDirectory = "hddtemp"; PrivateTmp = true; ProtectHome = "tmpfs"; From a135e7366e89178052a3c79f5b67b759a1687e8f Mon Sep 17 00:00:00 2001 From: Philip Wilk Date: Thu, 3 Jul 2025 17:16:58 +0100 Subject: [PATCH 02/97] nixos/hddfancontrol: loosen pwmPaths and disks types Use str instead of path for the types, and use script instead of ExecStart for the service. This lets you use command substitution to automatically select the correct disks and fan controllers at service start. Useful at hwmonX can change value frequently and spontaneously. Also lets you replace failed disks without having to change your nix config - only need to reload the service. --- .../services/hardware/hddfancontrol.nix | 24 ++++++++++++++----- 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/nixos/modules/services/hardware/hddfancontrol.nix b/nixos/modules/services/hardware/hddfancontrol.nix index a1e36012893d..999fb3cc5317 100644 --- a/nixos/modules/services/hardware/hddfancontrol.nix +++ b/nixos/modules/services/hardware/hddfancontrol.nix @@ -52,21 +52,30 @@ in { options = { disks = lib.mkOption { - type = lib.types.listOf lib.types.path; + type = lib.types.listOf lib.types.str; default = [ ]; description = '' Drive(s) to get temperature from + + Can also use command substitution to automatically grab all matching drives; such as all scsi (sas) drives ''; - example = [ "/dev/sda" ]; + example = [ + "/dev/sda" + "`find /dev/disk/by-id -name \"scsi*\" -and -not -name \"*-part*\" -printf \"%p \"`" + ]; }; pwmPaths = lib.mkOption { - type = lib.types.listOf lib.types.path; + type = lib.types.listOf lib.types.str; default = [ ]; description = '' PWM filepath(s) to control fan speed (under /sys), followed by initial and fan-stop PWM values + Can also use command substitution to ensure the correct hwmonX is selected on every boot ''; - example = [ "/sys/class/hwmon/hwmon2/pwm1:30:10" ]; + example = [ + "/sys/class/hwmon/hwmon2/pwm1:30:10" + "`echo /sys/devices/platform/nct6775.656/hwmon/hwmon[[:print:]]`/pwm4:80:20" + ]; }; logVerbosity = lib.mkOption { @@ -151,9 +160,12 @@ in documentation = [ "man:hddfancontrol(1)" ]; after = [ "hddtemp.service" ]; wants = [ "hddtemp.service" ]; + script = + let + argString = lib.strings.concatStringsSep " " (args cnf); + in + "${lib.getExe pkgs.hddfancontrol} -v ${cnf.logVerbosity} daemon ${argString}"; serviceConfig = { - ExecStart = "${lib.getExe pkgs.hddfancontrol} -v ${cnf.logVerbosity} daemon ${lib.escapeShellArgs (args cnf)}"; - CPUSchedulingPolicy = "rr"; CPUSchedulingPriority = 49; From 466efda0b6dafd55378bc50045974ac800812f8c Mon Sep 17 00:00:00 2001 From: Tom McLaughlin Date: Fri, 15 Aug 2025 01:33:39 -0700 Subject: [PATCH 03/97] nodehun: fix build at 3.0.2 --- pkgs/by-name/no/nodehun/package.nix | 18 +- pkgs/by-name/no/nodehun/remove-nodemon.patch | 2840 ++++++++++++++++++ pkgs/by-name/no/nodehun/update-nan.patch | 150 - 3 files changed, 2852 insertions(+), 156 deletions(-) create mode 100644 pkgs/by-name/no/nodehun/remove-nodemon.patch delete mode 100644 pkgs/by-name/no/nodehun/update-nan.patch diff --git a/pkgs/by-name/no/nodehun/package.nix b/pkgs/by-name/no/nodehun/package.nix index 4cfc9cf9dabe..8947522834bb 100644 --- a/pkgs/by-name/no/nodehun/package.nix +++ b/pkgs/by-name/no/nodehun/package.nix @@ -21,14 +21,16 @@ buildNpmPackage { }; patches = [ - # fsevents is needed on Darwin, but its dependency "nan" in the upstream package-lock.json - # is too old for the Node 18.x in Nixpkgs. - # This patch is generated by checking out the upstream source and running - # npm update nan --lockfile-version 1 - ./update-nan.patch + # Remove the dependency on "nodemon", which is only needed for interactive + # development. This package depends on fsevents on macOS, which has + # repeatedly caused build problems. This patch is generated by checking out + # the upstream source and removing the "nodemon" line, and then running + # + # npm install --lockfile-version 1 + ./remove-nodemon.patch ]; - npmDepsHash = "sha256-mV6rWNf2p2w4H0ESUT0/Ybtx9YEdvO5l2gCvlWFXK+U="; + npmDepsHash = "sha256-GyNUPgLJhdjzbIpld916/l8durIw0aQRHojjSmGgEJE="; nativeBuildInputs = [ node-gyp python3 @@ -43,8 +45,12 @@ buildNpmPackage { cp -r build_old/Release build/ rm -rf build_old rm -rf build/Release/.deps + # Remove a development script to eliminate runtime dependency on node rm node_modules/node-addon-api/tools/conversion.js + + # Remove dangling symlinks + rm -rf $out/lib/node_modules/nodehun/node_modules/.bin ''; doInstallCheck = true; diff --git a/pkgs/by-name/no/nodehun/remove-nodemon.patch b/pkgs/by-name/no/nodehun/remove-nodemon.patch new file mode 100644 index 000000000000..51137cbab539 --- /dev/null +++ b/pkgs/by-name/no/nodehun/remove-nodemon.patch @@ -0,0 +1,2840 @@ +diff --git a/package-lock.json b/package-lock.json +index 3c577dd..637b6b2 100644 +--- a/package-lock.json ++++ b/package-lock.json +@@ -16,21 +16,6 @@ + "integrity": "sha512-FjsYUPzEJdGXjwKqSpE0/9QEh6kzhTAeObA54rn6j3rR4C/mzpI9L0KNfoeASSPMMdxIsoJuCLDWcM/rVjIsSA==", + "dev": true + }, +- "abbrev": { +- "version": "1.1.1", +- "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", +- "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==", +- "dev": true +- }, +- "ansi-align": { +- "version": "2.0.0", +- "resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-2.0.0.tgz", +- "integrity": "sha1-w2rsy6VjuJzrVW82kPCx2eNUf38=", +- "dev": true, +- "requires": { +- "string-width": "^2.0.0" +- } +- }, + "ansi-colors": { + "version": "3.2.3", + "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.3.tgz", +@@ -52,27 +37,6 @@ + "color-convert": "^1.9.0" + } + }, +- "anymatch": { +- "version": "2.0.0", +- "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz", +- "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==", +- "dev": true, +- "requires": { +- "micromatch": "^3.1.4", +- "normalize-path": "^2.1.1" +- }, +- "dependencies": { +- "normalize-path": { +- "version": "2.1.1", +- "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz", +- "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=", +- "dev": true, +- "requires": { +- "remove-trailing-separator": "^1.0.1" +- } +- } +- } +- }, + "arg": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.1.tgz", +@@ -88,136 +52,18 @@ + "sprintf-js": "~1.0.2" + } + }, +- "arr-diff": { +- "version": "4.0.0", +- "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz", +- "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=", +- "dev": true +- }, +- "arr-flatten": { +- "version": "1.1.0", +- "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz", +- "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==", +- "dev": true +- }, +- "arr-union": { +- "version": "3.1.0", +- "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz", +- "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=", +- "dev": true +- }, +- "array-unique": { +- "version": "0.3.2", +- "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz", +- "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=", +- "dev": true +- }, +- "assign-symbols": { +- "version": "1.0.0", +- "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz", +- "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=", +- "dev": true +- }, +- "async-each": { +- "version": "1.0.3", +- "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.3.tgz", +- "integrity": "sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==", +- "dev": true +- }, +- "atob": { +- "version": "2.1.2", +- "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz", +- "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==", +- "dev": true +- }, + "balanced-match": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", + "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=", + "dev": true + }, +- "base": { +- "version": "0.11.2", +- "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz", +- "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==", +- "dev": true, +- "requires": { +- "cache-base": "^1.0.1", +- "class-utils": "^0.3.5", +- "component-emitter": "^1.2.1", +- "define-property": "^1.0.0", +- "isobject": "^3.0.1", +- "mixin-deep": "^1.2.0", +- "pascalcase": "^0.1.1" +- }, +- "dependencies": { +- "define-property": { +- "version": "1.0.0", +- "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", +- "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", +- "dev": true, +- "requires": { +- "is-descriptor": "^1.0.0" +- } +- }, +- "is-accessor-descriptor": { +- "version": "1.0.0", +- "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", +- "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", +- "dev": true, +- "requires": { +- "kind-of": "^6.0.0" +- } +- }, +- "is-data-descriptor": { +- "version": "1.0.0", +- "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", +- "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", +- "dev": true, +- "requires": { +- "kind-of": "^6.0.0" +- } +- }, +- "is-descriptor": { +- "version": "1.0.2", +- "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", +- "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", +- "dev": true, +- "requires": { +- "is-accessor-descriptor": "^1.0.0", +- "is-data-descriptor": "^1.0.0", +- "kind-of": "^6.0.2" +- } +- } +- } +- }, +- "binary-extensions": { +- "version": "1.13.1", +- "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz", +- "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==", +- "dev": true +- }, + "bindings": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.2.1.tgz", + "integrity": "sha1-FK1hE4EtLTfXLme0ystLtyZQXxE=", + "dev": true + }, +- "boxen": { +- "version": "1.3.0", +- "resolved": "https://registry.npmjs.org/boxen/-/boxen-1.3.0.tgz", +- "integrity": "sha512-TNPjfTr432qx7yOjQyaXm3dSR0MH9vXp7eT1BFSl/C51g+EFnOR9hTg1IreahGBmDNCehscshe45f+C1TBZbLw==", +- "dev": true, +- "requires": { +- "ansi-align": "^2.0.0", +- "camelcase": "^4.0.0", +- "chalk": "^2.0.1", +- "cli-boxes": "^1.0.0", +- "string-width": "^2.0.0", +- "term-size": "^1.2.0", +- "widest-line": "^2.0.0" +- } +- }, + "brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", +@@ -228,35 +74,6 @@ + "concat-map": "0.0.1" + } + }, +- "braces": { +- "version": "2.3.2", +- "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz", +- "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", +- "dev": true, +- "requires": { +- "arr-flatten": "^1.1.0", +- "array-unique": "^0.3.2", +- "extend-shallow": "^2.0.1", +- "fill-range": "^4.0.0", +- "isobject": "^3.0.1", +- "repeat-element": "^1.1.2", +- "snapdragon": "^0.8.1", +- "snapdragon-node": "^2.0.1", +- "split-string": "^3.0.2", +- "to-regex": "^3.0.1" +- }, +- "dependencies": { +- "extend-shallow": { +- "version": "2.0.1", +- "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", +- "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", +- "dev": true, +- "requires": { +- "is-extendable": "^0.1.0" +- } +- } +- } +- }, + "browser-stdout": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz", +@@ -269,35 +86,6 @@ + "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==", + "dev": true + }, +- "cache-base": { +- "version": "1.0.1", +- "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz", +- "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==", +- "dev": true, +- "requires": { +- "collection-visit": "^1.0.0", +- "component-emitter": "^1.2.1", +- "get-value": "^2.0.6", +- "has-value": "^1.0.0", +- "isobject": "^3.0.1", +- "set-value": "^2.0.0", +- "to-object-path": "^0.3.0", +- "union-value": "^1.0.0", +- "unset-value": "^1.0.0" +- } +- }, +- "camelcase": { +- "version": "4.1.0", +- "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz", +- "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=", +- "dev": true +- }, +- "capture-stack-trace": { +- "version": "1.0.1", +- "resolved": "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.1.tgz", +- "integrity": "sha512-mYQLZnx5Qt1JgB1WEiMCf2647plpGeQ2NMR/5L0HNZzGQo4fuSPnK+wjfPnKZV0aiJDgzmWqqkV/g7JD+DW0qw==", +- "dev": true +- }, + "chalk": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", +@@ -309,68 +97,6 @@ + "supports-color": "^5.3.0" + } + }, +- "chokidar": { +- "version": "2.1.8", +- "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz", +- "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==", +- "dev": true, +- "requires": { +- "anymatch": "^2.0.0", +- "async-each": "^1.0.1", +- "braces": "^2.3.2", +- "fsevents": "^1.2.7", +- "glob-parent": "^3.1.0", +- "inherits": "^2.0.3", +- "is-binary-path": "^1.0.0", +- "is-glob": "^4.0.0", +- "normalize-path": "^3.0.0", +- "path-is-absolute": "^1.0.0", +- "readdirp": "^2.2.1", +- "upath": "^1.1.1" +- } +- }, +- "chownr": { +- "version": "1.1.4", +- "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz", +- "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==", +- "dev": true, +- "optional": true +- }, +- "ci-info": { +- "version": "1.6.0", +- "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-1.6.0.tgz", +- "integrity": "sha512-vsGdkwSCDpWmP80ncATX7iea5DWQemg1UgCW5J8tqjU3lYw4FBYuj89J0CTVomA7BEfvSZd84GmHko+MxFQU2A==", +- "dev": true +- }, +- "class-utils": { +- "version": "0.3.6", +- "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz", +- "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==", +- "dev": true, +- "requires": { +- "arr-union": "^3.1.0", +- "define-property": "^0.2.5", +- "isobject": "^3.0.0", +- "static-extend": "^0.1.1" +- }, +- "dependencies": { +- "define-property": { +- "version": "0.2.5", +- "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", +- "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", +- "dev": true, +- "requires": { +- "is-descriptor": "^0.1.0" +- } +- } +- } +- }, +- "cli-boxes": { +- "version": "1.0.0", +- "resolved": "https://registry.npmjs.org/cli-boxes/-/cli-boxes-1.0.0.tgz", +- "integrity": "sha1-T6kXw+WclKAEzWH47lCdplFocUM=", +- "dev": true +- }, + "cliui": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz", +@@ -410,16 +136,6 @@ + } + } + }, +- "collection-visit": { +- "version": "1.0.0", +- "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz", +- "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=", +- "dev": true, +- "requires": { +- "map-visit": "^1.0.0", +- "object-visit": "^1.0.0" +- } +- }, + "color-convert": { + "version": "1.9.3", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", +@@ -435,70 +151,12 @@ + "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=", + "dev": true + }, +- "component-emitter": { +- "version": "1.3.0", +- "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz", +- "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==", +- "dev": true +- }, + "concat-map": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", + "dev": true + }, +- "configstore": { +- "version": "3.1.2", +- "resolved": "https://registry.npmjs.org/configstore/-/configstore-3.1.2.tgz", +- "integrity": "sha512-vtv5HtGjcYUgFrXc6Kx747B83MRRVS5R1VTEQoXvuP+kMI+if6uywV0nDGoiydJRy4yk7h9od5Og0kxx4zUXmw==", +- "dev": true, +- "requires": { +- "dot-prop": "^4.1.0", +- "graceful-fs": "^4.1.2", +- "make-dir": "^1.0.0", +- "unique-string": "^1.0.0", +- "write-file-atomic": "^2.0.0", +- "xdg-basedir": "^3.0.0" +- } +- }, +- "copy-descriptor": { +- "version": "0.1.1", +- "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz", +- "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=", +- "dev": true +- }, +- "core-util-is": { +- "version": "1.0.2", +- "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", +- "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=", +- "dev": true +- }, +- "create-error-class": { +- "version": "3.0.2", +- "resolved": "https://registry.npmjs.org/create-error-class/-/create-error-class-3.0.2.tgz", +- "integrity": "sha1-Br56vvlHo/FKMP1hBnHUAbyot7Y=", +- "dev": true, +- "requires": { +- "capture-stack-trace": "^1.0.0" +- } +- }, +- "cross-spawn": { +- "version": "5.1.0", +- "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", +- "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=", +- "dev": true, +- "requires": { +- "lru-cache": "^4.0.1", +- "shebang-command": "^1.2.0", +- "which": "^1.2.9" +- } +- }, +- "crypto-random-string": { +- "version": "1.0.0", +- "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-1.0.0.tgz", +- "integrity": "sha1-ojD2T1aDEOFJgAmUB5DsmVRbyn4=", +- "dev": true +- }, + "debug": { + "version": "3.2.6", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", +@@ -522,18 +180,6 @@ + "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=", + "dev": true + }, +- "decode-uri-component": { +- "version": "0.2.0", +- "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz", +- "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=", +- "dev": true +- }, +- "deep-extend": { +- "version": "0.6.0", +- "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz", +- "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==", +- "dev": true +- }, + "define-properties": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz", +@@ -543,68 +189,12 @@ + "object-keys": "^1.0.12" + } + }, +- "define-property": { +- "version": "2.0.2", +- "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz", +- "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==", +- "dev": true, +- "requires": { +- "is-descriptor": "^1.0.2", +- "isobject": "^3.0.1" +- }, +- "dependencies": { +- "is-accessor-descriptor": { +- "version": "1.0.0", +- "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", +- "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", +- "dev": true, +- "requires": { +- "kind-of": "^6.0.0" +- } +- }, +- "is-data-descriptor": { +- "version": "1.0.0", +- "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", +- "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", +- "dev": true, +- "requires": { +- "kind-of": "^6.0.0" +- } +- }, +- "is-descriptor": { +- "version": "1.0.2", +- "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", +- "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", +- "dev": true, +- "requires": { +- "is-accessor-descriptor": "^1.0.0", +- "is-data-descriptor": "^1.0.0", +- "kind-of": "^6.0.2" +- } +- } +- } +- }, + "diff": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.1.tgz", + "integrity": "sha512-s2+XdvhPCOF01LRQBC8hf4vhbVmI2CGS5aZnxLJlT5FtdhPCDFq80q++zK2KlrVorVDdL5BOGZ/VfLrVtYNF+Q==", + "dev": true + }, +- "dot-prop": { +- "version": "4.2.0", +- "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-4.2.0.tgz", +- "integrity": "sha512-tUMXrxlExSW6U2EXiiKGSBVdYgtV8qlHL+C10TsW4PURY/ic+eaysnSkwB4kA/mBlCyy/IKDJ+Lc3wbWeaXtuQ==", +- "dev": true, +- "requires": { +- "is-obj": "^1.0.0" +- } +- }, +- "duplexer3": { +- "version": "0.1.4", +- "resolved": "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz", +- "integrity": "sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI=", +- "dev": true +- }, + "emoji-regex": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz", +@@ -652,174 +242,6 @@ + "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", + "dev": true + }, +- "execa": { +- "version": "0.7.0", +- "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz", +- "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=", +- "dev": true, +- "requires": { +- "cross-spawn": "^5.0.1", +- "get-stream": "^3.0.0", +- "is-stream": "^1.1.0", +- "npm-run-path": "^2.0.0", +- "p-finally": "^1.0.0", +- "signal-exit": "^3.0.0", +- "strip-eof": "^1.0.0" +- } +- }, +- "expand-brackets": { +- "version": "2.1.4", +- "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz", +- "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=", +- "dev": true, +- "requires": { +- "debug": "^2.3.3", +- "define-property": "^0.2.5", +- "extend-shallow": "^2.0.1", +- "posix-character-classes": "^0.1.0", +- "regex-not": "^1.0.0", +- "snapdragon": "^0.8.1", +- "to-regex": "^3.0.1" +- }, +- "dependencies": { +- "debug": { +- "version": "2.6.9", +- "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", +- "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", +- "dev": true, +- "requires": { +- "ms": "2.0.0" +- } +- }, +- "define-property": { +- "version": "0.2.5", +- "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", +- "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", +- "dev": true, +- "requires": { +- "is-descriptor": "^0.1.0" +- } +- }, +- "extend-shallow": { +- "version": "2.0.1", +- "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", +- "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", +- "dev": true, +- "requires": { +- "is-extendable": "^0.1.0" +- } +- } +- } +- }, +- "extend-shallow": { +- "version": "3.0.2", +- "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz", +- "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=", +- "dev": true, +- "requires": { +- "assign-symbols": "^1.0.0", +- "is-extendable": "^1.0.1" +- }, +- "dependencies": { +- "is-extendable": { +- "version": "1.0.1", +- "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz", +- "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", +- "dev": true, +- "requires": { +- "is-plain-object": "^2.0.4" +- } +- } +- } +- }, +- "extglob": { +- "version": "2.0.4", +- "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz", +- "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==", +- "dev": true, +- "requires": { +- "array-unique": "^0.3.2", +- "define-property": "^1.0.0", +- "expand-brackets": "^2.1.4", +- "extend-shallow": "^2.0.1", +- "fragment-cache": "^0.2.1", +- "regex-not": "^1.0.0", +- "snapdragon": "^0.8.1", +- "to-regex": "^3.0.1" +- }, +- "dependencies": { +- "define-property": { +- "version": "1.0.0", +- "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", +- "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", +- "dev": true, +- "requires": { +- "is-descriptor": "^1.0.0" +- } +- }, +- "extend-shallow": { +- "version": "2.0.1", +- "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", +- "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", +- "dev": true, +- "requires": { +- "is-extendable": "^0.1.0" +- } +- }, +- "is-accessor-descriptor": { +- "version": "1.0.0", +- "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", +- "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", +- "dev": true, +- "requires": { +- "kind-of": "^6.0.0" +- } +- }, +- "is-data-descriptor": { +- "version": "1.0.0", +- "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", +- "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", +- "dev": true, +- "requires": { +- "kind-of": "^6.0.0" +- } +- }, +- "is-descriptor": { +- "version": "1.0.2", +- "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", +- "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", +- "dev": true, +- "requires": { +- "is-accessor-descriptor": "^1.0.0", +- "is-data-descriptor": "^1.0.0", +- "kind-of": "^6.0.2" +- } +- } +- } +- }, +- "fill-range": { +- "version": "4.0.0", +- "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz", +- "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", +- "dev": true, +- "requires": { +- "extend-shallow": "^2.0.1", +- "is-number": "^3.0.0", +- "repeat-string": "^1.6.1", +- "to-regex-range": "^2.1.0" +- }, +- "dependencies": { +- "extend-shallow": { +- "version": "2.0.1", +- "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", +- "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", +- "dev": true, +- "requires": { +- "is-extendable": "^0.1.0" +- } +- } +- } +- }, + "find-up": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz", +@@ -846,555 +268,12 @@ + } + } + }, +- "for-in": { +- "version": "1.0.2", +- "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz", +- "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=", +- "dev": true +- }, +- "fragment-cache": { +- "version": "0.2.1", +- "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz", +- "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=", +- "dev": true, +- "requires": { +- "map-cache": "^0.2.2" +- } +- }, +- "fs-minipass": { +- "version": "1.2.7", +- "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.7.tgz", +- "integrity": "sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA==", +- "dev": true, +- "optional": true, +- "requires": { +- "minipass": "^2.6.0" +- } +- }, + "fs.realpath": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", + "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=", + "dev": true + }, +- "fsevents": { +- "version": "1.2.9", +- "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.9.tgz", +- "integrity": "sha512-oeyj2H3EjjonWcFjD5NvZNE9Rqe4UW+nQBU2HNeKw0koVLEFIhtyETyAakeAM3de7Z/SW5kcA+fZUait9EApnw==", +- "dev": true, +- "optional": true, +- "requires": { +- "nan": "^2.12.1", +- "node-pre-gyp": "^0.12.0" +- }, +- "dependencies": { +- "abbrev": { +- "version": "1.1.1", +- "bundled": true, +- "dev": true, +- "optional": true +- }, +- "ansi-regex": { +- "version": "2.1.1", +- "bundled": true, +- "dev": true, +- "optional": true +- }, +- "aproba": { +- "version": "1.2.0", +- "bundled": true, +- "dev": true, +- "optional": true +- }, +- "are-we-there-yet": { +- "version": "1.1.5", +- "bundled": true, +- "dev": true, +- "optional": true, +- "requires": { +- "delegates": "^1.0.0", +- "readable-stream": "^2.0.6" +- } +- }, +- "balanced-match": { +- "version": "1.0.0", +- "bundled": true, +- "dev": true, +- "optional": true +- }, +- "brace-expansion": { +- "version": "1.1.11", +- "bundled": true, +- "dev": true, +- "optional": true, +- "requires": { +- "balanced-match": "^1.0.0", +- "concat-map": "0.0.1" +- } +- }, +- "chownr": { +- "version": "1.1.1", +- "bundled": true +- }, +- "code-point-at": { +- "version": "1.1.0", +- "bundled": true, +- "dev": true, +- "optional": true +- }, +- "concat-map": { +- "version": "0.0.1", +- "bundled": true, +- "dev": true, +- "optional": true +- }, +- "console-control-strings": { +- "version": "1.1.0", +- "bundled": true, +- "dev": true, +- "optional": true +- }, +- "core-util-is": { +- "version": "1.0.2", +- "bundled": true, +- "dev": true, +- "optional": true +- }, +- "debug": { +- "version": "4.1.1", +- "bundled": true, +- "dev": true, +- "optional": true, +- "requires": { +- "ms": "^2.1.1" +- } +- }, +- "deep-extend": { +- "version": "0.6.0", +- "bundled": true, +- "dev": true, +- "optional": true +- }, +- "delegates": { +- "version": "1.0.0", +- "bundled": true, +- "dev": true, +- "optional": true +- }, +- "detect-libc": { +- "version": "1.0.3", +- "bundled": true, +- "dev": true, +- "optional": true +- }, +- "fs-minipass": { +- "version": "1.2.5", +- "bundled": true, +- "requires": { +- "minipass": "^2.2.1" +- } +- }, +- "fs.realpath": { +- "version": "1.0.0", +- "bundled": true, +- "dev": true, +- "optional": true +- }, +- "gauge": { +- "version": "2.7.4", +- "bundled": true, +- "dev": true, +- "optional": true, +- "requires": { +- "aproba": "^1.0.3", +- "console-control-strings": "^1.0.0", +- "has-unicode": "^2.0.0", +- "object-assign": "^4.1.0", +- "signal-exit": "^3.0.0", +- "string-width": "^1.0.1", +- "strip-ansi": "^3.0.1", +- "wide-align": "^1.1.0" +- } +- }, +- "glob": { +- "version": "7.1.3", +- "bundled": true, +- "dev": true, +- "optional": true, +- "requires": { +- "fs.realpath": "^1.0.0", +- "inflight": "^1.0.4", +- "inherits": "2", +- "minimatch": "^3.0.4", +- "once": "^1.3.0", +- "path-is-absolute": "^1.0.0" +- } +- }, +- "has-unicode": { +- "version": "2.0.1", +- "bundled": true, +- "dev": true, +- "optional": true +- }, +- "iconv-lite": { +- "version": "0.4.24", +- "bundled": true, +- "dev": true, +- "optional": true, +- "requires": { +- "safer-buffer": ">= 2.1.2 < 3" +- } +- }, +- "ignore-walk": { +- "version": "3.0.1", +- "bundled": true, +- "dev": true, +- "optional": true, +- "requires": { +- "minimatch": "^3.0.4" +- } +- }, +- "inflight": { +- "version": "1.0.6", +- "bundled": true, +- "dev": true, +- "optional": true, +- "requires": { +- "once": "^1.3.0", +- "wrappy": "1" +- } +- }, +- "inherits": { +- "version": "2.0.3", +- "bundled": true, +- "dev": true, +- "optional": true +- }, +- "is-fullwidth-code-point": { +- "version": "1.0.0", +- "bundled": true, +- "dev": true, +- "optional": true, +- "requires": { +- "number-is-nan": "^1.0.0" +- } +- }, +- "isarray": { +- "version": "1.0.0", +- "bundled": true, +- "dev": true, +- "optional": true +- }, +- "minimatch": { +- "version": "3.0.4", +- "bundled": true, +- "dev": true, +- "optional": true, +- "requires": { +- "brace-expansion": "^1.1.7" +- } +- }, +- "minimist": { +- "version": "0.0.8", +- "bundled": true, +- "dev": true, +- "optional": true +- }, +- "minipass": { +- "version": "2.3.5", +- "bundled": true, +- "optional": true, +- "requires": { +- "safe-buffer": "^5.1.2", +- "yallist": "^3.0.0" +- } +- }, +- "minizlib": { +- "version": "1.2.1", +- "bundled": true, +- "requires": { +- "minipass": "^2.2.1" +- } +- }, +- "mkdirp": { +- "version": "0.5.1", +- "bundled": true, +- "dev": true, +- "optional": true, +- "requires": { +- "minimist": "0.0.8" +- } +- }, +- "ms": { +- "version": "2.1.1", +- "bundled": true, +- "dev": true, +- "optional": true +- }, +- "needle": { +- "version": "2.3.0", +- "bundled": true, +- "dev": true, +- "optional": true, +- "requires": { +- "debug": "^4.1.0", +- "iconv-lite": "^0.4.4", +- "sax": "^1.2.4" +- } +- }, +- "node-pre-gyp": { +- "version": "0.12.0", +- "bundled": true, +- "dev": true, +- "optional": true, +- "requires": { +- "detect-libc": "^1.0.2", +- "mkdirp": "^0.5.1", +- "needle": "^2.2.1", +- "nopt": "^4.0.1", +- "npm-packlist": "^1.1.6", +- "npmlog": "^4.0.2", +- "rc": "^1.2.7", +- "rimraf": "^2.6.1", +- "semver": "^5.3.0", +- "tar": "^4" +- } +- }, +- "nopt": { +- "version": "4.0.1", +- "bundled": true, +- "dev": true, +- "optional": true, +- "requires": { +- "abbrev": "1", +- "osenv": "^0.1.4" +- } +- }, +- "npm-bundled": { +- "version": "1.0.6", +- "bundled": true, +- "dev": true, +- "optional": true +- }, +- "npm-packlist": { +- "version": "1.4.1", +- "bundled": true, +- "dev": true, +- "optional": true, +- "requires": { +- "ignore-walk": "^3.0.1", +- "npm-bundled": "^1.0.1" +- } +- }, +- "npmlog": { +- "version": "4.1.2", +- "bundled": true, +- "dev": true, +- "optional": true, +- "requires": { +- "are-we-there-yet": "~1.1.2", +- "console-control-strings": "~1.1.0", +- "gauge": "~2.7.3", +- "set-blocking": "~2.0.0" +- } +- }, +- "number-is-nan": { +- "version": "1.0.1", +- "bundled": true, +- "dev": true, +- "optional": true +- }, +- "object-assign": { +- "version": "4.1.1", +- "bundled": true, +- "dev": true, +- "optional": true +- }, +- "once": { +- "version": "1.4.0", +- "bundled": true, +- "dev": true, +- "optional": true, +- "requires": { +- "wrappy": "1" +- } +- }, +- "os-homedir": { +- "version": "1.0.2", +- "bundled": true, +- "dev": true, +- "optional": true +- }, +- "os-tmpdir": { +- "version": "1.0.2", +- "bundled": true, +- "dev": true, +- "optional": true +- }, +- "osenv": { +- "version": "0.1.5", +- "bundled": true, +- "dev": true, +- "optional": true, +- "requires": { +- "os-homedir": "^1.0.0", +- "os-tmpdir": "^1.0.0" +- } +- }, +- "path-is-absolute": { +- "version": "1.0.1", +- "bundled": true, +- "dev": true, +- "optional": true +- }, +- "process-nextick-args": { +- "version": "2.0.0", +- "bundled": true, +- "dev": true, +- "optional": true +- }, +- "rc": { +- "version": "1.2.8", +- "bundled": true, +- "dev": true, +- "optional": true, +- "requires": { +- "deep-extend": "^0.6.0", +- "ini": "~1.3.0", +- "minimist": "^1.2.0", +- "strip-json-comments": "~2.0.1" +- }, +- "dependencies": { +- "minimist": { +- "version": "1.2.0", +- "bundled": true, +- "dev": true, +- "optional": true +- } +- } +- }, +- "readable-stream": { +- "version": "2.3.6", +- "bundled": true, +- "dev": true, +- "optional": true, +- "requires": { +- "core-util-is": "~1.0.0", +- "inherits": "~2.0.3", +- "isarray": "~1.0.0", +- "process-nextick-args": "~2.0.0", +- "safe-buffer": "~5.1.1", +- "string_decoder": "~1.1.1", +- "util-deprecate": "~1.0.1" +- } +- }, +- "rimraf": { +- "version": "2.6.3", +- "bundled": true, +- "dev": true, +- "optional": true, +- "requires": { +- "glob": "^7.1.3" +- } +- }, +- "safe-buffer": { +- "version": "5.1.2", +- "bundled": true, +- "optional": true +- }, +- "safer-buffer": { +- "version": "2.1.2", +- "bundled": true, +- "dev": true, +- "optional": true +- }, +- "sax": { +- "version": "1.2.4", +- "bundled": true, +- "dev": true, +- "optional": true +- }, +- "semver": { +- "version": "5.7.0", +- "bundled": true, +- "dev": true, +- "optional": true +- }, +- "set-blocking": { +- "version": "2.0.0", +- "bundled": true, +- "dev": true, +- "optional": true +- }, +- "signal-exit": { +- "version": "3.0.2", +- "bundled": true, +- "dev": true, +- "optional": true +- }, +- "string-width": { +- "version": "1.0.2", +- "bundled": true, +- "dev": true, +- "optional": true, +- "requires": { +- "code-point-at": "^1.0.0", +- "is-fullwidth-code-point": "^1.0.0", +- "strip-ansi": "^3.0.0" +- } +- }, +- "string_decoder": { +- "version": "1.1.1", +- "bundled": true, +- "dev": true, +- "optional": true, +- "requires": { +- "safe-buffer": "~5.1.0" +- } +- }, +- "strip-ansi": { +- "version": "3.0.1", +- "bundled": true, +- "dev": true, +- "optional": true, +- "requires": { +- "ansi-regex": "^2.0.0" +- } +- }, +- "strip-json-comments": { +- "version": "2.0.1", +- "bundled": true, +- "dev": true, +- "optional": true +- }, +- "util-deprecate": { +- "version": "1.0.2", +- "bundled": true, +- "dev": true, +- "optional": true +- }, +- "wide-align": { +- "version": "1.1.3", +- "bundled": true, +- "dev": true, +- "optional": true, +- "requires": { +- "string-width": "^1.0.2 || 2" +- } +- }, +- "wrappy": { +- "version": "1.0.2", +- "bundled": true, +- "dev": true, +- "optional": true +- }, +- "yallist": { +- "version": "3.0.3", +- "bundled": true, +- "optional": true +- } +- } +- }, + "function-bind": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", +@@ -1407,73 +286,6 @@ + "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", + "dev": true + }, +- "get-stream": { +- "version": "3.0.0", +- "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz", +- "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=", +- "dev": true +- }, +- "get-value": { +- "version": "2.0.6", +- "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz", +- "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=", +- "dev": true +- }, +- "glob-parent": { +- "version": "3.1.0", +- "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz", +- "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=", +- "dev": true, +- "requires": { +- "is-glob": "^3.1.0", +- "path-dirname": "^1.0.0" +- }, +- "dependencies": { +- "is-glob": { +- "version": "3.1.0", +- "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz", +- "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=", +- "dev": true, +- "requires": { +- "is-extglob": "^2.1.0" +- } +- } +- } +- }, +- "global-dirs": { +- "version": "0.1.1", +- "resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-0.1.1.tgz", +- "integrity": "sha1-sxnA3UYH81PzvpzKTHL8FIxJ9EU=", +- "dev": true, +- "requires": { +- "ini": "^1.3.4" +- } +- }, +- "got": { +- "version": "6.7.1", +- "resolved": "https://registry.npmjs.org/got/-/got-6.7.1.tgz", +- "integrity": "sha1-JAzQV4WpoY5WHcG0S0HHY+8ejbA=", +- "dev": true, +- "requires": { +- "create-error-class": "^3.0.0", +- "duplexer3": "^0.1.4", +- "get-stream": "^3.0.0", +- "is-redirect": "^1.0.0", +- "is-retry-allowed": "^1.0.0", +- "is-stream": "^1.0.0", +- "lowercase-keys": "^1.0.0", +- "safe-buffer": "^5.0.1", +- "timed-out": "^4.0.0", +- "unzip-response": "^2.0.1", +- "url-parse-lax": "^1.0.0" +- } +- }, +- "graceful-fs": { +- "version": "4.2.3", +- "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz", +- "integrity": "sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==", +- "dev": true +- }, + "growl": { + "version": "1.10.5", + "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz", +@@ -1498,273 +310,47 @@ + "has-symbols": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.0.tgz", +- "integrity": "sha1-uhqPGvKg/DllD1yFA2dwQSIGO0Q=", +- "dev": true +- }, +- "has-value": { +- "version": "1.0.0", +- "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz", +- "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=", +- "dev": true, +- "requires": { +- "get-value": "^2.0.6", +- "has-values": "^1.0.0", +- "isobject": "^3.0.0" +- } +- }, +- "has-values": { +- "version": "1.0.0", +- "resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz", +- "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=", +- "dev": true, +- "requires": { +- "is-number": "^3.0.0", +- "kind-of": "^4.0.0" +- }, +- "dependencies": { +- "kind-of": { +- "version": "4.0.0", +- "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz", +- "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=", +- "dev": true, +- "requires": { +- "is-buffer": "^1.1.5" +- } +- } +- } +- }, +- "he": { +- "version": "1.2.0", +- "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz", +- "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==", +- "dev": true +- }, +- "ignore-by-default": { +- "version": "1.0.1", +- "resolved": "https://registry.npmjs.org/ignore-by-default/-/ignore-by-default-1.0.1.tgz", +- "integrity": "sha1-SMptcvbGo68Aqa1K5odr44ieKwk=", +- "dev": true +- }, +- "import-lazy": { +- "version": "2.1.0", +- "resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-2.1.0.tgz", +- "integrity": "sha1-BWmOPUXIjo1+nZLLBYTnfwlvPkM=", +- "dev": true +- }, +- "imurmurhash": { +- "version": "0.1.4", +- "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", +- "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=", +- "dev": true +- }, +- "inflight": { +- "version": "1.0.6", +- "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", +- "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", +- "dev": true, +- "requires": { +- "once": "^1.3.0", +- "wrappy": "1" +- } +- }, +- "inherits": { +- "version": "2.0.4", +- "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", +- "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", +- "dev": true +- }, +- "ini": { +- "version": "1.3.8", +- "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz", +- "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==", +- "dev": true +- }, +- "is-accessor-descriptor": { +- "version": "0.1.6", +- "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", +- "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", +- "dev": true, +- "requires": { +- "kind-of": "^3.0.2" +- }, +- "dependencies": { +- "kind-of": { +- "version": "3.2.2", +- "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", +- "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", +- "dev": true, +- "requires": { +- "is-buffer": "^1.1.5" +- } +- } +- } +- }, +- "is-binary-path": { +- "version": "1.0.1", +- "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz", +- "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=", +- "dev": true, +- "requires": { +- "binary-extensions": "^1.0.0" +- } +- }, +- "is-buffer": { +- "version": "1.1.6", +- "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", +- "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==", +- "dev": true +- }, +- "is-callable": { +- "version": "1.1.4", +- "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.4.tgz", +- "integrity": "sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA==", +- "dev": true +- }, +- "is-ci": { +- "version": "1.2.1", +- "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-1.2.1.tgz", +- "integrity": "sha512-s6tfsaQaQi3JNciBH6shVqEDvhGut0SUXr31ag8Pd8BBbVVlcGfWhpPmEOoM6RJ5TFhbypvf5yyRw/VXW1IiWg==", +- "dev": true, +- "requires": { +- "ci-info": "^1.5.0" +- } +- }, +- "is-data-descriptor": { +- "version": "0.1.4", +- "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", +- "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", +- "dev": true, +- "requires": { +- "kind-of": "^3.0.2" +- }, +- "dependencies": { +- "kind-of": { +- "version": "3.2.2", +- "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", +- "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", +- "dev": true, +- "requires": { +- "is-buffer": "^1.1.5" +- } +- } +- } +- }, +- "is-date-object": { +- "version": "1.0.1", +- "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz", +- "integrity": "sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY=", +- "dev": true +- }, +- "is-descriptor": { +- "version": "0.1.6", +- "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz", +- "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", +- "dev": true, +- "requires": { +- "is-accessor-descriptor": "^0.1.6", +- "is-data-descriptor": "^0.1.4", +- "kind-of": "^5.0.0" +- }, +- "dependencies": { +- "kind-of": { +- "version": "5.1.0", +- "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz", +- "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==", +- "dev": true +- } +- } +- }, +- "is-extendable": { +- "version": "0.1.1", +- "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz", +- "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=", +- "dev": true +- }, +- "is-extglob": { +- "version": "2.1.1", +- "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", +- "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=", +- "dev": true +- }, +- "is-fullwidth-code-point": { +- "version": "2.0.0", +- "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", +- "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", +- "dev": true +- }, +- "is-glob": { +- "version": "4.0.1", +- "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz", +- "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==", +- "dev": true, +- "requires": { +- "is-extglob": "^2.1.1" +- } +- }, +- "is-installed-globally": { +- "version": "0.1.0", +- "resolved": "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-0.1.0.tgz", +- "integrity": "sha1-Df2Y9akRFxbdU13aZJL2e/PSWoA=", +- "dev": true, +- "requires": { +- "global-dirs": "^0.1.0", +- "is-path-inside": "^1.0.0" +- } ++ "integrity": "sha1-uhqPGvKg/DllD1yFA2dwQSIGO0Q=", ++ "dev": true + }, +- "is-npm": { +- "version": "1.0.0", +- "resolved": "https://registry.npmjs.org/is-npm/-/is-npm-1.0.0.tgz", +- "integrity": "sha1-8vtjpl5JBbQGyGBydloaTceTufQ=", ++ "he": { ++ "version": "1.2.0", ++ "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz", ++ "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==", + "dev": true + }, +- "is-number": { +- "version": "3.0.0", +- "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", +- "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", ++ "inflight": { ++ "version": "1.0.6", ++ "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", ++ "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", + "dev": true, + "requires": { +- "kind-of": "^3.0.2" +- }, +- "dependencies": { +- "kind-of": { +- "version": "3.2.2", +- "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", +- "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", +- "dev": true, +- "requires": { +- "is-buffer": "^1.1.5" +- } +- } ++ "once": "^1.3.0", ++ "wrappy": "1" + } + }, +- "is-obj": { +- "version": "1.0.1", +- "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz", +- "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=", ++ "inherits": { ++ "version": "2.0.4", ++ "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", ++ "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", + "dev": true + }, +- "is-path-inside": { +- "version": "1.0.1", +- "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.1.tgz", +- "integrity": "sha1-jvW33lBDej/cprToZe96pVy0gDY=", +- "dev": true, +- "requires": { +- "path-is-inside": "^1.0.1" +- } ++ "is-callable": { ++ "version": "1.1.4", ++ "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.4.tgz", ++ "integrity": "sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA==", ++ "dev": true + }, +- "is-plain-object": { +- "version": "2.0.4", +- "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz", +- "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==", +- "dev": true, +- "requires": { +- "isobject": "^3.0.1" +- } ++ "is-date-object": { ++ "version": "1.0.1", ++ "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz", ++ "integrity": "sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY=", ++ "dev": true + }, +- "is-redirect": { +- "version": "1.0.0", +- "resolved": "https://registry.npmjs.org/is-redirect/-/is-redirect-1.0.0.tgz", +- "integrity": "sha1-HQPd7VO9jbDzDCbk+V02/HyH3CQ=", ++ "is-fullwidth-code-point": { ++ "version": "2.0.0", ++ "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", ++ "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", + "dev": true + }, + "is-regex": { +@@ -1776,18 +362,6 @@ + "has": "^1.0.1" + } + }, +- "is-retry-allowed": { +- "version": "1.2.0", +- "resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.2.0.tgz", +- "integrity": "sha512-RUbUeKwvm3XG2VYamhJL1xFktgjvPzL0Hq8C+6yrWIswDy3BIXGqCxhxkc30N9jqK311gVU137K8Ei55/zVJRg==", +- "dev": true +- }, +- "is-stream": { +- "version": "1.1.0", +- "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz", +- "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=", +- "dev": true +- }, + "is-symbol": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.2.tgz", +@@ -1797,30 +371,12 @@ + "has-symbols": "^1.0.0" + } + }, +- "is-windows": { +- "version": "1.0.2", +- "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz", +- "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==", +- "dev": true +- }, +- "isarray": { +- "version": "1.0.0", +- "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", +- "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", +- "dev": true +- }, + "isexe": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", + "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=", + "dev": true + }, +- "isobject": { +- "version": "3.0.1", +- "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", +- "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", +- "dev": true +- }, + "js-yaml": { + "version": "3.13.1", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz", +@@ -1831,21 +387,6 @@ + "esprima": "^4.0.0" + } + }, +- "kind-of": { +- "version": "6.0.2", +- "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", +- "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", +- "dev": true +- }, +- "latest-version": { +- "version": "3.1.0", +- "resolved": "https://registry.npmjs.org/latest-version/-/latest-version-3.1.0.tgz", +- "integrity": "sha1-ogU4P+oyKzO1rjsYq+4NwvNW7hU=", +- "dev": true, +- "requires": { +- "package-json": "^4.0.0" +- } +- }, + "locate-path": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz", +@@ -1871,73 +412,12 @@ + "chalk": "^2.0.1" + } + }, +- "lowercase-keys": { +- "version": "1.0.1", +- "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz", +- "integrity": "sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==", +- "dev": true +- }, +- "lru-cache": { +- "version": "4.1.5", +- "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz", +- "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==", +- "dev": true, +- "requires": { +- "pseudomap": "^1.0.2", +- "yallist": "^2.1.2" +- } +- }, +- "make-dir": { +- "version": "1.3.0", +- "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz", +- "integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==", +- "dev": true, +- "requires": { +- "pify": "^3.0.0" +- } +- }, + "make-error": { + "version": "1.3.5", + "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.5.tgz", + "integrity": "sha512-c3sIjNUow0+8swNwVpqoH4YCShKNFkMaw6oH1mNS2haDZQqkeZFlHS3dhoeEbKKmJB4vXpJucU6oH75aDYeE9g==", + "dev": true + }, +- "map-cache": { +- "version": "0.2.2", +- "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz", +- "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=", +- "dev": true +- }, +- "map-visit": { +- "version": "1.0.0", +- "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz", +- "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=", +- "dev": true, +- "requires": { +- "object-visit": "^1.0.0" +- } +- }, +- "micromatch": { +- "version": "3.1.10", +- "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz", +- "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==", +- "dev": true, +- "requires": { +- "arr-diff": "^4.0.0", +- "array-unique": "^0.3.2", +- "braces": "^2.3.1", +- "define-property": "^2.0.2", +- "extend-shallow": "^3.0.2", +- "extglob": "^2.0.4", +- "fragment-cache": "^0.2.1", +- "kind-of": "^6.0.2", +- "nanomatch": "^1.2.9", +- "object.pick": "^1.3.0", +- "regex-not": "^1.0.0", +- "snapdragon": "^0.8.1", +- "to-regex": "^3.0.2" +- } +- }, + "minimatch": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", +@@ -1947,63 +427,6 @@ + "brace-expansion": "^1.1.7" + } + }, +- "minimist": { +- "version": "1.2.0", +- "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", +- "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", +- "dev": true +- }, +- "minipass": { +- "version": "2.9.0", +- "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.9.0.tgz", +- "integrity": "sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==", +- "dev": true, +- "optional": true, +- "requires": { +- "safe-buffer": "^5.1.2", +- "yallist": "^3.0.0" +- }, +- "dependencies": { +- "yallist": { +- "version": "3.1.1", +- "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", +- "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==", +- "dev": true, +- "optional": true +- } +- } +- }, +- "minizlib": { +- "version": "1.3.3", +- "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.3.3.tgz", +- "integrity": "sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q==", +- "dev": true, +- "optional": true, +- "requires": { +- "minipass": "^2.9.0" +- } +- }, +- "mixin-deep": { +- "version": "1.3.2", +- "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz", +- "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==", +- "dev": true, +- "requires": { +- "for-in": "^1.0.2", +- "is-extendable": "^1.0.1" +- }, +- "dependencies": { +- "is-extendable": { +- "version": "1.0.1", +- "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz", +- "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", +- "dev": true, +- "requires": { +- "is-plain-object": "^2.0.4" +- } +- } +- } +- }, + "mkdirp": { + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", +@@ -2089,38 +512,6 @@ + } + } + }, +- "ms": { +- "version": "2.0.0", +- "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", +- "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", +- "dev": true +- }, +- "nan": { +- "version": "2.14.0", +- "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz", +- "integrity": "sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==", +- "dev": true, +- "optional": true +- }, +- "nanomatch": { +- "version": "1.2.13", +- "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz", +- "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==", +- "dev": true, +- "requires": { +- "arr-diff": "^4.0.0", +- "array-unique": "^0.3.2", +- "define-property": "^2.0.2", +- "extend-shallow": "^3.0.2", +- "fragment-cache": "^0.2.1", +- "is-windows": "^1.0.2", +- "kind-of": "^6.0.2", +- "object.pick": "^1.3.0", +- "regex-not": "^1.0.0", +- "snapdragon": "^0.8.1", +- "to-regex": "^3.0.1" +- } +- }, + "node-addon-api": { + "version": "1.6.3", + "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-1.6.3.tgz", +@@ -2136,79 +527,6 @@ + "semver": "^5.7.0" + } + }, +- "nodemon": { +- "version": "1.19.4", +- "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-1.19.4.tgz", +- "integrity": "sha512-VGPaqQBNk193lrJFotBU8nvWZPqEZY2eIzymy2jjY0fJ9qIsxA0sxQ8ATPl0gZC645gijYEc1jtZvpS8QWzJGQ==", +- "dev": true, +- "requires": { +- "chokidar": "^2.1.8", +- "debug": "^3.2.6", +- "ignore-by-default": "^1.0.1", +- "minimatch": "^3.0.4", +- "pstree.remy": "^1.1.7", +- "semver": "^5.7.1", +- "supports-color": "^5.5.0", +- "touch": "^3.1.0", +- "undefsafe": "^2.0.2", +- "update-notifier": "^2.5.0" +- } +- }, +- "nopt": { +- "version": "1.0.10", +- "resolved": "https://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz", +- "integrity": "sha1-bd0hvSoxQXuScn3Vhfim83YI6+4=", +- "dev": true, +- "requires": { +- "abbrev": "1" +- } +- }, +- "normalize-path": { +- "version": "3.0.0", +- "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", +- "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", +- "dev": true +- }, +- "npm-run-path": { +- "version": "2.0.2", +- "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz", +- "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=", +- "dev": true, +- "requires": { +- "path-key": "^2.0.0" +- } +- }, +- "object-copy": { +- "version": "0.1.0", +- "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz", +- "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=", +- "dev": true, +- "requires": { +- "copy-descriptor": "^0.1.0", +- "define-property": "^0.2.5", +- "kind-of": "^3.0.3" +- }, +- "dependencies": { +- "define-property": { +- "version": "0.2.5", +- "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", +- "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", +- "dev": true, +- "requires": { +- "is-descriptor": "^0.1.0" +- } +- }, +- "kind-of": { +- "version": "3.2.2", +- "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", +- "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", +- "dev": true, +- "requires": { +- "is-buffer": "^1.1.5" +- } +- } +- } +- }, + "object-inspect": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.6.0.tgz", +@@ -2221,15 +539,6 @@ + "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==", + "dev": true + }, +- "object-visit": { +- "version": "1.0.1", +- "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz", +- "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=", +- "dev": true, +- "requires": { +- "isobject": "^3.0.0" +- } +- }, + "object.assign": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz", +@@ -2252,221 +561,49 @@ + "es-abstract": "^1.5.1" + } + }, +- "object.pick": { +- "version": "1.3.0", +- "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz", +- "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=", +- "dev": true, +- "requires": { +- "isobject": "^3.0.1" +- } +- }, +- "once": { +- "version": "1.4.0", +- "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", +- "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", +- "dev": true, +- "requires": { +- "wrappy": "1" +- } +- }, +- "p-finally": { +- "version": "1.0.0", +- "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz", +- "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=", +- "dev": true +- }, +- "p-limit": { +- "version": "2.2.1", +- "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.1.tgz", +- "integrity": "sha512-85Tk+90UCVWvbDavCLKPOLC9vvY8OwEX/RtKF+/1OADJMVlFfEHOiMTPVyxg7mk/dKa+ipdHm0OUkTvCpMTuwg==", +- "dev": true, +- "requires": { +- "p-try": "^2.0.0" +- } +- }, +- "p-locate": { +- "version": "3.0.0", +- "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz", +- "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==", +- "dev": true, +- "requires": { +- "p-limit": "^2.0.0" +- } +- }, +- "p-try": { +- "version": "2.2.0", +- "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", +- "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", +- "dev": true +- }, +- "package-json": { +- "version": "4.0.1", +- "resolved": "https://registry.npmjs.org/package-json/-/package-json-4.0.1.tgz", +- "integrity": "sha1-iGmgQBJTZhxMTKPabCEh7VVfXu0=", +- "dev": true, +- "requires": { +- "got": "^6.7.1", +- "registry-auth-token": "^3.0.1", +- "registry-url": "^3.0.3", +- "semver": "^5.1.0" +- } +- }, +- "pascalcase": { +- "version": "0.1.1", +- "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz", +- "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=", +- "dev": true +- }, +- "path-dirname": { +- "version": "1.0.2", +- "resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz", +- "integrity": "sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=", +- "dev": true +- }, +- "path-exists": { +- "version": "3.0.0", +- "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", +- "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=", +- "dev": true +- }, +- "path-is-absolute": { +- "version": "1.0.1", +- "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", +- "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", +- "dev": true +- }, +- "path-is-inside": { +- "version": "1.0.2", +- "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz", +- "integrity": "sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=", +- "dev": true +- }, +- "path-key": { +- "version": "2.0.1", +- "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz", +- "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=", +- "dev": true +- }, +- "pify": { +- "version": "3.0.0", +- "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", +- "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=", +- "dev": true +- }, +- "posix-character-classes": { +- "version": "0.1.1", +- "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz", +- "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=", +- "dev": true +- }, +- "prepend-http": { +- "version": "1.0.4", +- "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz", +- "integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=", +- "dev": true +- }, +- "process-nextick-args": { +- "version": "2.0.1", +- "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", +- "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==", +- "dev": true +- }, +- "pseudomap": { +- "version": "1.0.2", +- "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz", +- "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=", +- "dev": true +- }, +- "pstree.remy": { +- "version": "1.1.7", +- "resolved": "https://registry.npmjs.org/pstree.remy/-/pstree.remy-1.1.7.tgz", +- "integrity": "sha512-xsMgrUwRpuGskEzBFkH8NmTimbZ5PcPup0LA8JJkHIm2IMUbQcpo3yeLNWVrufEYjh8YwtSVh0xz6UeWc5Oh5A==", +- "dev": true +- }, +- "rc": { +- "version": "1.2.8", +- "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz", +- "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==", +- "dev": true, +- "requires": { +- "deep-extend": "^0.6.0", +- "ini": "~1.3.0", +- "minimist": "^1.2.0", +- "strip-json-comments": "~2.0.1" +- } +- }, +- "readable-stream": { +- "version": "2.3.6", +- "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", +- "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", +- "dev": true, +- "requires": { +- "core-util-is": "~1.0.0", +- "inherits": "~2.0.3", +- "isarray": "~1.0.0", +- "process-nextick-args": "~2.0.0", +- "safe-buffer": "~5.1.1", +- "string_decoder": "~1.1.1", +- "util-deprecate": "~1.0.1" +- } +- }, +- "readdirp": { +- "version": "2.2.1", +- "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz", +- "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==", +- "dev": true, +- "requires": { +- "graceful-fs": "^4.1.11", +- "micromatch": "^3.1.10", +- "readable-stream": "^2.0.2" +- } +- }, +- "regex-not": { +- "version": "1.0.2", +- "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz", +- "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==", ++ "once": { ++ "version": "1.4.0", ++ "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", ++ "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", + "dev": true, + "requires": { +- "extend-shallow": "^3.0.2", +- "safe-regex": "^1.1.0" ++ "wrappy": "1" + } + }, +- "registry-auth-token": { +- "version": "3.4.0", +- "resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.4.0.tgz", +- "integrity": "sha512-4LM6Fw8eBQdwMYcES4yTnn2TqIasbXuwDx3um+QRs7S55aMKCBKBxvPXl2RiUjHwuJLTyYfxSpmfSAjQpcuP+A==", ++ "p-limit": { ++ "version": "2.2.1", ++ "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.1.tgz", ++ "integrity": "sha512-85Tk+90UCVWvbDavCLKPOLC9vvY8OwEX/RtKF+/1OADJMVlFfEHOiMTPVyxg7mk/dKa+ipdHm0OUkTvCpMTuwg==", + "dev": true, + "requires": { +- "rc": "^1.1.6", +- "safe-buffer": "^5.0.1" ++ "p-try": "^2.0.0" + } + }, +- "registry-url": { +- "version": "3.1.0", +- "resolved": "https://registry.npmjs.org/registry-url/-/registry-url-3.1.0.tgz", +- "integrity": "sha1-PU74cPc93h138M+aOBQyRE4XSUI=", ++ "p-locate": { ++ "version": "3.0.0", ++ "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz", ++ "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==", + "dev": true, + "requires": { +- "rc": "^1.0.1" ++ "p-limit": "^2.0.0" + } + }, +- "remove-trailing-separator": { +- "version": "1.1.0", +- "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz", +- "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8=", ++ "p-try": { ++ "version": "2.2.0", ++ "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", ++ "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", + "dev": true + }, +- "repeat-element": { +- "version": "1.1.3", +- "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.3.tgz", +- "integrity": "sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g==", ++ "path-exists": { ++ "version": "3.0.0", ++ "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", ++ "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=", + "dev": true + }, +- "repeat-string": { +- "version": "1.6.1", +- "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz", +- "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=", ++ "path-is-absolute": { ++ "version": "1.0.1", ++ "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", ++ "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", + "dev": true + }, + "require-directory": { +@@ -2481,233 +618,18 @@ + "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==", + "dev": true + }, +- "resolve-url": { +- "version": "0.2.1", +- "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz", +- "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=", +- "dev": true +- }, +- "ret": { +- "version": "0.1.15", +- "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz", +- "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==", +- "dev": true +- }, +- "safe-buffer": { +- "version": "5.1.2", +- "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", +- "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", +- "dev": true +- }, +- "safe-regex": { +- "version": "1.1.0", +- "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz", +- "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=", +- "dev": true, +- "requires": { +- "ret": "~0.1.10" +- } +- }, + "semver": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "dev": true + }, +- "semver-diff": { +- "version": "2.1.0", +- "resolved": "https://registry.npmjs.org/semver-diff/-/semver-diff-2.1.0.tgz", +- "integrity": "sha1-S7uEN8jTfksM8aaP1ybsbWRdbTY=", +- "dev": true, +- "requires": { +- "semver": "^5.0.3" +- } +- }, + "set-blocking": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", + "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=", + "dev": true + }, +- "set-value": { +- "version": "2.0.1", +- "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz", +- "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==", +- "dev": true, +- "requires": { +- "extend-shallow": "^2.0.1", +- "is-extendable": "^0.1.1", +- "is-plain-object": "^2.0.3", +- "split-string": "^3.0.1" +- }, +- "dependencies": { +- "extend-shallow": { +- "version": "2.0.1", +- "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", +- "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", +- "dev": true, +- "requires": { +- "is-extendable": "^0.1.0" +- } +- } +- } +- }, +- "shebang-command": { +- "version": "1.2.0", +- "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz", +- "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=", +- "dev": true, +- "requires": { +- "shebang-regex": "^1.0.0" +- } +- }, +- "shebang-regex": { +- "version": "1.0.0", +- "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz", +- "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=", +- "dev": true +- }, +- "signal-exit": { +- "version": "3.0.2", +- "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz", +- "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=", +- "dev": true +- }, +- "snapdragon": { +- "version": "0.8.2", +- "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz", +- "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==", +- "dev": true, +- "requires": { +- "base": "^0.11.1", +- "debug": "^2.2.0", +- "define-property": "^0.2.5", +- "extend-shallow": "^2.0.1", +- "map-cache": "^0.2.2", +- "source-map": "^0.5.6", +- "source-map-resolve": "^0.5.0", +- "use": "^3.1.0" +- }, +- "dependencies": { +- "debug": { +- "version": "2.6.9", +- "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", +- "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", +- "dev": true, +- "requires": { +- "ms": "2.0.0" +- } +- }, +- "define-property": { +- "version": "0.2.5", +- "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", +- "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", +- "dev": true, +- "requires": { +- "is-descriptor": "^0.1.0" +- } +- }, +- "extend-shallow": { +- "version": "2.0.1", +- "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", +- "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", +- "dev": true, +- "requires": { +- "is-extendable": "^0.1.0" +- } +- } +- } +- }, +- "snapdragon-node": { +- "version": "2.1.1", +- "resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz", +- "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==", +- "dev": true, +- "requires": { +- "define-property": "^1.0.0", +- "isobject": "^3.0.0", +- "snapdragon-util": "^3.0.1" +- }, +- "dependencies": { +- "define-property": { +- "version": "1.0.0", +- "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", +- "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", +- "dev": true, +- "requires": { +- "is-descriptor": "^1.0.0" +- } +- }, +- "is-accessor-descriptor": { +- "version": "1.0.0", +- "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", +- "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", +- "dev": true, +- "requires": { +- "kind-of": "^6.0.0" +- } +- }, +- "is-data-descriptor": { +- "version": "1.0.0", +- "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", +- "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", +- "dev": true, +- "requires": { +- "kind-of": "^6.0.0" +- } +- }, +- "is-descriptor": { +- "version": "1.0.2", +- "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", +- "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", +- "dev": true, +- "requires": { +- "is-accessor-descriptor": "^1.0.0", +- "is-data-descriptor": "^1.0.0", +- "kind-of": "^6.0.2" +- } +- } +- } +- }, +- "snapdragon-util": { +- "version": "3.0.1", +- "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz", +- "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==", +- "dev": true, +- "requires": { +- "kind-of": "^3.2.0" +- }, +- "dependencies": { +- "kind-of": { +- "version": "3.2.2", +- "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", +- "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", +- "dev": true, +- "requires": { +- "is-buffer": "^1.1.5" +- } +- } +- } +- }, +- "source-map": { +- "version": "0.5.7", +- "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", +- "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", +- "dev": true +- }, +- "source-map-resolve": { +- "version": "0.5.2", +- "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz", +- "integrity": "sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==", +- "dev": true, +- "requires": { +- "atob": "^2.1.1", +- "decode-uri-component": "^0.2.0", +- "resolve-url": "^0.2.1", +- "source-map-url": "^0.4.0", +- "urix": "^0.1.0" +- } +- }, + "source-map-support": { + "version": "0.5.16", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.16.tgz", +@@ -2726,48 +648,12 @@ + } + } + }, +- "source-map-url": { +- "version": "0.4.0", +- "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz", +- "integrity": "sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=", +- "dev": true +- }, +- "split-string": { +- "version": "3.1.0", +- "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz", +- "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==", +- "dev": true, +- "requires": { +- "extend-shallow": "^3.0.0" +- } +- }, + "sprintf-js": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", + "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=", + "dev": true + }, +- "static-extend": { +- "version": "0.1.2", +- "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz", +- "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=", +- "dev": true, +- "requires": { +- "define-property": "^0.2.5", +- "object-copy": "^0.1.0" +- }, +- "dependencies": { +- "define-property": { +- "version": "0.2.5", +- "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", +- "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", +- "dev": true, +- "requires": { +- "is-descriptor": "^0.1.0" +- } +- } +- } +- }, + "string-width": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", +@@ -2798,15 +684,6 @@ + "function-bind": "^1.1.1" + } + }, +- "string_decoder": { +- "version": "1.1.1", +- "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", +- "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", +- "dev": true, +- "requires": { +- "safe-buffer": "~5.1.0" +- } +- }, + "strip-ansi": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", +@@ -2816,12 +693,6 @@ + "ansi-regex": "^3.0.0" + } + }, +- "strip-eof": { +- "version": "1.0.0", +- "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz", +- "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=", +- "dev": true +- }, + "strip-json-comments": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", +@@ -2837,121 +708,6 @@ + "has-flag": "^3.0.0" + } + }, +- "tar": { +- "version": "4.4.19", +- "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.19.tgz", +- "integrity": "sha512-a20gEsvHnWe0ygBY8JbxoM4w3SJdhc7ZAuxkLqh+nvNQN2IOt0B5lLgM490X5Hl8FF0dl0tOf2ewFYAlIFgzVA==", +- "dev": true, +- "optional": true, +- "requires": { +- "chownr": "^1.1.4", +- "fs-minipass": "^1.2.7", +- "minipass": "^2.9.0", +- "minizlib": "^1.3.3", +- "mkdirp": "^0.5.5", +- "safe-buffer": "^5.2.1", +- "yallist": "^3.1.1" +- }, +- "dependencies": { +- "minimist": { +- "version": "1.2.5", +- "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", +- "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", +- "dev": true, +- "optional": true +- }, +- "mkdirp": { +- "version": "0.5.5", +- "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz", +- "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==", +- "dev": true, +- "optional": true, +- "requires": { +- "minimist": "^1.2.5" +- } +- }, +- "safe-buffer": { +- "version": "5.2.1", +- "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", +- "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", +- "dev": true, +- "optional": true +- }, +- "yallist": { +- "version": "3.1.1", +- "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", +- "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==", +- "dev": true, +- "optional": true +- } +- } +- }, +- "term-size": { +- "version": "1.2.0", +- "resolved": "https://registry.npmjs.org/term-size/-/term-size-1.2.0.tgz", +- "integrity": "sha1-RYuDiH8oj8Vtb/+/rSYuJmOO+mk=", +- "dev": true, +- "requires": { +- "execa": "^0.7.0" +- } +- }, +- "timed-out": { +- "version": "4.0.1", +- "resolved": "https://registry.npmjs.org/timed-out/-/timed-out-4.0.1.tgz", +- "integrity": "sha1-8y6srFoXW+ol1/q1Zas+2HQe9W8=", +- "dev": true +- }, +- "to-object-path": { +- "version": "0.3.0", +- "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz", +- "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=", +- "dev": true, +- "requires": { +- "kind-of": "^3.0.2" +- }, +- "dependencies": { +- "kind-of": { +- "version": "3.2.2", +- "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", +- "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", +- "dev": true, +- "requires": { +- "is-buffer": "^1.1.5" +- } +- } +- } +- }, +- "to-regex": { +- "version": "3.0.2", +- "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz", +- "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==", +- "dev": true, +- "requires": { +- "define-property": "^2.0.2", +- "extend-shallow": "^3.0.2", +- "regex-not": "^1.0.2", +- "safe-regex": "^1.1.0" +- } +- }, +- "to-regex-range": { +- "version": "2.1.1", +- "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz", +- "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=", +- "dev": true, +- "requires": { +- "is-number": "^3.0.0", +- "repeat-string": "^1.6.1" +- } +- }, +- "touch": { +- "version": "3.1.0", +- "resolved": "https://registry.npmjs.org/touch/-/touch-3.1.0.tgz", +- "integrity": "sha512-WBx8Uy5TLtOSRtIq+M03/sKDrXCLHxwDcquSP2c43Le03/9serjQBIztjRz6FkJez9D/hleyAXTBGLwwZUw9lA==", +- "dev": true, +- "requires": { +- "nopt": "~1.0.10" +- } +- }, + "ts-node": { + "version": "8.4.1", + "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-8.4.1.tgz", +@@ -2971,130 +727,6 @@ + "integrity": "sha512-ml7V7JfiN2Xwvcer+XAf2csGO1bPBdRbFCkYBczNZggrBZ9c7G3riSUeJmqEU5uOtXNPMhE3n+R4FA/3YOAWOQ==", + "dev": true + }, +- "undefsafe": { +- "version": "2.0.5", +- "resolved": "https://registry.npmjs.org/undefsafe/-/undefsafe-2.0.5.tgz", +- "integrity": "sha512-WxONCrssBM8TSPRqN5EmsjVrsv4A8X12J4ArBiiayv3DyyG3ZlIg6yysuuSYdZsVz3TKcTg2fd//Ujd4CHV1iA==", +- "dev": true +- }, +- "union-value": { +- "version": "1.0.1", +- "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz", +- "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==", +- "dev": true, +- "requires": { +- "arr-union": "^3.1.0", +- "get-value": "^2.0.6", +- "is-extendable": "^0.1.1", +- "set-value": "^2.0.1" +- } +- }, +- "unique-string": { +- "version": "1.0.0", +- "resolved": "https://registry.npmjs.org/unique-string/-/unique-string-1.0.0.tgz", +- "integrity": "sha1-nhBXzKhRq7kzmPizOuGHuZyuwRo=", +- "dev": true, +- "requires": { +- "crypto-random-string": "^1.0.0" +- } +- }, +- "unset-value": { +- "version": "1.0.0", +- "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz", +- "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=", +- "dev": true, +- "requires": { +- "has-value": "^0.3.1", +- "isobject": "^3.0.0" +- }, +- "dependencies": { +- "has-value": { +- "version": "0.3.1", +- "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz", +- "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=", +- "dev": true, +- "requires": { +- "get-value": "^2.0.3", +- "has-values": "^0.1.4", +- "isobject": "^2.0.0" +- }, +- "dependencies": { +- "isobject": { +- "version": "2.1.0", +- "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz", +- "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=", +- "dev": true, +- "requires": { +- "isarray": "1.0.0" +- } +- } +- } +- }, +- "has-values": { +- "version": "0.1.4", +- "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz", +- "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E=", +- "dev": true +- } +- } +- }, +- "unzip-response": { +- "version": "2.0.1", +- "resolved": "https://registry.npmjs.org/unzip-response/-/unzip-response-2.0.1.tgz", +- "integrity": "sha1-0vD3N9FrBhXnKmk17QQhRXLVb5c=", +- "dev": true +- }, +- "upath": { +- "version": "1.2.0", +- "resolved": "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz", +- "integrity": "sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==", +- "dev": true +- }, +- "update-notifier": { +- "version": "2.5.0", +- "resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-2.5.0.tgz", +- "integrity": "sha512-gwMdhgJHGuj/+wHJJs9e6PcCszpxR1b236igrOkUofGhqJuG+amlIKwApH1IW1WWl7ovZxsX49lMBWLxSdm5Dw==", +- "dev": true, +- "requires": { +- "boxen": "^1.2.1", +- "chalk": "^2.0.1", +- "configstore": "^3.0.0", +- "import-lazy": "^2.1.0", +- "is-ci": "^1.0.10", +- "is-installed-globally": "^0.1.0", +- "is-npm": "^1.0.0", +- "latest-version": "^3.0.0", +- "semver-diff": "^2.0.0", +- "xdg-basedir": "^3.0.0" +- } +- }, +- "urix": { +- "version": "0.1.0", +- "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz", +- "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=", +- "dev": true +- }, +- "url-parse-lax": { +- "version": "1.0.0", +- "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-1.0.0.tgz", +- "integrity": "sha1-evjzA2Rem9eaJy56FKxovAYJ2nM=", +- "dev": true, +- "requires": { +- "prepend-http": "^1.0.1" +- } +- }, +- "use": { +- "version": "3.1.1", +- "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz", +- "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==", +- "dev": true +- }, +- "util-deprecate": { +- "version": "1.0.2", +- "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", +- "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=", +- "dev": true +- }, + "which": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", +@@ -3119,15 +751,6 @@ + "string-width": "^1.0.2 || 2" + } + }, +- "widest-line": { +- "version": "2.0.1", +- "resolved": "https://registry.npmjs.org/widest-line/-/widest-line-2.0.1.tgz", +- "integrity": "sha512-Ba5m9/Fa4Xt9eb2ELXt77JxVDV8w7qQrH0zS/TWSJdLyAwQjWoOzpzj5lwVftDz6n/EOu3tNACS84v509qwnJA==", +- "dev": true, +- "requires": { +- "string-width": "^2.1.1" +- } +- }, + "wrap-ansi": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz", +@@ -3173,35 +796,12 @@ + "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", + "dev": true + }, +- "write-file-atomic": { +- "version": "2.4.3", +- "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.4.3.tgz", +- "integrity": "sha512-GaETH5wwsX+GcnzhPgKcKjJ6M2Cq3/iZp1WyY/X1CSqrW+jVNM9Y7D8EC2sM4ZG/V8wZlSniJnCKWPmBYAucRQ==", +- "dev": true, +- "requires": { +- "graceful-fs": "^4.1.11", +- "imurmurhash": "^0.1.4", +- "signal-exit": "^3.0.2" +- } +- }, +- "xdg-basedir": { +- "version": "3.0.0", +- "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-3.0.0.tgz", +- "integrity": "sha1-SWsswQnsqNus/i3HK2A8F8WHCtQ=", +- "dev": true +- }, + "y18n": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.1.tgz", + "integrity": "sha512-wNcy4NvjMYL8gogWWYAO7ZFWFfHcbdbE57tZO8e4cbpj8tfUcwrwqSl3ad8HxpYWCdXcJUCeKKZS62Av1affwQ==", + "dev": true + }, +- "yallist": { +- "version": "2.1.2", +- "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz", +- "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=", +- "dev": true +- }, + "yargs": { + "version": "13.3.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.0.tgz", +diff --git a/package.json b/package.json +index 007d99d..81b5f87 100644 +--- a/package.json ++++ b/package.json +@@ -33,7 +33,6 @@ + "@types/node": "^12.12.6", + "bindings": "~1.2.1", + "mocha": "^6.2.2", +- "nodemon": "^1.19.4", + "ts-node": "^8.4.1", + "typescript": "^3.7.2" + }, diff --git a/pkgs/by-name/no/nodehun/update-nan.patch b/pkgs/by-name/no/nodehun/update-nan.patch deleted file mode 100644 index e01f1e15c0e6..000000000000 --- a/pkgs/by-name/no/nodehun/update-nan.patch +++ /dev/null @@ -1,150 +0,0 @@ -diff --git a/package-lock.json b/package-lock.json -index 3c577dd..64be338 100644 ---- a/package-lock.json -+++ b/package-lock.json -@@ -932,10 +932,6 @@ - "concat-map": "0.0.1" - } - }, -- "chownr": { -- "version": "1.1.1", -- "bundled": true -- }, - "code-point-at": { - "version": "1.1.0", - "bundled": true, -@@ -987,13 +983,6 @@ - "dev": true, - "optional": true - }, -- "fs-minipass": { -- "version": "1.2.5", -- "bundled": true, -- "requires": { -- "minipass": "^2.2.1" -- } -- }, - "fs.realpath": { - "version": "1.0.0", - "bundled": true, -@@ -1100,22 +1089,6 @@ - "dev": true, - "optional": true - }, -- "minipass": { -- "version": "2.3.5", -- "bundled": true, -- "optional": true, -- "requires": { -- "safe-buffer": "^5.1.2", -- "yallist": "^3.0.0" -- } -- }, -- "minizlib": { -- "version": "1.2.1", -- "bundled": true, -- "requires": { -- "minipass": "^2.2.1" -- } -- }, - "mkdirp": { - "version": "0.5.1", - "bundled": true, -@@ -1300,6 +1273,7 @@ - "safe-buffer": { - "version": "5.1.2", - "bundled": true, -+ "dev": true, - "optional": true - }, - "safer-buffer": { -@@ -1332,24 +1306,24 @@ - "dev": true, - "optional": true - }, -- "string-width": { -- "version": "1.0.2", -+ "string_decoder": { -+ "version": "1.1.1", - "bundled": true, - "dev": true, - "optional": true, - "requires": { -- "code-point-at": "^1.0.0", -- "is-fullwidth-code-point": "^1.0.0", -- "strip-ansi": "^3.0.0" -+ "safe-buffer": "~5.1.0" - } - }, -- "string_decoder": { -- "version": "1.1.1", -+ "string-width": { -+ "version": "1.0.2", - "bundled": true, - "dev": true, - "optional": true, - "requires": { -- "safe-buffer": "~5.1.0" -+ "code-point-at": "^1.0.0", -+ "is-fullwidth-code-point": "^1.0.0", -+ "strip-ansi": "^3.0.0" - } - }, - "strip-ansi": { -@@ -1387,11 +1361,6 @@ - "bundled": true, - "dev": true, - "optional": true -- }, -- "yallist": { -- "version": "3.0.3", -- "bundled": true, -- "optional": true - } - } - }, -@@ -2096,9 +2065,9 @@ - "dev": true - }, - "nan": { -- "version": "2.14.0", -- "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz", -- "integrity": "sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==", -+ "version": "2.17.0", -+ "resolved": "https://registry.npmjs.org/nan/-/nan-2.17.0.tgz", -+ "integrity": "sha512-2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ==", - "dev": true, - "optional": true - }, -@@ -2768,6 +2737,15 @@ - } - } - }, -+ "string_decoder": { -+ "version": "1.1.1", -+ "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", -+ "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", -+ "dev": true, -+ "requires": { -+ "safe-buffer": "~5.1.0" -+ } -+ }, - "string-width": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", -@@ -2798,15 +2776,6 @@ - "function-bind": "^1.1.1" - } - }, -- "string_decoder": { -- "version": "1.1.1", -- "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", -- "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", -- "dev": true, -- "requires": { -- "safe-buffer": "~5.1.0" -- } -- }, - "strip-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", From fd2b94e52cc96be7ed47163bece3170b66799141 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 27 Aug 2025 05:56:40 +0000 Subject: [PATCH 04/97] gixy: 0.1.20 -> 0.1.21 --- pkgs/by-name/gi/gixy/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gi/gixy/package.nix b/pkgs/by-name/gi/gixy/package.nix index 8ae3ab0d7c29..aa5daa25a642 100644 --- a/pkgs/by-name/gi/gixy/package.nix +++ b/pkgs/by-name/gi/gixy/package.nix @@ -25,7 +25,7 @@ let in python.pkgs.buildPythonApplication rec { pname = "gixy"; - version = "0.1.20"; + version = "0.1.21"; pyproject = true; # fetching from GitHub because the PyPi source is missing the tests @@ -33,7 +33,7 @@ python.pkgs.buildPythonApplication rec { owner = "yandex"; repo = "gixy"; rev = "v${version}"; - sha256 = "14arz3fjidb8z37m08xcpih1391varj8s0v3gri79z3qb4zq5k6b"; + sha256 = "sha256-Ak2UTP0gDKoac/rR2h1XCUKld1b41O466ogZNQ1yQN0="; }; patches = [ From 9da35b8f6b08742c21ad3a5f099a07139cd657ad Mon Sep 17 00:00:00 2001 From: Flakebi Date: Sat, 16 Aug 2025 11:50:04 +0200 Subject: [PATCH 05/97] ulauncher: Fix with webkitgtk_4_1 Apply patch for compatibility with webkitgtk 4.1. Fixes dependency on insecure webkitgtk 4.0. --- pkgs/by-name/ul/ulauncher/package.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ul/ulauncher/package.nix b/pkgs/by-name/ul/ulauncher/package.nix index c9fdbcf6defa..bb4175b3cb2f 100644 --- a/pkgs/by-name/ul/ulauncher/package.nix +++ b/pkgs/by-name/ul/ulauncher/package.nix @@ -1,6 +1,7 @@ { lib, fetchurl, + fetchpatch, nix-update-script, python3Packages, gdk-pixbuf, @@ -9,7 +10,7 @@ gobject-introspection, gtk3, wrapGAppsHook3, - webkitgtk_4_0, + webkitgtk_4_1, libnotify, keybinder3, libappindicator, @@ -45,7 +46,7 @@ python3Packages.buildPythonApplication rec { libappindicator libnotify librsvg - webkitgtk_4_0 + webkitgtk_4_1 wmctrl ]; @@ -77,6 +78,11 @@ python3Packages.buildPythonApplication rec { patches = [ ./fix-path.patch ./fix-extensions.patch + (fetchpatch { + name = "support-gir1.2-webkit2-4.1.patch"; + url = "https://src.fedoraproject.org/rpms/ulauncher/raw/rawhide/f/support-gir1.2-webkit2-4.1.patch"; + hash = "sha256-w1c+Yf6SA3fyMrMn1LXzCXf5yuynRYpofkkUqZUKLS8="; + }) ]; postPatch = '' From 71d4f71cbdbe87d1c2bd07ab7b0e69ab1470600f Mon Sep 17 00:00:00 2001 From: Notarin Steele <424c414e4b@gmail.com> Date: Sun, 31 Aug 2025 05:11:00 -0400 Subject: [PATCH 06/97] termius: fix #438763 --- pkgs/by-name/te/termius/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/te/termius/package.nix b/pkgs/by-name/te/termius/package.nix index 66c858c97602..8ed3f8939cab 100644 --- a/pkgs/by-name/te/termius/package.nix +++ b/pkgs/by-name/te/termius/package.nix @@ -12,6 +12,7 @@ udev, wrapGAppsHook3, writeScript, + sqlite, }: stdenv.mkDerivation rec { @@ -57,6 +58,7 @@ stdenv.mkDerivation rec { alsa-lib libsecret libgbm + sqlite ]; unpackPhase = '' From bbe4974cda93e630e0c504479cb754f7526a3611 Mon Sep 17 00:00:00 2001 From: neil-lobo Date: Thu, 4 Sep 2025 00:03:59 -0400 Subject: [PATCH 07/97] chatterino{2,7}: patch elf rpath with libpulseaudio add pulseaudio to RUNPATH so miniaudio is able to load it --- pkgs/by-name/ch/chatterino2/common.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ch/chatterino2/common.nix b/pkgs/by-name/ch/chatterino2/common.nix index 3f45d34812a9..e9f0c519bbc2 100644 --- a/pkgs/by-name/ch/chatterino2/common.nix +++ b/pkgs/by-name/ch/chatterino2/common.nix @@ -10,6 +10,8 @@ libnotify, libavif, kdePackages, + autoPatchelfHook, + libpulseaudio, }: stdenv.mkDerivation { @@ -17,7 +19,8 @@ stdenv.mkDerivation { cmake pkg-config kdePackages.wrapQtAppsHook - ]; + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; buildInputs = (with kdePackages; [ @@ -38,6 +41,8 @@ stdenv.mkDerivation { ] ++ lib.optional enableAvifSupport libavif; + runtimeDependencies = lib.optionals stdenv.hostPlatform.isLinux [ libpulseaudio ]; + preConfigure = '' if [[ -f "$src/GIT_HASH" ]]; then export GIT_HASH="$(cat $src/GIT_HASH)" From 41f34ef183f1dbcabbae23a71b59dbea28e0cea2 Mon Sep 17 00:00:00 2001 From: someplaceguy Date: Mon, 8 Sep 2025 17:42:51 -0300 Subject: [PATCH 08/97] solaar: fix /usr/bin/getfacl path --- pkgs/by-name/so/solaar/package.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/by-name/so/solaar/package.nix b/pkgs/by-name/so/solaar/package.nix index f48f559fd9ee..444b039d00ee 100644 --- a/pkgs/by-name/so/solaar/package.nix +++ b/pkgs/by-name/so/solaar/package.nix @@ -9,6 +9,7 @@ libappindicator, librsvg, udevCheckHook, + acl, }: # Although we copy in the udev rules here, you probably just want to use @@ -62,6 +63,11 @@ python3Packages.buildPythonApplication rec { pytest-cov-stub ]; + preConfigure = '' + substituteInPlace lib/solaar/listener.py \ + --replace-fail /usr/bin/getfacl "${lib.getExe' acl "getfacl"}" + ''; + # the -cli symlink is just to maintain compabilility with older versions where # there was a difference between the GUI and CLI versions. postInstall = '' From bbe3614be270e0497309110b203bb8769d899952 Mon Sep 17 00:00:00 2001 From: magicquark <198001825+magicquark@users.noreply.github.com> Date: Sun, 14 Sep 2025 08:18:06 +0100 Subject: [PATCH 09/97] catppuccin-sddm: fix custom background substitution - Upstream changed the default `CustomBackground` configuration option to `true` instead of `false`. Therefore, when `background` is not null the configuration is correct and a substitution is not required. - See: catppuccin/sddm@f5418099#diff-e121ebe3 - Resolves: https://github.com/NixOS/nixpkgs/issues/442758 --- pkgs/by-name/ca/catppuccin-sddm/package.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/by-name/ca/catppuccin-sddm/package.nix b/pkgs/by-name/ca/catppuccin-sddm/package.nix index 132dd25c84bf..5b456fecf142 100644 --- a/pkgs/by-name/ca/catppuccin-sddm/package.nix +++ b/pkgs/by-name/ca/catppuccin-sddm/package.nix @@ -64,8 +64,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { ${lib.optionalString (background != null) '' substituteInPlace $configFile \ - --replace-fail 'Background="backgrounds/wall.png"' 'Background="${background}"' \ - --replace-fail 'CustomBackground="false"' 'CustomBackground="true"' + --replace-fail 'Background="backgrounds/wall.png"' 'Background="${background}"' ''} ${lib.optionalString loginBackground '' From ae03b471aa7068d2c45ea7ea863d11a6234bd9c6 Mon Sep 17 00:00:00 2001 From: fmbearmf <77757734+fmbearmf@users.noreply.github.com> Date: Sun, 14 Sep 2025 00:23:00 -0700 Subject: [PATCH 10/97] widevine-cdm: fix source URL in update script --- pkgs/by-name/wi/widevine-cdm/update-x86_64.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/wi/widevine-cdm/update-x86_64.py b/pkgs/by-name/wi/widevine-cdm/update-x86_64.py index 4b18c1dd0b78..c255557f62a8 100755 --- a/pkgs/by-name/wi/widevine-cdm/update-x86_64.py +++ b/pkgs/by-name/wi/widevine-cdm/update-x86_64.py @@ -6,7 +6,7 @@ import sys, os, json, base64, re, argparse, urllib.request, time from typing import Dict, Optional, Tuple from pathlib import Path -DEFAULT_JSON = "https://raw.githubusercontent.com/mozilla/gecko-dev/master/toolkit/content/gmp-sources/widevinecdm.json" +DEFAULT_JSON = "https://raw.githubusercontent.com/mozilla-firefox/firefox/refs/heads/main/toolkit/content/gmp-sources/widevinecdm.json" ARCH_PATTERNS = { "linux_x86_64": ["Linux_x86_64-gcc3"], "linux_aarch64": ["Linux_aarch64-gcc3"] From 2f4f5a6e46f594e4e4d7d5f0818b7f4d1f184a5b Mon Sep 17 00:00:00 2001 From: eljamm Date: Sun, 14 Sep 2025 15:14:48 +0200 Subject: [PATCH 11/97] tunefish: fix vst3 and refactor dependencies - Copy vst3 correctly to the output - Remove vulnerable and unneeded dependencies (webkitgtk_4_0), add libXcursor and libXrandr --- pkgs/by-name/tu/tunefish/package.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/tu/tunefish/package.nix b/pkgs/by-name/tu/tunefish/package.nix index 9f5772e5d8e1..ae8cc6bd3f27 100644 --- a/pkgs/by-name/tu/tunefish/package.nix +++ b/pkgs/by-name/tu/tunefish/package.nix @@ -7,12 +7,12 @@ alsa-lib, curl, freetype, - gtk3, libGL, libX11, + libXcursor, libXext, libXinerama, - webkitgtk_4_0, + libXrandr, }: stdenv.mkDerivation (finalAttrs: { @@ -27,6 +27,8 @@ stdenv.mkDerivation (finalAttrs: { fetchSubmodules = true; }; + strictDeps = true; + nativeBuildInputs = [ pkg-config python3 @@ -36,12 +38,12 @@ stdenv.mkDerivation (finalAttrs: { alsa-lib curl freetype - gtk3 libGL libX11 + libXcursor libXext libXinerama - webkitgtk_4_0 + libXrandr ]; makeFlags = [ @@ -60,11 +62,11 @@ stdenv.mkDerivation (finalAttrs: { installPhase = '' runHook preInstall - mkdir -p $out/lib/{lv2,vst,vst3/Tunefish4.vst3} + mkdir -p $out/lib/{lv2,vst,vst3} pushd src/tunefish4/Builds/LinuxMakefile/build cp -r "Tunefish4.lv2" $out/lib/lv2 - cp -r "Tunefish4.vst3/Contents/x86_64-linux"/* $out/lib/vst3/Tunefish4.vst3 + cp -r "Tunefish4.vst3" $out/lib/vst3 cp "Tunefish4.so" $out/lib/vst popd From efdf6512fb95b641457cda7a64fe68be8e47df63 Mon Sep 17 00:00:00 2001 From: magicquark <198001825+magicquark@users.noreply.github.com> Date: Tue, 16 Sep 2025 01:27:04 +0100 Subject: [PATCH 12/97] catppuccin-sddm: add `disableBackground` option - The default upstream behaviour applies a transparent overlay background. - Presently, there is no straightforward way to disable this. - This commit introduces a `disableBackground` option, defaulting to `false` to preserve upstream behaviour. - When set to `true`, it sets `CustomBackground=false` in the configuration file, preventing the background path from being loaded. --- pkgs/by-name/ca/catppuccin-sddm/package.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/by-name/ca/catppuccin-sddm/package.nix b/pkgs/by-name/ca/catppuccin-sddm/package.nix index 5b456fecf142..88a7152552ea 100644 --- a/pkgs/by-name/ca/catppuccin-sddm/package.nix +++ b/pkgs/by-name/ca/catppuccin-sddm/package.nix @@ -11,6 +11,7 @@ font ? "Noto Sans", fontSize ? "9", background ? null, + disableBackground ? false, loginBackground ? false, userIcon ? false, clockEnabled ? true, @@ -67,6 +68,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { --replace-fail 'Background="backgrounds/wall.png"' 'Background="${background}"' ''} + ${lib.optionalString disableBackground '' + substituteInPlace $configFile \ + --replace-fail 'CustomBackground="true"' 'CustomBackground="false"' + ''} + ${lib.optionalString loginBackground '' substituteInPlace $configFile \ --replace-fail 'LoginBackground="false"' 'LoginBackground="true"' From a570315bcbff41361e34bdad89c96d9f1ff9dcb1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 17 Sep 2025 00:38:06 +0200 Subject: [PATCH 13/97] mediagoblin: remove bower usage --- .../by-name/me/mediagoblin/bower-packages.nix | 13 -------- pkgs/by-name/me/mediagoblin/package.nix | 31 ++++++++++++++----- 2 files changed, 24 insertions(+), 20 deletions(-) delete mode 100644 pkgs/by-name/me/mediagoblin/bower-packages.nix diff --git a/pkgs/by-name/me/mediagoblin/bower-packages.nix b/pkgs/by-name/me/mediagoblin/bower-packages.nix deleted file mode 100644 index 279a437a10ab..000000000000 --- a/pkgs/by-name/me/mediagoblin/bower-packages.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ fetchbower, buildEnv }: -buildEnv { - name = "bower-env"; - ignoreCollisions = true; - paths = [ - (fetchbower "jquery" "2.1.4" "~2.1.3" "1ywrpk2xsr6ghkm3j9gfnl9r3jn6xarfamp99b0bcm57kq9fm2k0") - (fetchbower "video.js" "5.20.5" "~5.20.1" "1agvvid2valba7xxypknbb3k578jz8sa4rsmq5z2yc5010k3nkqp") - (fetchbower "videojs-resolution-switcher" "0.4.2" "~0.4.2" - "1bz2q1wwdglaxbb20fin9djgs1c71jywxhlrm16hm4bzg708ycaf" - ) - (fetchbower "leaflet" "0.7.7" "~0.7.3" "0jim285bljmxxngpm3yx6bnnd10n2whwkgmmhzpcd1rdksnr5nca") - ]; -} diff --git a/pkgs/by-name/me/mediagoblin/package.nix b/pkgs/by-name/me/mediagoblin/package.nix index 439a73563959..2add18b3d539 100644 --- a/pkgs/by-name/me/mediagoblin/package.nix +++ b/pkgs/by-name/me/mediagoblin/package.nix @@ -1,7 +1,8 @@ { lib, - buildBowerComponents, + buildNpmPackage, fetchFromSourcehut, + fetchpatch, gobject-introspection, gst_all_1, poppler-utils, @@ -34,16 +35,32 @@ let hash = "sha256-Y1VnXLHEl6TR8nt+vKSfoCwleQ+oA2WPMN9q4fW9R3s="; }; - extlib = buildBowerComponents { + patches = [ + (fetchpatch { + url = "https://git.sr.ht/~mediagoblin/mediagoblin/commit/95a591bb2ffdeed059b926059155fd0802e6b1e6.patch"; + excludes = [ "docs/source/siteadmin/relnotes.rst" ]; + hash = "sha256-Coff02bewl6E9bHeMy/6tA2dngKcw/c33xk9nmMl/Bk="; + }) + ]; + + extlib = buildNpmPackage { name = "mediagoblin-extlib"; - generated = ./bower-packages.nix; - inherit src; + inherit src patches; + + npmDepsHash = "sha256-wtk5MgsWEpuz3V/EcozEAMOa8UeCgdjhR5wxaiaMugY="; + + dontNpmBuild = true; + + installPhase = '' + mkdir -p $out/node_modules/ + cp -r node_modules/{jquery,video.js,videojs-resolution-switcher,leaflet} $out/node_modules/ + ''; }; in python.pkgs.buildPythonApplication rec { format = "setuptools"; pname = "mediagoblin"; - inherit version src; + inherit version src patches; postPatch = '' # https://git.sr.ht/~mediagoblin/mediagoblin/tree/bf61d38df21748aadb480c53fdd928647285e35f/item/.guix/modules/mediagoblin-package.scm#L60-62 @@ -128,7 +145,7 @@ python.pkgs.buildPythonApplication rec { ''; postInstall = '' - lndir -silent ${extlib}/bower_components/ $out/${python.sitePackages}/mediagoblin/static/extlib/ + lndir -silent ${extlib}/node_modules $out/${python.sitePackages}/mediagoblin/static/extlib/ ln -rs $out/${python.sitePackages}/mediagoblin/static/extlib/jquery/dist/jquery.js $out/${python.sitePackages}/mediagoblin/static/js/extlib/jquery.js ln -rs $out/${python.sitePackages}/mediagoblin/static/extlib/leaflet/dist/leaflet.css $out/${python.sitePackages}/mediagoblin/static/extlib/leaflet/leaflet.css @@ -151,7 +168,7 @@ python.pkgs.buildPythonApplication rec { pythonImportsCheck = [ "mediagoblin" ]; passthru = { - inherit python; + inherit extlib python; }; meta = { From cd33c6bf2c8c50752e50f313e47714bb5a424186 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 17 Sep 2025 16:54:54 +0000 Subject: [PATCH 14/97] odin: dev-2025-08 -> dev-2025-09 --- pkgs/by-name/od/odin/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/od/odin/package.nix b/pkgs/by-name/od/odin/package.nix index e5ea311510e7..f2963ed2954e 100644 --- a/pkgs/by-name/od/odin/package.nix +++ b/pkgs/by-name/od/odin/package.nix @@ -12,13 +12,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "odin"; - version = "dev-2025-08"; + version = "dev-2025-09"; src = fetchFromGitHub { owner = "odin-lang"; repo = "Odin"; tag = finalAttrs.version; - hash = "sha256-08a5MFnHiG/HsetF7V913Hozev2rm1PaXdA/QJcDXTk="; + hash = "sha256-PxegNMEzxytZtmhmzDgb1Umzx/9aUIlc9SDojRlZfsE="; }; patches = [ From 202859b86202b7b2cdf1407d6429c864d28b78e1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 17 Sep 2025 19:56:14 +0000 Subject: [PATCH 15/97] gotenberg: 8.23.0 -> 8.23.1 --- pkgs/by-name/go/gotenberg/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/go/gotenberg/package.nix b/pkgs/by-name/go/gotenberg/package.nix index 68e4a0c812e1..93aa5d94a471 100644 --- a/pkgs/by-name/go/gotenberg/package.nix +++ b/pkgs/by-name/go/gotenberg/package.nix @@ -24,7 +24,7 @@ let in buildGo125Module rec { pname = "gotenberg"; - version = "8.23.0"; + version = "8.23.1"; outputs = [ "out" @@ -35,10 +35,10 @@ buildGo125Module rec { owner = "gotenberg"; repo = "gotenberg"; tag = "v${version}"; - hash = "sha256-sZALMMnOmewhhukPoW6sIw80uPHu+rAZmgYdlZdVH7A="; + hash = "sha256-rhpeQf1c/XzVEzWuRHryLWSRyL3Ruc3xaYOd5n/hRKc="; }; - vendorHash = "sha256-fAAaX8E4di6ppU8osLPs6wnAe+e6ogOwp6dQAr42Mes="; + vendorHash = "sha256-ZCRA4P4z/fb8zXGIFfLtGwo9ff9tdgdMeYbBnMvYgEU="; postPatch = '' find ./pkg -name '*_test.go' -exec sed -i -e 's#/tests#${src}#g' {} \; From 6654cdac327f7510b28c69816750cc5c8236fe85 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 18 Sep 2025 06:55:46 +0000 Subject: [PATCH 16/97] rzls: 10.0.0-preview.25424.9 -> 10.0.0-preview.25464.2 --- pkgs/by-name/rz/rzls/deps.json | 90 ++++++++++++++++---------------- pkgs/by-name/rz/rzls/package.nix | 6 +-- 2 files changed, 48 insertions(+), 48 deletions(-) diff --git a/pkgs/by-name/rz/rzls/deps.json b/pkgs/by-name/rz/rzls/deps.json index 3d9cb9231c9e..44f7c584b212 100644 --- a/pkgs/by-name/rz/rzls/deps.json +++ b/pkgs/by-name/rz/rzls/deps.json @@ -43,9 +43,9 @@ }, { "pname": "Microsoft.CodeAnalysis.Analyzers", - "version": "5.0.0-2.25418.8", - "hash": "sha256-dlQ7KyYZLqSE3D0j6ZAPBv8gbSuE+8IVQhJAeoo2K8g=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.analyzers/5.0.0-2.25418.8/microsoft.codeanalysis.analyzers.5.0.0-2.25418.8.nupkg" + "version": "5.0.0-2.25452.2", + "hash": "sha256-BsNPX6p08WG5unEZOq/m8c9iKQ2tcX8LiUj2Icf9Mm8=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.analyzers/5.0.0-2.25452.2/microsoft.codeanalysis.analyzers.5.0.0-2.25452.2.nupkg" }, { "pname": "Microsoft.CodeAnalysis.BannedApiAnalyzers", @@ -55,27 +55,27 @@ }, { "pname": "Microsoft.CodeAnalysis.Common", - "version": "5.0.0-2.25418.8", - "hash": "sha256-O1yCn9+EAwtxZ/GwmAcyDWDPrhjMM4jAuSHvDYCMYiI=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.common/5.0.0-2.25418.8/microsoft.codeanalysis.common.5.0.0-2.25418.8.nupkg" + "version": "5.0.0-2.25452.2", + "hash": "sha256-C5ymxF29vgwu9Jwl7CwNEf4+zpb7fFLUdBGPVnf+Ixs=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.common/5.0.0-2.25452.2/microsoft.codeanalysis.common.5.0.0-2.25452.2.nupkg" }, { "pname": "Microsoft.CodeAnalysis.CSharp", - "version": "5.0.0-2.25418.8", - "hash": "sha256-aO1ZCPkpE0SiF1YgELlOVTe2Mq6mbdZhc8acKsgGYCM=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp/5.0.0-2.25418.8/microsoft.codeanalysis.csharp.5.0.0-2.25418.8.nupkg" + "version": "5.0.0-2.25452.2", + "hash": "sha256-foZzAkEdfdtvF3WJwUhdC51KeBHnTdBoH+JGV5XD5A0=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp/5.0.0-2.25452.2/microsoft.codeanalysis.csharp.5.0.0-2.25452.2.nupkg" }, { "pname": "Microsoft.CodeAnalysis.CSharp.Features", - "version": "5.0.0-2.25418.8", - "hash": "sha256-KFlqI0142Cli+8LgWlfK1DCNO+TlFPQK8NtmCvJZz6A=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.features/5.0.0-2.25418.8/microsoft.codeanalysis.csharp.features.5.0.0-2.25418.8.nupkg" + "version": "5.0.0-2.25452.2", + "hash": "sha256-3J+9YhYUePNRX8sWJQNbK3G/FjS+sh5ML1ix1zn5B5Q=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.features/5.0.0-2.25452.2/microsoft.codeanalysis.csharp.features.5.0.0-2.25452.2.nupkg" }, { "pname": "Microsoft.CodeAnalysis.CSharp.Workspaces", - "version": "5.0.0-2.25418.8", - "hash": "sha256-TigMGogMhbbRaWR4/9Aj+o5lxmVWUoIjBtmUiBHFhxM=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.workspaces/5.0.0-2.25418.8/microsoft.codeanalysis.csharp.workspaces.5.0.0-2.25418.8.nupkg" + "version": "5.0.0-2.25452.2", + "hash": "sha256-Wnqq7HFdRvwde+tx1fLufiVOeAZul5jDasswEKFLhdk=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.workspaces/5.0.0-2.25452.2/microsoft.codeanalysis.csharp.workspaces.5.0.0-2.25452.2.nupkg" }, { "pname": "Microsoft.CodeAnalysis.Elfie", @@ -85,21 +85,21 @@ }, { "pname": "Microsoft.CodeAnalysis.ExternalAccess.Razor.Features", - "version": "5.0.0-2.25418.8", - "hash": "sha256-153NrMy6dA1FuUD0XfRASHiALANMSKXIigf49pQ8emI=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.externalaccess.razor.features/5.0.0-2.25418.8/microsoft.codeanalysis.externalaccess.razor.features.5.0.0-2.25418.8.nupkg" + "version": "5.0.0-2.25452.2", + "hash": "sha256-cfOyGxroU5SZAUar6YROo2o6lsr2lVAkYMQopIsIRnc=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.externalaccess.razor.features/5.0.0-2.25452.2/microsoft.codeanalysis.externalaccess.razor.features.5.0.0-2.25452.2.nupkg" }, { "pname": "Microsoft.CodeAnalysis.Features", - "version": "5.0.0-2.25418.8", - "hash": "sha256-dYmfiCnerjAArbF4LuXNi6oF9dY8lcDw2M3MX1IswhI=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.features/5.0.0-2.25418.8/microsoft.codeanalysis.features.5.0.0-2.25418.8.nupkg" + "version": "5.0.0-2.25452.2", + "hash": "sha256-3flzK3w1P+YEm93XeKyWKKu0de7uaSJhRR6CjDi2uAo=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.features/5.0.0-2.25452.2/microsoft.codeanalysis.features.5.0.0-2.25452.2.nupkg" }, { "pname": "Microsoft.CodeAnalysis.LanguageServer.Protocol", - "version": "5.0.0-2.25418.8", - "hash": "sha256-cgAS5pZY6qb2I8QlTaDWl3zLGURNBblPKf69lYHF+xc=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.languageserver.protocol/5.0.0-2.25418.8/microsoft.codeanalysis.languageserver.protocol.5.0.0-2.25418.8.nupkg" + "version": "5.0.0-2.25452.2", + "hash": "sha256-VbfgcAULLmLjGHfqYD1ohJPLZn65b8JFaOnP0kucqJg=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.languageserver.protocol/5.0.0-2.25452.2/microsoft.codeanalysis.languageserver.protocol.5.0.0-2.25452.2.nupkg" }, { "pname": "Microsoft.CodeAnalysis.PublicApiAnalyzers", @@ -109,27 +109,27 @@ }, { "pname": "Microsoft.CodeAnalysis.Remote.Workspaces", - "version": "5.0.0-2.25418.8", - "hash": "sha256-bHlIsWZus8Ms10WTAgSsKaAsIWyxwCMLd3zfXO3eFXA=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.remote.workspaces/5.0.0-2.25418.8/microsoft.codeanalysis.remote.workspaces.5.0.0-2.25418.8.nupkg" + "version": "5.0.0-2.25452.2", + "hash": "sha256-jYHylTS3OO84UFz1vfB8ST/k5G/XI6Ks4lOE5DYlPcw=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.remote.workspaces/5.0.0-2.25452.2/microsoft.codeanalysis.remote.workspaces.5.0.0-2.25452.2.nupkg" }, { "pname": "Microsoft.CodeAnalysis.Scripting.Common", - "version": "5.0.0-2.25418.8", - "hash": "sha256-jmvE90GOWoZLsHcX0SaBHXSJIfDeL/s/47k7uaG0DiE=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.scripting.common/5.0.0-2.25418.8/microsoft.codeanalysis.scripting.common.5.0.0-2.25418.8.nupkg" + "version": "5.0.0-2.25452.2", + "hash": "sha256-dG632yqX95EwXqDfhnBwhbS1/fuex7fUjM/wUnPQaR0=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.scripting.common/5.0.0-2.25452.2/microsoft.codeanalysis.scripting.common.5.0.0-2.25452.2.nupkg" }, { "pname": "Microsoft.CodeAnalysis.Workspaces.Common", - "version": "5.0.0-2.25418.8", - "hash": "sha256-+LI3eEQDmdLTGaab4gu225NblD1l+RWZ+noosDWbxFM=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.workspaces.common/5.0.0-2.25418.8/microsoft.codeanalysis.workspaces.common.5.0.0-2.25418.8.nupkg" + "version": "5.0.0-2.25452.2", + "hash": "sha256-JNadLPLKA2wuThQABqj3/PKPhMTrn72VjNumkGbkNm4=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.workspaces.common/5.0.0-2.25452.2/microsoft.codeanalysis.workspaces.common.5.0.0-2.25452.2.nupkg" }, { "pname": "Microsoft.CommonLanguageServerProtocol.Framework", - "version": "5.0.0-2.25418.8", - "hash": "sha256-b5QMnPTP/+wpkD2RmS6UtaO5RNYC3PxirboyVgniG04=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.commonlanguageserverprotocol.framework/5.0.0-2.25418.8/microsoft.commonlanguageserverprotocol.framework.5.0.0-2.25418.8.nupkg" + "version": "5.0.0-2.25452.2", + "hash": "sha256-b/kxQt5KyluSGkkmFzy9+EGlTOW5gBv3bkM/t5PbB+8=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.commonlanguageserverprotocol.framework/5.0.0-2.25452.2/microsoft.commonlanguageserverprotocol.framework.5.0.0-2.25452.2.nupkg" }, { "pname": "Microsoft.CSharp", @@ -145,15 +145,15 @@ }, { "pname": "Microsoft.DotNet.Arcade.Sdk", - "version": "9.0.0-beta.25255.5", - "hash": "sha256-AgHPYDKvoO3a2zoRSgnokC6XrF521V1lQ9KEPcKyS5E=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.arcade.sdk/9.0.0-beta.25255.5/microsoft.dotnet.arcade.sdk.9.0.0-beta.25255.5.nupkg" + "version": "9.0.0-beta.25428.3", + "hash": "sha256-imlZjZcVWjNXO0yZmSoXPOlxX/qaJ96LeN8Xb/ox+Vk=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.arcade.sdk/9.0.0-beta.25428.3/microsoft.dotnet.arcade.sdk.9.0.0-beta.25428.3.nupkg" }, { "pname": "Microsoft.DotNet.XliffTasks", - "version": "9.0.0-beta.25255.5", - "hash": "sha256-yigTPcb88S+1FUal0K/fL5pu5I/dmPACAo2sPOTDfZk=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.xlifftasks/9.0.0-beta.25255.5/microsoft.dotnet.xlifftasks.9.0.0-beta.25255.5.nupkg" + "version": "9.0.0-beta.25428.3", + "hash": "sha256-4Jgieh85GiTg8rmQb3esR0UZTuj+L2cLzwyC0ziOBDc=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.xlifftasks/9.0.0-beta.25428.3/microsoft.dotnet.xlifftasks.9.0.0-beta.25428.3.nupkg" }, { "pname": "Microsoft.Extensions.DependencyInjection", @@ -181,9 +181,9 @@ }, { "pname": "Microsoft.Net.Compilers.Toolset", - "version": "5.0.0-2.25418.8", - "hash": "sha256-/Vr5J7ORwruP5mLMeVdbUPjUWYmCbLmZbi+aJBq8HmU=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.net.compilers.toolset/5.0.0-2.25418.8/microsoft.net.compilers.toolset.5.0.0-2.25418.8.nupkg" + "version": "5.0.0-2.25452.2", + "hash": "sha256-lrjvenHm6/z8Fy37UaUdKjM36zlwe43revlQjg+aqV4=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.net.compilers.toolset/5.0.0-2.25452.2/microsoft.net.compilers.toolset.5.0.0-2.25452.2.nupkg" }, { "pname": "Microsoft.NET.StringTools", diff --git a/pkgs/by-name/rz/rzls/package.nix b/pkgs/by-name/rz/rzls/package.nix index 2a0ba603e5ad..3964d85dc55c 100644 --- a/pkgs/by-name/rz/rzls/package.nix +++ b/pkgs/by-name/rz/rzls/package.nix @@ -29,11 +29,11 @@ buildDotnetModule { src = fetchFromGitHub { owner = "dotnet"; repo = "razor"; - rev = "f2270a5492e831864b60a8853c7435ded110ad6f"; - hash = "sha256-QMeIQmX/1W3N3r27fG5/Q6CsW/Wh+EI5+poGlJ2sbsQ="; + rev = "bde4f70c9560811a7f25023b9d8ac42fd7d0e99f"; + hash = "sha256-wS7JKHLpX9/JluID94HXUkepaX9eoceRzuIofBICiBk="; }; - version = "10.0.0-preview.25424.9"; + version = "10.0.0-preview.25464.2"; projectFile = "src/Razor/src/rzls/rzls.csproj"; useDotnetFromEnv = true; nugetDeps = ./deps.json; From 5d12f3185cd2693f18442bbdc01f808062d58de4 Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Thu, 18 Sep 2025 15:24:45 +0200 Subject: [PATCH 17/97] python3Packages.python-markdown-math: fix Markdown dependency --- .../development/python-modules/python-markdown-math/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/python-markdown-math/default.nix b/pkgs/development/python-modules/python-markdown-math/default.nix index 508229050afe..a5f42e85901f 100644 --- a/pkgs/development/python-modules/python-markdown-math/default.nix +++ b/pkgs/development/python-modules/python-markdown-math/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { build-system = [ setuptools ]; - nativeCheckInputs = [ markdown ]; + dependencies = [ markdown ]; meta = { description = "Math extension for Python-Markdown"; From 14a3cc02bdd4729f59398aad309685a82cbc2b25 Mon Sep 17 00:00:00 2001 From: Arnout Engelen Date: Thu, 18 Sep 2025 16:15:23 +0200 Subject: [PATCH 18/97] onlyoffice: fix syntax error The `more_set_headers` syntax was wrong. Syntax docs: https://github.com/openresty/headers-more-nginx-module?tab=readme-ov-file#more_set_headers This led to: ``` {\"Exception\":\"InvalidArgumentException\",\"Message\":\"\\\"attachment;\\\" is not valid header name.\",\"Code\":0,\"Trace\":[ {\"file\":\"/nix/store/4y4c191pd9pa5nd78i8flvkf50gd4lvp-nextcloud-31.0.8/3rdparty/guzzlehttp/psr7/src/MessageTrait.php\",\"line\":153,\"function\":\"assertHeader\",\"class\":\"GuzzleHttp\\\\Psr7\\\\Response\",\"type\":\"->\"}, ``` Introduced in https://github.com/NixOS/nixpkgs/pull/419765 --- nixos/modules/services/web-apps/onlyoffice.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/web-apps/onlyoffice.nix b/nixos/modules/services/web-apps/onlyoffice.nix index 8392af4a4673..88b194091651 100644 --- a/nixos/modules/services/web-apps/onlyoffice.nix +++ b/nixos/modules/services/web-apps/onlyoffice.nix @@ -145,7 +145,7 @@ in ''; "~* ^(\\/cache\\/files.*)(\\/.*)".extraConfig = '' alias /var/lib/onlyoffice/documentserver/App_Data$1; - more_set_headers Content-Disposition "attachment; filename*=UTF-8''$arg_filename"; + more_set_headers "Content-Disposition: attachment; filename*=UTF-8''$arg_filename"; set $secure_link_secret verysecretstring; secure_link $arg_md5,$arg_expires; From ae9e6a9e343a083460681cfc6e6e05e8ab0acccf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 19 Sep 2025 08:48:23 +0000 Subject: [PATCH 19/97] gcs: 5.37.1 -> 5.39.0 --- pkgs/by-name/gc/gcs/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gc/gcs/package.nix b/pkgs/by-name/gc/gcs/package.nix index 105ccf4bd061..b08444957347 100644 --- a/pkgs/by-name/gc/gcs/package.nix +++ b/pkgs/by-name/gc/gcs/package.nix @@ -19,13 +19,13 @@ buildGoModule rec { pname = "gcs"; - version = "5.37.1"; + version = "5.39.0"; src = fetchFromGitHub { owner = "richardwilkes"; repo = "gcs"; tag = "v${version}"; - hash = "sha256-VHysS1/LxtVIJvnlw1joFPc+8uS525VK+FpmKoSikp0="; + hash = "sha256-R0IFIGDSpKxNmcDUMVdtKV+M3I8tglBhyHj5XXe2rjg="; }; modPostBuild = '' @@ -33,7 +33,7 @@ buildGoModule rec { sed -i 's|-lmupdf[^ ]* |-lmupdf |g' vendor/github.com/richardwilkes/pdf/pdf.go ''; - vendorHash = "sha256-T6Omz/jsk0raGM8p+G2wlMWRHzpo2qcTOtCddQoa83w="; + vendorHash = "sha256-llbBYO1dNPm+k8WEfao6qyDtQZbcmueNwFBuIpaMvFQ="; nativeBuildInputs = [ pkg-config ]; From d457818da697aa7711ff3599be23ab8850573a46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Wiedemann?= Date: Sun, 21 Sep 2025 01:14:43 +0200 Subject: [PATCH 20/97] davinci-resolve: Fix run env (Studio) and taskbar icon (all) --- pkgs/by-name/da/davinci-resolve/package.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/da/davinci-resolve/package.nix b/pkgs/by-name/da/davinci-resolve/package.nix index 2f0f8029c161..1929c022a5f9 100644 --- a/pkgs/by-name/da/davinci-resolve/package.nix +++ b/pkgs/by-name/da/davinci-resolve/package.nix @@ -150,7 +150,7 @@ let test -e ${lib.escapeShellArg appimageName} appimage-run ${lib.escapeShellArg appimageName} -i -y -n -C $out - mkdir -p $out/{configs,DolbyVision,easyDCP,Fairlight,GPUCache,logs,Media,"Resolve Disk Database",.crashreport,.license,.LUT} + mkdir -p $out/{configs,DolbyVision,easyDCP,Fairlight,GPUCache,logs,Media,"Resolve Disk Database",.crashreport,.license,.LUT,Extras} runHook postInstall ''; @@ -186,6 +186,7 @@ let "Video" "Graphics" ]; + startupWMClass = "resolve"; }) ]; } @@ -248,10 +249,12 @@ buildFHSEnv { extraPreBwrapCmds = lib.optionalString studioVariant '' mkdir -p ~/.local/share/DaVinciResolve/license || exit 1 + mkdir -p ~/.local/share/DaVinciResolve/Extras || exit 1 ''; extraBwrapArgs = lib.optionals studioVariant [ - "--bind \"$HOME\"/.local/share/DaVinciResolve/license ${davinci}/.license" + ''--bind "$HOME"/.local/share/DaVinciResolve/license ${davinci}/.license'' + ''--bind "$HOME"/.local/share/DaVinciResolve/Extras ${davinci}/Extras'' ]; runScript = "${bash}/bin/bash ${writeText "davinci-wrapper" '' From a27a3ee6b8d76eff8e407428943cf18746f8537b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 21 Sep 2025 01:06:25 +0000 Subject: [PATCH 21/97] benthos: 4.55.0 -> 4.56.0 --- pkgs/by-name/be/benthos/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/be/benthos/package.nix b/pkgs/by-name/be/benthos/package.nix index d8fe088eff66..3ad7b9e939d0 100644 --- a/pkgs/by-name/be/benthos/package.nix +++ b/pkgs/by-name/be/benthos/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "benthos"; - version = "4.55.0"; + version = "4.56.0"; src = fetchFromGitHub { owner = "redpanda-data"; repo = "benthos"; tag = "v${version}"; - hash = "sha256-i6PDTgiDEZJAobNvDxRwggIfBMsZ7gZsn6ruthVn37w="; + hash = "sha256-TayHN6Vsp1mkDNqa6mc5HWGPIfyeJQdzOGBnE6SioZ0="; }; proxyVendor = true; From 5e6dc5097113c069dc0ba775d96b2afd91480700 Mon Sep 17 00:00:00 2001 From: Ulysses Zhan Date: Sat, 20 Sep 2025 18:53:24 -0700 Subject: [PATCH 22/97] server-box: 1.0.1253 -> 1.0.1256; fix desktop entry; add maintainer --- pkgs/by-name/se/server-box/package.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/se/server-box/package.nix b/pkgs/by-name/se/server-box/package.nix index a57a4b8300f5..0c5d5481f8c2 100644 --- a/pkgs/by-name/se/server-box/package.nix +++ b/pkgs/by-name/se/server-box/package.nix @@ -12,13 +12,13 @@ }: let - version = "1.0.1253"; + version = "1.0.1256"; src = fetchFromGitHub { owner = "lollipopkit"; repo = "flutter_server_box"; tag = "v${version}"; - hash = "sha256-UflskghSx9ODQ8q2TI9DRjfmWSxp5wSDYGomUcv/Oy4="; + hash = "sha256-V4Y4JoUsca2MmPJd1t+IWrNiIj5oslaj6736rPUT9hM="; }; in flutter335.buildFlutterApplication { @@ -37,7 +37,7 @@ flutter335.buildFlutterApplication { desktopItems = [ (makeDesktopItem { name = "server-box"; - exec = "server-box"; + exec = "ServerBox"; icon = "server-box"; genericName = "ServerBox"; desktopName = "ServerBox"; @@ -78,9 +78,10 @@ flutter335.buildFlutterApplication { meta = { description = "Server status & toolbox"; homepage = "https://github.com/lollipopkit/flutter_server_box"; + changelog = "https://github.com/lollipopkit/flutter_server_box/releases/tag/${src.tag}"; mainProgram = "ServerBox"; license = lib.licenses.gpl3Plus; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ ]; + maintainers = with lib.maintainers; [ ulysseszhan ]; }; } From dfbd3a25f653caa6ab54c4a7435f77e2fec06422 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 21 Sep 2025 15:41:20 +0200 Subject: [PATCH 23/97] maintainers: drop 8aed Inactive since August 2024, didn't join the NixOS org. --- maintainers/maintainer-list.nix | 6 ------ pkgs/by-name/pa/passt/package.nix | 1 - 2 files changed, 7 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 4adac94f9526..a36d0811a500 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -279,12 +279,6 @@ githubId = 43320117; name = "Sebastian Marquardt"; }; - _8aed = { - email = "8aed@riseup.net"; - github = "8aed"; - githubId = 140662578; - name = "Huit Aed"; - }; _9999years = { email = "rbt@fastmail.com"; github = "9999years"; diff --git a/pkgs/by-name/pa/passt/package.nix b/pkgs/by-name/pa/passt/package.nix index 8ad346a8c5d4..90ee260c41af 100644 --- a/pkgs/by-name/pa/passt/package.nix +++ b/pkgs/by-name/pa/passt/package.nix @@ -62,7 +62,6 @@ stdenv.mkDerivation (finalAttrs: { licenses.gpl2Plus ]; platforms = platforms.linux; - maintainers = with maintainers; [ _8aed ]; mainProgram = "passt"; }; }) From 85f8f3f2267509dae8beb072e31d159adfb9b4b2 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 21 Sep 2025 18:24:36 +0200 Subject: [PATCH 24/97] maintainers: drop tfmoraes Last active in January 2024. --- maintainers/maintainer-list.nix | 5 ----- pkgs/by-name/op/openvino/package.nix | 1 - pkgs/by-name/wx/wxGTK31/package.nix | 1 - pkgs/by-name/wx/wxGTK32/package.nix | 1 - pkgs/by-name/wx/wxwidgets_3_3/package.nix | 1 - pkgs/by-name/ze/zettlr/package.nix | 1 - pkgs/development/libraries/gdcm/default.nix | 1 - pkgs/development/python-modules/pypubsub/default.nix | 1 - 8 files changed, 12 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 4adac94f9526..22b707fe2170 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -25536,11 +25536,6 @@ github = "tfkhdyt"; githubId = 47195537; }; - tfmoraes = { - name = "Thiago Franco de Moraes"; - github = "tfmoraes"; - githubId = 351108; - }; tg-x = { email = "*@tg-x.net"; github = "tg-x"; diff --git a/pkgs/by-name/op/openvino/package.nix b/pkgs/by-name/op/openvino/package.nix index f8225cec2b56..9d4d36ac6149 100644 --- a/pkgs/by-name/op/openvino/package.nix +++ b/pkgs/by-name/op/openvino/package.nix @@ -191,6 +191,5 @@ stdenv.mkDerivation rec { license = with licenses; [ asl20 ]; platforms = platforms.all; broken = stdenv.hostPlatform.isDarwin; # Cannot find macos sdk - maintainers = with maintainers; [ tfmoraes ]; }; } diff --git a/pkgs/by-name/wx/wxGTK31/package.nix b/pkgs/by-name/wx/wxGTK31/package.nix index a37d95ec4caa..e474550d6223 100644 --- a/pkgs/by-name/wx/wxGTK31/package.nix +++ b/pkgs/by-name/wx/wxGTK31/package.nix @@ -130,7 +130,6 @@ stdenv.mkDerivation rec { lgpl2Plus wxWindowsException31 ]; - maintainers = with maintainers; [ tfmoraes ]; platforms = platforms.unix; }; } diff --git a/pkgs/by-name/wx/wxGTK32/package.nix b/pkgs/by-name/wx/wxGTK32/package.nix index 4161416ce89b..80a179152dfb 100644 --- a/pkgs/by-name/wx/wxGTK32/package.nix +++ b/pkgs/by-name/wx/wxGTK32/package.nix @@ -152,7 +152,6 @@ stdenv.mkDerivation rec { wxWindowsException31 ]; maintainers = with maintainers; [ - tfmoraes fliegendewurst ]; platforms = platforms.unix; diff --git a/pkgs/by-name/wx/wxwidgets_3_3/package.nix b/pkgs/by-name/wx/wxwidgets_3_3/package.nix index 05ebb6a946a9..9f16a12edbb5 100644 --- a/pkgs/by-name/wx/wxwidgets_3_3/package.nix +++ b/pkgs/by-name/wx/wxwidgets_3_3/package.nix @@ -132,7 +132,6 @@ stdenv.mkDerivation (finalAttrs: { wxWindowsException31 ]; maintainers = with lib.maintainers; [ - tfmoraes fliegendewurst wegank ]; diff --git a/pkgs/by-name/ze/zettlr/package.nix b/pkgs/by-name/ze/zettlr/package.nix index fe3905ec75b3..3c7176f7d144 100644 --- a/pkgs/by-name/ze/zettlr/package.nix +++ b/pkgs/by-name/ze/zettlr/package.nix @@ -42,7 +42,6 @@ appimageTools.wrapType2 rec { homepage = "https://www.zettlr.com"; platforms = [ "x86_64-linux" ]; license = lib.licenses.gpl3; - maintainers = with lib.maintainers; [ tfmoraes ]; mainProgram = "zettlr"; }; } diff --git a/pkgs/development/libraries/gdcm/default.nix b/pkgs/development/libraries/gdcm/default.nix index 9bbd2f7600c7..3347193c296b 100644 --- a/pkgs/development/libraries/gdcm/default.nix +++ b/pkgs/development/libraries/gdcm/default.nix @@ -121,7 +121,6 @@ stdenv.mkDerivation (finalAttrs: { bsd3 asl20 ]; - maintainers = with lib.maintainers; [ tfmoraes ]; platforms = lib.platforms.all; }; }) diff --git a/pkgs/development/python-modules/pypubsub/default.nix b/pkgs/development/python-modules/pypubsub/default.nix index 2bf879624a22..895bca300e39 100644 --- a/pkgs/development/python-modules/pypubsub/default.nix +++ b/pkgs/development/python-modules/pypubsub/default.nix @@ -40,6 +40,5 @@ buildPythonPackage { applications. ''; license = licenses.bsd2; - maintainers = with maintainers; [ tfmoraes ]; }; } From b5cfb40cc1690f06b32fa482814cb13635d29c46 Mon Sep 17 00:00:00 2001 From: Ross Smyth <18294397+RossSmyth@users.noreply.github.com> Date: Sun, 21 Sep 2025 00:12:46 -0400 Subject: [PATCH 25/97] ntl: to finalAttrs, strictDeps, fix static and cross builds. --- pkgs/by-name/nt/ntl/package.nix | 33 +++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/pkgs/by-name/nt/ntl/package.nix b/pkgs/by-name/nt/ntl/package.nix index 41a6191654d9..f52ac96c7fba 100644 --- a/pkgs/by-name/nt/ntl/package.nix +++ b/pkgs/by-name/nt/ntl/package.nix @@ -13,24 +13,24 @@ assert withGf2x -> gf2x != null; -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ntl"; version = "11.5.1"; src = fetchurl { - url = "http://www.shoup.net/ntl/ntl-${version}.tar.gz"; - sha256 = "sha256-IQ0GwxMGy8bq9oFEU8Vsd22djo3zbXTrMG9qUj0caoo="; + url = "http://www.shoup.net/ntl/ntl-${finalAttrs.version}.tar.gz"; + hash = "sha256-IQ0GwxMGy8bq9oFEU8Vsd22djo3zbXTrMG9qUj0caoo="; }; + strictDeps = true; + depsBuildBuild = [ + perl # needed for ./configure + ]; buildInputs = [ gmp ]; - nativeBuildInputs = [ - perl # needed for ./configure - ]; - - sourceRoot = "${pname}-${version}/src"; + sourceRoot = "ntl-${finalAttrs.version}/src"; enableParallelBuilding = true; @@ -42,9 +42,9 @@ stdenv.mkDerivation rec { configurePlatforms = [ ]; # reference: http://shoup.net/ntl/doc/tour-unix.html + dontAddStaticConfigureFlags = true; # perl config doesn't understand it. configureFlags = [ "DEF_PREFIX=$(out)" - "SHARED=on" # genereate a shared library (as well as static) "NATIVE=off" # don't target code to current hardware (reproducibility, portability) "TUNE=${ if tune then @@ -55,15 +55,20 @@ stdenv.mkDerivation rec { "generic" # "chooses options that should be OK for most platforms" }" "CXX=${stdenv.cc.targetPrefix}c++" + "AR=${stdenv.cc.targetPrefix}ar" + ] + ++ lib.optionals (!stdenv.hostPlatform.isStatic) [ + "SHARED=on" # genereate a shared library ] ++ lib.optionals withGf2x [ "NTL_GF2X_LIB=on" "GF2X_PREFIX=${gf2x}" ]; + enableParallelChecking = true; doCheck = true; # takes some time - meta = with lib; { + meta = { description = "Library for doing Number Theory"; longDescription = '' NTL is a high-performance, portable C++ library providing data @@ -76,11 +81,11 @@ stdenv.mkDerivation rec { homepage = "http://www.shoup.net/ntl/"; # also locally at "${src}/doc/tour-changes.html"; changelog = "https://www.shoup.net/ntl/doc/tour-changes.html"; - teams = [ teams.sage ]; - license = licenses.gpl2Plus; - platforms = platforms.all; + teams = [ lib.teams.sage ]; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.all; # Does not cross compile # https://github.com/libntl/ntl/issues/8 broken = !(stdenv.buildPlatform.canExecute stdenv.hostPlatform); }; -} +}) From b5f92b2385229d3e51fe2d369eec4f4ff8ba1e72 Mon Sep 17 00:00:00 2001 From: Ihar Hrachyshka Date: Sun, 21 Sep 2025 16:56:44 -0400 Subject: [PATCH 26/97] llama-cpp: don't define metal test for linux --- pkgs/by-name/ll/llama-cpp/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ll/llama-cpp/package.nix b/pkgs/by-name/ll/llama-cpp/package.nix index 0b2f7c9b3a21..782bc5fe98bf 100644 --- a/pkgs/by-name/ll/llama-cpp/package.nix +++ b/pkgs/by-name/ll/llama-cpp/package.nix @@ -177,7 +177,7 @@ effectiveStdenv.mkDerivation (finalAttrs: { doCheck = false; passthru = { - tests = { + tests = lib.optionalAttrs stdenv.hostPlatform.isDarwin { metal = llama-cpp.override { metalSupport = true; }; }; updateScript = nix-update-script { From 5acf8ae51bff2ea0ce368434528a1f95b0f6eeab Mon Sep 17 00:00:00 2001 From: Katalin Rebhan Date: Sun, 21 Sep 2025 22:31:17 +0200 Subject: [PATCH 27/97] open5gs: use usrsctp on non-Linux This is the library Open5GS suggests to use for building on macOS. Since it's portable, use everywhere that isn't Linux. --- pkgs/by-name/op/open5gs/package.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/op/open5gs/package.nix b/pkgs/by-name/op/open5gs/package.nix index 5cd935064901..3b11a43d651c 100644 --- a/pkgs/by-name/op/open5gs/package.nix +++ b/pkgs/by-name/op/open5gs/package.nix @@ -21,6 +21,7 @@ curl, libtins, mongosh, + usrsctp, }: stdenv.mkDerivation (finalAttrs: { @@ -75,13 +76,18 @@ stdenv.mkDerivation (finalAttrs: { libyaml libmicrohttpd libgcrypt - lksctp-tools libidn openssl curl libtins gnutls libnghttp2.dev + ] + ++ lib.optionals stdenv.isLinux [ + lksctp-tools + ] + ++ lib.optionals (!stdenv.isLinux) [ + usrsctp ]; # For subproject From 6f420216e550e4b09f59642ae374763fd51027f9 Mon Sep 17 00:00:00 2001 From: Katalin Rebhan Date: Sun, 21 Sep 2025 22:31:17 +0200 Subject: [PATCH 28/97] open5gs: remove extra compiler flags Seems to be no longer needed with GCC and additionally breaks the build with Clang. --- pkgs/by-name/op/open5gs/package.nix | 8 -------- 1 file changed, 8 deletions(-) diff --git a/pkgs/by-name/op/open5gs/package.nix b/pkgs/by-name/op/open5gs/package.nix index 3b11a43d651c..d4e30914a6f8 100644 --- a/pkgs/by-name/op/open5gs/package.nix +++ b/pkgs/by-name/op/open5gs/package.nix @@ -90,14 +90,6 @@ stdenv.mkDerivation (finalAttrs: { usrsctp ]; - # For subproject - env = { - NIX_CFLAGS_COMPILE = toString [ - "-Wno-error=array-bounds" - "-Wno-error=stringop-overflow" - ]; - }; - preConfigure = '' cp -R --no-preserve=mode,ownership ${finalAttrs.diameter} subprojects/freeDiameter cp -R --no-preserve=mode,ownership ${finalAttrs.libtins} subprojects/libtins From d36b1912e7fb08dfb10dbf27bca37eda1d65e667 Mon Sep 17 00:00:00 2001 From: fmbearmf <77757734+fmbearmf@users.noreply.github.com> Date: Mon, 22 Sep 2025 19:29:20 -0700 Subject: [PATCH 29/97] nzportable: fix dependencies adds xorg.libxcb to buildInputs --- pkgs/by-name/nz/nzportable/fteqw.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/nz/nzportable/fteqw.nix b/pkgs/by-name/nz/nzportable/fteqw.nix index be8173db02b2..89ba5709e9d4 100644 --- a/pkgs/by-name/nz/nzportable/fteqw.nix +++ b/pkgs/by-name/nz/nzportable/fteqw.nix @@ -61,6 +61,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ libGL + xorg.libxcb xorg.libX11 xorg.libXrandr xorg.libXcursor From 259195e21e303da9a990ffdedb9f158d6164fcc4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 23 Sep 2025 10:37:09 +0000 Subject: [PATCH 30/97] simdjson: 3.13.0 -> 4.0.6 --- pkgs/by-name/si/simdjson/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/si/simdjson/package.nix b/pkgs/by-name/si/simdjson/package.nix index 29c1859ce63e..e1b62c5ae255 100644 --- a/pkgs/by-name/si/simdjson/package.nix +++ b/pkgs/by-name/si/simdjson/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "simdjson"; - version = "3.13.0"; + version = "4.0.6"; src = fetchFromGitHub { owner = "simdjson"; repo = "simdjson"; rev = "v${version}"; - sha256 = "sha256-Vzw1FpFjg3Tun1Sfk7H4h4tY7lfnjE1Wk+W82K7dcW0="; + sha256 = "sha256-e3W5p4MUv0sE7JazWFJ3mCqo2D/A3jVHhNedSOURMv8="; }; nativeBuildInputs = [ cmake ]; From b7acca95c28238f2a784f1ec5aec200e04f50c3a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 23 Sep 2025 17:32:39 +0000 Subject: [PATCH 31/97] slumber: 3.4.0 -> 4.0.1 --- pkgs/by-name/sl/slumber/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sl/slumber/package.nix b/pkgs/by-name/sl/slumber/package.nix index 92eca43bc0e1..ccd231a3a3c3 100644 --- a/pkgs/by-name/sl/slumber/package.nix +++ b/pkgs/by-name/sl/slumber/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "slumber"; - version = "3.4.0"; + version = "4.0.1"; src = fetchFromGitHub { owner = "LucasPickering"; repo = "slumber"; tag = "v${version}"; - hash = "sha256-RI5+SbVPtIEaudNV+S/HiKDATRy93CIQX/RvNJmBoos="; + hash = "sha256-Xr4jAQ3G5El9FU6qOJJARjkZmTZly8pb//ElQizOHSg="; }; - cargoHash = "sha256-i6ovc8aWgB9mABuSetdFNPKjOIRKFig2mbowY2djxWA="; + cargoHash = "sha256-Di3Kqwa63AWwZE1VOal+mqmYe/nzPFqis1MnawW9uZo="; meta = { description = "Terminal-based HTTP/REST client"; From 87f49aed8075e600a7e2b0cdbdd10b52d4608907 Mon Sep 17 00:00:00 2001 From: Defelo Date: Wed, 24 Sep 2025 04:46:01 +0000 Subject: [PATCH 32/97] smtp4dev: 3.10.1 -> 3.10.2 Diff: https://github.com/rnwood/smtp4dev/compare/3.10.1...3.10.2 --- pkgs/by-name/sm/smtp4dev/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sm/smtp4dev/package.nix b/pkgs/by-name/sm/smtp4dev/package.nix index b36cf4518a5b..d2e6ebe89ba0 100644 --- a/pkgs/by-name/sm/smtp4dev/package.nix +++ b/pkgs/by-name/sm/smtp4dev/package.nix @@ -11,13 +11,13 @@ buildDotnetModule (finalAttrs: { pname = "smtp4dev"; - version = "3.10.1"; + version = "3.10.2"; src = fetchFromGitHub { owner = "rnwood"; repo = "smtp4dev"; tag = finalAttrs.version; - hash = "sha256-bhS2/YO7jejw6+qx6EdLH98SnxeqMWajSz8i7ocNVX8="; + hash = "sha256-0j5r5YO1wHg3N/OX81UE2YCqhqIaQuSGZa2uh2y+zqs="; }; patches = [ ./smtp4dev-npm-packages.patch ]; From fc63b9a0d4f4afb829a09792a0c1f2a2910359eb Mon Sep 17 00:00:00 2001 From: Bu Kun <65808665+pokon548@users.noreply.github.com> Date: Thu, 25 Sep 2025 13:30:49 +0800 Subject: [PATCH 33/97] wechat-uos: Fix download --- pkgs/by-name/we/wechat-uos/package.nix | 120 +++++++++++++++---------- pkgs/by-name/we/wechat-uos/sources.nix | 20 +++-- pkgs/by-name/we/wechat-uos/update.sh | 24 +++-- 3 files changed, 99 insertions(+), 65 deletions(-) diff --git a/pkgs/by-name/we/wechat-uos/package.nix b/pkgs/by-name/we/wechat-uos/package.nix index 4e40b4ade627..9b6f1f2a905c 100644 --- a/pkgs/by-name/we/wechat-uos/package.nix +++ b/pkgs/by-name/we/wechat-uos/package.nix @@ -45,6 +45,10 @@ libnotify, buildFHSEnv, writeShellScript, + runCommandLocal, + cacert, + coreutils, + curl, }: let wechat-uos-env = stdenvNoCC.mkDerivation { @@ -123,66 +127,84 @@ let bzip2 ]; - sources = import ./sources.nix; + wechat = + let + sources = import ./sources.nix; - wechat = stdenvNoCC.mkDerivation rec { - pname = "wechat-uos"; - version = sources.version; + pname = "wechat-uos"; + version = sources.version; + fetch = + { + url, + hash, + }: + runCommandLocal "wechat-uos-${version}-src" + { + outputHashAlgo = "sha256"; + outputHash = hash; - src = - { - x86_64-linux = fetchurl { - url = sources.amd64_url; - hash = sources.amd64_hash; - }; - aarch64-linux = fetchurl { - url = sources.arm64_url; - hash = sources.arm64_hash; - }; - loongarch64-linux = fetchurl { - url = sources.loongarch64_url; - hash = sources.loongarch64_hash; - }; - } - .${stdenv.system} or (throw "${pname}-${version}: ${stdenv.system} is unsupported."); + nativeBuildInputs = [ + curl + coreutils + ]; - nativeBuildInputs = [ dpkg ]; + impureEnvVars = lib.fetchers.proxyImpureEnvVars; + SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt"; + } + '' + curl -A "debian APT-HTTP/1.3 (1.6.11)" --retry 3 --retry-delay 3 -L "${url}" > $out + ''; - unpackPhase = '' - runHook preUnpack + srcs = { + x86_64-linux = fetch sources.amd64; + aarch64-linux = fetch sources.arm64; + loongarch64-linux = fetch sources.loongarch64; + }; - dpkg -x $src ./wechat-uos + src = + srcs.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); - runHook postUnpack - ''; + in + stdenvNoCC.mkDerivation { + inherit pname src version; - # Use ln for license to prevent being garbage collection - installPhase = '' - runHook preInstall - mkdir -p $out + nativeBuildInputs = [ dpkg ]; - cp -r wechat-uos/* $out + unpackPhase = '' + runHook preUnpack - runHook postInstall - ''; + dpkg -x $src ./wechat-uos - meta = with lib; { - description = "Messaging app"; - homepage = "https://weixin.qq.com/"; - license = licenses.unfree; - platforms = [ - "x86_64-linux" - "aarch64-linux" - "loongarch64-linux" - ]; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - maintainers = with maintainers; [ - pokon548 - xddxdd - ]; - mainProgram = "wechat-uos"; + runHook postUnpack + ''; + + # Use ln for license to prevent being garbage collection + installPhase = '' + runHook preInstall + mkdir -p $out + + cp -r wechat-uos/* $out + + runHook postInstall + ''; + + meta = with lib; { + description = "Messaging app"; + homepage = "https://weixin.qq.com/"; + license = licenses.unfree; + platforms = [ + "x86_64-linux" + "aarch64-linux" + "loongarch64-linux" + ]; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + maintainers = with maintainers; [ + pokon548 + xddxdd + ]; + mainProgram = "wechat-uos"; + }; }; - }; in buildFHSEnv { inherit (wechat) pname version meta; diff --git a/pkgs/by-name/we/wechat-uos/sources.nix b/pkgs/by-name/we/wechat-uos/sources.nix index 4d3a19695a29..20506a002dbe 100644 --- a/pkgs/by-name/we/wechat-uos/sources.nix +++ b/pkgs/by-name/we/wechat-uos/sources.nix @@ -1,11 +1,17 @@ # Generated by ./update.sh - do not update manually! -# Last updated: 2025-02-21 +# Last updated: 2025-09-25 { version = "4.0.1.12"; - amd64_url = "https://pro-store-packages.uniontech.com/appstore/pool/appstore/c/com.tencent.wechat/com.tencent.wechat_4.0.1.12_amd64.deb"; - arm64_url = "https://pro-store-packages.uniontech.com/appstore/pool/appstore/c/com.tencent.wechat/com.tencent.wechat_4.0.1.12_arm64.deb"; - loongarch64_url = "https://pro-store-packages.uniontech.com/appstore/pool/appstore/c/com.tencent.wechat/com.tencent.wechat_4.0.1.12_loongarch64.deb"; - amd64_hash = "sha256-u0NbuB06my+v8yUxQ9CKSHp4nxHAcMEhVzbAozM9nQU="; - arm64_hash = "sha256-GZnIMikYS+TGvTrEl+PT7KyjmXOXXOc0PMxp3Xfpqo8="; - loongarch64_hash = "sha256-dON2EW1+2aiiCTuBdc+IwRAmC/x2bEcQcZcar7WOfZo="; + amd64 = { + url = "https://pro-store-packages.uniontech.com/appstore/pool/appstore/c/com.tencent.wechat/com.tencent.wechat_4.0.1.12_amd64.deb"; + hash = "sha256-u0NbuB06my+v8yUxQ9CKSHp4nxHAcMEhVzbAozM9nQU="; + }; + arm64 = { + url = "https://pro-store-packages.uniontech.com/appstore/pool/appstore/c/com.tencent.wechat/com.tencent.wechat_4.0.1.12_arm64.deb"; + hash = "sha256-GZnIMikYS+TGvTrEl+PT7KyjmXOXXOc0PMxp3Xfpqo8="; + }; + loongarch64 = { + url = "https://pro-store-packages.uniontech.com/appstore/pool/appstore/c/com.tencent.wechat/com.tencent.wechat_4.0.1.12_loongarch64.deb"; + hash = "sha256-dON2EW1+2aiiCTuBdc+IwRAmC/x2bEcQcZcar7WOfZo="; + }; } diff --git a/pkgs/by-name/we/wechat-uos/update.sh b/pkgs/by-name/we/wechat-uos/update.sh index 61c85b671837..ecf2deafa75c 100644 --- a/pkgs/by-name/we/wechat-uos/update.sh +++ b/pkgs/by-name/we/wechat-uos/update.sh @@ -1,7 +1,7 @@ #! /usr/bin/env nix-shell #! nix-shell -i bash --pure --keep GITHUB_TOKEN -p nix git curl cacert nix-prefetch-git gzip -base_url_suffix="https://pro-store-packages.uniontech.com/appstore/dists/eagle/appstore/binary-" +base_url_suffix="https://pro-store-packages.uniontech.com/appstore/dists/eagle-pro/appstore/binary-" base_url_appendix="/Packages.gz" target_package="com.tencent.wechat" packages_file="Packages.gz" @@ -13,7 +13,7 @@ hash=() for i in amd64 arm64 loongarch64 do current_url=$base_url_suffix$i$base_url_appendix - curl -A "Mozilla/5.0 (X11; Linux x86_64; rv:125.0) Gecko/20100101 Firefox/125.0" -v -L -O $current_url + curl -A "debian APT-HTTP/1.3 (1.6.11)" -v -L -O $current_url current_version=$(zgrep -A 20 "Package: $target_package" "$packages_file" | awk -v pkg="$target_package" ' BEGIN { found = 0 } { @@ -39,8 +39,8 @@ do } } ') + hash+=("$(nix --extra-experimental-features nix-command hash convert --hash-algo sha256 --to sri $sha256sum)") url+=("https://pro-store-packages.uniontech.com/appstore/pool/appstore/c/com.tencent.wechat/com.tencent.wechat_"$version"_"$i".deb") - hash+=("$(nix --extra-experimental-features nix-command hash to-sri --type sha256 $sha256sum)") done cat >sources.nix <sources.nix < Date: Wed, 24 Sep 2025 13:21:19 +0200 Subject: [PATCH 34/97] visual-paradigm-ce: init at 17.3.20250906 --- .../by-name/vi/visual-paradigm-ce/package.nix | 83 +++++++++++++++++++ 1 file changed, 83 insertions(+) create mode 100644 pkgs/by-name/vi/visual-paradigm-ce/package.nix diff --git a/pkgs/by-name/vi/visual-paradigm-ce/package.nix b/pkgs/by-name/vi/visual-paradigm-ce/package.nix new file mode 100644 index 000000000000..2a6ac7bf101d --- /dev/null +++ b/pkgs/by-name/vi/visual-paradigm-ce/package.nix @@ -0,0 +1,83 @@ +{ + lib, + stdenv, + fetchurl, + copyDesktopItems, + makeDesktopItem, + openjdk, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "visual-paradigm-ce"; + version = "17.3.20250906"; + + src = + let + splitted = lib.versions.splitVersion finalAttrs.version; + majorMinor = builtins.concatStringsSep "." (lib.dropEnd 1 splitted); + suffix = lib.last splitted; + in + fetchurl { + url = "https://eu8.dl.visual-paradigm.com/visual-paradigm/vpce${majorMinor}/${suffix}/Visual_Paradigm_CE_${ + builtins.replaceStrings [ "." ] [ "_" ] majorMinor + }_${suffix}_Linux64_InstallFree.tar.gz"; + hash = "sha256-9BaAJKzK8jjQ1W+eSyJFI2NfizNCwY7PpSZoje2Zd38="; + }; + + nativeBuildInputs = [ + copyDesktopItems + ]; + + desktopItems = [ + (makeDesktopItem { + name = "visualparadigm"; + desktopName = "Visual Paradigm"; + exec = "Visual_Paradigm %f"; + icon = "vpuml"; + }) + (makeDesktopItem { + name = "visualparadigmproductselector"; + desktopName = "Visual Paradigm Product Selector"; + exec = "Visual_Paradigm_Product_Selector"; + icon = "ProductSelector"; + }) + (makeDesktopItem { + name = "visualparadigmshapeeditor"; + desktopName = "Visual Paradigm Shape Editor"; + exec = "Visual_Paradigm_Shape_Editor"; + icon = "vpuml"; + }) + ]; + + installPhase = '' + runHook preInstall + + install -D Application/resources/vpuml.png $out/share/icons/hicolor/512x512/apps/vpuml.png + install -D Application/resources/ProductSelector.png $out/share/icons/hicolor/512x512/apps/ProductSelector.png + + mkdir -p $out/{bin,share/visual-paradigm-ce} + mv {Application,.install4j} $out/share/visual-paradigm-ce/ + + for bin in Visual_Paradigm Visual_Paradigm_Product_Selector Visual_Paradigm_Shape_Editor; do + substituteInPlace $out/share/visual-paradigm-ce/Application/bin/$bin \ + --replace-fail '# INSTALL4J_JAVA_HOME_OVERRIDE=' "INSTALL4J_JAVA_HOME_OVERRIDE=${openjdk}" \ + --replace-fail 'app_home=../../' "app_home=${placeholder "out"}/share/visual-paradigm-ce" + ln -s $out/share/visual-paradigm-ce/Application/bin/$bin $out/bin/ + done + + runHook postInstall + ''; + + meta = { + description = "All-in-one UML CASE tool for software development"; + homepage = "https://www.visual-paradigm.com/"; + license = lib.licenses.unfree; + maintainers = with lib.maintainers; [ drupol ]; + platforms = lib.platforms.linux; + sourceProvenance = with lib.sourceTypes; [ + binaryBytecode + binaryNativeCode + ]; + mainProgram = "Visual_Paradigm"; + }; +}) From 938adebc2b8203327d2641d1adcae1bb7546d917 Mon Sep 17 00:00:00 2001 From: Gliczy <129636582+Gliczy@users.noreply.github.com> Date: Thu, 25 Sep 2025 15:33:19 +0200 Subject: [PATCH 35/97] proton-ge-bin: GE-Proton10-16 -> GE-Proton10-17 --- pkgs/by-name/pr/proton-ge-bin/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pr/proton-ge-bin/package.nix b/pkgs/by-name/pr/proton-ge-bin/package.nix index cf14b1d3bd9a..a6deb791adb6 100644 --- a/pkgs/by-name/pr/proton-ge-bin/package.nix +++ b/pkgs/by-name/pr/proton-ge-bin/package.nix @@ -9,11 +9,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "proton-ge-bin"; - version = "GE-Proton10-16"; + version = "GE-Proton10-17"; src = fetchzip { url = "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/${finalAttrs.version}/${finalAttrs.version}.tar.gz"; - hash = "sha256-pwnYnO6JPoZS8w2kge98WQcTfclrx7U2vwxGc6uj9k4="; + hash = "sha256-GMwAAKuaBhDv1TvAuW9DVcXSYPRM87NP6NnJfk8O8ZU="; }; dontUnpack = true; From 31f095fa1a25c7f1ef27ebb95fdb15ae8288e847 Mon Sep 17 00:00:00 2001 From: Felix Singer Date: Thu, 25 Sep 2025 14:22:20 +0200 Subject: [PATCH 36/97] nixos/redmine: Set up runtime directory by using RuntimeDirectory option Instead of letting systemd tmpfiles set up the runtime directory, use the option `RuntimeDirectory` from the systemd service config since the configured path stays read-writable when ProtectSystem is set to `strict`. This is equal to adding the path to ReadWritePaths. Signed-off-by: Felix Singer --- nixos/modules/services/misc/redmine.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/redmine.nix b/nixos/modules/services/misc/redmine.nix index 5771c766d285..6f0269d402bd 100644 --- a/nixos/modules/services/misc/redmine.nix +++ b/nixos/modules/services/misc/redmine.nix @@ -357,7 +357,6 @@ in "d '${cfg.stateDir}/themes' 0750 ${cfg.user} ${cfg.group} - -" "d '${cfg.stateDir}/tmp' 0750 ${cfg.user} ${cfg.group} - -" - "d /run/redmine - - - - -" "d /run/redmine/public - - - - -" "L+ /run/redmine/config - - - - ${cfg.stateDir}/config" "L+ /run/redmine/files - - - - ${cfg.stateDir}/files" @@ -456,6 +455,8 @@ in TimeoutSec = "300"; WorkingDirectory = "${cfg.package}/share/redmine"; ExecStart = "${bundle} exec rails server -u webrick -e production -b ${toString cfg.address} -p ${toString cfg.port} -P '${cfg.stateDir}/redmine.pid'"; + RuntimeDirectory = "redmine"; + RuntimeDirectoryMode = "0750"; AmbientCapabilities = ""; CapabilityBoundingSet = ""; LockPersonality = true; From b19c6d9645616031671dbe9693a7757503fc41e1 Mon Sep 17 00:00:00 2001 From: Felix Singer Date: Thu, 25 Sep 2025 14:23:15 +0200 Subject: [PATCH 37/97] nixos/redmine: Set ProtectSystem to `strict` Make the whole file system read-only except the directories related to Redmine, like the state directory. The runtime directory is already excluded by configuring it with the option `RuntimeDirectory`. Signed-off-by: Felix Singer --- nixos/modules/services/misc/redmine.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/redmine.nix b/nixos/modules/services/misc/redmine.nix index 6f0269d402bd..30d0278f45e7 100644 --- a/nixos/modules/services/misc/redmine.nix +++ b/nixos/modules/services/misc/redmine.nix @@ -474,7 +474,10 @@ in ProtectKernelModules = true; ProtectKernelTunables = true; ProtectProc = "noaccess"; - ProtectSystem = "full"; + ProtectSystem = "strict"; + ReadWritePaths = [ + cfg.stateDir + ]; RemoveIPC = true; RestrictAddressFamilies = [ "AF_UNIX" From 2c06bb1950d996762d8e1c17f58d24bdf1df7707 Mon Sep 17 00:00:00 2001 From: ghpzin Date: Tue, 16 Sep 2025 15:36:43 +0300 Subject: [PATCH 38/97] yaml-cpp: fix build with gcc15 - add patch from merged upstream PR that adds `include `: https://www.github.com/jbeder/yaml-cpp/pull/1310 https://github.com/jbeder/yaml-cpp/commit/7b469b4220f96fb3d036cf68cd7bd30bd39e61d2 Fixes build failure with gcc15: ``` /build/source/src/emitterutils.cpp:221:11: error: 'uint16_t' was not declared in this scope 221 | std::pair EncodeUTF16SurrogatePair(int codePoint) { | ^~~~~~~~ /build/source/src/emitterutils.cpp:13:1: note: 'uint16_t' is defined in header ''; this is probably fixable by adding '#include ' 12 | #include "yaml-cpp/null.h" +++ |+#include 13 | #include "yaml-cpp/ostream_wrapper.h" ``` --- pkgs/by-name/ya/yaml-cpp/package.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/by-name/ya/yaml-cpp/package.nix b/pkgs/by-name/ya/yaml-cpp/package.nix index fcc02c77bd14..f5940d39333d 100644 --- a/pkgs/by-name/ya/yaml-cpp/package.nix +++ b/pkgs/by-name/ya/yaml-cpp/package.nix @@ -25,6 +25,13 @@ stdenv.mkDerivation rec { url = "https://github.com/jbeder/yaml-cpp/commit/c2680200486572baf8221ba052ef50b58ecd816e.patch"; hash = "sha256-1kXRa+xrAbLEhcJxNV1oGHPmayj1RNIe6dDWXZA3mUA="; }) + # Fix build with gcc15 + # https://github.com/jbeder/yaml-cpp/pull/1310 + (fetchpatch { + name = "yaml-cpp-add-include-cstdint-gcc15.patch"; + url = "https://github.com/jbeder/yaml-cpp/commit/7b469b4220f96fb3d036cf68cd7bd30bd39e61d2.patch"; + hash = "sha256-4Mua6cYD8UR+fJfFeu0fdYVFprsiuF89HvbaTByz9nI="; + }) ]; strictDeps = true; From f357d9f4532e00494dfac25f45bc4e522a4741fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 25 Sep 2025 12:23:40 -0700 Subject: [PATCH 39/97] onnxruntime: fix build with gcc15 --- pkgs/by-name/on/onnxruntime/package.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/on/onnxruntime/package.nix b/pkgs/by-name/on/onnxruntime/package.nix index 2964c8a1ac37..3f332b60e81a 100644 --- a/pkgs/by-name/on/onnxruntime/package.nix +++ b/pkgs/by-name/on/onnxruntime/package.nix @@ -3,6 +3,7 @@ stdenv, lib, fetchFromGitHub, + fetchpatch, abseil-cpp_202407, cmake, cpuinfo, @@ -83,7 +84,15 @@ effectiveStdenv.mkDerivation rec { pname = "onnxruntime"; inherit src version; - patches = lib.optionals cudaSupport [ + patches = [ + # https://github.com/microsoft/onnxruntime/pull/24583 + (fetchpatch { + name = "fix-compilation-with-gcc-15.patch"; + url = "https://github.com/microsoft/onnxruntime/commit/f7619dc93f592ddfc10f12f7145f9781299163a0.patch"; + hash = "sha256-jxfMB+/Zokcu5DSfZP7QV1E8mTrsLe/sMr+ZCX/Y3m0="; + }) + ] + ++ lib.optionals cudaSupport [ # We apply the referenced 1064.patch ourselves to our nix dependency. # FIND_PACKAGE_ARGS for CUDA was added in https://github.com/microsoft/onnxruntime/commit/87744e5 so it might be possible to delete this patch after upgrading to 1.17.0 ./nvcc-gsl.patch From b93160990df0078a8d5f8b546c9ff6b1a81d8af7 Mon Sep 17 00:00:00 2001 From: Felix Singer Date: Thu, 25 Sep 2025 21:43:25 +0200 Subject: [PATCH 40/97] nixosTests.redmine: Drop 3rdparty plugins and themes The tests are supposed to test Redmine and not if specific 3rdparty plugins and themes work. These can be tested too, but then they should be separated out and not be included in the main test. However, just remove them as these weren't updated since quite a while. Signed-off-by: Felix Singer --- nixos/tests/redmine.nix | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/nixos/tests/redmine.nix b/nixos/tests/redmine.nix index 1a002abfbfff..dd1af128b386 100644 --- a/nixos/tests/redmine.nix +++ b/nixos/tests/redmine.nix @@ -19,18 +19,6 @@ let enable = true; package = pkgs.redmine; database.type = type; - plugins = { - redmine_env_auth = pkgs.fetchurl { - url = "https://github.com/Intera/redmine_env_auth/archive/0.7.zip"; - sha256 = "1xb8lyarc7mpi86yflnlgyllh9hfwb9z304f19dx409gqpia99sc"; - }; - }; - themes = { - dkuk-redmine_alex_skin = pkgs.fetchurl { - url = "https://bitbucket.org/dkuk/redmine_alex_skin/get/1842ef675ef3.zip"; - sha256 = "0hrin9lzyi50k4w2bd2b30vrf1i4fi1c0gyas5801wn8i7kpm9yl"; - }; - }; }; }; From a336da9b6cac774a6e9aabb31d5e5339013e79eb Mon Sep 17 00:00:00 2001 From: ghpzin Date: Fri, 19 Sep 2025 08:48:35 +0300 Subject: [PATCH 41/97] libodfgen: fix build with gcc15 - add patch that adds `#include ` to `OdfGenerator.cxx`, based on upstream commit that is not included in tagged versions: https://sourceforge.net/p/libwpd/libodfgen/ci/4da0b148def5b40ee60d4cd79762c0f158d64cc7/ Fixes build failure with gcc15: ``` OdfGenerator.cxx:53:9: error: 'uint8_t' was not declared in this scope 53 | uint8_t first; | ^~~~~~~ OdfGenerator.cxx:45:1: note: 'uint8_t' is defined in header ''; this is probably fixable by adding '#include ' 44 | #include "GraphicFunctions.hxx" +++ |+#include 45 | #include "InternalHandler.hxx" OdfGenerator.cxx:57:17: error: 'first' was not declared in this scope 57 | first = 0; | ^~~~~ ``` --- .../libodfgen-add-include-cstdint-gcc15.patch | 12 ++++++++++++ pkgs/by-name/li/libodfgen/package.nix | 6 ++++++ 2 files changed, 18 insertions(+) create mode 100644 pkgs/by-name/li/libodfgen/libodfgen-add-include-cstdint-gcc15.patch diff --git a/pkgs/by-name/li/libodfgen/libodfgen-add-include-cstdint-gcc15.patch b/pkgs/by-name/li/libodfgen/libodfgen-add-include-cstdint-gcc15.patch new file mode 100644 index 000000000000..c8ca813e9948 --- /dev/null +++ b/pkgs/by-name/li/libodfgen/libodfgen-add-include-cstdint-gcc15.patch @@ -0,0 +1,12 @@ +diff --git a/src/OdfGenerator.cxx b/src/OdfGenerator.cxx +index adf176b0a4..79de4dd2b7 100644 +--- a/src/OdfGenerator.cxx ++++ b/src/OdfGenerator.cxx +@@ -33,6 +33,7 @@ + #include + + #include ++#include + #include + #include + #include diff --git a/pkgs/by-name/li/libodfgen/package.nix b/pkgs/by-name/li/libodfgen/package.nix index d48a97088281..efaf663c9322 100644 --- a/pkgs/by-name/li/libodfgen/package.nix +++ b/pkgs/by-name/li/libodfgen/package.nix @@ -20,6 +20,12 @@ stdenv.mkDerivation rec { sha256 = "sha256-Mj5JH5VsjKKrsSyZjjUGcJMKMjF7+WYrBhXdSzkiuDE="; }; + patches = [ + # Fix build with gcc15, based on: + # https://sourceforge.net/p/libwpd/libodfgen/ci/4da0b148def5b40ee60d4cd79762c0f158d64cc7/ + ./libodfgen-add-include-cstdint-gcc15.patch + ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ boost From b9e4b728c051800e803ebd2e1ab5cc660ae70ed0 Mon Sep 17 00:00:00 2001 From: Michael Daniels Date: Thu, 25 Sep 2025 22:33:46 -0400 Subject: [PATCH 42/97] zarf: fix shell completions on Darwin --- pkgs/by-name/za/zarf/package.nix | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/za/zarf/package.nix b/pkgs/by-name/za/zarf/package.nix index ce5773a6edc3..3bb48a577497 100644 --- a/pkgs/by-name/za/zarf/package.nix +++ b/pkgs/by-name/za/zarf/package.nix @@ -2,7 +2,9 @@ lib, buildGoModule, fetchFromGitHub, + iana-etc, installShellFiles, + libredirect, stdenv, }: @@ -20,7 +22,10 @@ buildGoModule rec { vendorHash = "sha256-As7xDEo+bMslv9Xd6CbHTqvf2XaXmO6Gp3f9+xD3kNU="; proxyVendor = true; - nativeBuildInputs = [ installShellFiles ]; + nativeBuildInputs = [ + installShellFiles + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libredirect.hook ]; preBuild = '' mkdir -p build/ui @@ -43,17 +48,17 @@ buildGoModule rec { "k8s.io/component-base/version.buildDate=1970-01-01T00:00:00Z" ]; - # Breaks with sandbox on Darwin because it wants to read /etc/protocols postInstall = lib.optionalString - ((stdenv.buildPlatform.canExecute stdenv.hostPlatform) && !stdenv.buildPlatform.isDarwin) - '' - export K9S_LOGS_DIR=$(mktemp -d) - installShellCompletion --cmd zarf \ - --bash <($out/bin/zarf completion bash) \ - --fish <($out/bin/zarf completion fish) \ - --zsh <($out/bin/zarf completion zsh) - ''; + (stdenv.buildPlatform.canExecute stdenv.hostPlatform && stdenv.hostPlatform.isDarwin) + "export NIX_REDIRECTS=/etc/protocols=${iana-etc}/etc/protocols:/etc/services=${iana-etc}/etc/services" + + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + export K9S_LOGS_DIR=$(mktemp -d) + installShellCompletion --cmd zarf \ + --bash <($out/bin/zarf completion bash) \ + --fish <($out/bin/zarf completion fish) \ + --zsh <($out/bin/zarf completion zsh) + ''; meta = with lib; { description = "DevSecOps for Air Gap & Limited-Connection Systems. https://zarf.dev"; From 0078902b95b785cee5a06f09a23021f525a62097 Mon Sep 17 00:00:00 2001 From: Jake Stanger Date: Fri, 26 Sep 2025 09:13:41 +0100 Subject: [PATCH 43/97] ironbar: fix keyboard module compilation Adds missing `libinput` and `libevdev` dependencies --- pkgs/by-name/ir/ironbar/package.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ir/ironbar/package.nix b/pkgs/by-name/ir/ironbar/package.nix index 0c577e8e39cc..2cfbdadceb93 100644 --- a/pkgs/by-name/ir/ironbar/package.nix +++ b/pkgs/by-name/ir/ironbar/package.nix @@ -22,6 +22,8 @@ luajit, luajitPackages, libpulseaudio, + libinput, + libevdev, features ? [ ], systemd, }: @@ -58,7 +60,11 @@ rustPlatform.buildRustPackage rec { ++ lib.optionals (hasFeature "http") [ openssl ] ++ lib.optionals (hasFeature "volume") [ libpulseaudio ] ++ lib.optionals (hasFeature "cairo") [ luajit ] - ++ lib.optionals (hasFeature "tray") [ libdbusmenu-gtk3 ]; + ++ lib.optionals (hasFeature "tray") [ libdbusmenu-gtk3 ] + ++ lib.optionals (hasFeature "keyboard") [ + libinput + libevdev + ]; nativeBuildInputs = [ pkg-config From 82f58b8c301eeb3757adeadf156776a1488bc82f Mon Sep 17 00:00:00 2001 From: Jake Stanger Date: Fri, 26 Sep 2025 09:21:26 +0100 Subject: [PATCH 44/97] fix formatting --- pkgs/by-name/ir/ironbar/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ir/ironbar/package.nix b/pkgs/by-name/ir/ironbar/package.nix index 2cfbdadceb93..1d13cc0acc98 100644 --- a/pkgs/by-name/ir/ironbar/package.nix +++ b/pkgs/by-name/ir/ironbar/package.nix @@ -62,8 +62,8 @@ rustPlatform.buildRustPackage rec { ++ lib.optionals (hasFeature "cairo") [ luajit ] ++ lib.optionals (hasFeature "tray") [ libdbusmenu-gtk3 ] ++ lib.optionals (hasFeature "keyboard") [ - libinput - libevdev + libinput + libevdev ]; nativeBuildInputs = [ From b7ec5f70eacaa381500c3ca6b4c30ceba9c58366 Mon Sep 17 00:00:00 2001 From: Jost Alemann Date: Fri, 26 Sep 2025 18:04:58 +0200 Subject: [PATCH 45/97] ethersync: 0.7.0 -> 0.8.0 Changelog: https://github.com/ethersync/ethersync/releases/tag/v0.8.0 Diff: https://github.com/ethersync/ethersync/compare/v0.7.0...v0.8.0 --- pkgs/by-name/et/ethersync/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/et/ethersync/package.nix b/pkgs/by-name/et/ethersync/package.nix index 26659ce92301..d33aac2b7f3a 100644 --- a/pkgs/by-name/et/ethersync/package.nix +++ b/pkgs/by-name/et/ethersync/package.nix @@ -8,18 +8,18 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "ethersync"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "ethersync"; repo = "ethersync"; tag = "v${finalAttrs.version}"; - hash = "sha256-Swh8C8FMjPdIFpHOsNb3W9W7JAZGzPXHXTwwnr1gFok="; + hash = "sha256-GPZD/TshZMr+WeCd4WRN/Ewu7zINSzPNPci52bjsV3E="; }; sourceRoot = "${finalAttrs.src.name}/daemon"; - cargoHash = "sha256-ZgbxaEtsaBQLl9PJbo1O2wA3OxEfPKRl3KkFvR4c97Q="; + cargoHash = "sha256-F2wVRha63TOdMCWW3KNaQ8kbYjuYbdY5yKmTHOJqODA="; nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgramArg = "--version"; From a71bf6cd30a71eff0ac4301b60ead3cc415ecee9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 17 Sep 2025 00:53:39 +0200 Subject: [PATCH 46/97] treewide: remove bower --- doc/languages-frameworks/bower.section.md | 147 ------------------ doc/languages-frameworks/index.md | 1 - doc/redirects.json | 38 ++--- doc/release-notes/rl-2511.section.md | 2 + pkgs/build-support/fetchbower/default.nix | 41 ----- pkgs/by-name/bo/bower2nix/package.nix | 44 ------ .../bower-modules/generic/default.nix | 51 ------ pkgs/development/node-packages/aliases.nix | 1 + .../node-packages/node-packages.json | 1 - .../node-packages/node-packages.nix | 18 --- pkgs/top-level/aliases.nix | 3 + pkgs/top-level/all-packages.nix | 8 - 12 files changed, 16 insertions(+), 339 deletions(-) delete mode 100644 doc/languages-frameworks/bower.section.md delete mode 100644 pkgs/build-support/fetchbower/default.nix delete mode 100644 pkgs/by-name/bo/bower2nix/package.nix delete mode 100644 pkgs/development/bower-modules/generic/default.nix diff --git a/doc/languages-frameworks/bower.section.md b/doc/languages-frameworks/bower.section.md deleted file mode 100644 index 45728044e769..000000000000 --- a/doc/languages-frameworks/bower.section.md +++ /dev/null @@ -1,147 +0,0 @@ -# Bower {#sec-bower} - -[Bower](https://bower.io) is a package manager for web site front-end components. Bower packages (comprising of build artifacts and sometimes sources) are stored in `git` repositories, typically on Github. The package registry is run by the Bower team with package metadata coming from the `bower.json` file within each package. - -The end result of running Bower is a `bower_components` directory which can be included in the web app's build process. - -Bower can be run interactively, by installing `nodePackages.bower`. More interestingly, the Bower components can be declared in a Nix derivation, with the help of `bower2nix`. - -## bower2nix usage {#ssec-bower2nix-usage} - -Suppose you have a `bower.json` with the following contents: - -### Example bower.json {#ex-bowerJson} - -```json - "name": "my-web-app", - "dependencies": { - "angular": "~1.5.0", - "bootstrap": "~3.3.6" - } -``` - -Running `bower2nix` will produce something like the following output: - -```nix -{ fetchbower, buildEnv }: -buildEnv { - name = "bower-env"; - ignoreCollisions = true; - paths = [ - (fetchbower "angular" "1.5.3" "~1.5.0" "1749xb0firxdra4rzadm4q9x90v6pzkbd7xmcyjk6qfza09ykk9y") - (fetchbower "bootstrap" "3.3.6" "~3.3.6" "1vvqlpbfcy0k5pncfjaiskj3y6scwifxygfqnw393sjfxiviwmbv") - (fetchbower "jquery" "2.2.2" "1.9.1 - 2" "10sp5h98sqwk90y4k6hbdviwqzvzwqf47r3r51pakch5ii2y7js1") - ]; -} -``` - -Using the `bower2nix` command line arguments, the output can be redirected to a file. A name like `bower-packages.nix` would be fine. - -The resulting derivation is a union of all the downloaded Bower packages (and their dependencies). To use it, they still need to be linked together by Bower, which is where `buildBowerComponents` is useful. - -## buildBowerComponents function {#ssec-build-bower-components} - -The function is implemented in [pkgs/development/bower-modules/generic/default.nix](https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/bower-modules/generic/default.nix). - -### Example buildBowerComponents {#ex-buildBowerComponents} - -```nix -{ - bowerComponents = buildBowerComponents { - name = "my-web-app"; - generated = ./bower-packages.nix; # note 1 - src = myWebApp; # note 2 - }; -} -``` - -In ["buildBowerComponents" example](#ex-buildBowerComponents) the following arguments are of special significance to the function: - -1. `generated` specifies the file which was created by {command}`bower2nix`. -2. `src` is your project's sources. It needs to contain a {file}`bower.json` file. - -`buildBowerComponents` will run Bower to link together the output of `bower2nix`, resulting in a `bower_components` directory which can be used. - -Here is an example of a web frontend build process using `gulp`. You might use `grunt`, or anything else. - -### Example build script (gulpfile.js) {#ex-bowerGulpFile} - -```javascript -var gulp = require('gulp'); - -gulp.task('default', [], function () { - gulp.start('build'); -}); - -gulp.task('build', [], function () { - console.log("Just a dummy gulp build"); - gulp - .src(["./bower_components/**/*"]) - .pipe(gulp.dest("./gulpdist/")); -}); -``` - -### Example Full example — default.nix {#ex-buildBowerComponentsDefaultNix} - -```nix -{ - myWebApp ? { - outPath = ./.; - name = "myWebApp"; - }, - pkgs ? import { }, -}: - -pkgs.stdenv.mkDerivation { - name = "my-web-app-frontend"; - src = myWebApp; - - buildInputs = [ pkgs.nodePackages.gulp ]; - - bowerComponents = pkgs.buildBowerComponents { - # note 1 - name = "my-web-app"; - generated = ./bower-packages.nix; - src = myWebApp; - }; - - nativeBuildInputs = [ - writableTmpDirAsHomeHook # note 3 - ]; - - buildPhase = '' - runHook preBuild - - cp --reflink=auto --no-preserve=mode -R $bowerComponents/bower_components . # note 2 - ${pkgs.nodePackages.gulp}/bin/gulp build # note 4 - - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - - mv gulpdist $out - - runHook postInstall - ''; -} -``` - -A few notes about [Full example — `default.nix`](#ex-buildBowerComponentsDefaultNix): - -1. The result of `buildBowerComponents` is an input to the frontend build. -2. Whether to symlink or copy the {file}`bower_components` directory depends on the build tool in use. - In this case, a copy is used to avoid {command}`gulp` silliness with permissions. -3. {command}`gulp` requires `HOME` to refer to a writeable directory. -4. The actual build command in this example is {command}`gulp`. Other tools could be used instead. - -## Troubleshooting {#ssec-bower2nix-troubleshooting} - -### ENOCACHE errors from buildBowerComponents {#enocache-errors-from-buildbowercomponents} - -This means that Bower was looking for a package version which doesn't exist in the generated `bower-packages.nix`. - -If `bower.json` has been updated, then run `bower2nix` again. - -It could also be a bug in `bower2nix` or `fetchbower`. If possible, try reformulating the version specification in `bower.json`. diff --git a/doc/languages-frameworks/index.md b/doc/languages-frameworks/index.md index 2624b9afc5e4..71269aa6c030 100644 --- a/doc/languages-frameworks/index.md +++ b/doc/languages-frameworks/index.md @@ -55,7 +55,6 @@ agda.section.md android.section.md astal.section.md beam.section.md -bower.section.md chicken.section.md coq.section.md cosmic.section.md diff --git a/doc/redirects.json b/doc/redirects.json index 0442248c3e3e..8df4e6087be4 100644 --- a/doc/redirects.json +++ b/doc/redirects.json @@ -253,7 +253,16 @@ "release-notes.html#sec-nixpkgs-release-25.11-highlights" ], "sec-nixpkgs-release-25.11-incompatibilities": [ - "release-notes.html#sec-nixpkgs-release-25.11-incompatibilities" + "release-notes.html#sec-nixpkgs-release-25.11-incompatibilities", + "index.html#enocache-errors-from-buildbowercomponents", + "index.html#ex-bowerGulpFile", + "index.html#ex-bowerJson", + "index.html#ex-buildBowerComponents", + "index.html#ex-buildBowerComponentsDefaultNix", + "index.html#sec-bower", + "index.html#ssec-bower2nix-troubleshooting", + "index.html#ssec-bower2nix-usage", + "index.html#ssec-build-bower-components" ], "sec-nixpkgs-release-25.11-lib": [ "release-notes.html#sec-nixpkgs-release-25.11-lib" @@ -2786,33 +2795,6 @@ "elixir---phoenix-project": [ "index.html#elixir---phoenix-project" ], - "sec-bower": [ - "index.html#sec-bower" - ], - "ssec-bower2nix-usage": [ - "index.html#ssec-bower2nix-usage" - ], - "ex-bowerJson": [ - "index.html#ex-bowerJson" - ], - "ssec-build-bower-components": [ - "index.html#ssec-build-bower-components" - ], - "ex-buildBowerComponents": [ - "index.html#ex-buildBowerComponents" - ], - "ex-bowerGulpFile": [ - "index.html#ex-bowerGulpFile" - ], - "ex-buildBowerComponentsDefaultNix": [ - "index.html#ex-buildBowerComponentsDefaultNix" - ], - "ssec-bower2nix-troubleshooting": [ - "index.html#ssec-bower2nix-troubleshooting" - ], - "enocache-errors-from-buildbowercomponents": [ - "index.html#enocache-errors-from-buildbowercomponents" - ], "sec-chicken": [ "index.html#sec-chicken" ], diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md index a98d2f468196..fe5bd44f1f8b 100644 --- a/doc/release-notes/rl-2511.section.md +++ b/doc/release-notes/rl-2511.section.md @@ -20,6 +20,8 @@ - `mono4` and `mono5` have been removed. Use `mono6` or `mono` instead. +- Everything related to `bower` was removed, as it is deprecated and not used by anything in nixpkgs. + - The `offrss` package was removed due to lack of upstream maintenance since 2012. It's recommended for users to migrate to another RSS reader - `installShellFiles`: Allow installManPage to take a piped input, add the `--name` flag for renaming the file when installed. Can also append `--` to opt-out of all subsequent parsing. diff --git a/pkgs/build-support/fetchbower/default.nix b/pkgs/build-support/fetchbower/default.nix deleted file mode 100644 index 258a09189d99..000000000000 --- a/pkgs/build-support/fetchbower/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ - stdenvNoCC, - lib, - bower2nix, - cacert, -}: -let - bowerVersion = - version: - let - components = lib.splitString "#" version; - hash = lib.last components; - ver = if builtins.length components == 1 then (cleanName version) else hash; - in - ver; - - cleanName = name: lib.replaceStrings [ "/" ":" ] [ "-" "-" ] name; - - fetchbower = - name: version: target: outputHash: - stdenvNoCC.mkDerivation { - name = "${cleanName name}-${bowerVersion version}"; - buildCommand = '' - fetch-bower --quiet --out=$PWD/out "${name}" "${target}" "${version}" - # In some cases, the result of fetchBower is different depending - # on the output directory (e.g. if the bower package contains - # symlinks). So use a local output directory before copying to - # $out. - cp -R out $out - ''; - outputHashMode = "recursive"; - outputHashAlgo = "sha256"; - inherit outputHash; - nativeBuildInputs = [ - bower2nix - cacert - ]; - }; - -in -fetchbower diff --git a/pkgs/by-name/bo/bower2nix/package.nix b/pkgs/by-name/bo/bower2nix/package.nix deleted file mode 100644 index c0db35461b57..000000000000 --- a/pkgs/by-name/bo/bower2nix/package.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ - buildNpmPackage, - fetchFromGitHub, - git, - lib, - nix, - unstableGitUpdater, -}: - -buildNpmPackage rec { - pname = "bower2nix"; - version = "3.2.0-unstable-2024-06-25"; - - src = fetchFromGitHub { - owner = "rvl"; - repo = "bower2nix"; - rev = "b5da44f055c7561ed7a46226b3be0070e07d80e6"; - hash = "sha256-da+m2UWQ83tW1o0P1qvw35KpsXL/BDTeShg4KxL+7Ck="; - }; - - npmDepsHash = "sha256-TK1sqF2J/hQuP3bgGA4MolLA7LWWuYNnqf4gDyU154k="; - - npmBuildScript = "prepare"; - - makeWrapperArgs = [ - "--prefix PATH : ${ - lib.makeBinPath [ - git - nix - ] - }" - ]; - - passthru.updateScript = unstableGitUpdater { tagPrefix = "v"; }; - - meta = { - changelog = "https://github.com/rvl/bower2nix/releases/tag/v${version}"; - description = "Generate nix expressions to fetch bower dependencies"; - homepage = "https://github.com/rvl/bower2nix"; - license = lib.licenses.gpl3Only; - mainProgram = "bower2nix"; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/bower-modules/generic/default.nix b/pkgs/development/bower-modules/generic/default.nix deleted file mode 100644 index 65d3dd4d6e39..000000000000 --- a/pkgs/development/bower-modules/generic/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ pkgs }: - -{ - buildInputs ? [ ], - generated, - ... -}@attrs: - -let - # Fetches the bower packages. `generated` should be the result of a - # `bower2nix` command. - bowerPackages = import generated { - inherit (pkgs) buildEnv fetchbower; - }; - -in -pkgs.stdenv.mkDerivation ( - attrs - // { - name = "bower_components-" + attrs.name; - - inherit bowerPackages; - - builder = builtins.toFile "builder.sh" '' - # The project's bower.json is required - cp $src/bower.json . - - # Dereference symlinks -- bower doesn't like them - cp --recursive --reflink=auto \ - --dereference --no-preserve=mode \ - $bowerPackages bc - - # Bower install in offline mode -- links together the fetched - # bower packages. - HOME=$PWD bower \ - --config.storage.packages=bc/packages \ - --config.storage.registry=bc/registry \ - --offline install - - # Sets up a single bower_components directory within - # the output derivation. - mkdir -p $out - mv bower_components $out - ''; - - buildInputs = buildInputs ++ [ - pkgs.git - pkgs.nodePackages.bower - ]; - } -) diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index 523735e7c897..d53f97ed814b 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -63,6 +63,7 @@ mapAliases { inherit (pkgs) bash-language-server; # added 2024-06-07 bibtex-tidy = pkgs.bibtex-tidy; # added 2023-07-30 bitwarden-cli = pkgs.bitwarden-cli; # added 2023-07-25 + bower = throw "bower was removed because it was deprecated"; # added 2025-09-17 inherit (pkgs) bower2nix; # added 2024-08-23 inherit (pkgs) btc-rpc-explorer; # added 2023-08-17 inherit (pkgs) carbon-now-cli; # added 2023-08-17 diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 9ace13598dd7..1f473a018c11 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -18,7 +18,6 @@ , "audiosprite" , "aws-cdk" , "awesome-lint" -, "bower" , "browserify" , "browser-sync" , "cdk8s-cli" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index fdb5911a3af1..af270592afa0 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -46557,24 +46557,6 @@ in bypassCache = true; reconstructLock = true; }; - bower = nodeEnv.buildNodePackage { - name = "bower"; - packageName = "bower"; - version = "1.8.14"; - src = fetchurl { - url = "https://registry.npmjs.org/bower/-/bower-1.8.14.tgz"; - sha512 = "8Rq058FD91q9Nwthyhw0la9fzpBz0iwZTrt51LWl+w+PnJgZk9J+5wp3nibsJcIUPglMYXr4NRBaR+TUj0OkBQ=="; - }; - buildInputs = globalBuildInputs; - meta = { - description = "The browser package manager"; - homepage = "http://bower.io"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; browserify = nodeEnv.buildNodePackage { name = "browserify"; packageName = "browserify"; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 0e418fd89155..361163395042 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -538,6 +538,7 @@ mapAliases { boost184 = throw "Boost 1.84 has been removed as it is obsolete and no longer used by anything in Nixpkgs"; # Added 2024-11-24 boost185 = throw "Boost 1.85 has been removed as it is obsolete and no longer used by anything in Nixpkgs"; # Added 2024-11-24 boost_process = throw "boost_process has been removed as it is included in regular boost"; # Added 2024-05-01 + bower2nix = throw "bower2nix has been removed as bower was removed. It is recommended to migrate to yarn."; # Added 2025-09-17 bpb = throw "bpb has been removed as it is unmaintained and not compatible with recent Rust versions"; # Added 2024-04-30 bpftool = throw "'bpftool' has been renamed to/replaced by 'bpftools'"; # Converted to throw 2024-10-17 brasero-original = lib.warnOnInstantiate "Use 'brasero-unwrapped' instead of 'brasero-original'" brasero-unwrapped; # Added 2024-09-29 @@ -549,6 +550,7 @@ mapAliases { budgie = throw "The `budgie` scope has been removed and all packages moved to the top-level"; # Added 2024-07-14 budgiePlugins = throw "The `budgiePlugins` scope has been removed and all packages moved to the top-level"; # Added 2024-07-14 buildBarebox = throw "buildBarebox has been removed due to lack of interest in maintaining it in nixpkgs"; # Added 2025-04-19 + buildBowerComponents = throw "buildBowerComponents has been removed as bower was removed. It is recommended to migrate to yarn."; # Added 2025-09-17 buildGo122Module = throw "Go 1.22 is end-of-life, and 'buildGo122Module' has been removed. Please use a newer builder version."; # Added 2025-03-28 buildGo123Module = throw "Go 1.23 is end-of-life, and 'buildGo123Module' has been removed. Please use a newer builder version."; # Added 2025-08-13 buildGoPackage = throw "`buildGoPackage` has been deprecated and removed, see the Go section in the nixpkgs manual for details"; # Added 2024-11-18 @@ -886,6 +888,7 @@ mapAliases { fdr = throw "fdr has been removed, as it cannot be built from source and depends on Python 2.x"; # Added 2025-03-19 inherit (luaPackages) fennel; # Added 2022-09-24 ferdi = throw "'ferdi' has been removed, upstream does not exist anymore and the package is insecure"; # Added 2024-08-22 + fetchbower = throw "fetchbower has been removed as bower was removed. It is recommended to migrate to yarn."; # Added 2025-09-17 fetchFromGithub = throw "You meant fetchFromGitHub, with a capital H"; # preserve, reason: common typo ffmpeg_5 = throw "ffmpeg_5 has been removed, please use another version"; # Added 2024-07-12 ffmpeg_5-headless = throw "ffmpeg_5-headless has been removed, please use another version"; # Added 2024-07-12 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f2148de80af5..092a7ecec07a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -466,8 +466,6 @@ with pkgs; python3Packages = python311Packages; }; - fetchbower = callPackage ../build-support/fetchbower { }; - fetchbzr = callPackage ../build-support/fetchbzr { }; fetchcvs = @@ -9269,12 +9267,6 @@ with pkgs; saxon_12-he ; - ### DEVELOPMENT / LIBRARIES / JAVASCRIPT - - ### DEVELOPMENT / BOWER MODULES (JAVASCRIPT) - - buildBowerComponents = callPackage ../development/bower-modules/generic { }; - ### DEVELOPMENT / GO # the unversioned attributes should always point to the same go version From cf8f4b1938ea096751953b35306bcacfe3cb51f0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 26 Sep 2025 22:47:13 +0000 Subject: [PATCH 47/97] sc-controller: 0.5.2 -> 0.5.3 --- pkgs/by-name/sc/sc-controller/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sc/sc-controller/package.nix b/pkgs/by-name/sc/sc-controller/package.nix index b46df67c167b..66d6c38984f8 100644 --- a/pkgs/by-name/sc/sc-controller/package.nix +++ b/pkgs/by-name/sc/sc-controller/package.nix @@ -20,14 +20,14 @@ python3Packages.buildPythonApplication rec { pname = "sc-controller"; - version = "0.5.2"; + version = "0.5.3"; format = "setuptools"; src = fetchFromGitHub { owner = "C0rn3j"; repo = "sc-controller"; tag = "v${version}"; - hash = "sha256-w7jVh0d8u6csXOQ6pjUCSD3R/qFVqTa2gcGa47pqn/0="; + hash = "sha256-iieSKUTZwb1cInh/hz2cDvUFHf3p9Y5E4kR+YyZoNxI="; }; nativeBuildInputs = [ From 2825dc337d38fc64ff16864af6be38d8a4219c88 Mon Sep 17 00:00:00 2001 From: hexchen Date: Sat, 27 Sep 2025 01:23:10 +0200 Subject: [PATCH 48/97] qdmr: fix darwin build --- pkgs/by-name/qd/qdmr/package.nix | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/qd/qdmr/package.nix b/pkgs/by-name/qd/qdmr/package.nix index 9e5ac1f5ab56..0875c3b3e14c 100644 --- a/pkgs/by-name/qd/qdmr/package.nix +++ b/pkgs/by-name/qd/qdmr/package.nix @@ -42,18 +42,27 @@ stdenv.mkDerivation rec { yaml-cpp ]; - postPatch = lib.optionalString isLinux '' - substituteInPlace doc/docbook_man.debian.xsl \ - --replace /usr/share/xml/docbook/stylesheet/docbook-xsl/manpages/docbook\.xsl ${docbook_xsl_ns}/xml/xsl/docbook/manpages/docbook.xsl - ''; + postPatch = + let + file = "doc/docbook_man.${if isLinux then "debian" else "macports"}.xsl"; + path = + if isLinux then + "/usr/share/xml/docbook/stylesheet/docbook-xsl" + else + "/opt/local/share/xsl/docbook-xsl-nons"; + in + '' + substituteInPlace ${file} \ + --replace ${path}/manpages/docbook\.xsl ${docbook_xsl_ns}/xml/xsl/docbook/manpages/docbook.xsl + ''; cmakeFlags = [ "-DBUILD_MAN=ON" + "-DCMAKE_INSTALL_FULL_MANDIR=share/man" "-DINSTALL_UDEV_RULES=OFF" ]; - postInstall = '' - installManPage doc/dmrconf.1 doc/qdmr.1 + postInstall = lib.optionalString isLinux '' mkdir -p "$out/etc/udev/rules.d" cp ${src}/dist/99-qdmr.rules $out/etc/udev/rules.d/ ''; @@ -65,6 +74,6 @@ stdenv.mkDerivation rec { homepage = "https://dm3mat.darc.de/qdmr/"; license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ _0x4A6F ]; - platforms = lib.platforms.linux; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } From 5b33bf3bd83d5a110e0132ec7878344dd3e61c88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=A9clairevoyant?= <848000+eclairevoyant@users.noreply.github.com> Date: Fri, 26 Sep 2025 01:45:51 -0400 Subject: [PATCH 49/97] veloren: cleanup --- pkgs/by-name/ve/veloren/package.nix | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/ve/veloren/package.nix b/pkgs/by-name/ve/veloren/package.nix index cd68a5dc95cc..4b7044b74948 100644 --- a/pkgs/by-name/ve/veloren/package.nix +++ b/pkgs/by-name/ve/veloren/package.nix @@ -7,8 +7,12 @@ alsa-lib, udev, shaderc, - xorg, + libxcb, libxkbcommon, + libX11, + libXi, + libXcursor, + libXrandr, }: let @@ -51,7 +55,7 @@ rustPlatform.buildRustPackage { buildInputs = [ alsa-lib udev - xorg.libxcb + libxcb libxkbcommon ]; @@ -81,10 +85,10 @@ rustPlatform.buildRustPackage { # Add required but not explicitly requested libraries patchelf --add-rpath '${ lib.makeLibraryPath [ - xorg.libX11 - xorg.libXi - xorg.libXcursor - xorg.libXrandr + libX11 + libXi + libXcursor + libXrandr vulkan-loader ] }' "$out/bin/veloren-voxygen" @@ -99,13 +103,13 @@ rustPlatform.buildRustPackage { mkdir -p "$out/share/veloren"; cp -ar assets "$out/share/veloren/" ''; - meta = with lib; { + meta = { description = "Open world, open source voxel RPG"; homepage = "https://www.veloren.net"; - license = licenses.gpl3; + license = lib.licenses.gpl3Only; mainProgram = "veloren-voxygen"; - platforms = platforms.linux; - maintainers = with maintainers; [ + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ rnhmjoj tomodachi94 ]; From 34f9310ce5c89082137c316d891fa06752b2ccf2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=A9clairevoyant?= <848000+eclairevoyant@users.noreply.github.com> Date: Fri, 26 Sep 2025 01:47:00 -0400 Subject: [PATCH 50/97] veloren: use autoPatchelfHook --- pkgs/by-name/ve/veloren/package.nix | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/ve/veloren/package.nix b/pkgs/by-name/ve/veloren/package.nix index 4b7044b74948..33dfbb07240f 100644 --- a/pkgs/by-name/ve/veloren/package.nix +++ b/pkgs/by-name/ve/veloren/package.nix @@ -9,10 +9,12 @@ shaderc, libxcb, libxkbcommon, + autoPatchelfHook, libX11, libXi, libXcursor, libXrandr, + stdenv, }: let @@ -51,12 +53,18 @@ rustPlatform.buildRustPackage { EOF ''; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ + autoPatchelfHook + pkg-config + ]; + buildInputs = [ alsa-lib udev libxcb libxkbcommon + shaderc + stdenv.cc.cc # libgcc_s.so.1 ]; buildNoDefaultFeatures = true; @@ -81,18 +89,17 @@ rustPlatform.buildRustPackage { # Some tests require internet access doCheck = false; - postFixup = '' - # Add required but not explicitly requested libraries - patchelf --add-rpath '${ - lib.makeLibraryPath [ + appendRunpaths = [ + (lib.makeLibraryPath + [ libX11 libXi libXcursor libXrandr vulkan-loader ] - }' "$out/bin/veloren-voxygen" - ''; + ) + ]; postInstall = '' # Icons From 0b34dae479caf7f988f0770662cfd8d05e99b1f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=A9clairevoyant?= <848000+eclairevoyant@users.noreply.github.com> Date: Fri, 26 Sep 2025 01:51:38 -0400 Subject: [PATCH 51/97] veloren: add wayland dependency --- pkgs/by-name/ve/veloren/package.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ve/veloren/package.nix b/pkgs/by-name/ve/veloren/package.nix index 33dfbb07240f..074f0d772e97 100644 --- a/pkgs/by-name/ve/veloren/package.nix +++ b/pkgs/by-name/ve/veloren/package.nix @@ -14,6 +14,7 @@ libXi, libXcursor, libXrandr, + wayland, stdenv, }: @@ -90,7 +91,7 @@ rustPlatform.buildRustPackage { doCheck = false; appendRunpaths = [ - (lib.makeLibraryPath + (lib.makeLibraryPath ( [ libX11 libXi @@ -98,7 +99,10 @@ rustPlatform.buildRustPackage { libXrandr vulkan-loader ] - ) + ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform wayland) [ + wayland + ] + )) ]; postInstall = '' From 3f0a1aac689b578884fdec32c2aafe6b2b4d7e1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 27 Sep 2025 04:44:16 +0200 Subject: [PATCH 52/97] element-desktop: fix taskbar icon on KDE Plasma --- pkgs/by-name/el/element-desktop/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/el/element-desktop/package.nix b/pkgs/by-name/el/element-desktop/package.nix index fdf71bcea553..af332edd8748 100644 --- a/pkgs/by-name/el/element-desktop/package.nix +++ b/pkgs/by-name/el/element-desktop/package.nix @@ -112,8 +112,8 @@ stdenv.mkDerivation ( ln -s $out/share/element/electron/lib/i18n/strings/en{-us,}.json # icon - mkdir -p "$out/share/icons/hicolor/icon/apps" - ln -s "$out/share/element/electron/build/icon.png" "$out/share/icons/hicolor/icon/apps/element.png" + mkdir -p "$out/share/icons/hicolor/512x512/apps" + ln -s "$out/share/element/electron/build/icon.png" "$out/share/icons/hicolor/512x512/apps/element.png" # desktop item mkdir -p "$out/share" From 8fbbb9b34f970b2ce7221988c5d6c31c7b2d3d65 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 27 Sep 2025 02:46:11 +0000 Subject: [PATCH 53/97] rqlite: 9.0.1 -> 9.1.0 --- pkgs/by-name/rq/rqlite/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/rq/rqlite/package.nix b/pkgs/by-name/rq/rqlite/package.nix index 688cc84558c4..b3263710efbb 100644 --- a/pkgs/by-name/rq/rqlite/package.nix +++ b/pkgs/by-name/rq/rqlite/package.nix @@ -6,13 +6,13 @@ buildGoModule (finalAttrs: { pname = "rqlite"; - version = "9.0.1"; + version = "9.1.0"; src = fetchFromGitHub { owner = "rqlite"; repo = "rqlite"; tag = "v${finalAttrs.version}"; - hash = "sha256-ll8F5doXHG3Nq3LisSpy5iuh9JhA6/HsBwrSPDGs57c="; + hash = "sha256-q2T5Ze+rR2KfBvrtIiVa9W8DICxErdeRLA3aNKbyMCo="; }; vendorHash = "sha256-Mq469sUYgS19SVJ7noTUl7hml9xUAGDsr64MJM8Xq9g="; From 57656dad044fc2f65ef500c39ef10f21781e5f5f Mon Sep 17 00:00:00 2001 From: "Braian A. Diez" Date: Sat, 27 Sep 2025 00:24:59 -0300 Subject: [PATCH 54/97] exploitdb: fix nix/store path warning --- pkgs/by-name/ex/exploitdb/package.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ex/exploitdb/package.nix b/pkgs/by-name/ex/exploitdb/package.nix index 135dea9f4a95..36496b0a25e0 100644 --- a/pkgs/by-name/ex/exploitdb/package.nix +++ b/pkgs/by-name/ex/exploitdb/package.nix @@ -4,7 +4,6 @@ fetchFromGitLab, makeWrapper, }: - stdenv.mkDerivation (finalAttrs: { pname = "exploitdb"; version = "2025-09-18"; @@ -22,6 +21,11 @@ stdenv.mkDerivation (finalAttrs: { runHook preInstall mkdir -p $out/bin $out/share cp --recursive . $out/share/exploitdb + + substituteInPlace $out/share/exploitdb/.searchsploit_rc \ + --replace-fail 'path_array+=("/opt/exploitdb")' 'path_array+=("'$out'/share/exploitdb")' \ + --replace-fail 'path_array+=("/opt/exploitdb-papers")' 'path_array+=("'$out'/share/exploitdb")' + makeWrapper $out/share/exploitdb/searchsploit $out/bin/searchsploit runHook postInstall ''; From 91a77ae1ad68555bf56899715d28c266d4372339 Mon Sep 17 00:00:00 2001 From: Augustin Trancart Date: Sat, 27 Sep 2025 09:19:28 +0200 Subject: [PATCH 55/97] python3Packages.basemap-data-{,hires}: fix and add geospatial team --- .../development/python-modules/basemap-data-hires/default.nix | 3 ++- pkgs/development/python-modules/basemap-data/default.nix | 4 ++-- pkgs/development/python-modules/basemap/default.nix | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/basemap-data-hires/default.nix b/pkgs/development/python-modules/basemap-data-hires/default.nix index 44d352a8822a..cf96bf36f1d7 100644 --- a/pkgs/development/python-modules/basemap-data-hires/default.nix +++ b/pkgs/development/python-modules/basemap-data-hires/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pyproject = true; inherit (basemap) version src; - sourceRoot = "${src.name}/packages/basemap_data_hires"; + sourceRoot = "${src.name}/data/basemap_data_hires"; build-system = [ setuptools @@ -26,5 +26,6 @@ buildPythonPackage rec { description = "High-resolution data assets for matplotlib basemap"; license = lib.licenses.lgpl3Plus; maintainers = with lib.maintainers; [ moraxyc ]; + teams = with lib.teams; [ geospatial ]; }; } diff --git a/pkgs/development/python-modules/basemap-data/default.nix b/pkgs/development/python-modules/basemap-data/default.nix index f50feac37d48..4d80345558ba 100644 --- a/pkgs/development/python-modules/basemap-data/default.nix +++ b/pkgs/development/python-modules/basemap-data/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { format = "setuptools"; inherit (basemap) version src; - sourceRoot = "${src.name}/packages/basemap_data"; + sourceRoot = "${src.name}/data/basemap_data"; # no tests doCheck = false; @@ -23,6 +23,6 @@ buildPythonPackage rec { mit lgpl3Plus ]; - maintainers = [ ]; + teams = [ teams.geospatial ]; }; } diff --git a/pkgs/development/python-modules/basemap/default.nix b/pkgs/development/python-modules/basemap/default.nix index 415b6addd73b..f344cd5eab94 100644 --- a/pkgs/development/python-modules/basemap/default.nix +++ b/pkgs/development/python-modules/basemap/default.nix @@ -67,7 +67,7 @@ buildPythonPackage rec { coastlines, lakes, rivers and political boundaries. See http://matplotlib.github.com/basemap/users/examples.html for examples of what it can do. ''; - maintainers = [ ]; + teams = [ teams.geospatial ]; license = with licenses; [ mit lgpl21 From 58ba29eb7990d9ba9454a7d6f051ab551489bbe5 Mon Sep 17 00:00:00 2001 From: Augustin Trancart Date: Sat, 27 Sep 2025 09:27:54 +0200 Subject: [PATCH 56/97] python3Packages.basemap: fix build --- pkgs/development/python-modules/basemap/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/basemap/default.nix b/pkgs/development/python-modules/basemap/default.nix index f344cd5eab94..8bafd07f952f 100644 --- a/pkgs/development/python-modules/basemap/default.nix +++ b/pkgs/development/python-modules/basemap/default.nix @@ -26,8 +26,6 @@ buildPythonPackage rec { hash = "sha256-1T1FTcR99KbpqiYzrd2r5h1wTcygBEU7BLZXZ8uMthU="; }; - sourceRoot = "${src.name}/packages/basemap"; - nativeBuildInputs = [ cython geos @@ -65,7 +63,7 @@ buildPythonPackage rec { longDescription = '' An add-on toolkit for matplotlib that lets you plot data on map projections with coastlines, lakes, rivers and political boundaries. See - http://matplotlib.github.com/basemap/users/examples.html for examples of what it can do. + https://matplotlib.org/basemap/stable/users/examples.html for examples of what it can do. ''; teams = [ teams.geospatial ]; license = with licenses; [ From 756a9378227ecb8bfcb0c6cc596cbc870640847b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 27 Sep 2025 07:32:01 +0000 Subject: [PATCH 57/97] python3Packages.ucsmsdk: 0.9.22 -> 0.9.23 --- pkgs/development/python-modules/ucsmsdk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ucsmsdk/default.nix b/pkgs/development/python-modules/ucsmsdk/default.nix index ffeb58170e1a..a0ec0df2277b 100644 --- a/pkgs/development/python-modules/ucsmsdk/default.nix +++ b/pkgs/development/python-modules/ucsmsdk/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "ucsmsdk"; - version = "0.9.22"; + version = "0.9.23"; pyproject = true; src = fetchFromGitHub { owner = "CiscoUcs"; repo = "ucsmsdk"; tag = "v${version}"; - hash = "sha256-zpb43Id6uHBKpEORDGKNW8lXP10fQJm9lGOztxaTZSI="; + hash = "sha256-UVOEJl+oSjf6gaVaa6QWBfEViUPmhgUiSm6rerkZ+EM="; }; build-system = [ setuptools ]; From a4d1db8dd7e3bdec17fb809a450dd6a855292290 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 27 Sep 2025 08:58:17 +0000 Subject: [PATCH 58/97] scryer-prolog: 0.9.4 -> 0.10.0 --- pkgs/by-name/sc/scryer-prolog/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sc/scryer-prolog/package.nix b/pkgs/by-name/sc/scryer-prolog/package.nix index 58f8801d85c8..19c26ecc0674 100644 --- a/pkgs/by-name/sc/scryer-prolog/package.nix +++ b/pkgs/by-name/sc/scryer-prolog/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "scryer-prolog"; - version = "0.9.4"; + version = "0.10.0"; src = fetchFromGitHub { owner = "mthom"; repo = "scryer-prolog"; rev = "v${version}"; - hash = "sha256-0c0MsjrHRitg+5VEHB9/iSuiqcPztF+2inDZa9fQpwU="; + hash = "sha256-RCz4zLbmWgSRR6Y5YbhidIZ1+LNR6FHyk/G0ifSDOx4="; }; - cargoHash = "sha256-CuCVofzKd/VPBTZY+ubk5wP9akt9kQLyi221fg7yt3M="; + cargoHash = "sha256-8uFxCLKa8hnGPpilxtV5SxHUG4Nf704A0qG2zpoIK4s="; nativeBuildInputs = [ pkg-config ]; From c3af297731179b8c48d397fac098b0e155afc9da Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 27 Sep 2025 13:11:05 +0000 Subject: [PATCH 59/97] kdePackages.klevernotes: 1.2.3 -> 1.2.4 --- pkgs/kde/misc/klevernotes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/kde/misc/klevernotes/default.nix b/pkgs/kde/misc/klevernotes/default.nix index 408c06b83c3f..35e2ba4513bf 100644 --- a/pkgs/kde/misc/klevernotes/default.nix +++ b/pkgs/kde/misc/klevernotes/default.nix @@ -9,11 +9,11 @@ }: mkKdeDerivation rec { pname = "klevernotes"; - version = "1.2.3"; + version = "1.2.4"; src = fetchurl { url = "mirror://kde/stable/klevernotes/${version}/klevernotes-${version}.tar.xz"; - hash = "sha256-eWCjZrOfjqu6uC9WDqwoYg9Vyss8PGxEXKzR+MgEg24="; + hash = "sha256-btnCn9YhA0aIhg6PXYuxsZQa6JeHyIrYwSKvTuqrsj8="; }; extraBuildInputs = [ From 56ae3c1e6765ff3b03d2b95163cb73f94beb8d4a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 27 Sep 2025 17:39:10 +0000 Subject: [PATCH 60/97] diesel-cli: 2.3.0 -> 2.3.2 --- pkgs/by-name/di/diesel-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/di/diesel-cli/package.nix b/pkgs/by-name/di/diesel-cli/package.nix index 10b3970ee94d..164b69372ccc 100644 --- a/pkgs/by-name/di/diesel-cli/package.nix +++ b/pkgs/by-name/di/diesel-cli/package.nix @@ -27,15 +27,15 @@ assert lib.assertMsg (lib.elem true [ rustPlatform.buildRustPackage rec { pname = "diesel-cli"; - version = "2.3.0"; + version = "2.3.2"; src = fetchCrate { inherit version; crateName = "diesel_cli"; - hash = "sha256-s/RJ83TuW42MIYgKXq5tlqJ73u0aucuXrR8bFArqT5A="; + hash = "sha256-JNDFXBNmwCWpk+Lub453wS+7lVMZcdiJBmPoVAedpug="; }; - cargoHash = "sha256-XmWrXLOYm7y7+0mqT0WSmT6LhHAPA9UbGODlluBKyZw="; + cargoHash = "sha256-qfXa6DuuhKbXCdOvhuPNx6xlDIouoDVJUMob9Fc5XgI="; nativeBuildInputs = [ installShellFiles From 72fbbf6a0059500b9b7f717eb82f5b432dc74bae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Ha=CC=88cker?= Date: Sat, 27 Sep 2025 20:34:57 +0200 Subject: [PATCH 61/97] ut1999: add dwt as maintainer --- pkgs/by-name/ut/ut1999/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ut/ut1999/package.nix b/pkgs/by-name/ut/ut1999/package.nix index 7e5896fe15f1..dc2ae509e546 100644 --- a/pkgs/by-name/ut/ut1999/package.nix +++ b/pkgs/by-name/ut/ut1999/package.nix @@ -198,7 +198,10 @@ stdenv.mkDerivation (finalAttrs: { description = "Unreal Tournament GOTY (1999) with the OldUnreal patch"; license = licenses.unfree; platforms = attrNames srcs; - maintainers = with maintainers; [ eliandoran ]; + maintainers = with maintainers; [ + eliandoran + dwt + ]; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; mainProgram = "ut1999"; }; From dcb8dcfd30cb2aa14cd81d18236a20043ab89a7d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 27 Sep 2025 18:41:12 +0000 Subject: [PATCH 62/97] fluxcd-operator-mcp: 0.27.0 -> 0.29.0 --- pkgs/by-name/fl/fluxcd-operator-mcp/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fl/fluxcd-operator-mcp/package.nix b/pkgs/by-name/fl/fluxcd-operator-mcp/package.nix index 55374be39f3c..d6383e9ef221 100644 --- a/pkgs/by-name/fl/fluxcd-operator-mcp/package.nix +++ b/pkgs/by-name/fl/fluxcd-operator-mcp/package.nix @@ -9,16 +9,16 @@ }: buildGoModule (finalAttrs: { pname = "fluxcd-operator-mcp"; - version = "0.27.0"; + version = "0.29.0"; src = fetchFromGitHub { owner = "controlplaneio-fluxcd"; repo = "fluxcd-operator"; tag = "v${finalAttrs.version}"; - hash = "sha256-haqRBK3ctQvx2VaG2PSSFnhodO5UsBv/iv4SYmO6ijQ="; + hash = "sha256-yV8aGmY2mUAu0urIi7d1pIjhJasRX17hpmvFEQm4YpY="; }; - vendorHash = "sha256-w7WEckmoajsR4sKCrheq34T0XC2ubnZhz6cVQmzHzN0="; + vendorHash = "sha256-zCzMNlpBBUS2P2aywFDUp/RSl+HlfQe+L8a1+vVYbgY="; ldflags = [ "-s" From 957e1d0b5fb8df0554e9e4812b5f262350c7276a Mon Sep 17 00:00:00 2001 From: ghpzin Date: Wed, 17 Sep 2025 19:02:40 +0300 Subject: [PATCH 63/97] fig2dev: fix build with gcc15 - add patch from merged upstream commit: https://sourceforge.net/p/mcj/fig2dev/ci/ab4eee3cf0d0c1d861d64b9569a5d1497800cae2 (fetchpatch is from gentoo because of upstream hosting on sourceforge) Fixes build failure with gcc15: ``` transfig.c:140:26: error: too many arguments to function 'str2lang'; expected 0, have 1 140 | tolang = str2lang(optarg); | ^~~~~~~~ ~~~~~~ transfig.h:63:22: note: declared here 63 | extern enum language str2lang(); | ^~~~~~~~ transfig.c:171:13: error: too many arguments to function 'parse_arg'; expected 0, have 6 171 | a = parse_arg(tolang, arg_f, arg_s, arg_m, arg_o, argv[optind]); | ^~~~~~~~~ ~~~~~~ transfig.c:36:11: note: declared here 36 | argument *parse_arg(), *arglist = NULL, *lastarg = NULL; | ^~~~~~~~~ transfig.c:259:7: error: too many arguments to function 'strip'; expected 0, have 2 259 | if (strip(arg, ".pic")) | ^~~~~ ~~~ transfig.c:37:7: note: declared here 37 | char *strip(); | ^~~~~ transfig.c:261:19: error: too many arguments to function 'mksuff'; expected 0, have 2 261 | a->name = mksuff(arg, ""); | ^~~~~~ ~~~ transfig.h:67:24: note: declared here 67 | extern char *sysls(), *mksuff(); | ^~~~~~ ``` --- pkgs/by-name/fi/fig2dev/package.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/by-name/fi/fig2dev/package.nix b/pkgs/by-name/fi/fig2dev/package.nix index d3ae31a4b04b..8ba60bd67ff9 100644 --- a/pkgs/by-name/fi/fig2dev/package.nix +++ b/pkgs/by-name/fi/fig2dev/package.nix @@ -1,6 +1,7 @@ { lib, stdenv, + fetchpatch, fetchurl, ghostscript, libpng, @@ -24,6 +25,14 @@ stdenv.mkDerivation rec { patches = [ ./CVE-2025-31162.patch ./CVE-2025-31163.patch + + # Fix build with gcc15 + # https://sourceforge.net/p/mcj/fig2dev/ci/ab4eee3cf0d0c1d861d64b9569a5d1497800cae2 + (fetchpatch { + name = "fig2dev-prototypes.patch"; + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-gfx/fig2dev/files/fig2dev-3.2.9a-prototypes.patch?id=93644497325b6df7a17f8bd05ad0495607aa5c34"; + hash = "sha256-F6z0m3Ez9JpgZg+TjVjuIZhAyTMHodB7O/l8lDTOL54="; + }) ]; nativeBuildInputs = [ makeWrapper ]; From 8eb0cdc5e760272236c4e6e2c165f64b6e321b37 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 28 Aug 2025 18:45:53 +0000 Subject: [PATCH 64/97] bash_unit: 2.3.2 -> 2.3.3 --- pkgs/by-name/ba/bash_unit/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ba/bash_unit/package.nix b/pkgs/by-name/ba/bash_unit/package.nix index f50f0bc9bfa1..5a1e0c3638ac 100644 --- a/pkgs/by-name/ba/bash_unit/package.nix +++ b/pkgs/by-name/ba/bash_unit/package.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "bash_unit"; - version = "2.3.2"; + version = "2.3.3"; src = fetchFromGitHub { - owner = "pgrange"; + owner = "bash-unit"; repo = "bash_unit"; rev = "v${version}"; - sha256 = "sha256-n5ehN7NrWID72xP7EYOk/mpnQJaDn71esIugWrLbZr0="; + hash = "sha256-uRUqa6sXaXXDes9JjyTsMlA+nYdTGdioM0/y2XDIiEw="; }; patchPhase = '' From 0aa639a90b42abc210a81222ac79123f6aa31eba Mon Sep 17 00:00:00 2001 From: "Adam C. Stephens" Date: Sat, 27 Sep 2025 16:20:21 -0400 Subject: [PATCH 65/97] fish: 4.0.8 -> 4.1.0 Changelog: https://github.com/fish-shell/fish-shell/releases/tag/4.1.0 --- pkgs/by-name/fi/fish/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/fi/fish/package.nix b/pkgs/by-name/fi/fish/package.nix index 4885876f0ecc..5f4a9d51862e 100644 --- a/pkgs/by-name/fi/fish/package.nix +++ b/pkgs/by-name/fi/fish/package.nix @@ -152,13 +152,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "fish"; - version = "4.0.8"; + version = "4.1.0"; src = fetchFromGitHub { owner = "fish-shell"; repo = "fish-shell"; tag = finalAttrs.version; - hash = "sha256-bve82WLP/mZrGZNW9JZFCnFiEy1QNB9M8+r3OVh9E3w="; + hash = "sha256-J1/Uup/HJP2COkUaDXg6pO6pKTq/44WKqWFqbv89bZk="; }; env = { @@ -169,7 +169,7 @@ stdenv.mkDerivation (finalAttrs: { cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src patches; - hash = "sha256-f1nxATT2iJiqQiYc6qHrUvRscupvZa8R41W4fvrgj08="; + hash = "sha256-9neZKkuQSOPRrBmjYQ5HYHAORNIjSaSAGN+bDqxb4wk="; }; patches = [ @@ -195,7 +195,7 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace src/builtins/tests/test_tests.rs \ --replace-fail '"/bin/ls"' '"${lib.getExe' coreutils "ls"}"' - substituteInPlace src/tests/highlight.rs \ + substituteInPlace src/highlight/tests.rs \ --replace-fail '"/bin/echo"' '"${lib.getExe' coreutils "echo"}"' \ --replace-fail '"/bin/c"' '"${lib.getExe' coreutils "c"}"' \ --replace-fail '"/bin/ca"' '"${lib.getExe' coreutils "ca"}"' \ From 19279b2459d031e3553271f6f8f09fbbd826b930 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 5 Sep 2025 11:23:59 +0000 Subject: [PATCH 66/97] s5: 0.1.15 -> 0.2.0 --- pkgs/by-name/s5/s5/package.nix | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/s5/s5/package.nix b/pkgs/by-name/s5/s5/package.nix index c78bff131861..e8e5c46a11cc 100644 --- a/pkgs/by-name/s5/s5/package.nix +++ b/pkgs/by-name/s5/s5/package.nix @@ -2,29 +2,36 @@ lib, buildGoModule, fetchFromGitHub, + versionCheckHook, }: buildGoModule rec { pname = "s5"; - version = "0.1.15"; + version = "0.2.0"; src = fetchFromGitHub { owner = "mvisonneau"; repo = "s5"; rev = "v${version}"; - hash = "sha256-QQMnzDRWdW0awwNx2vqtzrOW9Ua7EmJ9YFznQoK33J0="; + hash = "sha256-aNNf7ntGg2A84jD6UeoF4gFv8S/FonbIhV3ZOd/P4bw="; }; - vendorHash = "sha256-axcZ4XzgsPVU9at/g3WS8Hv92P2hmZRb+tUfw+h9iH0="; + vendorHash = "sha256-NmnYv0yAHmlOY9UK7GQtb5e9DwbyEbqQ2O6cpqkwtww="; subPackages = [ "cmd/s5" ]; ldflags = [ - "-X main.version=v${version}" + "-X github.com/mvisonneau/s5/internal/app.Version=v${version}" ]; doCheck = true; + doInstallCheck = true; + + nativeInstallCheckInputs = [ versionCheckHook ]; + + versionCheckProgramArg = "--version"; + meta = with lib; { description = "Cipher/decipher text within a file"; mainProgram = "s5"; From 7a690fd410546df1e11bb2da9e57e242b4e788b5 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sat, 27 Sep 2025 21:12:14 +0000 Subject: [PATCH 67/97] python3Packages.keras: unmark as broken --- pkgs/development/python-modules/keras/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/python-modules/keras/default.nix b/pkgs/development/python-modules/keras/default.nix index a1aa7438c423..93f8a3a14784 100644 --- a/pkgs/development/python-modules/keras/default.nix +++ b/pkgs/development/python-modules/keras/default.nix @@ -214,7 +214,5 @@ buildPythonPackage rec { changelog = "https://github.com/keras-team/keras/releases/tag/v${version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ GaetanLepage ]; - # Not yet released for tensorflow >= 2.20.0 - broken = lib.versionAtLeast tensorflow.version "2.20"; }; } From ebdfa26a353584db6f66727c3892cd7de1a63424 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 27 Sep 2025 22:04:25 +0000 Subject: [PATCH 68/97] ansible-doctor: 7.2.0 -> 7.2.1 --- pkgs/by-name/an/ansible-doctor/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/an/ansible-doctor/package.nix b/pkgs/by-name/an/ansible-doctor/package.nix index 570e1a04b0ba..aacfad5371b2 100644 --- a/pkgs/by-name/an/ansible-doctor/package.nix +++ b/pkgs/by-name/an/ansible-doctor/package.nix @@ -8,14 +8,14 @@ python3Packages.buildPythonApplication rec { pname = "ansible-doctor"; - version = "7.2.0"; + version = "7.2.1"; pyproject = true; src = fetchFromGitHub { owner = "thegeeklab"; repo = "ansible-doctor"; tag = "v${version}"; - hash = "sha256-7SGnbcaufKWBDq5Na+s+X8RGRskl1Q1bh0xelT/IQXU="; + hash = "sha256-2cJ1wV3hqoqSvLq3c7/J5nh1GTTcj9sexRhX3hfPoTc="; }; build-system = with python3Packages; [ From 62c60b6ed92b6573cb87a138e57e6c749657735d Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sat, 27 Sep 2025 22:26:31 +0000 Subject: [PATCH 69/97] python3Packages.mhcflurry: fix for python 3.13 --- pkgs/development/python-modules/mhcflurry/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/python-modules/mhcflurry/default.nix b/pkgs/development/python-modules/mhcflurry/default.nix index 611b67645165..88b99c0da802 100644 --- a/pkgs/development/python-modules/mhcflurry/default.nix +++ b/pkgs/development/python-modules/mhcflurry/default.nix @@ -31,6 +31,14 @@ buildPythonPackage rec { hash = "sha256-TNb3oKZvgBuXoSwsTuEJjFKEVZyHynazuPInj7wVKs8="; }; + # pipes has been removed in python 3.13 + postPatch = '' + substituteInPlace mhcflurry/downloads.py \ + --replace-fail \ + "from pipes import quote" \ + "from shlex import quote" + ''; + # keras and tensorflow are not in the official setup.py requirements but are required for the CLI utilities to run. dependencies = [ appdirs From dfb46856cc1d56533d19fdd653b0435ba2979a7a Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sat, 27 Sep 2025 22:30:03 +0000 Subject: [PATCH 70/97] python3Packages.brax: skip failing tests --- pkgs/development/python-modules/brax/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/brax/default.nix b/pkgs/development/python-modules/brax/default.nix index 11b4ac0dc9c6..3af04fe0b318 100644 --- a/pkgs/development/python-modules/brax/default.nix +++ b/pkgs/development/python-modules/brax/default.nix @@ -82,7 +82,14 @@ buildPythonPackage rec { transforms3d ]; - disabledTests = lib.optionals stdenv.hostPlatform.isAarch64 [ + disabledTests = [ + # AttributeError: 'functools.partial' object has no attribute 'value' + "testModelEncoding0" + "testModelEncoding1" + "testTrain" + "testTrainDomainRandomize" + ] + ++ lib.optionals stdenv.hostPlatform.isAarch64 [ # Flaky: # AssertionError: Array(-0.00135638, dtype=float32) != 0.0 within 0.001 delta (Array(0.00135638, dtype=float32) difference) "test_pendulum_period2" From 34b05b1d1589921220d5c1815ed542d0e50400b7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 28 Sep 2025 03:56:44 +0200 Subject: [PATCH 71/97] python313Packages.aiohttp-middlewares: disable failing tests --- .../python-modules/aiohttp-middlewares/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/python-modules/aiohttp-middlewares/default.nix b/pkgs/development/python-modules/aiohttp-middlewares/default.nix index b31deb2b3c0d..934f4d72000c 100644 --- a/pkgs/development/python-modules/aiohttp-middlewares/default.nix +++ b/pkgs/development/python-modules/aiohttp-middlewares/default.nix @@ -46,6 +46,14 @@ buildPythonPackage rec { pythonImportsCheck = [ "aiohttp_middlewares" ]; + disabledTests = [ + # TRests are outdated + "test_shield_middleware_funcitonal[DELETE-False]" + "test_shield_middleware_funcitonal[GET-False]" + "test_shield_middleware_funcitonal[POST-True]" + "test_shield_middleware_funcitonal[PUT-False]" + ]; + meta = with lib; { description = "Collection of useful middlewares for aiohttp.web applications"; homepage = "https://github.com/playpauseandstop/aiohttp-middlewares"; From 3ee909bfa441b9a9d0ea2b4c39de88abcfd1d3d6 Mon Sep 17 00:00:00 2001 From: Ross Smyth <18294397+RossSmyth@users.noreply.github.com> Date: Sun, 21 Sep 2025 15:42:34 -0400 Subject: [PATCH 72/97] flint: to finalAttrs, strictDeps, fix static build --- pkgs/development/libraries/flint/3.nix | 43 +++++++++++++------ .../libraries/flint/checkPhase.patch | 26 +++++++++++ 2 files changed, 56 insertions(+), 13 deletions(-) create mode 100644 pkgs/development/libraries/flint/checkPhase.patch diff --git a/pkgs/development/libraries/flint/3.nix b/pkgs/development/libraries/flint/3.nix index 3546022dc4f5..921b89be7005 100644 --- a/pkgs/development/libraries/flint/3.nix +++ b/pkgs/development/libraries/flint/3.nix @@ -2,34 +2,45 @@ lib, stdenv, fetchurl, - gmp, - mpfr, - ntl, + fetchpatch, windows, autoconf, automake, gettext, libtool, - openblas ? null, + gmp, + mpfr, + ntl, blas, lapack, + boehmgc, + openblas ? null, withBlas ? true, withNtl ? !ntl.meta.broken, + withGc ? false, }: assert withBlas -> openblas != null && blas.implementation == "openblas" && lapack.implementation == "openblas"; -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "flint3"; version = "3.3.1"; src = fetchurl { - url = "https://flintlib.org/download/flint-${version}.tar.gz"; + url = "https://flintlib.org/download/flint-${finalAttrs.version}.tar.gz"; hash = "sha256-ZNcOUTB2z6lx4EELWMHaXTURKRPppWtE4saBtFnT6vs="; }; + patches = [ + # Remove once/if https://github.com/flintlib/flint/pull/2411 is merged + # Required or else during the check phase the build fails while + # linking a test due to duplicate symbol errors + ./checkPhase.patch + ]; + + strictDeps = true; nativeBuildInputs = [ autoconf automake @@ -50,6 +61,9 @@ stdenv.mkDerivation rec { ++ lib.optionals withNtl [ ntl ] + ++ lib.optionals withGc [ + boehmgc + ] ++ lib.optionals stdenv.hostPlatform.isMinGW [ windows.pthreads ]; @@ -70,19 +84,22 @@ stdenv.mkDerivation rec { ] ++ lib.optionals withNtl [ "--with-ntl=${ntl}" + ] + ++ lib.optionals withGc [ + "--with-gc=${boehmgc}" ]; enableParallelBuilding = true; - + enableParallelChecking = true; doCheck = true; - meta = with lib; { + meta = { description = "Fast Library for Number Theory"; - license = licenses.lgpl3Plus; - maintainers = with maintainers; [ smasher164 ]; - teams = [ teams.sage ]; - platforms = platforms.all; + license = lib.licenses.lgpl3Plus; + maintainers = [ lib.maintainers.smasher164 ]; + teams = [ lib.teams.sage ]; + platforms = lib.platforms.all; homepage = "https://www.flintlib.org/"; downloadPage = "https://www.flintlib.org/downloads.html"; }; -} +}) diff --git a/pkgs/development/libraries/flint/checkPhase.patch b/pkgs/development/libraries/flint/checkPhase.patch new file mode 100644 index 000000000000..19de1b1f1e20 --- /dev/null +++ b/pkgs/development/libraries/flint/checkPhase.patch @@ -0,0 +1,26 @@ +https://github.com/flintlib/flint/pull/2411 + +From 9957b17e6b08bd57790f7da1344b4d92eefc0b38 Mon Sep 17 00:00:00 2001 +From: Ross Smyth <18294397+RossSmyth@users.noreply.github.com> +Date: Sun, 21 Sep 2025 15:58:57 -0400 +Subject: [PATCH] Fix duplicate symbols linker error + +When I run `make check` I get linker errors without +this patch +--- + src/double_interval.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/double_interval.h b/src/double_interval.h +index a423257db2..5f685c283f 100644 +--- a/src/double_interval.h ++++ b/src/double_interval.h +@@ -13,7 +13,7 @@ + #define DOUBLE_INTERVAL_H + + #ifdef DOUBLE_INTERVAL_INLINES_C +-#define DOUBLE_INTERVAL_INLINE ++#define DOUBLE_INTERVAL_INLINE static + #else + #define DOUBLE_INTERVAL_INLINE static inline + #endif From 2088c727470acbef55bcc029e77078cd913b3dff Mon Sep 17 00:00:00 2001 From: Ross Smyth <18294397+RossSmyth@users.noreply.github.com> Date: Sun, 21 Sep 2025 15:53:37 -0400 Subject: [PATCH 73/97] flint: Move to by-name --- .../libraries => by-name/fl}/flint/checkPhase.patch | 0 .../libraries/flint/3.nix => by-name/fl/flint/package.nix} | 2 +- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 4 ---- 4 files changed, 2 insertions(+), 5 deletions(-) rename pkgs/{development/libraries => by-name/fl}/flint/checkPhase.patch (100%) rename pkgs/{development/libraries/flint/3.nix => by-name/fl/flint/package.nix} (99%) diff --git a/pkgs/development/libraries/flint/checkPhase.patch b/pkgs/by-name/fl/flint/checkPhase.patch similarity index 100% rename from pkgs/development/libraries/flint/checkPhase.patch rename to pkgs/by-name/fl/flint/checkPhase.patch diff --git a/pkgs/development/libraries/flint/3.nix b/pkgs/by-name/fl/flint/package.nix similarity index 99% rename from pkgs/development/libraries/flint/3.nix rename to pkgs/by-name/fl/flint/package.nix index 921b89be7005..a49d3165cf54 100644 --- a/pkgs/development/libraries/flint/3.nix +++ b/pkgs/by-name/fl/flint/package.nix @@ -25,7 +25,7 @@ assert -> openblas != null && blas.implementation == "openblas" && lapack.implementation == "openblas"; stdenv.mkDerivation (finalAttrs: { - pname = "flint3"; + pname = "flint"; version = "3.3.1"; src = fetchurl { diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 043041e28f8f..dfe17d01e5fd 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -900,6 +900,7 @@ mapAliases { flashrom-stable = flashprog; # Added 2024-03-01 flatbuffers_2_0 = flatbuffers; # Added 2022-05-12 flatcam = throw "flatcam has been removed because it is unmaintained since 2022 and doesn't support Python > 3.10"; # Added 2025-01-25 + flint3 = flint; # Added 2025-09-21 floorp = throw "floorp has been replaced with floorp-bin, as building from upstream sources has become unfeasible starting with version 12.x"; # Added 2025-09-06 floorp-unwrapped = throw "floorp-unwrapped has been replaced with floorp-bin-unwrapped, as building from upstream sources has become unfeasible starting with version 12.x"; # Added 2025-09-06 flow-editor = flow-control; # Added 2025-03-05 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b3b820574ef8..722dba0348e2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7446,10 +7446,6 @@ with pkgs; }; fftwMpi = fftw.override { enableMpi = true; }; - flint = flint3; - - flint3 = callPackage ../development/libraries/flint/3.nix { }; - fltk13 = callPackage ../development/libraries/fltk { }; fltk14 = callPackage ../development/libraries/fltk/1.4.nix { }; fltk13-minimal = fltk13.override { From 7e7469589bda977d07ef0c6a9d73388ab532c55f Mon Sep 17 00:00:00 2001 From: Ross Smyth <18294397+RossSmyth@users.noreply.github.com> Date: Sun, 21 Sep 2025 16:33:17 -0400 Subject: [PATCH 74/97] tree-wide: Remove uses of flint3 --- pkgs/by-name/ms/msolve/package.nix | 4 ++-- pkgs/by-name/no/normaliz/package.nix | 4 ++-- pkgs/by-name/pp/pplite/package.nix | 4 ++-- pkgs/by-name/s7/s7/package.nix | 4 ++-- pkgs/by-name/sa/sage/package.nix | 8 ++++---- pkgs/by-name/sa/sage/sage-env.nix | 6 +++--- pkgs/by-name/sa/sage/sagelib.nix | 4 ++-- pkgs/by-name/si/singular/package.nix | 6 +++--- pkgs/by-name/sy/symengine/package.nix | 4 ++-- pkgs/development/ocaml-modules/apron/default.nix | 4 ++-- pkgs/development/ocaml-modules/mopsa/default.nix | 4 ++-- pkgs/development/r-modules/default.nix | 2 +- 12 files changed, 27 insertions(+), 27 deletions(-) diff --git a/pkgs/by-name/ms/msolve/package.nix b/pkgs/by-name/ms/msolve/package.nix index 652d1c152409..e8d9d2f52ce4 100644 --- a/pkgs/by-name/ms/msolve/package.nix +++ b/pkgs/by-name/ms/msolve/package.nix @@ -3,7 +3,7 @@ stdenv, fetchFromGitHub, autoreconfHook, - flint3, + flint, gmp, mpfr, llvmPackages, @@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - flint3 + flint gmp mpfr ] diff --git a/pkgs/by-name/no/normaliz/package.nix b/pkgs/by-name/no/normaliz/package.nix index 5d0d2e6db329..66e5671f83c5 100644 --- a/pkgs/by-name/no/normaliz/package.nix +++ b/pkgs/by-name/no/normaliz/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, autoreconfHook, gmpxx, - flint3, + flint, nauty, }: @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ gmpxx - flint3 + flint nauty ]; diff --git a/pkgs/by-name/pp/pplite/package.nix b/pkgs/by-name/pp/pplite/package.nix index c128142921ca..991ad0e03cdd 100644 --- a/pkgs/by-name/pp/pplite/package.nix +++ b/pkgs/by-name/pp/pplite/package.nix @@ -3,7 +3,7 @@ lib, fetchurl, fetchpatch, - flint3, + flint, gmp, }: @@ -17,7 +17,7 @@ stdenv.mkDerivation { }; buildInputs = [ - flint3 + flint gmp ]; diff --git a/pkgs/by-name/s7/s7/package.nix b/pkgs/by-name/s7/s7/package.nix index a8dbaa69e057..553c4afb5461 100644 --- a/pkgs/by-name/s7/s7/package.nix +++ b/pkgs/by-name/s7/s7/package.nix @@ -3,7 +3,7 @@ fetchFromGitLab, stdenv, - flint3, + flint, gmp, libmpc, mpfr, @@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { }; buildInputs = - lib.optional withArb flint3 + lib.optional withArb flint ++ lib.optionals withGMP [ gmp mpfr diff --git a/pkgs/by-name/sa/sage/package.nix b/pkgs/by-name/sa/sage/package.nix index 0244119055cd..a594c707256b 100644 --- a/pkgs/by-name/sa/sage/package.nix +++ b/pkgs/by-name/sa/sage/package.nix @@ -17,7 +17,7 @@ let self: super: { # `sagelib`, i.e. all of sage except some wrappers and runtime dependencies sagelib = self.callPackage ./sagelib.nix { - inherit flint3; + inherit flint; inherit sage-src env-locations singular; inherit (maxima) lisp-compiler; linbox = pkgs.linbox; @@ -79,7 +79,7 @@ let python3 singular palp - flint3 + flint pythonEnv maxima ; @@ -142,7 +142,7 @@ let extraLibs = pythonRuntimeDeps; }; # make the libs accessible - singular = pkgs.singular.override { inherit flint3; }; + singular = pkgs.singular.override { inherit flint; }; maxima = pkgs.maxima-ecl.override { lisp-compiler = pkgs.ecl.override { @@ -164,7 +164,7 @@ let # openblas instead of openblasCompat. Apparently other packages somehow use flints # blas when it is available. Alternative would be to override flint to use # openblasCompat. - flint3 = pkgs.flint3.override { withBlas = false; }; + flint = pkgs.flint.override { withBlas = false; }; # Multiple palp dimensions need to be available and sage expects them all to be # in the same folder. diff --git a/pkgs/by-name/sa/sage/sage-env.nix b/pkgs/by-name/sa/sage/sage-env.nix index 47028995d330..d1f0c104e183 100644 --- a/pkgs/by-name/sa/sage/sage-env.nix +++ b/pkgs/by-name/sa/sage/sage-env.nix @@ -43,7 +43,7 @@ rubiks, blas, lapack, - flint3, + flint, gmp, mpfr, zlib, @@ -167,7 +167,7 @@ writeTextFile rec { export LDFLAGS='${ lib.concatStringsSep " " ( map (pkg: "-L${pkg}/lib") [ - flint3 + flint gap glpk gmp @@ -187,7 +187,7 @@ writeTextFile rec { singular gmp.dev glpk - flint3 + flint gap mpfr.dev ] diff --git a/pkgs/by-name/sa/sage/sagelib.nix b/pkgs/by-name/sa/sage/sagelib.nix index 408a015a2a9a..7964c4b8fa25 100644 --- a/pkgs/by-name/sa/sage/sagelib.nix +++ b/pkgs/by-name/sa/sage/sagelib.nix @@ -21,7 +21,7 @@ eclib, ecm, fflas-ffpack, - flint3, + flint, gap, giac, givaro, @@ -136,7 +136,7 @@ buildPythonPackage rec { eclib ecm fflas-ffpack - flint3 + flint gap giac givaro diff --git a/pkgs/by-name/si/singular/package.nix b/pkgs/by-name/si/singular/package.nix index 608e4d3a4797..4278033373f2 100644 --- a/pkgs/by-name/si/singular/package.nix +++ b/pkgs/by-name/si/singular/package.nix @@ -15,7 +15,7 @@ sharutils, file, getconf, - flint3, + flint, ntl, mpfr, cddlib, @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-gfanlib" "--with-ntl=${ntl}" - "--with-flint=${flint3}" + "--with-flint=${flint}" ] ++ lib.optionals enableDocs [ "--enable-doc-build" @@ -88,7 +88,7 @@ stdenv.mkDerivation rec { buildInputs = [ # necessary gmp - flint3 + flint # by upstream recommended but optional ncurses readline diff --git a/pkgs/by-name/sy/symengine/package.nix b/pkgs/by-name/sy/symengine/package.nix index 9aaf8cde4269..5c71dfc1d5cb 100644 --- a/pkgs/by-name/sy/symengine/package.nix +++ b/pkgs/by-name/sy/symengine/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, cmake, gmp, - flint3, + flint, mpfr, libmpc, withShared ? true, @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { buildInputs = [ gmp - flint3 + flint mpfr libmpc ]; diff --git a/pkgs/development/ocaml-modules/apron/default.nix b/pkgs/development/ocaml-modules/apron/default.nix index 308803b75ced..f1206bab6ffb 100644 --- a/pkgs/development/ocaml-modules/apron/default.nix +++ b/pkgs/development/ocaml-modules/apron/default.nix @@ -10,7 +10,7 @@ findlib, camlidl, mlgmpidl, - flint3, + flint, pplite, }: @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { mpfr ppl camlidl - flint3 + flint pplite ]; propagatedBuildInputs = [ mlgmpidl ]; diff --git a/pkgs/development/ocaml-modules/mopsa/default.nix b/pkgs/development/ocaml-modules/mopsa/default.nix index 4e60eaff2f47..bccc33e7085a 100644 --- a/pkgs/development/ocaml-modules/mopsa/default.nix +++ b/pkgs/development/ocaml-modules/mopsa/default.nix @@ -5,7 +5,7 @@ clang, libclang, libllvm, - flint3, + flint, mpfr, pplite, ocaml, @@ -39,7 +39,7 @@ buildDunePackage rec { buildInputs = [ arg-complete camlidl - flint3 + flint libclang mpfr pplite diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index b20f8bcefeb0..c1bd7fb54744 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -503,7 +503,7 @@ let pkg-config gmp.dev mpfr.dev - flint3 + flint ]; fingerPro = [ pkgs.gsl ]; Formula = [ pkgs.gmp ]; From 2e84c0f8b87c4ff20bb2c84a6c33f69b0cf8b5ff Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 28 Sep 2025 02:15:19 +0000 Subject: [PATCH 75/97] git-credential-gopass: 1.15.17 -> 1.15.18 --- pkgs/tools/security/gopass/git-credential.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/gopass/git-credential.nix b/pkgs/tools/security/gopass/git-credential.nix index 25c84b64b49f..bc8610fd6575 100644 --- a/pkgs/tools/security/gopass/git-credential.nix +++ b/pkgs/tools/security/gopass/git-credential.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "git-credential-gopass"; - version = "1.15.17"; + version = "1.15.18"; src = fetchFromGitHub { owner = "gopasspw"; repo = "git-credential-gopass"; rev = "v${version}"; - hash = "sha256-dMCDRrq0o6naobsnKLedY6ORJdEOPdGG7L49VmcQiJQ="; + hash = "sha256-tW4tPSZErVGZyPgLyQBbwDqmuYyl4nB/qCdAad+Kro4="; }; - vendorHash = "sha256-MoellcZ/4iDu1hZ/5qvupfozl+iUP7Uc4RV0LxPaIOc="; + vendorHash = "sha256-Yqhl1e0fFykFv/T3yaRkEyOKWBfaJXVrjrUWTToWd5s="; subPackages = [ "." ]; From 61fa914264024bcd81baaea1f03365943d8f24c0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 28 Sep 2025 05:16:50 +0000 Subject: [PATCH 76/97] cljfmt: 0.13.1 -> 0.13.4 --- pkgs/by-name/cl/cljfmt/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/cl/cljfmt/package.nix b/pkgs/by-name/cl/cljfmt/package.nix index ccc7cac8f6b8..a1cbf19d55bc 100644 --- a/pkgs/by-name/cl/cljfmt/package.nix +++ b/pkgs/by-name/cl/cljfmt/package.nix @@ -8,11 +8,11 @@ buildGraalvmNativeImage (finalAttrs: { pname = "cljfmt"; - version = "0.13.1"; + version = "0.13.4"; src = fetchurl { url = "https://github.com/weavejester/cljfmt/releases/download/${finalAttrs.version}/cljfmt-${finalAttrs.version}-standalone.jar"; - hash = "sha256-Dj1g6hMzRhqm0pJggODVFgEkayB2Wdh3d0z6RglHbgY="; + hash = "sha256-i6ZUhN7gwADw0tZFPOjiGpC/po8us5QSAJAW7n3LgIU="; }; extraNativeImageBuildArgs = [ From 26e1e9e886c26c0fd6da1ebea272dcf24a441536 Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Sat, 27 Sep 2025 18:06:25 +0900 Subject: [PATCH 77/97] gemini-cli-bin: simplify updateScript --- pkgs/by-name/ge/gemini-cli-bin/package.nix | 18 +++----- .../by-name/ge/gemini-cli-bin/update-asset.sh | 41 ------------------- 2 files changed, 6 insertions(+), 53 deletions(-) delete mode 100755 pkgs/by-name/ge/gemini-cli-bin/update-asset.sh diff --git a/pkgs/by-name/ge/gemini-cli-bin/package.nix b/pkgs/by-name/ge/gemini-cli-bin/package.nix index 4e4a86d68623..272b96432518 100644 --- a/pkgs/by-name/ge/gemini-cli-bin/package.nix +++ b/pkgs/by-name/ge/gemini-cli-bin/package.nix @@ -3,19 +3,14 @@ stdenvNoCC, fetchurl, nodejs, - gitUpdater, + nix-update-script, }: -let - owner = "google-gemini"; - repo = "gemini-cli"; - asset = "gemini.js"; -in stdenvNoCC.mkDerivation (finalAttrs: { pname = "gemini-cli-bin"; version = "0.6.0"; src = fetchurl { - url = "https://github.com/${owner}/${repo}/releases/download/v${finalAttrs.version}/${asset}"; + url = "https://github.com/google-gemini/gemini-cli/releases/download/v${finalAttrs.version}/gemini.js"; hash = "sha256-jmZvL4Rst3238H2BdZ/bQuddFkFcFLRABJ1wTHm8qPM="; }; @@ -36,11 +31,10 @@ stdenvNoCC.mkDerivation (finalAttrs: { runHook postInstall ''; - passthru.updateScript = [ - ./update-asset.sh - "${owner}/${repo}" - "${asset}" - ]; + passthru.updateScript = nix-update-script { + # Ignore `preview` and `nightly` tags + extraArgs = [ "--version-regex=^v([0-9.]+)$" ]; + }; meta = { description = "AI agent that brings the power of Gemini directly into your terminal"; diff --git a/pkgs/by-name/ge/gemini-cli-bin/update-asset.sh b/pkgs/by-name/ge/gemini-cli-bin/update-asset.sh deleted file mode 100755 index 1fce69948530..000000000000 --- a/pkgs/by-name/ge/gemini-cli-bin/update-asset.sh +++ /dev/null @@ -1,41 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p gnugrep curl jq gnused - -set -euo pipefail - -cd "$(dirname "${BASH_SOURCE[0]}")" - -NIX_FILE="package.nix" - -GITHUB_REPO="$1" -ASSET_NAME="$2" -REV_PREFIX="${3:-v}" - -CURRENT_VER="$(grep -oP 'version = "\K[^"]+' "${NIX_FILE}")" -CURRENT_HASH="$(grep -oP 'hash = "\K[^"]+' "${NIX_FILE}")" - -JQ_FILTER='[.[] | select((.tag_name | test("preview|nightly")) | not)] | - first | .tag_name, (.assets[] | select(.name == $asset_name) | .digest)' - -{ - read -r LATEST_VER - read -r ASSET_DIGEST -} < <( - curl --fail -s ${GITHUB_TOKEN:+-u ":${GITHUB_TOKEN}"} \ - "https://api.github.com/repos/${GITHUB_REPO}/releases" | - jq -r --arg asset_name "${ASSET_NAME}" "${JQ_FILTER}" -) - -LATEST_VER="${LATEST_VER#"${REV_PREFIX}"}" - -if [[ "${LATEST_VER}" == "${CURRENT_VER}" ]]; then - echo "Up to date." - exit 0 -fi - -LATEST_HASH="$(nix-hash --to-sri "${ASSET_DIGEST}")" - -sed -i "s#hash = \"${CURRENT_HASH}\";#hash = \"${LATEST_HASH}\";#g" "${NIX_FILE}" -sed -i "s#version = \"${CURRENT_VER}\";#version = \"${LATEST_VER}\";#g" "${NIX_FILE}" - -echo "Successfully updated from ${CURRENT_VER} to version ${LATEST_VER}." From 5dc74ce5692a0256d4f2b08bcbbb66b5b0300c1d Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Sat, 27 Sep 2025 19:01:57 +0900 Subject: [PATCH 78/97] gemini-cli-bin: add installCheckPhase The original check on `gemini mcp list` output was simplified as suggested by the co-author to check the `gemini -v` exit code instead. Co-authored-by: ljxfstorm --- pkgs/by-name/ge/gemini-cli-bin/package.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/pkgs/by-name/ge/gemini-cli-bin/package.nix b/pkgs/by-name/ge/gemini-cli-bin/package.nix index 272b96432518..f31770f73130 100644 --- a/pkgs/by-name/ge/gemini-cli-bin/package.nix +++ b/pkgs/by-name/ge/gemini-cli-bin/package.nix @@ -3,6 +3,7 @@ stdenvNoCC, fetchurl, nodejs, + writableTmpDirAsHomeHook, nix-update-script, }: stdenvNoCC.mkDerivation (finalAttrs: { @@ -17,6 +18,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { phases = [ "installPhase" "fixupPhase" + "installCheckPhase" ]; strictDeps = true; @@ -31,6 +33,19 @@ stdenvNoCC.mkDerivation (finalAttrs: { runHook postInstall ''; + doInstallCheck = true; + nativeInstallCheckInputs = [ + writableTmpDirAsHomeHook + ]; + # versionCheckHook cannot be used because the reported version might be incorrect (e.g., 0.6.1 returns 0.6.0). + installCheckPhase = '' + runHook preInstallCheck + + "$out/bin/gemini" -v + + runHook postInstallCheck + ''; + passthru.updateScript = nix-update-script { # Ignore `preview` and `nightly` tags extraArgs = [ "--version-regex=^v([0-9.]+)$" ]; From 61b24e7ac5450bcd9683ae2bbd0ffec00966b69e Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Sat, 27 Sep 2025 19:02:24 +0900 Subject: [PATCH 79/97] gemini-cli-bin: 0.6.0 -> 0.6.1 Diff: https://github.com/google-gemini/gemini-cli/compare/v0.6.0...v0.6.1 --- pkgs/by-name/ge/gemini-cli-bin/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ge/gemini-cli-bin/package.nix b/pkgs/by-name/ge/gemini-cli-bin/package.nix index f31770f73130..0925a0a919b0 100644 --- a/pkgs/by-name/ge/gemini-cli-bin/package.nix +++ b/pkgs/by-name/ge/gemini-cli-bin/package.nix @@ -8,11 +8,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "gemini-cli-bin"; - version = "0.6.0"; + version = "0.6.1"; src = fetchurl { url = "https://github.com/google-gemini/gemini-cli/releases/download/v${finalAttrs.version}/gemini.js"; - hash = "sha256-jmZvL4Rst3238H2BdZ/bQuddFkFcFLRABJ1wTHm8qPM="; + hash = "sha256-gTd+uw5geR7W87BOiE6YmDDJ4AiFlYxbuLE2GWgg0kw="; }; phases = [ From 47bd111d7e147bdc63fa204c578ff6a0561e36ac Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 28 Sep 2025 06:31:02 +0000 Subject: [PATCH 80/97] linuxKernel.kernels.linux_lqx: 6.16.7 -> 6.16.9 --- pkgs/os-specific/linux/kernel/zen-kernels.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix index ce4385962ed5..e6e292087f22 100644 --- a/pkgs/os-specific/linux/kernel/zen-kernels.nix +++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix @@ -23,9 +23,9 @@ let }; # ./update-zen.py lqx lqx = { - version = "6.16.7"; # lqx + version = "6.16.9"; # lqx suffix = "lqx1"; # lqx - sha256 = "1rw5iz9d2zz39hzg9p0nxbprz25hgiaycax5iq2yg87mqsxdajad"; # lqx + sha256 = "01slgcp07s59yc9w2pghcvi15vrki55fn19jqks21phb09k2fkl6"; # lqx isLqx = true; }; }; From 88b9275b7d863c4f71e728406d18372802bf4fbe Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 28 Sep 2025 06:38:15 +0000 Subject: [PATCH 81/97] symfony-cli: 5.13.0 -> 5.14.2 --- pkgs/by-name/sy/symfony-cli/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sy/symfony-cli/package.nix b/pkgs/by-name/sy/symfony-cli/package.nix index a25d12943cdf..cfeeafc81675 100644 --- a/pkgs/by-name/sy/symfony-cli/package.nix +++ b/pkgs/by-name/sy/symfony-cli/package.nix @@ -12,14 +12,14 @@ buildGoModule (finalAttrs: { pname = "symfony-cli"; - version = "5.13.0"; + version = "5.14.2"; vendorHash = "sha256-SGD8jFRvdJ5GOeQiW3Whe6EnybQ60wOsC/OureOCn7k="; src = fetchFromGitHub { owner = "symfony-cli"; repo = "symfony-cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-F+OES8F2KdYuIq28z02/8HINddfbZuxY/pJtcx9V3xk="; + hash = "sha256-qgCuerKn7R4bn3YgzpMprIUDfn2SJdIiXC+9avnzDm4="; leaveDotGit = true; postFetch = '' git --git-dir $out/.git log -1 --pretty=%cd --date=format:'%Y-%m-%dT%H:%M:%SZ' > $out/SOURCE_DATE From bd8e84be31c7abd643c84f6c4981226bbd6ed71f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 28 Sep 2025 01:17:00 +0000 Subject: [PATCH 82/97] gopass-hibp: 1.15.17 -> 1.15.18 --- pkgs/tools/security/gopass/hibp.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/gopass/hibp.nix b/pkgs/tools/security/gopass/hibp.nix index 099cc00cb226..16a8490f61ef 100644 --- a/pkgs/tools/security/gopass/hibp.nix +++ b/pkgs/tools/security/gopass/hibp.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "gopass-hibp"; - version = "1.15.17"; + version = "1.15.18"; src = fetchFromGitHub { owner = "gopasspw"; repo = "gopass-hibp"; rev = "v${version}"; - hash = "sha256-MUC9eYpm+1inkJtTmXxfS3bTMcsQCZlpNhqlq0p7fEY="; + hash = "sha256-tlElF7AO4eJQAYwqBdwf6140Y1lsB8xdPCPfZZe/d8k="; }; - vendorHash = "sha256-58coZrNZdCK3R5EeJ/xQbRr94Y4ugufjrkaoeQgN1YY="; + vendorHash = "sha256-3uxKxpIgnQvTA1v/IJU7Z8IfIjjyhOFU7Py8uPIQ1q8="; subPackages = [ "." ]; @@ -35,6 +35,8 @@ buildGoModule rec { --prefix PATH : "${lib.makeBinPath [ gopass ]}" ''; + __darwinAllowLocalNetworking = true; + meta = with lib; { description = "Gopass haveibeenpwnd.com integration"; homepage = "https://github.com/gopasspw/gopass-hibp"; From 0d66a03a4395d7c1e12590268091d035b36ccf30 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 28 Sep 2025 08:05:57 +0000 Subject: [PATCH 83/97] gpxsee: 13.47 -> 13.48 --- pkgs/by-name/gp/gpxsee/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gp/gpxsee/package.nix b/pkgs/by-name/gp/gpxsee/package.nix index 3e414f88eadb..65a1dfac6bf4 100644 --- a/pkgs/by-name/gp/gpxsee/package.nix +++ b/pkgs/by-name/gp/gpxsee/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "gpxsee"; - version = "13.47"; + version = "13.48"; src = fetchFromGitHub { owner = "tumic0"; repo = "GPXSee"; tag = finalAttrs.version; - hash = "sha256-1waE0A70MsUaGttaxHcOO2aaeRdZ9ihc7ZeqJ+azH/0="; + hash = "sha256-3MkZpTrm8WVgv9k59XqwfhR1SDxNGDaD0TFBWeH4wQY="; }; buildInputs = [ From b946e4b1e550a34bb945d1c70e5ddf4bd7840ae8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 28 Sep 2025 01:21:20 -0700 Subject: [PATCH 84/97] radicale: 3.5.6 -> 3.5.7 Diff: https://github.com/Kozea/Radicale/compare/v3.5.6...v3.5.7 Changelog: https://github.com/Kozea/Radicale/blob/v3.5.7/CHANGELOG.md --- pkgs/by-name/ra/radicale/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ra/radicale/package.nix b/pkgs/by-name/ra/radicale/package.nix index e3b5c0ac5735..b820ceef3743 100644 --- a/pkgs/by-name/ra/radicale/package.nix +++ b/pkgs/by-name/ra/radicale/package.nix @@ -7,14 +7,14 @@ python3.pkgs.buildPythonApplication rec { pname = "radicale"; - version = "3.5.6"; + version = "3.5.7"; pyproject = true; src = fetchFromGitHub { owner = "Kozea"; repo = "Radicale"; tag = "v${version}"; - hash = "sha256-jMqy6vFT2DwF8NsANBm2Z+ApIBDUXqNaBbk+8zObQOI="; + hash = "sha256-+vYLBd4psPxL2NkH8zriRpLUGK6cWrrkJyV230LePVE="; }; build-system = with python3.pkgs; [ From c1cd1e6a08ea4af88456916e2d4f37e101de2c85 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 28 Sep 2025 11:00:45 +0200 Subject: [PATCH 85/97] python313Packages.aiohttp-middlewares: disable failing tests --- .../python-modules/aiohttp-middlewares/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/aiohttp-middlewares/default.nix b/pkgs/development/python-modules/aiohttp-middlewares/default.nix index 934f4d72000c..8b086fd8114b 100644 --- a/pkgs/development/python-modules/aiohttp-middlewares/default.nix +++ b/pkgs/development/python-modules/aiohttp-middlewares/default.nix @@ -7,7 +7,6 @@ poetry-core, pytest-aiohttp, pytestCheckHook, - pythonOlder, yarl, }: @@ -16,8 +15,6 @@ buildPythonPackage rec { version = "2.4.0"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "playpauseandstop"; repo = "aiohttp-middlewares"; @@ -57,7 +54,7 @@ buildPythonPackage rec { meta = with lib; { description = "Collection of useful middlewares for aiohttp.web applications"; homepage = "https://github.com/playpauseandstop/aiohttp-middlewares"; - changelog = "https://github.com/playpauseandstop/aiohttp-middlewares/blob/${version}/CHANGELOG.rst"; + changelog = "https://github.com/playpauseandstop/aiohttp-middlewares/blob/${src.tag}/CHANGELOG.rst"; license = licenses.bsd3; maintainers = with maintainers; [ fab ]; }; From c86b6736289970c4ed89ae14321750418b6f9340 Mon Sep 17 00:00:00 2001 From: Ashish SHUKLA Date: Sun, 28 Sep 2025 11:53:31 +0200 Subject: [PATCH 86/97] just: 1.42.4 -> 1.43.0 - Remove rec Changes: https://github.com/casey/just/releases/tag/1.43.0 --- pkgs/by-name/ju/just/package.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/ju/just/package.nix b/pkgs/by-name/ju/just/package.nix index f1fede42a821..6bcd1f2badba 100644 --- a/pkgs/by-name/ju/just/package.nix +++ b/pkgs/by-name/ju/just/package.nix @@ -16,10 +16,12 @@ # run the compiled `generate-book` utility to prepare the files for mdbook withDocumentation ? stdenv.buildPlatform.canExecute stdenv.hostPlatform, }: - -rustPlatform.buildRustPackage rec { +let + version = "1.43.0"; +in +rustPlatform.buildRustPackage { + inherit version; pname = "just"; - version = "1.42.4"; outputs = [ "out" ] @@ -32,10 +34,10 @@ rustPlatform.buildRustPackage rec { owner = "casey"; repo = "just"; tag = version; - hash = "sha256-MLGtHMNCyhYq9OTquCc9zKmear1ts5vNAvlLxNQaOqk="; + hash = "sha256-148bubjJYbmqugOd8crWXLqxigWfd3VVnsL0/WB2FYM="; }; - cargoHash = "sha256-udNHlPEwTb5S1ZypIqng7JLZ6Yl1vbYwASn+DT2SOLY="; + cargoHash = "sha256-3DIpEPStOh/PcjoJ5dWpfSgRNMTCmN+wO2VzeNtikFU="; nativeBuildInputs = lib.optionals (installShellCompletions || installManPages) [ installShellFiles ] From cc38e0a7002a77148ad72dff5fc10ed314cac8f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 28 Sep 2025 03:16:39 -0700 Subject: [PATCH 87/97] python3Packages.zigpy-znp: run tests --- .../python-modules/zigpy-znp/default.nix | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/pkgs/development/python-modules/zigpy-znp/default.nix b/pkgs/development/python-modules/zigpy-znp/default.nix index 094530d4bb9e..618ada6fbbad 100644 --- a/pkgs/development/python-modules/zigpy-znp/default.nix +++ b/pkgs/development/python-modules/zigpy-znp/default.nix @@ -22,8 +22,6 @@ buildPythonPackage rec { version = "0.14.1"; pyproject = true; - disabled = pythonOlder "3.7"; - src = fetchFromGitHub { owner = "zigpy"; repo = "zigpy-znp"; @@ -41,15 +39,15 @@ buildPythonPackage rec { build-system = [ setuptools ]; dependencies = [ - async-timeout coloredlogs jsonschema voluptuous zigpy + ] + ++ lib.optionals (pythonOlder "3.11") [ + async-timeout ]; - doCheck = false; # tests are not compatible with zigpy 0.65.3 - nativeCheckInputs = [ pytest-asyncio pytest-mock @@ -61,17 +59,6 @@ buildPythonPackage rec { pytestFlags = [ "--reruns=3" ]; - disabledTests = [ - # failing since zigpy 0.60.0 - "test_join_device" - "test_nonstandard_profile" - "test_permit_join" - "test_request_recovery_route_rediscovery_zdo" - "test_watchdog" - "test_zigpy_request" - "test_zigpy_request_failure" - ]; - pythonImportsCheck = [ "zigpy_znp" ]; meta = with lib; { From 33cc06f99f1987cef1bf3e56f5d23882124edcf2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 28 Sep 2025 11:12:41 +0000 Subject: [PATCH 88/97] jsonwatch: 0.9.0 -> 0.11.0 --- pkgs/by-name/js/jsonwatch/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/js/jsonwatch/package.nix b/pkgs/by-name/js/jsonwatch/package.nix index ad145abefba0..bfdf357ecab8 100644 --- a/pkgs/by-name/js/jsonwatch/package.nix +++ b/pkgs/by-name/js/jsonwatch/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "jsonwatch"; - version = "0.9.0"; + version = "0.11.0"; src = fetchFromGitHub { owner = "dbohdan"; repo = "jsonwatch"; tag = "v${version}"; - hash = "sha256-HSyavdH3zhzEvk5qW5fiv8wqmgYsLUyx6Q6oEIOk5to="; + hash = "sha256-qhVqAhUAbLb5wHnLNHr6BxffyH1G5B09eOJQoqSzWEk="; }; - cargoHash = "sha256-2CtB8TEn0bieT0S2w3cm4nLZWdFcIymvWSOnWDTXEJc="; + cargoHash = "sha256-D29pmt97DYfpYa9EwK+IlggR3zQFGzOy/Ky01UGI3tg="; meta = with lib; { description = "Like watch -d but for JSON"; From 2958b3252968e2e8a7c7697922533643f346930b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 28 Sep 2025 12:11:59 +0000 Subject: [PATCH 89/97] redpanda-client: 25.2.4 -> 25.2.5 --- pkgs/by-name/re/redpanda-client/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/re/redpanda-client/package.nix b/pkgs/by-name/re/redpanda-client/package.nix index 381d719f85da..1d778d7f9c1a 100644 --- a/pkgs/by-name/re/redpanda-client/package.nix +++ b/pkgs/by-name/re/redpanda-client/package.nix @@ -7,12 +7,12 @@ stdenv, }: let - version = "25.2.4"; + version = "25.2.5"; src = fetchFromGitHub { owner = "redpanda-data"; repo = "redpanda"; rev = "v${version}"; - sha256 = "sha256-atT2e5vzOKYBD3IHmgpq12ew4mxXWEmKQiwgIwW0+j4="; + sha256 = "sha256-hSL2IsequX/gsBnk7C0JkDDPjreoPhmsNgpR+x6hFUE="; }; in buildGoModule rec { From b425de52df5fe7cc06dc9cb2ad83ae2010fa819c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 28 Sep 2025 12:39:21 +0000 Subject: [PATCH 90/97] podman-tui: 1.8.0 -> 1.8.1 --- pkgs/by-name/po/podman-tui/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/po/podman-tui/package.nix b/pkgs/by-name/po/podman-tui/package.nix index 3e1aaee4f350..73ddb2e0a951 100644 --- a/pkgs/by-name/po/podman-tui/package.nix +++ b/pkgs/by-name/po/podman-tui/package.nix @@ -8,13 +8,13 @@ buildGoModule (finalAttrs: { pname = "podman-tui"; - version = "1.8.0"; + version = "1.8.1"; src = fetchFromGitHub { owner = "containers"; repo = "podman-tui"; tag = "v${finalAttrs.version}"; - hash = "sha256-lTgILCaisnCXMnNL6DSGIszJBC3GiPStZzol3dCm/7s="; + hash = "sha256-lvqitz4H10ILg2b6Mlw1DoWoByFKJaDiCo5zTlzTBQ4="; }; vendorHash = null; From f637813728724c4bcb58c0e5d0558abb2c6422aa Mon Sep 17 00:00:00 2001 From: Heitor Augusto Date: Mon, 8 Sep 2025 19:03:54 -0300 Subject: [PATCH 91/97] .github/labeler.yml: add libcosmicAppHook in COSMIC topic --- .github/labeler.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/labeler.yml b/.github/labeler.yml index d4f43e31b084..c45842c6ac17 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -58,6 +58,7 @@ - nixos/modules/services/display-managers/cosmic-greeter.nix - nixos/tests/cosmic.nix - pkgs/by-name/co/cosmic-*/**/* + - pkgs/by-name/li/libcosmicAppHook/* - pkgs/by-name/xd/xdg-desktop-portal-cosmic/* "6.topic: crystal": From 5b1c494eee08ef8f60f38d0a988bad2a2769ffe6 Mon Sep 17 00:00:00 2001 From: Heitor Augusto <44377258+HeitorAugustoLN@users.noreply.github.com> Date: Sun, 28 Sep 2025 09:39:17 -0300 Subject: [PATCH 92/97] .github/labeler.yml: add pop-launcher in COSMIC topic --- .github/labeler.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/labeler.yml b/.github/labeler.yml index c45842c6ac17..adfc49ef6ee2 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -59,6 +59,7 @@ - nixos/tests/cosmic.nix - pkgs/by-name/co/cosmic-*/**/* - pkgs/by-name/li/libcosmicAppHook/* + - pkgs/by-name/po/pop-launcher/* - pkgs/by-name/xd/xdg-desktop-portal-cosmic/* "6.topic: crystal": From 32d750f588dec828d74ff4f01c136f4961886279 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 28 Sep 2025 13:51:53 +0000 Subject: [PATCH 93/97] kdePackages.karousel: 0.13 -> 0.14 --- pkgs/kde/third-party/karousel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/kde/third-party/karousel/default.nix b/pkgs/kde/third-party/karousel/default.nix index be4179438951..9e0f2fee23ee 100644 --- a/pkgs/kde/third-party/karousel/default.nix +++ b/pkgs/kde/third-party/karousel/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "karousel"; - version = "0.13"; + version = "0.14"; src = fetchFromGitHub { owner = "peterfajdiga"; repo = "karousel"; rev = "v${finalAttrs.version}"; - hash = "sha256-kwj0G4px9Mmv2TdGJsRuj+29Qvg4ZfSYnxCDgf+54bg="; + hash = "sha256-bJv3fQ8w4bAtthlrDjj3cWA8lSpcJCEtJFk5C+94K5M="; }; postPatch = '' From 535053ed15e99004328f94f309afb08ceaccb930 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 28 Sep 2025 14:20:57 +0000 Subject: [PATCH 94/97] lazyjournal: 0.8.0 -> 0.8.1 --- pkgs/by-name/la/lazyjournal/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/la/lazyjournal/package.nix b/pkgs/by-name/la/lazyjournal/package.nix index 9ca1d946919e..93389946a374 100644 --- a/pkgs/by-name/la/lazyjournal/package.nix +++ b/pkgs/by-name/la/lazyjournal/package.nix @@ -5,7 +5,7 @@ nix-update-script, }: let - version = "0.8.0"; + version = "0.8.1"; in buildGoModule { pname = "lazyjournal"; @@ -15,7 +15,7 @@ buildGoModule { owner = "Lifailon"; repo = "lazyjournal"; tag = version; - hash = "sha256-dQKd7u4IGQWw8ExoHLd5qRenE07UQz69GNqGIAWN7ok="; + hash = "sha256-QHVwEesJZiySwEPeDZaU56uY+PJEJXCybvAezhwa59g="; }; vendorHash = "sha256-Wl8DmEBt1YtTk9QEvWybSWRQm0Lnfd5q3C/wg+gP33g="; From ed59146e15009e679c033cee30c561ed81fa933e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 28 Sep 2025 14:25:43 +0000 Subject: [PATCH 95/97] home-assistant-custom-components.xiaomi_gateway3: 4.1.2 -> 4.1.3 --- .../custom-components/xiaomi_gateway3/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/custom-components/xiaomi_gateway3/package.nix b/pkgs/servers/home-assistant/custom-components/xiaomi_gateway3/package.nix index 2f481f5eddd5..72989c472b1d 100644 --- a/pkgs/servers/home-assistant/custom-components/xiaomi_gateway3/package.nix +++ b/pkgs/servers/home-assistant/custom-components/xiaomi_gateway3/package.nix @@ -9,13 +9,13 @@ buildHomeAssistantComponent rec { owner = "AlexxIT"; domain = "xiaomi_gateway3"; - version = "4.1.2"; + version = "4.1.3"; src = fetchFromGitHub { owner = "AlexxIT"; repo = "XiaomiGateway3"; rev = "v${version}"; - hash = "sha256-20OA2H1HOwQKLL6Cjhp4xfTv1/BSc/XaMHX+wO+EM5s="; + hash = "sha256-CcJoXD60z91Gahv5pVrWaIpUNhetW0BN1Nd4DAVRPJs="; }; dependencies = [ zigpy ]; From 08e7c32299f02dffb92c91d637718f6280a81c52 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Sun, 28 Sep 2025 12:25:10 -0400 Subject: [PATCH 96/97] gdcm: add myself as maintainer --- pkgs/development/libraries/gdcm/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/gdcm/default.nix b/pkgs/development/libraries/gdcm/default.nix index 32251b117507..532f0c42502e 100644 --- a/pkgs/development/libraries/gdcm/default.nix +++ b/pkgs/development/libraries/gdcm/default.nix @@ -121,6 +121,7 @@ stdenv.mkDerivation (finalAttrs: { bsd3 asl20 ]; + maintainers = with lib.maintainers; [ bcdarwin ]; platforms = lib.platforms.all; }; }) From fbd806b3873147a513616dc39fb4783117de123a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 28 Sep 2025 17:10:43 +0000 Subject: [PATCH 97/97] taze: 19.5.0 -> 19.7.0 --- pkgs/by-name/ta/taze/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ta/taze/package.nix b/pkgs/by-name/ta/taze/package.nix index 7bf292ce1f21..7230003001fe 100644 --- a/pkgs/by-name/ta/taze/package.nix +++ b/pkgs/by-name/ta/taze/package.nix @@ -13,19 +13,19 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "taze"; - version = "19.5.0"; + version = "19.7.0"; src = fetchFromGitHub { owner = "antfu-collective"; repo = "taze"; tag = "v${finalAttrs.version}"; - hash = "sha256-TJ/gyqGTaaRYgx9EMFhFmzWAFrNRnESk6AvBZtQ+24k="; + hash = "sha256-O+xeAM6sh6YK+yAtxQCTI59Dle/6Z4/ePbgqRGmZxlU="; }; pnpmDeps = pnpm.fetchDeps { inherit (finalAttrs) pname version src; fetcherVersion = 1; - hash = "sha256-kTXW/KYI1ao7zIyIphMPxjfuo7RrEnmXXEK7yTRWO+U="; + hash = "sha256-vXw5LPNcuF9wyI23rZhsvvMYTsPNOvSY3LoLntFdm3g="; }; nativeBuildInputs = [