diff --git a/pkgs/by-name/an/antigravity-cli/package.nix b/pkgs/by-name/an/antigravity-cli/package.nix index d8336e7445c5..e7d9b83244de 100644 --- a/pkgs/by-name/an/antigravity-cli/package.nix +++ b/pkgs/by-name/an/antigravity-cli/package.nix @@ -6,8 +6,8 @@ versionCheckHook, }: let - version = "1.1.19"; - buildId = "4894004681244672"; + version = "1.1.24"; + buildId = "5215338632183808"; wholeVersion = "${version}-${buildId}"; throwSystem = throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}"; @@ -15,15 +15,15 @@ let sourceData = { x86_64-linux = fetchurl { url = "https://storage.googleapis.com/antigravity-public/antigravity-cli/${wholeVersion}/linux-x64/cli_linux_x64.tar.gz"; - hash = "sha256-oCEyp8bGR+8K1IPsvnZ2Ga32tmClWJy6XJN7DIOQm5c="; + hash = "sha256-FWgRhlUCV++eW3AG02VLWEPahjRO4cp3YPX5UhbMBrU="; }; aarch64-linux = fetchurl { url = "https://storage.googleapis.com/antigravity-public/antigravity-cli/${wholeVersion}/linux-arm/cli_linux_arm64.tar.gz"; - hash = "sha256-Fb2ZWewMCLy/7pSzdvAr2LVS3PF6U5vNIQpEP7gkQ8s="; + hash = "sha256-GKmQw5qLmcihFOG/qaOGs0y1J4Rz/S/Ka0cjVoapuDI="; }; aarch64-darwin = fetchurl { url = "https://storage.googleapis.com/antigravity-public/antigravity-cli/${wholeVersion}/darwin-arm/cli_mac_arm64.tar.gz"; - hash = "sha256-rXLa9rJV2W5IZP5r0vP6QHD7TFVIRc6vHWOZ2PEJLkU="; + hash = "sha256-Nba6bSLTnLagJXQizRLbEE2FQ2UeFmgusfniq102qu4="; }; }; in diff --git a/pkgs/by-name/ch/chameleos/package.nix b/pkgs/by-name/ch/chameleos/package.nix index d22b623afff9..e15d48b78e63 100644 --- a/pkgs/by-name/ch/chameleos/package.nix +++ b/pkgs/by-name/ch/chameleos/package.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "chameleos"; - version = "0.1.2"; + version = "0.2.0"; src = fetchFromGitHub { owner = "Treeniks"; repo = "chameleos"; tag = "v${finalAttrs.version}"; - hash = "sha256-zCAYEtDYJm9A+HC9M2XLtz47q+6dcBOVPgh4lmp4z/k="; + hash = "sha256-jF4szo4+f7K+luhHVw4DQYte7E9S3A4qfnEzhN9uYyM="; }; - cargoHash = "sha256-zBEu/T17W7dwz8jxnXm2NsHaVZo1wDFSW75yiYfRIoY="; + cargoHash = "sha256-6LPu5Lvr9Gieu1l78RtsKr4WzxuPQEE3DPnR+01Luew="; postPatch = '' substituteInPlace build.rs --replace-fail '"git"' '"echo"' diff --git a/pkgs/by-name/da/dataform/package-lock.json b/pkgs/by-name/da/dataform/package-lock.json index c5667de750b2..2dffd8c9648f 100644 --- a/pkgs/by-name/da/dataform/package-lock.json +++ b/pkgs/by-name/da/dataform/package-lock.json @@ -1,15 +1,16 @@ { "name": "@dataform/cli", - "version": "3.0.65", + "version": "3.0.66", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@dataform/cli", - "version": "3.0.65", + "version": "3.0.66", "license": "Apache-2.0", "dependencies": { "@google-cloud/bigquery": "~8.3.0", + "@google-cloud/lineage": "^2.1.1", "chokidar": "^3.5.3", "deepmerge": "^4.2.2", "fs-extra": "^9.0.0", @@ -28,7 +29,7 @@ "tmp": "^0.2.7", "typeid-js": "0.3.0", "untildify": "^4.0.0", - "vm2": "3.11.4", + "vm2": "3.11.6", "yargs": "^16.2.0" }, "bin": { @@ -94,6 +95,18 @@ "node": ">=8" } }, + "node_modules/@google-cloud/lineage": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@google-cloud/lineage/-/lineage-2.2.0.tgz", + "integrity": "sha512-23OKa0KnVViiTzARNIApxz8MYopYianMdVCA3eZUUDV/D2xDS9/j5izxQBn3x27sOK2Z/sKDeUi3ikn7ShFgOA==", + "license": "Apache-2.0", + "dependencies": { + "google-gax": "^5.0.0" + }, + "engines": { + "node": ">=18" + } + }, "node_modules/@google-cloud/paginator": { "version": "6.1.0", "resolved": "https://registry.npmjs.org/@google-cloud/paginator/-/paginator-6.1.0.tgz", @@ -133,6 +146,78 @@ "node": ">=18" } }, + "node_modules/@grpc/grpc-js": { + "version": "1.14.4", + "resolved": "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.14.4.tgz", + "integrity": "sha512-k9Dj3DV/itK9D06Y8f190Qgop7/Ui+D0njFV3LHMPwPT75DpXLQohE9Wmz0QElrJnzsjB7KPWiKJbOl7IPDArQ==", + "license": "Apache-2.0", + "dependencies": { + "@grpc/proto-loader": "^0.8.0", + "@js-sdsl/ordered-map": "^4.4.2" + }, + "engines": { + "node": ">=12.10.0" + } + }, + "node_modules/@grpc/proto-loader": { + "version": "0.8.1", + "resolved": "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.8.1.tgz", + "integrity": "sha512-wtF6h+DY6M3YaDBPAmvuuA6jV8Sif9MjtOI5euKFWRgCDl5PeDpPsHR9u2l6St5ceY8AZgoNDww5+HvEsXFsGg==", + "license": "Apache-2.0", + "dependencies": { + "lodash.camelcase": "^4.3.0", + "long": "^5.0.0", + "protobufjs": "^7.5.5", + "yargs": "^17.7.2" + }, + "bin": { + "proto-loader-gen-types": "build/bin/proto-loader-gen-types.js" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/@grpc/proto-loader/node_modules/cliui": { + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz", + "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==", + "license": "ISC", + "dependencies": { + "string-width": "^4.2.0", + "strip-ansi": "^6.0.1", + "wrap-ansi": "^7.0.0" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/@grpc/proto-loader/node_modules/yargs": { + "version": "17.7.3", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.3.tgz", + "integrity": "sha512-GZtjxm/J/4TSxuL3FNYjCmLktBTnIw/rVmKSIyKeYAZpmJB2ig9VauCC5xsa82GNKVKDAqpOn3KVzNt0zmrU0g==", + "license": "MIT", + "dependencies": { + "cliui": "^8.0.1", + "escalade": "^3.1.1", + "get-caller-file": "^2.0.5", + "require-directory": "^2.1.1", + "string-width": "^4.2.3", + "y18n": "^5.0.5", + "yargs-parser": "^21.1.1" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/@grpc/proto-loader/node_modules/yargs-parser": { + "version": "21.1.1", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz", + "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==", + "license": "ISC", + "engines": { + "node": ">=12" + } + }, "node_modules/@isaacs/cliui": { "version": "8.0.2", "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz", @@ -229,6 +314,16 @@ "url": "https://github.com/chalk/wrap-ansi?sponsor=1" } }, + "node_modules/@js-sdsl/ordered-map": { + "version": "4.4.2", + "resolved": "https://registry.npmjs.org/@js-sdsl/ordered-map/-/ordered-map-4.4.2.tgz", + "integrity": "sha512-iUKgm52T8HOE/makSxjqoWhe95ZJA1/G1sYsGev2JDKUSS14KAgg1LHb+Ba+IPow0xflbnSkOsZcO08C7w1gYw==", + "license": "MIT", + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/js-sdsl" + } + }, "node_modules/@one-ini/wasm": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/@one-ini/wasm/-/wasm-0.1.1.tgz", @@ -303,9 +398,9 @@ "license": "BSD-3-Clause" }, "node_modules/@types/node": { - "version": "26.2.0", - "resolved": "https://registry.npmjs.org/@types/node/-/node-26.2.0.tgz", - "integrity": "sha512-5IviulTZeRNp2vAJ514cc/HUlY5nZ9fCbq9DMyC52BrhFZACo3nI0R7qBxhQmo/d27NFe96ur/b7Wwxklda+kg==", + "version": "26.4.0", + "resolved": "https://registry.npmjs.org/@types/node/-/node-26.4.0.tgz", + "integrity": "sha512-faiGnoIrLH/V8cibOMEAZ8pMw6oXqSukl29ra4mN8GdaB2ZewzeaLj+INpV5N+Z1eKWzY+IzaIZH2EIR6YZRNQ==", "license": "MIT", "dependencies": { "undici-types": "~8.3.0" @@ -935,6 +1030,46 @@ "node": ">=18" } }, + "node_modules/google-gax": { + "version": "5.0.8", + "resolved": "https://registry.npmjs.org/google-gax/-/google-gax-5.0.8.tgz", + "integrity": "sha512-M4vpZcXQIC1gqIVGQ7eaU3jXQA6zecStyTXu514TYfThlgSurYJOxHZo9fzU6hAgwPWvuEynAVHWyaIk80VeEA==", + "license": "Apache-2.0", + "dependencies": { + "@grpc/grpc-js": "^1.12.6", + "@grpc/proto-loader": "^0.8.0", + "duplexify": "^4.1.3", + "google-auth-library": "10.5.0", + "google-logging-utils": "1.1.3", + "node-fetch": "^3.3.2", + "object-hash": "^3.0.0", + "proto3-json-serializer": "3.0.4", + "protobufjs": "^7.5.4", + "retry-request": "^8.0.2", + "rimraf": "^5.0.1" + }, + "engines": { + "node": ">=18" + } + }, + "node_modules/google-gax/node_modules/google-auth-library": { + "version": "10.5.0", + "resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-10.5.0.tgz", + "integrity": "sha512-7ABviyMOlX5hIVD60YOfHw4/CxOfBhyduaYB+wbFWCWoni4N7SLcV46hrVRktuBbZjFC9ONyqamZITN7q3n32w==", + "license": "Apache-2.0", + "dependencies": { + "base64-js": "^1.3.0", + "ecdsa-sig-formatter": "^1.0.11", + "gaxios": "^7.0.0", + "gcp-metadata": "^8.0.0", + "google-logging-utils": "^1.0.0", + "gtoken": "^8.0.0", + "jws": "^4.0.0" + }, + "engines": { + "node": ">=18" + } + }, "node_modules/google-logging-utils": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/google-logging-utils/-/google-logging-utils-1.1.3.tgz", @@ -962,6 +1097,19 @@ "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==", "license": "ISC" }, + "node_modules/gtoken": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/gtoken/-/gtoken-8.0.0.tgz", + "integrity": "sha512-+CqsMbHPiSTdtSO14O51eMNlrp9N79gmeqmXeouJOhfucAedHw9noVe/n5uJk3tbKE6a+6ZCQg3RPhVhHByAIw==", + "license": "MIT", + "dependencies": { + "gaxios": "^7.0.0", + "jws": "^4.0.0" + }, + "engines": { + "node": ">=18" + } + }, "node_modules/html-entities": { "version": "2.6.0", "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-2.6.0.tgz", @@ -1209,9 +1357,9 @@ "license": "MIT" }, "node_modules/js-yaml": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.3.1.tgz", - "integrity": "sha512-CY6crGq313MX8GkwvB7tzgp99vjQxY1++5y10/BKN/GUfHqWaOGQMNZkBvqSzsZKWk/ijwHlWzzkLulsGHhjWQ==", + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.3.2.tgz", + "integrity": "sha512-SFNOvSJ+Dgf/9An904Yx+CgSlIPCkIpao4qo51lpee25TIRejdH3rhR4EZMGoNx3/TP3O+wzWuiTFl4sqbltzA==", "funding": [ { "type": "github", @@ -1272,6 +1420,12 @@ "safe-buffer": "^5.0.1" } }, + "node_modules/lodash.camelcase": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz", + "integrity": "sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==", + "license": "MIT" + }, "node_modules/long": { "version": "5.3.2", "resolved": "https://registry.npmjs.org/long/-/long-5.3.2.tgz", @@ -1397,6 +1551,15 @@ "node": ">=0.10.0" } }, + "node_modules/object-hash": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-3.0.0.tgz", + "integrity": "sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw==", + "license": "MIT", + "engines": { + "node": ">= 6" + } + }, "node_modules/object-sizeof": { "version": "1.6.3", "resolved": "https://registry.npmjs.org/object-sizeof/-/object-sizeof-1.6.3.tgz", @@ -1524,10 +1687,22 @@ "integrity": "sha512-vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA==", "license": "ISC" }, + "node_modules/proto3-json-serializer": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/proto3-json-serializer/-/proto3-json-serializer-3.0.4.tgz", + "integrity": "sha512-E1sbAYg3aEbXrq0n1ojJkRHQJGE1kaE/O6GLA94y8rnJBfgvOPTOd1b9hOceQK1FFZI9qMh1vBERCyO2ifubcw==", + "license": "Apache-2.0", + "dependencies": { + "protobufjs": "^7.4.0" + }, + "engines": { + "node": ">=18" + } + }, "node_modules/protobufjs": { - "version": "7.6.5", - "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-7.6.5.tgz", - "integrity": "sha512-/FPD0nUc9jH6rfFjji9IBqOz4pcSE3CsT1m7Ep6Mdb0LxSUMj8hgl6GomOvZzpNpAqqGaXA0P3VSrZLFzIhQrw==", + "version": "7.6.6", + "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-7.6.6.tgz", + "integrity": "sha512-dYDWdjSl5RNb7SgPxGQcRU+GtvP7s2fpkrY0r432PcOIaZ0/rBcxEZnQN67iJhFuQiVw754JDoPruPCNdGsbjg==", "hasInstallScript": true, "license": "BSD-3-Clause", "dependencies": { @@ -1604,6 +1779,94 @@ "node": ">=18" } }, + "node_modules/rimraf": { + "version": "5.0.10", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-5.0.10.tgz", + "integrity": "sha512-l0OE8wL34P4nJH/H2ffoaniAokM2qSmrtXHmlpvYr5AVVX8msAyW0l8NVJFDxlSK4u3Uh/f41cQheDVdnYijwQ==", + "license": "ISC", + "dependencies": { + "glob": "^10.3.7" + }, + "bin": { + "rimraf": "dist/esm/bin.mjs" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/rimraf/node_modules/balanced-match": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", + "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", + "license": "MIT" + }, + "node_modules/rimraf/node_modules/brace-expansion": { + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.1.4.tgz", + "integrity": "sha512-hGfVzPxthbf3+2yjg/RBs60cB0FhqBS/zvdV/4wn4/BmN0bNMMHPc4V/BbFieqf1TKAGGAHnY4eSjajCl0f2Xg==", + "license": "MIT", + "dependencies": { + "balanced-match": "^1.0.0" + } + }, + "node_modules/rimraf/node_modules/glob": { + "version": "10.5.0", + "resolved": "https://registry.npmjs.org/glob/-/glob-10.5.0.tgz", + "integrity": "sha512-DfXN8DfhJ7NH3Oe7cFmu3NCu1wKbkReJ8TorzSAFbSKrlNaQSKfIzqYqVY8zlbs2NLBbWpRiU52GX2PbaBVNkg==", + "deprecated": "Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me", + "license": "ISC", + "dependencies": { + "foreground-child": "^3.1.0", + "jackspeak": "^3.1.2", + "minimatch": "^9.0.4", + "minipass": "^7.1.2", + "package-json-from-dist": "^1.0.0", + "path-scurry": "^1.11.1" + }, + "bin": { + "glob": "dist/esm/bin.mjs" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/rimraf/node_modules/lru-cache": { + "version": "10.4.3", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz", + "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==", + "license": "ISC" + }, + "node_modules/rimraf/node_modules/minimatch": { + "version": "9.0.9", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.9.tgz", + "integrity": "sha512-OBwBN9AL4dqmETlpS2zasx+vTeWclWzkblfZk7KTA5j3jeOONz/tRCnZomUyvNg83wL5Zv9Ss6HMJXAgL8R2Yg==", + "license": "ISC", + "dependencies": { + "brace-expansion": "^2.0.2" + }, + "engines": { + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/rimraf/node_modules/path-scurry": { + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz", + "integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==", + "license": "BlueOak-1.0.0", + "dependencies": { + "lru-cache": "^10.2.0", + "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0" + }, + "engines": { + "node": ">=16 || 14 >=14.18" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, "node_modules/safe-buffer": { "version": "5.2.1", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", @@ -1844,9 +2107,9 @@ } }, "node_modules/vm2": { - "version": "3.11.4", - "resolved": "https://registry.npmjs.org/vm2/-/vm2-3.11.4.tgz", - "integrity": "sha512-3assDRyB+A9/5rjECD2e2FAlezOfzCqejZy0L36zij4LgzoWZRA3a26q3PZnl6o5PmNjrTBRbAWACpdK/Y3qOQ==", + "version": "3.11.6", + "resolved": "https://registry.npmjs.org/vm2/-/vm2-3.11.6.tgz", + "integrity": "sha512-35hVTcKieg7jJMntHhgWT5c2a1J2vmpXm66Xs1Z8ayHOJTj8rzIlXKzba3nO1Om/sonmnkjlAOMt9p8lYJXsWw==", "license": "MIT", "dependencies": { "acorn": "^8.15.0", diff --git a/pkgs/by-name/da/dataform/package.nix b/pkgs/by-name/da/dataform/package.nix index e6cdf38f43e1..8a22f04a63ac 100644 --- a/pkgs/by-name/da/dataform/package.nix +++ b/pkgs/by-name/da/dataform/package.nix @@ -13,7 +13,7 @@ buildNpmPackage (finalAttrs: { pname = "dataform"; - version = "3.0.65"; + version = "3.0.66"; __structuredAttrs = true; strictDeps = true; @@ -22,7 +22,7 @@ buildNpmPackage (finalAttrs: { src = fetchurl { url = "https://registry.npmjs.org/@dataform/cli/-/cli-${finalAttrs.version}.tgz"; - hash = "sha256-Xs370Tq4vMUC2b4xxcv4U5Qmh1JrqpARaz7n/peBYcw="; + hash = "sha256-lqTJMuqk44mWVgYCsheUFToigFFLbd8nUChGIcuD6DY="; }; # Inject the locally committed lockfile into the extracted source @@ -30,7 +30,7 @@ buildNpmPackage (finalAttrs: { cp ${./package-lock.json} package-lock.json ''; - npmDepsHash = "sha256-WhungUwY5egN8hcpffmh4hvLcjJ34Ph6hkxR6mmelnk="; + npmDepsHash = "sha256-r5VdgdJlU3r/tezf+dYKu1a+rM23O+SFHMANQe38Tb0="; dontNpmBuild = true; diff --git a/pkgs/by-name/el/elogind/Add-missing-musl_missing.h-includes-for-basename.patch b/pkgs/by-name/el/elogind/Add-missing-musl_missing.h-includes-for-basename.patch deleted file mode 100644 index f20c19d32ef5..000000000000 --- a/pkgs/by-name/el/elogind/Add-missing-musl_missing.h-includes-for-basename.patch +++ /dev/null @@ -1,121 +0,0 @@ -From ae7ecfc9487756659077e126bfd296146125a59d Mon Sep 17 00:00:00 2001 -From: Alyssa Ross -Date: Sun, 13 Oct 2024 18:03:47 +0200 -Subject: [PATCH] Add missing musl_missing.h includes for basename - -Link: https://github.com/elogind/elogind/pull/292 ---- - src/basic/cgroup-util.c | 1 + - src/libelogind/sd-bus/test-bus-watch-bind.c | 2 ++ - src/login/logind-inhibit.c | 2 ++ - src/login/logind-seat.c | 2 ++ - src/login/logind-session.c | 1 + - src/test/test-fileio.c | 2 ++ - src/test/test-mountpoint-util.c | 1 + - src/test/test-path-util.c | 2 ++ - 8 files changed, 13 insertions(+) - -diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c -index 90cfeb570..c57fe54d0 100644 ---- a/src/basic/cgroup-util.c -+++ b/src/basic/cgroup-util.c -@@ -40,6 +40,7 @@ - //#include "xattr-util.h" - /// Additional includes needed by elogind - #include "env-file.h" -+#include "musl_missing.h" - - static int cg_enumerate_items(const char *controller, const char *path, FILE **ret, const char *item) { - _cleanup_free_ char *fs = NULL; -diff --git a/src/libelogind/sd-bus/test-bus-watch-bind.c b/src/libelogind/sd-bus/test-bus-watch-bind.c -index d6938a7f0..3227c17d7 100644 ---- a/src/libelogind/sd-bus/test-bus-watch-bind.c -+++ b/src/libelogind/sd-bus/test-bus-watch-bind.c -@@ -17,6 +17,8 @@ - #include "string-util.h" - #include "tmpfile-util.h" - #include "tests.h" -+/// Additional includes needed by elogind -+#include "musl_missing.h" - - static int method_foobar(sd_bus_message *m, void *userdata, sd_bus_error *ret_error) { - log_info("Got Foobar() call."); -diff --git a/src/login/logind-inhibit.c b/src/login/logind-inhibit.c -index 86d1f84b3..4140f1aae 100644 ---- a/src/login/logind-inhibit.c -+++ b/src/login/logind-inhibit.c -@@ -26,6 +26,8 @@ - #include "string-util.h" - #include "tmpfile-util.h" - #include "user-util.h" -+/// Additional includes needed by elogind -+#include "musl_missing.h" - - static void inhibitor_remove_fifo(Inhibitor *i); - -diff --git a/src/login/logind-seat.c b/src/login/logind-seat.c -index bef542d94..f520562ad 100644 ---- a/src/login/logind-seat.c -+++ b/src/login/logind-seat.c -@@ -24,6 +24,8 @@ - #include "string-util.h" - #include "terminal-util.h" - #include "tmpfile-util.h" -+/// Additional includes needed by elogind -+#include "musl_missing.h" - - int seat_new(Seat** ret, Manager *m, const char *id) { - _cleanup_(seat_freep) Seat *s = NULL; -diff --git a/src/login/logind-session.c b/src/login/logind-session.c -index ea69c2e6c..90ddec899 100644 ---- a/src/login/logind-session.c -+++ b/src/login/logind-session.c -@@ -42,6 +42,7 @@ - /// Additional includes needed by elogind - #include "cgroup-setup.h" - #include "extract-word.h" -+#include "musl_missing.h" - - #define RELEASE_USEC (20*USEC_PER_SEC) - -diff --git a/src/test/test-fileio.c b/src/test/test-fileio.c -index b9b82e7ff..db981bd41 100644 ---- a/src/test/test-fileio.c -+++ b/src/test/test-fileio.c -@@ -25,6 +25,8 @@ - #include "strv.h" - #include "tests.h" - #include "tmpfile-util.h" -+/// Additional includes needed by elogind -+#include "musl_missing.h" - - #if 0 /// elogind does not need load_/write_/merge_env_file() - TEST(parse_env_file) { -diff --git a/src/test/test-mountpoint-util.c b/src/test/test-mountpoint-util.c -index de526100f..9d37ce77d 100644 ---- a/src/test/test-mountpoint-util.c -+++ b/src/test/test-mountpoint-util.c -@@ -16,6 +16,7 @@ - #include "string-util.h" - #include "tests.h" - /// Addition includes needed by elogind -+#include "musl_missing.h" - #include "virt.h" - #include "tmpfile-util.h" - -diff --git a/src/test/test-path-util.c b/src/test/test-path-util.c -index 76fda746a..1df305d30 100644 ---- a/src/test/test-path-util.c -+++ b/src/test/test-path-util.c -@@ -16,6 +16,8 @@ - #include "strv.h" - #include "tests.h" - #include "tmpfile-util.h" -+/// Additional includes needed by elogind -+#include "musl_missing.h" - - TEST(print_paths) { - log_info("DEFAULT_PATH=%s", DEFAULT_PATH); --- -2.46.0 - diff --git a/pkgs/by-name/el/elogind/Remove-outdated-musl-hack-in-rlimit_nofile_safe.patch b/pkgs/by-name/el/elogind/Remove-outdated-musl-hack-in-rlimit_nofile_safe.patch deleted file mode 100644 index d7de78b4a6cd..000000000000 --- a/pkgs/by-name/el/elogind/Remove-outdated-musl-hack-in-rlimit_nofile_safe.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 3a0181ab0fb6c40f613894e65009e148c6e652c9 Mon Sep 17 00:00:00 2001 -From: Alyssa Ross -Date: Mon, 16 Sep 2024 10:24:08 +0200 -Subject: [PATCH] Remove outdated musl hack in rlimit_nofile_safe - -This was incorrect, because RLIM_FMT is not the format specifier for uintmax_t. - -Since 53e84063a ("Change RLIM_FMT to '%llu' for non-glibc builds (#269)"), -RLIM_FMT is correct for musl, so there's no longer any need for this casting -version. - -Link: https://github.com/elogind/elogind/pull/288 ---- - src/basic/rlimit-util.c | 4 ---- - 1 file changed, 4 deletions(-) - -diff --git a/src/basic/rlimit-util.c b/src/basic/rlimit-util.c -index 091c111df..59bdc35a0 100644 ---- a/src/basic/rlimit-util.c -+++ b/src/basic/rlimit-util.c -@@ -428,11 +428,7 @@ int rlimit_nofile_safe(void) { - rl.rlim_max = MIN(rl.rlim_max, (rlim_t) read_nr_open()); - rl.rlim_cur = MIN((rlim_t) FD_SETSIZE, rl.rlim_max); - if (setrlimit(RLIMIT_NOFILE, &rl) < 0) --#ifdef __GLIBC__ /// To be compatible with musl-libc, elogind uses an (uintmax_t) cast. - return log_debug_errno(errno, "Failed to lower RLIMIT_NOFILE's soft limit to " RLIM_FMT ": %m", rl.rlim_cur); --#else // __GLIBC__ -- return log_debug_errno(errno, "Failed to lower RLIMIT_NOFILE's soft limit to " RLIM_FMT ": %m", (uintmax_t)rl.rlim_cur); --#endif // __GLIBC__ - - return 1; - } --- -2.45.2 - diff --git a/pkgs/by-name/el/elogind/package.nix b/pkgs/by-name/el/elogind/package.nix index d424a9e6350f..2353b50efeea 100644 --- a/pkgs/by-name/el/elogind/package.nix +++ b/pkgs/by-name/el/elogind/package.nix @@ -40,13 +40,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "elogind"; - version = "255.5"; + version = "255.27"; src = fetchFromGitHub { owner = "elogind"; repo = "elogind"; rev = "v${finalAttrs.version}"; - hash = "sha256-4KZr/NiiGVwzdDROhiX3GEQTUyIGva6ezb+xC2U3bkg="; + hash = "sha256-zPKVD8gXgnjgquHgZ3F8VNIngGGN0i4lQckHokTqtP4="; }; nativeBuildInputs = [ @@ -96,46 +96,15 @@ stdenv.mkDerivation (finalAttrs: { url = "https://github.com/chimera-linux/cports/raw/49d65fe38be815b9918a15ac2d2ff2b123fc559a/main/elogind/patches/strerror_r.patch"; hash = "sha256-amqXP12mLtrkWuAURb3/aoQeeTSRYlYqL2q2zrKbhxk="; }) - (fetchurl { - url = "https://github.com/chimera-linux/cports/raw/49d65fe38be815b9918a15ac2d2ff2b123fc559a/main/elogind/patches/strerror_r_1.patch"; - hash = "sha256-tVUlmPValUPApqRX+Cqkzn7bkIILYSuCouvgRsdl9XE="; - }) (fetchpatch { url = "https://github.com/chimera-linux/cports/raw/49d65fe38be815b9918a15ac2d2ff2b123fc559a/main/elogind/patches/xxx-musl-fixes.patch"; - includes = [ - "src/basic/missing_prctl.h" - "src/libelogind/sd-journal/journal-file.h" - ]; - hash = "sha256-JYPB9AKbQpVgid5BhwBTvcebE5rxDFRMYhKRNS8KPTc="; + includes = [ "src/libelogind/sd-journal/journal-file.h" ]; + hash = "sha256-3tNz0M8PNTxISDaLP5f3Ldy5z1a+F85P6NZWpGe71Nc="; }) (fetchurl { url = "https://github.com/chimera-linux/cports/raw/49d65fe38be815b9918a15ac2d2ff2b123fc559a/main/elogind/patches/gshadow.patch"; hash = "sha256-YBy1OeWD1EluLTeUvqUvZKyrZyoUbGg1mxwqG5+VNO0="; }) - (fetchurl { - name = "FTW.patch"; - url = "https://git.openembedded.org/openembedded-core/plain/meta/recipes-core/systemd/systemd/0005-add-missing-FTW_-macros-for-musl.patch?id=6bc5e3f3cd882c81c972dbd27aacc1ce00e5e59a"; - hash = "sha256-SGvP0GT43vfyHxrmvl4AbsWQz8CPmNGyH001s3lTxng="; - }) - (fetchurl { - name = "malloc_info.patch"; - url = "https://git.openembedded.org/openembedded-core/plain/meta/recipes-core/systemd/systemd/0016-pass-correct-parameters-to-getdents64.patch?id=6bc5e3f3cd882c81c972dbd27aacc1ce00e5e59a"; - hash = "sha256-8aOw+BTtl5Qta8aqLmliKSHEirTjp1xLM195EmBdEDI="; - }) - (fetchpatch { - name = "malloc_trim.patch"; - url = "https://git.openembedded.org/openembedded-core/plain/meta/recipes-core/systemd/systemd/0020-sd-event-Make-malloc_trim-conditional-on-glibc.patch?id=6bc5e3f3cd882c81c972dbd27aacc1ce00e5e59a"; - stripLen = 3; - extraPrefix = [ "src/libelogind/" ]; - hash = "sha256-rtSnCEK+frhnlwl/UW3YHxB8MUCAq48jEzQRURpxdXk="; - }) - (fetchurl { - name = "malloc_info.patch"; - url = "https://git.openembedded.org/openembedded-core/plain/meta/recipes-core/systemd/systemd/0021-shared-Do-not-use-malloc_info-on-musl.patch?id=6bc5e3f3cd882c81c972dbd27aacc1ce00e5e59a"; - hash = "sha256-ZyOCmM5LcwJ7mHiZr0lQjV4G+XMxjhsUm7g7L3OzDDM="; - }) - ./Add-missing-musl_missing.h-includes-for-basename.patch - ./Remove-outdated-musl-hack-in-rlimit_nofile_safe.patch ./errno-list-filter-out-EFSBADCRC-and-EFSCORRUPTED.patch ]; diff --git a/pkgs/by-name/fa/faugus-launcher/package.nix b/pkgs/by-name/fa/faugus-launcher/package.nix index e27f07dcfb61..4c5e702c08f1 100644 --- a/pkgs/by-name/fa/faugus-launcher/package.nix +++ b/pkgs/by-name/fa/faugus-launcher/package.nix @@ -23,14 +23,14 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "faugus-launcher"; - version = "2.1.0"; + version = "2.2.1"; pyproject = false; src = fetchFromGitHub { owner = "Faugus"; repo = "faugus-launcher"; tag = finalAttrs.version; - hash = "sha256-Va5cPUPBfnmaTZhJhdSLBgtW4mUBM9/H6+vUrNbUiSg="; + hash = "sha256-NCWuyIhPVs+6zYpi4JYxukKyO+YLnHPOfd3APTECTFE="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/fi/fish/package.nix b/pkgs/by-name/fi/fish/package.nix index 565619aecf2e..3df137dba996 100644 --- a/pkgs/by-name/fi/fish/package.nix +++ b/pkgs/by-name/fi/fish/package.nix @@ -254,14 +254,16 @@ stdenv.mkDerivation (finalAttrs: { EOF '' + lib.optionalString stdenv.hostPlatform.isLinux '' + # Trailing space in 'awk ' to avoid matching store paths that coincidentally + # contain the string 'awk'. (Yes, this has happened before!) for cur in share/functions/*.fish; do substituteInPlace "$cur" \ --replace-quiet '/usr/bin/getent' '${lib.getExe getent}' \ - --replace-quiet 'awk' '${lib.getExe' gawk "awk"}' + --replace-quiet 'awk ' '${lib.getExe' gawk "awk"} ' done for cur in share/completions/*.fish; do substituteInPlace "$cur" \ - --replace-quiet 'awk' '${lib.getExe' gawk "awk"}' + --replace-quiet 'awk ' '${lib.getExe' gawk "awk"} ' done '' + '' diff --git a/pkgs/by-name/gh/gh/package.nix b/pkgs/by-name/gh/gh/package.nix index ad9d4b1303b2..ec42cdf8990f 100644 --- a/pkgs/by-name/gh/gh/package.nix +++ b/pkgs/by-name/gh/gh/package.nix @@ -10,7 +10,7 @@ buildGoModule (finalAttrs: { pname = "gh"; - version = "2.98.0"; + version = "2.99.0"; __structuredAttrs = true; @@ -18,10 +18,10 @@ buildGoModule (finalAttrs: { owner = "cli"; repo = "cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-2MktrI8FEvGkU2/cC6vrPtujl8fszuxz+Ey30WjRjhg="; + hash = "sha256-+66P7F+UBhqV+B/ak1LqzK8X5z+z9PLN2XhIB9FJyPg="; }; - vendorHash = "sha256-fhFsu/LjLNFwexSfUsd4X74UD+AQojLcdxU5IqOi3GY="; + vendorHash = "sha256-bVc4dhDapAp1YtO06C/nSrdxllpEhVFC2iZNPmjsJkI="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/gi/git-cliff/package.nix b/pkgs/by-name/gi/git-cliff/package.nix index 88023fb1703f..86b2231951a3 100644 --- a/pkgs/by-name/gi/git-cliff/package.nix +++ b/pkgs/by-name/gi/git-cliff/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "git-cliff"; - version = "2.13.1"; + version = "2.14.1"; src = fetchFromGitHub { owner = "orhun"; repo = "git-cliff"; rev = "v${finalAttrs.version}"; - hash = "sha256-OFVJUZ3jSuDlHYIl/8KmJJW5ZbVI12wn+bVx9XeOkvI="; + hash = "sha256-RR3jWEt8hggdWUr2K5vj/q+3nYWhrx6QPnLI6SuZ9IY="; }; - cargoHash = "sha256-wkSLz6WGsfYZobbrOaDV79Xl7f4/nDkP3z8ZFP1Cn54="; + cargoHash = "sha256-zrk1yal5CnXAHxo9UdNgzlxU/QkLymkhTEXPylHYygI="; # attempts to run the program on .git in src which is not deterministic doCheck = false; diff --git a/pkgs/by-name/go/google-chrome/package.nix b/pkgs/by-name/go/google-chrome/package.nix index 3fca0d309618..da6cefb03b13 100644 --- a/pkgs/by-name/go/google-chrome/package.nix +++ b/pkgs/by-name/go/google-chrome/package.nix @@ -180,7 +180,7 @@ let linux = stdenvNoCC.mkDerivation (finalAttrs: { inherit pname meta; - version = "152.0.7977.64"; + version = "152.0.7977.75"; src = let @@ -195,8 +195,8 @@ let url = "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${finalAttrs.version}-1_${debArch}.deb"; hash = { - amd64 = "sha256-Tq4HNqgS2byFHNKTf3rwDkfbr4MFhF7tRScD/wCYc8c="; - arm64 = "sha256-bMq3mnr+HRdMieKM8NWiZebohV/ztFxqIVGmXX3a6eg="; + amd64 = "sha256-oLemT3aP/A/1zMkmCtnrtT/Rb3oTHi42mU2li4LZE98="; + arm64 = "sha256-OFS2UlA3+NKXBIEqJoGEnE7N9peXdQ2jdCOBQD834dI="; } .${debArch}; }; @@ -306,11 +306,11 @@ let darwin = stdenvNoCC.mkDerivation (finalAttrs: { inherit pname meta; - version = "152.0.7977.65"; + version = "152.0.7977.76"; src = fetchurl { - url = "http://dl.google.com/release2/chrome/hojsgpdatugdlbpbk6whstg6m4_152.0.7977.65/GoogleChrome-152.0.7977.65.dmg"; - hash = "sha256-a3r/7DSXVfQJKNujF2xu5KPTLjJk3JLE+oFrAwktPAc="; + url = "http://dl.google.com/release2/chrome/fwccdneh3i55zgoy366y75r2ya_152.0.7977.76/GoogleChrome-152.0.7977.76.dmg"; + hash = "sha256-VuYzRvaOH0YB/I1m1Agk+l4y4al1b4o4dZZnhm7J2PQ="; }; dontPatch = true; diff --git a/pkgs/by-name/me/mediamtx/package.nix b/pkgs/by-name/me/mediamtx/package.nix index ff17cbeba55e..fa073da238ad 100644 --- a/pkgs/by-name/me/mediamtx/package.nix +++ b/pkgs/by-name/me/mediamtx/package.nix @@ -15,16 +15,16 @@ in buildGo126Module (finalAttrs: { pname = "mediamtx"; # check for hls.js version updates in internal/servers/hls/hlsjsdownloader/VERSION - version = "1.19.2"; + version = "1.20.1"; src = fetchFromGitHub { owner = "bluenviron"; repo = "mediamtx"; tag = "v${finalAttrs.version}"; - hash = "sha256-jUyA0XjR92I6RNTXtFKqrUG0v7P3DDnoThWHSxTQE2I="; + hash = "sha256-L9dRwOD5JCu3ZczTxeb3a6ShHMXGWNXVN5KAa/7bcjM="; }; - vendorHash = "sha256-i3J91K0aQ6/vC+HsJjjjWNjl9vX9uOSEzmNjB6cMU6Q="; + vendorHash = "sha256-15ERQ4TYJ+atLS3ZrOMtSq5UDWh0Q2xejepQlEJWPL4="; postPatch = '' cp ${hlsJs} internal/servers/hls/hls.min.js diff --git a/pkgs/by-name/pa/padthv1/package.nix b/pkgs/by-name/pa/padthv1/package.nix index d5dddbacf7cd..f427ac93ef42 100644 --- a/pkgs/by-name/pa/padthv1/package.nix +++ b/pkgs/by-name/pa/padthv1/package.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "padthv1"; - version = "1.4.2"; + version = "1.4.3"; src = fetchurl { url = "mirror://sourceforge/padthv1/padthv1-${finalAttrs.version}.tar.gz"; - hash = "sha256-Cuq1I18Nc6VCOgwnYzCj13lKjHGzQadWvJCGY4cJQWI="; + hash = "sha256-LtQ3TSnyJdi4Cb3C3jBLLd+BuK5XXMNEHZj7Cu9/3qw="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/rc/rcon-cli/package.nix b/pkgs/by-name/rc/rcon-cli/package.nix index bc21c7ac7a8b..55bd1de3db5e 100644 --- a/pkgs/by-name/rc/rcon-cli/package.nix +++ b/pkgs/by-name/rc/rcon-cli/package.nix @@ -6,13 +6,13 @@ }: buildGoModule (finalAttrs: { pname = "rcon-cli"; - version = "1.7.6"; + version = "1.7.7"; src = fetchFromGitHub { owner = "itzg"; repo = "rcon-cli"; tag = finalAttrs.version; - hash = "sha256-HuvRakiOlFeUbS0QVtHimhxCNaj1ppmluJbGcfR4Weg="; + hash = "sha256-OuukPDbxkUv8yGFQLBgUQwyiY2o96N1op/eDY1cP4gA="; }; vendorHash = "sha256-MxIofF5Jj+w7gxsO+F48ymtgB3bgSutmC5Jh3GcKCnA="; diff --git a/pkgs/by-name/se/serverpod_cli/package.nix b/pkgs/by-name/se/serverpod_cli/package.nix index 77611f90f0d0..decf227d2b24 100644 --- a/pkgs/by-name/se/serverpod_cli/package.nix +++ b/pkgs/by-name/se/serverpod_cli/package.nix @@ -8,14 +8,14 @@ }: buildDartApplication rec { pname = "serverpod_cli"; - version = "3.4.12"; + version = "3.4.13"; # Fetch the whole monorepo src = fetchFromGitHub { owner = "serverpod"; repo = "serverpod"; tag = version; - hash = "sha256-Za1AWzLkPL/EcJFunOrMwaE5C51/llTif7DYbTYirHs="; + hash = "sha256-IDIeYvjv4JqhzT39dQiVuNhwQ0STg/EwkwPRFqh5hCw="; }; sourceRoot = "${src.name}/tools/serverpod_cli"; diff --git a/pkgs/by-name/se/serverpod_cli/pubspec.lock.json b/pkgs/by-name/se/serverpod_cli/pubspec.lock.json index 53083e4c5f2c..2a5fa7cab995 100644 --- a/pkgs/by-name/se/serverpod_cli/pubspec.lock.json +++ b/pkgs/by-name/se/serverpod_cli/pubspec.lock.json @@ -24,11 +24,11 @@ "dependency": "direct main", "description": { "name": "archive", - "sha256": "be169cf6ac481e052c4538715d88841d567150dfe1df38aaec76461a4e7b39f2", + "sha256": "ace891da0862b0e4cabbb064ee3fd87b2728b898949fdb366d83fe98342c9f19", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.1.0" + "version": "4.2.0" }, "args": { "dependency": "direct main", @@ -124,21 +124,21 @@ "dependency": "transitive", "description": { "name": "clock", - "sha256": "fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b", + "sha256": "e51d50bca3217c9a9fa2b41a30e4a38971133f5f9ec7a3d57bae095007f1d28e", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.2" + "version": "1.1.3" }, "code_builder": { "dependency": "direct main", "description": { "name": "code_builder", - "sha256": "6a6cab2ba4680d6423f34a9b972a4c9a94ebe1b62ecec4e1a1f2cba91fd1319d", + "sha256": "aa5932e94c6c39c2f9ec4e5e06dfdd11a9430a61f6c41b6ba75b28ce0c481baf", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.11.1" + "version": "4.12.0" }, "collection": { "dependency": "direct main", @@ -264,11 +264,11 @@ "dependency": "transitive", "description": { "name": "glob", - "sha256": "c3f1ee72c96f8f78935e18aa8cecced9ab132419e8625dc187e1c2408efc20de", + "sha256": "218aeb56050c714f62a3182775320dfa04602b55074873e24e31bbd39bda96fb", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.3" + "version": "2.2.0" }, "http": { "dependency": "direct main", @@ -314,11 +314,11 @@ "dependency": "transitive", "description": { "name": "io", - "sha256": "dfd5a80599cf0165756e3181807ed3e77daf6dd4137caaad72d0b7931597650b", + "sha256": "2635216ca6a737e60de577ffa1a48a0bec76ca8a62917cfc1bb88c14c570646f", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.0.5" + "version": "1.1.0" }, "json_annotation": { "dependency": "transitive", @@ -394,11 +394,11 @@ "dependency": "transitive", "description": { "name": "mime", - "sha256": "41a20518f0cb1256669420fdba0cd90d21561e560ac240f26ef8322e45bb7ed6", + "sha256": "bd47de35f07e27267e69c8c8b22edf9473bfee170a60d60fcc93730c5144b7f6", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.0" + "version": "2.1.0" }, "node_preamble": { "dependency": "transitive", @@ -444,11 +444,11 @@ "dependency": "transitive", "description": { "name": "pool", - "sha256": "978783255c543aa3586a1b3c21f6e9d720eb315376a915872c61ef8b5c20177d", + "sha256": "4177f68c237ea2128d1bee66ac17b2ce05ba3dbaafcbdd54c5d40a39d0b6b11c", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.5.2" + "version": "1.5.3" }, "posix": { "dependency": "transitive", @@ -474,21 +474,21 @@ "dependency": "direct main", "description": { "name": "pub_semver", - "sha256": "5bfcf68ca79ef689f8990d1160781b4bad40a3bd5e5218ad4076ddb7f4081585", + "sha256": "261236774e8b1d69cfc6b9eabbc96c40f25e7a2d6b171f3385d4f65d5734fb24", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.2.0" + "version": "2.2.1" }, "pubspec_parse": { "dependency": "direct main", "description": { "name": "pubspec_parse", - "sha256": "0560ba233314abbed0a48a2956f7f022cce7c3e1e73df540277da7544cad4082", + "sha256": "c38b81cbf34450b67e0265d73433569d12e34782e30ed769c9cc99c9d5f2e796", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.5.0" + "version": "1.6.0" }, "recase": { "dependency": "direct main", @@ -514,51 +514,51 @@ "dependency": "transitive", "description": { "name": "serverpod_client", - "sha256": "abc79908adf3042c113dd7792dd0e183dc93208794299309bbf56821f3153d7c", + "sha256": "8388185c0eefe2c356c271427d37427cf2b366b3c095da79b7d8be9940cb10bd", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.4.12" + "version": "3.4.13" }, "serverpod_lints": { "dependency": "direct dev", "description": { "name": "serverpod_lints", - "sha256": "0d16adb1de3ea4ea25172089bd609259708cba288a78fae7b8ecd9cf26a09bb6", + "sha256": "61dd19505fb02a4df0fe9cfb9b6c14890b2cc54d10034bf2cafd19eabc8362ac", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.4.12" + "version": "3.4.13" }, "serverpod_serialization": { "dependency": "direct main", "description": { "name": "serverpod_serialization", - "sha256": "80d6bb6e4c8a01bc25b30fbbebc1991fd4c1ce301164599030942c39eee6a95b", + "sha256": "807afab39b758f7b21a870af87abfaa24ebdf49aa5d1d9d122b0f3e51157873e", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.4.12" + "version": "3.4.13" }, "serverpod_service_client": { "dependency": "direct main", "description": { "name": "serverpod_service_client", - "sha256": "31f8fe432822cf07c75aa3ec38ca1614d008de7d0d8c83bb966f0ae52d2a0d5c", + "sha256": "18e8a001a4b901392d02ba337fe63f64a532ca347a5b6f85243cfe4bd229d00d", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.4.12" + "version": "3.4.13" }, "serverpod_shared": { "dependency": "direct main", "description": { "name": "serverpod_shared", - "sha256": "2fe566d6623af3e3f6423652feeb1b96613bad18d1b83590d78b746eeefdfa07", + "sha256": "31691846277a6610a63bdec41dca61cd794ddc746becf875a1cc7bdd572fd651", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.4.12" + "version": "3.4.13" }, "shelf": { "dependency": "transitive", @@ -634,11 +634,11 @@ "dependency": "transitive", "description": { "name": "stack_trace", - "sha256": "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1", + "sha256": "277654b3034d17ac6f9f1cb5595db011b1d5d41e8806866db28e0abaa101c490", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.12.1" + "version": "1.12.2" }, "stream_channel": { "dependency": "direct main", @@ -814,11 +814,11 @@ "dependency": "direct main", "description": { "name": "yaml", - "sha256": "b9da305ac7c39faa3f030eccd175340f968459dae4af175130b3fc47e40d76ce", + "sha256": "f67cdd8e07d3c6329146aaef1ba043542b3134c12489f553ca9a7435d1068aea", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.1.3" + "version": "3.1.4" }, "yaml_edit": { "dependency": "direct main", diff --git a/pkgs/by-name/sq/squawk/package.nix b/pkgs/by-name/sq/squawk/package.nix index 68f22ab30b20..63fad95d7ac6 100644 --- a/pkgs/by-name/sq/squawk/package.nix +++ b/pkgs/by-name/sq/squawk/package.nix @@ -10,16 +10,16 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "squawk"; - version = "2.63.0"; + version = "2.64.0"; src = fetchFromGitHub { owner = "sbdchd"; repo = "squawk"; tag = "v${finalAttrs.version}"; - hash = "sha256-9ZcidQphREqvIw+AiToSCybFNuWic7zFTmOvNI+zpgQ="; + hash = "sha256-oi9u7BhZmgOJtbv0gpBnoOoydvxKUrr0MzSOmRx0Rfs="; }; - cargoHash = "sha256-wHf4TDVFkd0vt60BiF0qh56j/kSkryaLfvyAy3XlQt0="; + cargoHash = "sha256-RX5BTBRsx8lgpDe0NLP5sNsmApABZXoPycRtZbar4qg="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/development/libraries/qt-5/5.15/default.nix b/pkgs/development/libraries/qt-5/5.15/default.nix index 735afc3c5146..5ef17e29aa22 100644 --- a/pkgs/development/libraries/qt-5/5.15/default.nix +++ b/pkgs/development/libraries/qt-5/5.15/default.nix @@ -11,14 +11,12 @@ lib, stdenv, callPackages, - gcc14Stdenv, fetchurl, fetchgit, fetchpatch, fetchFromGitHub, makeSetupHook, python3, - llvmPackages_19, darwin, # options diff --git a/pkgs/development/python-modules/dbus-signature-pyparsing/default.nix b/pkgs/development/python-modules/dbus-signature-pyparsing/default.nix index 3385b90b6e0f..a9405eae6715 100644 --- a/pkgs/development/python-modules/dbus-signature-pyparsing/default.nix +++ b/pkgs/development/python-modules/dbus-signature-pyparsing/default.nix @@ -2,25 +2,30 @@ lib, buildPythonPackage, fetchFromGitHub, + setuptools, pyparsing, pytestCheckHook, hypothesis, hs-dbus-signature, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "dbus-signature-pyparsing"; version = "0.4.1"; - format = "setuptools"; + pyproject = true; + + __structuredAttrs = true; src = fetchFromGitHub { owner = "stratis-storage"; repo = "dbus-signature-pyparsing"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-+jY8kg3jBDpZr5doih3DiyUEcSskq7TgubmW3qdBoZM="; }; - propagatedBuildInputs = [ pyparsing ]; + build-system = [ setuptools ]; + + dependencies = [ pyparsing ]; nativeCheckInputs = [ pytestCheckHook hypothesis @@ -35,4 +40,4 @@ buildPythonPackage rec { license = lib.licenses.asl20; maintainers = with lib.maintainers; [ nickcao ]; }; -} +}) diff --git a/pkgs/development/python-modules/python-pooldose/default.nix b/pkgs/development/python-modules/python-pooldose/default.nix index a99bc9ff5d88..1ac6c7253d7d 100644 --- a/pkgs/development/python-modules/python-pooldose/default.nix +++ b/pkgs/development/python-modules/python-pooldose/default.nix @@ -13,14 +13,14 @@ buildPythonPackage (finalAttrs: { pname = "python-pooldose"; - version = "0.9.9"; + version = "0.9.11"; pyproject = true; src = fetchFromGitHub { owner = "lmaertin"; repo = "python-pooldose"; tag = finalAttrs.version; - hash = "sha256-03U6x1Q0f8oH58Z3IDUW82dc24Od9+fqF/fF0mbzcgg="; + hash = "sha256-4KHc9WUT3zlu6RvuEYTcZrKqS+Z32khRb9PDMhOz1XQ="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/scverse-misc/default.nix b/pkgs/development/python-modules/scverse-misc/default.nix index b5f827fa96cd..0a4357acc177 100644 --- a/pkgs/development/python-modules/scverse-misc/default.nix +++ b/pkgs/development/python-modules/scverse-misc/default.nix @@ -29,7 +29,7 @@ buildPythonPackage (finalAttrs: { pname = "scverse-misc"; - version = "0.1.3"; + version = "0.1.4"; pyproject = true; __structuredAttrs = true; @@ -37,7 +37,7 @@ buildPythonPackage (finalAttrs: { owner = "scverse"; repo = "scverse-misc"; tag = "v${finalAttrs.version}"; - hash = "sha256-5AKqvB3MFEPXgIQN7Z0LT4pW7gmJiHg1Qy7CZVnwPO8="; + hash = "sha256-MEtKDWCmg5B6//uwSfRGTShShE+T/bdXWGsuN/iX9bA="; }; build-system = [ diff --git a/pkgs/development/rocq-modules/hierarchy-builder/default.nix b/pkgs/development/rocq-modules/hierarchy-builder/default.nix index 3ed67fea6b91..5e0a438b07e4 100644 --- a/pkgs/development/rocq-modules/hierarchy-builder/default.nix +++ b/pkgs/development/rocq-modules/hierarchy-builder/default.nix @@ -66,6 +66,9 @@ let lib.optionalAttrs (lib.versions.isGe "1.2.0" o.version || o.version == "dev") { buildPhase = "make build"; } + // (lib.optionalAttrs (lib.versions.range "1.1" "1.6" o.version) { + nativeBuildInputs = [ rocq-core.ocamlPackages.ocaml ] ++ o.nativeBuildInputs; + }) // ( if lib.versions.range "1.1.0" "1.9.1" o.version then { installFlags = [ "DESTDIR=$(out)" ] ++ o.installFlags; } diff --git a/pkgs/os-specific/linux/batman-adv/default.nix b/pkgs/os-specific/linux/batman-adv/default.nix index 89c7a4dc30f6..97bd265fb667 100644 --- a/pkgs/os-specific/linux/batman-adv/default.nix +++ b/pkgs/os-specific/linux/batman-adv/default.nix @@ -45,5 +45,6 @@ stdenv.mkDerivation rec { philiptaron ]; platforms = with lib.platforms; linux; + broken = lib.versionOlder kernel.version cfg.minKernelVersion; }; } diff --git a/pkgs/os-specific/linux/batman-adv/version.nix b/pkgs/os-specific/linux/batman-adv/version.nix index 8f05cf345198..e37fc221b31c 100644 --- a/pkgs/os-specific/linux/batman-adv/version.nix +++ b/pkgs/os-specific/linux/batman-adv/version.nix @@ -1,14 +1,16 @@ { - version = "2026.2"; + version = "2026.3"; + + minKernelVersion = "5.15"; # To get these, run: # # ``` - # for tool in alfred batctl batman-adv; do nix-prefetch-url https://downloads.open-mesh.org/batman/releases/batman-adv-2026.2/$tool-2026.2.tar.gz --type sha256 | xargs nix --extra-experimental-features nix-command hash convert --hash-algo sha256 --to sri; done + # for tool in alfred batctl batman-adv; do nix-prefetch-url https://downloads.open-mesh.org/batman/releases/batman-adv-2026.3/$tool-2026.3.tar.gz --type sha256 | xargs nix --extra-experimental-features nix-command hash convert --hash-algo sha256 --to sri; done # ``` sha256 = { - alfred = "sha256-2ZV0i+X2KkIJFSXMwQLfWsZCGG6bkBRpipVaRGm2m5Y="; - batctl = "sha256-wdWAr7Bm0xZcI5tnQwuUxpkyYZwGqQsSlegoy1CBsSI="; - batman-adv = "sha256-Thf87SyAlF4iYJvodTRIFzP/G10XBQ3k5PMjwXFBgTU="; + alfred = "sha256-H4FQVIGqSIjpcRazdPKVOqQsJdoQYphGciadxZG7BDE="; + batctl = "sha256-LIRD+uezRxpQCDf4z7vCt7urYC5DzoxhsQBWDewdnuA="; + batman-adv = "sha256-w1JOfY8Uh4agUmVKexCQ45R0bTpx7l1lf5ht168WF2I="; }; } diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 0f4102740f91..68c38328ed98 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -1213,6 +1213,9 @@ let SCSI_LOWLEVEL_PCMCIA = yes; SCSI_SAS_ATA = yes; # added to enable detection of hard drive + # Required for booting our ISO in qemu's IBM pSeries machine emulation mode via '-cdrom'. + SCSI_IBMVSCSI = lib.mkIf (stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isBigEndian) yes; + SPI = yes; # needed for many devices SPI_MASTER = yes;