mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-07-22 08:30:57 +00:00
Merge staging-next into staging
This commit is contained in:
46
.github/actions/checkout/action.yml
vendored
46
.github/actions/checkout/action.yml
vendored
@@ -7,6 +7,8 @@ inputs:
|
||||
description: "Whether and which SHA to checkout for the merge commit in the ./nixpkgs/untrusted folder."
|
||||
target-as-trusted-at:
|
||||
description: "Whether and which SHA to checkout for the target commit in the ./nixpkgs/trusted folder."
|
||||
untrusted-pin-bump:
|
||||
description: "Commit that bumps ci/pinned.json; when set, ./nixpkgs/untrusted and ./nixpkgs/untrusted-pinned are derived from this commit."
|
||||
|
||||
runs:
|
||||
using: composite
|
||||
@@ -15,6 +17,7 @@ runs:
|
||||
env:
|
||||
MERGED_SHA: ${{ inputs.merged-as-untrusted-at }}
|
||||
TARGET_SHA: ${{ inputs.target-as-trusted-at }}
|
||||
PIN_BUMP_SHA: ${{ inputs.untrusted-pin-bump }}
|
||||
with:
|
||||
script: |
|
||||
const { spawn } = require('node:child_process')
|
||||
@@ -52,13 +55,18 @@ runs:
|
||||
return pinned.pins.nixpkgs.revision
|
||||
}
|
||||
|
||||
const pin_bump_sha = process.env.PIN_BUMP_SHA
|
||||
|
||||
// When dealing with a pin bump commit, we need `--depth=2` to view & apply its diff
|
||||
const depth = pin_bump_sha ? 2 : 1
|
||||
|
||||
const commits = [
|
||||
{
|
||||
sha: process.env.MERGED_SHA,
|
||||
path: 'untrusted',
|
||||
},
|
||||
{
|
||||
sha: await getPinnedSha(process.env.MERGED_SHA),
|
||||
sha: await getPinnedSha(pin_bump_sha || process.env.MERGED_SHA),
|
||||
path: 'untrusted-pinned'
|
||||
},
|
||||
{
|
||||
@@ -68,14 +76,17 @@ runs:
|
||||
{
|
||||
sha: await getPinnedSha(process.env.TARGET_SHA),
|
||||
path: 'trusted-pinned'
|
||||
},
|
||||
{
|
||||
sha: pin_bump_sha
|
||||
}
|
||||
].filter(({ sha }) => Boolean(sha))
|
||||
|
||||
console.log('Checking out the following commits:', commits)
|
||||
console.log('Fetching the following commits:', commits)
|
||||
|
||||
// Fetching all commits at once is much faster than doing multiple checkouts.
|
||||
// This would fail without --refetch, because the we had a partial clone before, but changed it above.
|
||||
await run('git', 'fetch', '--depth=1', '--refetch', 'origin', ...(commits.map(({ sha }) => sha)))
|
||||
await run('git', 'fetch', `--depth=${depth}`, '--refetch', 'origin', ...(commits.map(({ sha }) => sha)))
|
||||
|
||||
// Checking out onto tmpfs takes 1s and is faster by at least factor 10x.
|
||||
await run('mkdir', 'nixpkgs')
|
||||
@@ -89,8 +100,27 @@ runs:
|
||||
}
|
||||
|
||||
// Create all worktrees in parallel.
|
||||
await Promise.all(commits.map(async ({ sha, path }) => {
|
||||
await run('git', 'worktree', 'add', join('nixpkgs', path), sha, '--no-checkout')
|
||||
await run('git', '-C', join('nixpkgs', path), 'sparse-checkout', 'disable')
|
||||
await run('git', '-C', join('nixpkgs', path), 'checkout', '--progress')
|
||||
}))
|
||||
await Promise.all(
|
||||
commits
|
||||
.filter(({ path }) => Boolean(path))
|
||||
.map(async ({ sha, path }) => {
|
||||
await run('git', 'worktree', 'add', join('nixpkgs', path), sha, '--no-checkout')
|
||||
await run('git', '-C', join('nixpkgs', path), 'sparse-checkout', 'disable')
|
||||
await run('git', '-C', join('nixpkgs', path), 'checkout', '--progress')
|
||||
})
|
||||
)
|
||||
|
||||
// Apply pin bump to untrusted worktree
|
||||
if (pin_bump_sha) {
|
||||
console.log('Applying untrusted ci/pinned.json bump:', pin_bump_sha)
|
||||
try {
|
||||
await run('git', '-C', join('nixpkgs', 'untrusted'), 'cherry-pick', '--no-commit', pin_bump_sha)
|
||||
} catch {
|
||||
core.setFailed([
|
||||
`Failed to apply ci/pinned.json bump commit ${pin_bump_sha}.`,
|
||||
`This commit does not apply cleanly onto the untrusted base ${process.env.MERGED_SHA}.`,
|
||||
`Please rebase the PR or ensure the pin bump is standalone.`
|
||||
].join(' '))
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
8
.github/workflows/build.yml
vendored
8
.github/workflows/build.yml
vendored
@@ -41,7 +41,7 @@ jobs:
|
||||
- runner: ubuntu-24.04-arm
|
||||
name: aarch64-linux
|
||||
systems: aarch64-linux
|
||||
builds: [shell, manual-nixos, manual-nixpkgs, manual-nixpkgs-tests]
|
||||
builds: [shell, manual-nixos, manual-nixpkgs]
|
||||
desc: shell, docs
|
||||
- runner: macos-14
|
||||
name: darwin
|
||||
@@ -90,11 +90,7 @@ jobs:
|
||||
|
||||
- name: Build Nixpkgs manual
|
||||
if: contains(matrix.builds, 'manual-nixpkgs') && !cancelled()
|
||||
run: nix-build-uncached nixpkgs/untrusted/ci --arg nixpkgs ./nixpkgs/untrusted-pinned -A manual-nixpkgs -A manual-nixpkgs-tests
|
||||
|
||||
- name: Build Nixpkgs manual tests
|
||||
if: contains(matrix.builds, 'manual-nixpkgs-tests') && !cancelled()
|
||||
run: nix-build-uncached nixpkgs/untrusted/ci --arg nixpkgs ./nixpkgs/untrusted-pinned -A manual-nixpkgs-tests
|
||||
run: nix-build-uncached nixpkgs/untrusted/ci --arg nixpkgs ./nixpkgs/untrusted-pinned -A manual-nixpkgs
|
||||
|
||||
- name: Build lib tests
|
||||
if: contains(matrix.builds, 'lib-tests') && !cancelled()
|
||||
|
||||
93
.github/workflows/eval.yml
vendored
93
.github/workflows/eval.yml
vendored
@@ -9,7 +9,11 @@ on:
|
||||
mergedSha:
|
||||
required: true
|
||||
type: string
|
||||
headSha:
|
||||
required: false # only required when testVersions is true
|
||||
type: string
|
||||
targetSha:
|
||||
required: true
|
||||
type: string
|
||||
systems:
|
||||
required: true
|
||||
@@ -36,6 +40,8 @@ jobs:
|
||||
runs-on: ubuntu-slim
|
||||
outputs:
|
||||
versions: ${{ steps.versions.outputs.versions }}
|
||||
ciPinBumpCommit: ${{ steps.find-pinned-commit.outputs.ciPinBumpCommit }}
|
||||
ciPinBumpCommitShort: ${{ steps.find-pinned-commit.outputs.ciPinBumpCommitShort }}
|
||||
steps:
|
||||
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
|
||||
with:
|
||||
@@ -53,6 +59,78 @@ jobs:
|
||||
sparse-checkout: |
|
||||
ci/pinned.json
|
||||
|
||||
- name: Find commit that touched ci/pinned.json
|
||||
id: find-pinned-commit
|
||||
uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
|
||||
env:
|
||||
TARGET_SHA: ${{ inputs.targetSha }}
|
||||
HEAD_SHA: ${{ inputs.headSha }}
|
||||
with:
|
||||
script: |
|
||||
const targetSha = process.env.TARGET_SHA
|
||||
const headSha = process.env.HEAD_SHA
|
||||
|
||||
if (!targetSha || !headSha) {
|
||||
core.setFailed('Error: Both targetSha and headSha inputs are required when testVersions is true.')
|
||||
return
|
||||
}
|
||||
|
||||
// Compare the two commits to get the list of commits in between
|
||||
const comparison = await github.rest.repos.compareCommitsWithBasehead({
|
||||
...context.repo,
|
||||
basehead: `${targetSha}...${headSha}`,
|
||||
})
|
||||
|
||||
if(comparison.data.commits.length > 50) {
|
||||
core.setFailed('Error: Too many commits in comparison, cannot reliably find pinned.json change.')
|
||||
return
|
||||
}
|
||||
|
||||
const logRateLimit = async (label) => {
|
||||
const { data } = await github.rest.rateLimit.get()
|
||||
const { remaining, limit, used } = data.rate
|
||||
core.info(`[Rate Limit ${label}] ${remaining}/${limit} remaining (${used} used)`)
|
||||
}
|
||||
|
||||
await logRateLimit('before commit filtering')
|
||||
|
||||
// Filter commits that modified ci/pinned.json
|
||||
const commitsModifyingPinned = (
|
||||
await Promise.all(
|
||||
comparison.data.commits.map(async (commit) => {
|
||||
const commitDetails = await github.rest.repos.getCommit({
|
||||
...context.repo,
|
||||
ref: commit.sha,
|
||||
})
|
||||
const modifiesPinned = commitDetails.data.files?.some(
|
||||
(file) => file.filename === "ci/pinned.json"
|
||||
)
|
||||
return modifiesPinned ? commit.sha : null
|
||||
})
|
||||
)
|
||||
).filter((sha) => sha !== null)
|
||||
|
||||
await logRateLimit('after commit filtering')
|
||||
|
||||
if (commitsModifyingPinned.length === 0) {
|
||||
// This should not happen as testVersions should only be true
|
||||
// when ci/pinned.json was modified in the PR.
|
||||
core.setFailed("Error: ci/pinned.json was not modified in this PR")
|
||||
return
|
||||
} else if (commitsModifyingPinned.length > 1) {
|
||||
core.setFailed([
|
||||
"Error: Multiple commits touch ci/pinned.json in this PR:",
|
||||
...commitsModifyingPinned,
|
||||
"Please ensure only a single commit modifies ci/pinned.json for accurate version matrix evaluation."
|
||||
].join("\n"))
|
||||
return
|
||||
}
|
||||
|
||||
const ciPinBumpCommit = commitsModifyingPinned[0]
|
||||
core.setOutput("ciPinBumpCommit", ciPinBumpCommit)
|
||||
core.setOutput("ciPinBumpCommitShort", ciPinBumpCommit.substring(0, 7))
|
||||
core.info(`Found pinned.json commit: ${ciPinBumpCommit}`)
|
||||
|
||||
- name: Install Nix
|
||||
uses: cachix/install-nix-action@4e002c8ec80594ecd40e759629461e26c8abed15 # v31
|
||||
|
||||
@@ -75,7 +153,7 @@ jobs:
|
||||
# Failures for versioned Evals will be collected in a separate job below
|
||||
# to not interrupt main Eval's compare step.
|
||||
continue-on-error: ${{ matrix.version != '' }}
|
||||
name: ${{ matrix.system }}${{ matrix.version && format(' @ {0}', matrix.version) || '' }}
|
||||
name: ${{ matrix.system }}${{ matrix.version && format(' @ {0} ({1})', matrix.version, needs.versions.outputs.ciPinBumpCommitShort) || '' }}
|
||||
timeout-minutes: 15
|
||||
steps:
|
||||
# This is not supposed to be used and just acts as a fallback.
|
||||
@@ -96,7 +174,9 @@ jobs:
|
||||
- name: Check out the PR at merged and target commits
|
||||
uses: ./.github/actions/checkout
|
||||
with:
|
||||
merged-as-untrusted-at: ${{ inputs.mergedSha }}
|
||||
# For versioned evals, use the target as the untrusted base and apply the pin-bump commit
|
||||
merged-as-untrusted-at: ${{ matrix.version && inputs.targetSha || inputs.mergedSha }}
|
||||
untrusted-pin-bump: ${{ matrix.version && needs.versions.outputs.ciPinBumpCommit }}
|
||||
target-as-trusted-at: ${{ inputs.targetSha }}
|
||||
|
||||
- name: Install Nix
|
||||
@@ -284,6 +364,7 @@ jobs:
|
||||
ARTIFACT_PREFIX: ${{ inputs.artifact-prefix }}
|
||||
SYSTEMS: ${{ inputs.systems }}
|
||||
VERSIONS: ${{ needs.versions.outputs.versions }}
|
||||
CI_PIN_BUMP_COMMIT: ${{ needs.versions.outputs.ciPinBumpCommit }}
|
||||
with:
|
||||
script: |
|
||||
const { readFileSync } = require('node:fs')
|
||||
@@ -292,8 +373,10 @@ jobs:
|
||||
const prefix = process.env.ARTIFACT_PREFIX
|
||||
const systems = JSON.parse(process.env.SYSTEMS)
|
||||
const versions = JSON.parse(process.env.VERSIONS)
|
||||
const ciPinBumpCommit = process.env.CI_PIN_BUMP_COMMIT
|
||||
|
||||
core.summary.addHeading('Lix/Nix version comparison')
|
||||
core.summary.addRaw(`\n*Evaluated at commit: \`${ciPinBumpCommit}\` (commit that modified ci/pinned.json)*\n`, true)
|
||||
core.summary.addTable(
|
||||
[].concat(
|
||||
[
|
||||
@@ -324,7 +407,11 @@ jobs:
|
||||
.filter((attr) => attr.split('.').length > 1)
|
||||
if (attrs.length > 0) {
|
||||
core.setFailed(
|
||||
`${version} on ${system} has changed outpaths!\nNote: Please make sure to update ci/pinned.json separately from changes to other packages.`,
|
||||
`${version} on ${system} has changed outpaths!\n` +
|
||||
`Note: This indicates that commit ${ciPinBumpCommit} ` +
|
||||
`(which modified ci/pinned.json) also contains other ` +
|
||||
`changes affecting package outputs. ` +
|
||||
`Please ensure ci/pinned.json is updated in a standalone commit.`
|
||||
)
|
||||
return { data: ':x:' }
|
||||
}
|
||||
|
||||
1
.github/workflows/pull-request-target.yml
vendored
1
.github/workflows/pull-request-target.yml
vendored
@@ -86,6 +86,7 @@ jobs:
|
||||
with:
|
||||
artifact-prefix: ${{ inputs.artifact-prefix }}
|
||||
mergedSha: ${{ needs.prepare.outputs.mergedSha }}
|
||||
headSha: ${{ github.event.pull_request.head.sha }}
|
||||
targetSha: ${{ needs.prepare.outputs.targetSha }}
|
||||
systems: ${{ needs.prepare.outputs.systems }}
|
||||
testVersions: ${{ contains(fromJSON(needs.prepare.outputs.touched), 'pinned') && !contains(fromJSON(needs.prepare.outputs.headBranch).type, 'development') }}
|
||||
|
||||
@@ -172,7 +172,6 @@ rec {
|
||||
lib-tests = import ../lib/tests/release.nix { inherit pkgs; };
|
||||
manual-nixos = (import ../nixos/release.nix { }).manual.${system} or null;
|
||||
manual-nixpkgs = (import ../doc { inherit pkgs; });
|
||||
manual-nixpkgs-tests = (import ../doc { inherit pkgs; }).tests;
|
||||
nixpkgs-vet = pkgs.callPackage ./nixpkgs-vet.nix {
|
||||
nix = pkgs.nixVersions.latest;
|
||||
};
|
||||
|
||||
@@ -133,6 +133,11 @@ module.exports = async ({ github, context, core, dry }) => {
|
||||
id,
|
||||
})
|
||||
.then((resp) => resp.data)
|
||||
.catch((e) => {
|
||||
// User may have deleted their account
|
||||
if (e.status === 404) return null
|
||||
throw e
|
||||
})
|
||||
}
|
||||
|
||||
return users[id]
|
||||
|
||||
@@ -42,9 +42,15 @@ async function handleReviewers({
|
||||
}
|
||||
|
||||
const users = new Set([
|
||||
...(await Promise.all(
|
||||
maintainers.map(async (id) => (await getUser(id)).login.toLowerCase()),
|
||||
)),
|
||||
...(
|
||||
await Promise.all(
|
||||
maintainers.map(async (id) => {
|
||||
const user = await getUser(id)
|
||||
// User may have deleted their account
|
||||
return user?.login?.toLowerCase()
|
||||
}),
|
||||
)
|
||||
).filter(Boolean),
|
||||
...owners
|
||||
.filter((handle) => handle && !handle.includes('/'))
|
||||
.map((handle) => handle.toLowerCase()),
|
||||
|
||||
@@ -168,6 +168,7 @@ stdenvNoCC.mkDerivation (
|
||||
};
|
||||
|
||||
tests = {
|
||||
# Don't run this in CI because it's not reproducible
|
||||
manpage-urls = callPackage ../tests/manpage-urls.nix { };
|
||||
};
|
||||
};
|
||||
|
||||
@@ -61,6 +61,8 @@
|
||||
|
||||
- `spoof` has been removed, as there are many issues upstream with it working on modern OS versions, and it appears to be unmaintained.
|
||||
|
||||
- `nodePackages.wavedrom-cli` has been removed, as it was unmaintained within nixpkgs.
|
||||
|
||||
- `kanata` now requires `karabiner-dk` version 6.0+ or later.
|
||||
The package has been updated to use the new `karabiner-dk` package and the `darwinDriver` output stays at the version defined in the package.
|
||||
|
||||
|
||||
@@ -58,12 +58,19 @@ logFailure() {
|
||||
evalConfig() {
|
||||
local attr=$1
|
||||
shift
|
||||
local script="import ./default.nix { modules = [ $* ];}"
|
||||
|
||||
local nix_args=()
|
||||
|
||||
if [ "${ABORT_ON_WARN-0}" = "1" ]; then
|
||||
local-nix-instantiate --option abort-on-warn true -E "$script" -A "$attr"
|
||||
else
|
||||
local-nix-instantiate -E "$script" -A "$attr"
|
||||
nix_args+=(--option abort-on-warn true)
|
||||
fi
|
||||
|
||||
if [ "${STRICT_EVAL-0}" = "1" ]; then
|
||||
nix_args+=(--strict)
|
||||
fi
|
||||
|
||||
local script="import ./default.nix { modules = [ $* ];}"
|
||||
local-nix-instantiate "${nix_args[@]}" -E "$script" -A "$attr"
|
||||
}
|
||||
|
||||
reportFailure() {
|
||||
@@ -247,6 +254,19 @@ checkConfigError 'A definition for option .* is not of type .fileset.. Definitio
|
||||
checkConfigError 'A definition for option .* is not of type .fileset.. Definition values:\n.*' config.filesetCardinal.err3 ./fileset.nix
|
||||
checkConfigError 'A definition for option .* is not of type .fileset.. Definition values:\n.*' config.filesetCardinal.err4 ./fileset.nix
|
||||
|
||||
# types.serializableValueWith
|
||||
checkConfigOutput '^null$' config.nullableValue.null ./types.nix
|
||||
checkConfigOutput '^true$' config.nullableValue.bool ./types.nix
|
||||
checkConfigOutput '^1$' config.nullableValue.int ./types.nix
|
||||
checkConfigOutput '^1.1$' config.nullableValue.float ./types.nix
|
||||
checkConfigOutput '^"foo"$' config.nullableValue.str ./types.nix
|
||||
checkConfigOutput '^".*/store.*"$' config.nullableValue.path ./types.nix
|
||||
STRICT_EVAL=1 checkConfigOutput '^\{"foo":1\}$' config.nullableValue.attrs ./types.nix
|
||||
STRICT_EVAL=1 checkConfigOutput '^\[\{"bar":\[1\]\}\]$' config.nullableValue.list ./types.nix
|
||||
|
||||
checkConfigError 'A definition for option .* is not of type .VAL value.. .*' config.nullableValue.lambda ./types.nix
|
||||
checkConfigError 'A definition for option .* is not of type .VAL value.. .*' config.structuredValue.null ./types.nix
|
||||
|
||||
# Check boolean option.
|
||||
checkConfigOutput '^false$' config.enable ./declare-enable.nix
|
||||
checkConfigError 'The option .* does not exist. Definition values:\n\s*- In .*: true' config.enable ./define-enable.nix
|
||||
|
||||
@@ -16,6 +16,19 @@ in
|
||||
options = {
|
||||
pathInStore = mkOption { type = types.lazyAttrsOf types.pathInStore; };
|
||||
externalPath = mkOption { type = types.lazyAttrsOf types.externalPath; };
|
||||
# serializableValueWith
|
||||
nullableValue = mkOption {
|
||||
type = types.attrsOf (types.serializableValueWith { typeName = "VAL"; });
|
||||
};
|
||||
structuredValue = mkOption {
|
||||
type = types.attrsOf (
|
||||
types.serializableValueWith {
|
||||
typeName = "VAL";
|
||||
nullable = false;
|
||||
}
|
||||
);
|
||||
};
|
||||
|
||||
assertions = mkOption { };
|
||||
};
|
||||
config = {
|
||||
@@ -35,6 +48,22 @@ in
|
||||
externalPath.ok1 = "/foo/bar";
|
||||
externalPath.ok2 = "/";
|
||||
|
||||
# serializableValueWith { nullable = true; }
|
||||
nullableValue.null = null; # null
|
||||
nullableValue.bool = true; # bool
|
||||
nullableValue.int = 1; # int
|
||||
nullableValue.float = 1.1; # float
|
||||
nullableValue.str = "foo"; # str
|
||||
nullableValue.path = ./.; # path
|
||||
nullableValue.attrs = {
|
||||
foo = 1;
|
||||
};
|
||||
nullableValue.list = [ { bar = [ 1 ]; } ]; # list
|
||||
nullableValue.lambda = x: x; # Error
|
||||
|
||||
# serializableValueWith { nullable = false; }
|
||||
structuredValue.null = null; # Error
|
||||
|
||||
assertions =
|
||||
with lib.types;
|
||||
|
||||
@@ -486,6 +515,9 @@ in
|
||||
assert (unique { message = "custom"; } (listOf str)).description == "list of string";
|
||||
assert (unique { message = "test"; } (either int str)).description == "signed integer or string";
|
||||
assert (unique { message = "test"; } (listOf str)).description == "list of string";
|
||||
# json & toml
|
||||
assert json.description == "JSON value";
|
||||
assert toml.description == "TOML value";
|
||||
# done
|
||||
"ok";
|
||||
};
|
||||
|
||||
@@ -1437,6 +1437,45 @@ rec {
|
||||
};
|
||||
};
|
||||
|
||||
/**
|
||||
Creates a value type suitable for serialization formats.
|
||||
|
||||
Parameters:
|
||||
- typeName: String describing the format (e.g. "JSON", "YAML", "XML")
|
||||
- nullable: Whether the structured value type allows `null` values.
|
||||
|
||||
Returns a type suitable for structured data formats that supports:
|
||||
- Basic types: boolean, integer, float, string, path
|
||||
- Complex types: attribute sets and lists
|
||||
*/
|
||||
serializableValueWith =
|
||||
{
|
||||
typeName,
|
||||
nullable ? true,
|
||||
}:
|
||||
let
|
||||
baseType = oneOf [
|
||||
bool
|
||||
int
|
||||
float
|
||||
str
|
||||
path
|
||||
(attrsOf valueType)
|
||||
(listOf valueType)
|
||||
];
|
||||
valueType = (if nullable then nullOr baseType else baseType) // {
|
||||
description = "${typeName} value";
|
||||
};
|
||||
in
|
||||
valueType;
|
||||
|
||||
json = serializableValueWith { typeName = "JSON"; };
|
||||
|
||||
toml = serializableValueWith {
|
||||
typeName = "TOML";
|
||||
nullable = false;
|
||||
};
|
||||
|
||||
# Either value of type `t1` or `t2`.
|
||||
either =
|
||||
t1: t2:
|
||||
|
||||
@@ -497,6 +497,20 @@ Composed types are types that take a type as parameter. `listOf
|
||||
value of type *`to`*. Can be used to preserve backwards compatibility
|
||||
of an option if its type was changed.
|
||||
|
||||
`types.json`
|
||||
|
||||
: A type representing JSON-compatible values. This includes `null`, booleans,
|
||||
integers, floats, strings, paths, attribute sets, and lists.
|
||||
Attribute sets and lists can be arbitrarily nested and contain any JSON-compatible
|
||||
values.
|
||||
|
||||
`types.toml`
|
||||
|
||||
: A type representing TOML-compatible values. This includes booleans,
|
||||
integers, floats, strings, paths, attribute sets, and lists.
|
||||
Attribute sets and lists can be arbitrarily nested and contain any TOML-compatible
|
||||
values.
|
||||
|
||||
## Submodule {#section-option-types-submodule}
|
||||
|
||||
`submodule` is a very powerful type that defines a set of sub-options
|
||||
|
||||
@@ -77,6 +77,15 @@ in
|
||||
example = false;
|
||||
};
|
||||
|
||||
extraCompletionPackages = lib.mkOption {
|
||||
type = lib.types.listOf lib.types.package;
|
||||
default = [ ];
|
||||
example = lib.literalExpression "config.users.users.alice.packages";
|
||||
description = ''
|
||||
Additional packages to generate completions from, if {option}`programs.fish.generateCompletions` is enabled.
|
||||
'';
|
||||
};
|
||||
|
||||
vendor.config.enable = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
default = true;
|
||||
@@ -295,7 +304,7 @@ in
|
||||
pkgs.buildEnv {
|
||||
name = "system_fish-completions";
|
||||
ignoreCollisions = true;
|
||||
paths = map generateCompletions config.environment.systemPackages;
|
||||
paths = map generateCompletions (config.environment.systemPackages ++ cfg.extraCompletionPackages);
|
||||
};
|
||||
})
|
||||
|
||||
|
||||
@@ -3,6 +3,8 @@
|
||||
device-name-strategy,
|
||||
discovery-mode,
|
||||
mounts,
|
||||
disable-hooks,
|
||||
enable-hooks,
|
||||
glibc,
|
||||
jq,
|
||||
lib,
|
||||
@@ -37,7 +39,8 @@ writeScriptBin "nvidia-cdi-generator" ''
|
||||
}
|
||||
--discovery-mode ${discovery-mode} \
|
||||
--device-name-strategy ${device-name-strategy} \
|
||||
--disable-hook create-symlinks \
|
||||
${lib.concatMapStringsSep " \\\n" (hook: "--disable-hook ${hook}") disable-hooks} \
|
||||
${lib.concatMapStringsSep " \\\n" (hook: "--enable-hook ${hook}") enable-hooks} \
|
||||
--ldconfig-path ${lib.getExe' glibc "ldconfig"} \
|
||||
--library-search-path ${lib.getLib nvidia-driver}/lib \
|
||||
--nvidia-cdi-hook-path ${lib.getOutput "tools" nvidia-container-toolkit}/bin/nvidia-cdi-hook \
|
||||
|
||||
@@ -120,6 +120,26 @@
|
||||
|
||||
package = lib.mkPackageOption pkgs "nvidia-container-toolkit" { };
|
||||
|
||||
disable-hooks = lib.mkOption {
|
||||
type = lib.types.listOf lib.types.nonEmptyStr;
|
||||
default = [ "create-symlinks" ];
|
||||
description = ''
|
||||
List of hooks to disable when generating the CDI specification.
|
||||
Each hook name will be passed as `--disable-hook <hook-name>` to nvidia-ctk.
|
||||
Set to an empty list to disable no hooks.
|
||||
'';
|
||||
};
|
||||
|
||||
enable-hooks = lib.mkOption {
|
||||
type = lib.types.listOf lib.types.nonEmptyStr;
|
||||
default = [ ];
|
||||
description = ''
|
||||
List of hooks to enable when generating the CDI specification.
|
||||
Each hook name will be passed as `--enable-hook <hook-name>` to nvidia-ctk.
|
||||
Set to an empty list to enable no hooks.
|
||||
'';
|
||||
};
|
||||
|
||||
extraArgs = lib.mkOption {
|
||||
type = lib.types.listOf lib.types.str;
|
||||
default = [ ];
|
||||
@@ -306,6 +326,8 @@
|
||||
device-name-strategy
|
||||
discovery-mode
|
||||
mounts
|
||||
disable-hooks
|
||||
enable-hooks
|
||||
extraArgs
|
||||
;
|
||||
nvidia-container-toolkit = config.hardware.nvidia-container-toolkit.package;
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -1,3 +1,4 @@
|
||||
import bisect
|
||||
import os
|
||||
from pathlib import Path
|
||||
from tempfile import TemporaryDirectory
|
||||
@@ -30,7 +31,7 @@ def add_entries(sources, targets, hashes):
|
||||
if path == target["@url"]:
|
||||
raise ValueError(f"Unexpected target path {path}")
|
||||
|
||||
hashes.append({"url": url, "hash": artefact["sha256sum"], "path": path})
|
||||
bisect.insort(hashes, {"url": url, "hash": artefact["sha256sum"], "path": path}, key=lambda e: e["url"])
|
||||
|
||||
|
||||
def add_libraries(
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
}:
|
||||
mkLibretroCore {
|
||||
core = "genesis-plus-gx";
|
||||
version = "0-unstable-2025-12-21";
|
||||
version = "0-unstable-2026-01-16";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libretro";
|
||||
repo = "Genesis-Plus-GX";
|
||||
rev = "7c5819b7bd0b84c3265ee7dfcd7b90210ed7d687";
|
||||
hash = "sha256-3YrRWxKk6Uci5MKS5lQYU+edrLdsFYIAR6pTPXwiy8c=";
|
||||
rev = "3f0f44787b3c9f51eaad3abfbeb86f345d6d8fb1";
|
||||
hash = "sha256-ZrJIZqkJC39vreiNPeEm764vDW42uv6kZb0rFo4bAXw=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -833,13 +833,13 @@
|
||||
"vendorHash": "sha256-duHOqjy8AthXuDX63GO3myJ9TJmV0Ts1a8OsbSOGZWI="
|
||||
},
|
||||
"launchdarkly_launchdarkly": {
|
||||
"hash": "sha256-4vOAkZac3dpYdzZDk+vvqmr/S37q/Gl0HmOAFuDKyag=",
|
||||
"hash": "sha256-95dvJa6yyBiBVa2/SIUD7vb5jUgKZ2lPhsoBouvswVg=",
|
||||
"homepage": "https://registry.terraform.io/providers/launchdarkly/launchdarkly",
|
||||
"owner": "launchdarkly",
|
||||
"repo": "terraform-provider-launchdarkly",
|
||||
"rev": "v2.26.0",
|
||||
"rev": "v2.26.1",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-Y1L1nIOubhBN5vNIXY7miQgR9OzoTCS7QA55DEMwDSA="
|
||||
"vendorHash": "sha256-JRqLG+lM7emw8F0J2mVt4xHKvLG/TC/FNZiiXd0dKZY="
|
||||
},
|
||||
"linode_linode": {
|
||||
"hash": "sha256-/igrYgWTM4vujH2PFzXijVhHw0gQzLUwFZJd+RM0hSQ=",
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "ali";
|
||||
version = "0.7.5";
|
||||
version = "0.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nakabonne";
|
||||
repo = "ali";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-/pdHlI20IzSTX2pnsbxPiJiWmOCbp13eJWLi0Tcsueg=";
|
||||
hash = "sha256-iwuvWqDaaf/U8f4KDeq1gs+FlDoC11uDs+l2Z7Npd6M=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-YWx9K04kTMaI0FXebwRQVCt0nxIwZ6xlbtI2lk3qp0M=";
|
||||
vendorHash = "sha256-pRxkRY0MkQGnNhA/3CtT0ohKAPNx8QeyuD6bcacYHGI=";
|
||||
|
||||
meta = {
|
||||
description = "Generate HTTP load and plot the results in real-time";
|
||||
|
||||
@@ -95,7 +95,7 @@ let
|
||||
(with pkgs; [
|
||||
xorg.libxkbfile
|
||||
xorg.libxshmfence
|
||||
xcb-util-cursor-HEAD
|
||||
libxcb-cursor
|
||||
krb5
|
||||
zstd
|
||||
]);
|
||||
|
||||
@@ -13,13 +13,13 @@ let
|
||||
|
||||
pkg = buildGoModule (finalAttrs: {
|
||||
pname = "arduino-cli";
|
||||
version = "1.4.0";
|
||||
version = "1.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "arduino";
|
||||
repo = "arduino-cli";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-H7vccxDzJt0e/91PIV6Qg8nRD0beb/3g7AZ4uk2ebXU=";
|
||||
hash = "sha256-2m0V7yj6C7Lvlu9RaM54pbGKSwrek6WYuwH1yqYHdB0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -31,7 +31,7 @@ let
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
vendorHash = "sha256-GPZLvEgL/2Ekfj58d8dsbc6e2hHB2zUapvFdIT43hhQ=";
|
||||
vendorHash = "sha256-5bkaHEzQ2gLV1epkScbCf1qv5XeuewLwqNcpPCSdbh4=";
|
||||
|
||||
postPatch =
|
||||
let
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "butane";
|
||||
version = "0.25.1";
|
||||
version = "0.26.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "coreos";
|
||||
repo = "butane";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-HrLnXkaayCmMrvW79NSYrmI0ujfHtRwWmonkbvTXEXY=";
|
||||
hash = "sha256-htD/FecmBVUp0bmzDJpUNw8rVr9mheFwagUISFu8lJM=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
fetchurl,
|
||||
libX11,
|
||||
bison,
|
||||
ksh,
|
||||
mksh,
|
||||
perl,
|
||||
libXinerama,
|
||||
libXt,
|
||||
@@ -33,15 +33,18 @@
|
||||
flex,
|
||||
libXpm,
|
||||
rpcsvc-proto,
|
||||
sessreg,
|
||||
pkg-config,
|
||||
lmdb,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "cde";
|
||||
version = "2.5.1";
|
||||
version = "2.5.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/cdesktopenv/cde-${version}.tar.gz";
|
||||
hash = "sha256-caslezz2kbljwApv5igDPH345PK2YqQUTi1YZgvM1Dw=";
|
||||
url = "mirror://sourceforge/cdesktopenv/cde-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-K1jAjr8Ka7nUoyGRzSXiBPXYy6gbzKo2/HL1xKqXmFQ=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@@ -62,7 +65,7 @@ stdenv.mkDerivation rec {
|
||||
done
|
||||
|
||||
substituteInPlace configure.ac \
|
||||
--replace "-I/usr/include/tirpc" "-I${libtirpc.dev}/include/tirpc"
|
||||
--replace-warn "-I/usr/include/tirpc" "-I${libtirpc.dev}/include/tirpc"
|
||||
|
||||
patchShebangs autogen.sh config.rpath contrib programs
|
||||
'';
|
||||
@@ -82,9 +85,11 @@ stdenv.mkDerivation rec {
|
||||
libXScrnSaver
|
||||
tcl
|
||||
libXaw
|
||||
ksh
|
||||
mksh
|
||||
libxcrypt
|
||||
libXpm
|
||||
sessreg
|
||||
lmdb
|
||||
];
|
||||
nativeBuildInputs = [
|
||||
bison
|
||||
@@ -100,10 +105,15 @@ stdenv.mkDerivation rec {
|
||||
perl
|
||||
flex
|
||||
rpcsvc-proto
|
||||
pkg-config
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
# Can probably remove after next release
|
||||
# https://sourceforge.net/p/cdesktopenv/code/ci/f0154141b1f1501490bac8e0235214bf8f00f715/
|
||||
env.NIX_CFLAGS_COMPILE = "-std=gnu17";
|
||||
|
||||
preConfigure = ''
|
||||
export LOCALE_ARCHIVE="${glibcLocales}/lib/locale/locale-archive"
|
||||
'';
|
||||
@@ -123,4 +133,4 @@ stdenv.mkDerivation rec {
|
||||
maintainers = [ ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "cgif";
|
||||
version = "0.5.0";
|
||||
version = "0.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dloebl";
|
||||
repo = "cgif";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-i8xngmVhRCGkczY3NzomLkXj+iqPb81lvLn6dXsByYs=";
|
||||
hash = "sha256-Vnm0YIMoU6gJCxSP28mqBtqZnfhmhmvaSp5DvZJqW/A=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "cirrus-cli";
|
||||
version = "0.159.1";
|
||||
version = "0.160.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cirruslabs";
|
||||
repo = "cirrus-cli";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Zf7muVwJQzye5YEeQtRbHQ2SmFFap7BMze9YuJv1ABU=";
|
||||
hash = "sha256-odD2ap2Z+Wsrz3XIDJrGyxbsrMvZBp3kQJ64LhIpc74=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-n2Bmx4EJ+L6+rlvfG/2FD4Ua9bG9GVcnvD+QPfQg/HE=";
|
||||
vendorHash = "sha256-zW0xX4E2Wr/liL2RMGiU1wpwFbeiuex1owWisysHJsc=";
|
||||
|
||||
ldflags = [
|
||||
"-X github.com/cirruslabs/cirrus-cli/internal/version.Version=v${version}"
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "coroot-node-agent";
|
||||
version = "1.27.2";
|
||||
version = "1.27.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "coroot";
|
||||
repo = "coroot-node-agent";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-bA23qnC94hrmyQWR5kAKR27wzs55AJPC3Ix/l/9YCEY=";
|
||||
hash = "sha256-uIj74Su2ICB5v/khMgCJXps+HQUT67U6kI06QzNs+nc=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-jMR/ylMEgNDOn5mDkJU38h9h2rinCX7/jtOyjDos5Qc=";
|
||||
vendorHash = "sha256-adrXNMdR20K+DLexLebvjgcQFV9XLqYdHZW5hg/Zk8w=";
|
||||
|
||||
buildInputs = [ systemdLibs ];
|
||||
|
||||
|
||||
@@ -9,16 +9,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "dnscontrol";
|
||||
version = "4.30.0";
|
||||
version = "4.31.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "StackExchange";
|
||||
repo = "dnscontrol";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-SLcOG42Pd0RgDT98qNgceovDYbBvF0N7/ItkjBlEtLY=";
|
||||
hash = "sha256-8Pb/njUjiyUQZA3UnZ+4INJBnmXCo+F7+BhCDt1hJGQ=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-OsBVyWCPoVKBXmE/NH3r7KUH4TFCNkKu3LGJlW7dNqI=";
|
||||
vendorHash = "sha256-GMzLaV3LQNa4K111P6DLG28KAAgj9AHyPua4XSih14k=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
}:
|
||||
let
|
||||
pname = "e1s";
|
||||
version = "1.0.52";
|
||||
version = "1.0.53";
|
||||
in
|
||||
buildGoModule {
|
||||
inherit pname version;
|
||||
@@ -14,7 +14,7 @@ buildGoModule {
|
||||
owner = "keidarcy";
|
||||
repo = "e1s";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-ObqCd27gMG1WWqAObZZP1rGLJuh8weCdC0zrLfoPwMo=";
|
||||
hash = "sha256-Cy/aZVO6xM1oCeyT6x1O+otbUZ5lS90fl3iZzkf02QM=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-8z2RVT2W8TLXdZBAmi/2fu63pijVgzqSvF9xpGexlQ0=";
|
||||
|
||||
@@ -10,18 +10,18 @@
|
||||
}:
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "eas-cli";
|
||||
version = "16.23.1";
|
||||
version = "16.28.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "expo";
|
||||
repo = "eas-cli";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-hMUDtl5lMAZzlvPdzO7J3JTw0B5/fjssuqQlg1MUO3w=";
|
||||
hash = "sha256-/1E26CDD+vXR6/v9zOFOcJEuU/evUSVovQwnuyoV4SA=";
|
||||
};
|
||||
|
||||
yarnOfflineCache = fetchYarnDeps {
|
||||
yarnLock = finalAttrs.src + "/yarn.lock"; # Point to the root lockfile
|
||||
hash = "sha256-ybctj6TgW9JluDIsSaNm18wUXSBPuIT45te5HoQuz5s=";
|
||||
hash = "sha256-W2FuU4J28/qtXUa+eqirpc7bjRdL1fk6mgGxR50icYI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "git-wt";
|
||||
version = "0.13.1";
|
||||
version = "0.14.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "k1LoW";
|
||||
repo = "git-wt";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-uyvLbWsDN2ZxPzkLqHM782L/YyfarOgd8jDfmjtLNRY=";
|
||||
hash = "sha256-/wzaLLR8lReWmZB6TWwDiaVdcyVdIpnQYJWI4yEAMys=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-K5geAvG+mvnKeixOyZt0C1T5ojSBFmx2K/Msol0HsSg=";
|
||||
|
||||
@@ -170,11 +170,11 @@ let
|
||||
|
||||
linux = stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
inherit pname meta passthru;
|
||||
version = "144.0.7559.59";
|
||||
version = "144.0.7559.96";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${finalAttrs.version}-1_amd64.deb";
|
||||
hash = "sha256-N2y+St4UuUWOqc9O40p+sBV4Bx8Ivloq7GGUICp6dSY=";
|
||||
hash = "sha256-tPM+bbT3AreOPZdeHfO2ktBXvFGicH1+oz/a2R+MbEE=";
|
||||
};
|
||||
|
||||
# With strictDeps on, some shebangs were not being patched correctly
|
||||
@@ -272,11 +272,11 @@ let
|
||||
|
||||
darwin = stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
inherit pname meta passthru;
|
||||
version = "144.0.7559.60";
|
||||
version = "144.0.7559.97";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://dl.google.com/release2/chrome/aceqfoiuzjbxhz6xooajrcqohsoa_144.0.7559.60/GoogleChrome-144.0.7559.60.dmg";
|
||||
hash = "sha256-ZyQWHmduNSPFARCroQBG2GfU+FwiAJ0RJIWzJoBcbrk=";
|
||||
url = "http://dl.google.com/release2/chrome/acs3ozv33k7hgpukzi2nuehve3aa_144.0.7559.97/GoogleChrome-144.0.7559.97.dmg";
|
||||
hash = "sha256-uhNWvAnifxbNMPR9QiXSgpDK9tnim39q2bLMCM9Q93w=";
|
||||
};
|
||||
|
||||
dontPatch = true;
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "istioctl";
|
||||
version = "1.28.2";
|
||||
version = "1.28.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "istio";
|
||||
repo = "istio";
|
||||
rev = version;
|
||||
hash = "sha256-T3bhFAIsdnobcTYc80jY7mtIKRjBK6OcqGR59ko6q3s=";
|
||||
hash = "sha256-V8yG0Dj2/KevTiG9C68SlkLzo5xkblxMYhsZOq1ucgc=";
|
||||
};
|
||||
vendorHash = "sha256-QcPtQV3sO+B2NtxJvOi5x5hlAI1ace4LqWO84fAovGw=";
|
||||
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "kubedb-cli";
|
||||
version = "0.59.0";
|
||||
version = "0.60.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kubedb";
|
||||
repo = "cli";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-gM61Om1qNbzeHWAzLbgUlHsZPzBNzyFN8r9PoS3Pf1c=";
|
||||
hash = "sha256-L1DFcD6DdY+fQLznv26PPbeCTI6PCdBmsYnDb9WcRoc=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "kubedock";
|
||||
version = "0.20.1";
|
||||
version = "0.20.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "joyrex2001";
|
||||
repo = "kubedock";
|
||||
rev = version;
|
||||
hash = "sha256-ZwNixOeBuyuFT0Hfl3USfArhmyIPHFP0fTbiztTSPOA=";
|
||||
hash = "sha256-DoAvM+/yGr34qOjC9LevYtiUmhnkh7dR90kG2TPZxWg=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-QLiu014QowDqebDCXSxOH2TPHUG2d+34mlnbo3NdafA=";
|
||||
|
||||
@@ -9,17 +9,17 @@
|
||||
writableTmpDirAsHomeHook,
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "lctime";
|
||||
version = "0.0.27";
|
||||
version = "0.0.28";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "codeberg.org";
|
||||
owner = "librecell";
|
||||
repo = "lctime";
|
||||
tag = version;
|
||||
hash = "sha256-KKZhsKNTr+J5+rLUdlwGMsUCa6NYY1X9yaujPe1c0Do=";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-Td56NtqcI8763hw/XVxLP7+qExraapN9ULD3ZolfR6M=";
|
||||
};
|
||||
|
||||
build-system = with python3Packages; [
|
||||
@@ -32,7 +32,6 @@ python3Packages.buildPythonApplication rec {
|
||||
liberty-parser
|
||||
networkx
|
||||
numpy
|
||||
pyspice
|
||||
scipy
|
||||
sympy
|
||||
];
|
||||
@@ -77,7 +76,7 @@ python3Packages.buildPythonApplication rec {
|
||||
''
|
||||
cd "$HOME"
|
||||
|
||||
cp -R "${src}/tests/"* .
|
||||
cp -R "${finalAttrs.src}/tests/"* .
|
||||
patchShebangs *.sh
|
||||
|
||||
mkdir -p $out
|
||||
@@ -94,8 +93,9 @@ python3Packages.buildPythonApplication rec {
|
||||
cc-by-sa-40
|
||||
cc0
|
||||
];
|
||||
changelog = "https://codeberg.org/librecell/lctime/releases/tag/${finalAttrs.src.tag}";
|
||||
maintainers = with lib.maintainers; [ eljamm ];
|
||||
teams = with lib.teams; [ ngi ];
|
||||
mainProgram = "lctime";
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
unstableGitUpdater,
|
||||
autoreconfHook,
|
||||
autoconf-archive,
|
||||
@@ -24,20 +25,28 @@
|
||||
|
||||
let
|
||||
pname = "libvmi";
|
||||
version = "0.14.0-unstable-2025-12-17";
|
||||
version = "0.14.0-unstable-2026-01-04";
|
||||
libVersion = "0.0.15";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libvmi";
|
||||
repo = "libvmi";
|
||||
rev = "77a677aa6621927495f1954eded11e601937798b";
|
||||
hash = "sha256-qwZEU41xhY/prgD72CBOKcQ4GqujXeMlUU+NDRJ9U3M=";
|
||||
rev = "82bbee6c378da854d07887048b06dc4ee8e20d6a";
|
||||
hash = "sha256-PGILZdVdY3MyfvYW8h4NGeB4XgwL02oKdl4RAR1OkqA=";
|
||||
};
|
||||
in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
inherit pname version src;
|
||||
|
||||
patches = [
|
||||
# Compatibility with GCC 15
|
||||
(fetchpatch {
|
||||
url = "https://github.com/libvmi/libvmi/commit/9deb49d17e7e675158ed3b19d405792254e22bdf.patch";
|
||||
hash = "sha256-stjbHogH6JpCu3hTR+UUJGzUeq1TOWZPc8ocjUA7t/g=";
|
||||
})
|
||||
];
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
"lib"
|
||||
|
||||
@@ -47,14 +47,14 @@ in
|
||||
# as bootloader for various platforms and corresponding binary and helper files.
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "limine";
|
||||
version = "10.6.2";
|
||||
version = "10.6.3";
|
||||
|
||||
# We don't use the Git source but the release tarball, as the source has a
|
||||
# `./bootstrap` script performing network access to download resources.
|
||||
# Packaging that in Nix is very cumbersome.
|
||||
src = fetchurl {
|
||||
url = "https://codeberg.org/Limine/Limine/releases/download/v${finalAttrs.version}/limine-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-WHzv4pNXSIu6H2i8MtxO6ogIzB7ZVcBqAGz+zzbmFKs=";
|
||||
hash = "sha256-4jpxSJ+ZHYsaX7eYhOonh1j/Ye9QF7Wt8kST7CbBtKk=";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "litmusctl";
|
||||
version = "1.21.0";
|
||||
version = "1.22.0";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
@@ -23,7 +23,7 @@ buildGoModule rec {
|
||||
owner = "litmuschaos";
|
||||
repo = "litmusctl";
|
||||
rev = "${version}";
|
||||
hash = "sha256-Re9NBGKJK7FKCVtOg3BTuH4PXSmkvEtf+yYD75u5Lgg=";
|
||||
hash = "sha256-wf/y74ST4H6w8f/AyA2QIvLmQusyOALPY95qVtHF6Ac=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-7FYOQ89aUFPX+5NCPYKg+YGCXstQ6j9DK4V2mCgklu0=";
|
||||
|
||||
@@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
owner = "CISOfy";
|
||||
repo = "lynis";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-XMgC6KjkLgjSOBHBx7WM7C2Vm3Z/lto7CFs10kIxwZc=";
|
||||
hash = "sha256-f1iV9OBkycrwP3ydjaGMX45JIBtzZKHEJqnEoVuZPu4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "mainsail";
|
||||
version = "2.15.0";
|
||||
version = "2.17.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mainsail-crew";
|
||||
repo = "mainsail";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-JmN5VPj4h83gLx/UsT69mXFxyvCHir0tl7zN2Q7eMOc=";
|
||||
hash = "sha256-lKLoY5FHO34bT/3apmfVkuW0E1h4/K4r2thF9ht03U4=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-8rUhDo1l0oLENWwy56UzwlSGIBJtTPsH6w5OX8tnp6U=";
|
||||
npmDepsHash = "sha256-HIErBrQ0VP4vdCFZe7uT5b1q+QdSSf08CIQmNcSryZ8=";
|
||||
|
||||
nodejs = nodejs_20;
|
||||
|
||||
|
||||
@@ -6,19 +6,20 @@
|
||||
nodejs,
|
||||
}:
|
||||
|
||||
buildNpmPackage rec {
|
||||
buildNpmPackage {
|
||||
pname = "math-preview";
|
||||
version = "5.1.1";
|
||||
version = "5.1.2-unstable-2024-08-01";
|
||||
inherit nodejs;
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "matsievskiysv";
|
||||
repo = "math-preview";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-P3TZ/D6D2PvwPV6alSrDEQujzgI8DhK4VOuCC0BCIFo=";
|
||||
# FIXME: switch to tag="v${finalAttrs.version}" when upstream eventually cuts a new release.
|
||||
rev = "a2ca3c175468ceaf02bab6cdfd8ef016bda2b98d";
|
||||
hash = "sha256-o7n02aecHWt4Vumj+wdv/yavaVnMuxm8p+Pb+ppDrUE=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-GAPhG3haM9UNdj6tCz8I4j7v6rvNbatdu7NjCeENj3s=";
|
||||
npmDepsHash = "sha256-IzJszTaa8NMGRadRdBetfQXJfyjVKKYveTzbPOr07Sw=";
|
||||
dontNpmBuild = true;
|
||||
|
||||
passthru = {
|
||||
|
||||
@@ -8,18 +8,18 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "meilisearch";
|
||||
version = "1.33.0";
|
||||
version = "1.33.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "meilisearch";
|
||||
repo = "meilisearch";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-OC8JPG/UAgBm+l5bFG4A+4/3cqkUMbeBkqIG+rjiucY=";
|
||||
hash = "sha256-q1sDiIJETk22Ain8M1LfhFZ2sUSq7H5qNCs23f0qsz4=";
|
||||
};
|
||||
|
||||
cargoBuildFlags = [ "--package=meilisearch" ];
|
||||
|
||||
cargoHash = "sha256-MwCbrPnWLipuSaJdtrm595e/geE/pb6Nw1vHL7l/XRU=";
|
||||
cargoHash = "sha256-Ae/KR45LXwXd/qTeKTAoWPnsue4ekNr1SP7oJ8EN+Q8=";
|
||||
|
||||
# Default features include mini dashboard which downloads something from the internet.
|
||||
buildNoDefaultFeatures = true;
|
||||
|
||||
@@ -22,16 +22,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "mise";
|
||||
version = "2026.1.2";
|
||||
version = "2026.1.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jdx";
|
||||
repo = "mise";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-CMDspsChrfGcraITzjoBbtMYy9MrGgLL62JtM46s0no=";
|
||||
hash = "sha256-rOeTm4Qc8+cqce5jx4LciVMiQ7Jvu4883t0KdqgeTy4=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-HJ/tm3FPtuPkUzvkureXVFhUWc5qPqq1BAPtOCl7R5E=";
|
||||
cargoHash = "sha256-/QcnUD8/WsZnbQY+Ecc33KT4tOj0Ua+BOBFybBK/O4Y=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "newman";
|
||||
version = "6.2.1";
|
||||
version = "6.2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "postmanlabs";
|
||||
repo = "newman";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-p0/uHrLiqw5VnboXzLKF+f56ZfW77m5aoopf2zqIpQE=";
|
||||
hash = "sha256-zp5x/eMF5MPpWrbqDt2t5p5LGx2g58hr+uySLRN3vR4=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-HQ5V0hisolXqWV/oWlroCzC7ZoNw0P9bwTxFyUrL3Hc=";
|
||||
npmDepsHash = "sha256-Es4Pu3XG9qQiCpYJMIfhKiqCGb4R4Focu/2ol4qRiW8=";
|
||||
|
||||
dontNpmBuild = true;
|
||||
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "nrr";
|
||||
version = "0.10.3";
|
||||
version = "0.10.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ryanccn";
|
||||
repo = "nrr";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-RBKFDm6MpK2lDCUvbX0EFEuOASKtHM+5QknWM0A6AKE=";
|
||||
hash = "sha256-/PB5m0gVjhQxYB7IeR59gs4n1vuleFc0ZLBY0a+JYWI=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-DiapeSFfsmox+Utx9uW/8/veEQcnWmoaETLNyffpv64=";
|
||||
cargoHash = "sha256-QaNn3CrBXbWLquXkIHs4Ba6tbYwwN1XLfysJAnG8Dgc=";
|
||||
|
||||
env = lib.optionalAttrs enableLTO {
|
||||
CARGO_PROFILE_RELEASE_LTO = "fat";
|
||||
|
||||
24
pkgs/by-name/on/onnxruntime/musl-cstdint.patch
Normal file
24
pkgs/by-name/on/onnxruntime/musl-cstdint.patch
Normal file
@@ -0,0 +1,24 @@
|
||||
diff --git a/include/onnxruntime/core/framework/tensor_shape.h b/include/onnxruntime/core/framework/tensor_shape.h
|
||||
index d4ee4a0e5e..c33bea9cf7 100644
|
||||
--- a/include/onnxruntime/core/framework/tensor_shape.h
|
||||
+++ b/include/onnxruntime/core/framework/tensor_shape.h
|
||||
@@ -8,6 +8,7 @@
|
||||
#include <iosfwd>
|
||||
#include <string>
|
||||
#include <vector>
|
||||
+#include <cstdint>
|
||||
|
||||
#include <gsl/gsl>
|
||||
#include "core/common/inlined_containers_fwd.h"
|
||||
diff --git a/onnxruntime/test/perftest/strings_helper.h b/onnxruntime/test/perftest/strings_helper.h
|
||||
index d6c6f6112a..8580c86db6 100644
|
||||
--- a/onnxruntime/test/perftest/strings_helper.h
|
||||
+++ b/onnxruntime/test/perftest/strings_helper.h
|
||||
@@ -7,6 +7,7 @@
|
||||
#include <unordered_map>
|
||||
#include <unordered_set>
|
||||
#include <vector>
|
||||
+#include <cstdint>
|
||||
|
||||
namespace onnxruntime {
|
||||
namespace perftest {
|
||||
33
pkgs/by-name/on/onnxruntime/musl-execinfo.patch
Normal file
33
pkgs/by-name/on/onnxruntime/musl-execinfo.patch
Normal file
@@ -0,0 +1,33 @@
|
||||
From 7bc56c886c8b9fa27842a14bbb964ffe8e576a9e Mon Sep 17 00:00:00 2001
|
||||
From: Jaeyoon Jung <jaeyoon.jung@lge.com>
|
||||
Date: Tue, 12 Aug 2025 10:55:52 +0900
|
||||
Subject: [PATCH] Fix build with musl
|
||||
|
||||
Added __GLIBC__ macro for 'execinfo.h' and related functions as they are
|
||||
GLIBC specific and not available in other libc implementation like musl.
|
||||
---
|
||||
onnxruntime/core/platform/posix/stacktrace.cc | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/onnxruntime/core/platform/posix/stacktrace.cc b/onnxruntime/core/platform/posix/stacktrace.cc
|
||||
index a34f6fd82ddd1..ab00f5fbb233e 100644
|
||||
--- a/onnxruntime/core/platform/posix/stacktrace.cc
|
||||
+++ b/onnxruntime/core/platform/posix/stacktrace.cc
|
||||
@@ -3,7 +3,7 @@
|
||||
|
||||
#include "core/common/common.h"
|
||||
|
||||
-#if !defined(__ANDROID__) && !defined(__wasm__) && !defined(_OPSCHEMA_LIB_) && !defined(_AIX)
|
||||
+#if !defined(__ANDROID__) && !defined(__wasm__) && !defined(_OPSCHEMA_LIB_) && !defined(_AIX) && defined(__GLIBC__)
|
||||
#include <execinfo.h>
|
||||
#endif
|
||||
#include <vector>
|
||||
@@ -13,7 +13,7 @@ namespace onnxruntime {
|
||||
std::vector<std::string> GetStackTrace() {
|
||||
std::vector<std::string> stack;
|
||||
|
||||
-#if !defined(NDEBUG) && !defined(__ANDROID__) && !defined(__wasm__) && !defined(_OPSCHEMA_LIB_)
|
||||
+#if !defined(NDEBUG) && !defined(__ANDROID__) && !defined(__wasm__) && !defined(_OPSCHEMA_LIB_) && defined(__GLIBC__)
|
||||
constexpr int kCallstackLimit = 64; // Maximum depth of callstack
|
||||
|
||||
void* array[kCallstackLimit];
|
||||
@@ -5,6 +5,7 @@
|
||||
fetchFromGitHub,
|
||||
applyPatches,
|
||||
fetchpatch,
|
||||
fetchurl,
|
||||
abseil-cpp_202407,
|
||||
cmake,
|
||||
cpuinfo,
|
||||
@@ -128,6 +129,20 @@ effectiveStdenv.mkDerivation (finalAttrs: {
|
||||
url = "https://github.com/microsoft/onnxruntime/commit/8ebd0bf1cf02414584d15d7244b07fa97d65ba02.patch";
|
||||
hash = "sha256-vX+kaFiNdmqWI91JELcLpoaVIHBb5EPbI7rCAMYAx04=";
|
||||
})
|
||||
|
||||
# Skip execinfo include on musl
|
||||
# https://github.com/microsoft/onnxruntime/pull/25726
|
||||
./musl-execinfo.patch
|
||||
# Add missing include which is only needed on musl (is implied in other includes on glibc)
|
||||
# https://github.com/microsoft/onnxruntime/pull/26969
|
||||
./musl-cstdint.patch
|
||||
|
||||
# Fix build of unit tests with musl libc
|
||||
# https://github.com/microsoft/onnxruntime/issues/9155
|
||||
(fetchurl {
|
||||
url = "https://gitlab.alpinelinux.org/alpine/aports/-/raw/462dfe0eb4b66948fe48de44545cc22bb64fdf9f/community/onnxruntime/0001-Remove-MATH_NO_EXCEPT-macro.patch";
|
||||
hash = "sha256-BdeGYevZExWWCuJ1lSw0Roy3h+9EbJgFF8qMwVxSn1A=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -279,21 +294,26 @@ effectiveStdenv.mkDerivation (finalAttrs: {
|
||||
(lib.cmakeBool "onnxruntime_USE_COMPOSABLE_KERNEL_CK_TILE" false)
|
||||
];
|
||||
|
||||
env = lib.optionalAttrs rocmSupport {
|
||||
MIOPEN_PATH = rocmPackages.miopen;
|
||||
# HIP steps fail to find ROCm libs when not in HIPFLAGS, causing
|
||||
# fatal error: 'rocrand/rocrand.h' file not found
|
||||
HIPFLAGS = lib.concatMapStringsSep " " (pkg: "-I${lib.getInclude pkg}/include") [
|
||||
rocmPackages.hipblas
|
||||
rocmPackages.hipcub
|
||||
rocmPackages.hiprand
|
||||
rocmPackages.hipsparse
|
||||
rocmPackages.rocblas
|
||||
rocmPackages.rocprim
|
||||
rocmPackages.rocrand
|
||||
rocmPackages.rocthrust
|
||||
];
|
||||
};
|
||||
env =
|
||||
lib.optionalAttrs rocmSupport {
|
||||
MIOPEN_PATH = rocmPackages.miopen;
|
||||
# HIP steps fail to find ROCm libs when not in HIPFLAGS, causing
|
||||
# fatal error: 'rocrand/rocrand.h' file not found
|
||||
HIPFLAGS = lib.concatMapStringsSep " " (pkg: "-I${lib.getInclude pkg}/include") [
|
||||
rocmPackages.hipblas
|
||||
rocmPackages.hipcub
|
||||
rocmPackages.hiprand
|
||||
rocmPackages.hipsparse
|
||||
rocmPackages.rocblas
|
||||
rocmPackages.rocprim
|
||||
rocmPackages.rocrand
|
||||
rocmPackages.rocthrust
|
||||
];
|
||||
}
|
||||
// lib.optionalAttrs effectiveStdenv.hostPlatform.isMusl {
|
||||
NIX_CFLAGS_COMPILE = "-DFLATBUFFERS_LOCALE_INDEPENDENT=0";
|
||||
GTEST_FILTER = "*:-ContribOpTest.StringNormalizer*";
|
||||
};
|
||||
|
||||
doCheck =
|
||||
!(
|
||||
@@ -313,6 +333,7 @@ effectiveStdenv.mkDerivation (finalAttrs: {
|
||||
hardeningEnable = lib.optionals (effectiveStdenv.hostPlatform.system == "loongarch64-linux") [
|
||||
"nostrictaliasing"
|
||||
];
|
||||
hardeningDisable = lib.optional effectiveStdenv.hostPlatform.isMusl "fortify";
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace cmake/libonnxruntime.pc.cmake.in \
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
git,
|
||||
pkg-config,
|
||||
runCommand,
|
||||
nodejs,
|
||||
nodejs_22,
|
||||
node-gyp,
|
||||
libsecret,
|
||||
libkrb5,
|
||||
@@ -22,6 +22,8 @@
|
||||
}:
|
||||
let
|
||||
|
||||
nodejs = nodejs_22;
|
||||
|
||||
system = stdenv.hostPlatform.system;
|
||||
|
||||
vsBuildTarget =
|
||||
|
||||
@@ -12,11 +12,11 @@
|
||||
}:
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "plasticscm-client-core-unwrapped";
|
||||
version = "11.0.16.9791";
|
||||
version = "11.0.16.9872";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.plasticscm.com/plasticrepo/stable/debian/amd64/plasticscm-client-core_${finalAttrs.version}_amd64.deb";
|
||||
hash = "sha256-9K4pvl+hxB3+bQwC3HYaEOq5nQlCyTQQuYsuqT4BbRg=";
|
||||
hash = "sha256-5V1x21+Dal6JDI8KBEFr9PXH1k12LutVWbaMOuDL954=";
|
||||
nativeBuildInputs = [ dpkg ];
|
||||
downloadToTemp = true;
|
||||
recursiveHash = true;
|
||||
|
||||
@@ -11,11 +11,11 @@
|
||||
}:
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "plasticscm-client-gui-unwrapped";
|
||||
version = "11.0.16.9791";
|
||||
version = "11.0.16.9872";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.plasticscm.com/plasticrepo/stable/debian/amd64/plasticscm-client-gui_${finalAttrs.version}_amd64.deb";
|
||||
hash = "sha256-jqU4nfRtobdXiNIx9pjceje5Y+m+xFYdWQwWgEXxW+k=";
|
||||
hash = "sha256-gLu0r7eo7XrYwquZurduj1NiKIB7EnRky5vYKW9fks4=";
|
||||
nativeBuildInputs = [ dpkg ];
|
||||
downloadToTemp = true;
|
||||
recursiveHash = true;
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
}:
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "plasticscm-theme";
|
||||
version = "11.0.16.9791";
|
||||
version = "11.0.16.9872";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.plasticscm.com/plasticrepo/stable/debian/amd64/plasticscm-theme_${finalAttrs.version}_amd64.deb";
|
||||
|
||||
@@ -8,22 +8,22 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "rustical";
|
||||
version = "0.11.10";
|
||||
version = "0.12.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lennart-k";
|
||||
repo = "rustical";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-+XGYM12RO0+bUpt7mIP7qm1CoYDnJYRNtkxVRyoH32g=";
|
||||
hash = "sha256-pVN7xu0M/9S4Gq5kWTls5vOpFK8fPXf9MIXJncdvtVc=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-cmjtPQd4ZvZ5HG+Cw1I4w8XRu64Q5HhR1rxhiYAC4aY=";
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace Cargo.toml \
|
||||
--replace-fail 'rust-version = "1.92"' 'rust-version = "1.91"'
|
||||
'';
|
||||
|
||||
cargoHash = "sha256-9GF7ViELoUxOxccyhFJehfRm7KuQIbv2wp9xIKkCpPQ=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ openssl ];
|
||||
|
||||
|
||||
@@ -36,20 +36,20 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "siyuan";
|
||||
version = "3.5.4-dev2";
|
||||
version = "3.5.4-dev4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "siyuan-note";
|
||||
repo = "siyuan";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-D3vpbtGNeDP+PZIOUGYufZo0ZTq9/eZsesizNuvAHdE=";
|
||||
hash = "sha256-ECBk4qzRCzRzgTYawHkvuStiz2DCYx3GXfjoKAWyiys=";
|
||||
};
|
||||
|
||||
kernel = buildGoModule {
|
||||
name = "${finalAttrs.pname}-${finalAttrs.version}-kernel";
|
||||
inherit (finalAttrs) src;
|
||||
sourceRoot = "${finalAttrs.src.name}/kernel";
|
||||
vendorHash = "sha256-/VLI51s3CQSzaLhiO673chXgqDml2l0zVXGFvhiVbAs=";
|
||||
vendorHash = "sha256-9hLvphgyZGkn3PYrjnPa7NPLqkLsTdNtBa2JUMtj8Wo=";
|
||||
|
||||
patches = [
|
||||
(replaceVars ./set-pandoc-path.patch {
|
||||
|
||||
@@ -7,14 +7,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "sqlit-tui";
|
||||
version = "1.2.6";
|
||||
version = "1.2.11";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Maxteabag";
|
||||
repo = "sqlit";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-5uGdKK7z/Rvb4VHZDJOjwPFXedX8l8RTvGvCQs7iAq8=";
|
||||
hash = "sha256-zPkBdGq4PoAWonMq5FWGaz19QWiZsHuVQcW/45ynqq4=";
|
||||
};
|
||||
|
||||
build-system = with python3Packages; [
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "starboard";
|
||||
version = "0.15.29";
|
||||
version = "0.15.30";
|
||||
|
||||
__darwinAllowLocalNetworking = true; # for tests
|
||||
|
||||
@@ -17,7 +17,7 @@ buildGoModule (finalAttrs: {
|
||||
owner = "aquasecurity";
|
||||
repo = "starboard";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-co4+k+91T/M+f4zk4Q26SEoRRTKDsQpYZQY9AWOjv9o=";
|
||||
hash = "sha256-3Z2dALOgm68bPrchyXYd1HsWJbplTUV1JapYFoS/OPU=";
|
||||
# populate values that require us to use git. By doing this in postFetch we
|
||||
# can delete .git afterwards and maintain better reproducibility of the src.
|
||||
leaveDotGit = true;
|
||||
|
||||
@@ -13,13 +13,13 @@
|
||||
|
||||
buildNpmPackage (finalAttrs: {
|
||||
pname = "sub-store-frontend";
|
||||
version = "2.15.94";
|
||||
version = "2.16.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sub-store-org";
|
||||
repo = "Sub-Store-Front-End";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-HpE7+XmlZAfmVYURaad9sHmJNFaTzQkJkenNcYUCCHU=";
|
||||
hash = "sha256-VC9dGG1NCY2rQJNtUyeBusAdrDyW6h1/7hDlb502eqs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -15,13 +15,13 @@
|
||||
|
||||
buildNpmPackage (finalAttrs: {
|
||||
pname = "sub-store";
|
||||
version = "2.20.83";
|
||||
version = "2.21.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sub-store-org";
|
||||
repo = "Sub-Store";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-UfNioH6WfnxjvBG5NJTz1h9I1lOxtxUVDGW4jRj3m2E=";
|
||||
hash = "sha256-JYXNeswcM5dmchAxOoIlvqjzsuO2DwjJ/WqAJMTrIpQ=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/backend";
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "terramate";
|
||||
version = "0.15.4";
|
||||
version = "0.15.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "terramate-io";
|
||||
repo = "terramate";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-DSxXX3HpIFM0F/+kqTFw0gvYfFfrGzoUt7GLDM42NuI=";
|
||||
hash = "sha256-iSDxhuUD29eGhvUeyGT3OEV/++xlta7lljTYn+8WmlE=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-o2MNmJmYMq2mQBLslOtRyRH9euEhcJyIhohJ3CKp6kg=";
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "thrift-ls";
|
||||
version = "0.2.9";
|
||||
version = "0.2.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "joyme123";
|
||||
repo = "thrift-ls";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Gmqm1D+zcXtqFEraHjivqIqFz0AZCJd3pnH4zKE/jxw=";
|
||||
hash = "sha256-v1PUrIHgdKqH7D5/KkJuNYYPMbjY817BGOix8B64sOA=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-SGCJ12BxjFUQ7bnaNY0bvrrtm2qNNrwYKKfNEi1lPco=";
|
||||
|
||||
@@ -23,13 +23,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "transcribe";
|
||||
version = "9.42.0";
|
||||
version = "9.50.1";
|
||||
|
||||
src =
|
||||
if stdenv.hostPlatform.system == "x86_64-linux" then
|
||||
fetchzip {
|
||||
url = "https://www.seventhstring.com/xscribe/downlo/xscsetup-${version}.tar.gz";
|
||||
sha256 = "sha256-QCEkxOP1nWtBHFS259Oyqo2beehgCeR7zZ6wqBZe00s=";
|
||||
sha256 = "sha256-FdaUglemrnLC2uSmKDgrYLCPB7Uu/pzp+oA+Zj/9W/s=";
|
||||
}
|
||||
else
|
||||
throw "Platform not supported";
|
||||
|
||||
@@ -20,16 +20,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "universal-android-debloater";
|
||||
version = "1.1.2";
|
||||
version = "1.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Universal-Debloater-Alliance";
|
||||
repo = "universal-android-debloater-next-generation";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-DapPUvkI4y159gYbSGJQbbDfW+C0Ggvaxo45Qj3mLrQ=";
|
||||
hash = "sha256-TGelOjwqTzYShZxXyPTTfkjAreFmZmrCF7jtp1UAfDw=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-eXbReRi/0h4UyJwIMI3GfHcQzX1E5Spoa4moMXtrBng=";
|
||||
cargoHash = "sha256-RutiCWTkXnF7W86SnXRs+vI7dELrbdZXI62J8suZv5g=";
|
||||
|
||||
buildInputs = [
|
||||
expat
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "viceroy";
|
||||
version = "0.16.2";
|
||||
version = "0.16.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fastly";
|
||||
repo = "viceroy";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-7IIgFoRYRQ7O6VS4C80CIzmtZOQypdZO8BEdMhO4u8o=";
|
||||
hash = "sha256-LVzpf5JDhL0zzKp+/loj3Et5R7fZh4h28eEO51VtKqc=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-04+sZm43YZXpkVdFuoI2ej7Gt7CG52hOdp52x3AgFzg=";
|
||||
cargoHash = "sha256-gXwpdWE7Te0ngGUu6meaIpY6lUX1yh8pu5G9KVSNNME=";
|
||||
|
||||
cargoTestFlags = [
|
||||
"--package viceroy-lib"
|
||||
|
||||
@@ -19,13 +19,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "wrangler";
|
||||
version = "4.59.1";
|
||||
version = "4.59.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cloudflare";
|
||||
repo = "workers-sdk";
|
||||
rev = "wrangler@${finalAttrs.version}";
|
||||
hash = "sha256-Pd9kc7OEg9mGRqonxvilPLTjjgZ2RXKbWx8kSGRE3Ik=";
|
||||
hash = "sha256-DKKngT58p8x+Qzl550468JDOQuymQmzPwkLL/iB7Aa4=";
|
||||
};
|
||||
|
||||
pnpmDeps = fetchPnpmDeps {
|
||||
@@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
;
|
||||
pnpm = pnpm_9;
|
||||
fetcherVersion = 2;
|
||||
hash = "sha256-8yelX0ZY7OGXxwhO3RC0jany9ItTRFQJ4iwwQgVnCvk=";
|
||||
hash = "sha256-r3J4xNZJlWmNtnpLfx/eKK3TDKcrjZmR7oxp6TDuwxg=";
|
||||
};
|
||||
# pnpm packageManager version in workers-sdk root package.json may not match nixpkgs
|
||||
postPatch = ''
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "xosview";
|
||||
version = "1.24";
|
||||
version = "1.25";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hills";
|
||||
repo = "xosview";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-9Pr7voJiCH7oBziMFRHCWxoyuGdndcdRD2POjiNT7yw=";
|
||||
hash = "sha256-lAVMpdVeYENtJrnRiCVgMbti7fKdQusTBsNCVdJZJkA=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
||||
@@ -85,9 +85,14 @@ in
|
||||
}
|
||||
);
|
||||
julia_112 = wrapJulia (
|
||||
callPackage (import ./generic.nix {
|
||||
version = "1.12.1";
|
||||
hash = "sha256-iR0Wu5HIqU1aY1WoLBf6PCRY64kWDUKEQ6CyobhB6lI=";
|
||||
}) { }
|
||||
callPackage
|
||||
(import ./generic.nix {
|
||||
version = "1.12.1";
|
||||
hash = "sha256-iR0Wu5HIqU1aY1WoLBf6PCRY64kWDUKEQ6CyobhB6lI=";
|
||||
})
|
||||
{
|
||||
stdenv = gcc14Stdenv;
|
||||
gfortran = gfortran14;
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
@@ -17,13 +17,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "qodeassist-plugin";
|
||||
version = "0.9.7";
|
||||
version = "0.9.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Palm1r";
|
||||
repo = "QodeAssist";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-aS2ZA5rFSxIpc4RfVIyWbae/nQa2lBkQQJacGQdC8kI=";
|
||||
hash = "sha256-1Lr46N/M4SXpHjY/HLIz33IRf3C6MIyMF9lCyaJ17Uc=";
|
||||
};
|
||||
|
||||
dontWrapQtApps = true;
|
||||
|
||||
@@ -1,58 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchgit,
|
||||
autoconf,
|
||||
automake,
|
||||
libtool,
|
||||
pkg-config,
|
||||
xorg,
|
||||
gnum4,
|
||||
libxcb,
|
||||
gperf,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "xcb-util-cursor-0.1.1-3-unstable";
|
||||
version = "2017-04-05";
|
||||
|
||||
src = fetchgit {
|
||||
url = "http://anongit.freedesktop.org/git/xcb/util-cursor.git";
|
||||
rev = "f03cc278c6cce0cf721adf9c3764d3c5fba63392";
|
||||
sha256 = "127zfmihd8nqlj8jjaja06xb84xdgl263w0av1xnprx05mkbkcyc";
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "XCB cursor library (libxcursor port)";
|
||||
homepage = "https://cgit.freedesktop.org/xcb/util-cursor";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ lovek323 ];
|
||||
platforms = lib.platforms.linux ++ lib.platforms.darwin;
|
||||
};
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
"dev"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoconf
|
||||
automake
|
||||
pkg-config
|
||||
];
|
||||
buildInputs = [
|
||||
gnum4
|
||||
gperf
|
||||
libtool
|
||||
libxcb
|
||||
xorg.utilmacros
|
||||
xorg.xcbutilimage
|
||||
xorg.xcbutilrenderutil
|
||||
];
|
||||
|
||||
configurePhase = ''
|
||||
sed -i '15 i\
|
||||
LT_INIT' configure.ac
|
||||
${stdenv.shell} autogen.sh --prefix="$out"
|
||||
'';
|
||||
}
|
||||
@@ -1,174 +0,0 @@
|
||||
# ===========================================================================
|
||||
# http://autoconf-archive.cryp.to/ax_compare_version.html
|
||||
# ===========================================================================
|
||||
#
|
||||
# SYNOPSIS
|
||||
#
|
||||
# AX_COMPARE_VERSION(VERSION_A, OP, VERSION_B, [ACTION-IF-TRUE], [ACTION-IF-FALSE])
|
||||
#
|
||||
# DESCRIPTION
|
||||
#
|
||||
# This macro compares two version strings. Due to the various number of
|
||||
# minor-version numbers that can exist, and the fact that string
|
||||
# comparisons are not compatible with numeric comparisons, this is not
|
||||
# necessarily trivial to do in a autoconf script. This macro makes doing
|
||||
# these comparisons easy.
|
||||
#
|
||||
# The six basic comparisons are available, as well as checking equality
|
||||
# limited to a certain number of minor-version levels.
|
||||
#
|
||||
# The operator OP determines what type of comparison to do, and can be one
|
||||
# of:
|
||||
#
|
||||
# eq - equal (test A == B)
|
||||
# ne - not equal (test A != B)
|
||||
# le - less than or equal (test A <= B)
|
||||
# ge - greater than or equal (test A >= B)
|
||||
# lt - less than (test A < B)
|
||||
# gt - greater than (test A > B)
|
||||
#
|
||||
# Additionally, the eq and ne operator can have a number after it to limit
|
||||
# the test to that number of minor versions.
|
||||
#
|
||||
# eq0 - equal up to the length of the shorter version
|
||||
# ne0 - not equal up to the length of the shorter version
|
||||
# eqN - equal up to N sub-version levels
|
||||
# neN - not equal up to N sub-version levels
|
||||
#
|
||||
# When the condition is true, shell commands ACTION-IF-TRUE are run,
|
||||
# otherwise shell commands ACTION-IF-FALSE are run. The environment
|
||||
# variable 'ax_compare_version' is always set to either 'true' or 'false'
|
||||
# as well.
|
||||
#
|
||||
# Examples:
|
||||
#
|
||||
# AX_COMPARE_VERSION([3.15.7],[lt],[3.15.8])
|
||||
# AX_COMPARE_VERSION([3.15],[lt],[3.15.8])
|
||||
#
|
||||
# would both be true.
|
||||
#
|
||||
# AX_COMPARE_VERSION([3.15.7],[eq],[3.15.8])
|
||||
# AX_COMPARE_VERSION([3.15],[gt],[3.15.8])
|
||||
#
|
||||
# would both be false.
|
||||
#
|
||||
# AX_COMPARE_VERSION([3.15.7],[eq2],[3.15.8])
|
||||
#
|
||||
# would be true because it is only comparing two minor versions.
|
||||
#
|
||||
# AX_COMPARE_VERSION([3.15.7],[eq0],[3.15])
|
||||
#
|
||||
# would be true because it is only comparing the lesser number of minor
|
||||
# versions of the two values.
|
||||
#
|
||||
# Note: The characters that separate the version numbers do not matter. An
|
||||
# empty string is the same as version 0. OP is evaluated by autoconf, not
|
||||
# configure, so must be a string, not a variable.
|
||||
#
|
||||
# The author would like to acknowledge Guido Draheim whose advice about
|
||||
# the m4_case and m4_ifvaln functions make this macro only include the
|
||||
# portions necessary to perform the specific comparison specified by the
|
||||
# OP argument in the final configure script.
|
||||
#
|
||||
# LICENSE
|
||||
#
|
||||
# Copyright (c) 2008 Tim Toolan <toolan@ele.uri.edu>
|
||||
#
|
||||
# Copying and distribution of this file, with or without modification, are
|
||||
# permitted in any medium without royalty provided the copyright notice
|
||||
# and this notice are preserved.
|
||||
|
||||
dnl #########################################################################
|
||||
AC_DEFUN([AX_COMPARE_VERSION], [
|
||||
AC_PROG_AWK
|
||||
|
||||
# Used to indicate true or false condition
|
||||
ax_compare_version=false
|
||||
|
||||
# Convert the two version strings to be compared into a format that
|
||||
# allows a simple string comparison. The end result is that a version
|
||||
# string of the form 1.12.5-r617 will be converted to the form
|
||||
# 0001001200050617. In other words, each number is zero padded to four
|
||||
# digits, and non digits are removed.
|
||||
AS_VAR_PUSHDEF([A],[ax_compare_version_A])
|
||||
A=`echo "$1" | sed -e 's/\([[0-9]]*\)/Z\1Z/g' \
|
||||
-e 's/Z\([[0-9]]\)Z/Z0\1Z/g' \
|
||||
-e 's/Z\([[0-9]][[0-9]]\)Z/Z0\1Z/g' \
|
||||
-e 's/Z\([[0-9]][[0-9]][[0-9]]\)Z/Z0\1Z/g' \
|
||||
-e 's/[[^0-9]]//g'`
|
||||
|
||||
AS_VAR_PUSHDEF([B],[ax_compare_version_B])
|
||||
B=`echo "$3" | sed -e 's/\([[0-9]]*\)/Z\1Z/g' \
|
||||
-e 's/Z\([[0-9]]\)Z/Z0\1Z/g' \
|
||||
-e 's/Z\([[0-9]][[0-9]]\)Z/Z0\1Z/g' \
|
||||
-e 's/Z\([[0-9]][[0-9]][[0-9]]\)Z/Z0\1Z/g' \
|
||||
-e 's/[[^0-9]]//g'`
|
||||
|
||||
dnl # In the case of le, ge, lt, and gt, the strings are sorted as necessary
|
||||
dnl # then the first line is used to determine if the condition is true.
|
||||
dnl # The sed right after the echo is to remove any indented white space.
|
||||
m4_case(m4_tolower($2),
|
||||
[lt],[
|
||||
ax_compare_version=`echo "x$A
|
||||
x$B" | sed 's/^ *//' | sort -r | sed "s/x${A}/false/;s/x${B}/true/;1q"`
|
||||
],
|
||||
[gt],[
|
||||
ax_compare_version=`echo "x$A
|
||||
x$B" | sed 's/^ *//' | sort | sed "s/x${A}/false/;s/x${B}/true/;1q"`
|
||||
],
|
||||
[le],[
|
||||
ax_compare_version=`echo "x$A
|
||||
x$B" | sed 's/^ *//' | sort | sed "s/x${A}/true/;s/x${B}/false/;1q"`
|
||||
],
|
||||
[ge],[
|
||||
ax_compare_version=`echo "x$A
|
||||
x$B" | sed 's/^ *//' | sort -r | sed "s/x${A}/true/;s/x${B}/false/;1q"`
|
||||
],[
|
||||
dnl Split the operator from the subversion count if present.
|
||||
m4_bmatch(m4_substr($2,2),
|
||||
[0],[
|
||||
# A count of zero means use the length of the shorter version.
|
||||
# Determine the number of characters in A and B.
|
||||
ax_compare_version_len_A=`echo "$A" | $AWK '{print(length)}'`
|
||||
ax_compare_version_len_B=`echo "$B" | $AWK '{print(length)}'`
|
||||
|
||||
# Set A to no more than B's length and B to no more than A's length.
|
||||
A=`echo "$A" | sed "s/\(.\{$ax_compare_version_len_B\}\).*/\1/"`
|
||||
B=`echo "$B" | sed "s/\(.\{$ax_compare_version_len_A\}\).*/\1/"`
|
||||
],
|
||||
[[0-9]+],[
|
||||
# A count greater than zero means use only that many subversions
|
||||
A=`echo "$A" | sed "s/\(\([[0-9]]\{4\}\)\{m4_substr($2,2)\}\).*/\1/"`
|
||||
B=`echo "$B" | sed "s/\(\([[0-9]]\{4\}\)\{m4_substr($2,2)\}\).*/\1/"`
|
||||
],
|
||||
[.+],[
|
||||
AC_WARNING(
|
||||
[illegal OP numeric parameter: $2])
|
||||
],[])
|
||||
|
||||
# Pad zeros at end of numbers to make same length.
|
||||
ax_compare_version_tmp_A="$A`echo $B | sed 's/./0/g'`"
|
||||
B="$B`echo $A | sed 's/./0/g'`"
|
||||
A="$ax_compare_version_tmp_A"
|
||||
|
||||
# Check for equality or inequality as necessary.
|
||||
m4_case(m4_tolower(m4_substr($2,0,2)),
|
||||
[eq],[
|
||||
test "x$A" = "x$B" && ax_compare_version=true
|
||||
],
|
||||
[ne],[
|
||||
test "x$A" != "x$B" && ax_compare_version=true
|
||||
],[
|
||||
AC_WARNING([illegal OP parameter: $2])
|
||||
])
|
||||
])
|
||||
|
||||
AS_VAR_POPDEF([A])dnl
|
||||
AS_VAR_POPDEF([B])dnl
|
||||
|
||||
dnl # Execute ACTION-IF-TRUE / ACTION-IF-FALSE.
|
||||
if test "$ax_compare_version" = "true" ; then
|
||||
m4_ifvaln([$4],[$4],[:])dnl
|
||||
m4_ifvaln([$5],[else $5])dnl
|
||||
fi
|
||||
]) dnl AX_COMPARE_VERSION
|
||||
@@ -1,44 +0,0 @@
|
||||
# XCB_UTIL_COMMON(xcb-required-version, xcb-proto-required-version)
|
||||
# -----------------------------------------------------------------
|
||||
#
|
||||
# Defines default options for xcb-util libraries. xorg/util/macros >=
|
||||
# 1.6.0 is required for cross-platform compiler flags and to build
|
||||
# library documentation.
|
||||
#
|
||||
AC_DEFUN([XCB_UTIL_COMMON], [
|
||||
m4_ifndef([AX_COMPARE_VERSION],
|
||||
[m4_fatal([could not find AX_COMPARE_VERSION in macros search path])])
|
||||
|
||||
AC_REQUIRE([AC_PROG_LIBTOOL])
|
||||
|
||||
# Define header files and pkgconfig paths
|
||||
xcbincludedir='${includedir}/xcb'
|
||||
AC_SUBST(xcbincludedir)
|
||||
pkgconfigdir='${libdir}/pkgconfig'
|
||||
AC_SUBST(pkgconfigdir)
|
||||
|
||||
# Check xcb version
|
||||
PKG_CHECK_MODULES(XCB, xcb >= [$1])
|
||||
|
||||
# Check version of xcb-proto that xcb was compiled against
|
||||
xcbproto_required=[$2]
|
||||
|
||||
AC_MSG_CHECKING([whether libxcb was compiled against xcb-proto >= $xcbproto_required])
|
||||
xcbproto_version=`$PKG_CONFIG --variable=xcbproto_version xcb`
|
||||
AX_COMPARE_VERSION([$xcbproto_version],[ge],[$xcbproto_required], xcbproto_ok="yes",
|
||||
xcbproto_ok="no")
|
||||
AC_MSG_RESULT([$xcbproto_ok])
|
||||
|
||||
if test $xcbproto_ok = no; then
|
||||
AC_MSG_ERROR([libxcb was compiled against xcb-proto $xcbproto_version; it needs to be compiled against version $xcbproto_required or higher])
|
||||
fi
|
||||
|
||||
# Call macros from Xorg util-macros
|
||||
m4_ifndef([XORG_MACROS_VERSION],
|
||||
[m4_fatal([must install xorg-macros 1.6.0 or later before running autoconf/autogen])])
|
||||
|
||||
XORG_MACROS_VERSION([1.6.0])
|
||||
XORG_DEFAULT_OPTIONS
|
||||
XORG_ENABLE_DEVEL_DOCS
|
||||
XORG_WITH_DOXYGEN
|
||||
]) # XCB_UTIL_COMMON
|
||||
@@ -1,24 +0,0 @@
|
||||
# XCB_UTIL_M4_WITH_INCLUDE_PATH
|
||||
# ------------------------------
|
||||
#
|
||||
# This macro attempts to locate an m4 macro processor which supports
|
||||
# -I option and is only useful for modules relying on M4 in order to
|
||||
# expand macros in source code files.
|
||||
#
|
||||
# M4: variable holding the path to an usable m4 program.
|
||||
#
|
||||
# This macro requires Autoconf 2.62 or later as it is relying upon
|
||||
# AC_PATH_PROGS_FEATURE_CHECK macro. NOTE: As soon as the minimum
|
||||
# required version of Autoconf for Xorg is bumped to 2.62, this macro
|
||||
# is supposed to be shipped with xorg/util/macros.
|
||||
#
|
||||
AC_DEFUN([XCB_UTIL_M4_WITH_INCLUDE_PATH], [
|
||||
AC_CACHE_CHECK([for m4 that supports -I option], [ac_cv_path_M4],
|
||||
[AC_PATH_PROGS_FEATURE_CHECK([M4], [m4 gm4],
|
||||
[[$ac_path_M4 -I. /dev/null > /dev/null 2>&1 && \
|
||||
ac_cv_path_M4=$ac_path_M4 ac_path_M4_found=:]],
|
||||
[AC_MSG_ERROR([could not find m4 that supports -I option])],
|
||||
[$PATH:/usr/gnu/bin])])
|
||||
|
||||
AC_SUBST([M4], [$ac_cv_path_M4])
|
||||
]) # XCB_UTIL_M4_WITH_INCLUDE_PATH
|
||||
@@ -416,6 +416,7 @@ mapAliases {
|
||||
vscode-langservers-extracted = pkgs.vscode-langservers-extracted; # Added 2023-05-27
|
||||
vue-language-server = self.vls; # added 2023-08-20
|
||||
vue-cli = throw "vue-cli has been removed since upstream no longer recommends using it; consider using create-vue and the new Vite-based tooling instead."; # added 2024-07-12
|
||||
wavedrom-cli = throw "wavedrom-cli has been removed because it was unmaintained within nixpkgs"; # Added 2026-01-20
|
||||
inherit (pkgs) web-ext; # added 2023-08-20
|
||||
webpack = throw "'webpack' has been removed because it is a library that should be imported within a Javascript project, not an end-user tool."; # Added 2025-11-04
|
||||
inherit (pkgs) webpack-cli; # added 2024-12-03
|
||||
|
||||
@@ -18,5 +18,4 @@
|
||||
, "sass"
|
||||
, "semver"
|
||||
, "vercel"
|
||||
, "wavedrom-cli"
|
||||
]
|
||||
|
||||
932
pkgs/development/node-packages/node-packages.nix
generated
932
pkgs/development/node-packages/node-packages.nix
generated
File diff suppressed because it is too large
Load Diff
@@ -79,19 +79,4 @@ final: prev: {
|
||||
rush = prev."@microsoft/rush".override {
|
||||
name = "rush";
|
||||
};
|
||||
|
||||
wavedrom-cli = prev.wavedrom-cli.override {
|
||||
nativeBuildInputs = [
|
||||
pkgs.pkg-config
|
||||
pkgs.node-pre-gyp
|
||||
];
|
||||
# These dependencies are required by
|
||||
# https://github.com/Automattic/node-canvas.
|
||||
buildInputs = with pkgs; [
|
||||
giflib
|
||||
pixman
|
||||
cairo
|
||||
pango
|
||||
];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -24,6 +24,11 @@ buildPythonPackage rec {
|
||||
hash = "sha256-njzSpKPis033eLoRKXL538ljyMOB43chslio1wodrKU=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# https://github.com/iroco-co/aioimaplib/issues/125
|
||||
./event-loop.patch
|
||||
];
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
|
||||
nativeCheckInputs = [
|
||||
|
||||
25
pkgs/development/python-modules/aioimaplib/event-loop.patch
Normal file
25
pkgs/development/python-modules/aioimaplib/event-loop.patch
Normal file
@@ -0,0 +1,25 @@
|
||||
diff --git a/aioimaplib/imap_testing_server.py b/aioimaplib/imap_testing_server.py
|
||||
index b303aa3..419b808 100644
|
||||
--- a/aioimaplib/imap_testing_server.py
|
||||
+++ b/aioimaplib/imap_testing_server.py
|
||||
@@ -198,12 +198,18 @@ class ImapProtocol(asyncio.Protocol):
|
||||
DEFAULT_QUOTA = 5000
|
||||
|
||||
def __init__(self, server_state, fetch_chunk_size=0, capabilities=CAPABILITIES,
|
||||
- loop=asyncio.get_event_loop()):
|
||||
+ loop=None):
|
||||
self.uidvalidity = int(datetime.now().timestamp())
|
||||
self.capabilities = capabilities
|
||||
self.state_to_send = list()
|
||||
self.delay_seconds = 0
|
||||
- self.loop = loop
|
||||
+ if loop is None:
|
||||
+ try:
|
||||
+ self.loop = asyncio.get_running_loop()
|
||||
+ except RuntimeError:
|
||||
+ self.loop = asyncio.new_event_loop()
|
||||
+ else:
|
||||
+ self.loop = loop
|
||||
self.fetch_chunk_size = fetch_chunk_size
|
||||
self.transport = None
|
||||
self.server_state = server_state
|
||||
@@ -4,6 +4,7 @@
|
||||
fetchFromGitHub,
|
||||
flit-core,
|
||||
pytestCheckHook,
|
||||
pythonAtLeast,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
@@ -11,6 +12,9 @@ buildPythonPackage rec {
|
||||
version = "3.13.1";
|
||||
pyproject = true;
|
||||
|
||||
# https://github.com/maxfischer2781/asyncstdlib/issues/189
|
||||
disabled = pythonAtLeast "3.14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "maxfischer2781";
|
||||
repo = "asyncstdlib";
|
||||
|
||||
@@ -8,21 +8,21 @@
|
||||
setuptools,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "awsiotsdk";
|
||||
version = "1.27.0";
|
||||
version = "1.28.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aws";
|
||||
repo = "aws-iot-device-sdk-python-v2";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-CafecTMRNIKQ2FB13SLJwtYwysNMG5DYl2xfHnejApU=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Cs+MbI/23bPvdZNaze7ENyEZNT/AVYsPz/dEEzaAy8c=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace awsiot/__init__.py \
|
||||
--replace-fail "__version__ = '1.0.0-dev'" "__version__ = '${version}'"
|
||||
--replace-fail "__version__ = '1.0.0-dev'" "__version__ = '${finalAttrs.version}'"
|
||||
'';
|
||||
|
||||
pythonRelaxDeps = [ "awscrt" ];
|
||||
@@ -46,8 +46,8 @@ buildPythonPackage rec {
|
||||
meta = {
|
||||
description = "Next generation AWS IoT Client SDK for Python using the AWS Common Runtime";
|
||||
homepage = "https://github.com/aws/aws-iot-device-sdk-python-v2";
|
||||
changelog = "https://github.com/aws/aws-iot-device-sdk-python-v2/releases/tag/${src.tag}";
|
||||
changelog = "https://github.com/aws/aws-iot-device-sdk-python-v2/releases/tag/${finalAttrs.src.tag}";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
fetchFromGitHub,
|
||||
|
||||
# build-system
|
||||
flit-core,
|
||||
poetry-core,
|
||||
|
||||
# dependencies
|
||||
pyyaml,
|
||||
@@ -15,18 +15,18 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "confuse";
|
||||
version = "2.0.1";
|
||||
version = "2.1.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "beetbox";
|
||||
repo = "confuse";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-TVx0cBXv/fIuli/xrFXBAmwJ1rQr5xJL1Q67FaDr4ow=";
|
||||
hash = "sha256-RKiHYAFEvksRLsXC1VrlrKzkPl72dDI4O0Y+X3MrpSs=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
flit-core
|
||||
poetry-core
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
|
||||
@@ -28,7 +28,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "copier";
|
||||
version = "9.11.1";
|
||||
version = "9.11.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
@@ -39,7 +39,7 @@ buildPythonPackage rec {
|
||||
postFetch = ''
|
||||
rm $out/tests/demo/doc/ma*ana.txt
|
||||
'';
|
||||
hash = "sha256-5Rv+Pg23KDEmaTa7C9A5xLcEoneuAMiaZq/obOs0vg8=";
|
||||
hash = "sha256-+cbIohIfCfJRBlRmFyI9dzyZ7EcEThDNxvbxY3rlJFw=";
|
||||
};
|
||||
|
||||
POETRY_DYNAMIC_VERSIONING_BYPASS = version;
|
||||
|
||||
@@ -44,20 +44,18 @@
|
||||
pytest-mock,
|
||||
pytestCheckHook,
|
||||
torchvision,
|
||||
pythonAtLeast,
|
||||
}:
|
||||
|
||||
let
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "detectron2";
|
||||
version = "0.6";
|
||||
in
|
||||
buildPythonPackage {
|
||||
inherit pname version;
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "facebookresearch";
|
||||
repo = "detectron2";
|
||||
tag = "v${version}";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-TosuUZ1hJrXF3VGzsGO2hmQJitGUxe7FyZyKjNh+zPA=";
|
||||
};
|
||||
|
||||
@@ -188,6 +186,12 @@ buildPythonPackage {
|
||||
"test_apply_deltas_tracing"
|
||||
"test_imagelist_padding_tracing"
|
||||
"test_roi_pooler_tracing"
|
||||
]
|
||||
++ lib.optionals (pythonAtLeast "3.14") [
|
||||
# AttributeError: '...' object has no attribute '__annotations__'
|
||||
"test_default_anchor_generator_centered"
|
||||
"test_scriptability_cpu"
|
||||
"test_scriptable_cpu"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "detectron2" ];
|
||||
@@ -198,4 +202,4 @@ buildPythonPackage {
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ happysalada ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
107
pkgs/development/python-modules/exllamav2/default.nix
Normal file
107
pkgs/development/python-modules/exllamav2/default.nix
Normal file
@@ -0,0 +1,107 @@
|
||||
{
|
||||
fetchFromGitHub,
|
||||
lib,
|
||||
cudaPackages,
|
||||
buildPythonPackage,
|
||||
nix-update-script,
|
||||
|
||||
setuptools,
|
||||
|
||||
pybind11,
|
||||
|
||||
which,
|
||||
|
||||
fastparquet,
|
||||
flash-attn,
|
||||
ninja,
|
||||
numpy,
|
||||
pandas,
|
||||
pillow,
|
||||
pygments,
|
||||
regex,
|
||||
rich,
|
||||
safetensors,
|
||||
tokenizers,
|
||||
torch,
|
||||
websockets,
|
||||
}:
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "exllamav2";
|
||||
version = "0.3.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "turboderp-org";
|
||||
repo = "exllamav2";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-WbpbANenOuy6F0qAKVKAmolHjgRKfPxSVud8FZG1TXw=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
pybind11
|
||||
]
|
||||
++ lib.optionals torch.cudaSupport [
|
||||
cudaPackages.libcusparse # cusparse.h
|
||||
cudaPackages.libcublas # cublas_v2.h
|
||||
cudaPackages.libcusolver # cusolverDn.h
|
||||
cudaPackages.libcurand # curand_kernel.h
|
||||
cudaPackages.cuda_cudart # cuda_runtime.h
|
||||
];
|
||||
|
||||
env = lib.optionalAttrs torch.cudaSupport {
|
||||
CUDA_HOME = lib.getDev cudaPackages.cuda_nvcc;
|
||||
TORCH_CUDA_ARCH_LIST = lib.concatStringsSep ";" torch.cudaCapabilities;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
ninja
|
||||
which
|
||||
];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"numpy" # Wants numpy 1.26.4
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
fastparquet
|
||||
flash-attn
|
||||
ninja
|
||||
numpy
|
||||
pandas
|
||||
pillow
|
||||
pygments
|
||||
regex
|
||||
rich
|
||||
safetensors
|
||||
tokenizers
|
||||
torch
|
||||
websockets
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "exllamav2" ];
|
||||
|
||||
# Tests require GPU hardware and external model files
|
||||
doCheck = false;
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/turboderp-org/exllamav2";
|
||||
description = "Inference library for running LLMs locally on modern consumer-class GPUs";
|
||||
changelog = "https://github.com/turboderp-org/exllamav2/releases/tag/${finalAttrs.src.tag}";
|
||||
license = lib.licenses.mit;
|
||||
platforms = [
|
||||
"x86_64-windows"
|
||||
"x86_64-linux"
|
||||
];
|
||||
|
||||
# Package requires CUDA or ROCm for functionality
|
||||
# ROCm support is partially implemented but untested
|
||||
broken = !torch.cudaSupport;
|
||||
maintainers = with lib.maintainers; [ BatteredBunny ];
|
||||
};
|
||||
})
|
||||
102
pkgs/development/python-modules/exllamav3/default.nix
Normal file
102
pkgs/development/python-modules/exllamav3/default.nix
Normal file
@@ -0,0 +1,102 @@
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
buildPythonPackage,
|
||||
cudaPackages,
|
||||
nix-update-script,
|
||||
|
||||
setuptools,
|
||||
|
||||
flash-attn,
|
||||
formatron,
|
||||
kbnf,
|
||||
marisa-trie,
|
||||
ninja,
|
||||
numpy,
|
||||
pillow,
|
||||
pydantic,
|
||||
pyyaml,
|
||||
rich,
|
||||
safetensors,
|
||||
tokenizers,
|
||||
torch,
|
||||
typing-extensions,
|
||||
}:
|
||||
let
|
||||
newerThanTuring = lib.filter (version: lib.versionOlder "7.9" version) torch.cudaCapabilities;
|
||||
in
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "exllamav3";
|
||||
version = "0.0.20";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "turboderp-org";
|
||||
repo = "exllamav3";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-G3PtxKU/J4JEQQOwFmrSWuSr/hA4uyxRci3khXCwEqE=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"pydantic"
|
||||
];
|
||||
|
||||
build-system = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
ninja
|
||||
];
|
||||
|
||||
buildInputs = lib.optionals torch.cudaSupport [
|
||||
cudaPackages.cuda_cudart # cuda_runtime.h
|
||||
cudaPackages.libcusparse # cusparse.h
|
||||
cudaPackages.libcublas # cublas_v2.h
|
||||
cudaPackages.libcusolver # cusolverDn.h
|
||||
cudaPackages.libcurand # curand_kernel.h
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
flash-attn
|
||||
formatron
|
||||
kbnf
|
||||
marisa-trie
|
||||
numpy
|
||||
pillow
|
||||
pydantic
|
||||
pyyaml
|
||||
rich
|
||||
safetensors
|
||||
tokenizers
|
||||
torch
|
||||
typing-extensions
|
||||
];
|
||||
|
||||
env = lib.optionalAttrs torch.cudaSupport {
|
||||
CUDA_HOME = lib.getDev cudaPackages.cuda_nvcc;
|
||||
# exllamav3 only supports turing or newer GPUs
|
||||
# https://github.com/turboderp-org/exllamav3/issues/44
|
||||
TORCH_CUDA_ARCH_LIST = lib.concatStringsSep ";" newerThanTuring;
|
||||
};
|
||||
|
||||
pythonImportsCheck = [ "exllamav3" ];
|
||||
|
||||
# Tests require GPU hardware and external model files
|
||||
doCheck = false;
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Quantization and inference library for running LLMs locally on modern consumer-class GPUs";
|
||||
homepage = "https://github.com/turboderp-org/exllamav3";
|
||||
changelog = "https://github.com/turboderp-org/exllamav3/releases/tag/${finalAttrs.src.tag}";
|
||||
license = lib.licenses.mit;
|
||||
platforms = [
|
||||
"x86_64-windows"
|
||||
"x86_64-linux"
|
||||
];
|
||||
broken = !torch.cudaSupport; # Package requires CUDA for functionality
|
||||
maintainers = with lib.maintainers; [ BatteredBunny ];
|
||||
};
|
||||
})
|
||||
@@ -18,21 +18,21 @@
|
||||
pytestCheckHook,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "fastexcel";
|
||||
version = "0.18.0";
|
||||
version = "0.19.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ToucanToco";
|
||||
repo = "fastexcel";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-d55KHkY6kMuEcX1ApHZZbwnyjEObfPpMrxR+cQshi24=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-BMFZOduKN6D3y9aRkt9VAG2T9oNFBUcnmux1qTKgY5c=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit pname version src;
|
||||
hash = "sha256-ja8hYSq2BiajV/ZlN8EJEFypKzbv80w8iKij3yZst3M=";
|
||||
inherit (finalAttrs) pname version src;
|
||||
hash = "sha256-aTYwXJN2hncZsEAGSlQzK5cX4uWpNoS0wpsXL0I6pZo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -79,8 +79,8 @@ buildPythonPackage rec {
|
||||
meta = {
|
||||
description = "Fast excel file reader for Python, written in Rust";
|
||||
homepage = "https://github.com/ToucanToco/fastexcel/";
|
||||
changelog = "https://github.com/ToucanToco/fastexcel/releases/tag/v${version}";
|
||||
changelog = "https://github.com/ToucanToco/fastexcel/releases/tag/${finalAttrs.src.tag}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ GaetanLepage ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -13,13 +13,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-websecurityscanner";
|
||||
version = "1.18.0";
|
||||
version = "1.19.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "google_cloud_websecurityscanner";
|
||||
inherit version;
|
||||
hash = "sha256-JjW9Rifp3BZIjAzs94trQj1RJAHLzll+tDksV/e1rag=";
|
||||
hash = "sha256-ZNPoAbzhytetU1XauosOQ4jpjJd+AkEZC70gPfnZ6OY=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
pythonAtLeast,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "hydra-core";
|
||||
version = "1.3.2";
|
||||
pyproject = true;
|
||||
@@ -32,7 +32,7 @@ buildPythonPackage rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "facebookresearch";
|
||||
repo = "hydra";
|
||||
tag = "v${version}";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-kD4BStnstr5hwyAOxdpPzLAJ9MZqU/CPiHkaD2HnUPI=";
|
||||
};
|
||||
|
||||
@@ -87,9 +87,51 @@ buildPythonPackage rec {
|
||||
++ lib.optionals (pythonAtLeast "3.13") [
|
||||
# AssertionError: Regex pattern did not match
|
||||
"test_failure"
|
||||
]
|
||||
++ lib.optionals (pythonAtLeast "3.14") [
|
||||
# AssertionError: Regex pattern did not match
|
||||
"test_partial_failure"
|
||||
|
||||
# AssertionError: Mismatch between expected and actual text
|
||||
"test_write_protect_config_node"
|
||||
|
||||
# ValueError: badly formed help string
|
||||
"TestBasicLauncherIntegration"
|
||||
"test_cli_error"
|
||||
"test_completion_plugin"
|
||||
"test_completion_plugin_multirun"
|
||||
"test_configuring_experiments"
|
||||
"test_examples_using_the_config_object"
|
||||
"test_extending_configs"
|
||||
"test_file_completion"
|
||||
"test_missing_default_value"
|
||||
"test_multi_select"
|
||||
"test_searchpath_addition"
|
||||
"test_tutorial_config_file"
|
||||
"test_tutorial_config_file_bad_key"
|
||||
"test_tutorial_config_groups"
|
||||
"test_tutorial_defaults"
|
||||
"test_tutorial_logging"
|
||||
"test_tutorial_simple_cli_app"
|
||||
"test_tutorial_working_directory"
|
||||
"test_tutorial_working_directory_original_cwd"
|
||||
"test_with_flags"
|
||||
];
|
||||
|
||||
disabledTestPaths = [ "tests/test_hydra.py" ];
|
||||
disabledTestPaths = [
|
||||
"tests/test_hydra.py"
|
||||
]
|
||||
++ lib.optionals (pythonAtLeast "3.14") [
|
||||
# ValueError: badly formed help string
|
||||
"tests/test_callbacks.py"
|
||||
"tests/test_env_defaults.py"
|
||||
"tests/test_examples/test_advanced_package_overrides.py"
|
||||
"tests/test_examples/test_basic_sweep.py"
|
||||
"tests/test_examples/test_configure_hydra.py"
|
||||
"tests/test_examples/test_experimental.py"
|
||||
"tests/test_examples/test_instantiate_examples.py"
|
||||
"tests/test_examples/test_structured_configs_tutorial.py"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"hydra"
|
||||
@@ -100,8 +142,8 @@ buildPythonPackage rec {
|
||||
meta = {
|
||||
description = "Framework for configuring complex applications";
|
||||
homepage = "https://hydra.cc";
|
||||
changelog = "https://github.com/facebookresearch/hydra/blob/v${version}/NEWS.md";
|
||||
changelog = "https://github.com/facebookresearch/hydra/blob/${finalAttrs.src.tag}/NEWS.md";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ bcdarwin ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
pythonAtLeast,
|
||||
|
||||
# build-system
|
||||
setuptools,
|
||||
@@ -14,20 +14,23 @@
|
||||
pytestCheckHook,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "hydra-joblib-launcher";
|
||||
pyproject = true;
|
||||
|
||||
inherit (hydra-core) version src;
|
||||
|
||||
sourceRoot = "${src.name}/plugins/hydra_joblib_launcher";
|
||||
# _pickle.PicklingError: Could not pickle the task to send it to the workers
|
||||
disabled = pythonAtLeast "3.14";
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/plugins/hydra_joblib_launcher";
|
||||
|
||||
# get rid of deprecated "read_version" dependency, no longer in Nixpkgs:
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml --replace-fail ', "read-version"' ""
|
||||
substituteInPlace setup.py \
|
||||
--replace-fail 'from read_version import read_version' "" \
|
||||
--replace-fail 'version=read_version("hydra_plugins/hydra_joblib_launcher", "__init__.py"),' 'version="${version}",'
|
||||
--replace-fail 'version=read_version("hydra_plugins/hydra_joblib_launcher", "__init__.py"),' 'version="${finalAttrs.version}",'
|
||||
'';
|
||||
|
||||
build-system = [
|
||||
@@ -52,4 +55,4 @@ buildPythonPackage rec {
|
||||
homepage = "https://hydra.cc/docs/plugins/joblib_launcher";
|
||||
maintainers = with lib.maintainers; [ bcdarwin ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -23,8 +23,7 @@ buildPythonPackage rec {
|
||||
owner = "jeffkaufman";
|
||||
repo = "icdiff";
|
||||
tag = "release-${version}";
|
||||
hash = "sha256-ykQLF2b47RZSlrJXYpZ03evhpcGfVyTYwpO2UbmWqrY=";
|
||||
deepClone = true;
|
||||
hash = "sha256-SbgUBWaNT8akYKXYef/94vqZqJannZv+TxfbCnHKQtw=";
|
||||
};
|
||||
|
||||
patches = [ ./0001-Don-t-test-black-or-flake8.patch ];
|
||||
|
||||
@@ -2,13 +2,15 @@
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
pytestCheckHook,
|
||||
setuptools,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "iteration-utilities";
|
||||
version = "0.13.0";
|
||||
format = "setuptools";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "MSeifert04";
|
||||
@@ -17,6 +19,16 @@ buildPythonPackage rec {
|
||||
hash = "sha256-SiqNUyuvsD5m5qz5ByYyVln3SSa4/D4EHpmM+pf8ngM=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "python314-compat.patch";
|
||||
url = "https://github.com/MSeifert04/iteration_utilities/pull/347.patch";
|
||||
hash = "sha256-1BzUTbzxIw4kExdrAlS4Pbh1zPweyU78ln2qGL7XL58=";
|
||||
})
|
||||
];
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
pythonImportsCheck = [ "iteration_utilities" ];
|
||||
|
||||
@@ -17,14 +17,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "sapi-python-client";
|
||||
version = "0.9.4";
|
||||
version = "0.9.5";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "keboola";
|
||||
repo = "sapi-python-client";
|
||||
tag = version;
|
||||
hash = "sha256-FlafM42CVlYtJGFToLIjg0RKhwJ0/oVvGd3T8PNwhOI=";
|
||||
hash = "sha256-i+SI5F48C90Af04boedEk72obctHp9PJIv8m0ewpGR0=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
}:
|
||||
buildPythonPackage rec {
|
||||
pname = "netbox-contract";
|
||||
version = "2.4.3";
|
||||
version = "2.4.4";
|
||||
pyproject = true;
|
||||
|
||||
disabled = python.pythonVersion != netbox.python.pythonVersion;
|
||||
@@ -20,7 +20,7 @@ buildPythonPackage rec {
|
||||
owner = "mlebreuil";
|
||||
repo = "netbox-contract";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-6xJ/c2VsAL2WlV/djbYeZIZ1FHWCtHy+UC3U4cMSIZA=";
|
||||
hash = "sha256-3kjxy6gkhqYrWvl/gbeAxb8m8r3Dihas9cDf50NQMC4=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -1,38 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
isPy3k,
|
||||
pythonAtLeast,
|
||||
cython,
|
||||
numpy,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pkuseg";
|
||||
version = "0.0.25";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = !isPy3k || pythonAtLeast "3.9";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "148yp0l7h8cflxag62pc1iwj5b5liyljnaxwfjaiqwl96vwjn0fx";
|
||||
};
|
||||
|
||||
# Does not seem to have actual tests, but unittest discover
|
||||
# recognizes some non-tests as tests and fails.
|
||||
doCheck = false;
|
||||
|
||||
nativeBuildInputs = [ cython ];
|
||||
|
||||
propagatedBuildInputs = [ numpy ];
|
||||
|
||||
pythonImportsCheck = [ "pkuseg" ];
|
||||
|
||||
meta = {
|
||||
description = "Toolkit for multi-domain Chinese word segmentation";
|
||||
homepage = "https://github.com/lancopku/pkuseg-python";
|
||||
license = lib.licenses.unfree;
|
||||
};
|
||||
}
|
||||
@@ -30,7 +30,7 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "pyopencl";
|
||||
version = "2026.1.1";
|
||||
version = "2026.1.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
@@ -38,7 +38,7 @@ buildPythonPackage (finalAttrs: {
|
||||
repo = "pyopencl";
|
||||
tag = "v${finalAttrs.version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-+uFuOhz2zkseL95iHJgGmz36+Rz1zcg2RX3Dc7IThxY=";
|
||||
hash = "sha256-n1xdJbq+RPW2p8MNc6YA9+GlYokSbW8llbCFFv1wCcE=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
|
||||
# build system
|
||||
setuptools,
|
||||
@@ -27,25 +26,16 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "samsungtvws";
|
||||
version = "2.7.2";
|
||||
version = "3.0.3";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "xchwarze";
|
||||
repo = "samsung-tv-ws-api";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-CU59Kg8kSEE71x6wifCKCaVFdaMftodtkrAOpD+qvWY=";
|
||||
hash = "sha256-yxCdcE5N/ZMRAkb0R8TT1jocMre0xv3EzpBXJ6Erkvg=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# https://github.com/xchwarze/samsung-tv-ws-api/pull/159
|
||||
(fetchpatch {
|
||||
name = "replace-async-timeout-with-asyncio.timeout.patch";
|
||||
url = "https://github.com/xchwarze/samsung-tv-ws-api/commit/c5b363aababe0e859cf3aa521a658c83c567f876.patch";
|
||||
hash = "sha256-gEtcqmxy2Til0KYLGwCxRThx9fndqdMbYam5WbzDKOo=";
|
||||
})
|
||||
];
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "0.2.6";
|
||||
version = "0.2.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "yzx9";
|
||||
repo = "sdflit";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-Ze3J5Dp+TskhIiGP6kMK3AIHLnhVBuEaKJokccIr+SM=";
|
||||
hash = "sha256-9x/EnFCWhGu1zlLLz6D084PduS9ReQqdeRMblmw0g/s=";
|
||||
};
|
||||
in
|
||||
buildPythonPackage {
|
||||
@@ -24,7 +24,7 @@ buildPythonPackage {
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit src;
|
||||
hash = "sha256-CrMe5DuO9sQZZ50Hy+av4nF4gbOe296zSWJfJ8th7zs=";
|
||||
hash = "sha256-Bz4HfpC+qNWWV3KgLW8L+4d5odmbYNRvdMjdMBy6qIQ=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -11,13 +11,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "sphinxcontrib-confluencebuilder";
|
||||
version = "2.17.1";
|
||||
version = "3.0.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "sphinxcontrib_confluencebuilder";
|
||||
inherit version;
|
||||
hash = "sha256-Cc5ogZn3QpqNsPHyYpyvtMVEnQK+QHO1pSxg3pDrMLM=";
|
||||
hash = "sha256-+Z4rsqozJ3DWrg7SYr7dh7CIQlCgpX9Fj6lJmcCxoMk=";
|
||||
};
|
||||
|
||||
build-system = [ flit-core ];
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user