Merge master into staging-next
This commit is contained in:
@@ -77,6 +77,7 @@ jobs:
|
||||
'ci/github-script/bot.js',
|
||||
'ci/github-script/check-target-branch.js',
|
||||
'ci/github-script/commits.js',
|
||||
'ci/github-script/get-pr-commit-details.js',
|
||||
'ci/github-script/lint-commits.js',
|
||||
'ci/github-script/merge.js',
|
||||
'ci/github-script/prepare.js',
|
||||
|
||||
@@ -0,0 +1,101 @@
|
||||
// @ts-check
|
||||
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)
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the SHA, subject and changed files for each commit in the given PR.
|
||||
*
|
||||
* Don't use GitHub API at all: the "list commits on PR" endpoint has a limit
|
||||
* of 250 commits and doesn't return the changed files.
|
||||
*
|
||||
* @param {{
|
||||
* core: import('@actions/core'),
|
||||
* pr: Awaited<ReturnType<InstanceType<import('@actions/github/lib/utils').GitHub>["rest"]["pulls"]["get"]>>["data"]
|
||||
* repoPath?: string,
|
||||
* }} GetCommitMessagesForPRProps
|
||||
*
|
||||
* @returns {Promise<{
|
||||
* subject: string,
|
||||
* sha: string,
|
||||
* changedPaths: string[],
|
||||
* changedPathSegments: Set<string>,
|
||||
* }[]>}
|
||||
*/
|
||||
async function getCommitDetailsForPR({ core, pr, repoPath }) {
|
||||
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)
|
||||
|
||||
return Promise.all(
|
||||
shas.map(async (sha) => {
|
||||
// Subject first, then a blank line, then filenames.
|
||||
const result = (
|
||||
await runGit({
|
||||
args: ['log', '--format=%s', '--name-only', '-1', sha],
|
||||
repoPath,
|
||||
core,
|
||||
quiet: true,
|
||||
})
|
||||
).stdout.split('\n')
|
||||
|
||||
const subject = result[0]
|
||||
|
||||
const changedPaths = result.slice(2, -1)
|
||||
|
||||
const changedPathSegments = new Set(
|
||||
changedPaths.flatMap((path) => path.split('/')),
|
||||
)
|
||||
|
||||
return {
|
||||
sha,
|
||||
subject,
|
||||
changedPaths,
|
||||
changedPathSegments,
|
||||
}
|
||||
}),
|
||||
)
|
||||
}
|
||||
|
||||
module.exports = { getCommitDetailsForPR }
|
||||
@@ -1,27 +1,6 @@
|
||||
// @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)
|
||||
}
|
||||
const { getCommitDetailsForPR } = require('./get-pr-commit-details.js')
|
||||
|
||||
/**
|
||||
* @param {{
|
||||
@@ -67,84 +46,70 @@ async function checkCommitMessages({ github, context, core, repoPath }) {
|
||||
return
|
||||
}
|
||||
|
||||
/**
|
||||
* 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 commits = await getCommitDetailsForPR({ core, pr, repoPath })
|
||||
|
||||
const failures = new Set()
|
||||
|
||||
const conventionalCommitTypes = [
|
||||
'build',
|
||||
'chore',
|
||||
'ci',
|
||||
'doc',
|
||||
'docs',
|
||||
'feat',
|
||||
'feature',
|
||||
'fix',
|
||||
'perf',
|
||||
'refactor',
|
||||
'style',
|
||||
'test',
|
||||
]
|
||||
|
||||
/**
|
||||
* @param {string[]} types e.g. ["fix", "feat"]
|
||||
* @param {string?} sha commit hash
|
||||
*/
|
||||
function makeConventionalCommitRegex(types, sha = null) {
|
||||
core.info(
|
||||
`${
|
||||
sha
|
||||
? `Conventional commit types for ${sha?.slice(0, 16)}`
|
||||
: 'Default conventional commit types'
|
||||
}: ${JSON.stringify(types)}`,
|
||||
)
|
||||
|
||||
return new RegExp(`^(${types.join('|')})!?(\\(.*\\))?!?:`)
|
||||
}
|
||||
|
||||
// Optimize for the common case that we don't have path segments with the
|
||||
// same name as a conventional commit type.
|
||||
const fullConventionalCommitRegex = makeConventionalCommitRegex(
|
||||
conventionalCommitTypes,
|
||||
)
|
||||
|
||||
for (const commit of commits) {
|
||||
const message = commit.message
|
||||
const firstLine = message.split('\n')[0]
|
||||
const logMsgStart = `Commit ${commit.sha}'s message's subject ("${commit.subject}")`
|
||||
|
||||
const logMsgStart = `Commit ${commit.sha}'s message's subject ("${firstLine}")`
|
||||
// If we have a commit `perf: ...`, and we touch a file containing the path
|
||||
// segment "perf", we don't want to flag this.
|
||||
const filteredTypes = conventionalCommitTypes.filter(
|
||||
(type) => !commit.changedPathSegments.has(type),
|
||||
)
|
||||
const conventionalCommitRegex =
|
||||
filteredTypes.length === conventionalCommitTypes.length
|
||||
? fullConventionalCommitRegex
|
||||
: makeConventionalCommitRegex(filteredTypes, commit.sha)
|
||||
|
||||
if (!firstLine.includes(': ')) {
|
||||
if (!commit.subject.includes(': ')) {
|
||||
core.error(
|
||||
`${logMsgStart} was detected as not meeting our guidelines because ` +
|
||||
'it does not contain a colon followed by a whitespace.' +
|
||||
'it does not contain a colon followed by a whitespace. ' +
|
||||
'There are likely other issues as well.',
|
||||
)
|
||||
failures.add(commit.sha)
|
||||
}
|
||||
|
||||
if (firstLine.endsWith('.')) {
|
||||
if (commit.subject.endsWith('.')) {
|
||||
core.error(
|
||||
`${logMsgStart} was detected as not meeting our guidelines because ` +
|
||||
'it ends in a period. There may be other issues as well.',
|
||||
@@ -153,15 +118,25 @@ async function checkCommitMessages({ github, context, core, repoPath }) {
|
||||
}
|
||||
|
||||
const fixups = ['amend!', 'fixup!', 'squash!']
|
||||
if (fixups.some((s) => firstLine.startsWith(s))) {
|
||||
if (fixups.some((s) => commit.subject.startsWith(s))) {
|
||||
core.error(
|
||||
`${logMsgStart} was detected as not meeting our guidelines because ` +
|
||||
`it begins with "${fixups.find((s) => firstLine.startsWith(s))}". ` +
|
||||
`it begins with "${fixups.find((s) => commit.subject.startsWith(s))}". ` +
|
||||
'Did you forget to run `git rebase -i --autosquash`?',
|
||||
)
|
||||
failures.add(commit.sha)
|
||||
}
|
||||
|
||||
if (conventionalCommitRegex.test(commit.subject)) {
|
||||
core.error(
|
||||
`${logMsgStart} was detected as not meeting our guidelines because ` +
|
||||
'it seems to use conventional commit (conventionalcommits.org) ' +
|
||||
'formatting. Nixpkgs has its own, different, commit message ' +
|
||||
'formatting standards.',
|
||||
)
|
||||
failures.add(commit.sha)
|
||||
}
|
||||
|
||||
if (!failures.has(commit.sha)) {
|
||||
core.info(`${logMsgStart} passed our automated checks!`)
|
||||
}
|
||||
|
||||
@@ -4470,7 +4470,7 @@
|
||||
name = "Claas Augner";
|
||||
};
|
||||
caverav = {
|
||||
email = "camilo@fvv.cl";
|
||||
email = "nixpkgs@caverav.cl";
|
||||
github = "caverav";
|
||||
githubId = 66751764;
|
||||
name = "Camilo Vera Vidales";
|
||||
@@ -25207,12 +25207,6 @@
|
||||
githubId = 12636891;
|
||||
name = "Akhil Indurti";
|
||||
};
|
||||
smironov = {
|
||||
email = "grrwlf@gmail.com";
|
||||
github = "sergei-mironov";
|
||||
githubId = 4477729;
|
||||
name = "Sergey Mironov";
|
||||
};
|
||||
smissingham = {
|
||||
email = "sean@missingham.com";
|
||||
github = "smissingham";
|
||||
|
||||
@@ -48,6 +48,10 @@ in
|
||||
};
|
||||
};
|
||||
|
||||
xdg = {
|
||||
serverAutostart = lib.mkEnableOption "starting the foot server via xdg-autostart";
|
||||
};
|
||||
|
||||
theme = lib.mkOption {
|
||||
type = with lib.types; nullOr str;
|
||||
default = null;
|
||||
@@ -74,10 +78,14 @@ in
|
||||
environment = {
|
||||
systemPackages = [ cfg.package ];
|
||||
etc."xdg/foot/foot.ini".source = settingsFormat.generate "foot.ini" cfg.settings;
|
||||
|
||||
etc."xdg/autostart/foot-server.desktop".source =
|
||||
lib.mkIf cfg.xdg.serverAutostart "${cfg.package}/share/applications/foot-server.desktop";
|
||||
};
|
||||
|
||||
programs = {
|
||||
foot.settings.main.include = lib.optionals (cfg.theme != null) [
|
||||
"${pkgs.foot.themes}/share/foot/themes/${cfg.theme}"
|
||||
"${cfg.package.themes}/share/foot/themes/${cfg.theme}"
|
||||
];
|
||||
# https://codeberg.org/dnkl/foot/wiki#user-content-shell-integration
|
||||
bash.interactiveShellInit = lib.mkIf cfg.enableBashIntegration ". ${./bashrc} # enable shell integration for foot terminal";
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
}:
|
||||
vimUtils.buildVimPlugin rec {
|
||||
pname = "codediff.nvim";
|
||||
version = "2.41.1";
|
||||
version = "2.43.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "esmuellert";
|
||||
repo = "codediff.nvim";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-JOlBmzdKVfU7HLVXyCbxwrARLFAiW/p7xFMlafpIKCY=";
|
||||
hash = "sha256-9u0jrAjsxSt0HbQ/9DhgQfpjkgsxC50u26KwOrwesJ4=";
|
||||
};
|
||||
|
||||
dependencies = [ vimPlugins.nui-nvim ];
|
||||
|
||||
@@ -6,8 +6,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "vscode-wakatime";
|
||||
publisher = "WakaTime";
|
||||
version = "25.5.1";
|
||||
hash = "sha256-4wdY8cmKWfp/ua39lcD8ibxoy8W0zyX97vMyDEZu2o4=";
|
||||
version = "27.0.0";
|
||||
hash = "sha256-SCgVX/s4fjMXPA4wrjIqzdi+RHMuhq+kf5gN2oWpQQY=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
+2
-2
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension (finalAttrs: {
|
||||
mktplcRef = {
|
||||
name = "amazon-q-vscode";
|
||||
publisher = "AmazonWebServices";
|
||||
version = "1.111.0";
|
||||
hash = "sha256-f4GVY3vL7ienn/pWzcbXcDHNHCrPPmFWeVpVDVVNF5c=";
|
||||
version = "1.112.0";
|
||||
hash = "sha256-iuyET7vCZCyldfNuognB6fLDurJzg7XsRme6BjDCQzU=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -1007,8 +1007,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "coder-remote";
|
||||
publisher = "coder";
|
||||
version = "1.12.2";
|
||||
hash = "sha256-0ZX0EQnPIqREsIy5dSML94PXD0Z+UZCIKwdqXVYTc1Q=";
|
||||
version = "1.13.2";
|
||||
hash = "sha256-Dw8eJPpbeMz2taELHI0eYwO67SngCFel8wL/ZCGXQoM=";
|
||||
};
|
||||
meta = {
|
||||
description = "Extension for Visual Studio Code to open any Coder workspace in VS Code with a single click";
|
||||
@@ -1729,8 +1729,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "foam-vscode";
|
||||
publisher = "foam";
|
||||
version = "0.29.2";
|
||||
hash = "sha256-6Bga51DCHaVn+UV5RPCE7uFsAei/F0xN4Mk4dm52FWs=";
|
||||
version = "0.31.0";
|
||||
hash = "sha256-Z3M20CjSEFSG5KVfsbLa7gokNnGAG1IrdD0xe7Ch3t8=";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/foam.foam-vscode/changelog";
|
||||
|
||||
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
publisher = "google";
|
||||
name = "colab";
|
||||
version = "0.3.0";
|
||||
hash = "sha256-O95bJuMQtQDj30nhw9yE1Spf/ViuakpcO2q9nf2iVtg=";
|
||||
version = "0.4.1";
|
||||
hash = "sha256-ebSMfnDumkXKsMqg3/ifi0GVXfXtrs2mLCCG8hZlkR0=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -13,7 +13,7 @@ let
|
||||
buildVscodeLanguagePack =
|
||||
{
|
||||
language,
|
||||
version ? "1.108.2026012809",
|
||||
version ? "1.108.2026021109",
|
||||
hash,
|
||||
}:
|
||||
buildVscodeMarketplaceExtension {
|
||||
@@ -41,71 +41,71 @@ in
|
||||
# French
|
||||
vscode-language-pack-fr = buildVscodeLanguagePack {
|
||||
language = "fr";
|
||||
hash = "sha256-1+aWgvoXR/FqhnIn3OrLOC11jLXVWlO2yecpzr2Waww=";
|
||||
hash = "sha256-wlNUPeU7gblFeQ0G6CE+lzC3xQW8Xy2DM0mpmy1K5dM=";
|
||||
};
|
||||
# Italian
|
||||
vscode-language-pack-it = buildVscodeLanguagePack {
|
||||
language = "it";
|
||||
hash = "sha256-t6jN3qok7B4/G/IjEXD6THO6c+8X+1gxny6W7qdh5mI=";
|
||||
hash = "sha256-Nx+4ByeCnH3BxL41M6XcwlW5qgbUh9ex3Bu6xvy24UI=";
|
||||
};
|
||||
# German
|
||||
vscode-language-pack-de = buildVscodeLanguagePack {
|
||||
language = "de";
|
||||
hash = "sha256-rZM/T1gbYrtcHNLW0itNdhKcRR938PwK5VBN0xLDIWg=";
|
||||
hash = "sha256-9747wTc4cdsEOZmy7JPNGL65vNG+bLEjN4CDMVbOphw=";
|
||||
};
|
||||
# Spanish
|
||||
vscode-language-pack-es = buildVscodeLanguagePack {
|
||||
language = "es";
|
||||
hash = "sha256-PG3oOCjWRgh1ox6GAPRdZdf8QNP1JsJZznJnM+2Ihl0=";
|
||||
hash = "sha256-LKoDwonmsB9X50/DLTfh0rED/EvdWPbkP+i/n2pjfL4=";
|
||||
};
|
||||
# Russian
|
||||
vscode-language-pack-ru = buildVscodeLanguagePack {
|
||||
language = "ru";
|
||||
hash = "sha256-RPpNet015xGnOszcKfehP9VxnfDAnQJ2A62rVtNBDew=";
|
||||
hash = "sha256-CZhmpvW+EQW3E0PdRB7zz1XXQW+9vnzT99n7cagx7DE=";
|
||||
};
|
||||
# Chinese (Simplified)
|
||||
vscode-language-pack-zh-hans = buildVscodeLanguagePack {
|
||||
language = "zh-hans";
|
||||
hash = "sha256-pm1dCoK4YM8XBM/O6p42R4PYy5f95sLcECHJMAKFt9Q=";
|
||||
hash = "sha256-QYgM9PRpHKB4SxAC5C92gkUsNXO9ua5GHqn7Cd9I8tM=";
|
||||
};
|
||||
# Chinese (Traditional)
|
||||
vscode-language-pack-zh-hant = buildVscodeLanguagePack {
|
||||
language = "zh-hant";
|
||||
hash = "sha256-cSM+2W5aCUA77kxgV7vyk7KAoSlkeT+y56ziIPjP9II=";
|
||||
hash = "sha256-X476P0tOH4VBgbW74/XnnsBdkAcq2co7rxzXD8O5Xtc=";
|
||||
};
|
||||
# Japanese
|
||||
vscode-language-pack-ja = buildVscodeLanguagePack {
|
||||
language = "ja";
|
||||
hash = "sha256-UfMMLKHi48Qhgm8PXFAfGFQFX6e8vQsl/RYqha42TOc=";
|
||||
hash = "sha256-BoTVsv5KhZd+hZFdpe3RhU+VvpZu5Z2u3X1KPsEBd3U=";
|
||||
};
|
||||
# Korean
|
||||
vscode-language-pack-ko = buildVscodeLanguagePack {
|
||||
language = "ko";
|
||||
hash = "sha256-gneZF4CIEDy88juFZBiB9/o/rzTnu2du4aiZ+NH+XlE=";
|
||||
hash = "sha256-/RaaiP32Ky9bbifWNDB3rCHu7G8rZS6jvEyJhnR+0A8=";
|
||||
};
|
||||
# Czech
|
||||
vscode-language-pack-cs = buildVscodeLanguagePack {
|
||||
language = "cs";
|
||||
hash = "sha256-ojh2KBEpTTJsAgM2RilGO58kkcWgaFf5nkiiZ4gYNtg=";
|
||||
hash = "sha256-hHnrMUVmjXezk5k/q1jrd3Zp6NyetoeYnFQgAyEuX+8=";
|
||||
};
|
||||
# Portuguese (Brazil)
|
||||
vscode-language-pack-pt-br = buildVscodeLanguagePack {
|
||||
language = "pt-BR";
|
||||
hash = "sha256-n55nI9gCxNpr6Pq70qJnmgp2rs0Gcblirg4SaeXAXtE=";
|
||||
hash = "sha256-JTkPbkwrH4Vxg6V9zTSame8WyjSli/LDVLCv4DY7zGM=";
|
||||
};
|
||||
# Turkish
|
||||
vscode-language-pack-tr = buildVscodeLanguagePack {
|
||||
language = "tr";
|
||||
hash = "sha256-S6orhrfCaA4aeLhW3+rdaJb4X8h7IUjfBC9A+QgiQgk=";
|
||||
hash = "sha256-rvM5SgcJujWztSREZulD4y5wZBm9e9CDseKozqtmNfM=";
|
||||
};
|
||||
# Polish
|
||||
vscode-language-pack-pl = buildVscodeLanguagePack {
|
||||
language = "pl";
|
||||
hash = "sha256-YoNl44f2jEYXIhDKz+xU5fzt/JD6l86dtbqXFKOzHrk=";
|
||||
hash = "sha256-M4XKkz1hgsjxsjqf7pQGYAB0rtJN9eKxM2WhDYGLssk=";
|
||||
};
|
||||
# Pseudo Language
|
||||
vscode-language-pack-qps-ploc = buildVscodeLanguagePack {
|
||||
language = "qps-ploc";
|
||||
hash = "sha256-onc+lk6itrWP5J17eVLIMcpG1gDM/rpTzKci8m2uBcY=";
|
||||
hash = "sha256-/zVq/03CcM7cgZ4/K7k4pYqkbc6bNuBnhMl38DRFulw=";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -15,19 +15,19 @@
|
||||
let
|
||||
supported = {
|
||||
x86_64-linux = {
|
||||
hash = "sha256-MJ5FI1YbvknhuBgSQIpd/s4fyIvaOZHTQBeGxBo1uhs=";
|
||||
hash = "sha256-14CuWI0le00n55TYhEtz0XI/xG+fXnjrboSHgJ2Tx/s=";
|
||||
arch = "linux-x64";
|
||||
};
|
||||
x86_64-darwin = {
|
||||
hash = "sha256-Jk41L8QulT+olJxUl1E/UOOtD/qIIiwSlkP5R9qOJhU=";
|
||||
hash = "sha256-EKomndqpCJXajwesbolWx9kr/sEpAhZpPtn0S/d1nbM=";
|
||||
arch = "darwin-x64";
|
||||
};
|
||||
aarch64-linux = {
|
||||
hash = "sha256-xeD73t9WleBz/p+DyIs9vRUlKcbzUwL1RxILNKOi+14=";
|
||||
hash = "sha256-f8jehKgNMuIyP+yQ7oCLhKvdcmujc6d7UbwXL+khZCg=";
|
||||
arch = "linux-arm64";
|
||||
};
|
||||
aarch64-darwin = {
|
||||
hash = "sha256-gRViqhIyqmUId56lf8o6z9KK4rNK5Ufg9i2gecsTrVc=";
|
||||
hash = "sha256-87tvTop81XTOHuY64dXA+WmfEGdEACNKipqHDe3lNp8=";
|
||||
arch = "darwin-arm64";
|
||||
};
|
||||
};
|
||||
@@ -41,7 +41,7 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
||||
mktplcRef = base // {
|
||||
name = "python";
|
||||
publisher = "ms-python";
|
||||
version = "2025.16.0";
|
||||
version = "2026.2.0";
|
||||
};
|
||||
|
||||
buildInputs = [ icu ];
|
||||
|
||||
@@ -8,8 +8,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "vscode-pylance";
|
||||
publisher = "MS-python";
|
||||
version = "2025.9.1";
|
||||
hash = "sha256-8iZP5nd5SAEhwy6CxBY5kVhJFX5OdZp8u1sjDyuMS08=";
|
||||
version = "2026.1.1";
|
||||
hash = "sha256-82zIUJBgjbBW0R6ExBLXGYYtYxm1vC7bz/3BvP3IIXA=";
|
||||
};
|
||||
|
||||
buildInputs = [ pyright ];
|
||||
|
||||
@@ -21,13 +21,13 @@ let
|
||||
# Use the plugin version as in vscode marketplace, updated by update script.
|
||||
inherit (vsix) version;
|
||||
|
||||
releaseTag = "2025-08-25";
|
||||
releaseTag = "2026-02-16";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rust-lang";
|
||||
repo = "rust-analyzer";
|
||||
tag = releaseTag;
|
||||
hash = "sha256-apbJj2tsJkL2l+7Or9tJm1Mt5QPB6w/zIyDkCx8pfvk=";
|
||||
hash = "sha256-1TZROjtryMzOJHgHhAUQUoAMnnWal231G7gM1pfNlK4=";
|
||||
};
|
||||
|
||||
vsix = buildNpmPackage {
|
||||
@@ -35,7 +35,7 @@ let
|
||||
name = "${pname}-${version}.vsix";
|
||||
version = lib.trim (lib.readFile ./version.txt);
|
||||
src = "${src}/editors/code";
|
||||
npmDepsHash = "sha256-fV4Z3jj+v56A7wbIEYhVAPVuAMqMds5xSe3OetWAsbw=";
|
||||
npmDepsHash = "sha256-rg4ARGB9NzI8rxEOONWq+mwSG9hd3yyFRhOUomMLN6w=";
|
||||
buildInputs = [
|
||||
pkgsBuildBuild.libsecret
|
||||
];
|
||||
|
||||
@@ -1 +1 @@
|
||||
0.3.2593
|
||||
0.3.2803
|
||||
|
||||
@@ -11,26 +11,26 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
||||
sources = {
|
||||
"x86_64-linux" = {
|
||||
arch = "linux-x64";
|
||||
hash = "sha256-NXlV80CV6EyALfJHT3x3pfjGiJfYxPT2JXTADMfB7yA=";
|
||||
hash = "sha256-qyhYpEkkXjG48JXSxOodgvh18R/nOOcP2m3m0OpdqvY=";
|
||||
};
|
||||
"x86_64-darwin" = {
|
||||
arch = "darwin-x64";
|
||||
hash = "sha256-NWak0NXK5SxGm7JLpqR7zapEzxG+CDFdTcZDyCY6ifk=";
|
||||
hash = "sha256-elhKqa9aLcx+3CTYt1S1BiE+Y5ldLc5ilfnfPoEEd3w=";
|
||||
};
|
||||
"aarch64-linux" = {
|
||||
arch = "linux-arm64";
|
||||
hash = "sha256-9lJfrqVFTROMqLaO9SUx9msACjHu0lTSKLRPPA8r8AM=";
|
||||
hash = "sha256-r2DmSo1TLyZSFKVsbvYhF1CkNODgjotNFXhA+q69MAw=";
|
||||
};
|
||||
"aarch64-darwin" = {
|
||||
arch = "darwin-arm64";
|
||||
hash = "sha256-iz3+iEXCYzItNTrAlzZAuM80U+TNlz/n1nljRvOfX3k=";
|
||||
hash = "sha256-4qGX4TwT9gtJbZt7JLbnQwGLA13yoqZQsydtfr4Kivw=";
|
||||
};
|
||||
};
|
||||
in
|
||||
{
|
||||
name = "visualjj";
|
||||
publisher = "visualjj";
|
||||
version = "0.20.2";
|
||||
version = "0.24.1";
|
||||
}
|
||||
// sources.${stdenvNoCC.hostPlatform.system}
|
||||
or (throw "Unsupported system ${stdenvNoCC.hostPlatform.system}");
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
}:
|
||||
mkLibretroCore {
|
||||
core = "fbneo";
|
||||
version = "0-unstable-2026-03-03";
|
||||
version = "0-unstable-2026-03-08";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libretro";
|
||||
repo = "fbneo";
|
||||
rev = "7706b59fecf5a8ef81190d8d7e0abe3b08ce6d22";
|
||||
hash = "sha256-D2PB2vaq1HpHAE0/c5I9YxwFPS8QQ4hSRuKu5xzJR/k=";
|
||||
rev = "14ff80a2e0611d039321a3ac0dd76bf6b4e3210f";
|
||||
hash = "sha256-L6KYyEb95L9rDnaMVh49afaWxsshTy3eujsTQWbPfl0=";
|
||||
};
|
||||
|
||||
makefile = "Makefile";
|
||||
|
||||
@@ -67,7 +67,6 @@ symlinkJoin {
|
||||
license = lib.licenses.zlib;
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = with lib.maintainers; [
|
||||
smironov
|
||||
TethysSvensson
|
||||
];
|
||||
mainProgram = "zathura";
|
||||
|
||||
@@ -571,11 +571,11 @@
|
||||
"vendorHash": "sha256-xIagZvWtlNpz5SQfxbA7r9ojAeS3CW2pwV337ObKOwU="
|
||||
},
|
||||
"hashicorp_google": {
|
||||
"hash": "sha256-mSUEhO6zZ4PO/WzvHVCaoxFjhL/kF1OfuCeH67DA4+w=",
|
||||
"hash": "sha256-ulwx4+m/7mTTr0+1kSO1g4qkKhd/Yx5of4K7moDik88=",
|
||||
"homepage": "https://registry.terraform.io/providers/hashicorp/google",
|
||||
"owner": "hashicorp",
|
||||
"repo": "terraform-provider-google",
|
||||
"rev": "v7.22.0",
|
||||
"rev": "v7.23.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-v/XHGUEpAIpGHErv7GPqfosVLL3xaqBwZHbJKS8fkn4="
|
||||
},
|
||||
@@ -1049,11 +1049,11 @@
|
||||
"vendorHash": null
|
||||
},
|
||||
"oracle_oci": {
|
||||
"hash": "sha256-3gDOKRaZzsqFj8DOK8rug43nvU3kE6KAGcYy/ky4o0o=",
|
||||
"hash": "sha256-Luh2NB1+dKTbYnvU3o+rkta8wmqHuJRLv+lroM6/LcQ=",
|
||||
"homepage": "https://registry.terraform.io/providers/oracle/oci",
|
||||
"owner": "oracle",
|
||||
"repo": "terraform-provider-oci",
|
||||
"rev": "v8.3.0",
|
||||
"rev": "v8.5.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": null
|
||||
},
|
||||
|
||||
@@ -78,7 +78,7 @@ stdenv.mkDerivation rec {
|
||||
mainProgram = "lp_solve";
|
||||
homepage = "https://lpsolve.sourceforge.net";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
maintainers = with lib.maintainers; [ smironov ];
|
||||
maintainers = [ ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -45,7 +45,6 @@ symlinkJoin {
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = with lib.maintainers; [
|
||||
balodja
|
||||
smironov
|
||||
];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
|
||||
@@ -74,7 +74,6 @@ mkOpenModelicaDerivation (
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = with lib.maintainers; [
|
||||
balodja
|
||||
smironov
|
||||
];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
|
||||
@@ -52,7 +52,6 @@ mkOpenModelicaDerivation {
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = with lib.maintainers; [
|
||||
balodja
|
||||
smironov
|
||||
];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
|
||||
@@ -38,7 +38,6 @@ including Modelica Standard Library";
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = with lib.maintainers; [
|
||||
balodja
|
||||
smironov
|
||||
];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
|
||||
@@ -28,7 +28,6 @@ suite";
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = with lib.maintainers; [
|
||||
balodja
|
||||
smironov
|
||||
];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
|
||||
@@ -36,7 +36,6 @@ mkOpenModelicaDerivation {
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = with lib.maintainers; [
|
||||
balodja
|
||||
smironov
|
||||
];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
|
||||
@@ -51,7 +51,6 @@ mkOpenModelicaDerivation {
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = with lib.maintainers; [
|
||||
balodja
|
||||
smironov
|
||||
];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
|
||||
@@ -41,7 +41,6 @@ mkOpenModelicaDerivation {
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = with lib.maintainers; [
|
||||
balodja
|
||||
smironov
|
||||
];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
|
||||
@@ -82,13 +82,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
pname = "ansel";
|
||||
version = "0-unstable-2026-03-03";
|
||||
version = "0-unstable-2026-03-11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aurelienpierreeng";
|
||||
repo = "ansel";
|
||||
rev = "58d4f3ee9f7c7b17474e85d9bc5f08f3e108b4b0";
|
||||
hash = "sha256-zWmhHI8l+Tnm8hRRWT4X4FE/piOfXE/GBCP4WT63WfE=";
|
||||
rev = "d718fd06e944415af093a3a89c7ccffb3928e5aa";
|
||||
hash = "sha256-EAM/kz+RDuc+G7/CjIJDRScCq85YAqVnYNUs6HLyavY=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -25,8 +25,10 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
--replace-fail "cmake_minimum_required( VERSION 2.8 )" "cmake_minimum_required(VERSION 3.10)"
|
||||
'';
|
||||
|
||||
# fixes: error: 'sprintf' is deprecated: This function is provided for compatibility reasons only.
|
||||
NIX_CFLAGS_COMPILE = lib.optional stdenv.cc.isClang "-Wno-error=deprecated-declarations";
|
||||
env = lib.optionalAttrs stdenv.cc.isClang {
|
||||
# fixes: error: 'sprintf' is deprecated: This function is provided for compatibility reasons only.
|
||||
NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations";
|
||||
};
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/vietjtnguyen/argagg";
|
||||
|
||||
@@ -12,14 +12,14 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "bvibratr";
|
||||
version = "1.0.0";
|
||||
version = "1.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sjaehn";
|
||||
repo = "BVibratr";
|
||||
tag = "v${finalAttrs.version}";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "sha256-bm4RKyLPR5WL52wXJ8w4YUZ1t9WoqYAw5ApMASVmiAQ=";
|
||||
sha256 = "sha256-V3cy+JlpBjCYr4eyrr9fTuaA7bmi8A2SP5KA4o1qQDU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
@@ -15,13 +15,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "ccid";
|
||||
version = "1.7.0";
|
||||
version = "1.7.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "LudovicRousseau";
|
||||
repo = "CCID";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-6eaznSIQZl1bpIe1F9EtwotF9BjOruJ9g/c2QrTgfUg=";
|
||||
hash = "sha256-5GkpsrjGFfiGDNIhU9zsx0p7/MSVra1fse9yFhjGSFU=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -11,14 +11,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication {
|
||||
pname = "chirp";
|
||||
version = "0.4.0-unstable-2026-03-03";
|
||||
version = "0.4.0-unstable-2026-03-11";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kk7ds";
|
||||
repo = "chirp";
|
||||
rev = "60f3edae35afe0b9542c8ef2eef047d6d42211ac";
|
||||
hash = "sha256-b2dAb8RjV2X+j13tcCvmq0Nn0Xp5l6GNGPLRC/KMVao=";
|
||||
rev = "74e1075fd884d30837e78fc3212984a508c124a3";
|
||||
hash = "sha256-Z2z2p0It13JFAFQAa4BDICeF4P9JfMneO4fLKioa1yg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -19,14 +19,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "cine";
|
||||
version = "1.0.9";
|
||||
version = "1.1.0";
|
||||
pyproject = false;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "diegopvlk";
|
||||
repo = "Cine";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-aw+M1wCGSbRRmKKcgyM4luEr0WtPLw/v7SqBE1B5H9U=";
|
||||
hash = "sha256-vkK/6EmbER/xp8Uk5aCqHNIUVroZeXN/pcBjB2Hyifs=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "codecrafters-cli";
|
||||
version = "52";
|
||||
version = "53";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "codecrafters-io";
|
||||
repo = "cli";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-RgKqZ9C3aK2N3gjeX1qvLtojO8Y+jik+HrOO9UlpSvo=";
|
||||
hash = "sha256-LuMLYupL6OgWujJzH/gu3VRI24LjmqOwPOP2ROGcjlk=";
|
||||
# A shortened git commit hash is part of the version output, and is
|
||||
# needed at build time. Use the `.git` directory to retrieve the
|
||||
# commit SHA, and remove the directory afterwards since it is not needed
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "deck";
|
||||
version = "1.55.2";
|
||||
version = "1.56.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Kong";
|
||||
repo = "deck";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-d8klm5pac6hINuiQhOMItSZx+lIVPwZEe+bpiMCiefk=";
|
||||
hash = "sha256-F57BuEU91wRLVaA4YYHyqCKdBL60ZiHEAyuuioLN66c=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
@@ -28,7 +28,7 @@ buildGoModule (finalAttrs: {
|
||||
];
|
||||
|
||||
proxyVendor = true; # darwin/linux hash mismatch
|
||||
vendorHash = "sha256-eGL42rfNnrc9vSUEZd7xilXO+8O7RffajeLkFF9S+xI=";
|
||||
vendorHash = "sha256-joVAsg714Nuizv1fYYMes7vGsWbIvmUPKRDuU/Hwyso=";
|
||||
|
||||
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
|
||||
installShellCompletion --cmd deck \
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "dinit";
|
||||
version = "0.20.0";
|
||||
version = "0.21.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "davmac314";
|
||||
@@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
postFetch = ''
|
||||
[ -f "$out/BUILD" ] && rm "$out/BUILD"
|
||||
'';
|
||||
hash = "sha256-71BUjguKt9Ow5n2olnIaTtOJJ/Bap50SJ3HD+91Rj6s=";
|
||||
hash = "sha256-PkriMQrvmBCZsReATcHBkHu9AJQDSvjctPAifseuJGI=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -8,18 +8,18 @@
|
||||
|
||||
php.buildComposerProject2 (finalAttrs: {
|
||||
pname = "drupal";
|
||||
version = "11.3.3";
|
||||
version = "11.3.5";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "git.drupalcode.org";
|
||||
owner = "project";
|
||||
repo = "drupal";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-QD/vk19OLrI8whxZ9dJROL/v90U4QuCfeONs0OX4qS4=";
|
||||
hash = "sha256-h01wI6EcVwynXVYUJDokG0rS0I7SxDfu1/sNFan96Og=";
|
||||
};
|
||||
|
||||
composerNoPlugins = false;
|
||||
vendorHash = "sha256-YsNg5l72htLoJgBhQ+RYxWYK5nB5Nq7Js6tf8L+BE7E=";
|
||||
vendorHash = "sha256-R/9F7JGMlTnque6Ip5NTN8alKdIUr1+Zyds2ks2sEko=";
|
||||
|
||||
passthru = {
|
||||
tests = {
|
||||
|
||||
@@ -38,9 +38,9 @@ let
|
||||
# However, the version string is more useful for end-users.
|
||||
# These are contained in a attrset of their own to make it obvious that
|
||||
# people should update both.
|
||||
version = "1.36.2";
|
||||
rev = "dc2d3098ae5641555f15c71d5bb5ce0060a8015c";
|
||||
hash = "sha256-ll7gn3y2dUW3kMtbUTjfi7ZTviE87S30ptiRlCPec9Q=";
|
||||
version = "1.36.5";
|
||||
rev = "41749943780b54b70b510b1b1a4805ae529e174a";
|
||||
hash = "sha256-dT6ehfmW/huuyitqIlYAlEzUE6WrVA39sDKxatkZGaY=";
|
||||
};
|
||||
|
||||
# these need to be updated for any changes to fetchAttrs
|
||||
@@ -49,8 +49,8 @@ let
|
||||
depsHash
|
||||
else
|
||||
{
|
||||
x86_64-linux = "sha256-CUWT2EIHG9vWo4aUbA18SpYn2HTa9haWNo7lGLN8ihw=";
|
||||
aarch64-linux = "sha256-bdFQlvBi7UG2oV8h74geNZbDQCXh+4oIQxD8JNtpWf4=";
|
||||
x86_64-linux = "sha256-ty429bQBZRNKMWsjUUv07ICrq5d4FjR1zjtO+nbbqiA=";
|
||||
aarch64-linux = "sha256-59sY+bpGsKMDthcj+jw00WhN+vsP5MOTXy0m8HJxebM=";
|
||||
}
|
||||
.${stdenv.system} or (throw "unsupported system ${stdenv.system}");
|
||||
|
||||
|
||||
@@ -20,20 +20,20 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
# the Equicord repository. Dates as tags (and automatic releases) were the compromise
|
||||
# we came to with upstream. Please do not change the version schema (e.g., to semver)
|
||||
# unless upstream changes the tag schema from dates.
|
||||
version = "2026-03-03";
|
||||
version = "2026-03-11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Equicord";
|
||||
repo = "Equicord";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-JGzzT0HXkopUVocgtz3cSQBD69W+PPFZqWrfJth12uo=";
|
||||
hash = "sha256-bx0zXbkXBzxB56yvR9Svuwm0Ci8NBdT+7kS5idOD4E4=";
|
||||
};
|
||||
|
||||
pnpmDeps = fetchPnpmDeps {
|
||||
inherit (finalAttrs) pname version src;
|
||||
pnpm = pnpm_10;
|
||||
fetcherVersion = 3;
|
||||
hash = "sha256-4mpqjkCCCjzNpLns6Q3TDBqf29wg0jooRnz8nnJRlN4=";
|
||||
hash = "sha256-jG9A/nIU8pU8c5JT/fLJn3M6EJf2vB+pm5LdrvAr22M=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -10,10 +10,10 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "2.8.1";
|
||||
srcHash = "sha256-TuXkG54ohsfHMw1VXsYnepZkMx1ZbMHaog+XPxN5F+8=";
|
||||
vendorHash = "sha256-nzNVH4Vm1p7PwtOqej+RfgjpONpxCrZdqjY6x3f/uog=";
|
||||
manifestsHash = "sha256-qo0szujGP2eL48KYjnft2Iu95Y/uH2/bSNETvnpVGYE=";
|
||||
version = "2.8.2";
|
||||
srcHash = "sha256-2UBnOtTdYkzHioGUHtAd0vwqpCouk/uaNvYmjmwc4F0=";
|
||||
vendorHash = "sha256-W6Vgvb4pPexHxx7t8IIfBWyC3c5jUr9KxaR8k5QUUpw=";
|
||||
manifestsHash = "sha256-mYIn7tzsKmx9Wx2WCrztyD3IVLI3pF7robv25HPiCx4=";
|
||||
|
||||
manifests = fetchzip {
|
||||
url = "https://github.com/fluxcd/flux2/releases/download/v${version}/manifests.tar.gz";
|
||||
|
||||
@@ -20,13 +20,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fzf-git-sh";
|
||||
version = "0-unstable-2026-01-31";
|
||||
version = "0-unstable-2026-03-10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "junegunn";
|
||||
repo = "fzf-git.sh";
|
||||
rev = "34cd6c9d315d9b59b94721bd602c5769e919d686";
|
||||
hash = "sha256-9xa7th5qC1ZtZ8VYTEgYNqoCk6dIII4OvsCcrG8vuyc=";
|
||||
rev = "52e3f704767f6cf1dad557220e077fbb40162349";
|
||||
hash = "sha256-4dR3bF4iKXZGWwr3FfmGqflhghdBB02EoVgjPu97mAk=";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "gat";
|
||||
version = "0.26.2";
|
||||
version = "0.27.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "koki-develop";
|
||||
repo = "gat";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-qg6X02MgtK97tY5G74gojHu6mD8qEEWPotep985grsA=";
|
||||
hash = "sha256-xydy+iKBfO1np/jtzWHFNUmXqb545ldWtwqMymaah2c=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-0kNtZOTpWpeFVyRHFIf6ybM7gAWb5/JWVljm0FO5fK8=";
|
||||
|
||||
@@ -18,7 +18,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/4ian/GDevelop/releases/download/v${version}/GDevelop-5-${version}-universal-mac.zip";
|
||||
hash = "sha256-kTqFfLk3TWITM5DVa8rMZoezq/Yct9wkyofZbUl2SBQ=";
|
||||
hash = "sha256-BU6TGKFUWyeDELFlKch2j+Y80LIenOqblQjNWfznS1Q=";
|
||||
};
|
||||
|
||||
sourceRoot = ".";
|
||||
|
||||
@@ -13,7 +13,7 @@ let
|
||||
if stdenv.hostPlatform.system == "x86_64-linux" then
|
||||
fetchurl {
|
||||
url = "https://github.com/4ian/GDevelop/releases/download/v${version}/GDevelop-5-${version}.AppImage";
|
||||
hash = "sha256-Vg1uovP3gY3EQ0GNg/2dx8Uwj080Gf6YTHyu6OnZGNg=";
|
||||
hash = "sha256-Osp66w64jxxuQf0AS4jK8kOI4ti6+Yz/YwIE2eccJm8=";
|
||||
}
|
||||
else
|
||||
throw "${pname}-${version} is not supported on ${stdenv.hostPlatform.system}";
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
callPackage,
|
||||
}:
|
||||
let
|
||||
version = "5.6.260";
|
||||
version = "5.6.261";
|
||||
pname = "gdevelop";
|
||||
meta = {
|
||||
description = "Graphical Game Development Studio";
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "gh-dash";
|
||||
version = "4.23.0";
|
||||
version = "4.23.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dlvhdr";
|
||||
repo = "gh-dash";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-MkZ3HfJ+lt05fNKCb6Xpi+x30ZtgapPcoXvGhq8nj6k=";
|
||||
hash = "sha256-C06LPVoE23ITJpMG0x75Djgeup+eb5uYwA8wL7xxvWU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-4AbeoH0l7eIS7d0yyJxM7+woC7Q/FCh0BOJj3d1zyX4=";
|
||||
|
||||
@@ -9,14 +9,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication (finalAttrs: {
|
||||
pname = "git-machete";
|
||||
version = "3.39.0";
|
||||
version = "3.39.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "virtuslab";
|
||||
repo = "git-machete";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-A523zHMckOLAQJzYBWoFSxummR8tuaMbGTy3bz4aHs8=";
|
||||
hash = "sha256-jk/IWF2+uC+LybBlTRuh0Sc8+KHyLzLxoswFvAZnEMU=";
|
||||
};
|
||||
|
||||
build-system = with python3.pkgs; [ setuptools ];
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "github-mcp-server";
|
||||
version = "0.31.0";
|
||||
version = "0.33.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "github";
|
||||
repo = "github-mcp-server";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-7vcDkN0q/bNr2dHQgM4YzmQjDjMyLLtkbdBjhmUM1/4=";
|
||||
hash = "sha256-FNSwZTz0RDP/BH2k66SBridiAZwAtuKsZaQgb/2jScA=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-zxisK5o2zqeAkQEPKd1w8rFXoJsDB4VNEdD27uos250=";
|
||||
vendorHash = "sha256-q21hnMnWOzfg7BGDl4KM1I3v0wwS5sSxzLA++L6jO4s=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "gokapi";
|
||||
version = "2.2.3";
|
||||
version = "2.2.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Forceu";
|
||||
repo = "Gokapi";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-v4MgpnKFrxDUOerc7+3N6PjhlZZgGcOHOGwbZi6zpds=";
|
||||
hash = "sha256-N9rV8/IJy4eMwdXXh+7z3raPcalSFUWP7EwN84tfbk8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-oZyZD4kPqgSIaphXRyXVzY+8gYd7kpWAAo1cfiE1ln8=";
|
||||
|
||||
@@ -7,18 +7,18 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "google-alloydb-auth-proxy";
|
||||
version = "1.13.11";
|
||||
version = "1.14.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "GoogleCloudPlatform";
|
||||
repo = "alloydb-auth-proxy";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-yumoStHsqICOYN9p6EY6L/GOG6g07fVO7Lyy4gkU7N4=";
|
||||
hash = "sha256-M2eYpTmDFnZTq0eQ79VziBzNgyLsdXigqRj+zlSdUvg=";
|
||||
};
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
vendorHash = "sha256-hFxTDVd/iFVSTRp9hIADe33YIjGYGYlUWBgB9Ff3Oiw=";
|
||||
vendorHash = "sha256-z16WjUpN3BZSQajAvJYF0SlrVdj7L7e4kugjTFpRJnM=";
|
||||
|
||||
checkFlags = [
|
||||
"-short"
|
||||
|
||||
@@ -1,9 +1,10 @@
|
||||
{
|
||||
lib,
|
||||
autoAddDriverRunpath,
|
||||
config,
|
||||
cudaPackages,
|
||||
fetchFromGitHub,
|
||||
lib,
|
||||
nix-update-script,
|
||||
}:
|
||||
let
|
||||
inherit (lib.lists) last map optionals;
|
||||
@@ -20,15 +21,15 @@ let
|
||||
in
|
||||
backendStdenv.mkDerivation {
|
||||
pname = "gpu-burn";
|
||||
version = "0-unstable-2024-04-09";
|
||||
version = "0-unstable-2025-11-04";
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wilicc";
|
||||
repo = "gpu-burn";
|
||||
rev = "9aefd7c0cc603bbc8c3c102f5338c6af26f8127c";
|
||||
hash = "sha256-Nz0yaoHGfodaYl2HJ7p+1nasqRmxwPJ9aL9oxitXDpM=";
|
||||
rev = "671f4be92477ce01cd9b536bc534a006dbee058f";
|
||||
hash = "sha256-zaGzwpdvF9dw3RypBO+g6FhjOFN8/F9+yI1+lLxLjgs=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@@ -69,6 +70,10 @@ backendStdenv.mkDerivation {
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script {
|
||||
extraArgs = [ "--version=branch" ];
|
||||
};
|
||||
|
||||
# NOTE: Certain packages may be missing from cudaPackages on non-Linux platforms. To avoid evaluation failure,
|
||||
# we only include the platforms where we know the package is available -- thus the conditionals setting the
|
||||
# platforms and badPlatforms fields.
|
||||
@@ -79,7 +84,10 @@ backendStdenv.mkDerivation {
|
||||
homepage = "http://wili.cc/blog/gpu-burn.html";
|
||||
license = lib.licenses.bsd2;
|
||||
mainProgram = "gpu_burn";
|
||||
maintainers = with lib.maintainers; [ connorbaker ];
|
||||
maintainers = with lib.maintainers; [
|
||||
GaetanLepage
|
||||
connorbaker
|
||||
];
|
||||
platforms = optionals cudaSupport lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -15,16 +15,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "hail";
|
||||
version = "0.3.0";
|
||||
version = "0.4.0";
|
||||
|
||||
src = fetchFromCodeberg {
|
||||
owner = "periwinkle";
|
||||
repo = "hail";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-PpZfOC4M6XNcdAWd2E8ONruOq9yOTRutjKi86mmoxAo=";
|
||||
hash = "sha256-pPhbeZKNH5iKv4y34zKRmDIwLhmogaHIJJ00sZvHzHs=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-+zxoICy3lrS+7fZU0yD1C4uKRj/JtDvizKla1xmz+PY=";
|
||||
cargoHash = "sha256-TlxNHIpweWqRtoCblwUBS3RJM7vItORV8uYr4T3U37k=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
||||
@@ -5,10 +5,10 @@
|
||||
}:
|
||||
let
|
||||
pname = "heptabase";
|
||||
version = "1.84.3";
|
||||
version = "1.85.1";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/heptameta/project-meta/releases/download/v${version}/Heptabase-${version}.AppImage";
|
||||
hash = "sha256-ddkNmKWORgIeX7jkskP4f386Imp9CX3q7Kbe+SEGTpQ=";
|
||||
hash = "sha256-GdX38JTFn3p2rqDygulYut2mCYZY41xm0q2n2/EIiOw=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extractType2 { inherit pname version src; };
|
||||
|
||||
@@ -8,22 +8,22 @@
|
||||
|
||||
let
|
||||
pname = "hoppscotch";
|
||||
version = "26.2.0-0";
|
||||
version = "26.2.1-0";
|
||||
|
||||
src =
|
||||
fetchurl
|
||||
{
|
||||
aarch64-darwin = {
|
||||
url = "https://github.com/hoppscotch/releases/releases/download/v${version}/Hoppscotch_mac_aarch64.dmg";
|
||||
hash = "sha256-aSllZvfdx80MnqA7EyhaRoMWewtKg0mW53VRC9ITBnI=";
|
||||
hash = "sha256-F9kEa1trZKm2sUs5JMQY8lwkM+Vs0SFGd5NGbrmythQ=";
|
||||
};
|
||||
x86_64-darwin = {
|
||||
url = "https://github.com/hoppscotch/releases/releases/download/v${version}/Hoppscotch_mac_x64.dmg";
|
||||
hash = "sha256-KpIfbgWlbPD09NgJd8jh6zhGB2GhWTM9C/Ko8AWtmKw=";
|
||||
hash = "sha256-jxqYV3OsfJljfFi5PeMD/rOnpuuEJ0+08lozjCTZlOc=";
|
||||
};
|
||||
x86_64-linux = {
|
||||
url = "https://github.com/hoppscotch/releases/releases/download/v${version}/Hoppscotch_linux_x64.AppImage";
|
||||
hash = "sha256-Dhj8FpRTUZineAIKYLHPzr7AiArce/Un+HfJ4PbjfSg=";
|
||||
hash = "sha256-PiFcLAAXvR1GlIAeKlK066NE/bCCpLqJ32tVEY/VZ1s=";
|
||||
};
|
||||
}
|
||||
.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
|
||||
|
||||
@@ -16,16 +16,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "hyprwhspr-rs";
|
||||
version = "0.3.22";
|
||||
version = "0.3.23";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "better-slop";
|
||||
repo = "hyprwhspr-rs";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-82sVGwzlzEAuIoot/bFwdVLP6d9CEoVuoba4wWohj8w=";
|
||||
hash = "sha256-O4mb7pIdhu6D9zJNm/1MKh3YO7WIGYtHM4IAPRFLDSY=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-6LxzFrBZbV+d4QeZPB1Ija4D5CWbeVg5ayKGXTB3x6c=";
|
||||
cargoHash = "sha256-f1aXLMzAzdUhQw6eK0wuWO19HAg2iJgo+Im9Oto+VO4=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "inori";
|
||||
version = "0.2.6";
|
||||
version = "0.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "eshrh";
|
||||
repo = "inori";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-U1fNLqJYtTJK0WZ0sO7DADVDRPSik5vuE78zGnJt15A=";
|
||||
hash = "sha256-Kd04NXv07zJgvvJi+Fx4jbXmip++A2K7KPfEt3Fdkbs=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-EfRSFxu/F+ltkx3uQ353CRlMrZN4PbmFdcw7H9Tm3ss=";
|
||||
cargoHash = "sha256-MlANGTStN1Z82eyFzWTwc678k0irlYuPf+i5fAES6v4=";
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
|
||||
@@ -7,14 +7,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "isd";
|
||||
version = "0.6.1";
|
||||
version = "0.6.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kainctl";
|
||||
repo = "isd";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-MEfjE0zRxSuBwBkjAz9cKhodS+I4CjjtuvbO+WwL9SM=";
|
||||
hash = "sha256-aIVZvsmIZRHKg7267wxWzmcwAqleu4i7z5GHSNJi260=";
|
||||
};
|
||||
|
||||
build-system = with python3Packages; [
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
let
|
||||
pname = "jai";
|
||||
minor = "2";
|
||||
patch = "025";
|
||||
patch = "026";
|
||||
version = "0.${minor}.${patch}";
|
||||
zipName = "jai-beta-${minor}-${patch}.zip";
|
||||
jai = stdenv.mkDerivation {
|
||||
@@ -20,7 +20,7 @@ let
|
||||
nix-store --add-fixed sha256 ${zipName}
|
||||
'';
|
||||
name = zipName;
|
||||
sha256 = "sha256-pr43599kdVne9USVvb9p35SYQk2zkT03pO66UGl9IuQ=";
|
||||
sha256 = "sha256-iWPMVGzcDlR3cP4ruPZJBAAdvFLZeM8+pCxbsSk2ZLw=";
|
||||
};
|
||||
nativeBuildInputs = [ unzip ];
|
||||
buildCommand = "unzip $src -d $out";
|
||||
|
||||
@@ -43,7 +43,9 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
mkdir -p $out/share/jpsxdec
|
||||
mv _ant/release/{doc,*.jar} $out/share/jpsxdec
|
||||
install -Dm644 src/jpsxdec/gui/icon48.png $out/share/pixmaps/jpsxdec.png
|
||||
install -Dm644 src/jpsxdec/gui/icon16.png $out/share/icons/hicolor/16x16/apps/jpsxdec.png
|
||||
install -Dm644 src/jpsxdec/gui/icon32.png $out/share/icons/hicolor/32x32/apps/jpsxdec.png
|
||||
install -Dm644 src/jpsxdec/gui/icon48.png $out/share/icons/hicolor/48x48/apps/jpsxdec.png
|
||||
|
||||
makeWrapper ${jre}/bin/java $out/bin/jpsxdec \
|
||||
--add-flags "-jar $out/share/jpsxdec/jpsxdec.jar"
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "korrect";
|
||||
version = "0.3.6";
|
||||
version = "0.3.7";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit (finalAttrs) pname version;
|
||||
hash = "sha256-w+XO3KMzXAssleH/Zs8dpZxG7w4hQRsoxMQLORjv1fA=";
|
||||
hash = "sha256-qpjpdP0KeuwF5XhnlkrKcXJ4puHNpt/7SrIFOnFjGNA=";
|
||||
};
|
||||
cargoHash = "sha256-uLRFXzTyoZw9H4qEkH6/B+/zE+YQc9yp5LIJRheB5/k=";
|
||||
cargoHash = "sha256-1k2I8R5H4UGYf7rc9r2SwMwrA2F7PlECbsCco731beQ=";
|
||||
|
||||
# Tests create a local http server to check the download functionality
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
@@ -23,13 +23,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "kubernetes";
|
||||
version = "1.35.0";
|
||||
version = "1.35.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kubernetes";
|
||||
repo = "kubernetes";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-AT1/4RhnVK/mAoNVqPIfSwbzD8VNRqKumOpE0fidJ74=";
|
||||
hash = "sha256-cmR5ugxeBC0RsrvQ38zK6/5QGptAfTk6bXo53XHkU2s=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@@ -23,14 +23,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "librelane";
|
||||
version = "3.0.0rc0";
|
||||
version = "3.0.0rc1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "librelane";
|
||||
repo = "librelane";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-YG1/Exm1sXqydBvXQcSvRH3DcJbBMxu4P/AHytu9JMI=";
|
||||
hash = "sha256-oEMybXxnOyCbUEsJWtBMuV+6XSg9Y8wKrbR9pm/GI5U=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -51,24 +51,21 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
# --with-systemdsystemunitdir
|
||||
# https://sourceforge.net/p/lirc/tickets/385/
|
||||
./ubuntu.diff
|
||||
|
||||
# fix overriding PYTHONPATH
|
||||
./pythonpath.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs .
|
||||
|
||||
# fix overriding PYTHONPATH
|
||||
sed -i 's,^PYTHONPATH *= *,PYTHONPATH := $(PYTHONPATH):,' \
|
||||
Makefile.in
|
||||
sed -i 's,PYTHONPATH=,PYTHONPATH=$(PYTHONPATH):,' \
|
||||
doc/Makefile.in
|
||||
|
||||
# Pull fix for new pyyaml pending upstream inclusion
|
||||
# https://sourceforge.net/p/lirc/git/merge-requests/39/
|
||||
substituteInPlace python-pkg/lirc/database.py --replace 'yaml.load(' 'yaml.safe_load('
|
||||
substituteInPlace python-pkg/lirc/database.py \
|
||||
--replace-fail 'yaml.load(' 'yaml.safe_load('
|
||||
|
||||
# cant import '/build/lirc-0.10.1/python-pkg/lirc/_client.so' while cross-compiling to check the version
|
||||
substituteInPlace python-pkg/setup.py \
|
||||
--replace "VERSION='0.0.0'" "VERSION='${finalAttrs.version}'"
|
||||
substituteInPlace systemd/*.service \
|
||||
--replace-fail "ExecStart=/usr/" "ExecStart=''${!outputBin}/"
|
||||
'';
|
||||
|
||||
preConfigure = ''
|
||||
@@ -112,6 +109,30 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
"localstatedir=$TMPDIR"
|
||||
];
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
"man"
|
||||
"doc"
|
||||
"dev"
|
||||
# This is the output referenced by dependent packages most of the time.
|
||||
# $out on the other hand contains files used by direct users of lirc -
|
||||
# systemd units, binaries, shell scripts & lirc python package. Since
|
||||
# Nixpkgs' stdenv puts by default python libraries in $lib, this causes a
|
||||
# cyclic reference between $out and $lib. We solve this by moving the
|
||||
# Python library to $out in postFixup below. Since the Python library is
|
||||
# also strongly related to the direct usage of lirc (and not only linking
|
||||
# to the libraries of it), this makes sense anyway.
|
||||
"lib"
|
||||
];
|
||||
|
||||
postFixup = ''
|
||||
moveToOutput "${python3.sitePackages}" "$out"
|
||||
# $out/bin/lirc-setup is symlinked to $lib/''${python3.sitePackages}, so it
|
||||
# has to be fixed due to the above.
|
||||
rm $out/bin/lirc-setup
|
||||
ln -s $out/${python3.sitePackages}/lirc-setup/lirc-setup $out/bin/lirc-setup
|
||||
'';
|
||||
|
||||
# Upstream ships broken symlinks in docs
|
||||
dontCheckForBrokenSymlinks = true;
|
||||
|
||||
|
||||
@@ -0,0 +1,13 @@
|
||||
diff --git i/Makefile.in w/Makefile.in
|
||||
index d039ed3e9d6a..c40e6eac56ae 100644
|
||||
--- i/Makefile.in
|
||||
+++ w/Makefile.in
|
||||
@@ -493,7 +493,7 @@ AUTOMAKE_OPTIONS = 1.5 check-news dist-bzip2 -Wno-portability \
|
||||
|
||||
PYTHONPATH1 = $(abs_top_srcdir)/python-pkg/lirc:
|
||||
PYTHONPATH2 = $(abs_top_srcdir)/python-pkg/lirc/lib/.libs
|
||||
-PYTHONPATH = $(PYTHONPATH1):$(PYTHONPATH2)
|
||||
+PYTHONPATH := $(PYTHONPATH):$(PYTHONPATH1):$(PYTHONPATH2)
|
||||
PYLINT = python3-pylint
|
||||
pylint_template = {path}:{line}: [{msg_id}({symbol}), {obj}] {msg}
|
||||
GIT_COMMIT = $(shell git log -1 --pretty=format:%h || echo UNKNOWN)
|
||||
@@ -62,11 +62,14 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
}
|
||||
}
|
||||
cp -r opt $out
|
||||
mkdir -p $out/bin $out/share/pixmaps $out/share/applications
|
||||
mkdir -p $out/bin $out/share/applications $out/share/icons/hicolor/{128x128,256x256}/apps
|
||||
for name in LicenseManager MarvinSketch MarvinView; do
|
||||
wrapBin $out/opt/chemaxon/marvinsuite/$name
|
||||
ln -s {$out/opt/chemaxon/marvinsuite/.install4j,$out/share/pixmaps}/$name.png
|
||||
done
|
||||
ln -s $out/opt/chemaxon/marvinsuite/.install4j/MarvinSketch.png $out/share/icons/hicolor/128x128/apps
|
||||
ln -s $out/opt/chemaxon/marvinsuite/.install4j/MarvinView.png $out/share/icons/hicolor/128x128/apps
|
||||
ln -s $out/opt/chemaxon/marvinsuite/.install4j/LicenseManager.png $out/share/icons/hicolor/256x256/apps
|
||||
|
||||
for name in cxcalc cxtrain evaluate molconvert mview msketch; do
|
||||
wrapBin $out/opt/chemaxon/marvinsuite/bin/$name
|
||||
done
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
fetchFromGitHub,
|
||||
ldap3,
|
||||
ldaptor,
|
||||
matrix-synapse-unwrapped,
|
||||
@@ -14,19 +14,16 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "matrix-synapse-ldap3";
|
||||
version = "0.3.0";
|
||||
version = "0.4.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-i7ZRcXMWTUucxE9J3kEdjOvbLnBdXdHqHzhzPEoAnh0=";
|
||||
src = fetchFromGitHub {
|
||||
owner = "matrix-org";
|
||||
repo = "matrix-synapse-ldap3";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-d3TRtPEhyc45dj7k2TpJlBn8fZgKFDZxocKdfAoeI2w=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# https://github.com/matrix-org/matrix-synapse-ldap3/pull/200
|
||||
./setuptools-pkg_resources.patch
|
||||
];
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [
|
||||
|
||||
@@ -1,24 +0,0 @@
|
||||
From a879613c79861597525cdbab0d53dc4672c9a5a1 Mon Sep 17 00:00:00 2001
|
||||
From: Timotheus Pokorra <mailinglists@tpokorra.de>
|
||||
Date: Wed, 11 Feb 2026 06:54:10 +0100
|
||||
Subject: [PATCH] Replace pkg_resources.parse_version with
|
||||
packaging.version.parse
|
||||
|
||||
fixes #199
|
||||
---
|
||||
ldap_auth_provider.py | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/ldap_auth_provider.py b/ldap_auth_provider.py
|
||||
index 25dd81b..1f1c9ef 100644
|
||||
--- a/ldap_auth_provider.py
|
||||
+++ b/ldap_auth_provider.py
|
||||
@@ -21,7 +21,7 @@
|
||||
import ldap3
|
||||
import ldap3.core.exceptions
|
||||
import synapse
|
||||
-from pkg_resources import parse_version
|
||||
+from packaging.version import parse as parse_version
|
||||
from synapse.module_api import ModuleApi
|
||||
from synapse.types import JsonDict
|
||||
from twisted.internet import threads
|
||||
@@ -12,14 +12,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "mistral-vibe";
|
||||
version = "2.4.1";
|
||||
version = "2.4.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mistralai";
|
||||
repo = "mistral-vibe";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-iAW+ndHgODTrDOuF5DByiVvk+sHDRj7QTm1gOTSqc2I=";
|
||||
hash = "sha256-r/9kMhkoLfj9oEifFun/bpIQYEouqm9YEiWZVk07+S8=";
|
||||
};
|
||||
|
||||
build-system = with python3Packages; [
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "moor";
|
||||
version = "2.11.0";
|
||||
version = "2.11.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "walles";
|
||||
repo = "moor";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-sfeYr3lf9QvRb9TfVQSe1IU8/uX4ypw2CCQmyWMhPqw=";
|
||||
hash = "sha256-ldrXHJN9u+S0ogxmaJU6yqygL/f+cHPr0enOeqYy+EU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-lz3cq2xL9byhLNbAwEvYOsP9WQsu0hqrWe2EDaLSeOQ=";
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 1780f874..3ac02be6 100644
|
||||
index 6c1747f3..ab69cf5e 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -140,7 +140,7 @@ target_link_libraries(
|
||||
@@ -158,7 +158,7 @@ target_link_libraries(
|
||||
lodepng
|
||||
qhullstatic_r
|
||||
tinyobjloader
|
||||
@@ -12,10 +12,10 @@ index 1780f874..3ac02be6 100644
|
||||
|
||||
set_target_properties(
|
||||
diff --git a/cmake/MujocoDependencies.cmake b/cmake/MujocoDependencies.cmake
|
||||
index 5cdc33cb..a4c9f61f 100644
|
||||
index d2404bc1..5c7ddaf6 100644
|
||||
--- a/cmake/MujocoDependencies.cmake
|
||||
+++ b/cmake/MujocoDependencies.cmake
|
||||
@@ -93,8 +93,6 @@ set(BUILD_SHARED_LIBS
|
||||
@@ -87,8 +87,6 @@ set(BUILD_SHARED_LIBS
|
||||
if(NOT TARGET lodepng)
|
||||
FetchContent_Declare(
|
||||
lodepng
|
||||
@@ -24,7 +24,7 @@ index 5cdc33cb..a4c9f61f 100644
|
||||
)
|
||||
|
||||
FetchContent_GetProperties(lodepng)
|
||||
@@ -113,8 +111,6 @@ endif()
|
||||
@@ -111,8 +109,6 @@ endif()
|
||||
if(NOT TARGET marchingcubecpp)
|
||||
FetchContent_Declare(
|
||||
marchingcubecpp
|
||||
@@ -33,7 +33,7 @@ index 5cdc33cb..a4c9f61f 100644
|
||||
)
|
||||
|
||||
FetchContent_GetProperties(marchingcubecpp)
|
||||
@@ -130,13 +126,9 @@ findorfetch(
|
||||
@@ -132,13 +128,9 @@ findorfetch(
|
||||
USE_SYSTEM_PACKAGE
|
||||
OFF
|
||||
PACKAGE_NAME
|
||||
@@ -48,7 +48,7 @@ index 5cdc33cb..a4c9f61f 100644
|
||||
TARGETS
|
||||
qhull
|
||||
EXCLUDE_FROM_ALL
|
||||
@@ -157,12 +149,8 @@ findorfetch(
|
||||
@@ -160,12 +152,8 @@ findorfetch(
|
||||
tinyxml2
|
||||
LIBRARY_NAME
|
||||
tinyxml2
|
||||
@@ -62,7 +62,7 @@ index 5cdc33cb..a4c9f61f 100644
|
||||
EXCLUDE_FROM_ALL
|
||||
)
|
||||
target_compile_options(tinyxml2 PRIVATE ${MUJOCO_MACOS_COMPILE_OPTIONS})
|
||||
@@ -175,10 +163,6 @@ findorfetch(
|
||||
@@ -183,10 +171,6 @@ findorfetch(
|
||||
tinyobjloader
|
||||
LIBRARY_NAME
|
||||
tinyobjloader
|
||||
@@ -73,16 +73,7 @@ index 5cdc33cb..a4c9f61f 100644
|
||||
TARGETS
|
||||
tinyobjloader
|
||||
EXCLUDE_FROM_ALL
|
||||
@@ -187,8 +171,6 @@ findorfetch(
|
||||
if(NOT TARGET trianglemeshdistance)
|
||||
FetchContent_Declare(
|
||||
trianglemeshdistance
|
||||
- GIT_REPOSITORY https://github.com/InteractiveComputerGraphics/TriangleMeshDistance.git
|
||||
- GIT_TAG ${MUJOCO_DEP_VERSION_TriangleMeshDistance}
|
||||
)
|
||||
|
||||
FetchContent_GetProperties(trianglemeshdistance)
|
||||
@@ -207,10 +189,6 @@ findorfetch(
|
||||
@@ -216,10 +200,6 @@ findorfetch(
|
||||
ccd
|
||||
LIBRARY_NAME
|
||||
ccd
|
||||
@@ -93,7 +84,7 @@ index 5cdc33cb..a4c9f61f 100644
|
||||
TARGETS
|
||||
ccd
|
||||
EXCLUDE_FROM_ALL
|
||||
@@ -247,10 +225,6 @@ if(MUJOCO_BUILD_TESTS)
|
||||
@@ -261,10 +241,6 @@ if(MUJOCO_BUILD_TESTS OR MUJOCO_BUILD_STUDIO OR MUJOCO_USE_FILAMENT)
|
||||
absl
|
||||
LIBRARY_NAME
|
||||
abseil-cpp
|
||||
@@ -104,7 +95,7 @@ index 5cdc33cb..a4c9f61f 100644
|
||||
TARGETS
|
||||
absl::core_headers
|
||||
EXCLUDE_FROM_ALL
|
||||
@@ -274,14 +248,9 @@ if(MUJOCO_BUILD_TESTS)
|
||||
@@ -291,14 +267,9 @@ if(MUJOCO_BUILD_TESTS)
|
||||
GTest
|
||||
LIBRARY_NAME
|
||||
googletest
|
||||
@@ -121,7 +112,7 @@ index 5cdc33cb..a4c9f61f 100644
|
||||
EXCLUDE_FROM_ALL
|
||||
)
|
||||
|
||||
@@ -308,10 +277,6 @@ if(MUJOCO_BUILD_TESTS)
|
||||
@@ -323,10 +294,6 @@ if(MUJOCO_BUILD_TESTS)
|
||||
benchmark
|
||||
LIBRARY_NAME
|
||||
benchmark
|
||||
@@ -132,7 +123,7 @@ index 5cdc33cb..a4c9f61f 100644
|
||||
TARGETS
|
||||
benchmark::benchmark
|
||||
benchmark::benchmark_main
|
||||
@@ -322,14 +287,12 @@ endif()
|
||||
@@ -337,14 +304,12 @@ endif()
|
||||
|
||||
if(MUJOCO_TEST_PYTHON_UTIL)
|
||||
add_compile_definitions(EIGEN_MPL2_ONLY)
|
||||
@@ -149,7 +140,7 @@ index 5cdc33cb..a4c9f61f 100644
|
||||
|
||||
FetchContent_GetProperties(Eigen3)
|
||||
diff --git a/python/mujoco/util/CMakeLists.txt b/python/mujoco/util/CMakeLists.txt
|
||||
index 666a3725..d89bb499 100644
|
||||
index 666a3725..8f4ce043 100644
|
||||
--- a/python/mujoco/util/CMakeLists.txt
|
||||
+++ b/python/mujoco/util/CMakeLists.txt
|
||||
@@ -63,8 +63,8 @@ if(BUILD_TESTING)
|
||||
@@ -185,19 +176,8 @@ index 666a3725..d89bb499 100644
|
||||
)
|
||||
gtest_add_tests(TARGET func_wrap_test SOURCES func_wrap_test.cc)
|
||||
|
||||
@@ -90,8 +90,8 @@ if(BUILD_TESTING)
|
||||
target_link_libraries(
|
||||
tuple_tools_test
|
||||
func_wrap
|
||||
- gmock
|
||||
- gtest_main
|
||||
+ GTest::gmock
|
||||
+ GTest::gtest_main
|
||||
)
|
||||
gtest_add_tests(TARGET tuple_tools_test SOURCES tuple_tools_test.cc)
|
||||
endif()
|
||||
diff --git a/simulate/cmake/SimulateDependencies.cmake b/simulate/cmake/SimulateDependencies.cmake
|
||||
index 5141406c..75ff7884 100644
|
||||
index 7885f5f9..97b8b783 100644
|
||||
--- a/simulate/cmake/SimulateDependencies.cmake
|
||||
+++ b/simulate/cmake/SimulateDependencies.cmake
|
||||
@@ -81,10 +81,6 @@ findorfetch(
|
||||
@@ -212,17 +192,17 @@ index 5141406c..75ff7884 100644
|
||||
glfw
|
||||
EXCLUDE_FROM_ALL
|
||||
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
|
||||
index a286a1c6..982f2e68 100644
|
||||
index f459a6ca..6830509d 100644
|
||||
--- a/test/CMakeLists.txt
|
||||
+++ b/test/CMakeLists.txt
|
||||
@@ -81,8 +81,8 @@ target_link_libraries(
|
||||
@@ -82,8 +82,8 @@ target_link_libraries(
|
||||
absl::synchronization
|
||||
absl::flat_hash_map
|
||||
absl::flat_hash_set
|
||||
- gtest
|
||||
- gmock
|
||||
+ GTest::gtest
|
||||
+ GTest::gmock
|
||||
+ GTest::gtest_main
|
||||
mujoco::mujoco
|
||||
)
|
||||
target_include_directories(fixture PRIVATE ${mujoco_SOURCE_DIR}/include gmock)
|
||||
|
||||
@@ -25,8 +25,8 @@ let
|
||||
benchmark = fetchFromGitHub {
|
||||
owner = "google";
|
||||
repo = "benchmark";
|
||||
rev = "5f7d66929fb66869d96dfcbacf0d8a586b33766d";
|
||||
hash = "sha256-G9jMWq8BxKvRGP4D2/tcogdLwmek4XGYESqepnZIlCw=";
|
||||
rev = "5c55f5d4f45a1b09c5d98aa63a671993ebd42c69";
|
||||
hash = "sha256-CChXn58cqam3d6Q61ZJMr5NFq1Ezc5uywA7FSPhk4GI=";
|
||||
};
|
||||
ccd = fetchFromGitHub {
|
||||
owner = "danfis";
|
||||
@@ -76,18 +76,12 @@ let
|
||||
rev = "f03a1b3ec29b1d7d865691ca8aea4f1eb2c2873d";
|
||||
hash = "sha256-90ei0lpJA8XuVGI0rGb3md0Qtq8/bdkU7dUCHpp88Bw=";
|
||||
};
|
||||
trianglemeshdistance = fetchFromGitHub {
|
||||
owner = "InteractiveComputerGraphics";
|
||||
repo = "TriangleMeshDistance";
|
||||
rev = "2cb643de1436e1ba8e2be49b07ec5491ac604457";
|
||||
hash = "sha256-qG/8QKpOnUpUQJ1nLj+DFoLnUr+9oYkJPqUhwEQD2pc=";
|
||||
};
|
||||
};
|
||||
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "mujoco";
|
||||
version = "3.5.0";
|
||||
version = "3.6.0";
|
||||
|
||||
# Bumping version? Make sure to look though the MuJoCo's commit
|
||||
# history for bumped dependency pins!
|
||||
@@ -95,7 +89,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
owner = "google-deepmind";
|
||||
repo = "mujoco";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-5i+QQIwu8olwsMaYvO8b1vLkOkA4jZVR0xcFMuieF5w=";
|
||||
hash = "sha256-Gxr8AH9grTjrMTHHOVseLuTC3rNuQEZRWhSvR4HgIc4=";
|
||||
};
|
||||
|
||||
patches = [ ./mujoco-system-deps-dont-fetch.patch ];
|
||||
@@ -146,10 +140,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
+ ''
|
||||
ln -s ${pin.tinyobjloader} build/_deps/tinyobjloader-src
|
||||
ln -s ${pin.tinyxml2} build/_deps/tinyxml2-src
|
||||
''
|
||||
# Mujoco's cmake apply a patch on the trianglemeshdistance source code. Requires write permission.
|
||||
+ ''
|
||||
cp -r ${pin.trianglemeshdistance} build/_deps/trianglemeshdistance-src
|
||||
ln -s ${pin.marchingcubecpp} build/_deps/marchingcubecpp-src
|
||||
'';
|
||||
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "nuclei";
|
||||
version = "3.7.0";
|
||||
version = "3.7.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "projectdiscovery";
|
||||
repo = "nuclei";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-MAOyMpcJsw4O+oC3IhEBF1XR6KSLBHhYZDnmNnwX4mo=";
|
||||
hash = "sha256-PiuFlEIEQNsVLLwHVDi+b/ABPyrp4+hnO6JjLGHxWc0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-XaRcVKFgsQnPngqmp7QIcx2jV7h51EafNlZjSd9lUIE=";
|
||||
vendorHash = "sha256-eevywU57QoA2K/Fl4XQZwaiyGCiGDrkvAdco6khcInc=";
|
||||
|
||||
proxyVendor = true; # hash mismatch between Linux and Darwin
|
||||
|
||||
|
||||
@@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
gpl2Plus
|
||||
lgpl21Plus
|
||||
];
|
||||
maintainers = with lib.maintainers; [ smironov ];
|
||||
maintainers = [ ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
})
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "ord";
|
||||
version = "0.26.0";
|
||||
version = "0.27.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ordinals";
|
||||
repo = "ord";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-9ElAq+1Bc3y+97rHIQqpDNm81aZzncgJMo2WvDuoUxc=";
|
||||
hash = "sha256-LP/Hgo7seXoNf0IHMpxd2euMmxH1usGCkuYMPmw6jn4=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-OIZgCTHGrPWyAD5is9FyDwt3DGwxCcr0gjfvzyZyRBE=";
|
||||
cargoHash = "sha256-qJhTh6nXVlZJ3kAZN2hrZ6XDrv1dk45nX6KRSQ1EbS4=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@@ -1,23 +1,23 @@
|
||||
{
|
||||
lib,
|
||||
buildGoModule,
|
||||
buildGo126Module,
|
||||
fetchFromGitHub,
|
||||
installShellFiles,
|
||||
testers,
|
||||
}:
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
buildGo126Module (finalAttrs: {
|
||||
pname = "ovhcloud-cli";
|
||||
version = "0.9.0";
|
||||
version = "0.10.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ovh";
|
||||
repo = "ovhcloud-cli";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-fX8pjFLXHeHKp1K7XlwLrP5ivz/Tjk8vsPIbqEAWbU8=";
|
||||
hash = "sha256-NBfMxXu5sZpv+OnoMCq4xc4AVQU+mbPrapVdq2Hffb8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-WNONEceR/cDVloosQ/BMYjPTk9elQ1oTX89lgzENSAI=";
|
||||
vendorHash = "sha256-JNnIpRr4zdGtlOOKGf1bQVViMgjnwGBAmYbFcCpzStY=";
|
||||
|
||||
env.CGO_ENABLED = 0;
|
||||
|
||||
|
||||
@@ -8,18 +8,18 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "parca-agent";
|
||||
version = "0.45.1";
|
||||
version = "0.46.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "parca-dev";
|
||||
repo = "parca-agent";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-NcvEU9MgAYK7jFbg/jdUP/ltgzDAIR6JNphv5Xkcba4=";
|
||||
hash = "sha256-WUOHTH5nk5ryv7kE66gfwU25AEbiqyXv6NOj0SA59xQ=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
proxyVendor = true;
|
||||
vendorHash = "sha256-/V4proGF8Vpv2w4+3vZv4tcKkEgBi6eZGMjXW9vrLts=";
|
||||
vendorHash = "sha256-c1HtY1hlhjtJuhJ1tz2wIzgyLqqpGZCPoLZGSNIxNDo=";
|
||||
|
||||
buildInputs = [
|
||||
stdenv.cc.libc.static
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
source 'https://rubygems.org'
|
||||
gem 'pdk', '3.3.0'
|
||||
gem 'pdk', '3.4.0'
|
||||
|
||||
@@ -1,24 +1,36 @@
|
||||
GEM
|
||||
remote: https://rubygems.org/
|
||||
specs:
|
||||
addressable (2.8.7)
|
||||
public_suffix (>= 2.0.2, < 7.0)
|
||||
addressable (2.8.8)
|
||||
public_suffix (>= 2.0.2, < 8.0)
|
||||
bigdecimal (3.3.1)
|
||||
childprocess (5.1.0)
|
||||
logger (~> 1.5)
|
||||
cri (2.15.12)
|
||||
deep_merge (1.2.2)
|
||||
diff-lcs (1.6.2)
|
||||
ffi (1.17.2)
|
||||
diff-lcs (2.0.0)
|
||||
faraday (2.14.1)
|
||||
faraday-net_http (>= 2.0, < 3.5)
|
||||
json
|
||||
logger
|
||||
faraday-follow_redirects (0.3.0)
|
||||
faraday (>= 1, < 3)
|
||||
faraday-net_http (3.4.2)
|
||||
net-http (~> 0.5)
|
||||
ffi (1.17.3)
|
||||
hitimes (2.0.0)
|
||||
json-schema (4.3.1)
|
||||
addressable (>= 2.8)
|
||||
json_pure (2.6.3)
|
||||
json (2.18.1)
|
||||
json-schema (5.2.2)
|
||||
addressable (~> 2.8)
|
||||
bigdecimal (~> 3.1)
|
||||
logger (1.7.0)
|
||||
minitar (0.12.1)
|
||||
net-http (0.9.1)
|
||||
uri (>= 0.11.1)
|
||||
pastel (0.8.0)
|
||||
tty-color (~> 0.5)
|
||||
pathspec (1.1.3)
|
||||
pdk (3.3.0)
|
||||
pdk (3.4.0)
|
||||
bundler (>= 2.1.0, < 3.0.0)
|
||||
childprocess (~> 5.0)
|
||||
cri (~> 2.15.11)
|
||||
@@ -26,18 +38,24 @@ GEM
|
||||
diff-lcs (>= 1.5.0)
|
||||
ffi (>= 1.15.5, < 2.0.0)
|
||||
hitimes (= 2.0.0)
|
||||
json-schema (~> 4.0)
|
||||
json_pure (~> 2.6.3)
|
||||
json-schema (~> 5.0)
|
||||
minitar (~> 0.8)
|
||||
pathspec (~> 1.1)
|
||||
puppet-modulebuilder (~> 1.0)
|
||||
puppet_forge (~> 5.0)
|
||||
tty-prompt (~> 0.23)
|
||||
tty-spinner (~> 0.9)
|
||||
tty-which (~> 0.5)
|
||||
public_suffix (6.0.2)
|
||||
public_suffix (7.0.2)
|
||||
puppet-modulebuilder (1.1.0)
|
||||
minitar (~> 0.9)
|
||||
pathspec (>= 0.2.1, < 3.0.0)
|
||||
puppet_forge (5.0.4)
|
||||
faraday (~> 2.0)
|
||||
faraday-follow_redirects (~> 0.3.0)
|
||||
minitar (< 1.0.0)
|
||||
semantic_puppet (~> 1.0)
|
||||
semantic_puppet (1.1.1)
|
||||
tty-color (0.6.0)
|
||||
tty-cursor (0.7.1)
|
||||
tty-prompt (0.23.1)
|
||||
@@ -51,13 +69,14 @@ GEM
|
||||
tty-spinner (0.9.3)
|
||||
tty-cursor (~> 0.7)
|
||||
tty-which (0.5.0)
|
||||
uri (1.1.1)
|
||||
wisper (2.0.1)
|
||||
|
||||
PLATFORMS
|
||||
ruby
|
||||
|
||||
DEPENDENCIES
|
||||
pdk (= 3.3.0)
|
||||
pdk (= 3.4.0)
|
||||
|
||||
BUNDLED WITH
|
||||
2.6.9
|
||||
2.7.2
|
||||
|
||||
+115
-18
@@ -5,10 +5,20 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "0cl2qpvwiffym62z991ynks7imsm87qmgxf0yfsmlwzkgi9qcaa6";
|
||||
sha256 = "0mxhjgihzsx45l9wh2n0ywl9w0c6k70igm5r0d63dxkcagwvh4vw";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.8.7";
|
||||
version = "2.8.8";
|
||||
};
|
||||
bigdecimal = {
|
||||
groups = [ "default" ];
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "0612spks81fvpv2zrrv3371lbs6mwd7w6g5zafglyk75ici1x87a";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.3.1";
|
||||
};
|
||||
childprocess = {
|
||||
dependencies = [ "logger" ];
|
||||
@@ -46,20 +56,57 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "0qlrj2qyysc9avzlr4zs1py3x684hqm61n4czrsk1pyllz5x5q4s";
|
||||
sha256 = "1mb3nfmnv5gyaxcw10fzdr4jrvx198bq38akiw7vai99xi95v2kh";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.6.2";
|
||||
version = "2.0.0";
|
||||
};
|
||||
faraday = {
|
||||
dependencies = [
|
||||
"faraday-net_http"
|
||||
"json"
|
||||
"logger"
|
||||
];
|
||||
groups = [ "default" ];
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "077n5ss3z3ds4vj54w201kd12smai853dp9c9n7ii7g3q7nwwg54";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.14.1";
|
||||
};
|
||||
faraday-follow_redirects = {
|
||||
dependencies = [ "faraday" ];
|
||||
groups = [ "default" ];
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "1y87p3yk15bjbk0z9mf01r50lzxvp7agr56lbm9gxiz26mb9fbfr";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.3.0";
|
||||
};
|
||||
faraday-net_http = {
|
||||
dependencies = [ "net-http" ];
|
||||
groups = [ "default" ];
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "0v4hfmc7d4lrqqj2wl366rm9551gd08zkv2ppwwnjlnkc217aizi";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.4.2";
|
||||
};
|
||||
ffi = {
|
||||
groups = [ "default" ];
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "19kdyjg3kv7x0ad4xsd4swy5izsbb1vl1rpb6qqcqisr5s23awi9";
|
||||
sha256 = "0k1xaqw2jk13q3ss7cnyvkp8fzp75dk4kazysrxgfd1rpgvkk7qf";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.17.2";
|
||||
version = "1.17.3";
|
||||
};
|
||||
hitimes = {
|
||||
groups = [ "default" ];
|
||||
@@ -71,26 +118,29 @@
|
||||
};
|
||||
version = "2.0.0";
|
||||
};
|
||||
json-schema = {
|
||||
dependencies = [ "addressable" ];
|
||||
json = {
|
||||
groups = [ "default" ];
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "09bq393nrxa7hmphc3li8idgxdnb5hwgj15d0q5qsh4l5g1qvrnm";
|
||||
sha256 = "11prr7nrxh1y4rfsqa51gy4ixx63r18cz9mdnmk0938va1ajf4gy";
|
||||
type = "gem";
|
||||
};
|
||||
version = "4.3.1";
|
||||
version = "2.18.1";
|
||||
};
|
||||
json_pure = {
|
||||
json-schema = {
|
||||
dependencies = [
|
||||
"addressable"
|
||||
"bigdecimal"
|
||||
];
|
||||
groups = [ "default" ];
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "0kn736pb52j8b9xxq6l8wqp2chs74aa14vfnp0rijjn086m8b4f3";
|
||||
sha256 = "1ma0k5889hzydba2ci8lqg87pxsh9zabz7jchm9cbacwsw7axgk0";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.6.3";
|
||||
version = "5.2.2";
|
||||
};
|
||||
logger = {
|
||||
groups = [ "default" ];
|
||||
@@ -112,6 +162,17 @@
|
||||
};
|
||||
version = "0.12.1";
|
||||
};
|
||||
net-http = {
|
||||
dependencies = [ "uri" ];
|
||||
groups = [ "default" ];
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "15k96fj6qwbaiv6g52l538ass95ds1qwgynqdridz29yqrkhpfi5";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.9.1";
|
||||
};
|
||||
pastel = {
|
||||
dependencies = [ "tty-color" ];
|
||||
groups = [ "default" ];
|
||||
@@ -142,10 +203,10 @@
|
||||
"ffi"
|
||||
"hitimes"
|
||||
"json-schema"
|
||||
"json_pure"
|
||||
"minitar"
|
||||
"pathspec"
|
||||
"puppet-modulebuilder"
|
||||
"puppet_forge"
|
||||
"tty-prompt"
|
||||
"tty-spinner"
|
||||
"tty-which"
|
||||
@@ -154,20 +215,20 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "1gildcnii3ayw585as8d8bqhnfb9diqg7n3vmgaz8c5b9wb8c106";
|
||||
sha256 = "0pcwygvs85rnqndn3b64mxbgcs1yb628z5cg9hwwjaxf5wds37vi";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.3.0";
|
||||
version = "3.4.0";
|
||||
};
|
||||
public_suffix = {
|
||||
groups = [ "default" ];
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "1543ap9w3ydhx39ljcd675cdz9cr948x9mp00ab8qvq6118wv9xz";
|
||||
sha256 = "0mx84s7gn3xabb320hw8060v7amg6gmcyyhfzp0kawafiq60j54i";
|
||||
type = "gem";
|
||||
};
|
||||
version = "6.0.2";
|
||||
version = "7.0.2";
|
||||
};
|
||||
puppet-modulebuilder = {
|
||||
dependencies = [
|
||||
@@ -183,6 +244,32 @@
|
||||
};
|
||||
version = "1.1.0";
|
||||
};
|
||||
puppet_forge = {
|
||||
dependencies = [
|
||||
"faraday"
|
||||
"faraday-follow_redirects"
|
||||
"minitar"
|
||||
"semantic_puppet"
|
||||
];
|
||||
groups = [ "default" ];
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "0d65zri1nmpph8iki5iigdzfqd6rfyc1mlgdfhg69q3566rcff06";
|
||||
type = "gem";
|
||||
};
|
||||
version = "5.0.4";
|
||||
};
|
||||
semantic_puppet = {
|
||||
groups = [ "default" ];
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "15ksbizvakfx0zfdgjbh34hqnrnkjj47m4kbnsg58mpqsx45pzqm";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.1.1";
|
||||
};
|
||||
tty-color = {
|
||||
groups = [ "default" ];
|
||||
platforms = [ ];
|
||||
@@ -263,6 +350,16 @@
|
||||
};
|
||||
version = "0.5.0";
|
||||
};
|
||||
uri = {
|
||||
groups = [ "default" ];
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "1ijpbj7mdrq7rhpq2kb51yykhrs2s54wfs6sm9z3icgz4y6sb7rp";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.1.1";
|
||||
};
|
||||
wisper = {
|
||||
groups = [ "default" ];
|
||||
platforms = [ ];
|
||||
|
||||
@@ -0,0 +1,78 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
gmp,
|
||||
installShellFiles,
|
||||
versionCheckHook,
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "prst";
|
||||
version = "13.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "patnashev";
|
||||
repo = "prst";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-J+45JwkA/z3HmzO9J6RVVXutUAVSzOXDMkyUR3zSh9E=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
buildInputs = [ gmp ];
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
# add #include <cstdint>
|
||||
# remove static flag
|
||||
postPatch = ''
|
||||
for f in framework/arithmetic/*.h; do
|
||||
sed -i '1i #include <cstdint>' "$f"
|
||||
done
|
||||
|
||||
substituteInPlace src/linux64/Makefile \
|
||||
--replace-fail "-static" "" \
|
||||
'';
|
||||
|
||||
makeFlags = [
|
||||
"-C"
|
||||
"src/linux64"
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
installBin src/linux64/prst
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
doInstallCheck = true;
|
||||
nativeInstallCheckInputs = [
|
||||
versionCheckHook
|
||||
];
|
||||
|
||||
versionCheckProgramArg = "-v";
|
||||
|
||||
meta = {
|
||||
description = "Primality testing utility written in C++";
|
||||
longDescription = ''
|
||||
This utility is best used for systematic searches of large prime numbers, either by public distributed projects or by private individuals.
|
||||
It can handle numbers of many popular forms like Proth numbers, Thabit numbers, generalized Fermat numbers, factorials, primorials and arbitrary numbers.
|
||||
Mersenne numbers are better handled by GIMPS.
|
||||
It is assumed that input candiates are previously sieved by a sieving utility best suited for the specific form of numbers.
|
||||
'';
|
||||
homepage = "https://github.com/patnashev/prst";
|
||||
maintainers = with lib.maintainers; [ dstremur ];
|
||||
license = lib.licenses.unfree;
|
||||
# PRST links against gwnum.a which is part of the proprietary gwnum library,
|
||||
# making the resulting binary unfree even though the PRST source code itself
|
||||
# may have different licensing terms.
|
||||
sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
mainProgram = "prst";
|
||||
};
|
||||
})
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "pulumi-esc";
|
||||
version = "0.22.0";
|
||||
version = "0.23.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pulumi";
|
||||
repo = "esc";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-ogLlcF8KJAhyaRJGv6BMxmwTfy6okFGaD3h825bJ7ls=";
|
||||
hash = "sha256-0CjlnSGpSJbiQalc22T+cMWjmFfC4dwo29M5m0wqebQ=";
|
||||
};
|
||||
|
||||
subPackages = "cmd/esc";
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
GEM
|
||||
remote: https://rubygems.org/
|
||||
specs:
|
||||
puppet-lint (4.3.0)
|
||||
puppet-lint (5.1.1)
|
||||
|
||||
PLATFORMS
|
||||
ruby
|
||||
@@ -10,4 +10,4 @@ DEPENDENCIES
|
||||
puppet-lint
|
||||
|
||||
BUNDLED WITH
|
||||
2.6.9
|
||||
2.7.2
|
||||
|
||||
@@ -4,9 +4,9 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "1lbr7smgx3k48zxrsp4kkkpwfgr6q2mjyz0bz5r14j0in5j5j3xa";
|
||||
sha256 = "11j46i4bankyvmknl69pqz15ysrd8l6nwhbl77lslrswx7dlwxqy";
|
||||
type = "gem";
|
||||
};
|
||||
version = "4.3.0";
|
||||
version = "5.1.1";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -4,6 +4,7 @@
|
||||
fetchFromGitHub,
|
||||
qt6,
|
||||
installShellFiles,
|
||||
enableGui ? true,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
@@ -31,7 +32,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
qmakeFlags = [
|
||||
"QUsb2snes.pro"
|
||||
"CONFIG+=release"
|
||||
];
|
||||
]
|
||||
++ lib.optional (!enableGui) "QUSB2SNES_NOGUI=1";
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
@@ -1,21 +1,21 @@
|
||||
GEM
|
||||
remote: https://rubygems.org/
|
||||
specs:
|
||||
base64 (0.2.0)
|
||||
base64 (0.3.0)
|
||||
colored2 (4.0.3)
|
||||
cri (2.15.12)
|
||||
erubi (1.13.1)
|
||||
faraday (2.13.1)
|
||||
faraday (2.14.1)
|
||||
faraday-net_http (>= 2.0, < 3.5)
|
||||
json
|
||||
logger
|
||||
faraday-follow_redirects (0.3.0)
|
||||
faraday-follow_redirects (0.4.0)
|
||||
faraday (>= 1, < 3)
|
||||
faraday-net_http (3.4.0)
|
||||
net-http (>= 0.5.0)
|
||||
faraday-net_http (3.4.2)
|
||||
net-http (~> 0.5)
|
||||
fast_gettext (2.4.0)
|
||||
prime
|
||||
forwardable (1.3.3)
|
||||
forwardable (1.4.0)
|
||||
gettext (3.5.1)
|
||||
erubi
|
||||
locale (>= 2.0.5)
|
||||
@@ -26,25 +26,26 @@ GEM
|
||||
fast_gettext (~> 2.1)
|
||||
gettext (~> 3.4)
|
||||
locale
|
||||
json (2.12.2)
|
||||
jwt (2.10.1)
|
||||
json (2.18.1)
|
||||
jwt (2.10.2)
|
||||
base64
|
||||
locale (2.1.4)
|
||||
log4r (1.1.10)
|
||||
logger (1.7.0)
|
||||
minitar (1.0.2)
|
||||
multi_json (1.15.0)
|
||||
net-http (0.6.0)
|
||||
uri
|
||||
prime (0.1.3)
|
||||
minitar (1.1.0)
|
||||
multi_json (1.19.1)
|
||||
net-http (0.9.1)
|
||||
uri (>= 0.11.1)
|
||||
prime (0.1.4)
|
||||
forwardable
|
||||
singleton
|
||||
puppet_forge (6.0.0)
|
||||
puppet_forge (6.1.0)
|
||||
base64 (>= 0.2.0, < 0.4.0)
|
||||
faraday (~> 2.0)
|
||||
faraday-follow_redirects (~> 0.3.0)
|
||||
faraday-follow_redirects (>= 0.3, < 0.5)
|
||||
minitar (~> 1.0, >= 1.0.2)
|
||||
semantic_puppet (~> 1.0)
|
||||
r10k (5.0.0)
|
||||
r10k (5.0.2)
|
||||
colored2 (~> 4.0)
|
||||
cri (>= 2.15.10)
|
||||
gettext-setup (>= 0.24, < 2.0)
|
||||
@@ -57,7 +58,7 @@ GEM
|
||||
semantic_puppet (1.1.1)
|
||||
singleton (0.3.0)
|
||||
text (1.3.1)
|
||||
uri (1.0.3)
|
||||
uri (1.1.1)
|
||||
|
||||
PLATFORMS
|
||||
ruby
|
||||
@@ -66,4 +67,4 @@ DEPENDENCIES
|
||||
r10k
|
||||
|
||||
BUNDLED WITH
|
||||
2.6.6
|
||||
2.7.2
|
||||
|
||||
@@ -4,10 +4,10 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "01qml0yilb9basf7is2614skjp8384h2pycfx86cr8023arfj98g";
|
||||
sha256 = "0yx9yn47a8lkfcjmigk79fykxvr80r4m1i35q82sxzynpbm7lcr7";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.2.0";
|
||||
version = "0.3.0";
|
||||
};
|
||||
colored2 = {
|
||||
groups = [ "default" ];
|
||||
@@ -49,10 +49,10 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "0xbv450qj2bx0qz9l2pjrd3kc057y6bglc3na7a78zby8ssiwlyc";
|
||||
sha256 = "077n5ss3z3ds4vj54w201kd12smai853dp9c9n7ii7g3q7nwwg54";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.13.1";
|
||||
version = "2.14.1";
|
||||
};
|
||||
faraday-follow_redirects = {
|
||||
dependencies = [ "faraday" ];
|
||||
@@ -60,10 +60,10 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "1y87p3yk15bjbk0z9mf01r50lzxvp7agr56lbm9gxiz26mb9fbfr";
|
||||
sha256 = "1nfmmnmqgbxci7dlca0qnwxn8j29yv7v8wm26m0f4l0kmcc13ynk";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.3.0";
|
||||
version = "0.4.0";
|
||||
};
|
||||
faraday-net_http = {
|
||||
dependencies = [ "net-http" ];
|
||||
@@ -71,10 +71,10 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "0jp5ci6g40d6i50bsywp35l97nc2fpi9a592r2cibwicdb6y9wd1";
|
||||
sha256 = "0v4hfmc7d4lrqqj2wl366rm9551gd08zkv2ppwwnjlnkc217aizi";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.4.0";
|
||||
version = "3.4.2";
|
||||
};
|
||||
fast_gettext = {
|
||||
dependencies = [ "prime" ];
|
||||
@@ -92,10 +92,10 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "1b5g1i3xdvmxxpq4qp0z4v78ivqnazz26w110fh4cvzsdayz8zgi";
|
||||
sha256 = "0f78rjpnhm4lgp1qzadnr6kr02b6afh1lvy7w607k4qjk3641kgi";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.3.3";
|
||||
version = "1.4.0";
|
||||
};
|
||||
gettext = {
|
||||
dependencies = [
|
||||
@@ -134,10 +134,10 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "1x5b8ipv6g0z44wgc45039k04smsyf95h2m5m67mqq35sa5a955s";
|
||||
sha256 = "11prr7nrxh1y4rfsqa51gy4ixx63r18cz9mdnmk0938va1ajf4gy";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.12.2";
|
||||
version = "2.18.1";
|
||||
};
|
||||
jwt = {
|
||||
dependencies = [ "base64" ];
|
||||
@@ -145,10 +145,10 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "1i8wmzgb5nfhvkx1f6bhdwfm7v772172imh439v3xxhkv3hllhp6";
|
||||
sha256 = "1x64l31nkqjwfv51s2vsm0yqq4cwzrlnji12wvaq761myx3fxq9i";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.10.1";
|
||||
version = "2.10.2";
|
||||
};
|
||||
locale = {
|
||||
groups = [ "default" ];
|
||||
@@ -185,20 +185,20 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "0wj6cgvzbnc8qvdb5rai4hf9z10a2f422gc5agnhcab7lwmyp4mi";
|
||||
sha256 = "0gm2ksf678gr5cqr4a3mzx0zvwrc7z2qvkfd8rwh209qdzxhrnrq";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.0.2";
|
||||
version = "1.1.0";
|
||||
};
|
||||
multi_json = {
|
||||
groups = [ "default" ];
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "0pb1g1y3dsiahavspyzkdy39j4q377009f6ix0bh1ag4nqw43l0z";
|
||||
sha256 = "1drisvysgvnjlz49a0qcbs294id6mvj3i8iik5rvym68ybwfzvvs";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.15.0";
|
||||
version = "1.19.1";
|
||||
};
|
||||
net-http = {
|
||||
dependencies = [ "uri" ];
|
||||
@@ -206,10 +206,10 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "1ysrwaabhf0sn24jrp0nnp51cdv0jf688mh5i6fsz63q2c6b48cn";
|
||||
sha256 = "15k96fj6qwbaiv6g52l538ass95ds1qwgynqdridz29yqrkhpfi5";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.6.0";
|
||||
version = "0.9.1";
|
||||
};
|
||||
prime = {
|
||||
dependencies = [
|
||||
@@ -220,13 +220,14 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "1qsk9q2n4yb80f5mwslxzfzm2ckar25grghk95cj7sbc1p2k3w5s";
|
||||
sha256 = "0pi2g9sd9ssyrpvbybh4skrgzqrv0rrd1q7ylgrsd519gjzmwxad";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.1.3";
|
||||
version = "0.1.4";
|
||||
};
|
||||
puppet_forge = {
|
||||
dependencies = [
|
||||
"base64"
|
||||
"faraday"
|
||||
"faraday-follow_redirects"
|
||||
"minitar"
|
||||
@@ -236,10 +237,10 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "1pwd5x0vyf04qzzdw6v98m6f6rb110g14sv6h6yj2nwz3kbbww07";
|
||||
sha256 = "0jvncdjxz6337m2mljj6f15l6i9vln023x9q17gnl4zhh8rfigz3";
|
||||
type = "gem";
|
||||
};
|
||||
version = "6.0.0";
|
||||
version = "6.1.0";
|
||||
};
|
||||
r10k = {
|
||||
dependencies = [
|
||||
@@ -256,10 +257,10 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "0m0k0aqf9gaakgkmfcx86324qx6mvs2p0ja1rrs36ifq1l70lgsf";
|
||||
sha256 = "1cz8hf6bsgax7h8rs30p1ys5n9d58w978frh0dmwbka7hhmlxqj8";
|
||||
type = "gem";
|
||||
};
|
||||
version = "5.0.0";
|
||||
version = "5.0.2";
|
||||
};
|
||||
racc = {
|
||||
groups = [ "default" ];
|
||||
@@ -306,9 +307,9 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "04bhfvc25b07jaiaf62yrach7khhr5jlr5bx6nygg8pf11329wp9";
|
||||
sha256 = "1ijpbj7mdrq7rhpq2kb51yykhrs2s54wfs6sm9z3icgz4y6sb7rp";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.0.3";
|
||||
version = "1.1.1";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -35,7 +35,7 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "rerun";
|
||||
version = "0.30.1";
|
||||
version = "0.30.2";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@@ -46,7 +46,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
owner = "rerun-io";
|
||||
repo = "rerun";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-6TZTZ5bQ9eM93tKZAn82GUmSdq48qxoK+Z6cjAPLa0U=";
|
||||
hash = "sha256-KDtDX7qt+wOJDUVkqjJQPFp2umH7vYja8WyYven5emM=";
|
||||
};
|
||||
|
||||
# The path in `build.rs` is wrong for some reason, so we patch it to make the passthru tests work
|
||||
@@ -55,7 +55,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
--replace-fail '"rerun_sdk/rerun_cli/rerun"' '"rerun_sdk/rerun"'
|
||||
'';
|
||||
|
||||
cargoHash = "sha256-yum+14912Jlmr+b3y4E7EoyWn/Sbx2t3uqlg7t0EFME=";
|
||||
cargoHash = "sha256-/VAPPz1KYy8kbNRyPq198x3uyX2/vbEqWJxY18+b7BI=";
|
||||
|
||||
cargoBuildFlags = [
|
||||
"--package"
|
||||
|
||||
@@ -5,17 +5,17 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "rust-rpxy";
|
||||
version = "0.11.0";
|
||||
version = "0.11.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "junkurihara";
|
||||
repo = "rust-rpxy";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-TKaOHJSvio1WrrNI9fe9/q32JOCfz764z1Q9emWUgLg=";
|
||||
hash = "sha256-9YieB+ZlO4lrNv+yAswv0/t/RAYfmhi5s9NGtESJjjg=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
cargoHash = "sha256-j5Z0Pvj/v9LfKeDgnP0hGXJcuCXJjCco3Vy0YeFSTzs=";
|
||||
cargoHash = "sha256-mFXXWdpUtDnxo6NB5Oh5PdHPE513Ks/H8UqzeplXQ+s=";
|
||||
|
||||
meta = {
|
||||
description = "Http reverse proxy serving multiple domain names and terminating TLS for http/1.1, 2 and 3, written in Rust";
|
||||
|
||||
@@ -6,6 +6,7 @@
|
||||
installShellFiles,
|
||||
nix-update-script,
|
||||
tzdata,
|
||||
fuse,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
@@ -21,8 +22,13 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
|
||||
cargoHash = "sha256-osVyOFO+vHbcXEp44VH7XI8y4Ir8/IkCr/cF0FMPQvQ=";
|
||||
|
||||
buildFeatures = lib.optionals stdenv.hostPlatform.isLinux [ "mount" ];
|
||||
checkFeatures = lib.subtractLists [ "mount" ] finalAttrs.buildFeatures; # we do not want `mount` during unit tests because it breaks rustic's test snapshots
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ fuse ];
|
||||
|
||||
nativeCheckInputs = [ tzdata ];
|
||||
|
||||
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
|
||||
|
||||
+2299
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,94 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
gradle,
|
||||
nix-update-script,
|
||||
libGL,
|
||||
jdk21,
|
||||
git,
|
||||
cargo,
|
||||
rustc,
|
||||
rustPlatform,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "schildi-revenge";
|
||||
version = "26.01.26";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SchildiChat";
|
||||
repo = "schildi-revenge";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-oxXuis6hkd8UWmckUfuocJ9mvAoMj8bIa+xdDUVKB7Q=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
cargoRoot = "matrix-rust-sdk";
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit (finalAttrs) src cargoRoot;
|
||||
hash = "sha256-snb/qKagBJsTygc/YNX4mki+lGc7zmNVYYT0o9UScoY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
jdk21
|
||||
gradle
|
||||
git
|
||||
cargo
|
||||
rustc
|
||||
rustPlatform.cargoSetupHook
|
||||
];
|
||||
|
||||
gradleBuildTask = "createReleaseDistributable";
|
||||
|
||||
gradleUpdateScript = ''
|
||||
runHook preBuild
|
||||
|
||||
gradle composeApp:dependencies composeApp:checkRuntime --write-verification-metadata sha256
|
||||
##### Fallback
|
||||
## If the update script starts missing dependencies after an update this should still work.
|
||||
## Unfortunately it also unnecessarily builds the entire rust crate
|
||||
#gradle createReleaseDistributable --write-verification-metadata sha256
|
||||
'';
|
||||
|
||||
mitmCache = gradle.fetchDeps {
|
||||
pkg = finalAttrs.finalPackage;
|
||||
data = ./deps.json;
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
BUILD_DIR="composeApp/build/compose/binaries/main-release/app/SchildiChatRevenge"
|
||||
|
||||
mkdir -p $out/share/{applications,icons/scalable}
|
||||
cp -r $BUILD_DIR/bin $out/bin
|
||||
cp -r $BUILD_DIR/lib $out/lib
|
||||
|
||||
cp -r graphics/ic_launcher_foreground.svg $out/share/icons/scalable/ic_launcher.svg
|
||||
cp -r launcher/SchildiChatRevenge.desktop $out/share/applications
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
patchelf $out/lib/app/libskiko-linux-x64.so \
|
||||
--add-rpath ${lib.makeLibraryPath [ libGL ]}
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Matrix client for desktop written in Kotlin and using the Matrix Rust SDK";
|
||||
mainProgram = "SchildiChatRevenge";
|
||||
platforms = lib.platforms.linux;
|
||||
license = lib.licenses.gpl3Only;
|
||||
sourceProvenance = with lib.sourceTypes; [
|
||||
fromSource
|
||||
binaryBytecode # mitm cache
|
||||
];
|
||||
maintainers = with lib.maintainers; [
|
||||
_71rd
|
||||
];
|
||||
};
|
||||
})
|
||||
@@ -17,13 +17,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "sickgear";
|
||||
version = "3.34.12";
|
||||
version = "3.34.13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SickGear";
|
||||
repo = "SickGear";
|
||||
tag = "release_${finalAttrs.version}";
|
||||
hash = "sha256-EdJCPuILAiz7jVTC4ZKY+ziiUEqrRyZOqZOGUtyCmLw=";
|
||||
hash = "sha256-jOQktr7KG/C/ap/cLGMCwWnceirGo3TuwxXNewE5I78=";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "skim";
|
||||
version = "3.6.2";
|
||||
version = "4.0.0";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@@ -24,14 +24,14 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
owner = "skim-rs";
|
||||
repo = "skim";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-f3WCOED4glzi3m7TVRgFZe51180yPPOIXlO+g5STxi0=";
|
||||
hash = "sha256-1ckQ9ZWf4PWgRxE8jtQL7yuitPGvgebNJFPMWQ3xdrU=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
sed -i -e "s|expand('<sfile>:h:h')|'$out'|" plugin/skim.vim
|
||||
'';
|
||||
|
||||
cargoHash = "sha256-2X89zUXfsy3z5fddD+9QQmJ+dsg4BShByHFsjFWOKwA=";
|
||||
cargoHash = "sha256-AIMmgspcj40Ktw5THk2p/bOcPBsqjD0/9jfpOJEm23w=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
nativeCheckInputs = [
|
||||
|
||||
@@ -11,12 +11,12 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "streamlink";
|
||||
version = "8.2.0";
|
||||
version = "8.2.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-ZFI+mUAd307n8J9VF4fcEnER7rmsjYsOgDeWbv3XoaU=";
|
||||
hash = "sha256-r6Jlgsq/ND9Jcz154ryaW76QrsfbskbsX5d5ZJnGN+4=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -24,16 +24,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "supersonic" + lib.optionalString waylandSupport "-wayland";
|
||||
version = "0.20.1";
|
||||
version = "0.21.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dweymouth";
|
||||
repo = "supersonic";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-q9g59TVo8Y7cKdSnyrsTQEIpB+f/+pcaobBFynnAgwY=";
|
||||
hash = "sha256-bVY9Q61shftUigCitRhE18GVi3RNULIifGdgwThXlaQ=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-x8eq1ZGitBoq+N1QOIYLZRLIta3gbfpn2xZsqkj4cGo=";
|
||||
vendorHash = "sha256-aSstxlxx22iF86lCMcR9E+Zn83wcS1oSfT2KflNt6Ks=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
copyDesktopItems
|
||||
|
||||
@@ -22,18 +22,18 @@
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "swayosd";
|
||||
version = "0.3.0";
|
||||
version = "0.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ErikReider";
|
||||
repo = "SwayOSD";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-DRJ4D+QcgkVZmlfbj2HEIUHnYldzIuSDcpsOAOuoaL0=";
|
||||
hash = "sha256-NX2+QKQ7iSOkPls+nWMbwkrlK5TTMu8kGajSqJ0oGWI=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit pname version src;
|
||||
hash = "sha256-t0IZvO7Wbx6A7v/sRZOSOLj0O/1m7vOBjZSd99TAutI=";
|
||||
hash = "sha256-BctsgIuzVCt2dJlu/rNVheWZu0TGyw4hzsotUZlKmMw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -27,14 +27,14 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
version = "2.0.8";
|
||||
version = "2.0.9";
|
||||
pname = "syncthingtray";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Martchus";
|
||||
repo = "syncthingtray";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-iaLHl6XvmcsP/iO+sit1yWT8UZxA+euL7cusP/NCaK4=";
|
||||
hash = "sha256-kWOr+PLO+qxjDZhsMrQwi2bRPlK5hKNaoRcHX1nOYFg=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "tofu-ls";
|
||||
version = "0.3.1";
|
||||
version = "0.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "opentofu";
|
||||
repo = "tofu-ls";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-BrCBltZJ56SM7XxWy/bgaHXOob8e3cJNfsB3/2k1u0s=";
|
||||
hash = "sha256-gdejHJp4RAeOxH3h8iyMhRGNwFlFwVwTssypdE/X78s=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Uq/4rd3OvCBhp53MEMLiWL/V6hkygwdBLSN8Wzwqoew=";
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "ttdl";
|
||||
version = "4.24.1";
|
||||
version = "4.25.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "VladimirMarkelov";
|
||||
repo = "ttdl";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-tfyfFwHnIS5nCYobVu49AmjVKvxhngqD5woxyiv5FEc=";
|
||||
sha256 = "sha256-gDR9EQN1EorqELaWUk+0sFwa6FxjmdkCLXudnFRjs+U=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-XH/F0ffWmIvesR0sA+AdnLV3IaLWrgin4YDJtkfbVDI=";
|
||||
cargoHash = "sha256-+G2F5HGv57JqKJF6G1I7gLOrQSma9RUXdG4CVsdplaE=";
|
||||
|
||||
meta = {
|
||||
description = "CLI tool to manage todo lists in todo.txt format";
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user