Merge master into staging-next
This commit is contained in:
nixpkgs-ci[bot]
@@ -29,7 +29,7 @@ jobs:
|
||||
with:
|
||||
persist-credentials: false
|
||||
sparse-checkout: |
|
||||
ci/supportedSystems.json
|
||||
ci/github-script/supportedSystems.js
|
||||
|
||||
- id: prepare
|
||||
uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
|
||||
@@ -39,6 +39,8 @@ jobs:
|
||||
with:
|
||||
script: |
|
||||
const { classify } = require('./ci/supportedBranches.js')
|
||||
const supportedSystems = require('./ci/github-script/supportedSystems.js')
|
||||
|
||||
const baseBranch = (
|
||||
context.payload.merge_group?.base_ref ??
|
||||
context.payload.pull_request.base.ref
|
||||
@@ -47,11 +49,16 @@ jobs:
|
||||
core.setOutput('base', baseClassification)
|
||||
core.info('base classification:', baseClassification)
|
||||
|
||||
core.setOutput('mergedSha', context.payload.merge_group?.head_sha ?? process.env.MERGED_SHA)
|
||||
core.info(`mergedSha: ${context.payload.merge_group?.head_sha ?? process.env.MERGED_SHA}`)
|
||||
core.setOutput('targetSha', context.payload.merge_group?.base_sha ?? process.env.TARGET_SHA)
|
||||
core.info(`targetSha: ${context.payload.merge_group?.base_sha ?? process.env.TARGET_SHA}`)
|
||||
core.setOutput('systems', require('./ci/supportedSystems.json'))
|
||||
const mergedSha = context.payload.merge_group?.head_sha ?? process.env.MERGED_SHA
|
||||
core.setOutput('mergedSha', mergedSha)
|
||||
core.info(`mergedSha: ${mergedSha}`)
|
||||
|
||||
const targetSha = context.payload.merge_group?.base_sha ?? process.env.TARGET_SHA
|
||||
core.setOutput('targetSha', targetSha)
|
||||
core.info(`targetSha: ${targetSha}`)
|
||||
|
||||
const systems = await supportedSystems({ github, context, targetSha })
|
||||
core.setOutput('systems', systems)
|
||||
|
||||
check:
|
||||
name: Check
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
const { classify } = require('../supportedBranches.js')
|
||||
const { postReview, dismissReviews } = require('./reviews.js')
|
||||
const reviewKey = 'prepare'
|
||||
const supportedSystems = require('./supportedSystems.js')
|
||||
|
||||
module.exports = async ({ github, context, core, dry }) => {
|
||||
const pull_number = context.payload.pull_request.number
|
||||
@@ -209,7 +210,8 @@ module.exports = async ({ github, context, core, dry }) => {
|
||||
core.setOutput('mergedSha', mergedSha)
|
||||
core.setOutput('targetSha', targetSha)
|
||||
|
||||
core.setOutput('systems', require('../supportedSystems.json'))
|
||||
const systems = await supportedSystems({ github, context, targetSha })
|
||||
core.setOutput('systems', systems)
|
||||
|
||||
const files = (
|
||||
await github.paginate(github.rest.pulls.listFiles, {
|
||||
|
||||
@@ -0,0 +1,10 @@
|
||||
module.exports = async ({ github, context, targetSha }) => {
|
||||
const { content, encoding } = (
|
||||
await github.rest.repos.getContent({
|
||||
...context.repo,
|
||||
path: 'pkgs/top-level/release-supported-systems.json',
|
||||
ref: targetSha,
|
||||
})
|
||||
).data
|
||||
return JSON.parse(Buffer.from(content, encoding).toString())
|
||||
}
|
||||
@@ -1,6 +0,0 @@
|
||||
[
|
||||
"aarch64-linux",
|
||||
"aarch64-darwin",
|
||||
"x86_64-linux",
|
||||
"x86_64-darwin"
|
||||
]
|
||||
@@ -76,6 +76,10 @@
|
||||
|
||||
- `nodePackages.wavedrom-cli` has been removed, as it was unmaintained within nixpkgs.
|
||||
|
||||
- `nodePackages.browserify` has been removed, as it was unmaintained within nixpkgs.
|
||||
|
||||
- `nodePackages.sass` has been removed, as it was unmaintained within nixpkgs.
|
||||
|
||||
- All `@tailwindcss` packages in the `nodePackages` set have been removed, as they are libraries that should instead be locked by JS projects that utilize them.
|
||||
|
||||
- `arti` has been updated to major version 2, which removed the long-deprecated `proxy.socks_port` and `proxy.dns_port` and the legacy syntax for specifying directory authorities. For more information, see the [changelog for 2.0.0](https://gitlab.torproject.org/tpo/core/arti/-/blob/arti-v2.0.0/CHANGELOG.md).
|
||||
|
||||
@@ -3582,12 +3582,6 @@
|
||||
githubId = 124877155;
|
||||
name = "Benjamin Lemouzy";
|
||||
};
|
||||
blenderfreaky = {
|
||||
name = "blenderfreaky";
|
||||
email = "nix@blenderfreaky.de";
|
||||
github = "blenderfreaky";
|
||||
githubId = 14351657;
|
||||
};
|
||||
blghnks = {
|
||||
email = "bilgehankuch@gmail.com";
|
||||
name = "Bilgehan Kuş";
|
||||
@@ -6601,12 +6595,6 @@
|
||||
githubId = 4951663;
|
||||
name = "Morgan Helton";
|
||||
};
|
||||
dezgeg = {
|
||||
email = "tuomas.tynkkynen@iki.fi";
|
||||
github = "dezgeg";
|
||||
githubId = 579369;
|
||||
name = "Tuomas Tynkkynen";
|
||||
};
|
||||
dezren39 = {
|
||||
email = "drewrypope@gmail.com";
|
||||
github = "dezren39";
|
||||
@@ -10689,12 +10677,6 @@
|
||||
githubId = 1903556;
|
||||
keys = [ { fingerprint = "F1C5 760E 45B9 9A44 72E9 6BFB D65C 9AFB 4C22 4DA3"; } ];
|
||||
};
|
||||
hodapp = {
|
||||
email = "hodapp87@gmail.com";
|
||||
github = "Hodapp87";
|
||||
githubId = 896431;
|
||||
name = "Chris Hodapp";
|
||||
};
|
||||
hogcycle = {
|
||||
email = "nate@gysli.ng";
|
||||
github = "hogcycle";
|
||||
@@ -11847,6 +11829,12 @@
|
||||
github = "james-atkins";
|
||||
githubId = 9221409;
|
||||
};
|
||||
jamespeapen = {
|
||||
name = "James Eapen";
|
||||
email = "james.eapen@vai.org";
|
||||
github = "jamespeapen";
|
||||
githubId = 39574560;
|
||||
};
|
||||
jamesward = {
|
||||
email = "james@jamesward.com";
|
||||
name = "James Ward";
|
||||
@@ -13927,6 +13915,12 @@
|
||||
githubId = 20063;
|
||||
name = "Pascal Hertleif";
|
||||
};
|
||||
kilyanni = {
|
||||
name = "Nikolas Kilian";
|
||||
email = "nix@nkilian.org";
|
||||
github = "kilyanni";
|
||||
githubId = 14351657;
|
||||
};
|
||||
kim0 = {
|
||||
email = "email.ahmedkamal@googlemail.com";
|
||||
github = "kim0";
|
||||
|
||||
@@ -686,6 +686,7 @@ with lib.maintainers;
|
||||
members = [
|
||||
b-rodrigues
|
||||
bcdarwin
|
||||
jamespeapen
|
||||
jbedo
|
||||
kupac
|
||||
];
|
||||
|
||||
@@ -136,7 +136,7 @@ in
|
||||
BindReadOnlyPaths = [ "/dev/null:/etc/man_db.conf" ]; # mandb will still read /etc/man_db.conf if it exists, even when setting -C path/to/config.conf
|
||||
ProtectSystem = "strict";
|
||||
};
|
||||
wantedBy = [ "default.target" ];
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
};
|
||||
})
|
||||
]
|
||||
|
||||
@@ -315,7 +315,7 @@ in
|
||||
options.sttLibrary == "onnx-asr" || options.sttLibrary == "auto" && options.language == "ru"
|
||||
) oldAttrs.optional-dependencies.onnx_asr
|
||||
++ optionals (
|
||||
options.sttLibrary == "sherpa-onnx" || options.sttLibrary == "auto" && options.language == "en"
|
||||
options.sttLibrary == "sherpa" || options.sttLibrary == "auto" && options.language == "en"
|
||||
) oldAttrs.optional-dependencies.sherpa
|
||||
++ optionals (options.sttLibrary == "transformers") oldAttrs.optional-dependencies.transformers;
|
||||
});
|
||||
|
||||
@@ -116,6 +116,5 @@ in
|
||||
|
||||
meta.maintainers = with maintainers; [
|
||||
dan-theriault
|
||||
phaer
|
||||
];
|
||||
}
|
||||
|
||||
@@ -105,6 +105,6 @@ in
|
||||
});
|
||||
};
|
||||
|
||||
meta.maintainers = with maintainers; [ phaer ];
|
||||
meta.maintainers = [ ];
|
||||
|
||||
}
|
||||
|
||||
@@ -128,13 +128,13 @@
|
||||
"vendorHash": "sha256-/dOiXO2aPkuZaFiwv/6AXJdIADgx8T7eOwvJfBBoqg8="
|
||||
},
|
||||
"buildkite_buildkite": {
|
||||
"hash": "sha256-05OXB9YrV4ciNmISd41aJ4IPpSDeIqWZqv4K3Bp50mA=",
|
||||
"hash": "sha256-kQ0uFyRdhZYNVTd1YdzyZZVdQrZVpnZeYeThhiML5ng=",
|
||||
"homepage": "https://registry.terraform.io/providers/buildkite/buildkite",
|
||||
"owner": "buildkite",
|
||||
"repo": "terraform-provider-buildkite",
|
||||
"rev": "v1.30.0",
|
||||
"rev": "v1.31.1",
|
||||
"spdx": "MIT",
|
||||
"vendorHash": "sha256-/KuTuHvwI/37OYG2NlEjYy0hJ8i1zVupz8Eq5SBoGQA="
|
||||
"vendorHash": "sha256-XyM6C5OL/xRJ2oVhANQQBmm2eT0Pj5RrEqe7ld2un70="
|
||||
},
|
||||
"camptocamp_pass": {
|
||||
"hash": "sha256-GQ2g7VyK+eeBqW3LMR4U0gMYsvQnG3y+KEKKkvnmfsk=",
|
||||
@@ -400,11 +400,11 @@
|
||||
"vendorHash": null
|
||||
},
|
||||
"fastly_fastly": {
|
||||
"hash": "sha256-KPEgLMxKyiepNb5A9uJmcOEDDbE+L0k6Cz3hAVg0H08=",
|
||||
"hash": "sha256-EQlK21yB1PcM74NBKnslB/Q4Y9JO1SOzvmpGZkJ74HQ=",
|
||||
"homepage": "https://registry.terraform.io/providers/fastly/fastly",
|
||||
"owner": "fastly",
|
||||
"repo": "terraform-provider-fastly",
|
||||
"rev": "v8.7.0",
|
||||
"rev": "v8.7.1",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-xgIAmxi9VvPsWqBtQHchv5UvwALkayxmoMsUp0aYJVs="
|
||||
},
|
||||
@@ -724,13 +724,13 @@
|
||||
"vendorHash": null
|
||||
},
|
||||
"ibm-cloud_ibm": {
|
||||
"hash": "sha256-Bd4iCThAVw0VAO8EiJ9R2fLLW7XkjFj5oxwzZnqEf/Y=",
|
||||
"hash": "sha256-xdQk+11X4q8xrLmkWOd0dqx38C/RscybdBqaTLDntP8=",
|
||||
"homepage": "https://registry.terraform.io/providers/IBM-Cloud/ibm",
|
||||
"owner": "IBM-Cloud",
|
||||
"repo": "terraform-provider-ibm",
|
||||
"rev": "v1.88.2",
|
||||
"rev": "v1.88.3",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-KjhTp/Sjf4pxbsrWc4EZAD/NAtr0U7yieYd6s2NQHHc="
|
||||
"vendorHash": "sha256-rZ8SgbLQTpZWd6DfPZOzagqepQsnNxqVNUTFPafU870="
|
||||
},
|
||||
"icinga_icinga2": {
|
||||
"hash": "sha256-Y/Oq0aTzP+oSKPhHiHY9Leal4HJJm7TNDpcdqkUsCmk=",
|
||||
|
||||
@@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
description = "Fast-paced, polished OpenGL demonstration by Excess (data files)";
|
||||
homepage = "https://packages.qa.debian.org/a/amoeba-data.html";
|
||||
license = lib.licenses.unfree;
|
||||
maintainers = with lib.maintainers; [ dezgeg ];
|
||||
maintainers = [ ];
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
})
|
||||
|
||||
@@ -64,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
description = "Fast-paced, polished OpenGL demonstration by Excess";
|
||||
homepage = "https://packages.qa.debian.org/a/amoeba.html";
|
||||
license = lib.licenses.gpl2Only; # Engine is GPLv2, data files in amoeba-data nonfree
|
||||
maintainers = with lib.maintainers; [ dezgeg ];
|
||||
maintainers = [ ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
})
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "andcli";
|
||||
version = "2.4.3";
|
||||
version = "2.5.0";
|
||||
|
||||
subPackages = [ "cmd/andcli" ];
|
||||
|
||||
@@ -16,10 +16,10 @@ buildGoModule (finalAttrs: {
|
||||
owner = "tjblackheart";
|
||||
repo = "andcli";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-OhMycd1L52hkrXbKwi21zh063FqPRQrBCcXcmy2ljdA=";
|
||||
hash = "sha256-TrcLw5pUMzyXUuMyQljVXbprS2voqvmVk6Ktj6Zi7Xk=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-XZcSD7/vIA5XibWCI7PorqB300r6/gWhItgUq7v92m4=";
|
||||
vendorHash = "sha256-jtyxzmDGm/JHTJAkCHfSfECNB5XkwEyTBWnMCbCOAvE=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -7,11 +7,11 @@
|
||||
|
||||
let
|
||||
pname = "apidog";
|
||||
version = "2.7.51";
|
||||
version = "2.8.11";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://file-assets.apidog.com/download/${version}/Apidog-${version}.AppImage";
|
||||
hash = "sha256-MEVnpzVRj0Mi+ZX9CVi5dyDlV3rxuSC5tYM03bqdw0Q=";
|
||||
hash = "sha256-+nilQYbkfS8z3J4CbD9jC1nm/zY3fX+bl8eNsaLOHVA=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extract {
|
||||
|
||||
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://github.com/autotrace/autotrace";
|
||||
description = "Utility for converting bitmap into vector graphics";
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = with lib.maintainers; [ hodapp ];
|
||||
maintainers = [ ];
|
||||
license = lib.licenses.gpl2;
|
||||
mainProgram = "autotrace";
|
||||
};
|
||||
|
||||
@@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
mainProgram = "bastet";
|
||||
homepage = "http://fph.altervista.org/prog/bastet.html";
|
||||
license = lib.licenses.gpl3;
|
||||
maintainers = [ lib.maintainers.dezgeg ];
|
||||
maintainers = [ ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
})
|
||||
|
||||
@@ -12,14 +12,14 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "bird";
|
||||
version = "2.17.3";
|
||||
version = "2.18";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.nic.cz";
|
||||
owner = "labs";
|
||||
repo = "bird";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-Uwvb5u12Hwsv0uouEpGQiTgMgprWUpghbwD3TmKBoOM=";
|
||||
hash = "sha256-Kta8zzM/EYC3Mz3mLptaJ+pFgs1Hi7MBsWjwkR4hwL8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -29,7 +29,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
|
||||
description = "BMAP Tools";
|
||||
homepage = "https://github.com/yoctoproject/bmaptool";
|
||||
license = lib.licenses.gpl2Only;
|
||||
maintainers = with lib.maintainers; [ dezgeg ];
|
||||
maintainers = [ ];
|
||||
platforms = lib.platforms.linux;
|
||||
mainProgram = "bmaptool";
|
||||
};
|
||||
|
||||
@@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
description = "Compiles a XKB keyboard description to a keymap suitable for loadkeys";
|
||||
homepage = "https://salsa.debian.org/installer-team/console-setup";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
maintainers = with lib.maintainers; [ dezgeg ];
|
||||
maintainers = [ ];
|
||||
platforms = lib.platforms.unix;
|
||||
mainProgram = "ckbcomp";
|
||||
};
|
||||
|
||||
+14
-9
@@ -1,24 +1,29 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
gccStdenv,
|
||||
fetchurl,
|
||||
flex,
|
||||
bison,
|
||||
gmp,
|
||||
perl,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
let
|
||||
gmp' = lib.overrideDerivation gmp (_: {
|
||||
dontDisableStatic = true;
|
||||
});
|
||||
stdenv = gccStdenv;
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "cvc3";
|
||||
version = "2.4.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://cs.nyu.edu/acsys/cvc3/releases/${version}/${pname}-${version}.tar.gz";
|
||||
sha256 = "1xxcwhz3y6djrycw8sm6xz83wb4hb12rd1n0skvc7fng0rh1snym";
|
||||
url = "https://cs.nyu.edu/acsys/cvc3/releases/${finalAttrs.version}/cvc3-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-1VsdYAbPusP21MCGlkVYkCw+0O+masSZz7IZPz7krPc=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
gmp
|
||||
gmp'
|
||||
flex
|
||||
bison
|
||||
perl
|
||||
@@ -28,8 +33,8 @@ stdenv.mkDerivation rec {
|
||||
|
||||
# fails to configure on darwin due to gmp not found
|
||||
configureFlags = [
|
||||
"LIBS=-L${gmp}/lib"
|
||||
"CXXFLAGS=-I${gmp.dev}/include"
|
||||
"LIBS=-L${gmp'}/lib"
|
||||
"CXXFLAGS=-I${gmp'.dev}/include"
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
@@ -55,4 +60,4 @@ stdenv.mkDerivation rec {
|
||||
downloadPage = "https://cs.nyu.edu/acsys/cvc3/download.html";
|
||||
};
|
||||
};
|
||||
}
|
||||
})
|
||||
@@ -343,7 +343,6 @@ python.pkgs.buildPythonApplication rec {
|
||||
changelog = "https://diffoscope.org/news/diffoscope-${version}-released/";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = with lib.maintainers; [
|
||||
dezgeg
|
||||
danielfullmer
|
||||
raitobezarius
|
||||
];
|
||||
|
||||
@@ -3,14 +3,14 @@
|
||||
source 'https://rubygems.org'
|
||||
|
||||
|
||||
gem 'arabic-letter-connector', require: 'arabic-letter-connector/logic'
|
||||
gem 'arabic-letter-connector', require: false
|
||||
gem 'aws-sdk-s3', require: false
|
||||
gem 'aws-sdk-secretsmanager', require: false
|
||||
gem 'azure-storage-blob', require: false
|
||||
gem 'azure-blob', require: false
|
||||
gem 'bootsnap', require: false
|
||||
gem 'cancancan'
|
||||
gem 'csv'
|
||||
gem 'csv-safe'
|
||||
gem 'csv', require: false
|
||||
gem 'csv-safe', require: false
|
||||
gem 'devise'
|
||||
gem 'devise-two-factor'
|
||||
gem 'dotenv', require: false
|
||||
@@ -20,12 +20,11 @@ gem 'faraday-follow_redirects'
|
||||
gem 'google-cloud-storage', require: false
|
||||
gem 'hexapdf'
|
||||
gem 'image_processing'
|
||||
gem 'jwt'
|
||||
gem 'jwt', require: false
|
||||
gem 'lograge'
|
||||
gem 'mysql2', require: false
|
||||
gem 'numo-narray'
|
||||
gem 'numo-narray-alt', require: false
|
||||
gem 'oj'
|
||||
gem 'onnxruntime'
|
||||
gem 'onnxruntime', require: false
|
||||
gem 'pagy'
|
||||
gem 'pg', require: false
|
||||
gem 'premailer-rails'
|
||||
@@ -37,13 +36,14 @@ gem 'rails_autolink'
|
||||
gem 'rails-i18n'
|
||||
gem 'rotp'
|
||||
gem 'rouge', require: false
|
||||
gem 'rqrcode'
|
||||
gem 'rqrcode', require: false
|
||||
gem 'ruby-vips'
|
||||
gem 'rubyXL'
|
||||
gem 'rubyXL', require: false
|
||||
gem 'shakapacker'
|
||||
gem 'sidekiq'
|
||||
gem 'sqlite3', require: false
|
||||
gem 'strip_attributes'
|
||||
gem 'trilogy', github: 'trilogy-libraries/trilogy', glob: 'contrib/ruby/*.gemspec', require: false
|
||||
gem 'turbo-rails'
|
||||
gem 'twitter_cldr', require: false
|
||||
gem 'tzinfo-data'
|
||||
|
||||
@@ -1,29 +1,39 @@
|
||||
GIT
|
||||
remote: https://github.com/trilogy-libraries/trilogy.git
|
||||
revision: 3963d490459df7a2b5bedb42424c3285f25eab22
|
||||
glob: contrib/ruby/*.gemspec
|
||||
specs:
|
||||
trilogy (2.10.0)
|
||||
bigdecimal
|
||||
|
||||
GEM
|
||||
remote: https://rubygems.org/
|
||||
specs:
|
||||
actioncable (8.0.2.1)
|
||||
actionpack (= 8.0.2.1)
|
||||
activesupport (= 8.0.2.1)
|
||||
action_text-trix (2.1.16)
|
||||
railties
|
||||
actioncable (8.1.2)
|
||||
actionpack (= 8.1.2)
|
||||
activesupport (= 8.1.2)
|
||||
nio4r (~> 2.0)
|
||||
websocket-driver (>= 0.6.1)
|
||||
zeitwerk (~> 2.6)
|
||||
actionmailbox (8.0.2.1)
|
||||
actionpack (= 8.0.2.1)
|
||||
activejob (= 8.0.2.1)
|
||||
activerecord (= 8.0.2.1)
|
||||
activestorage (= 8.0.2.1)
|
||||
activesupport (= 8.0.2.1)
|
||||
actionmailbox (8.1.2)
|
||||
actionpack (= 8.1.2)
|
||||
activejob (= 8.1.2)
|
||||
activerecord (= 8.1.2)
|
||||
activestorage (= 8.1.2)
|
||||
activesupport (= 8.1.2)
|
||||
mail (>= 2.8.0)
|
||||
actionmailer (8.0.2.1)
|
||||
actionpack (= 8.0.2.1)
|
||||
actionview (= 8.0.2.1)
|
||||
activejob (= 8.0.2.1)
|
||||
activesupport (= 8.0.2.1)
|
||||
actionmailer (8.1.2)
|
||||
actionpack (= 8.1.2)
|
||||
actionview (= 8.1.2)
|
||||
activejob (= 8.1.2)
|
||||
activesupport (= 8.1.2)
|
||||
mail (>= 2.8.0)
|
||||
rails-dom-testing (~> 2.2)
|
||||
actionpack (8.0.2.1)
|
||||
actionview (= 8.0.2.1)
|
||||
activesupport (= 8.0.2.1)
|
||||
actionpack (8.1.2)
|
||||
actionview (= 8.1.2)
|
||||
activesupport (= 8.1.2)
|
||||
nokogiri (>= 1.8.5)
|
||||
rack (>= 2.2.4)
|
||||
rack-session (>= 1.0.1)
|
||||
@@ -31,97 +41,97 @@ GEM
|
||||
rails-dom-testing (~> 2.2)
|
||||
rails-html-sanitizer (~> 1.6)
|
||||
useragent (~> 0.16)
|
||||
actiontext (8.0.2.1)
|
||||
actionpack (= 8.0.2.1)
|
||||
activerecord (= 8.0.2.1)
|
||||
activestorage (= 8.0.2.1)
|
||||
activesupport (= 8.0.2.1)
|
||||
actiontext (8.1.2)
|
||||
action_text-trix (~> 2.1.15)
|
||||
actionpack (= 8.1.2)
|
||||
activerecord (= 8.1.2)
|
||||
activestorage (= 8.1.2)
|
||||
activesupport (= 8.1.2)
|
||||
globalid (>= 0.6.0)
|
||||
nokogiri (>= 1.8.5)
|
||||
actionview (8.0.2.1)
|
||||
activesupport (= 8.0.2.1)
|
||||
actionview (8.1.2)
|
||||
activesupport (= 8.1.2)
|
||||
builder (~> 3.1)
|
||||
erubi (~> 1.11)
|
||||
rails-dom-testing (~> 2.2)
|
||||
rails-html-sanitizer (~> 1.6)
|
||||
activejob (8.0.2.1)
|
||||
activesupport (= 8.0.2.1)
|
||||
activejob (8.1.2)
|
||||
activesupport (= 8.1.2)
|
||||
globalid (>= 0.3.6)
|
||||
activemodel (8.0.2.1)
|
||||
activesupport (= 8.0.2.1)
|
||||
activerecord (8.0.2.1)
|
||||
activemodel (= 8.0.2.1)
|
||||
activesupport (= 8.0.2.1)
|
||||
activemodel (8.1.2)
|
||||
activesupport (= 8.1.2)
|
||||
activerecord (8.1.2)
|
||||
activemodel (= 8.1.2)
|
||||
activesupport (= 8.1.2)
|
||||
timeout (>= 0.4.0)
|
||||
activestorage (8.0.2.1)
|
||||
actionpack (= 8.0.2.1)
|
||||
activejob (= 8.0.2.1)
|
||||
activerecord (= 8.0.2.1)
|
||||
activesupport (= 8.0.2.1)
|
||||
activestorage (8.1.2)
|
||||
actionpack (= 8.1.2)
|
||||
activejob (= 8.1.2)
|
||||
activerecord (= 8.1.2)
|
||||
activesupport (= 8.1.2)
|
||||
marcel (~> 1.0)
|
||||
activesupport (8.0.2.1)
|
||||
activesupport (8.1.2)
|
||||
base64
|
||||
benchmark (>= 0.3)
|
||||
bigdecimal
|
||||
concurrent-ruby (~> 1.0, >= 1.3.1)
|
||||
connection_pool (>= 2.2.5)
|
||||
drb
|
||||
i18n (>= 1.6, < 2)
|
||||
json
|
||||
logger (>= 1.4.2)
|
||||
minitest (>= 5.1)
|
||||
securerandom (>= 0.3)
|
||||
tzinfo (~> 2.0, >= 2.0.5)
|
||||
uri (>= 0.13.1)
|
||||
addressable (2.8.7)
|
||||
public_suffix (>= 2.0.2, < 7.0)
|
||||
annotaterb (4.14.0)
|
||||
addressable (2.8.8)
|
||||
public_suffix (>= 2.0.2, < 8.0)
|
||||
annotaterb (4.20.0)
|
||||
activerecord (>= 6.0.0)
|
||||
activesupport (>= 6.0.0)
|
||||
arabic-letter-connector (0.1.1)
|
||||
ast (2.4.3)
|
||||
aws-eventstream (1.3.0)
|
||||
aws-partitions (1.1027.0)
|
||||
aws-sdk-core (3.214.0)
|
||||
aws-eventstream (1.4.0)
|
||||
aws-partitions (1.1209.0)
|
||||
aws-sdk-core (3.241.4)
|
||||
aws-eventstream (~> 1, >= 1.3.0)
|
||||
aws-partitions (~> 1, >= 1.992.0)
|
||||
aws-sigv4 (~> 1.9)
|
||||
base64
|
||||
bigdecimal
|
||||
jmespath (~> 1, >= 1.6.1)
|
||||
aws-sdk-kms (1.96.0)
|
||||
aws-sdk-core (~> 3, >= 3.210.0)
|
||||
logger
|
||||
aws-sdk-kms (1.121.0)
|
||||
aws-sdk-core (~> 3, >= 3.241.4)
|
||||
aws-sigv4 (~> 1.5)
|
||||
aws-sdk-s3 (1.176.1)
|
||||
aws-sdk-core (~> 3, >= 3.210.0)
|
||||
aws-sdk-s3 (1.212.0)
|
||||
aws-sdk-core (~> 3, >= 3.241.4)
|
||||
aws-sdk-kms (~> 1)
|
||||
aws-sigv4 (~> 1.5)
|
||||
aws-sdk-secretsmanager (1.110.0)
|
||||
aws-sdk-core (~> 3, >= 3.210.0)
|
||||
aws-sdk-secretsmanager (1.128.0)
|
||||
aws-sdk-core (~> 3, >= 3.241.4)
|
||||
aws-sigv4 (~> 1.5)
|
||||
aws-sigv4 (1.10.1)
|
||||
aws-sigv4 (1.12.1)
|
||||
aws-eventstream (~> 1, >= 1.0.2)
|
||||
azure-storage-blob (2.0.3)
|
||||
azure-storage-common (~> 2.0)
|
||||
nokogiri (~> 1, >= 1.10.8)
|
||||
azure-storage-common (2.0.4)
|
||||
faraday (~> 1.0)
|
||||
faraday_middleware (~> 1.0, >= 1.0.0.rc1)
|
||||
net-http-persistent (~> 4.0)
|
||||
nokogiri (~> 1, >= 1.10.8)
|
||||
azure-blob (0.8.0)
|
||||
cgi
|
||||
rexml
|
||||
base64 (0.3.0)
|
||||
bcrypt (3.1.20)
|
||||
benchmark (0.4.1)
|
||||
better_html (2.1.1)
|
||||
actionview (>= 6.0)
|
||||
activesupport (>= 6.0)
|
||||
bcrypt (3.1.21)
|
||||
better_html (2.2.0)
|
||||
actionview (>= 7.0)
|
||||
activesupport (>= 7.0)
|
||||
ast (~> 2.0)
|
||||
erubi (~> 1.4)
|
||||
parser (>= 2.4)
|
||||
smart_properties
|
||||
bigdecimal (3.2.2)
|
||||
bigdecimal (4.0.1)
|
||||
bindex (0.8.1)
|
||||
bootsnap (1.18.4)
|
||||
bootsnap (1.21.1)
|
||||
msgpack (~> 1.2)
|
||||
brakeman (7.0.0)
|
||||
brakeman (7.1.2)
|
||||
racc
|
||||
builder (3.3.0)
|
||||
bullet (8.0.0)
|
||||
bullet (8.1.0)
|
||||
activesupport (>= 3.0.0)
|
||||
uniform_notifier (~> 1.11)
|
||||
camertron-eprun (1.1.1)
|
||||
@@ -135,28 +145,29 @@ GEM
|
||||
rack-test (>= 0.6.3)
|
||||
regexp_parser (>= 1.5, < 3.0)
|
||||
xpath (~> 3.2)
|
||||
cgi (0.5.1)
|
||||
childprocess (5.1.0)
|
||||
logger (~> 1.5)
|
||||
chunky_png (1.4.0)
|
||||
cldr-plurals-runtime-rb (1.1.0)
|
||||
cmdparse (3.0.7)
|
||||
coderay (1.1.3)
|
||||
concurrent-ruby (1.3.5)
|
||||
connection_pool (2.5.3)
|
||||
crack (1.0.0)
|
||||
concurrent-ruby (1.3.6)
|
||||
connection_pool (3.0.2)
|
||||
crack (1.0.1)
|
||||
bigdecimal
|
||||
rexml
|
||||
crass (1.0.6)
|
||||
css_parser (1.21.0)
|
||||
css_parser (1.21.1)
|
||||
addressable
|
||||
csv (3.3.2)
|
||||
csv (3.3.5)
|
||||
csv-safe (3.3.1)
|
||||
csv (~> 3.0)
|
||||
cuprite (0.15.1)
|
||||
cuprite (0.17)
|
||||
capybara (~> 3.0)
|
||||
ferrum (~> 0.15.0)
|
||||
date (3.4.1)
|
||||
debug (1.10.0)
|
||||
ferrum (~> 0.17.0)
|
||||
date (3.5.1)
|
||||
debug (1.11.1)
|
||||
irb (~> 1.10)
|
||||
reline (>= 0.3.8)
|
||||
declarative (0.0.20)
|
||||
@@ -166,20 +177,20 @@ GEM
|
||||
railties (>= 4.1.0)
|
||||
responders
|
||||
warden (~> 1.2.3)
|
||||
devise-two-factor (6.1.0)
|
||||
activesupport (>= 7.0, < 8.1)
|
||||
devise (~> 4.0)
|
||||
railties (>= 7.0, < 8.1)
|
||||
devise-two-factor (6.3.1)
|
||||
activesupport (>= 7.0, < 8.2)
|
||||
devise (>= 4.0, < 5.0)
|
||||
railties (>= 7.0, < 8.2)
|
||||
rotp (~> 6.0)
|
||||
diff-lcs (1.5.1)
|
||||
digest-crc (0.6.5)
|
||||
diff-lcs (1.6.2)
|
||||
digest-crc (0.7.0)
|
||||
rake (>= 12.0.0, < 14.0.0)
|
||||
docile (1.4.1)
|
||||
dotenv (3.1.7)
|
||||
dotenv (3.2.0)
|
||||
drb (2.2.3)
|
||||
email_typo (0.2.3)
|
||||
erb (5.0.2)
|
||||
erb_lint (0.7.0)
|
||||
erb (6.0.1)
|
||||
erb_lint (0.9.0)
|
||||
activesupport
|
||||
better_html (>= 2.0.1)
|
||||
parser (>= 2.7.1.4)
|
||||
@@ -187,115 +198,99 @@ GEM
|
||||
rubocop (>= 1)
|
||||
smart_properties
|
||||
erubi (1.13.1)
|
||||
factory_bot (6.5.0)
|
||||
activesupport (>= 5.0.0)
|
||||
factory_bot_rails (6.4.4)
|
||||
factory_bot (6.5.6)
|
||||
activesupport (>= 6.1.0)
|
||||
factory_bot_rails (6.5.1)
|
||||
factory_bot (~> 6.5)
|
||||
railties (>= 5.0.0)
|
||||
faker (3.5.1)
|
||||
railties (>= 6.1.0)
|
||||
faker (3.6.0)
|
||||
i18n (>= 1.8.11, < 2)
|
||||
faraday (1.10.4)
|
||||
faraday-em_http (~> 1.0)
|
||||
faraday-em_synchrony (~> 1.0)
|
||||
faraday-excon (~> 1.1)
|
||||
faraday-httpclient (~> 1.0)
|
||||
faraday-multipart (~> 1.0)
|
||||
faraday-net_http (~> 1.0)
|
||||
faraday-net_http_persistent (~> 1.0)
|
||||
faraday-patron (~> 1.0)
|
||||
faraday-rack (~> 1.0)
|
||||
faraday-retry (~> 1.0)
|
||||
ruby2_keywords (>= 0.0.4)
|
||||
faraday-em_http (1.0.0)
|
||||
faraday-em_synchrony (1.0.0)
|
||||
faraday-excon (1.1.0)
|
||||
faraday-follow_redirects (0.3.0)
|
||||
faraday (2.14.1)
|
||||
faraday-net_http (>= 2.0, < 3.5)
|
||||
json
|
||||
logger
|
||||
faraday-follow_redirects (0.5.0)
|
||||
faraday (>= 1, < 3)
|
||||
faraday-httpclient (1.0.1)
|
||||
faraday-multipart (1.1.0)
|
||||
multipart-post (~> 2.0)
|
||||
faraday-net_http (1.0.2)
|
||||
faraday-net_http_persistent (1.2.0)
|
||||
faraday-patron (1.0.0)
|
||||
faraday-rack (1.0.0)
|
||||
faraday-retry (1.0.3)
|
||||
faraday_middleware (1.2.1)
|
||||
faraday (~> 1.0)
|
||||
ferrum (0.15)
|
||||
faraday-net_http (3.4.2)
|
||||
net-http (~> 0.5)
|
||||
ferrum (0.17.1)
|
||||
addressable (~> 2.5)
|
||||
base64 (~> 0.2)
|
||||
concurrent-ruby (~> 1.1)
|
||||
webrick (~> 1.7)
|
||||
websocket-driver (~> 0.7)
|
||||
ffi (1.17.1)
|
||||
ffi (1.17.1-aarch64-linux-musl)
|
||||
ffi (1.17.1-arm64-darwin)
|
||||
ffi (1.17.1-x86_64-linux-musl)
|
||||
foreman (0.88.1)
|
||||
ffi (1.17.3)
|
||||
ffi (1.17.3-aarch64-linux-musl)
|
||||
ffi (1.17.3-arm64-darwin)
|
||||
ffi (1.17.3-x86_64-linux-musl)
|
||||
foreman (0.90.0)
|
||||
thor (~> 1.4)
|
||||
geom2d (0.4.1)
|
||||
globalid (1.2.1)
|
||||
globalid (1.3.0)
|
||||
activesupport (>= 6.1)
|
||||
google-apis-core (0.15.1)
|
||||
addressable (~> 2.5, >= 2.5.1)
|
||||
googleauth (~> 1.9)
|
||||
httpclient (>= 2.8.3, < 3.a)
|
||||
mini_mime (~> 1.0)
|
||||
mutex_m
|
||||
google-apis-core (1.0.2)
|
||||
addressable (~> 2.8, >= 2.8.7)
|
||||
faraday (~> 2.13)
|
||||
faraday-follow_redirects (~> 0.3)
|
||||
googleauth (~> 1.14)
|
||||
mini_mime (~> 1.1)
|
||||
representable (~> 3.0)
|
||||
retriable (>= 2.0, < 4.a)
|
||||
google-apis-iamcredentials_v1 (0.22.0)
|
||||
retriable (~> 3.1)
|
||||
google-apis-iamcredentials_v1 (0.26.0)
|
||||
google-apis-core (>= 0.15.0, < 2.a)
|
||||
google-apis-storage_v1 (0.49.0)
|
||||
google-apis-storage_v1 (0.59.0)
|
||||
google-apis-core (>= 0.15.0, < 2.a)
|
||||
google-cloud-core (1.7.1)
|
||||
google-cloud-core (1.8.0)
|
||||
google-cloud-env (>= 1.0, < 3.a)
|
||||
google-cloud-errors (~> 1.0)
|
||||
google-cloud-env (2.2.1)
|
||||
google-cloud-env (2.3.1)
|
||||
base64 (~> 0.2)
|
||||
faraday (>= 1.0, < 3.a)
|
||||
google-cloud-errors (1.4.0)
|
||||
google-cloud-storage (1.54.0)
|
||||
google-cloud-errors (1.5.0)
|
||||
google-cloud-storage (1.58.0)
|
||||
addressable (~> 2.8)
|
||||
digest-crc (~> 0.4)
|
||||
google-apis-core (~> 0.13)
|
||||
google-apis-core (>= 0.18, < 2)
|
||||
google-apis-iamcredentials_v1 (~> 0.18)
|
||||
google-apis-storage_v1 (~> 0.38)
|
||||
google-apis-storage_v1 (>= 0.42)
|
||||
google-cloud-core (~> 1.6)
|
||||
googleauth (~> 1.9)
|
||||
mini_mime (~> 1.0)
|
||||
google-logging-utils (0.1.0)
|
||||
googleauth (1.12.2)
|
||||
google-logging-utils (0.2.0)
|
||||
googleauth (1.16.1)
|
||||
faraday (>= 1.0, < 3.a)
|
||||
google-cloud-env (~> 2.2)
|
||||
google-logging-utils (~> 0.1)
|
||||
jwt (>= 1.4, < 3.0)
|
||||
jwt (>= 1.4, < 4.0)
|
||||
multi_json (~> 1.11)
|
||||
os (>= 0.9, < 2.0)
|
||||
signet (>= 0.16, < 2.a)
|
||||
hashdiff (1.1.2)
|
||||
hexapdf (1.4.0)
|
||||
hashdiff (1.2.1)
|
||||
hexapdf (1.5.0)
|
||||
cmdparse (~> 3.0, >= 3.0.3)
|
||||
geom2d (~> 0.4, >= 0.4.1)
|
||||
openssl (>= 2.2.1)
|
||||
strscan (>= 3.1.2)
|
||||
htmlentities (4.3.4)
|
||||
httpclient (2.8.3)
|
||||
i18n (1.14.7)
|
||||
htmlentities (4.4.2)
|
||||
i18n (1.14.8)
|
||||
concurrent-ruby (~> 1.0)
|
||||
image_processing (1.13.0)
|
||||
mini_magick (>= 4.9.5, < 5)
|
||||
image_processing (1.14.0)
|
||||
mini_magick (>= 4.9.5, < 6)
|
||||
ruby-vips (>= 2.0.17, < 3)
|
||||
io-console (0.8.1)
|
||||
irb (1.15.2)
|
||||
io-console (0.8.2)
|
||||
irb (1.16.0)
|
||||
pp (>= 0.6.0)
|
||||
rdoc (>= 4.0.0)
|
||||
reline (>= 0.4.2)
|
||||
jmespath (1.6.2)
|
||||
json (2.15.0)
|
||||
jwt (2.9.3)
|
||||
json (2.18.1)
|
||||
jwt (3.1.2)
|
||||
base64
|
||||
language_server-protocol (3.17.0.5)
|
||||
launchy (3.0.1)
|
||||
launchy (3.1.1)
|
||||
addressable (~> 2.8)
|
||||
childprocess (~> 5.0)
|
||||
logger (~> 1.6)
|
||||
letter_opener (1.10.0)
|
||||
launchy (>= 2.2, < 4)
|
||||
letter_opener_web (3.0.0)
|
||||
@@ -310,29 +305,29 @@ GEM
|
||||
activesupport (>= 4)
|
||||
railties (>= 4)
|
||||
request_store (~> 1.0)
|
||||
loofah (2.24.1)
|
||||
loofah (2.25.0)
|
||||
crass (~> 1.0.2)
|
||||
nokogiri (>= 1.12.0)
|
||||
mail (2.8.1)
|
||||
mail (2.9.0)
|
||||
logger
|
||||
mini_mime (>= 0.1.1)
|
||||
net-imap
|
||||
net-pop
|
||||
net-smtp
|
||||
marcel (1.0.4)
|
||||
matrix (0.4.2)
|
||||
marcel (1.1.0)
|
||||
matrix (0.4.3)
|
||||
method_source (1.1.0)
|
||||
mini_magick (4.13.2)
|
||||
mini_magick (5.3.1)
|
||||
logger
|
||||
mini_mime (1.1.5)
|
||||
mini_portile2 (2.8.9)
|
||||
minitest (5.25.5)
|
||||
msgpack (1.7.5)
|
||||
multi_json (1.15.0)
|
||||
multipart-post (2.4.1)
|
||||
mutex_m (0.3.0)
|
||||
mysql2 (0.5.6)
|
||||
net-http-persistent (4.0.5)
|
||||
connection_pool (~> 2.2)
|
||||
net-imap (0.5.9)
|
||||
minitest (6.0.1)
|
||||
prism (~> 1.5)
|
||||
msgpack (1.8.0)
|
||||
multi_json (1.19.1)
|
||||
net-http (0.9.1)
|
||||
uri (>= 0.11.1)
|
||||
net-imap (0.6.2)
|
||||
date
|
||||
net-protocol
|
||||
net-pop (0.1.2)
|
||||
@@ -341,18 +336,18 @@ GEM
|
||||
timeout
|
||||
net-smtp (0.5.1)
|
||||
net-protocol
|
||||
nio4r (2.7.4)
|
||||
nokogiri (1.18.9)
|
||||
nio4r (2.7.5)
|
||||
nokogiri (1.19.0)
|
||||
mini_portile2 (~> 2.8.2)
|
||||
racc (~> 1.4)
|
||||
nokogiri (1.18.9-aarch64-linux-musl)
|
||||
nokogiri (1.19.0-aarch64-linux-musl)
|
||||
racc (~> 1.4)
|
||||
nokogiri (1.18.9-arm64-darwin)
|
||||
nokogiri (1.19.0-arm64-darwin)
|
||||
racc (~> 1.4)
|
||||
nokogiri (1.18.9-x86_64-linux-musl)
|
||||
nokogiri (1.19.0-x86_64-linux-musl)
|
||||
racc (~> 1.4)
|
||||
numo-narray (0.9.2.1)
|
||||
oj (3.16.11)
|
||||
numo-narray-alt (0.9.13)
|
||||
oj (3.16.13)
|
||||
bigdecimal (>= 3.0)
|
||||
ostruct (>= 0.2)
|
||||
onnxruntime (0.10.1)
|
||||
@@ -363,18 +358,23 @@ GEM
|
||||
ffi
|
||||
onnxruntime (0.10.1-x86_64-linux)
|
||||
ffi
|
||||
openssl (3.3.0)
|
||||
openssl (4.0.0)
|
||||
orm_adapter (0.5.0)
|
||||
os (1.1.4)
|
||||
ostruct (0.6.3)
|
||||
package_json (0.1.0)
|
||||
pagy (9.3.3)
|
||||
package_json (0.2.0)
|
||||
pagy (43.2.8)
|
||||
json
|
||||
yaml
|
||||
parallel (1.27.0)
|
||||
parser (3.3.9.0)
|
||||
parser (3.3.10.1)
|
||||
ast (~> 2.4.1)
|
||||
racc
|
||||
pg (1.5.9)
|
||||
pp (0.6.2)
|
||||
pg (1.6.3)
|
||||
pg (1.6.3-aarch64-linux-musl)
|
||||
pg (1.6.3-arm64-darwin)
|
||||
pg (1.6.3-x86_64-linux-musl)
|
||||
pp (0.6.3)
|
||||
prettyprint
|
||||
premailer (1.27.0)
|
||||
addressable
|
||||
@@ -384,23 +384,24 @@ GEM
|
||||
actionmailer (>= 3)
|
||||
net-smtp
|
||||
premailer (~> 1.7, >= 1.7.9)
|
||||
pretender (0.5.0)
|
||||
actionpack (>= 6.1)
|
||||
pretender (0.6.0)
|
||||
actionpack (>= 7.1)
|
||||
prettyprint (0.2.0)
|
||||
prism (1.5.1)
|
||||
pry (0.15.0)
|
||||
prism (1.8.0)
|
||||
pry (0.16.0)
|
||||
coderay (~> 1.1)
|
||||
method_source (~> 1.0)
|
||||
reline (>= 0.6.0)
|
||||
pry-rails (0.3.11)
|
||||
pry (>= 0.13.0)
|
||||
psych (5.2.6)
|
||||
psych (5.3.1)
|
||||
date
|
||||
stringio
|
||||
public_suffix (6.0.1)
|
||||
puma (6.5.0)
|
||||
public_suffix (7.0.2)
|
||||
puma (7.2.0)
|
||||
nio4r (~> 2.0)
|
||||
racc (1.8.1)
|
||||
rack (3.2.3)
|
||||
rack (3.2.4)
|
||||
rack-proxy (0.7.7)
|
||||
rack
|
||||
rack-session (2.1.1)
|
||||
@@ -408,22 +409,22 @@ GEM
|
||||
rack (>= 3.0.0)
|
||||
rack-test (2.2.0)
|
||||
rack (>= 1.3)
|
||||
rackup (2.2.1)
|
||||
rackup (2.3.1)
|
||||
rack (>= 3)
|
||||
rails (8.0.2.1)
|
||||
actioncable (= 8.0.2.1)
|
||||
actionmailbox (= 8.0.2.1)
|
||||
actionmailer (= 8.0.2.1)
|
||||
actionpack (= 8.0.2.1)
|
||||
actiontext (= 8.0.2.1)
|
||||
actionview (= 8.0.2.1)
|
||||
activejob (= 8.0.2.1)
|
||||
activemodel (= 8.0.2.1)
|
||||
activerecord (= 8.0.2.1)
|
||||
activestorage (= 8.0.2.1)
|
||||
activesupport (= 8.0.2.1)
|
||||
rails (8.1.2)
|
||||
actioncable (= 8.1.2)
|
||||
actionmailbox (= 8.1.2)
|
||||
actionmailer (= 8.1.2)
|
||||
actionpack (= 8.1.2)
|
||||
actiontext (= 8.1.2)
|
||||
actionview (= 8.1.2)
|
||||
activejob (= 8.1.2)
|
||||
activemodel (= 8.1.2)
|
||||
activerecord (= 8.1.2)
|
||||
activestorage (= 8.1.2)
|
||||
activesupport (= 8.1.2)
|
||||
bundler (>= 1.15.0)
|
||||
railties (= 8.0.2.1)
|
||||
railties (= 8.1.2)
|
||||
rails-dom-testing (2.3.0)
|
||||
activesupport (>= 5.0.0)
|
||||
minitest
|
||||
@@ -431,30 +432,32 @@ GEM
|
||||
rails-html-sanitizer (1.6.2)
|
||||
loofah (~> 2.21)
|
||||
nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
|
||||
rails-i18n (8.0.1)
|
||||
rails-i18n (8.1.0)
|
||||
i18n (>= 0.7, < 2)
|
||||
railties (>= 8.0.0, < 9)
|
||||
rails_autolink (1.1.8)
|
||||
actionview (> 3.1)
|
||||
activesupport (> 3.1)
|
||||
railties (> 3.1)
|
||||
railties (8.0.2.1)
|
||||
actionpack (= 8.0.2.1)
|
||||
activesupport (= 8.0.2.1)
|
||||
railties (8.1.2)
|
||||
actionpack (= 8.1.2)
|
||||
activesupport (= 8.1.2)
|
||||
irb (~> 1.13)
|
||||
rackup (>= 1.0.0)
|
||||
rake (>= 12.2)
|
||||
thor (~> 1.0, >= 1.2.2)
|
||||
tsort (>= 0.2)
|
||||
zeitwerk (~> 2.6)
|
||||
rainbow (3.1.1)
|
||||
rake (13.3.0)
|
||||
rdoc (6.14.2)
|
||||
rake (13.3.1)
|
||||
rdoc (7.1.0)
|
||||
erb
|
||||
psych (>= 4.0.0)
|
||||
redis-client (0.23.0)
|
||||
tsort
|
||||
redis-client (0.26.4)
|
||||
connection_pool
|
||||
regexp_parser (2.11.3)
|
||||
reline (0.6.2)
|
||||
reline (0.6.3)
|
||||
io-console (~> 0.5)
|
||||
representable (3.2.0)
|
||||
declarative (< 0.1.0)
|
||||
@@ -462,35 +465,35 @@ GEM
|
||||
uber (< 0.2.0)
|
||||
request_store (1.7.0)
|
||||
rack (>= 1.4)
|
||||
responders (3.1.1)
|
||||
actionpack (>= 5.2)
|
||||
railties (>= 5.2)
|
||||
responders (3.2.0)
|
||||
actionpack (>= 7.0)
|
||||
railties (>= 7.0)
|
||||
retriable (3.1.2)
|
||||
rexml (3.4.4)
|
||||
rotp (6.3.0)
|
||||
rouge (4.5.2)
|
||||
rqrcode (2.2.0)
|
||||
rouge (4.7.0)
|
||||
rqrcode (3.2.0)
|
||||
chunky_png (~> 1.0)
|
||||
rqrcode_core (~> 1.0)
|
||||
rqrcode_core (1.2.0)
|
||||
rspec-core (3.13.2)
|
||||
rqrcode_core (~> 2.0)
|
||||
rqrcode_core (2.1.0)
|
||||
rspec-core (3.13.6)
|
||||
rspec-support (~> 3.13.0)
|
||||
rspec-expectations (3.13.3)
|
||||
rspec-expectations (3.13.5)
|
||||
diff-lcs (>= 1.2.0, < 2.0)
|
||||
rspec-support (~> 3.13.0)
|
||||
rspec-mocks (3.13.2)
|
||||
rspec-mocks (3.13.7)
|
||||
diff-lcs (>= 1.2.0, < 2.0)
|
||||
rspec-support (~> 3.13.0)
|
||||
rspec-rails (7.1.0)
|
||||
actionpack (>= 7.0)
|
||||
activesupport (>= 7.0)
|
||||
railties (>= 7.0)
|
||||
rspec-rails (8.0.2)
|
||||
actionpack (>= 7.2)
|
||||
activesupport (>= 7.2)
|
||||
railties (>= 7.2)
|
||||
rspec-core (~> 3.13)
|
||||
rspec-expectations (~> 3.13)
|
||||
rspec-mocks (~> 3.13)
|
||||
rspec-support (~> 3.13)
|
||||
rspec-support (3.13.2)
|
||||
rubocop (1.81.1)
|
||||
rspec-support (3.13.6)
|
||||
rubocop (1.82.1)
|
||||
json (~> 2.3)
|
||||
language_server-protocol (~> 3.17.0.2)
|
||||
lint_roller (~> 1.1.0)
|
||||
@@ -498,85 +501,90 @@ GEM
|
||||
parser (>= 3.3.0.2)
|
||||
rainbow (>= 2.2.2, < 4.0)
|
||||
regexp_parser (>= 2.9.3, < 3.0)
|
||||
rubocop-ast (>= 1.47.1, < 2.0)
|
||||
rubocop-ast (>= 1.48.0, < 2.0)
|
||||
ruby-progressbar (~> 1.7)
|
||||
unicode-display_width (>= 2.4.0, < 4.0)
|
||||
rubocop-ast (1.47.1)
|
||||
rubocop-ast (1.49.0)
|
||||
parser (>= 3.3.7.2)
|
||||
prism (~> 1.4)
|
||||
rubocop-performance (1.23.0)
|
||||
rubocop (>= 1.48.1, < 2.0)
|
||||
rubocop-ast (>= 1.31.1, < 2.0)
|
||||
rubocop-rails (2.27.0)
|
||||
prism (~> 1.7)
|
||||
rubocop-performance (1.26.1)
|
||||
lint_roller (~> 1.1)
|
||||
rubocop (>= 1.75.0, < 2.0)
|
||||
rubocop-ast (>= 1.47.1, < 2.0)
|
||||
rubocop-rails (2.34.3)
|
||||
activesupport (>= 4.2.0)
|
||||
lint_roller (~> 1.1)
|
||||
rack (>= 1.1)
|
||||
rubocop (>= 1.52.0, < 2.0)
|
||||
rubocop-ast (>= 1.31.1, < 2.0)
|
||||
rubocop-rspec (3.3.0)
|
||||
rubocop (~> 1.61)
|
||||
rubocop (>= 1.75.0, < 2.0)
|
||||
rubocop-ast (>= 1.44.0, < 2.0)
|
||||
rubocop-rspec (3.9.0)
|
||||
lint_roller (~> 1.1)
|
||||
rubocop (~> 1.81)
|
||||
ruby-progressbar (1.13.0)
|
||||
ruby-vips (2.2.2)
|
||||
ruby-vips (2.3.0)
|
||||
ffi (~> 1.12)
|
||||
logger
|
||||
ruby2_keywords (0.0.5)
|
||||
rubyXL (3.4.33)
|
||||
rubyXL (3.4.35)
|
||||
nokogiri (>= 1.10.8)
|
||||
rubyzip (>= 1.3.0)
|
||||
rubyzip (2.3.2)
|
||||
rubyzip (>= 3.2.2)
|
||||
rubyzip (3.2.2)
|
||||
securerandom (0.4.1)
|
||||
semantic_range (3.1.0)
|
||||
shakapacker (8.0.2)
|
||||
shakapacker (9.5.0)
|
||||
activesupport (>= 5.2)
|
||||
package_json
|
||||
rack-proxy (>= 0.6.1)
|
||||
railties (>= 5.2)
|
||||
semantic_range (>= 2.3.0)
|
||||
sidekiq (7.3.7)
|
||||
connection_pool (>= 2.3.0)
|
||||
logger
|
||||
rack (>= 2.2.4)
|
||||
redis-client (>= 0.22.2)
|
||||
signet (0.19.0)
|
||||
sidekiq (8.1.0)
|
||||
connection_pool (>= 3.0.0)
|
||||
json (>= 2.16.0)
|
||||
logger (>= 1.7.0)
|
||||
rack (>= 3.2.0)
|
||||
redis-client (>= 0.26.0)
|
||||
signet (0.21.0)
|
||||
addressable (~> 2.8)
|
||||
faraday (>= 0.17.5, < 3.a)
|
||||
jwt (>= 1.5, < 3.0)
|
||||
jwt (>= 1.5, < 4.0)
|
||||
multi_json (~> 1.10)
|
||||
simplecov (0.22.0)
|
||||
docile (~> 1.1)
|
||||
simplecov-html (~> 0.11)
|
||||
simplecov_json_formatter (~> 0.1)
|
||||
simplecov-html (0.13.1)
|
||||
simplecov-html (0.13.2)
|
||||
simplecov_json_formatter (0.1.4)
|
||||
smart_properties (1.17.0)
|
||||
sqlite3 (2.5.0)
|
||||
sqlite3 (2.9.0)
|
||||
mini_portile2 (~> 2.8.0)
|
||||
sqlite3 (2.5.0-aarch64-linux-musl)
|
||||
sqlite3 (2.5.0-arm64-darwin)
|
||||
sqlite3 (2.5.0-x86_64-linux-musl)
|
||||
stringio (3.1.7)
|
||||
strip_attributes (1.14.1)
|
||||
sqlite3 (2.9.0-aarch64-linux-musl)
|
||||
sqlite3 (2.9.0-arm64-darwin)
|
||||
sqlite3 (2.9.0-x86_64-linux-musl)
|
||||
stringio (3.2.0)
|
||||
strip_attributes (2.0.1)
|
||||
activemodel (>= 3.0, < 9.0)
|
||||
strscan (3.1.5)
|
||||
thor (1.4.0)
|
||||
timeout (0.4.3)
|
||||
strscan (3.1.7)
|
||||
thor (1.5.0)
|
||||
timeout (0.6.0)
|
||||
trailblazer-option (0.1.2)
|
||||
turbo-rails (2.0.11)
|
||||
actionpack (>= 6.0.0)
|
||||
railties (>= 6.0.0)
|
||||
twitter_cldr (6.12.1)
|
||||
tsort (0.2.0)
|
||||
turbo-rails (2.0.21)
|
||||
actionpack (>= 7.1.0)
|
||||
railties (>= 7.1.0)
|
||||
twitter_cldr (6.14.0)
|
||||
base64
|
||||
camertron-eprun
|
||||
cldr-plurals-runtime-rb (~> 1.1)
|
||||
tzinfo
|
||||
tzinfo (2.0.6)
|
||||
concurrent-ruby (~> 1.0)
|
||||
tzinfo-data (1.2024.2)
|
||||
tzinfo-data (1.2025.3)
|
||||
tzinfo (>= 1.0.0)
|
||||
uber (0.1.0)
|
||||
unicode-display_width (3.2.0)
|
||||
unicode-emoji (~> 4.1)
|
||||
unicode-emoji (4.1.0)
|
||||
uniform_notifier (1.16.0)
|
||||
uri (1.0.3)
|
||||
unicode-emoji (4.2.0)
|
||||
uniform_notifier (1.18.0)
|
||||
uri (1.1.1)
|
||||
useragent (0.16.11)
|
||||
warden (1.2.9)
|
||||
rack (>= 2.0.9)
|
||||
@@ -585,18 +593,19 @@ GEM
|
||||
activemodel (>= 6.0.0)
|
||||
bindex (>= 0.4.0)
|
||||
railties (>= 6.0.0)
|
||||
webmock (3.24.0)
|
||||
webmock (3.26.1)
|
||||
addressable (>= 2.8.0)
|
||||
crack (>= 0.3.2)
|
||||
hashdiff (>= 0.4.0, < 2.0.0)
|
||||
webrick (1.9.1)
|
||||
webrick (1.9.2)
|
||||
websocket-driver (0.8.0)
|
||||
base64
|
||||
websocket-extensions (>= 0.1.0)
|
||||
websocket-extensions (0.1.5)
|
||||
xpath (3.2.0)
|
||||
nokogiri (~> 1.8)
|
||||
zeitwerk (2.7.3)
|
||||
yaml (0.4.0)
|
||||
zeitwerk (2.7.4)
|
||||
|
||||
PLATFORMS
|
||||
aarch64-linux-musl
|
||||
@@ -609,7 +618,7 @@ DEPENDENCIES
|
||||
arabic-letter-connector
|
||||
aws-sdk-s3
|
||||
aws-sdk-secretsmanager
|
||||
azure-storage-blob
|
||||
azure-blob
|
||||
better_html
|
||||
bootsnap
|
||||
brakeman
|
||||
@@ -636,8 +645,7 @@ DEPENDENCIES
|
||||
jwt
|
||||
letter_opener_web
|
||||
lograge
|
||||
mysql2
|
||||
numo-narray
|
||||
numo-narray-alt
|
||||
oj
|
||||
onnxruntime
|
||||
pagy
|
||||
@@ -665,6 +673,7 @@ DEPENDENCIES
|
||||
simplecov
|
||||
sqlite3
|
||||
strip_attributes
|
||||
trilogy!
|
||||
turbo-rails
|
||||
twitter_cldr
|
||||
tzinfo-data
|
||||
|
||||
+389
-486
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,28 @@
|
||||
From 60d2d1daf12abae33ee09ca42b9c7f1ad2aa3fa1 Mon Sep 17 00:00:00 2001
|
||||
From: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
|
||||
Date: Thu, 19 Feb 2026 20:11:20 -0500
|
||||
Subject: [PATCH] dotenv: only switch to uid 2000 when running as root
|
||||
|
||||
Non-root processes cannot switch to uid/gid 2000 and may crash under
|
||||
strict seccomp filters when setxid syscalls are blocked. Keep the switch
|
||||
logic for root-run/container setups (e.g. Synology ACL case).
|
||||
---
|
||||
config/dotenv.rb | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/config/dotenv.rb b/config/dotenv.rb
|
||||
index b17d9aac..b4ef51b0 100644
|
||||
--- a/config/dotenv.rb
|
||||
+++ b/config/dotenv.rb
|
||||
@@ -60,7 +60,7 @@ if ENV['RAILS_ENV'] == 'production'
|
||||
ENV['DATABASE_URL'] = ENV['DATABASE_URL'].to_s.empty? ? database_url : ENV.fetch('DATABASE_URL', nil)
|
||||
end
|
||||
|
||||
- unless Process.euid == 2000
|
||||
+ if Process.uid.zero? && Process.euid != 2000
|
||||
begin
|
||||
test_file = "#{ENV.fetch('WORKDIR', '.')}/test"
|
||||
|
||||
--
|
||||
2.52.0
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "docuseal";
|
||||
version = "2.2.0";
|
||||
version = "2.3.4";
|
||||
|
||||
bundler = bundler.override { ruby = ruby_3_4; };
|
||||
|
||||
@@ -24,11 +24,17 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
owner = "docusealco";
|
||||
repo = "docuseal";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-QKGIcLdyIeYcHXA3TRv7PS9V2mok3Y8UOuqCdnCpNfM=";
|
||||
hash = "sha256-JKV0xAtEbGETprC5zYEcmCVcUFrW4h/+lbYayzWefKs=";
|
||||
# https://github.com/docusealco/docuseal/issues/505#issuecomment-3153802333
|
||||
postFetch = "rm $out/db/schema.rb";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Drop setxid calls in non-root mode (fails under strict seccomp).
|
||||
# https://github.com/docusealco/docuseal/pull/593
|
||||
./only-switch-uid-when-root.patch
|
||||
];
|
||||
|
||||
rubyEnv = bundlerEnv {
|
||||
name = "docuseal-gems";
|
||||
ruby = ruby_3_4;
|
||||
@@ -46,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
offlineCache = fetchYarnDeps {
|
||||
inherit (finalAttrs) src;
|
||||
hash = "sha256-WypnmgUbt+qlJivg1oWX6dabD/1o0H6c3ODcv+S5Ptw=";
|
||||
hash = "sha256-AvdaSIXO31t15wWysTvFISqmKCAi1Q8CJgO0J2DqM6M=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -95,7 +101,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/public/packs
|
||||
cp -r ${finalAttrs.src}/* $out
|
||||
cp -r ./* $out
|
||||
cp -r ${finalAttrs.docusealWeb}/* $out/public/packs
|
||||
|
||||
bundle exec bootsnap precompile --gemfile app/ lib/
|
||||
|
||||
@@ -29,6 +29,8 @@ sed -i "/^ruby '[0-9]\+\.[0-9]\+\.[0-9]\+'$/d" "$repo/Gemfile"
|
||||
# fix: https://github.com/nix-community/bundix/issues/88
|
||||
BUNDLE_GEMFILE="$repo/Gemfile" bundler lock --remove-platform x86_64-linux --lockfile="$repo/Gemfile.lock"
|
||||
BUNDLE_GEMFILE="$repo/Gemfile" bundler lock --remove-platform aarch64-linux --lockfile="$repo/Gemfile.lock"
|
||||
# keep generic gems available for bundlerEnv consumers
|
||||
BUNDLE_GEMFILE="$repo/Gemfile" bundler lock --add-platform ruby --lockfile="$repo/Gemfile.lock"
|
||||
# generate gemset.nix
|
||||
bundix --lock --lockfile="$repo/Gemfile.lock" --gemfile="$repo/Gemfile" --gemset="$dir/gemset.nix"
|
||||
|
||||
|
||||
@@ -103,7 +103,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
description = "Device Tree Compiler";
|
||||
homepage = "https://git.kernel.org/pub/scm/utils/dtc/dtc.git";
|
||||
license = lib.licenses.gpl2Plus; # dtc itself is GPLv2, libfdt is dual GPL/BSD
|
||||
maintainers = [ lib.maintainers.dezgeg ];
|
||||
maintainers = [ ];
|
||||
platforms = lib.platforms.unix;
|
||||
mainProgram = "dtc";
|
||||
};
|
||||
|
||||
@@ -2,25 +2,32 @@
|
||||
lib,
|
||||
buildNpmPackage,
|
||||
fetchFromGitHub,
|
||||
versionCheckHook,
|
||||
}:
|
||||
|
||||
buildNpmPackage rec {
|
||||
buildNpmPackage (finalAttrs: {
|
||||
pname = "eask-cli";
|
||||
version = "0.12.8";
|
||||
version = "0.12.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "emacs-eask";
|
||||
repo = "cli";
|
||||
rev = version;
|
||||
hash = "sha256-eH46NlHQs+OVbc3WVUKHQGgXi9rvFMTrbd3UB8WCB6k=";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-jYdx+MYgUop01MzcKPxtm+ZW6lsy9eCqH00uQd8imRw=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-U/VKtefL31FNYUegt8+Qg2jM6fx4cX660UcNqGsWMOc=";
|
||||
npmDepsHash = "sha256-Xj68un97I8xtAY3RXEq8PNC8ZOZ+NWg6SblnmKzHGMo=";
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
nativeInstallCheckInputs = [
|
||||
versionCheckHook
|
||||
];
|
||||
|
||||
doInstallCheck = true;
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/emacs-eask/cli/blob/${src.rev}/CHANGELOG.md";
|
||||
changelog = "https://github.com/emacs-eask/cli/blob/${finalAttrs.version}/CHANGELOG.md";
|
||||
description = "CLI for building, runing, testing, and managing your Emacs Lisp dependencies";
|
||||
homepage = "https://emacs-eask.github.io/";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
@@ -30,4 +37,4 @@ buildNpmPackage rec {
|
||||
piotrkwiecinski
|
||||
];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -61,9 +61,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
meta = {
|
||||
description = "High performance ray tracing kernels from Intel";
|
||||
homepage = "https://embree.github.io/";
|
||||
maintainers = with lib.maintainers; [
|
||||
hodapp
|
||||
];
|
||||
maintainers = [ ];
|
||||
license = lib.licenses.asl20;
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
|
||||
@@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
changelog = "https://github.com/ktprime/emhash/releases/tag/v${finalAttrs.version}";
|
||||
description = "Fast and memory efficient c++ flat hash map/set";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ blenderfreaky ];
|
||||
maintainers = with lib.maintainers; [ kilyanni ];
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
})
|
||||
|
||||
@@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
description = "ESP8266/ESP32 build helper tool";
|
||||
homepage = "https://github.com/igrr/esptool-ck";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
maintainers = [ lib.maintainers.dezgeg ];
|
||||
maintainers = [ ];
|
||||
platforms = lib.platforms.linux;
|
||||
mainProgram = "esptool";
|
||||
};
|
||||
|
||||
@@ -116,7 +116,6 @@ python3Packages.buildPythonApplication rec {
|
||||
homepage = "https://github.com/espressif/esptool";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
maintainers = with lib.maintainers; [
|
||||
dezgeg
|
||||
dotlambda
|
||||
];
|
||||
platforms = with lib.platforms; linux ++ darwin;
|
||||
|
||||
@@ -57,7 +57,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
changelog = "https://github.com/MisterTea/EternalTerminal/releases/tag/et-v${finalAttrs.version}";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [
|
||||
dezgeg
|
||||
jshort
|
||||
];
|
||||
platforms = lib.platforms.linux ++ lib.platforms.darwin;
|
||||
|
||||
@@ -17,16 +17,16 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "0.301.1";
|
||||
version = "0.301.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "evcc-io";
|
||||
repo = "evcc";
|
||||
tag = version;
|
||||
hash = "sha256-qs4jtqOn2Kjj6dL5qGBI5jQyt/VeZYGexYNtgV2mnCs=";
|
||||
hash = "sha256-14qIWgHLQCz+d0PlIavw4F7XEWpx9jJL43XbCpZb4XA=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Wxu535IGvHD09/ZIn+Ky9pwsysi788+HN4WIsETMdyc=";
|
||||
vendorHash = "sha256-t70o3VWfypvWOLMCqC4I8GXywzrDgNKUi5yAaB0NdZw=";
|
||||
|
||||
commonMeta = {
|
||||
license = lib.licenses.mit;
|
||||
@@ -52,7 +52,7 @@ buildGo126Module rec {
|
||||
|
||||
npmDeps = fetchNpmDeps {
|
||||
inherit src;
|
||||
hash = "sha256-fblf49V+fn+9iuIwwOZ/iYMxUbjtWcm3iEs9mP9l59I=";
|
||||
hash = "sha256-lHbFy2iddAitNz9qxAnhKrhFKPn/w9yeyuNqaBCALEk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -1,17 +1,18 @@
|
||||
diff --git a/src/exo/utils/dashboard_path.py b/src/exo/utils/dashboard_path.py
|
||||
index b5ce9c04..ec60ef4a 100644
|
||||
index 980bb80f..7faecd27 100644
|
||||
--- a/src/exo/utils/dashboard_path.py
|
||||
+++ b/src/exo/utils/dashboard_path.py
|
||||
@@ -5,11 +5,7 @@ from typing import cast
|
||||
@@ -32,12 +32,7 @@ def _find_resources_in_bundle() -> Path | None:
|
||||
|
||||
|
||||
def find_dashboard() -> Path:
|
||||
- dashboard = (
|
||||
- _find_dashboard_in_env()
|
||||
- or _find_dashboard_in_repo()
|
||||
- or _find_dashboard_in_bundle()
|
||||
- )
|
||||
+ dashboard = "@dashboard@"
|
||||
if not dashboard:
|
||||
raise FileNotFoundError(
|
||||
"Unable to locate dashboard assets - make sure the dashboard has been built, or export DASHBOARD_DIR if you've built the dashboard elsewhere."
|
||||
- dashboard = _find_dashboard_in_repo() or _find_dashboard_in_bundle()
|
||||
- if not dashboard:
|
||||
- raise FileNotFoundError(
|
||||
- "Unable to locate dashboard assets - you probably forgot to run `cd dashboard && npm install && npm run build && cd ..`"
|
||||
- )
|
||||
- return dashboard
|
||||
+ return Path("@dashboard@")
|
||||
|
||||
|
||||
def _find_dashboard_in_repo() -> Path | None:
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
python3Packages,
|
||||
python3,
|
||||
replaceVars,
|
||||
macmon,
|
||||
|
||||
@@ -18,15 +18,35 @@
|
||||
nix-update-script,
|
||||
}:
|
||||
let
|
||||
version = "1.0.67";
|
||||
version = "1.0.68";
|
||||
src = fetchFromGitHub {
|
||||
name = "exo";
|
||||
owner = "exo-explore";
|
||||
repo = "exo";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-hipCiAqCkkyrVcQXEZKbGoVbgjM3hykUcazNPEbT+q8=";
|
||||
hash = "sha256-ryaz68vXS/SjPxGsWxtUSlzZrLBxV1tbBmJVraZu3RI=";
|
||||
};
|
||||
|
||||
python = python3.override {
|
||||
packageOverrides = _final: prev: {
|
||||
# https://github.com/exo-explore/exo/blob/ba611f9cd0e21d3e63e2327b18fbc888fd085269/pyproject.toml#L67
|
||||
mlx = prev.mlx.overridePythonAttrs (old: {
|
||||
version = "custom";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rltakashige";
|
||||
repo = "mlx-jaccl-fix-small-recv";
|
||||
rev = "address-rdma-gpu-locks";
|
||||
hash = "sha256-GosFIWxIB48Egb1MqJrR3xhsUsQeWdRk5rV93USY6wQ=";
|
||||
};
|
||||
meta = old.meta // {
|
||||
changelog = "";
|
||||
};
|
||||
});
|
||||
};
|
||||
};
|
||||
python3Packages = python.pkgs;
|
||||
|
||||
pyo3-bindings = python3Packages.buildPythonPackage (finalAttrs: {
|
||||
pname = "exo-pyo3-bindings";
|
||||
inherit version src;
|
||||
@@ -36,7 +56,7 @@ let
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit (finalAttrs) pname src version;
|
||||
hash = "sha256-N7B1WFqPdqeNPZe9hXGyX7F3EbB1spzeKc19BFDDwls=";
|
||||
hash = "sha256-Ga3/Yhg2Wn2w8cnNtq11/AN7K4nht4chSEIVOkYEI/U=";
|
||||
};
|
||||
|
||||
# Bypass rust nightly features not being available on rust stable
|
||||
@@ -47,18 +67,8 @@ let
|
||||
rustPlatform.maturinBuildHook
|
||||
];
|
||||
|
||||
nativeCheckInputs = with python3Packages; [
|
||||
pytest-asyncio
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
enabledTestPaths = [
|
||||
"rust/exo_pyo3_bindings/tests/"
|
||||
];
|
||||
|
||||
# RuntimeError
|
||||
# Attempted to create a NULL object
|
||||
doCheck = !stdenv.hostPlatform.isDarwin;
|
||||
# The only test is failing
|
||||
doCheck = false;
|
||||
});
|
||||
|
||||
dashboard = buildNpmPackage (finalAttrs: {
|
||||
@@ -66,6 +76,7 @@ let
|
||||
inherit src version;
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/dashboard";
|
||||
npmDepsFetcherVersion = 3;
|
||||
|
||||
npmDeps = fetchNpmDeps {
|
||||
inherit (finalAttrs)
|
||||
@@ -74,21 +85,8 @@ let
|
||||
src
|
||||
sourceRoot
|
||||
;
|
||||
fetcherVersion = 2;
|
||||
hash = "sha256-ok1Yl8CIPwViioH5HOM4VWilRU3HsSa8IAsBFl/QgG0=";
|
||||
};
|
||||
});
|
||||
|
||||
# exo requires building mlx-lm from its main branch to use the kimi-k2.5 model
|
||||
mlx-lm-unstable = python3Packages.mlx-lm.overridePythonAttrs (old: {
|
||||
version = "0.30.4-unstable-2026-01-27";
|
||||
src = old.src.override {
|
||||
rev = "96699e6dadb13b82b28285bb131a0741997d19ae";
|
||||
tag = null;
|
||||
hash = "sha256-L1ws8XA8VhR18pRuRGbVal/yEfJaFNW8QzS16C1dFpE=";
|
||||
};
|
||||
meta = old.meta // {
|
||||
changelog = "https://github.com/ml-explore/mlx-lm/releases/tag/v0.30.5";
|
||||
fetcherVersion = 3;
|
||||
hash = "sha256-eMmzWwsebwvrpNLqs+4iyiPsDFvwRlk+LaiKQ0SZmt8=";
|
||||
};
|
||||
});
|
||||
in
|
||||
@@ -151,7 +149,8 @@ python3Packages.buildPythonApplication (finalAttrs: {
|
||||
loguru
|
||||
mflux
|
||||
mlx
|
||||
mlx-lm-unstable
|
||||
mlx-lm
|
||||
msgspec
|
||||
nvidia-ml-py
|
||||
openai
|
||||
openai-harmony
|
||||
@@ -169,9 +168,16 @@ python3Packages.buildPythonApplication (finalAttrs: {
|
||||
tomlkit
|
||||
transformers
|
||||
uvloop
|
||||
zstandard
|
||||
]
|
||||
++ sqlalchemy.optional-dependencies.asyncio;
|
||||
|
||||
# 'resources' are not getting copied to the installation directory, so we do it manually
|
||||
# FileNotFoundError: Unable to locate resources. Did you clone the repo properly?
|
||||
postInstall = ''
|
||||
cp -r resources $out/${python.sitePackages}/exo/
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [
|
||||
"exo"
|
||||
"exo.main"
|
||||
@@ -188,7 +194,18 @@ python3Packages.buildPythonApplication (finalAttrs: {
|
||||
rm src/exo/__init__.py
|
||||
'';
|
||||
|
||||
disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
disabledTests = [
|
||||
# AttributeError: type object 'builtins.Keypair' has no attribute 'generate_ed25519'
|
||||
"test_sleep_on_multiple_items"
|
||||
|
||||
# Require internet access:
|
||||
# openai_harmony.HarmonyError: error downloading or loading vocab file: failed to download or load vocab file
|
||||
"test_both_formats_produce_identical_tool_calls"
|
||||
"test_format_a_yields_tool_call"
|
||||
"test_format_b_yields_tool_call"
|
||||
"test_thinking_then_tool_call"
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
# AssertionError: assert "MacMon not found in PATH" in str(exc_info.value)
|
||||
"test_macmon_not_found_raises_macmon_error"
|
||||
|
||||
|
||||
@@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
description = "File system and storage benchmark that can generate both micro and macro workloads";
|
||||
homepage = "https://sourceforge.net/projects/filebench/";
|
||||
license = lib.licenses.cddl;
|
||||
maintainers = [ lib.maintainers.dezgeg ];
|
||||
maintainers = [ ];
|
||||
platforms = lib.platforms.linux;
|
||||
mainProgram = "filebench";
|
||||
};
|
||||
|
||||
@@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
description = "Synchronous write workload file system benchmark";
|
||||
homepage = "https://sourceforge.net/projects/fsmark/";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
maintainers = [ lib.maintainers.dezgeg ];
|
||||
maintainers = [ ];
|
||||
platforms = lib.platforms.linux;
|
||||
mainProgram = "fs_mark";
|
||||
};
|
||||
|
||||
@@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
homepage = "https://github.com/nowsecure/fsmon";
|
||||
changelog = "https://github.com/nowsecure/fsmon/releases/tag/${finalAttrs.version}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ dezgeg ];
|
||||
maintainers = [ ];
|
||||
platforms = lib.platforms.linux;
|
||||
mainProgram = "fsmon";
|
||||
};
|
||||
|
||||
@@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
description = "Live GLSL coding renderer";
|
||||
homepage = "https://patriciogonzalezvivo.com/2015/glslViewer/";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = [ lib.maintainers.hodapp ];
|
||||
maintainers = [ ];
|
||||
platforms = lib.platforms.unix;
|
||||
mainProgram = "glslViewer";
|
||||
# never built on aarch64-darwin since first introduction in nixpkgs
|
||||
|
||||
@@ -78,7 +78,6 @@ stdenv.mkDerivation {
|
||||
# the same distribution terms that you use for the rest of that
|
||||
# program.
|
||||
maintainers = with lib.maintainers; [
|
||||
dezgeg
|
||||
emilytrau
|
||||
];
|
||||
platforms = lib.platforms.all;
|
||||
|
||||
@@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
lgpl21Plus
|
||||
gpl2Plus
|
||||
];
|
||||
maintainers = [ lib.maintainers.dezgeg ];
|
||||
maintainers = [ ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
})
|
||||
|
||||
@@ -98,7 +98,7 @@ buildGoModule (finalAttrs: {
|
||||
changelog = "https://github.com/ivpn/desktop-app/releases/tag/v${finalAttrs.version}";
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = with lib.maintainers; [
|
||||
blenderfreaky
|
||||
kilyanni
|
||||
];
|
||||
mainProgram = "ivpn-service";
|
||||
};
|
||||
|
||||
@@ -84,7 +84,7 @@ buildNpmPackage (finalAttrs: {
|
||||
downloadPage = "https://github.com/ivpn/desktop-app";
|
||||
changelog = "https://github.com/ivpn/desktop-app/releases/tag/v${finalAttrs.version}";
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = with lib.maintainers; [ blenderfreaky ];
|
||||
maintainers = with lib.maintainers; [ kilyanni ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
})
|
||||
|
||||
@@ -42,7 +42,7 @@ buildGoModule (finalAttrs: {
|
||||
changelog = "https://github.com/ivpn/desktop-app/releases/tag/v${finalAttrs.version}";
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = with lib.maintainers; [
|
||||
blenderfreaky
|
||||
kilyanni
|
||||
];
|
||||
mainProgram = "ivpn";
|
||||
};
|
||||
|
||||
@@ -44,7 +44,7 @@ stdenv.mkDerivation {
|
||||
description = "Example OpenGL app using KMS/GBM";
|
||||
homepage = "https://gitlab.freedesktop.org/mesa/kmscube";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ dezgeg ];
|
||||
maintainers = [ ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -88,7 +88,7 @@ buildNpmPackage {
|
||||
downloadPage = "https://github.com/kopia/kopia";
|
||||
changelog = "https://github.com/kopia/kopia/releases/tag/v${version}";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ blenderfreaky ];
|
||||
maintainers = with lib.maintainers; [ kilyanni ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -60,7 +60,7 @@ buildGoModule (finalAttrs: {
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [
|
||||
bbigras
|
||||
blenderfreaky
|
||||
kilyanni
|
||||
nadir-ishiguro
|
||||
];
|
||||
};
|
||||
|
||||
@@ -80,7 +80,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
changelog = "https://github.com/linux-test-project/lcov/releases/tag/v${finalAttrs.version}";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
|
||||
maintainers = with lib.maintainers; [ dezgeg ];
|
||||
maintainers = [ ];
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
})
|
||||
|
||||
@@ -115,7 +115,6 @@ stdenv.mkDerivation {
|
||||
description = "Infrastructure for solid modeling with F-Reps in C, C++, and Guile";
|
||||
homepage = "https://libfive.com/";
|
||||
maintainers = with lib.maintainers; [
|
||||
hodapp
|
||||
kovirobi
|
||||
wulfsta
|
||||
];
|
||||
|
||||
@@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
description = "Client interface library for NIS(YP) and NIS+";
|
||||
homepage = "https://github.com/thkukuk/libnsl";
|
||||
license = lib.licenses.lgpl21;
|
||||
maintainers = [ lib.maintainers.dezgeg ];
|
||||
maintainers = [ ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
})
|
||||
|
||||
@@ -9,17 +9,36 @@
|
||||
yaml-cpp,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libpointmatcher";
|
||||
version = "1.4.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "norlab-ulaval";
|
||||
repo = "libpointmatcher";
|
||||
rev = version;
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-OkfWdim0JDKiBx5spYpkMyFrLQP3AMWBVDpzmFwqNFM=";
|
||||
};
|
||||
|
||||
# Fix boost 1.89 compatibility
|
||||
postPatch = ''
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace-fail \
|
||||
"find_package(Boost REQUIRED COMPONENTS thread system program_options date_time)" \
|
||||
"find_package(Boost REQUIRED COMPONENTS thread program_options date_time)" \
|
||||
--replace-fail \
|
||||
"find_package(Boost REQUIRED COMPONENTS thread system program_options date_time chrono)" \
|
||||
"find_package(Boost REQUIRED COMPONENTS thread program_options date_time chrono)"
|
||||
|
||||
substituteInPlace libpointmatcherConfig.cmake.in \
|
||||
--replace-fail \
|
||||
"find_package(Boost COMPONENTS thread system program_options date_time REQUIRED)" \
|
||||
"find_package(Boost COMPONENTS thread program_options date_time REQUIRED)" \
|
||||
--replace-fail \
|
||||
"find_package(Boost COMPONENTS thread system program_options date_time chrono REQUIRED)" \
|
||||
"find_package(Boost COMPONENTS thread program_options date_time chrono REQUIRED)"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [
|
||||
eigen
|
||||
@@ -30,16 +49,16 @@ stdenv.mkDerivation rec {
|
||||
|
||||
cmakeFlags = [
|
||||
(lib.cmakeFeature "EIGEN_INCLUDE_DIR" "${eigen}/include/eigen3")
|
||||
(lib.cmakeBool "BUILD_TESTS" doCheck)
|
||||
(lib.cmakeBool "BUILD_TESTS" finalAttrs.doCheck)
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
meta = {
|
||||
inherit (src.meta) homepage;
|
||||
inherit (finalAttrs.src.meta) homepage;
|
||||
description = "\"Iterative Closest Point\" library for 2-D/3-D mapping in robotic";
|
||||
license = lib.licenses.bsd3;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [ cryptix ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -43,7 +43,6 @@ stdenv.mkDerivation {
|
||||
"x86_64-linux"
|
||||
];
|
||||
maintainers = with lib.maintainers; [
|
||||
dezgeg
|
||||
tkerber
|
||||
];
|
||||
};
|
||||
|
||||
@@ -53,7 +53,7 @@ stdenv.mkDerivation {
|
||||
description = "Free, open source raytracer";
|
||||
downloadPage = "https://github.com/YafaRay/libYafaRay";
|
||||
homepage = "http://www.yafaray.org";
|
||||
maintainers = with lib.maintainers; [ hodapp ];
|
||||
maintainers = [ ];
|
||||
license = lib.licenses.lgpl21;
|
||||
platforms = [
|
||||
"aarch64-linux"
|
||||
|
||||
@@ -40,6 +40,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
homepage = "https://sourceforge.net/projects/linuxquota/";
|
||||
license = lib.licenses.gpl2Plus; # With some files being BSD as an exception
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = [ lib.maintainers.dezgeg ];
|
||||
maintainers = [ ];
|
||||
};
|
||||
})
|
||||
|
||||
@@ -88,7 +88,7 @@ stdenv.mkDerivation rec {
|
||||
from it).
|
||||
'';
|
||||
license = lib.licenses.lsof;
|
||||
maintainers = with lib.maintainers; [ dezgeg ];
|
||||
maintainers = [ ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
description = "Userspace utility for testing the memory subsystem for faults";
|
||||
homepage = "http://pyropus.ca/software/memtester/";
|
||||
license = lib.licenses.gpl2Only;
|
||||
maintainers = [ lib.maintainers.dezgeg ];
|
||||
maintainers = [ ];
|
||||
platforms = lib.platforms.unix;
|
||||
mainProgram = "memtester";
|
||||
};
|
||||
|
||||
@@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
description = "Simple tool for statistical comparison of data sets";
|
||||
homepage = "https://git.decadent.org.uk/gitweb/?p=ministat.git";
|
||||
license = lib.licenses.beerware;
|
||||
maintainers = [ lib.maintainers.dezgeg ];
|
||||
maintainers = [ ];
|
||||
platforms = lib.platforms.all;
|
||||
mainProgram = "ministat";
|
||||
};
|
||||
|
||||
@@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
mainProgram = "mmc";
|
||||
homepage = "https://git.kernel.org/pub/scm/utils/mmc/mmc-utils.git/";
|
||||
license = lib.licenses.gpl2Only;
|
||||
maintainers = [ lib.maintainers.dezgeg ];
|
||||
maintainers = [ ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
})
|
||||
|
||||
@@ -11,7 +11,15 @@
|
||||
libxdmcp,
|
||||
cppunit,
|
||||
}:
|
||||
|
||||
let
|
||||
libvgm' = libvgm.override {
|
||||
withAllEmulators = false;
|
||||
emulators = [
|
||||
"_PRESET_SMD"
|
||||
];
|
||||
enableLibplayer = false;
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
pname = "mmlgui";
|
||||
version = "210420-preview-unstable-2026-01-09";
|
||||
@@ -52,7 +60,7 @@ stdenv.mkDerivation {
|
||||
|
||||
buildInputs = [
|
||||
glfw
|
||||
libvgm
|
||||
libvgm'
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [
|
||||
libx11
|
||||
@@ -9,12 +9,12 @@
|
||||
}:
|
||||
let
|
||||
pname = "models-dev";
|
||||
version = "0-unstable-2026-02-21";
|
||||
version = "0-unstable-2026-03-01";
|
||||
src = fetchFromGitHub {
|
||||
owner = "anomalyco";
|
||||
repo = "models.dev";
|
||||
rev = "c36b8e94339b004bddc0d84f816bcac14babe1ba";
|
||||
hash = "sha256-z8yswVNWuf/aDbwirp99nCw4VCfzCVIOB4+5s5CKo3I=";
|
||||
rev = "fec48b83d3ef80134f2636202bbb81774ecf631a";
|
||||
hash = "sha256-nxUVyGzFwO7slGZr6lSHYqJKtEzYpW+eLxfMtAV28fk=";
|
||||
};
|
||||
|
||||
node_modules = stdenvNoCC.mkDerivation {
|
||||
|
||||
@@ -83,7 +83,7 @@ stdenv.mkDerivation rec {
|
||||
meta = {
|
||||
homepage = "https://github.com/tuxera/ntfs-3g";
|
||||
description = "FUSE-based NTFS driver with full write support";
|
||||
maintainers = with lib.maintainers; [ dezgeg ];
|
||||
maintainers = [ ];
|
||||
mainProgram = "ntfs-3g";
|
||||
platforms = with lib.platforms; darwin ++ linux;
|
||||
license = with lib.licenses; [
|
||||
|
||||
@@ -26,13 +26,13 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "open-scq30";
|
||||
version = "2.4.0";
|
||||
version = "2.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Oppzippy";
|
||||
repo = "OpenSCQ30";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-BSh10x0cbxfds/3m7XrWmVI1/9Li/Uh9OZA6I9gH8qE=";
|
||||
hash = "sha256-mt6h5Kkx1lY1TSndtOS7AGiol24UQIWolBUNWALgA6I=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -65,7 +65,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
libxi
|
||||
];
|
||||
|
||||
cargoHash = "sha256-410iXY9Ae3CPRX82LmbkWh+huna6YwBV2gtdfc3ap90=";
|
||||
cargoHash = "sha256-Gu7uh+qSBhm2qBX0wH3BJECN9n2KUv4XnzCuBu+ONlw=";
|
||||
|
||||
env.INSTALL_PREFIX = placeholder "out";
|
||||
|
||||
|
||||
@@ -90,7 +90,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
meta = {
|
||||
description = "Advanced shading language for production GI renderers";
|
||||
homepage = "http://openshadinglanguage.org";
|
||||
maintainers = with lib.maintainers; [ hodapp ];
|
||||
maintainers = [ ];
|
||||
license = lib.licenses.bsd3;
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
|
||||
+15
-14
@@ -3,22 +3,18 @@
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
pkg-config,
|
||||
qmake,
|
||||
qttools,
|
||||
wrapQtAppsHook,
|
||||
boost,
|
||||
kirigami2,
|
||||
libsForQt5,
|
||||
kyotocabinet,
|
||||
libmicrohttpd,
|
||||
libosmscout,
|
||||
libpostal,
|
||||
marisa,
|
||||
osrm-backend,
|
||||
protobuf,
|
||||
qtquickcontrols2,
|
||||
qtlocation,
|
||||
protobuf_21,
|
||||
sqlite,
|
||||
valhalla,
|
||||
abseil-cpp_202103,
|
||||
}:
|
||||
|
||||
let
|
||||
@@ -28,6 +24,11 @@ let
|
||||
rev = "a45ea7c17b4a7f320e199b71436074bd624c9e15";
|
||||
hash = "sha256-Mq7Yd+y8M3JNG9BEScwVEmxGWYEy6gaNNSlTGgR9LB4=";
|
||||
};
|
||||
protobuf' = protobuf_21.override {
|
||||
abseil-cpp = abseil-cpp_202103.override {
|
||||
cxxStandard = "17";
|
||||
};
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "osmscout-server";
|
||||
@@ -42,16 +43,16 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
qmake
|
||||
libsForQt5.qmake
|
||||
pkg-config
|
||||
qttools
|
||||
wrapQtAppsHook
|
||||
libsForQt5.qttools
|
||||
libsForQt5.wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
kirigami2
|
||||
qtquickcontrols2
|
||||
qtlocation
|
||||
libsForQt5.kirigami2
|
||||
libsForQt5.qtquickcontrols2
|
||||
libsForQt5.qtlocation
|
||||
valhalla
|
||||
libosmscout
|
||||
osrm-backend
|
||||
@@ -61,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
marisa
|
||||
kyotocabinet
|
||||
boost
|
||||
protobuf
|
||||
protobuf'
|
||||
date
|
||||
];
|
||||
|
||||
@@ -32,18 +32,18 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "pipeline";
|
||||
version = "3.1.1";
|
||||
version = "3.2.4";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "schmiddi-on-mobile";
|
||||
repo = "pipeline";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-iMBdyjN6fMDOSE110tA9i6+D4UaNGG2aBoq+4s0YyJI=";
|
||||
hash = "sha256-ggtsCZWIovjorOyo5pJ0Kc4UX3dWPaDfEce9hsC21Po=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit (finalAttrs) src pname version;
|
||||
hash = "sha256-w+q90i6FQRPFceniUfwouU2p673O4sVnsRfowCu2fWY=";
|
||||
hash = "sha256-SR6QVBSM9KfqxXp6x4si44JJNClqqJTxV4HZ2cQeXd0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -105,6 +105,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = with lib.maintainers; [
|
||||
chuangzhu
|
||||
Kladki
|
||||
];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
|
||||
@@ -9,16 +9,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "pueue";
|
||||
version = "4.0.2";
|
||||
version = "4.0.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Nukesor";
|
||||
repo = "pueue";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-hdYbLgBpPzizaYbj+W+YyXj9ks04SFObJ23gkSMTRPs=";
|
||||
hash = "sha256-r28l6I12pJFRPZgVHhDEe+kPu6UXT/+j2EdeXBeTpFE=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-oMD0AqLBPXRmlKEmIBfAazO6IqfiB2aeA9VwxXyx1Xw=";
|
||||
cargoHash = "sha256-TbZ6rXj6CE0hMasvsMyHrtOQdtjVKxIUjj1LjWNct7c=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
||||
@@ -128,7 +128,6 @@ minimal.overrideAttrs (
|
||||
GUIs and charts.
|
||||
'';
|
||||
platforms = lib.platforms.unix;
|
||||
badPlatforms = lib.platforms.darwin;
|
||||
};
|
||||
}
|
||||
)
|
||||
|
||||
@@ -5,20 +5,21 @@
|
||||
stdenv,
|
||||
libiconv,
|
||||
zlib,
|
||||
gitMinimal,
|
||||
radicle-node,
|
||||
makeBinaryWrapper,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "radicle-tui";
|
||||
version = "0.6.0";
|
||||
version = "0.7.0";
|
||||
|
||||
src = fetchFromRadicle {
|
||||
seed = "seed.radicle.xyz";
|
||||
repo = "z39mP9rQAaGmERfUMPULfPUi473tY";
|
||||
node = "z6MkswQE8gwZw924amKatxnNCXA55BMupMmRg7LvJuim2C1V";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-rz9l9GtycqZoROUI6Hn0Fv5Br0YCIrcHlEWLMP4hasQ=";
|
||||
node = "z6MkgFq6z5fkF2hioLLSNu1zP2qEL1aHXHZzGH1FLFGAnBGz";
|
||||
tag = "releases/${finalAttrs.version}";
|
||||
hash = "sha256-2/pLlhilJyrZl9eLFWIh4YxlJwBbzjmb1Cg1xFSSl5k=";
|
||||
leaveDotGit = true;
|
||||
postFetch = ''
|
||||
git -C $out rev-parse HEAD > $out/.git_head
|
||||
@@ -27,7 +28,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
'';
|
||||
};
|
||||
|
||||
cargoHash = "sha256-f9D4RKWw7y6z9rERuF7F6soyNITvKa6QVt34biZZ5JY=";
|
||||
cargoHash = "sha256-U5Gt8o2OLiJwpDkSK+dNlIx7PtbcBbg61s9GpLG50Vg=";
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace build.rs \
|
||||
@@ -35,39 +36,9 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
--replace-fail "GIT_COMMIT_TIME={commit_time}" "GIT_COMMIT_TIME=$(<.git_time)"
|
||||
'';
|
||||
|
||||
nativeCheckInputs = [ radicle-node ];
|
||||
|
||||
checkFlags = [
|
||||
"--skip=cli::can_be_executed"
|
||||
"--skip=cli::empty_command_is_forwarded"
|
||||
"--skip=cli::help_command_is_forwarded"
|
||||
"--skip=cli::version_command_is_forwarded"
|
||||
"--skip=commands::tui_inbox::cli::empty_operation"
|
||||
"--skip=commands::tui_inbox::cli::empty_operation_is_not_forwarded"
|
||||
"--skip=commands::tui_inbox::cli::empty_operation_is_not_forwarded_explicitly"
|
||||
"--skip=commands::tui_inbox::cli::empty_operation_with_help_is_forwarded"
|
||||
"--skip=commands::tui_inbox::cli::list_operation_is_not_forwarded"
|
||||
"--skip=commands::tui_inbox::cli::list_operation_is_not_forwarded_explicitly"
|
||||
"--skip=commands::tui_inbox::cli::list_operation_with_help_is_forwarded"
|
||||
"--skip=commands::tui_inbox::cli::unknown_operation_show_is_forwarded"
|
||||
"--skip=commands::tui_patch::cli::empty_operation"
|
||||
"--skip=commands::tui_patch::cli::empty_operation_is_not_forwarded"
|
||||
"--skip=commands::tui_patch::cli::empty_operation_is_not_forwarded_explicitly"
|
||||
"--skip=commands::tui_patch::cli::empty_operation_with_help_is_forwarded"
|
||||
"--skip=commands::tui_patch::cli::list_operation_is_not_forwarded"
|
||||
"--skip=commands::tui_patch::cli::list_operation_is_not_forwarded_explicitly"
|
||||
"--skip=commands::tui_patch::cli::list_operation_with_help_is_forwarded"
|
||||
"--skip=commands::tui_patch::cli::unknown_operation_edit_is_forwarded"
|
||||
"--skip=commands::tui_patch::cli::unknown_operation_is_not_forwarded"
|
||||
"--skip=commands::tui_patch::cli::unknown_operation_show_is_forwarded"
|
||||
"--skip=commands::tui_patch::review::test::app_with_single_file_multiple_hunks_can_be_constructed"
|
||||
"--skip=commands::tui_patch::review::test::app_with_single_hunk_can_be_constructed"
|
||||
"--skip=commands::tui_patch::review::test::first_hunk_is_selected_by_default"
|
||||
"--skip=commands::tui_patch::review::test::hunk_can_be_selected"
|
||||
"--skip=commands::tui_patch::review::test::hunks_are_rejected_by_default"
|
||||
"--skip=commands::tui_patch::review::test::multiple_files_single_hunk_can_be_accepted"
|
||||
"--skip=commands::tui_patch::review::test::single_file_multiple_hunks_only_last_can_be_accepted"
|
||||
"--skip=commands::tui_patch::review::test::single_file_single_hunk_can_be_accepted"
|
||||
nativeCheckInputs = [
|
||||
gitMinimal
|
||||
radicle-node
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ makeBinaryWrapper ];
|
||||
|
||||
@@ -8,8 +8,9 @@ dirname="$(dirname "${BASH_SOURCE[0]}")"
|
||||
url=$(nix-instantiate --eval --raw -A radicle-tui.src.url)
|
||||
old_node=$(nix-instantiate --eval --raw -A radicle-tui.src.node)
|
||||
|
||||
ref=$(git ls-remote "$url" 'refs/namespaces/*/refs/tags/*' | cut -f2 | tail -1)
|
||||
[[ "$ref" =~ ^refs/namespaces/([^/]+)/refs/tags/([^/]+)$ ]]
|
||||
ref=$(git ls-remote "$url" 'refs/namespaces/*/refs/tags/releases/*' \
|
||||
| cut -f2 | grep -Ev '\^\{\}$' | sort -t/ -k6rV | head -1)
|
||||
[[ "$ref" =~ ^refs/namespaces/([^/]+)/refs/tags/releases/([^/]+)$ ]]
|
||||
new_node="${BASH_REMATCH[1]}"
|
||||
version="${BASH_REMATCH[2]}"
|
||||
|
||||
|
||||
@@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
description = "Tool for reading and parsing EDID data from monitors";
|
||||
homepage = "http://www.polypux.org/projects/read-edid/";
|
||||
license = lib.licenses.bsd2; # Quoted: "This is an unofficial license. Let's call it BSD-like."
|
||||
maintainers = [ lib.maintainers.dezgeg ];
|
||||
maintainers = [ ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
})
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
# redumper is using C++ modules, this requires latest C++20 compiler and build tools
|
||||
llvmPackages.libcxxStdenv.mkDerivation (finalAttrs: {
|
||||
pname = "redumper";
|
||||
version = "689";
|
||||
version = "699";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "superg";
|
||||
repo = "redumper";
|
||||
tag = "b${finalAttrs.version}";
|
||||
hash = "sha256-VCC6cxbG/PGCPFQuBpPtOoV//nVaMvm87TA32YyYkSc=";
|
||||
hash = "sha256-hUZidsyTJywYiR4wzmbk9kwh9qDseGasBrsL+42z15A=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
|
||||
# nativeBuildInputs
|
||||
cmake,
|
||||
@@ -51,6 +50,14 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
hash = "sha256-u9wswlFkGpPgJaBwSddnpv49wBAmkKRwWFO5jQ9/twA=";
|
||||
};
|
||||
|
||||
# Fix boost 1.89 compatibility
|
||||
postPatch = ''
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace-fail \
|
||||
"find_package(Boost COMPONENTS thread filesystem system program_options date_time chrono timer serialization REQUIRED)" \
|
||||
"find_package(Boost COMPONENTS thread filesystem program_options date_time chrono timer serialization REQUIRED)"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
qt6.wrapQtAppsHook
|
||||
|
||||
@@ -53,13 +53,13 @@ in
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "shairport-sync";
|
||||
version = "5.0";
|
||||
version = "5.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
repo = "shairport-sync";
|
||||
owner = "mikebrady";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-JmzJqod3XMNZPMuZV8ZD8GIz17k7IkJs04dgvINYm/k=";
|
||||
hash = "sha256-/VvAGoS4tpYvnie0jkJvNwuLmLoMy+vOVcQs8K/Qi/0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -71,7 +71,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
license = with lib.licenses; [ gpl2Plus ];
|
||||
mainProgram = "sidplayfp";
|
||||
maintainers = with lib.maintainers; [
|
||||
dezgeg
|
||||
OPNA2608
|
||||
];
|
||||
platforms = lib.platforms.all;
|
||||
|
||||
@@ -40,7 +40,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
license = lib.licenses.asl20;
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = with lib.maintainers; [
|
||||
dezgeg
|
||||
arkivm
|
||||
];
|
||||
};
|
||||
|
||||
@@ -38,8 +38,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
description = "Minilanguage designed to represent the entire contents of a PNG file in an editable form";
|
||||
license = lib.licenses.zlib;
|
||||
mainProgram = "sng";
|
||||
maintainers = with lib.maintainers; [
|
||||
dezgeg
|
||||
maintainers = [
|
||||
];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
|
||||
@@ -78,7 +78,6 @@ python3Packages.buildPythonApplication rec {
|
||||
license = lib.licenses.bsd2;
|
||||
mainProgram = "streamlink";
|
||||
maintainers = with lib.maintainers; [
|
||||
dezgeg
|
||||
zraexy
|
||||
DeeUnderscore
|
||||
];
|
||||
|
||||
Generated
+69
-80
@@ -78,9 +78,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ariadne"
|
||||
version = "0.5.1"
|
||||
version = "0.6.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "36f5e3dca4e09a6f340a61a0e9c7b61e030c69fc27bf29d73218f7e5e3b7638f"
|
||||
checksum = "8454c8a44ce2cb9cc7e7fae67fc6128465b343b92c6631e94beca3c8d1524ea5"
|
||||
dependencies = [
|
||||
"unicode-width",
|
||||
"yansi",
|
||||
@@ -100,9 +100,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
|
||||
|
||||
[[package]]
|
||||
name = "bitflags"
|
||||
version = "2.10.0"
|
||||
version = "2.11.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "812e12b5285cc515a9c72a5c1d3b6d46a19dac5acfef5265968c166106e31dd3"
|
||||
checksum = "843867be96c8daad0d758b57df9392b6d8d271134fce549de6ce169ff98a92af"
|
||||
|
||||
[[package]]
|
||||
name = "bumpalo"
|
||||
@@ -112,9 +112,9 @@ checksum = "5dd9dc738b7a8311c7ade152424974d8115f2cdad61e8dab8dac9f2362298510"
|
||||
|
||||
[[package]]
|
||||
name = "cc"
|
||||
version = "1.2.54"
|
||||
version = "1.2.56"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "6354c81bbfd62d9cfa9cb3c773c2b7b2a3a482d569de977fd0e961f6e7c00583"
|
||||
checksum = "aebf35691d1bfb0ac386a69bac2fde4dd276fb618cf8bf4f5318fe285e821bb2"
|
||||
dependencies = [
|
||||
"find-msvc-tools",
|
||||
"shlex",
|
||||
@@ -141,15 +141,15 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "circular-buffer"
|
||||
version = "0.1.9"
|
||||
version = "1.2.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b67261db007b5f4cf8cba393c1a5c511a5cc072339ce16e12aeba1d7b9b77946"
|
||||
checksum = "14c638459986b83c2b885179bd4ea6a2cbb05697b001501a56adb3a3d230803b"
|
||||
|
||||
[[package]]
|
||||
name = "clap"
|
||||
version = "4.5.54"
|
||||
version = "4.5.58"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c6e6ff9dcd79cff5cd969a17a545d79e84ab086e444102a591e288a8aa3ce394"
|
||||
checksum = "63be97961acde393029492ce0be7a1af7e323e6bae9511ebfac33751be5e6806"
|
||||
dependencies = [
|
||||
"clap_builder",
|
||||
"clap_derive",
|
||||
@@ -157,9 +157,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "clap_builder"
|
||||
version = "4.5.54"
|
||||
version = "4.5.58"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "fa42cf4d2b7a41bc8f663a7cab4031ebafa1bf3875705bfaf8466dc60ab52c00"
|
||||
checksum = "7f13174bda5dfd69d7e947827e5af4b0f2f94a4a3ee92912fba07a66150f21e2"
|
||||
dependencies = [
|
||||
"anstream",
|
||||
"anstyle",
|
||||
@@ -170,21 +170,21 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "clap_derive"
|
||||
version = "4.5.49"
|
||||
version = "4.5.55"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "2a0b5487afeab2deb2ff4e03a807ad1a03ac532ff5a2cee5d86884440c7f7671"
|
||||
checksum = "a92793da1a46a5f2a02a6f4c46c6496b28c43638adea8306fcb0caa1634f24e5"
|
||||
dependencies = [
|
||||
"heck 0.5.0",
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.114",
|
||||
"syn",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "clap_lex"
|
||||
version = "0.7.7"
|
||||
version = "1.0.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c3e64b0cc0439b12df2fa678eae89a1c56a529fd067a9115f7827f1fffd22b32"
|
||||
checksum = "3a822ea5bc7590f9d40f1ba12c0dc3c2760f3482c6984db1573ad11031420831"
|
||||
|
||||
[[package]]
|
||||
name = "colorchoice"
|
||||
@@ -251,7 +251,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.114",
|
||||
"syn",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -262,18 +262,18 @@ checksum = "4c3cf4824e2d5f025c7b531afcb2325364084a16806f6d47fbc1f5fbd9960590"
|
||||
|
||||
[[package]]
|
||||
name = "env_filter"
|
||||
version = "0.1.4"
|
||||
version = "1.0.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1bf3c259d255ca70051b30e2e95b5446cdb8949ac4cd22c0d7fd634d89f568e2"
|
||||
checksum = "7a1c3cc8e57274ec99de65301228b537f1e4eedc1b8e0f9411c6caac8ae7308f"
|
||||
dependencies = [
|
||||
"log",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "env_logger"
|
||||
version = "0.11.8"
|
||||
version = "0.11.9"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "13c863f0904021b108aa8b2f55046443e6b1ebde8fd4a15c399893aae4fa069f"
|
||||
checksum = "b2daee4ea451f429a58296525ddf28b45a3b64f1acf6587e2067437bb11e218d"
|
||||
dependencies = [
|
||||
"anstream",
|
||||
"anstyle",
|
||||
@@ -299,9 +299,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "find-msvc-tools"
|
||||
version = "0.1.8"
|
||||
version = "0.1.9"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8591b0bcc8a98a64310a2fae1bb3e9b8564dd10e381e6e28010fde8e8e8568db"
|
||||
checksum = "5baebc0774151f905a1a2cc41989300b1e6fbb29aff0ceffa1064fdd3088d582"
|
||||
|
||||
[[package]]
|
||||
name = "form_urlencoded"
|
||||
@@ -355,9 +355,9 @@ checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
|
||||
|
||||
[[package]]
|
||||
name = "iana-time-zone"
|
||||
version = "0.1.64"
|
||||
version = "0.1.65"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "33e57f83510bb73707521ebaffa789ec8caf86f9657cad665b092b581d40e9fb"
|
||||
checksum = "e31bc9ad994ba00e440a8aa5c9ef0ec67d5cb5e5cb0cc7f8b744a35b389cc470"
|
||||
dependencies = [
|
||||
"android_system_properties",
|
||||
"core-foundation-sys",
|
||||
@@ -523,9 +523,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "libc"
|
||||
version = "0.2.180"
|
||||
version = "0.2.182"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "bcc35a38544a891a5f7c865aca548a982ccb3b8650a5b06d0fd33a10283c56fc"
|
||||
checksum = "6800badb6cb2082ffd7b6a67e6125bb39f18782f793520caee8cb8846be06112"
|
||||
|
||||
[[package]]
|
||||
name = "libredox"
|
||||
@@ -533,7 +533,7 @@ version = "0.1.12"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3d0b95e02c851351f877147b7deea7b1afb1df71b63aa5f8270716e0c5720616"
|
||||
dependencies = [
|
||||
"bitflags 2.10.0",
|
||||
"bitflags 2.11.0",
|
||||
"libc",
|
||||
]
|
||||
|
||||
@@ -583,9 +583,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "memchr"
|
||||
version = "2.7.6"
|
||||
version = "2.8.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273"
|
||||
checksum = "f8ca58f447f06ed17d5fc4043ce1b10dd205e060fb3ce5b979b8ed8e59ff3f79"
|
||||
|
||||
[[package]]
|
||||
name = "num-traits"
|
||||
@@ -644,7 +644,7 @@ dependencies = [
|
||||
"proc-macro2",
|
||||
"proc-macro2-diagnostics",
|
||||
"quote",
|
||||
"syn 2.0.114",
|
||||
"syn",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -688,7 +688,7 @@ checksum = "af066a9c399a26e020ada66a034357a868728e72cd426f3adcd35f80d88d88c8"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.114",
|
||||
"syn",
|
||||
"version_check",
|
||||
"yansi",
|
||||
]
|
||||
@@ -750,9 +750,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "regex"
|
||||
version = "1.12.2"
|
||||
version = "1.12.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "843bc0191f75f3e22651ae5f1e72939ab2f72a4bc30fa80a066bd66edefc24d4"
|
||||
checksum = "e10754a14b9137dd7b1e3e5b0493cc9171fdd105e0ab477f51b72e7f3ac0e276"
|
||||
dependencies = [
|
||||
"aho-corasick",
|
||||
"memchr",
|
||||
@@ -762,9 +762,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "regex-automata"
|
||||
version = "0.4.13"
|
||||
version = "0.4.14"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5276caf25ac86c8d810222b3dbb938e512c55c6831a10f3e6ed1c93b84041f1c"
|
||||
checksum = "6e1dd4122fc1595e8162618945476892eefca7b88c52820e74af6262213cae8f"
|
||||
dependencies = [
|
||||
"aho-corasick",
|
||||
"memchr",
|
||||
@@ -773,9 +773,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "regex-syntax"
|
||||
version = "0.8.8"
|
||||
version = "0.8.9"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7a2d987857b319362043e95f5353c0535c1f58eec5336fdfcf626430af7def58"
|
||||
checksum = "a96887878f22d7bad8a3b6dc5b7440e0ada9a245242924394987b21cf2210a4c"
|
||||
|
||||
[[package]]
|
||||
name = "replace_with"
|
||||
@@ -789,7 +789,7 @@ version = "1.1.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "146c9e247ccc180c1f61615433868c99f3de3ae256a30a43b49f67c2d9171f34"
|
||||
dependencies = [
|
||||
"bitflags 2.10.0",
|
||||
"bitflags 2.11.0",
|
||||
"errno",
|
||||
"libc",
|
||||
"linux-raw-sys",
|
||||
@@ -838,7 +838,7 @@ checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.114",
|
||||
"syn",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -863,7 +863,7 @@ checksum = "175ee3e80ae9982737ca543e96133087cbd9a485eecc3bc4de9c1a37b47ea59c"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.114",
|
||||
"syn",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -904,18 +904,18 @@ checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
|
||||
|
||||
[[package]]
|
||||
name = "sus-proc-macro"
|
||||
version = "0.3.7"
|
||||
version = "0.3.8"
|
||||
dependencies = [
|
||||
"quote",
|
||||
"regex",
|
||||
"syn 1.0.109",
|
||||
"syn",
|
||||
"tree-sitter",
|
||||
"tree-sitter-sus",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "sus_compiler"
|
||||
version = "0.3.7"
|
||||
version = "0.3.8"
|
||||
dependencies = [
|
||||
"ariadne",
|
||||
"chrono",
|
||||
@@ -946,20 +946,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "syn"
|
||||
version = "1.0.109"
|
||||
version = "2.0.116"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"unicode-ident",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "syn"
|
||||
version = "2.0.114"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d4d107df263a3013ef9b1879b0df87d706ff80f65a86ea879bd9c31f9b307c2a"
|
||||
checksum = "3df424c70518695237746f84cede799c9c58fcb37450d7b23716568cc8bc69cb"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
@@ -974,7 +963,7 @@ checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.114",
|
||||
"syn",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -1004,7 +993,7 @@ checksum = "ebc4ee7f67670e9b64d05fa4253e753e016c6c95ff35b89b7941d6b856dec1d5"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.114",
|
||||
"syn",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -1033,13 +1022,13 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "tree-sitter-language"
|
||||
version = "0.1.6"
|
||||
version = "0.1.7"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4ae62f7eae5eb549c71b76658648b72cc6111f2d87d24a1e31fa907f4943e3ce"
|
||||
checksum = "009994f150cc0cd50ff54917d5bc8bffe8cad10ca10d81c34da2ec421ae61782"
|
||||
|
||||
[[package]]
|
||||
name = "tree-sitter-sus"
|
||||
version = "0.3.7"
|
||||
version = "0.3.8"
|
||||
dependencies = [
|
||||
"cc",
|
||||
"tree-sitter",
|
||||
@@ -1059,15 +1048,15 @@ checksum = "ccb97dac3243214f8d8507998906ca3e2e0b900bf9bf4870477f125b82e68f6e"
|
||||
|
||||
[[package]]
|
||||
name = "unicode-ident"
|
||||
version = "1.0.22"
|
||||
version = "1.0.24"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9312f7c4f6ff9069b165498234ce8be658059c6728633667c526e27dc2cf1df5"
|
||||
checksum = "e6e4313cd5fcd3dad5cafa179702e2b244f760991f45397d14d4ebf38247da75"
|
||||
|
||||
[[package]]
|
||||
name = "unicode-width"
|
||||
version = "0.1.14"
|
||||
version = "0.2.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af"
|
||||
checksum = "b4ac048d71ede7ee76d585517add45da530660ef4390e49b098733c6e897f254"
|
||||
|
||||
[[package]]
|
||||
name = "url"
|
||||
@@ -1147,7 +1136,7 @@ dependencies = [
|
||||
"bumpalo",
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.114",
|
||||
"syn",
|
||||
"wasm-bindgen-shared",
|
||||
]
|
||||
|
||||
@@ -1190,7 +1179,7 @@ checksum = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.114",
|
||||
"syn",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -1201,7 +1190,7 @@ checksum = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.114",
|
||||
"syn",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -1348,28 +1337,28 @@ checksum = "b659052874eb698efe5b9e8cf382204678a0086ebf46982b79d6ca3182927e5d"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.114",
|
||||
"syn",
|
||||
"synstructure",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "zerocopy"
|
||||
version = "0.8.33"
|
||||
version = "0.8.39"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "668f5168d10b9ee831de31933dc111a459c97ec93225beb307aed970d1372dfd"
|
||||
checksum = "db6d35d663eadb6c932438e763b262fe1a70987f9ae936e60158176d710cae4a"
|
||||
dependencies = [
|
||||
"zerocopy-derive",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "zerocopy-derive"
|
||||
version = "0.8.33"
|
||||
version = "0.8.39"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "2c7962b26b0a8685668b671ee4b54d007a67d4eaf05fda79ac0ecf41e32270f1"
|
||||
checksum = "4122cd3169e94605190e77839c9a40d40ed048d305bfdc146e7df40ab0f3e517"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.114",
|
||||
"syn",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -1389,7 +1378,7 @@ checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.114",
|
||||
"syn",
|
||||
"synstructure",
|
||||
]
|
||||
|
||||
@@ -1423,11 +1412,11 @@ checksum = "eadce39539ca5cb3985590102671f2567e659fca9666581ad3411d59207951f3"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.114",
|
||||
"syn",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "zmij"
|
||||
version = "1.0.16"
|
||||
version = "1.0.21"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "dfcd145825aace48cff44a8844de64bf75feec3080e0aa5cdbde72961ae51a65"
|
||||
checksum = "b8848ee67ecc8aedbaf3e4122217aff892639231befc6a1b58d29fff4c2cabaa"
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "sus-compiler";
|
||||
version = "0.3.7";
|
||||
version = "0.3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pc2";
|
||||
repo = "sus-compiler";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-O4aBVN7jbPm7iqMpxCRYWJ+89zcMCZTKyhRLBcQDKa8=";
|
||||
hash = "sha256-4qtbK2zjbopoBmPIsaz5IZvvBwXdKupGDtcO5lw+Ivc=";
|
||||
fetchSubmodules = true;
|
||||
leaveDotGit = true;
|
||||
|
||||
|
||||
@@ -32,6 +32,6 @@ buildGoModule {
|
||||
description = "Tool that allows users to use Tailscale Whois authentication with NGINX as a reverse proxy";
|
||||
license = lib.licenses.bsd3;
|
||||
mainProgram = "tailscale.nginx-auth";
|
||||
maintainers = with lib.maintainers; [ phaer ];
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
mainProgram = "trinity";
|
||||
homepage = "https://github.com/kernelslacker/trinity";
|
||||
license = lib.licenses.gpl2Only;
|
||||
maintainers = [ lib.maintainers.dezgeg ];
|
||||
maintainers = [ ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
})
|
||||
|
||||
@@ -18,16 +18,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "turbo-unwrapped";
|
||||
version = "2.7.6";
|
||||
version = "2.8.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vercel";
|
||||
repo = "turborepo";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-skpTDC27F2S+rKB+24+I1OxgDX6AmdI9QwnUAr0Ps4o=";
|
||||
hash = "sha256-qVkKv3Odpx2KRVPztGhr+8AhxpYRmCF5XRCew957yJA=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-47ATXzlArTT+QsQvCQ7AfnFOXxTbPfXqmMS3zIimkEc=";
|
||||
cargoHash = "sha256-P6lujI0NCfmcJfa1Lw4xyzbP5jzQD5Ghyjhp8s3JpjY=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
capnproto
|
||||
|
||||
@@ -150,6 +150,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
lib.licenses.asl20
|
||||
lib.licenses.llvm-exception
|
||||
];
|
||||
maintainers = [ lib.maintainers.blenderfreaky ];
|
||||
maintainers = [ lib.maintainers.kilyanni ];
|
||||
};
|
||||
})
|
||||
|
||||
@@ -0,0 +1,178 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
nix-update-script,
|
||||
versionCheckHook,
|
||||
|
||||
clang,
|
||||
cmake,
|
||||
gitMinimal,
|
||||
installShellFiles,
|
||||
libclang,
|
||||
makeBinaryWrapper,
|
||||
pkg-config,
|
||||
|
||||
alsa-lib,
|
||||
dotool,
|
||||
libnotify,
|
||||
openssl,
|
||||
pciutils,
|
||||
wl-clipboard,
|
||||
wtype,
|
||||
xclip,
|
||||
xdotool,
|
||||
|
||||
installManPages ? stdenv.buildPlatform.canExecute stdenv.hostPlatform,
|
||||
installShellCompletions ? stdenv.buildPlatform.canExecute stdenv.hostPlatform,
|
||||
|
||||
vulkanSupport ? false,
|
||||
shaderc,
|
||||
vulkan-headers,
|
||||
vulkan-loader,
|
||||
|
||||
onnxSupport ? false,
|
||||
onnxruntime,
|
||||
|
||||
waylandSupport ? stdenv.hostPlatform.isLinux,
|
||||
waylandRuntimePackages ? [
|
||||
dotool
|
||||
wl-clipboard
|
||||
wtype
|
||||
],
|
||||
|
||||
x11Support ? stdenv.hostPlatform.isLinux,
|
||||
x11RuntimePackages ? [
|
||||
xclip
|
||||
xdotool
|
||||
],
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "voxtype";
|
||||
version = "0.6.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "peteonrails";
|
||||
repo = "voxtype";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-2YYHwiTJVD8kDccMvZe0wsKfWw+C2B0qSDAqT3ze8Mg=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-l0GibrwJfDfJmoPFggeTJbDyW2Bg3XLzG7eX3BbHVUs=";
|
||||
|
||||
buildFeatures =
|
||||
[ ]
|
||||
++ lib.optionals vulkanSupport [ "gpu-vulkan" ]
|
||||
++ lib.optionals onnxSupport [
|
||||
"parakeet-load-dynamic"
|
||||
"moonshine"
|
||||
"sensevoice"
|
||||
"paraformer"
|
||||
"dolphin"
|
||||
"omnilingual"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
clang
|
||||
gitMinimal # Required by whisper.cpp cmake
|
||||
installShellFiles
|
||||
makeBinaryWrapper
|
||||
pkg-config
|
||||
]
|
||||
++ lib.optional vulkanSupport [
|
||||
shaderc
|
||||
vulkan-headers
|
||||
vulkan-loader
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
alsa-lib
|
||||
openssl
|
||||
]
|
||||
++ lib.optionals vulkanSupport [
|
||||
vulkan-headers
|
||||
vulkan-loader
|
||||
]
|
||||
++ lib.optionals onnxSupport [
|
||||
onnxruntime
|
||||
];
|
||||
|
||||
env = {
|
||||
# NOTE: set LIBCLANG_PATH so bindgen can locate libclang
|
||||
LIBCLANG_PATH = "${lib.getLib libclang}/lib";
|
||||
|
||||
# NOTE: Ensure reproducible builds targeting AVX2-capable CPUs (x86-64-v3)
|
||||
# This matches the portable AVX2 binaries we ship for other distros
|
||||
RUSTFLAGS = lib.optionalString (
|
||||
stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86_64
|
||||
) "-C target-cpu=x86-64-v3";
|
||||
};
|
||||
|
||||
preBuild = ''
|
||||
# NOTE: whisper.cpp cmake needs some help in sandbox
|
||||
export CMAKE_BUILD_PARALLEL_LEVEL=$NIX_BUILD_CORES
|
||||
''
|
||||
+ lib.optionalString vulkanSupport ''
|
||||
export VULKAN_SDK="${shaderc.bin}"
|
||||
''
|
||||
+ lib.optionalString onnxSupport ''
|
||||
export ORT_LIB_LOCATION="${lib.getLib onnxruntime}/lib"
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
install -Dm644 config/default.toml \
|
||||
$out/share/voxtype/default-config.toml
|
||||
|
||||
wrapProgram $out/bin/voxtype \
|
||||
--prefix PATH : ${
|
||||
(lib.makeBinPath (
|
||||
[
|
||||
libnotify
|
||||
]
|
||||
++ lib.optionals vulkanSupport [
|
||||
pciutils
|
||||
]
|
||||
++ lib.optionals waylandSupport waylandRuntimePackages
|
||||
++ lib.optionals x11Support x11RuntimePackages
|
||||
))
|
||||
+ lib.optionalString onnxSupport " \\"
|
||||
}
|
||||
${lib.optionalString onnxSupport ''
|
||||
--set ORT_DYLIB_PATH "${lib.getLib onnxruntime}/lib/libonnxruntime.so" \
|
||||
--prefix LD_LIBRARY_PATH : "${lib.getLib onnxruntime}/lib"
|
||||
''}
|
||||
''
|
||||
+ lib.optionalString installManPages ''
|
||||
installManPage target/debug/build/voxtype-*/out/man/*
|
||||
''
|
||||
+ lib.optionalString installShellCompletions ''
|
||||
installShellCompletion packaging/completions/voxtype.{bash,zsh,fish}
|
||||
'';
|
||||
|
||||
nativeInstallCheckInputs = [
|
||||
versionCheckHook
|
||||
];
|
||||
doInstallCheck = true;
|
||||
|
||||
passthru.update-script = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Voice-to-text with push-to-talk for Wayland compositors";
|
||||
longDescription = ''
|
||||
Voxtype is a push-to-talk voice-to-text daemon for Linux.
|
||||
Hold a hotkey while speaking, release to transcribe and output
|
||||
text at your cursor position. Supports Whisper, Parakeet,
|
||||
SenseVoice, Moonshine, Paraformer, Dolphin, and Omnilingual engines.
|
||||
'';
|
||||
homepage = "https://voxtype.io";
|
||||
downloadPage = "https://voxtype.io/download/";
|
||||
changelog = "https://github.com/peteonrails/voxtype/releases/tag/v${finalAttrs.version}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ DuskyElf ];
|
||||
platforms = lib.platforms.linux;
|
||||
mainProgram = "voxtype";
|
||||
};
|
||||
})
|
||||
@@ -104,7 +104,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
]; # see https://git.kernel.org/pub/scm/fs/xfs/xfsprogs-dev.git/tree/debian/copyright
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [
|
||||
dezgeg
|
||||
ajs124
|
||||
];
|
||||
};
|
||||
|
||||
@@ -159,7 +159,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
description = "Torture test suite for filesystems";
|
||||
homepage = "https://git.kernel.org/pub/scm/fs/xfs/xfstests-dev.git/";
|
||||
license = lib.licenses.gpl2Only;
|
||||
maintainers = [ lib.maintainers.dezgeg ];
|
||||
maintainers = [ ];
|
||||
platforms = lib.platforms.linux;
|
||||
mainProgram = "xfstests-check";
|
||||
};
|
||||
|
||||
@@ -46,7 +46,7 @@ python3Packages.buildPythonApplication {
|
||||
homepage = "https://aajanki.github.io/yle-dl/";
|
||||
changelog = "https://github.com/aajanki/yle-dl/blob/${src.tag}/ChangeLog";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = with lib.maintainers; [ dezgeg ];
|
||||
maintainers = [ ];
|
||||
platforms = lib.platforms.unix;
|
||||
mainProgram = "yle-dl";
|
||||
};
|
||||
|
||||
@@ -0,0 +1,67 @@
|
||||
{
|
||||
lib,
|
||||
callPackage,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
pkg-config,
|
||||
protobuf,
|
||||
sqlite,
|
||||
writableTmpDirAsHomeHook,
|
||||
gitMinimal,
|
||||
versionCheckHook,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "zeroclaw";
|
||||
version = "0.1.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zeroclaw-labs";
|
||||
repo = "zeroclaw";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-D4/2h7TlOwAU4tl1xcdULRfO21KmP+zLlqQ8DzLqnjQ=";
|
||||
};
|
||||
|
||||
postPatch =
|
||||
let
|
||||
zeroclaw-web = callPackage ./zeroclaw-web { inherit (finalAttrs) version; };
|
||||
in
|
||||
''
|
||||
mkdir -p web
|
||||
ln -s ${zeroclaw-web} web/dist
|
||||
'';
|
||||
|
||||
cargoHash = "sha256-sbC+fdMzjrx0dF5zHBHzMgZeIPQth1oXNqilooVZF8s=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
protobuf
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
sqlite
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
writableTmpDirAsHomeHook
|
||||
gitMinimal
|
||||
];
|
||||
|
||||
checkFlags = [
|
||||
"--skip=memory::lucid::tests::failure_cooldown_avoids_repeated_lucid_calls"
|
||||
"--skip=memory::lucid::tests::recall_handles_lucid_cold_start_delay_within_timeout"
|
||||
"--skip=memory::lucid::tests::recall_merges_lucid_and_local_results"
|
||||
];
|
||||
|
||||
doInstallCheck = true;
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
|
||||
meta = {
|
||||
description = "Fast, small, and fully autonomous AI assistant infrastructure — deploy anywhere, swap anything";
|
||||
homepage = "https://github.com/zeroclaw-labs/zeroclaw";
|
||||
changelog = "https://github.com/zeroclaw-labs/zeroclaw/blob/${finalAttrs.src.tag}/CHANGELOG.md";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ drupol ];
|
||||
mainProgram = "zeroclaw";
|
||||
};
|
||||
})
|
||||
@@ -0,0 +1,29 @@
|
||||
{
|
||||
fetchFromGitHub,
|
||||
buildNpmPackage,
|
||||
version,
|
||||
...
|
||||
}:
|
||||
buildNpmPackage (finalAttrs: {
|
||||
pname = "zeroclaw-web";
|
||||
inherit version;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zeroclaw-labs";
|
||||
repo = "zeroclaw";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-D4/2h7TlOwAU4tl1xcdULRfO21KmP+zLlqQ8DzLqnjQ=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/web";
|
||||
|
||||
npmDepsHash = "sha256-H3extDaq4DgNYTUcw57gqwVWc3aPCWjIJEVYRMzdFdM=";
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
cp -r dist $out
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
})
|
||||
@@ -14,20 +14,20 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "zigbee2mqtt";
|
||||
version = "2.8.0";
|
||||
version = "2.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Koenkk";
|
||||
repo = "zigbee2mqtt";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-O4jTVZ/9mvv6SKQ3Wrs8AcGvHoxuUjNwkHEaZkY9kBM=";
|
||||
hash = "sha256-3AkQOBibkaHVKjbIGI1M6XPfmT0YkFxg16IwVu+TJmc=";
|
||||
};
|
||||
|
||||
pnpmDeps = fetchPnpmDeps {
|
||||
inherit (finalAttrs) pname version src;
|
||||
pnpm = pnpm_9;
|
||||
fetcherVersion = 1;
|
||||
hash = "sha256-USpzlTtNlRI+xOJ37ZEohjNjtSBrq+bIqTNFH1IpObE=";
|
||||
hash = "sha256-MM184JsFVGqOALyQjCyR3QnHqHoQr39lnodq5v4cXAQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -93,6 +93,7 @@ mapAliases {
|
||||
bitwarden-cli = pkgs.bitwarden-cli; # added 2023-07-25
|
||||
bower = throw "bower was removed because it was deprecated"; # added 2025-09-17
|
||||
inherit (pkgs) bower2nix; # added 2024-08-23
|
||||
browserify = throw "browserify has been removed because it was unmaintained in nixpkgs"; # Added 2026-03-01
|
||||
browser-sync = throw "'browser-sync' has been removed because it was unmaintained in nixpkgs"; # Added 2026-01-26
|
||||
inherit (pkgs) btc-rpc-explorer; # added 2023-08-17
|
||||
inherit (pkgs) carbon-now-cli; # added 2023-08-17
|
||||
@@ -332,6 +333,7 @@ mapAliases {
|
||||
rollup = throw "rollup has been removed because it was broken"; # added 2025-04-28
|
||||
inherit (pkgs) rtlcss; # added 2023-08-29
|
||||
s3http = throw "s3http was removed because it was abandoned upstream"; # added 2023-08-18
|
||||
sass = throw "sass has been removed because it was unmaintained in nixpkgs"; # Added 2026-03-01
|
||||
inherit (pkgs) serve; # added 2025-08-27
|
||||
inherit (pkgs) serverless; # Added 2023-11-29
|
||||
shout = throw "shout was removed because it was deprecated upstream in favor of thelounge."; # Added 2024-10-19
|
||||
|
||||
@@ -1,6 +1,4 @@
|
||||
[
|
||||
"browserify",
|
||||
"node2nix",
|
||||
"sass",
|
||||
"semver"
|
||||
]
|
||||
|
||||
-1536
File diff suppressed because it is too large
Load Diff
@@ -106,6 +106,15 @@ buildPythonPackage (finalAttrs: {
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# TypeError: only 0-dimensional arrays can be converted to Python scalars
|
||||
"test_deterministic"
|
||||
"test_mcse_array"
|
||||
"test_mcse_dataset"
|
||||
"test_mcse_nan"
|
||||
"test_multichain_summary_array"
|
||||
"test_numba_mcse"
|
||||
"test_plot_mcse"
|
||||
|
||||
# Tests require network access
|
||||
"test_plot_ppc_transposed"
|
||||
"test_plot_separation"
|
||||
|
||||
@@ -44,7 +44,7 @@ buildPythonPackage {
|
||||
description = "Package enabling color transfer across images";
|
||||
homepage = "https://github.com/hahnec/color-matcher";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = with lib.maintainers; [ blenderfreaky ];
|
||||
maintainers = with lib.maintainers; [ kilyanni ];
|
||||
# requires py2app which is not packaged for darwin
|
||||
broken = stdenv.hostPlatform.isDarwin;
|
||||
};
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user