Merge master into staging-next
This commit is contained in:
nixpkgs-ci[bot]
@@ -136,10 +136,8 @@ jobs:
|
||||
steps:
|
||||
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
|
||||
with:
|
||||
persist-credentials: false
|
||||
persist-credentials: true # Needed to run git fetch for large PRs.
|
||||
path: trusted
|
||||
sparse-checkout: |
|
||||
ci/github-script
|
||||
- name: Check commit messages
|
||||
uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
|
||||
with:
|
||||
@@ -150,4 +148,5 @@ jobs:
|
||||
github,
|
||||
context,
|
||||
core,
|
||||
repoPath: 'trusted',
|
||||
})
|
||||
|
||||
+2
-3
@@ -329,11 +329,10 @@ You can invoke the nixpkgs-merge-bot by commenting `@NixOS/nixpkgs-merge-bot mer
|
||||
The bot will verify the following conditions, refusing to merge otherwise:
|
||||
|
||||
- the PR author should be @r-ryantm or a Nixpkgs committer;
|
||||
- the invoker should be among the package maintainers;
|
||||
- the invoker should be among the package maintainers on the targeted branch;
|
||||
- the package should reside in `pkgs/by-name`.
|
||||
|
||||
Further, nixpkgs-merge-bot will ensure all CI checks and the ofborg builds for Linux have successfully completed before merging the pull request.
|
||||
Should the checks still be underway, the bot will wait for them to finish before attempting the merge again.
|
||||
Required status checks prevent PRs that fail them ("PR / ..." jobs) from being merged. Ofborg is not required by the checks.
|
||||
|
||||
For other pull requests, please see [I opened a PR, how do I get it merged?](#i-opened-a-pr-how-do-i-get-it-merged).
|
||||
|
||||
|
||||
@@ -1,14 +1,37 @@
|
||||
// @ts-check
|
||||
const { classify } = require('../supportedBranches.js')
|
||||
const { promisify } = require('node:util')
|
||||
const execFile = promisify(require('node:child_process').execFile)
|
||||
|
||||
/**
|
||||
* @param {{
|
||||
* args: string[]
|
||||
* core: import('@actions/core'),
|
||||
* quiet?: boolean,
|
||||
* repoPath?: string,
|
||||
* }} RunGitProps
|
||||
*/
|
||||
async function runGit({ args, repoPath, core, quiet }) {
|
||||
if (repoPath) {
|
||||
args = ['-C', repoPath, ...args]
|
||||
}
|
||||
|
||||
if (!quiet) {
|
||||
core.info(`About to run \`git ${args.map((s) => `'${s}'`).join(' ')}\``)
|
||||
}
|
||||
|
||||
return await execFile('git', args)
|
||||
}
|
||||
|
||||
/**
|
||||
* @param {{
|
||||
* github: InstanceType<import('@actions/github/lib/utils').GitHub>,
|
||||
* context: import('@actions/github/lib/context').Context
|
||||
* core: import('@actions/core')
|
||||
* context: import('@actions/github/lib/context').Context,
|
||||
* core: import('@actions/core'),
|
||||
* repoPath?: string,
|
||||
* }} CheckCommitMessagesProps
|
||||
*/
|
||||
async function checkCommitMessages({ github, context, core }) {
|
||||
async function checkCommitMessages({ github, context, core, repoPath }) {
|
||||
// This check should only be run when we have the pull_request context.
|
||||
const pull_number = context.payload.pull_request?.number
|
||||
if (!pull_number) {
|
||||
@@ -44,15 +67,70 @@ async function checkCommitMessages({ github, context, core }) {
|
||||
return
|
||||
}
|
||||
|
||||
const commits = await github.paginate(github.rest.pulls.listCommits, {
|
||||
...context.repo,
|
||||
pull_number,
|
||||
})
|
||||
/**
|
||||
* GitHub's API will return a maximum of 250 commits.
|
||||
* We will use it if we can, but fall back to using git locally.
|
||||
* This type is used to abstract over the differences between the two.
|
||||
* @type {{
|
||||
* message: string,
|
||||
* sha: string,
|
||||
* }[]}
|
||||
*/
|
||||
let commits
|
||||
|
||||
if (pr.commits < 250) {
|
||||
commits = (
|
||||
await github.paginate(github.rest.pulls.listCommits, {
|
||||
...context.repo,
|
||||
pull_number,
|
||||
})
|
||||
).map((commit) => ({ message: commit.commit.message, sha: commit.sha }))
|
||||
} else {
|
||||
await runGit({
|
||||
args: ['fetch', `--depth=1`, 'origin', pr.base.sha],
|
||||
repoPath,
|
||||
core,
|
||||
})
|
||||
await runGit({
|
||||
args: ['fetch', `--depth=${pr.commits + 1}`, 'origin', pr.head.sha],
|
||||
repoPath,
|
||||
core,
|
||||
})
|
||||
|
||||
const shas = (
|
||||
await runGit({
|
||||
args: [
|
||||
'rev-list',
|
||||
`--max-count=${pr.commits}`,
|
||||
`${pr.base.sha}..${pr.head.sha}`,
|
||||
],
|
||||
repoPath,
|
||||
core,
|
||||
})
|
||||
).stdout
|
||||
.split('\n')
|
||||
.map((s) => s.trim())
|
||||
.filter(Boolean)
|
||||
|
||||
commits = await Promise.all(
|
||||
shas.map(async (sha) => ({
|
||||
sha,
|
||||
message: (
|
||||
await runGit({
|
||||
args: ['log', '--format=%s', '-1', sha],
|
||||
repoPath,
|
||||
core,
|
||||
quiet: true,
|
||||
})
|
||||
).stdout,
|
||||
})),
|
||||
)
|
||||
}
|
||||
|
||||
const failures = new Set()
|
||||
|
||||
for (const commit of commits) {
|
||||
const message = commit.commit.message
|
||||
const message = commit.message
|
||||
const firstLine = message.split('\n')[0]
|
||||
|
||||
const logMsgStart = `Commit ${commit.sha}'s message's subject ("${firstLine}")`
|
||||
@@ -74,6 +152,16 @@ async function checkCommitMessages({ github, context, core }) {
|
||||
failures.add(commit.sha)
|
||||
}
|
||||
|
||||
const fixups = ['amend!', 'fixup!', 'squash!']
|
||||
if (fixups.some((s) => firstLine.startsWith(s))) {
|
||||
core.error(
|
||||
`${logMsgStart} was detected as not meeting our guidelines because ` +
|
||||
`it begins with "${fixups.find((s) => firstLine.startsWith(s))}". ` +
|
||||
'Did you forget to run `git rebase -i --autosquash`?',
|
||||
)
|
||||
failures.add(commit.sha)
|
||||
}
|
||||
|
||||
if (!failures.has(commit.sha)) {
|
||||
core.info(`${logMsgStart} passed our automated checks!`)
|
||||
}
|
||||
|
||||
@@ -39,6 +39,7 @@ let
|
||||
subtractLists
|
||||
types
|
||||
unique
|
||||
versionAtLeast
|
||||
;
|
||||
|
||||
cfg = config.services.kanidm;
|
||||
@@ -142,12 +143,14 @@ let
|
||||
builtins.toJSON { inherit (cfg.provision) groups persons systems; }
|
||||
);
|
||||
|
||||
scriptingArg = optionalString (versionAtLeast cfg.package.version "1.9") "scripting";
|
||||
|
||||
# Only recover the admin account if a password should explicitly be provisioned
|
||||
# for the account. Otherwise it is not needed for provisioning.
|
||||
maybeRecoverAdmin = optionalString (cfg.provision.adminPasswordFile != null) ''
|
||||
KANIDM_ADMIN_PASSWORD=$(< ${cfg.provision.adminPasswordFile})
|
||||
# We always reset the admin account password if a desired password was specified.
|
||||
if ! KANIDM_RECOVER_ACCOUNT_PASSWORD=$KANIDM_ADMIN_PASSWORD ${cfg.package}/bin/kanidmd recover-account -c ${serverConfigFile} admin --from-environment >/dev/null; then
|
||||
if ! KANIDM_RECOVER_ACCOUNT_PASSWORD=$KANIDM_ADMIN_PASSWORD ${cfg.package}/bin/kanidmd ${scriptingArg} recover-account -c ${serverConfigFile} admin --from-environment >/dev/null; then
|
||||
echo "Failed to recover admin account" >&2
|
||||
exit 1
|
||||
fi
|
||||
@@ -161,19 +164,35 @@ let
|
||||
''
|
||||
KANIDM_IDM_ADMIN_PASSWORD=$(< ${cfg.provision.idmAdminPasswordFile})
|
||||
# We always reset the idm_admin account password if a desired password was specified.
|
||||
if ! KANIDM_RECOVER_ACCOUNT_PASSWORD=$KANIDM_IDM_ADMIN_PASSWORD ${cfg.package}/bin/kanidmd recover-account -c ${serverConfigFile} idm_admin --from-environment >/dev/null; then
|
||||
if ! KANIDM_RECOVER_ACCOUNT_PASSWORD=$KANIDM_IDM_ADMIN_PASSWORD ${cfg.package}/bin/kanidmd ${scriptingArg} recover-account -c ${serverConfigFile} idm_admin --from-environment >/dev/null; then
|
||||
echo "Failed to recover idm_admin account" >&2
|
||||
exit 1
|
||||
fi
|
||||
''
|
||||
else if versionAtLeast cfg.package.version "1.9" then
|
||||
''
|
||||
# Recover idm_admin account
|
||||
if ! recover_out=$(${cfg.package}/bin/kanidmd scripting recover-account -c ${serverConfigFile} idm_admin); then
|
||||
echo "$recover_out" >&2
|
||||
echo "kanidm provision: Failed to recover idm_admin account" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if ! KANIDM_IDM_ADMIN_PASSWORD=$(${getExe pkgs.jq} -r .output <<< "$recover_out"); then
|
||||
echo "$recover_out" >&2
|
||||
echo "kanidm provision: Failed to parse password for idm_admin account" >&2
|
||||
exit 1
|
||||
fi
|
||||
''
|
||||
else
|
||||
''
|
||||
# Recover idm_admin account
|
||||
if ! recover_out=$(${cfg.package}/bin/kanidmd recover-account -c ${serverConfigFile} idm_admin -o json); then
|
||||
echo "$recover_out" >&2
|
||||
echo "kanidm provision: Failed to recover admin account" >&2
|
||||
echo "kanidm provision: Failed to recover idm_admin account" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if ! KANIDM_IDM_ADMIN_PASSWORD=$(grep '{"password' <<< "$recover_out" | ${getExe pkgs.jq} -r .password); then
|
||||
echo "$recover_out" >&2
|
||||
echo "kanidm provision: Failed to parse password for idm_admin account" >&2
|
||||
|
||||
@@ -47,6 +47,7 @@ mapAliases (
|
||||
coc-tsserver = throw "`vimPlugins.coc-tsserver` was removed, as it was unmaintained"; # added 2026-02-12
|
||||
coc-vetur = throw "coc-vetur was removed, as vetur is unmaintained by Vue. You should switch to Volar, which supports Vue 3"; # added 2025-10-01
|
||||
completion-treesitter = throw "completion-treesitter has been archived since 2024-01"; # Added 2025-12-18
|
||||
ctags-lsp-nvim = throw "`vimPlugins.ctags-lsp-nvim` has been removed, upstream deleted the repository"; # added 2026-02-14
|
||||
feline-nvim = throw "feline.nvim has been removed: upstream deleted repository. Consider using lualine"; # Added 2025-02-09
|
||||
floating-nvim = throw "floating.nvim has been removed: abandoned by upstream. Use popup-nvim or nui-nvim"; # Added 2024-11-26
|
||||
fruzzy = throw "vimPlugins.fruzzy did not update since 2019-10-28 and uses EOL version of Nim"; # Added 2025-11-12
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -498,12 +498,12 @@
|
||||
};
|
||||
dart = buildGrammar {
|
||||
language = "dart";
|
||||
version = "0.0.0+rev=5650b09";
|
||||
version = "0.0.0+rev=81638db";
|
||||
src = fetchFromGitHub {
|
||||
owner = "UserNobody14";
|
||||
repo = "tree-sitter-dart";
|
||||
rev = "5650b09d9fc4ef9315b361c74aa811bbdbc09458";
|
||||
hash = "sha256-J016cVFVoe1sXg0vCkqep2ODG/Hou1KGtO1sX0t+qbo=";
|
||||
rev = "81638dbbdb76a0e88ea8c31b95ec76b9625ddb84";
|
||||
hash = "sha256-JDuuatWkZSnj9sbsfutQQOKhuH2vNIaasoDp4iGxIjU=";
|
||||
};
|
||||
meta.homepage = "https://github.com/UserNobody14/tree-sitter-dart";
|
||||
};
|
||||
@@ -841,12 +841,12 @@
|
||||
};
|
||||
fortran = buildGrammar {
|
||||
language = "fortran";
|
||||
version = "0.0.0+rev=43cd127";
|
||||
version = "0.0.0+rev=32fe27e";
|
||||
src = fetchFromGitHub {
|
||||
owner = "stadelmanma";
|
||||
repo = "tree-sitter-fortran";
|
||||
rev = "43cd127cd41ff6e57b3ececb3cc283c5af4796e7";
|
||||
hash = "sha256-CwK8NYUI3ZRNVxDWOKY4Wa1uHBByW3VZOCIBts60uPk=";
|
||||
rev = "32fe27ec32b6a3bc2bc333566e6457f10fc7bbe3";
|
||||
hash = "sha256-SlbQpkfoIV0EN+nA2m53iojrSK0UilIJ4TO03wqgMw0=";
|
||||
};
|
||||
meta.homepage = "https://github.com/stadelmanma/tree-sitter-fortran";
|
||||
};
|
||||
@@ -988,12 +988,12 @@
|
||||
};
|
||||
gleam = buildGrammar {
|
||||
language = "gleam";
|
||||
version = "0.0.0+rev=dd4e328";
|
||||
version = "0.0.0+rev=6ea757f";
|
||||
src = fetchFromGitHub {
|
||||
owner = "gleam-lang";
|
||||
repo = "tree-sitter-gleam";
|
||||
rev = "dd4e328c5fd5f158d47a22339d8ce0f8be918a0b";
|
||||
hash = "sha256-9RoKAtdHmryAiBG6s/Og7qXt2Z0IkrN8cHA+8NZf2FM=";
|
||||
rev = "6ea757f7eb8d391dbf24dbb9461990757946dd5e";
|
||||
hash = "sha256-jCzv+PMwjcGrMuNFpKf1qP1ziNaSd3L0V+eukF3ZHjY=";
|
||||
};
|
||||
meta.homepage = "https://github.com/gleam-lang/tree-sitter-gleam";
|
||||
};
|
||||
@@ -1466,12 +1466,12 @@
|
||||
};
|
||||
janet_simple = buildGrammar {
|
||||
language = "janet_simple";
|
||||
version = "0.0.0+rev=7e28cbf";
|
||||
version = "0.0.0+rev=d183186";
|
||||
src = fetchFromGitHub {
|
||||
owner = "sogaiu";
|
||||
repo = "tree-sitter-janet-simple";
|
||||
rev = "7e28cbf1ca061887ea43591a2898001f4245fddf";
|
||||
hash = "sha256-qWsUPZfQkuEUiuCSsqs92MIMEvdD+q2bwKir3oE5thc=";
|
||||
rev = "d183186995204314700be3e9e0a48053ea16b350";
|
||||
hash = "sha256-zETOH+HpHyiCdOiggRy7VVjOv/WVRDb4qQ+kN9r2Frc=";
|
||||
};
|
||||
meta.homepage = "https://github.com/sogaiu/tree-sitter-janet-simple";
|
||||
};
|
||||
@@ -1603,12 +1603,12 @@
|
||||
};
|
||||
just = buildGrammar {
|
||||
language = "just";
|
||||
version = "0.0.0+rev=fe94f52";
|
||||
version = "0.0.0+rev=60df3d5";
|
||||
src = fetchFromGitHub {
|
||||
owner = "IndianBoy42";
|
||||
repo = "tree-sitter-just";
|
||||
rev = "fe94f5230d97ff9fc7bee8c57e650dff615ed7cc";
|
||||
hash = "sha256-H8aAmI8/D2/3eeR4Nn/q8JNPbJjKEyV6/QX608Ikbm4=";
|
||||
rev = "60df3d5b3fda2a22fdb3621226cafab50b763663";
|
||||
hash = "sha256-cul4U1V42l/nYcCvs2eVA09qSrPi34t0eJ/Pr/Ewfhc=";
|
||||
};
|
||||
meta.homepage = "https://github.com/IndianBoy42/tree-sitter-just";
|
||||
};
|
||||
@@ -1931,12 +1931,12 @@
|
||||
};
|
||||
mlir = buildGrammar {
|
||||
language = "mlir";
|
||||
version = "0.0.0+rev=a547cb7";
|
||||
version = "0.0.0+rev=d2ba26e";
|
||||
src = fetchFromGitHub {
|
||||
owner = "artagnon";
|
||||
repo = "tree-sitter-mlir";
|
||||
rev = "a547cb73d7c6373e77692bb7739e670b5de60f86";
|
||||
hash = "sha256-9ZmXquoJw2Sh9QyLnvHGxhvGmFeZdacn0+arw8VVZhA=";
|
||||
rev = "d2ba26eeee7e3fd83a52236e1f143da42145ade7";
|
||||
hash = "sha256-kPll9hqe7Jn0XEuQ1ZSJxeF5gnJWu3e2XUwDIpZV04M=";
|
||||
};
|
||||
generate = true;
|
||||
meta.homepage = "https://github.com/artagnon/tree-sitter-mlir";
|
||||
@@ -2618,12 +2618,12 @@
|
||||
};
|
||||
rescript = buildGrammar {
|
||||
language = "rescript";
|
||||
version = "0.0.0+rev=5938ae1";
|
||||
version = "0.0.0+rev=3159c94";
|
||||
src = fetchFromGitHub {
|
||||
owner = "rescript-lang";
|
||||
repo = "tree-sitter-rescript";
|
||||
rev = "5938ae1578aa559b4fa903f7cabc31da14f71c84";
|
||||
hash = "sha256-CG1pZOT9IrWPfGruEITNrNgrdsuyRDtv46Pdsg+Qm/0=";
|
||||
rev = "3159c949c15096b02b470bd4025754806fc7a17d";
|
||||
hash = "sha256-A1u3CCJw6Rqsr6SLqVjYIr6spd7prLF4AMmA79N+8tQ=";
|
||||
};
|
||||
meta.homepage = "https://github.com/rescript-lang/tree-sitter-rescript";
|
||||
};
|
||||
@@ -2820,12 +2820,12 @@
|
||||
};
|
||||
slint = buildGrammar {
|
||||
language = "slint";
|
||||
version = "0.0.0+rev=5dafe67";
|
||||
version = "0.0.0+rev=a6e4e1c";
|
||||
src = fetchFromGitHub {
|
||||
owner = "slint-ui";
|
||||
repo = "tree-sitter-slint";
|
||||
rev = "5dafe6745dd3bb24342acebe478015b642dc7135";
|
||||
hash = "sha256-FS1a0N2yiRyBqhxxzUgR4mTnQ81Q8CfNZTb2AQrkBPw=";
|
||||
rev = "a6e4e1c656429e5df52dcfcd92da87b642f6678b";
|
||||
hash = "sha256-A4m3jG7VjGws7pVzd7ulbhINe783shv4pc3tH8EDji0=";
|
||||
};
|
||||
meta.homepage = "https://github.com/slint-ui/tree-sitter-slint";
|
||||
};
|
||||
@@ -2875,12 +2875,12 @@
|
||||
};
|
||||
solidity = buildGrammar {
|
||||
language = "solidity";
|
||||
version = "0.0.0+rev=4e938a4";
|
||||
version = "0.0.0+rev=048fe68";
|
||||
src = fetchFromGitHub {
|
||||
owner = "JoranHonig";
|
||||
repo = "tree-sitter-solidity";
|
||||
rev = "4e938a46c7030dd001bc99e1ac0f0c750ac98254";
|
||||
hash = "sha256-b+DHy7BkkMg88kLhirtCzjF3dHlCFkXea65aGC18fW0=";
|
||||
rev = "048fe686cb1fde267243739b8bdbec8fc3a55272";
|
||||
hash = "sha256-tv78h5m5g+O16i6ZkQX4Ozh5pM47Xd7wCc3Owo3awzs=";
|
||||
};
|
||||
meta.homepage = "https://github.com/JoranHonig/tree-sitter-solidity";
|
||||
};
|
||||
@@ -2943,12 +2943,12 @@
|
||||
};
|
||||
sql = buildGrammar {
|
||||
language = "sql";
|
||||
version = "0.0.0+rev=86e3d03";
|
||||
version = "0.0.0+rev=c686d57";
|
||||
src = fetchFromGitHub {
|
||||
owner = "derekstride";
|
||||
repo = "tree-sitter-sql";
|
||||
rev = "86e3d03837d282544439620eb74d224586074b8b";
|
||||
hash = "sha256-O2FkTwt/I+tOXtpMbsxkgU+v64Ie9fh73ZZRm3E83no=";
|
||||
rev = "c686d575d6ee585c404c30dd1cf2a0f42d687460";
|
||||
hash = "sha256-fI4Le/4OIxDJrQ0uzJaKMejhDkPY7Ew6DuhJFya8t4k=";
|
||||
};
|
||||
meta.homepage = "https://github.com/derekstride/tree-sitter-sql";
|
||||
};
|
||||
@@ -3110,12 +3110,12 @@
|
||||
};
|
||||
t32 = buildGrammar {
|
||||
language = "t32";
|
||||
version = "0.0.0+rev=5b5e433";
|
||||
version = "0.0.0+rev=c4c5fa3";
|
||||
src = fetchFromGitHub {
|
||||
owner = "xasc";
|
||||
repo = "tree-sitter-t32";
|
||||
rev = "5b5e4336731bda5ea2e6b78b6a2d9e7a89032b75";
|
||||
hash = "sha256-dAbjM+wlKtJ3cY3zdRgsdsjJ0ZYDZxTL0mcunqqNbvw=";
|
||||
rev = "c4c5fa31666c66036ad3ace8179a408b8478395f";
|
||||
hash = "sha256-BUao6oveuWWPn2jDUWAjzoi9YMsDEA5B+hKJHvCUtD0=";
|
||||
};
|
||||
meta.homepage = "https://github.com/xasc/tree-sitter-t32";
|
||||
};
|
||||
@@ -3396,12 +3396,12 @@
|
||||
};
|
||||
unison = buildGrammar {
|
||||
language = "unison";
|
||||
version = "0.0.0+rev=873e599";
|
||||
version = "0.0.0+rev=16650de";
|
||||
src = fetchFromGitHub {
|
||||
owner = "kylegoetz";
|
||||
repo = "tree-sitter-unison";
|
||||
rev = "873e599faaba40a69b8f9507f90bcfa0ae0bbe26";
|
||||
hash = "sha256-fnSuRrFp5AfuBKBXmzijBsYHvOHCUFjquuKbOrd1pBg=";
|
||||
rev = "16650de9f519e41f8e88b22b4c401d50fa0ac8ca";
|
||||
hash = "sha256-gdTjLC7J+x99EjWYdwOSzPGnnAMri1Q7luwvRE4AzQ0=";
|
||||
};
|
||||
generate = true;
|
||||
meta.homepage = "https://github.com/kylegoetz/tree-sitter-unison";
|
||||
@@ -3453,12 +3453,12 @@
|
||||
};
|
||||
vento = buildGrammar {
|
||||
language = "vento";
|
||||
version = "0.0.0+rev=3b32474";
|
||||
version = "0.0.0+rev=edd6596";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ventojs";
|
||||
repo = "tree-sitter-vento";
|
||||
rev = "3b32474bc29584ea214e4e84b47102408263fe0e";
|
||||
hash = "sha256-h8yC+MJIAH7DM69UQ8moJBmcmrSZkxvWrMb+NqtYB2Y=";
|
||||
rev = "edd6596d4b0f392b87fc345dc26d84a6c32f7059";
|
||||
hash = "sha256-QbPV9MVe5e9l/rAy2phEd5aqejl4KBkBhHIFdhuYCe4=";
|
||||
};
|
||||
meta.homepage = "https://github.com/ventojs/tree-sitter-vento";
|
||||
};
|
||||
|
||||
@@ -947,14 +947,6 @@ assertNoAdditions {
|
||||
};
|
||||
|
||||
cpsm = super.cpsm.overrideAttrs (old: {
|
||||
# CMake 4 dropped support of versions lower than 3.5, and versions
|
||||
# lower than 3.10 are deprecated.
|
||||
postPatch = (old.postPatch or "") + ''
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace-fail \
|
||||
"cmake_minimum_required(VERSION 2.8.12)" \
|
||||
"cmake_minimum_required(VERSION 3.10)"
|
||||
'';
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [
|
||||
python3
|
||||
@@ -1619,9 +1611,8 @@ assertNoAdditions {
|
||||
|
||||
jj-nvim = super.jj-nvim.overrideAttrs {
|
||||
# Don't install 30 MB of GIFs
|
||||
installPhase = ''
|
||||
mkdir $out
|
||||
cp -r lua $out
|
||||
postPatch = ''
|
||||
rm -rf assets/
|
||||
'';
|
||||
};
|
||||
|
||||
@@ -2808,6 +2799,8 @@ assertNoAdditions {
|
||||
# Meta can't be required
|
||||
"nvim-tree._meta.api"
|
||||
"nvim-tree._meta.api_decorator"
|
||||
"nvim-tree._meta.api.decorator_example"
|
||||
"nvim-tree._meta.classes"
|
||||
"nvim-tree._meta.config.filters"
|
||||
"nvim-tree._meta.config.actions"
|
||||
"nvim-tree._meta.config.git"
|
||||
|
||||
@@ -294,7 +294,6 @@ https://github.com/Decodetalkers/csharpls-extended-lsp.nvim/,HEAD,
|
||||
https://github.com/davidmh/cspell.nvim/,HEAD,
|
||||
https://github.com/chrisbra/csv.vim/,,
|
||||
https://github.com/hat0uma/csvview.nvim/,HEAD,
|
||||
https://github.com/netmute/ctags-lsp.nvim/,HEAD,
|
||||
https://github.com/JazzCore/ctrlp-cmatcher/,,
|
||||
https://github.com/FelikZ/ctrlp-py-matcher/,,
|
||||
https://github.com/amiorin/ctrlp-z/,,
|
||||
@@ -1113,6 +1112,7 @@ https://github.com/leath-dub/snipe.nvim/,HEAD,
|
||||
https://github.com/norcalli/snippets.nvim/,,
|
||||
https://github.com/craftzdog/solarized-osaka.nvim/,HEAD,
|
||||
https://github.com/shaunsingh/solarized.nvim/,HEAD,
|
||||
https://github.com/iamkarasik/sonarqube.nvim/,HEAD,
|
||||
https://github.com/sainnhe/sonokai/,,
|
||||
https://github.com/sQVe/sort.nvim/,HEAD,
|
||||
https://github.com/chikatoike/sourcemap.vim/,,
|
||||
|
||||
@@ -226,7 +226,6 @@ stdenv.mkDerivation (
|
||||
exec = executableName + " --open-url %U";
|
||||
icon = iconName;
|
||||
startupNotify = true;
|
||||
startupWMClass = shortName;
|
||||
categories = [
|
||||
"Utility"
|
||||
"TextEditor"
|
||||
|
||||
@@ -12,17 +12,18 @@
|
||||
desktop-file-utils,
|
||||
appstream,
|
||||
appstream-glib,
|
||||
gitUpdater,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "zathura-cb";
|
||||
version = "0.1.12";
|
||||
version = "2026.02.03";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pwmt";
|
||||
repo = "zathura-cb";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-Dj398aUQBxOrH5XOC5u/vNkEQ6pa05/EDB5m0EAGAxo=";
|
||||
hash = "sha256-k5WbJR0PToiSQo00igH/3uHWp7z4dNxwSXiAos6OgJ8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -43,6 +44,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
env.PKG_CONFIG_ZATHURA_PLUGINDIR = "lib/zathura";
|
||||
|
||||
passthru.updateScript = gitUpdater { };
|
||||
|
||||
meta = {
|
||||
homepage = "https://pwmt.org/projects/zathura-cb/";
|
||||
description = "Zathura CB plugin";
|
||||
|
||||
@@ -32,13 +32,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "zathura";
|
||||
version = "0.5.14";
|
||||
version = "2026.02.09";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pwmt";
|
||||
repo = "zathura";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-Ejd39gUWA9YEoPpaaxo+9JkoezAjXYpXTB+FGdXt03U=";
|
||||
hash = "sha256-Zkefujp9Ywm7swHNMMvWSV0hKHaMXpJpOcfoL+f6XfE=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
||||
@@ -13,17 +13,18 @@
|
||||
desktop-file-utils,
|
||||
appstream,
|
||||
appstream-glib,
|
||||
gitUpdater,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "zathura-djvu";
|
||||
version = "0.2.11";
|
||||
version = "2026.02.03";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pwmt";
|
||||
repo = "zathura-djvu";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-TehD0uTQguH8f6pdOSIyhr1m87jB3F0WTUNtUM0fPu4=";
|
||||
hash = "sha256-5Nl9hK2uOS/NZ4MOxe3m6E9CBt5YKGeh1lZZ5E5bghw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -45,6 +46,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
env.PKG_CONFIG_ZATHURA_PLUGINDIR = "lib/zathura";
|
||||
|
||||
passthru.updateScript = gitUpdater { };
|
||||
|
||||
meta = {
|
||||
homepage = "https://pwmt.org/projects/zathura-djvu/";
|
||||
description = "Zathura DJVU plugin";
|
||||
|
||||
@@ -24,14 +24,14 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
version = "0.4.6";
|
||||
version = "2026.02.03";
|
||||
pname = "zathura-pdf-mupdf";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pwmt";
|
||||
repo = "zathura-pdf-mupdf";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-vg/ac62MPTWRbTPjbh+rKcFjVb5237wBEIVvTef6K5Q=";
|
||||
hash = "sha256-pNaawaExmBYDJbry/Ek/EpP2mojHp3MZw3cR6ku2jeg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -11,17 +11,18 @@
|
||||
desktop-file-utils,
|
||||
appstream,
|
||||
appstream-glib,
|
||||
gitUpdater,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "zathura-pdf-poppler";
|
||||
version = "0.3.4";
|
||||
version = "2026.02.03";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pwmt";
|
||||
repo = "zathura-pdf-poppler";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-xRTJlPj8sKRjwyuf1hWDyL1n4emLnAEVxVjn6XYn5IU=";
|
||||
hash = "sha256-ddW2SepBoR9BpqcAIAONmd2P5AjkhmWyIjIDeTnHO4Y=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -41,6 +42,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
env.PKG_CONFIG_ZATHURA_PLUGINDIR = "lib/zathura";
|
||||
|
||||
passthru.updateScript = gitUpdater { };
|
||||
|
||||
meta = {
|
||||
homepage = "https://pwmt.org/projects/zathura-pdf-poppler/";
|
||||
description = "Zathura PDF plugin (poppler)";
|
||||
|
||||
@@ -12,17 +12,18 @@
|
||||
desktop-file-utils,
|
||||
appstream,
|
||||
appstream-glib,
|
||||
gitUpdater,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "zathura-ps";
|
||||
version = "0.2.9";
|
||||
version = "2026.02.03";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pwmt";
|
||||
repo = "zathura-ps";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-YQtMfHhPAe8LtJfcw8LRGe5LvtPY7DjYKFaWOYlveeI=";
|
||||
hash = "sha256-5i3LvdjcAdofc0oZCBSm2qn/29UR1Yiia3OmVjFC4ZI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -43,6 +44,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
env.PKG_CONFIG_ZATHURA_PLUGINDIR = "lib/zathura";
|
||||
|
||||
passthru.updateScript = gitUpdater { };
|
||||
|
||||
meta = {
|
||||
homepage = "https://pwmt.org/projects/zathura-ps/";
|
||||
description = "Zathura PS plugin";
|
||||
|
||||
@@ -110,13 +110,13 @@
|
||||
"vendorHash": null
|
||||
},
|
||||
"bpg_proxmox": {
|
||||
"hash": "sha256-WabJZeEDG8q+tccLbRg/j7N3XgkEW7xyTiIwE5t3SD4=",
|
||||
"hash": "sha256-BYpqXdtjEez7uOtUw3x70ki6sNVUzVuQVvQ8Y7vwOdc=",
|
||||
"homepage": "https://registry.terraform.io/providers/bpg/proxmox",
|
||||
"owner": "bpg",
|
||||
"repo": "terraform-provider-proxmox",
|
||||
"rev": "v0.94.0",
|
||||
"rev": "v0.95.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-o9k7Bv33cF9O1ByMn8ZcI/DzmVbmEznzMVnLuxcMA7g="
|
||||
"vendorHash": "sha256-LvzKLPNZ+37qSSll6VqV44MOVe8/jGmUiKrSWCHkqf8="
|
||||
},
|
||||
"brightbox_brightbox": {
|
||||
"hash": "sha256-pwFbCP+qDL/4IUfbPRCkddkbsEEeAu7Wp12/mDL0ABA=",
|
||||
@@ -724,11 +724,11 @@
|
||||
"vendorHash": null
|
||||
},
|
||||
"ibm-cloud_ibm": {
|
||||
"hash": "sha256-6xJf+67xcxZLraRvbKkazNis44V2EP67nHjyCeV832A=",
|
||||
"hash": "sha256-Bd4iCThAVw0VAO8EiJ9R2fLLW7XkjFj5oxwzZnqEf/Y=",
|
||||
"homepage": "https://registry.terraform.io/providers/IBM-Cloud/ibm",
|
||||
"owner": "IBM-Cloud",
|
||||
"repo": "terraform-provider-ibm",
|
||||
"rev": "v1.88.0",
|
||||
"rev": "v1.88.2",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-KjhTp/Sjf4pxbsrWc4EZAD/NAtr0U7yieYd6s2NQHHc="
|
||||
},
|
||||
@@ -1481,13 +1481,13 @@
|
||||
"vendorHash": "sha256-rUYHapEVqRupLOPVbcAH8YP0cuXclMmYTQUkqeOwCN0="
|
||||
},
|
||||
"vultr_vultr": {
|
||||
"hash": "sha256-u6f4DQ5P2lOaxmGeHSloxRtBF+pF7nHWOSlSEIKxG9c=",
|
||||
"hash": "sha256-Mu0cY1B9pE4sDL9X0c0w4Jmia5KUoTMtnrBSDDWtDXA=",
|
||||
"homepage": "https://registry.terraform.io/providers/vultr/vultr",
|
||||
"owner": "vultr",
|
||||
"repo": "terraform-provider-vultr",
|
||||
"rev": "v2.28.1",
|
||||
"rev": "v2.29.1",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-8vYTNSjEwalDsS77UUVw7u2K3bbK4HM3yiUR3Ppi79I="
|
||||
"vendorHash": "sha256-dNcxDi20kIkpcfByMMFXB1nhN0EQxru8t/PnCV1zFL8="
|
||||
},
|
||||
"wgebis_mailgun": {
|
||||
"hash": "sha256-Li4eyqZ6huO5Q+XTcQ+HQCg8IOjhxGU9Z4Uw3TbMdAc=",
|
||||
|
||||
@@ -21,7 +21,7 @@ json_output=$(echo "$output" | gawk '/^{/{p=1} p')
|
||||
full_rev=$(echo "$json_output" | jq -r '.rev')
|
||||
new_rev="${full_rev:0:16}" # Use 16-char prefix for consistency
|
||||
new_hash=$(echo "$json_output" | jq -r '.hash')
|
||||
commit_date=$(echo "$json_output" | jq -r '.date')
|
||||
commit_date=$(echo "$json_output" | jq -r '.date' | cut -dT -f1)
|
||||
|
||||
# Fallback to current date if extraction fails
|
||||
if [ -z "$commit_date" ] || [ "$commit_date" = "null" ]; then
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# Generated by ./update.sh - do not update manually!
|
||||
{
|
||||
version = "1.17.5-1";
|
||||
arm64-hash = "sha256-B6nJAvveAgOkXtWY5mUq1444rylZnC3uviXUYSx0wXI=";
|
||||
x86_64-hash = "sha256-FbMg4nhy887PLsnCM+ZPS4n1cqtpRklNElvcd8V/qxw=";
|
||||
version = "1.17.5-2";
|
||||
arm64-hash = "sha256-4I/Kb+kfO73doOw10+knRqNpwlKWAzOWBrh1akggALk=";
|
||||
x86_64-hash = "sha256-ZqxqCsSpU71nS5+o+S1nscEFC+7wLgLzdpa6qLUUPYI=";
|
||||
}
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
openssl,
|
||||
zlib,
|
||||
pkg-config,
|
||||
python310,
|
||||
python3,
|
||||
re2,
|
||||
}:
|
||||
|
||||
@@ -26,10 +26,19 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
# Fix gcc15 build failures due to missing <cstdint>
|
||||
# Tracking: https://github.com/NixOS/nixpkgs/issues/475479
|
||||
postPatch = ''
|
||||
sed -i '1i #include <cstdint>' src/exif_entry.h
|
||||
''
|
||||
+ lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
substituteInPlace src/be20_api/feature_recorder_set.cpp --replace-fail '#warn ' '#warning '
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
python310
|
||||
python3
|
||||
autoreconfHook
|
||||
];
|
||||
buildInputs = [
|
||||
@@ -48,10 +57,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
aclocal -I m4
|
||||
'';
|
||||
|
||||
postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
substituteInPlace src/be20_api/feature_recorder_set.cpp --replace-fail '#warn ' '#warning '
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Digital forensics tool for extracting information from file systems";
|
||||
longDescription = ''
|
||||
|
||||
@@ -2,11 +2,11 @@
|
||||
{ fetchLibrustyV8 }:
|
||||
|
||||
fetchLibrustyV8 {
|
||||
version = "142.2.0";
|
||||
version = "145.0.0";
|
||||
shas = {
|
||||
x86_64-linux = "sha256-xHmofo8wTNg88/TuC2pX2OHDRYtHncoSvSBnTV65o+0=";
|
||||
aarch64-linux = "sha256-24q6wX8RTRX1tMGqgcz9/wN3Y+hWxM2SEuVrYhECyS8=";
|
||||
x86_64-darwin = "sha256-u7fImeadycU1gS5m+m35WZA/G2SOdPrLOMafY54JwY4=";
|
||||
aarch64-darwin = "sha256-XvJ7M5XxOzmevv+nPpy/mvEDD1MfHr986bImvDG0o4U=";
|
||||
x86_64-linux = "sha256-chV1PAx40UH3Ute5k3lLrgfhih39Rm3KqE+mTna6ysE=";
|
||||
aarch64-linux = "sha256-4IivYskhUSsMLZY97+g23UtUYh4p5jk7CzhMbMyqXyY=";
|
||||
x86_64-darwin = "sha256-1jUuC+z7saQfPYILNyRJanD4+zOOhXU2ac/LFoytwho=";
|
||||
aarch64-darwin = "sha256-yHa1eydVCrfYGgrZANbzgmmf25p7ui1VMas2A7BhG6k=";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -30,17 +30,17 @@ let
|
||||
in
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "deno";
|
||||
version = "2.6.6";
|
||||
version = "2.6.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "denoland";
|
||||
repo = "deno";
|
||||
tag = "v${finalAttrs.version}";
|
||||
fetchSubmodules = true; # required for tests
|
||||
hash = "sha256-QqzV4Ikr5iWrOX+KJH/65S1HHhxOB0SmHj7yejVJp3M=";
|
||||
hash = "sha256-RBrBtkDd8lgrnRmFkRwF86xuUr2zTDHUrcNVh5P6gCc=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-soJ2ZKpxlBskl2b3pz4pn6zMaWUXjYOBRKBuoxHokes=";
|
||||
cargoHash = "sha256-6UTRvrQzuEvrHxleTEEpoTwgDWDG79+9Txjo0SLL3Ns=";
|
||||
|
||||
patches = [
|
||||
./patches/0002-tests-replace-hardcoded-paths.patch
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
}:
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "deterministic-zip";
|
||||
version = "5.2.0";
|
||||
version = "6.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "timo-reymann";
|
||||
repo = "deterministic-zip";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-rvheo/DkQTfpVy8fVRRwRA4G9mdMNArptxNT0sxdqnc=";
|
||||
hash = "sha256-ew1R2twyl5hX+UA7nZoMnelwCDHwunNphBQZFqP6izs=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-qLVeliB2+qRhF+iRE0zHyhBOTB7q31ZGCEH7kbSLSBA=";
|
||||
vendorHash = "sha256-hEPZrS2D6YqlaaJXF8uyt+fJ38Adi3WvOq7v9dZuovI=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -9,16 +9,16 @@
|
||||
|
||||
buildGoModule {
|
||||
pname = "echoip";
|
||||
version = "0-unstable-2023-05-21";
|
||||
version = "0-unstable-2026-02-14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mpolden";
|
||||
repo = "echoip";
|
||||
rev = "d84665c26cf7df612061e9c35abe325ba9d86b8d";
|
||||
hash = "sha256-7qc1NZu0hC1np/EKf5fU5Cnd7ikC1+tIrYOXhxK/++Y=";
|
||||
rev = "0405a55f7d0007c72aaf88e449b8416a62f16772";
|
||||
hash = "sha256-oMxbFyFQ1VYXgUU3wkDrfmIku8uigvF3bJInGNQAZkc=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-lXYpkeGpBK+WGHqyLxJz7kS3t7a55q55QQLTqtxzroc=";
|
||||
vendorHash = "sha256-gNXu1yfvJnviPDeG0oNJ9MD5R93rjEV/n8hrADi8ZnM=";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "fake-gcs-server";
|
||||
version = "1.53.1";
|
||||
version = "1.54.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fsouza";
|
||||
repo = "fake-gcs-server";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-UNXmbfCmLfY3gvstR2sEQ5SmHJy7PBe38JMCnc2GTz8=";
|
||||
hash = "sha256-mskNNTytnqqFXP4REMz7KLgWL0ma/8hlQKSAABOGuvk=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-+X0/vHHfzz4u7taeUhrH3E3TCZ2ABYwurDwg0THfnKY=";
|
||||
vendorHash = "sha256-KNappojVBU1F9F3FqindXVDzOIy7IwYd7xVzbqQk6QE=";
|
||||
|
||||
# Unit tests fail to start the emulator server in some environments (e.g. Hydra) for some reason.
|
||||
#
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
}:
|
||||
buildNpmPackage rec {
|
||||
pname = "flood";
|
||||
version = "4.12.2";
|
||||
version = "4.12.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jesec";
|
||||
repo = "flood";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-N+6MFxFDfrrp8MLUMjtzdUMDsJGvRPE7SdTedOlrRX4=";
|
||||
hash = "sha256-F1qsUFQG2tWVgKQ4Cet4cRIG37FNLOIfW9bH9dsJeRs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pnpm_9 ];
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "olm";
|
||||
version = "1.4.1";
|
||||
version = "1.4.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fosrl";
|
||||
repo = "olm";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-yzs+mveiZQ+7+hln3H3C5m7nSDdIIzwzSuuw7QlS9H0=";
|
||||
hash = "sha256-Tily8Srpr5GpKTYl3Ivm1b/VN2yEzbbHHABeoJvo3wo=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-lqH/pMWeDsTJa39uJwHntCAUs0BwJiB0aMyFaI++5ms=";
|
||||
|
||||
@@ -15,11 +15,12 @@
|
||||
json-glib,
|
||||
libintl,
|
||||
zathura,
|
||||
gitUpdater,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "girara";
|
||||
version = "0.4.5";
|
||||
version = "2026.02.04";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@@ -30,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
owner = "pwmt";
|
||||
repo = "girara";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-XjRmGgljlkvxwcbPmA9ZFAPAjbClSQDdmQU/GFeLLxI=";
|
||||
hash = "sha256-wTVgldfo8pWdY244nNldiogioijv/k32w1A8pEqOTRE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -74,8 +75,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
meson test --print-errorlogs
|
||||
'';
|
||||
|
||||
passthru.tests = {
|
||||
inherit zathura;
|
||||
passthru = {
|
||||
updateScript = gitUpdater { };
|
||||
tests = {
|
||||
inherit zathura;
|
||||
};
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -28,7 +28,7 @@
|
||||
let
|
||||
rootSrc = stdenv.mkDerivation {
|
||||
pname = "iEDA-src";
|
||||
version = "2025-12-16";
|
||||
version = "0.1.0-unstable-2025-12-16";
|
||||
src = fetchgit {
|
||||
url = "https://gitee.com/oscc-project/iEDA";
|
||||
rev = "b73be0f1909294b56b2dbb27dba04b6cd9e0070d";
|
||||
@@ -57,7 +57,7 @@ let
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
pname = "iEDA";
|
||||
version = "0.1.0-unstable-2025-12-16";
|
||||
version = rootSrc.version;
|
||||
|
||||
src = rootSrc;
|
||||
|
||||
@@ -126,6 +126,8 @@ stdenv.mkDerivation {
|
||||
|
||||
enableParallelBuild = true;
|
||||
|
||||
passthru.updateScript = ./update.sh;
|
||||
|
||||
meta = {
|
||||
description = "Open-source EDA infracstructure and tools from Netlist to GDS for ASIC design";
|
||||
homepage = "https://gitee.com/oscc-project/iEDA";
|
||||
|
||||
Executable
+20
@@ -0,0 +1,20 @@
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p curl jq common-updater-scripts
|
||||
|
||||
set -eu -o pipefail
|
||||
|
||||
latestCommit="$(curl -fs https://gitee.com/api/v5/repos/oscc-project/iEDA/commits?sha=master | jq -r '.[0].sha')"
|
||||
commitDate="$(curl -fs https://gitee.com/api/v5/repos/oscc-project/iEDA/commits/"$latestCommit" | jq -r '.commit.committer.date[:10]')"
|
||||
latestReleaseTag="$(curl -fs https://gitee.com/api/v5/repos/oscc-project/iEDA/releases/latest | jq -r '.tag_name | ltrimstr("v")')"
|
||||
|
||||
[ "$latestCommit" != "null" ] && [ -n "$latestCommit" ] || { echo "Failed to fetch latest commit"; exit 1; }
|
||||
[ "$commitDate" != "null" ] && [ -n "$commitDate" ] || { echo "Failed to fetch commit date"; exit 1; }
|
||||
[ "$latestReleaseTag" != "null" ] && [ -n "$latestReleaseTag" ] || { echo "Failed to fetch release tag"; exit 1; }
|
||||
|
||||
newVersion="$latestReleaseTag-unstable-$commitDate"
|
||||
|
||||
update-source-version \
|
||||
"$UPDATE_NIX_ATTR_PATH" \
|
||||
"$newVersion" \
|
||||
--rev="$latestCommit" \
|
||||
--source-key="src.src"
|
||||
@@ -0,0 +1,40 @@
|
||||
{
|
||||
lib,
|
||||
rustPlatform,
|
||||
fetchFromCodeberg,
|
||||
jujutsu,
|
||||
git,
|
||||
writableTmpDirAsHomeHook,
|
||||
cacert,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "jj-vine";
|
||||
version = "0.3.6";
|
||||
|
||||
src = fetchFromCodeberg {
|
||||
owner = "abrenneke";
|
||||
repo = "jj-vine";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-vvNbeQvP205snAGiql/i8yFGyMw23YkSU4/uxOSnycY=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-vcpaKlNeORnDpVqXxu0TrXWaWNfaK9QPVJOrty9WmcQ=";
|
||||
|
||||
nativeCheckInputs = [
|
||||
jujutsu
|
||||
git
|
||||
writableTmpDirAsHomeHook
|
||||
];
|
||||
checkFeatures = [ "no-e2e-tests" ];
|
||||
env.SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt";
|
||||
|
||||
meta = {
|
||||
description = "Tool for submitting stacked Pull/Merge Requests from Jujutsu bookmarks";
|
||||
homepage = "https://codeberg.org/abrenneke/jj-vine";
|
||||
changelog = "https://codeberg.org/abrenneke/jj-vine/releases/tag/v${finalAttrs.version}";
|
||||
license = lib.licenses.mit;
|
||||
mainProgram = "jj-vine";
|
||||
maintainers = with lib.maintainers; [ winter ];
|
||||
};
|
||||
})
|
||||
@@ -16,16 +16,16 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "kanata";
|
||||
version = "1.10.1";
|
||||
version = "1.11.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jtroo";
|
||||
repo = "kanata";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-jzTK/ZK9UrXTP/Ow662ENBv3cim6klA8+DQv4DLVSNU=";
|
||||
hash = "sha256-7rGV0nfI/ntvByz3NQs/2Sa2q/Ml8O3XRD14Mbt5fIU=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-qYFt/oHokR+EznugEaE/ZEn26IFVLXePgoYGxoPRi+g=";
|
||||
cargoHash = "sha256-Qxa90fMZ3c1+jlyxbIkC94DtSQSKFNr2V8GiLII6PNc=";
|
||||
|
||||
nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
(writeShellScriptBin "sw_vers" ''
|
||||
|
||||
@@ -5,9 +5,9 @@
|
||||
buildPackages,
|
||||
fetchFromGitHub,
|
||||
installShellFiles,
|
||||
testers,
|
||||
makeWrapper,
|
||||
python310,
|
||||
python3,
|
||||
versionCheckHook,
|
||||
}:
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
@@ -27,22 +27,16 @@ buildGoModule (finalAttrs: {
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X main.version=v${finalAttrs.version}"
|
||||
];
|
||||
|
||||
# Depends on docker
|
||||
doCheck = false;
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
passthru.tests.version = testers.testVersion {
|
||||
package = finalAttrs.finalPackage;
|
||||
version = "v${finalAttrs.version}";
|
||||
};
|
||||
# Depends on docker
|
||||
doCheck = false;
|
||||
|
||||
postInstall =
|
||||
let
|
||||
@@ -52,13 +46,18 @@ buildGoModule (finalAttrs: {
|
||||
mv $out/bin/{cmd,kluctl}
|
||||
wrapProgram $out/bin/kluctl \
|
||||
--set KLUCTL_USE_SYSTEM_PYTHON 1 \
|
||||
--prefix PATH : '${lib.makeBinPath [ python310 ]}'
|
||||
--prefix PATH : '${lib.makeBinPath [ python3 ]}'
|
||||
installShellCompletion --cmd kluctl \
|
||||
--bash <(${emulator} $out/bin/kluctl completion bash) \
|
||||
--fish <(${emulator} $out/bin/kluctl completion fish) \
|
||||
--zsh <(${emulator} $out/bin/kluctl completion zsh)
|
||||
'';
|
||||
|
||||
nativeInstallCheckInputs = [
|
||||
versionCheckHook
|
||||
];
|
||||
doInstallCheck = true;
|
||||
|
||||
meta = {
|
||||
description = "Missing glue to put together large Kubernetes deployments";
|
||||
mainProgram = "kluctl";
|
||||
|
||||
@@ -32,11 +32,6 @@ python3Packages.buildPythonApplication {
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
substituteInPlace "lib/lichess_bot.py" \
|
||||
--replace 'open("lib/versioning.yml")' \
|
||||
'open("'$out'/share/lichess-bot/lib/versioning.yml")'
|
||||
|
||||
|
||||
mkdir -p "$out"/{bin,share/lichess-bot}
|
||||
cp -R . $out/share/lichess-bot
|
||||
|
||||
|
||||
@@ -78,7 +78,7 @@ let
|
||||
in
|
||||
effectiveStdenv.mkDerivation (finalAttrs: {
|
||||
pname = "llama-cpp";
|
||||
version = "7966";
|
||||
version = "8054";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@@ -89,7 +89,7 @@ effectiveStdenv.mkDerivation (finalAttrs: {
|
||||
owner = "ggml-org";
|
||||
repo = "llama.cpp";
|
||||
tag = "b${finalAttrs.version}";
|
||||
hash = "sha256-ivGqCSBVDmDTal4MecJCWoghqEua3WgT4XmUzm7QGIc=";
|
||||
hash = "sha256-gzW/XOfx3dvCb2g1b93CcPNkqtw7VOEAYffd0WRy/6o=";
|
||||
leaveDotGit = true;
|
||||
postFetch = ''
|
||||
git -C "$out" rev-parse --short HEAD > $out/COMMIT
|
||||
|
||||
@@ -23,16 +23,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "lnd";
|
||||
version = "0.20.0-beta";
|
||||
version = "0.20.1-beta";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lightningnetwork";
|
||||
repo = "lnd";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-N8eZacu8BHMiI8RyueBv+Y1bWlaEuCQLRsfIj5WviV4=";
|
||||
hash = "sha256-EHyyUleCKLEAnYNH7+PYwE/uTz445EQmtfosFxf10wU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-3F2ERp8gosNFzsg2QqSJpmjewf6N0zho+st+pafP8F0=";
|
||||
vendorHash = "sha256-jF/yQE0xH0MFKI7CCGHy/HFzp6tgTM5T/MP2uB62vKk=";
|
||||
|
||||
subPackages = [
|
||||
"cmd/lncli"
|
||||
|
||||
Generated
+8
-33
@@ -19,45 +19,25 @@
|
||||
"version": "4.14.1",
|
||||
"hash": "sha256-YSEcfyYVskwJX6xa13wGW4JgHn0VpD04CtUiAGn3et0="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
|
||||
"version": "8.0.0",
|
||||
"hash": "sha256-75KzEGWjbRELczJpCiJub+ltNUMMbz5A/1KQU+5dgP8="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
|
||||
"version": "8.0.2",
|
||||
"hash": "sha256-UfLfEQAkXxDaVPC7foE/J3FVEXd31Pu6uQIhTic3JgY="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Extensions.Logging.Abstractions",
|
||||
"version": "8.0.0",
|
||||
"hash": "sha256-Jmddjeg8U5S+iBTwRlVAVLeIHxc4yrrNgqVMOB7EjM4="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Extensions.Logging.Abstractions",
|
||||
"version": "8.0.2",
|
||||
"hash": "sha256-cHpe8X2BgYa5DzulZfq24rg8O2K5Lmq2OiLhoyAVgJc="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.IdentityModel.Abstractions",
|
||||
"version": "8.14.0",
|
||||
"hash": "sha256-bkCuz1Wj56N+LHWLvHKLcCtIRqBK+3k5vD2qfB7xXKk="
|
||||
"version": "8.15.0",
|
||||
"hash": "sha256-LKTvERNUTMCEF7xs377tCMwOMRki93OS4kh6Yv0uXJ4="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.IdentityModel.JsonWebTokens",
|
||||
"version": "8.14.0",
|
||||
"hash": "sha256-YBXaSWnLgxIQxv+Lwt2aRC20miFguNZbbuTc2Jjq+Ys="
|
||||
"version": "8.15.0",
|
||||
"hash": "sha256-LwzKiGjcnORvmQ9tim6lomXpfVlPpd/fE8FKTFWKlpM="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.IdentityModel.Logging",
|
||||
"version": "8.14.0",
|
||||
"hash": "sha256-QvCJplLvTGTXZKGbRMccW2hld6oWUhHkneZd+msn9aE="
|
||||
"version": "8.15.0",
|
||||
"hash": "sha256-mMXwsjGcrrmHR1mG7BLTKg/30mX+m93QVX17/ynOOd4="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.IdentityModel.Tokens",
|
||||
"version": "8.14.0",
|
||||
"hash": "sha256-ALeMe3AjEy4dazHTBeR1JHMtzm+sqS3RbrjQWoNbuno="
|
||||
"version": "8.15.0",
|
||||
"hash": "sha256-7Lo/TsvqgNCEMyFssO3Om233521Pqgb9K9lUeHc5HMk="
|
||||
},
|
||||
{
|
||||
"pname": "MimeKit",
|
||||
@@ -69,11 +49,6 @@
|
||||
"version": "9.0.4",
|
||||
"hash": "sha256-YH2QYLe56dH6NNGgSwLIaHefjkKQLh0Sf4vMWoJciyU="
|
||||
},
|
||||
{
|
||||
"pname": "System.Formats.Asn1",
|
||||
"version": "8.0.1",
|
||||
"hash": "sha256-may/Wg+esmm1N14kQTG4ESMBi+GQKPp0ZrrBo/o6OXM="
|
||||
},
|
||||
{
|
||||
"pname": "System.Security.Cryptography.Pkcs",
|
||||
"version": "8.0.1",
|
||||
|
||||
@@ -7,20 +7,20 @@
|
||||
|
||||
buildDotnetModule rec {
|
||||
pname = "lubelogger";
|
||||
version = "1.5.7";
|
||||
version = "1.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hargata";
|
||||
repo = "lubelog";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-EsQG2NHzVQ6u3XrmlhZ95F+jiRnv4D8wXYAVyVBp8as=";
|
||||
hash = "sha256-EVW14IkUO+qMDZLF6TghY3FYiyeMKJifGpa9Vt15OkU=";
|
||||
};
|
||||
|
||||
projectFile = "CarCareTracker.sln";
|
||||
nugetDeps = ./deps.json; # File generated with `nix-build -A lubelogger.passthru.fetch-deps`.
|
||||
|
||||
dotnet-sdk = dotnetCorePackages.sdk_8_0;
|
||||
dotnet-runtime = dotnetCorePackages.aspnetcore_8_0;
|
||||
dotnet-sdk = dotnetCorePackages.sdk_10_0;
|
||||
dotnet-runtime = dotnetCorePackages.aspnetcore_10_0;
|
||||
|
||||
makeWrapperArgs = [
|
||||
"--set DOTNET_WEBROOT ${placeholder "out"}/lib/lubelogger/wwwroot"
|
||||
|
||||
@@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/Foundry376/Mailspring/releases/download/${finalAttrs.version}/Mailspring-AppleSilicon.zip";
|
||||
hash = "sha256-jbsU8pSvhPFKFjIr+2ZHETOihKKoqQiZmKQ6eGtAIKk=";
|
||||
hash = "sha256-AwP5gVyqO3pjIXom5VQjxSZWu4IsG5O9zulqmC24lk0=";
|
||||
};
|
||||
dontUnpack = true;
|
||||
|
||||
|
||||
@@ -8,6 +8,7 @@
|
||||
autoPatchelfHook,
|
||||
alsa-lib,
|
||||
coreutils,
|
||||
curl,
|
||||
db,
|
||||
dpkg,
|
||||
glib,
|
||||
@@ -33,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/Foundry376/Mailspring/releases/download/${finalAttrs.version}/mailspring-${finalAttrs.version}-amd64.deb";
|
||||
hash = "sha256-iJ6VzwvNTIRqUq9OWNOWOSuLbqhx+Lqx584kuyIslyA=";
|
||||
hash = "sha256-PHxe44yzX9Zz+fQu30kX9epLEeG3wqqVL3p5+ZHMmos=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -57,6 +58,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
libxshmfence
|
||||
libgbm
|
||||
libdrm
|
||||
openssl
|
||||
curl
|
||||
];
|
||||
|
||||
runtimeDependencies = [
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
}:
|
||||
let
|
||||
pname = "mailspring";
|
||||
version = "1.16.0";
|
||||
version = "1.17.4";
|
||||
|
||||
meta = {
|
||||
description = "Beautiful, fast and maintained fork of Nylas Mail by one of the original authors";
|
||||
|
||||
@@ -29,6 +29,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
|
||||
];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"agent-client-protocol"
|
||||
"gitpython"
|
||||
"mistralai"
|
||||
"pydantic"
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "niks3";
|
||||
version = "1.3.0";
|
||||
version = "1.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Mic92";
|
||||
repo = "niks3";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-taQgMTbC+k/b+9mJH5vx7BMM3gKSI+MZWL26ZhePThk=";
|
||||
hash = "sha256-zskaX55kGzbFFO0UGwTsOpALEzPTSIycgbrQRurlVz8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-MoYTq1rY1GMmBBP/ypx6DqrHLGtccgsHa+2rpoztI4U=";
|
||||
vendorHash = "sha256-/3klr19Rfz4dZrv8cWPaClLw1FgKfgqnBaR7KCydfQE=";
|
||||
|
||||
subPackages = [
|
||||
"cmd/niks3"
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "nu_plugin_skim";
|
||||
version = "0.23.0";
|
||||
version = "0.23.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "idanarye";
|
||||
repo = "nu_plugin_skim";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-my6ATIGNGCCBMOhmsp+dat+wV3oYD9ER4Iu8ln0jtMo=";
|
||||
hash = "sha256-CWjds0AWYwrKk1sgBSOalEIYJd2Aymc6XK22Bd9QLuo=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-fCNpiBlqzKn7biszBSjhxvs3RgRAyd8Ze6R4P/3AfVo=";
|
||||
cargoHash = "sha256-mucbl0ow0FjNiDL1BNKT7BMVpMKvmKEz3dP6/9BBRV4=";
|
||||
|
||||
nativeBuildInputs = lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ];
|
||||
|
||||
|
||||
@@ -192,6 +192,7 @@ goBuild (finalAttrs: {
|
||||
+ lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
rm ml/backend/ggml/ggml_test.go
|
||||
rm ml/nn/pooling/pooling_test.go
|
||||
rm model/models/qwen3next/checkpoints_test.go
|
||||
'';
|
||||
|
||||
overrideModAttrs = (
|
||||
|
||||
@@ -46,7 +46,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace makefile \
|
||||
--replace-fail 'cc' '${stdenv.cc.targetPrefix}cc'
|
||||
--replace-fail 'cc' '${stdenv.cc.targetPrefix}cc' \
|
||||
--replace-fail 'CFLAGS = ' 'CFLAGS = -std=c99 '
|
||||
''
|
||||
+ lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
substituteInPlace makefile \
|
||||
|
||||
@@ -21,7 +21,7 @@ json_output=$(echo "$output" | gawk '/^{/{p=1} p')
|
||||
full_rev=$(echo "$json_output" | jq -r '.rev')
|
||||
new_rev="${full_rev:0:16}" # Use 16-char prefix for consistency
|
||||
new_hash=$(echo "$json_output" | jq -r '.hash')
|
||||
commit_date=$(echo "$json_output" | jq -r '.date')
|
||||
commit_date=$(echo "$json_output" | jq -r '.date' | cut -dT -f1)
|
||||
|
||||
# Fallback to current date if extraction fails
|
||||
if [ -z "$commit_date" ] || [ "$commit_date" = "null" ]; then
|
||||
|
||||
@@ -1,21 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
flutter329,
|
||||
plant-it,
|
||||
}:
|
||||
|
||||
flutter329.buildFlutterApplication {
|
||||
pname = "plant-it-frontend";
|
||||
inherit (plant-it) version src;
|
||||
|
||||
sourceRoot = "${plant-it.src.name}/frontend";
|
||||
|
||||
targetFlutterPlatform = "web";
|
||||
|
||||
pubspecLock = lib.importJSON ./pubspec.lock.json;
|
||||
|
||||
meta = plant-it.meta // {
|
||||
description = "Frontend for Plant It";
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1,14 +0,0 @@
|
||||
--- backend/src/test/resources/features/plants-and-species.feature
|
||||
+++ backend/src/test/resources/features/plants-and-species.feature
|
||||
@@ -199,11 +199,8 @@
|
||||
Then response is ok
|
||||
* species "foo" is
|
||||
| scientific_name | synonyms | family | genus | species | creator | externalId |
|
||||
| foo | synonym1 | fam | gen | foo | USER | |
|
||||
- * species "foo" has this image
|
||||
- | image_id | image_url | image_content |
|
||||
- | | https://dummyimage.com/1 | |
|
||||
* species "foo" has this care
|
||||
| light | humidity | minTemp | maxTemp | phMax | phMin |
|
||||
| 6 | 5 | | | 2 | 1 |
|
||||
When user updates botanical info "foo"
|
||||
@@ -1,49 +0,0 @@
|
||||
{
|
||||
maven,
|
||||
jdk21_headless,
|
||||
makeBinaryWrapper,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
let
|
||||
version = "0.10.0";
|
||||
in
|
||||
maven.buildMavenPackage {
|
||||
pname = "plant-it";
|
||||
inherit version;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "MDeLuise";
|
||||
repo = "plant-it";
|
||||
tag = version;
|
||||
hash = "sha256-QnujZecUu7bzllSsrLH6hSZMaWeOUXBrSZ5rbT56pDM=";
|
||||
};
|
||||
sourceRoot = "source/backend";
|
||||
|
||||
mvnHash = "sha256-3YQOZMXMI6BrHkqud2OKColJWbDXfwnAwRifYxbleqI=";
|
||||
nativeBuildInputs = [
|
||||
makeBinaryWrapper
|
||||
];
|
||||
|
||||
patches = [ ./Remove-test-needing-internet-connection.patch ];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -Dm644 target/plant-it-*.jar $out/share/plant-it/plant-it.jar
|
||||
|
||||
makeBinaryWrapper ${jdk21_headless}/bin/java $out/bin/plant-it --add-flags "-jar $out/share/plant-it/plant-it.jar"
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/MDeLuise/plant-it/releases/tag/${version}";
|
||||
description = "Self-hosted gardening companion application";
|
||||
homepage = "https://plant-it.org";
|
||||
maintainers = with lib.maintainers; [ epireyn ];
|
||||
license = lib.licenses.gpl3;
|
||||
platforms = lib.platforms.unix;
|
||||
mainProgram = "plant-it";
|
||||
};
|
||||
}
|
||||
@@ -42,13 +42,13 @@
|
||||
}:
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "podman";
|
||||
version = "5.7.1";
|
||||
version = "5.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "containers";
|
||||
repo = "podman";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-wfzkn8sv7LajwTZzlWi2gy7Uox4rWGc0i8/OjTIqi5o=";
|
||||
hash = "sha256-0rpEmdx/IUgIvsqCxVyydXZXUm/r7cJG7xlHlEIz1G8=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -21,13 +21,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "shader-slang";
|
||||
version = "2026.1.2";
|
||||
version = "2026.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "shader-slang";
|
||||
repo = "slang";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-PaxE6C6pjLQ5rBeJDZBILvbQf2buYGWjTyZZaxG6/cI=";
|
||||
hash = "sha256-UY1nmkXAtxKycqAq7dcErX7afadYgqwWAUahfVI9ZB8=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "smug";
|
||||
version = "0.3.14";
|
||||
version = "0.3.17";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
@@ -15,7 +15,7 @@ buildGoModule (finalAttrs: {
|
||||
owner = "ivaaaan";
|
||||
repo = "smug";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-5MvDhG7cTbapF1mwEpuvEFvSpduwFnvv7seTh7Va5Yw=";
|
||||
hash = "sha256-wp7JkppWsGMN9/5QcoisXlqMhG/5N1EFvP6OMeRmPEE=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-N6btfKjhJ0MkXAL4enyNfnJk8vUeUDCRus5Fb7hNtug=";
|
||||
|
||||
@@ -31,6 +31,10 @@ rustPlatform.buildRustPackage rec {
|
||||
--replace-fail "./config.cfg" "$out/etc/sonic/config.cfg"
|
||||
'';
|
||||
|
||||
# Fix GCC 15 compatibility
|
||||
# error: unknown type name 'uint32_t'
|
||||
env.CXXFLAGS = "-include cstdint";
|
||||
|
||||
postInstall = ''
|
||||
install -Dm444 -t $out/etc/sonic config.cfg
|
||||
install -Dm444 -t $out/lib/systemd/system debian/sonic.service
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "tailscale";
|
||||
version = "1.94.1";
|
||||
version = "1.94.2";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@@ -35,7 +35,7 @@ buildGoModule (finalAttrs: {
|
||||
owner = "tailscale";
|
||||
repo = "tailscale";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-jk4C2xw6vKIjo5F+FHRNTgNGZ7Zl+Hgpl84xeptCs1g=";
|
||||
hash = "sha256-qjWVB8xWVgIVUgrf27F6hwiFIE+4ERXWeHv26ugg/x4=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-WeMTOkERj4hvdg4yPaZ1gRgKnhRIBXX55kUVbX/k/xM=";
|
||||
|
||||
@@ -8,14 +8,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "tldr";
|
||||
version = "3.4.3";
|
||||
version = "3.4.4";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tldr-pages";
|
||||
repo = "tldr-python-client";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-YdVmgV7N67XswcGlUN1hhXpRXGMHhY34VBxfr7i/MBs=";
|
||||
hash = "sha256-xFRpw6H4xriuwHWAGeWks/vJOzpW3+AEH/QZ0uPYtiI=";
|
||||
};
|
||||
|
||||
build-system = with python3Packages; [
|
||||
|
||||
@@ -7,14 +7,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "toot";
|
||||
version = "0.51.0";
|
||||
version = "0.51.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ihabunek";
|
||||
repo = "toot";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-A3ValIMDPcfrvOdOJIkeurT+fAj1TzGf6cy12yaaBQE=";
|
||||
hash = "sha256-PZMh11MeJaKipt3E1reZQdL8+qz7gY/8bKleRPjshzI=";
|
||||
};
|
||||
|
||||
nativeCheckInputs = with python3Packages; [ pytest ];
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "tuios";
|
||||
version = "0.5.1";
|
||||
version = "0.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Gaurav-Gosain";
|
||||
repo = "tuios";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-OBdVnKt3XkuzztgNcwla/EGqmAhNuRGkT6boJw5UITQ=";
|
||||
hash = "sha256-cisbHTrp2k+henmxJOwcyfPG+SaxL6GWSa8OWGyimck=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-kDZRT/Ua+SaxyZ6RI9ZY2tqBgQBWo755fvQVRupBsUc=";
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "typos";
|
||||
version = "1.42.3";
|
||||
version = "1.43.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "crate-ci";
|
||||
repo = "typos";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-u9hjY/d4Ul+EvZIoTJzWkUl4j+Vzcvu61x2USP0hGiw=";
|
||||
hash = "sha256-P6LmKEpD8FExU5f/r5cGkeefHR+w24NyZyrz0aoBmPY=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-ED/jkTlVPqM5VDDEvKPDcF0/jFYfyvszTuPSMZUNuY0=";
|
||||
cargoHash = "sha256-qOcrj9Ysu4VqizPChoTLUHaPuysHMwbvzcgyAuHtc0A=";
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
|
||||
Generated
+10
-80
@@ -51,23 +51,13 @@
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.JavaScript.NodeApi",
|
||||
"version": "0.9.18",
|
||||
"hash": "sha256-FLpMBwfbLbyj+6LATS78WpvTfbpgWGhZZI6R53PKIYU="
|
||||
"version": "0.9.19",
|
||||
"hash": "sha256-iB/LRJVbH8FOetSgMAbBDc/k8iFMUW6OFvYgGWYDcmo="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.JavaScript.NodeApi.Generator",
|
||||
"version": "0.9.18",
|
||||
"hash": "sha256-I6sCIq5G6sfkxmaJnYpXY8w0Md6XuC39fDxy2yzTI9s="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.NETCore.Platforms",
|
||||
"version": "1.1.0",
|
||||
"hash": "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.NETCore.Platforms",
|
||||
"version": "1.1.1",
|
||||
"hash": "sha256-8hLiUKvy/YirCWlFwzdejD2Db3DaXhHxT7GSZx/znJg="
|
||||
"version": "0.9.19",
|
||||
"hash": "sha256-wuT9iVFKUMe8AXwlxwF3XAHW8dF+HytdCmPXIslUocw="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.NETCore.Platforms",
|
||||
@@ -79,16 +69,6 @@
|
||||
"version": "3.1.0",
|
||||
"hash": "sha256-cnygditsEaU86bnYtIthNMymAHqaT/sf9Gjykhzqgb0="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.NETCore.Targets",
|
||||
"version": "1.1.0",
|
||||
"hash": "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.NETCore.Targets",
|
||||
"version": "1.1.3",
|
||||
"hash": "sha256-WLsf1NuUfRWyr7C7Rl9jiua9jximnVvzy6nk2D2bVRc="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Win32.Registry",
|
||||
"version": "4.7.0",
|
||||
@@ -96,8 +76,8 @@
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Win32.SystemEvents",
|
||||
"version": "10.0.1",
|
||||
"hash": "sha256-fg806DoQzCBU9O6O9WId9he+Jk64YfaUIJfNAT9PXx8="
|
||||
"version": "4.7.0",
|
||||
"hash": "sha256-GHxnD1Plb32GJWVWSv0Y51Kgtlb+cdKgOYVBYZSgVF4="
|
||||
},
|
||||
{
|
||||
"pname": "Newtonsoft.Json",
|
||||
@@ -114,26 +94,11 @@
|
||||
"version": "6.0.7",
|
||||
"hash": "sha256-Le6ocjCN29rtgRiAroVfjUbMXCrjk0pSv2GEtZZy0qU="
|
||||
},
|
||||
{
|
||||
"pname": "runtime.any.System.Runtime",
|
||||
"version": "4.3.0",
|
||||
"hash": "sha256-qwhNXBaJ1DtDkuRacgHwnZmOZ1u9q7N8j0cWOLYOELM="
|
||||
},
|
||||
{
|
||||
"pname": "runtime.native.System",
|
||||
"version": "4.3.0",
|
||||
"hash": "sha256-ZBZaodnjvLXATWpXXakFgcy6P+gjhshFXmglrL5xD5Y="
|
||||
},
|
||||
{
|
||||
"pname": "runtime.native.System.Data.SqlClient.sni",
|
||||
"version": "4.7.0",
|
||||
"hash": "sha256-cj0+BpmoibwOWj2wNXwONJeTGosmFwhD349zPjNaBK0="
|
||||
},
|
||||
{
|
||||
"pname": "runtime.unix.System.Private.Uri",
|
||||
"version": "4.3.0",
|
||||
"hash": "sha256-c5tXWhE/fYbJVl9rXs0uHh3pTsg44YD1dJvyOA0WoMs="
|
||||
},
|
||||
{
|
||||
"pname": "runtime.win-arm64.runtime.native.System.Data.SqlClient.sni",
|
||||
"version": "4.4.0",
|
||||
@@ -181,8 +146,8 @@
|
||||
},
|
||||
{
|
||||
"pname": "System.CodeDom",
|
||||
"version": "10.0.1",
|
||||
"hash": "sha256-ilpU2rkTepWP0e+DF4rEZJgz2UcNGrcTElGo4IGDTmM="
|
||||
"version": "10.0.2",
|
||||
"hash": "sha256-MAKLNGx7mczcSE6n7b3HvQOLPC8Afk5Mv6PUV2hlHC0="
|
||||
},
|
||||
{
|
||||
"pname": "System.CodeDom",
|
||||
@@ -229,36 +194,21 @@
|
||||
"version": "1.0.119",
|
||||
"hash": "sha256-upgcZ/YGVNT7kl+oZ/4fsLVourVef/8xpLQjk+J9+7w="
|
||||
},
|
||||
{
|
||||
"pname": "System.Drawing.Common",
|
||||
"version": "10.0.1",
|
||||
"hash": "sha256-tM5Cc45MJiR58yTSvcsC8oQ0xXSO4zIuKpCP/ozqFjw="
|
||||
},
|
||||
{
|
||||
"pname": "System.Drawing.Common",
|
||||
"version": "4.7.0",
|
||||
"hash": "sha256-D3qG+xAe78lZHvlco9gHK2TEAM370k09c6+SQi873Hk="
|
||||
},
|
||||
{
|
||||
"pname": "System.IO.Pipelines",
|
||||
"version": "10.0.1",
|
||||
"hash": "sha256-3NHQjvO1mSPo8Hq9vMM5QeKJeS9/y3UpznideAf5pJA="
|
||||
},
|
||||
{
|
||||
"pname": "System.Management",
|
||||
"version": "10.0.1",
|
||||
"hash": "sha256-CxFR8FycstzLJvNzbAcrO9CVftIAb3o6RekAEZgZqRE="
|
||||
"version": "10.0.2",
|
||||
"hash": "sha256-u0Dn4zJUvSpftmtvR24enqKPDxxAMXJpav2/sfiwYiE="
|
||||
},
|
||||
{
|
||||
"pname": "System.Memory",
|
||||
"version": "4.5.4",
|
||||
"hash": "sha256-3sCEfzO4gj5CYGctl9ZXQRRhwAraMQfse7yzKoRe65E="
|
||||
},
|
||||
{
|
||||
"pname": "System.Private.Uri",
|
||||
"version": "4.3.0",
|
||||
"hash": "sha256-fVfgcoP4AVN1E5wHZbKBIOPYZ/xBeSIdsNF+bdukIRM="
|
||||
},
|
||||
{
|
||||
"pname": "System.Reactive",
|
||||
"version": "6.0.0",
|
||||
@@ -279,11 +229,6 @@
|
||||
"version": "6.0.0",
|
||||
"hash": "sha256-82aeU8c4rnYPLL3ba1ho1fxfpYQt5qrSK5e6ES+OTsY="
|
||||
},
|
||||
{
|
||||
"pname": "System.Runtime",
|
||||
"version": "4.3.1",
|
||||
"hash": "sha256-R9T68AzS1PJJ7v6ARz9vo88pKL1dWqLOANg4pkQjkA0="
|
||||
},
|
||||
{
|
||||
"pname": "System.Runtime.CompilerServices.Unsafe",
|
||||
"version": "4.5.2",
|
||||
@@ -324,21 +269,6 @@
|
||||
"version": "4.5.1",
|
||||
"hash": "sha256-PIhkv59IXjyiuefdhKxS9hQfEwO9YWRuNudpo53HQfw="
|
||||
},
|
||||
{
|
||||
"pname": "System.Text.Encodings.Web",
|
||||
"version": "10.0.1",
|
||||
"hash": "sha256-dBN9Rpe+J1F8/cdzwNxLHYiqvzgSX1r9128YXyb2DKM="
|
||||
},
|
||||
{
|
||||
"pname": "System.Text.Json",
|
||||
"version": "10.0.1",
|
||||
"hash": "sha256-WfSgOpRL4DKfIry/H+eHxJHHrj6ENZ3+P6Q2ol3R2XM="
|
||||
},
|
||||
{
|
||||
"pname": "System.Text.RegularExpressions",
|
||||
"version": "4.3.1",
|
||||
"hash": "sha256-DxsEZ0nnPozyC1W164yrMUXwnAdHShS9En7ImD/GJMM="
|
||||
},
|
||||
{
|
||||
"pname": "System.Threading.Tasks.Extensions",
|
||||
"version": "4.5.4",
|
||||
|
||||
@@ -18,19 +18,19 @@ let
|
||||
in
|
||||
buildNpmPackage (finalAttrs: {
|
||||
pname = "vrcx";
|
||||
version = "2026.01.28";
|
||||
version = "2026.02.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
repo = "VRCX";
|
||||
owner = "vrcx-team";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-D6KYKKDaWk7OMKVNOsA8K2j+kilAtLcRmMz4Xmt5pms=";
|
||||
hash = "sha256-/CMxFjIcLqk2oTnXUV519NkrImsnq3/kUGiew5E3Zyw=";
|
||||
};
|
||||
|
||||
nodejs = node;
|
||||
makeCacheWritable = true;
|
||||
npmFlags = [ "--ignore-scripts" ];
|
||||
npmDepsHash = "sha256-qa9056EljXLxcrArECf41vygueAAwrbeuA20yoMcYPA=";
|
||||
npmDepsHash = "sha256-bli8TKzxcASuCegEGwiHM5siMXGK4WuzhweNr5HaCvg=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
|
||||
@@ -17,13 +17,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "xdp-tools";
|
||||
version = "1.6.0";
|
||||
version = "1.6.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "xdp-project";
|
||||
repo = "xdp-tools";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-Smu93zwZN2jn9bLkVRpyubqTUh8VnVFMGqzc9myryLU=";
|
||||
hash = "sha256-KIUuAaWmU5BsmLsp8T3S2hSF4p7BJ506luS82RpmOKs=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
||||
@@ -10,6 +10,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "yetris";
|
||||
version = "2.3.0";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
"man"
|
||||
];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "alexdantas";
|
||||
repo = "yetris";
|
||||
|
||||
@@ -9,16 +9,16 @@
|
||||
|
||||
php.buildComposerProject2 (finalAttrs: {
|
||||
pname = "castor";
|
||||
version = "1.1.0";
|
||||
version = "1.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jolicode";
|
||||
repo = "castor";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-HgFFy/qEN7fPCFqDJe1SLMpDWB04YPI6OPYaURqjyKQ=";
|
||||
hash = "sha256-yTfSRB+Kr244lX4uIttCJltunGe3C67Ti8EUkZQsOIA=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-RBN99M5YFee8FZURn4lVuscrCmajMNn+10KgwqgPk8k=";
|
||||
vendorHash = "sha256-OkW7I8nowjqd3bmvQwnqog6V73T9C+F763/QNcCXZNM=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@@ -19,14 +19,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "agent-client-protocol";
|
||||
version = "0.8.0";
|
||||
version = "0.8.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "agentclientprotocol";
|
||||
repo = "python-sdk";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-MFfHr0bPBSMxb6HMndbrw/Aidd8TXUKwFam6+TroXkI=";
|
||||
hash = "sha256-pP2exnCiXPw4mPKBQVUWaCE7N132WIGU//whsJGTwgY=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -10,14 +10,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "asyncer";
|
||||
version = "0.0.12";
|
||||
version = "0.0.13";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fastapi";
|
||||
repo = "asyncer";
|
||||
tag = version;
|
||||
hash = "sha256-ViPCy9N93qcpaAeawuUoSnLiW1jVGFM14K9LC/AQ+Fc=";
|
||||
hash = "sha256-YSOTYKXmLpXZSTBChqn20KVwLdlaXn1onQDdlQsTKvc=";
|
||||
};
|
||||
|
||||
build-system = [ pdm-backend ];
|
||||
|
||||
@@ -22,14 +22,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-genai";
|
||||
version = "1.62.0";
|
||||
version = "1.63.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "googleapis";
|
||||
repo = "python-genai";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-LxTWMJbkwndbmp3hNL4n4OxSI7GjMkoFc/17LbjaIyo=";
|
||||
hash = "sha256-aTuMvF6ZymKfhw7wjV0flaOW5BD37eNYfAR7IM6BJRg=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -1,35 +1,41 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
setuptools,
|
||||
fetchFromGitHub,
|
||||
flit-core,
|
||||
pygments,
|
||||
python,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "pygments-better-html";
|
||||
version = "0.1.5";
|
||||
version = "0.1.6";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "pygments_better_html";
|
||||
inherit version;
|
||||
hash = "sha256-SLAe5ubIGEchUNoHCct6CWisBja3WNEfpE48v9CTzPQ=";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Kwpolska";
|
||||
repo = "pygments_better_html";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-7vX/xm1lb89YLuDJmgdDCg+/UHinQAchi8OaF9TXRJA=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
build-system = [ flit-core ];
|
||||
|
||||
dependencies = [ pygments ];
|
||||
|
||||
# has no tests
|
||||
doCheck = false;
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
${python.interpreter} demo.py
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [ "pygments_better_html" ];
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/Kwpolska/pygments_better_html/blob/${finalAttrs.src.tag}/CHANGELOG.md";
|
||||
homepage = "https://github.com/Kwpolska/pygments_better_html";
|
||||
description = "Improved line numbering for Pygments’ HTML formatter";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = with lib.maintainers; [ hexa ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -24,14 +24,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "rawpy";
|
||||
version = "0.26.0";
|
||||
version = "0.26.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "letmaik";
|
||||
repo = "rawpy";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-dFY1JNZxcV+FIj4qQgP1M1BP4x2ByV/K0J5kPZm/fjw=";
|
||||
hash = "sha256-/pD3t6sP/SctjzjiOo2e937NEetvkcC5wB/RWi8UXI0=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
From bebd0ae51344eba2bc9bb8e8bd88f279daf09581 Mon Sep 17 00:00:00 2001
|
||||
From 3ba8714f99d57e1434aeed316f6fd9cd115198dc Mon Sep 17 00:00:00 2001
|
||||
From: oddlama <oddlama@oddlama.org>
|
||||
Date: Mon, 10 Nov 2025 19:58:39 +0100
|
||||
Date: Sat, 14 Feb 2026 12:23:49 +0100
|
||||
Subject: [PATCH 1/2] oauth2 basic secret modify
|
||||
|
||||
---
|
||||
@@ -11,7 +11,7 @@ Subject: [PATCH 1/2] oauth2 basic secret modify
|
||||
4 files changed, 92 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/server/core/src/actors/v1_write.rs b/server/core/src/actors/v1_write.rs
|
||||
index 732e826c8..a2b8e503f 100644
|
||||
index 47be2002e..4e3522e1a 100644
|
||||
--- a/server/core/src/actors/v1_write.rs
|
||||
+++ b/server/core/src/actors/v1_write.rs
|
||||
@@ -324,6 +324,48 @@ impl QueryServerWriteV1 {
|
||||
@@ -64,7 +64,7 @@ index 732e826c8..a2b8e503f 100644
|
||||
level = "info",
|
||||
skip_all,
|
||||
diff --git a/server/core/src/https/v1.rs b/server/core/src/https/v1.rs
|
||||
index 7d5beb1f0..210147e0a 100644
|
||||
index 97be6d666..33778ae08 100644
|
||||
--- a/server/core/src/https/v1.rs
|
||||
+++ b/server/core/src/https/v1.rs
|
||||
@@ -10,7 +10,7 @@ use axum::extract::{Path, State};
|
||||
@@ -76,7 +76,7 @@ index 7d5beb1f0..210147e0a 100644
|
||||
use axum::{Extension, Json, Router};
|
||||
use axum_extra::extract::cookie::{Cookie, CookieJar, SameSite};
|
||||
use compact_jwt::{Jwk, Jws, JwsSigner};
|
||||
@@ -3113,6 +3113,10 @@ pub(crate) fn route_setup(state: ServerState) -> Router<ServerState> {
|
||||
@@ -3123,6 +3123,10 @@ pub(crate) fn route_setup(state: ServerState) -> Router<ServerState> {
|
||||
"/v1/oauth2/{rs_name}/_basic_secret",
|
||||
get(super::v1_oauth2::oauth2_id_get_basic_secret),
|
||||
)
|
||||
@@ -88,7 +88,7 @@ index 7d5beb1f0..210147e0a 100644
|
||||
"/v1/oauth2/{rs_name}/_scopemap/{group}",
|
||||
post(super::v1_oauth2::oauth2_id_scopemap_post)
|
||||
diff --git a/server/core/src/https/v1_oauth2.rs b/server/core/src/https/v1_oauth2.rs
|
||||
index f399539bc..ffad9921e 100644
|
||||
index c6209c750..16dd3e348 100644
|
||||
--- a/server/core/src/https/v1_oauth2.rs
|
||||
+++ b/server/core/src/https/v1_oauth2.rs
|
||||
@@ -151,6 +151,35 @@ pub(crate) async fn oauth2_id_get_basic_secret(
|
||||
@@ -128,10 +128,10 @@ index f399539bc..ffad9921e 100644
|
||||
patch,
|
||||
path = "/v1/oauth2/{rs_name}",
|
||||
diff --git a/server/lib/src/server/migrations.rs b/server/lib/src/server/migrations.rs
|
||||
index a916eced2..94327e938 100644
|
||||
index e5dcdfc04..add51fba5 100644
|
||||
--- a/server/lib/src/server/migrations.rs
|
||||
+++ b/server/lib/src/server/migrations.rs
|
||||
@@ -172,6 +172,22 @@ impl QueryServer {
|
||||
@@ -220,6 +220,22 @@ impl QueryServer {
|
||||
reload_required = true;
|
||||
};
|
||||
|
||||
@@ -155,5 +155,5 @@ index a916eced2..94327e938 100644
|
||||
// to preserve ordering of the operations - if we reloaded after a remigrate then
|
||||
// we would have skipped the patch level fix which needs to have occurred *first*.
|
||||
--
|
||||
2.51.0
|
||||
2.52.0
|
||||
|
||||
|
||||
@@ -1,20 +1,20 @@
|
||||
From 29dab03201185675d116dd5da6928c6ca3ad30ff Mon Sep 17 00:00:00 2001
|
||||
From 8db3febfce8057011156e80a371c4312a79be4cc Mon Sep 17 00:00:00 2001
|
||||
From: oddlama <oddlama@oddlama.org>
|
||||
Date: Mon, 10 Nov 2025 20:01:07 +0100
|
||||
Date: Sat, 14 Feb 2026 12:27:00 +0100
|
||||
Subject: [PATCH 2/2] recover account
|
||||
|
||||
---
|
||||
server/core/src/actors/internal.rs | 5 +++--
|
||||
server/core/src/admin.rs | 6 +++---
|
||||
server/daemon/src/main.rs | 23 ++++++++++++++++++++++-
|
||||
server/daemon/src/main.rs | 24 +++++++++++++++++++++++-
|
||||
server/daemon/src/opt.rs | 7 +++++++
|
||||
4 files changed, 35 insertions(+), 6 deletions(-)
|
||||
4 files changed, 36 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/server/core/src/actors/internal.rs b/server/core/src/actors/internal.rs
|
||||
index b3708f36d..6a52735fc 100644
|
||||
index abcc1b27c..2a63d0e9d 100644
|
||||
--- a/server/core/src/actors/internal.rs
|
||||
+++ b/server/core/src/actors/internal.rs
|
||||
@@ -186,17 +186,18 @@ impl QueryServerWriteV1 {
|
||||
@@ -189,17 +189,18 @@ impl QueryServerWriteV1 {
|
||||
|
||||
#[instrument(
|
||||
level = "info",
|
||||
@@ -36,10 +36,10 @@ index b3708f36d..6a52735fc 100644
|
||||
idms_prox_write.commit().map(|()| pw)
|
||||
}
|
||||
diff --git a/server/core/src/admin.rs b/server/core/src/admin.rs
|
||||
index b74cc90c5..660e3de8f 100644
|
||||
index e00eb0476..175a6f661 100644
|
||||
--- a/server/core/src/admin.rs
|
||||
+++ b/server/core/src/admin.rs
|
||||
@@ -24,7 +24,7 @@ pub use kanidm_proto::internal::{
|
||||
@@ -23,7 +23,7 @@ pub use kanidm_proto::internal::{
|
||||
|
||||
#[derive(Serialize, Deserialize, Debug)]
|
||||
pub enum AdminTaskRequest {
|
||||
@@ -48,7 +48,7 @@ index b74cc90c5..660e3de8f 100644
|
||||
DisableAccount { name: String },
|
||||
ShowReplicationCertificate,
|
||||
RenewReplicationCertificate,
|
||||
@@ -334,8 +334,8 @@ async fn handle_client(
|
||||
@@ -341,8 +341,8 @@ async fn handle_client(
|
||||
|
||||
let resp = async {
|
||||
match req {
|
||||
@@ -60,18 +60,16 @@ index b74cc90c5..660e3de8f 100644
|
||||
Err(e) => {
|
||||
error!(err = ?e, "error during recover-account");
|
||||
diff --git a/server/daemon/src/main.rs b/server/daemon/src/main.rs
|
||||
index 2ad7830cc..52fa8d2d9 100644
|
||||
index 611022a63..0b2f863e4 100644
|
||||
--- a/server/daemon/src/main.rs
|
||||
+++ b/server/daemon/src/main.rs
|
||||
@@ -832,13 +832,34 @@ async fn kanidm_main(config: Configuration, opt: KanidmdParser) -> ExitCode {
|
||||
.await;
|
||||
}
|
||||
}
|
||||
- KanidmdOpt::RecoverAccount { name } => {
|
||||
+ KanidmdOpt::RecoverAccount { name, from_environment } => {
|
||||
info!("Running account recovery ...");
|
||||
let output_mode: ConsoleOutputMode = opt.output_mode.into();
|
||||
+ let password = if *from_environment {
|
||||
@@ -370,11 +370,32 @@ fn check_file_ownership(opt: &KanidmdParser) -> Result<(), ExitCode> {
|
||||
|
||||
async fn scripting_command(cmd: ScriptingCommand, config: Configuration) -> ExitCode {
|
||||
match cmd {
|
||||
- ScriptingCommand::RecoverAccount { name } => {
|
||||
+ ScriptingCommand::RecoverAccount { name, from_environment } => {
|
||||
+ let password = if from_environment {
|
||||
+ match std::env::var("KANIDM_RECOVER_ACCOUNT_PASSWORD_FILE") {
|
||||
+ Ok(path) => match tokio::fs::read_to_string(&path).await {
|
||||
+ Ok(contents) => Some(contents),
|
||||
@@ -91,19 +89,27 @@ index 2ad7830cc..52fa8d2d9 100644
|
||||
+ } else {
|
||||
+ None
|
||||
+ };
|
||||
submit_admin_req(
|
||||
submit_admin_req_json(
|
||||
config.adminbindpath.as_str(),
|
||||
AdminTaskRequest::RecoverAccount {
|
||||
name: name.to_owned(),
|
||||
+ password,
|
||||
},
|
||||
output_mode,
|
||||
)
|
||||
.await;
|
||||
@@ -998,6 +1019,7 @@ async fn kanidm_main(config: Configuration, opt: KanidmdParser) -> ExitCode {
|
||||
config.adminbindpath.as_str(),
|
||||
AdminTaskRequest::RecoverAccount {
|
||||
name: name.to_owned(),
|
||||
+ password: None,
|
||||
},
|
||||
)
|
||||
.await;
|
||||
diff --git a/server/daemon/src/opt.rs b/server/daemon/src/opt.rs
|
||||
index 05c5b9fb3..834b8f9cf 100644
|
||||
index ba5d00fc7..f1497f6dc 100644
|
||||
--- a/server/daemon/src/opt.rs
|
||||
+++ b/server/daemon/src/opt.rs
|
||||
@@ -158,6 +158,13 @@ enum KanidmdOpt {
|
||||
@@ -128,6 +128,13 @@ enum ScriptingCommand {
|
||||
#[clap(value_parser)]
|
||||
/// The account name to recover credentials for.
|
||||
name: String,
|
||||
@@ -115,8 +121,8 @@ index 05c5b9fb3..834b8f9cf 100644
|
||||
+ #[clap(long = "from-environment")]
|
||||
+ from_environment: bool,
|
||||
},
|
||||
#[clap(name = "disable-account")]
|
||||
/// Disable an account so that it can not be used. This can be reset with `recover-account`.
|
||||
/// Backup
|
||||
Backup {
|
||||
--
|
||||
2.51.0
|
||||
2.52.0
|
||||
|
||||
|
||||
@@ -1535,6 +1535,8 @@ mapAliases {
|
||||
pinentry = throw "'pinentry' has been removed. Pick an appropriate variant like 'pinentry-curses' or 'pinentry-gnome3'"; # Converted to throw 2025-10-26
|
||||
pingvin-share = throw "'pingvin-share' has been removed as it was broken and archived upstream"; # Added 2025-11-08
|
||||
piper-train = throw "piper-train is now part of the piper package using the `withTrain` override"; # Added 2025-09-03
|
||||
plant-it = throw "plant-it backend was discontinued in september 2025"; # Added 2026-01-30
|
||||
plant-it-frontend = throw "plant-it-frontend has been presented as being Android-only since the server-side was discontinued in september 2025"; # Added 2026-01-30
|
||||
plasma-applet-volumewin7mixer = throw "'plasma-applet-volumewin7mixer' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20
|
||||
plasma-pass = throw "'plasma-pass' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20
|
||||
plasma-theme-switcher = throw "'plasma-theme-switcher' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20
|
||||
|
||||
@@ -8294,7 +8294,7 @@ with pkgs;
|
||||
kanidmWithSecretProvisioning = kanidmWithSecretProvisioning_1_8;
|
||||
};
|
||||
kanidm_1_9 = callPackage ../servers/kanidm/1_9.nix {
|
||||
kanidmWithSecretProvisioning = kanidmWithSecretProvisioning_1_8;
|
||||
kanidmWithSecretProvisioning = kanidmWithSecretProvisioning_1_9;
|
||||
};
|
||||
|
||||
kanidmWithSecretProvisioning_1_7 = kanidm_1_7.override { enableSecretProvisioning = true; };
|
||||
|
||||
Reference in New Issue
Block a user