Merge master into staging-next
This commit is contained in:
github-actions[bot]
@@ -20,8 +20,8 @@ import ./make-test-python.nix (
|
||||
let cfg = config.services.zammad; in
|
||||
{
|
||||
serviceConfig = {
|
||||
Type = "simple";
|
||||
Restart = "always";
|
||||
Type = "oneshot";
|
||||
Restart = "on-failure";
|
||||
|
||||
User = "zammad";
|
||||
Group = "zammad";
|
||||
|
||||
@@ -9,16 +9,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "waylyrics";
|
||||
version = "0.3.15";
|
||||
version = "0.3.16";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "waylyrics";
|
||||
repo = "waylyrics";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-iW3NIPdnMoardC95kgU/jgzHy7qu/7wpJrkMdJE/r9U=";
|
||||
hash = "sha256-/hwx4fe1yjfsLYxsQkUMXrqWhAgp/VJ74N1eSiXuJ54=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-3nPLi7/F8AG5pqHHPHzLCbXKZFeV/Z+LR3nK2BbrlEE=";
|
||||
cargoHash = "sha256-Os7djeTDChNWXWbmDuJWJnf7E+U/V14Jg4cLOMAKhu4=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config wrapGAppsHook4 ];
|
||||
buildInputs = [ openssl dbus ];
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "qemacs";
|
||||
version = "5.4.1c";
|
||||
version = "6.1.1b";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "qemacs";
|
||||
repo = "qemacs";
|
||||
rev = "216b3ff8b77ff138aec22045522d5601b7390e58";
|
||||
hash = "sha256-ngVaZZdr/Ym9YswLqzUtDytC0K7L9mKgORopLghGH3k=";
|
||||
rev = "06b3d373bbcc52b51ccb438bf3cab38a49492ff0";
|
||||
hash = "sha256-Z4BbA8W3bYdw+cHgI24r55OP1Olr3GwKLlfRxjy45i8=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -1,15 +0,0 @@
|
||||
diff --git a/config/application.rb b/config/application.rb
|
||||
index d85a17491..90ea5e387 100644
|
||||
--- a/config/application.rb
|
||||
+++ b/config/application.rb
|
||||
@@ -3,6 +3,7 @@
|
||||
require_relative 'boot'
|
||||
|
||||
require 'rails/all'
|
||||
+require 'nulldb'
|
||||
require_relative '../lib/zammad/safe_mode'
|
||||
|
||||
# DO NOT REMOVE THIS LINE - see issue #2037
|
||||
diff --git a/db/schema.rb b/db/schema.rb
|
||||
new file mode 100644
|
||||
index 000000000..e69de29bb
|
||||
@@ -23,21 +23,20 @@
|
||||
|
||||
let
|
||||
pname = "zammad";
|
||||
version = "6.2.0";
|
||||
version = "6.3.1";
|
||||
|
||||
src = applyPatches {
|
||||
|
||||
src = fetchFromGitHub (lib.importJSON ./source.json);
|
||||
|
||||
patches = [
|
||||
./0001-nulldb.patch
|
||||
./fix-sendmail-location.diff
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
sed -i -e "s|ruby '3.1.[0-9]\+'|ruby '${ruby.version}'|" Gemfile
|
||||
sed -i -e "s|ruby 3.1.[0-9]\+p[0-9]\+|ruby ${ruby.version}|" Gemfile.lock
|
||||
sed -i -e "s|3.1.[0-9]\+|${ruby.version}|" .ruby-version
|
||||
sed -i -e "s|ruby '3.2.[0-9]\+'|ruby '${ruby.version}'|" Gemfile
|
||||
sed -i -e "s|ruby 3.2.[0-9]\+p[0-9]\+|ruby ${ruby.version}|" Gemfile.lock
|
||||
sed -i -e "s|3.2.[0-9]\+|${ruby.version}|" .ruby-version
|
||||
${jq}/bin/jq '. += {name: "Zammad", version: "${version}"}' package.json | ${moreutils}/bin/sponge package.json
|
||||
'';
|
||||
};
|
||||
@@ -65,7 +64,6 @@ let
|
||||
groups = [
|
||||
"assets"
|
||||
"unicorn" # server
|
||||
"nulldb"
|
||||
"test"
|
||||
"mysql"
|
||||
"puma"
|
||||
@@ -100,9 +98,11 @@ let
|
||||
|
||||
offlineCache = fetchYarnDeps {
|
||||
yarnLock = "${src}/yarn.lock";
|
||||
hash = "sha256-u72ZTpcUvFa1gaWi4lzTQa+JsI85jU4n8r1JhqFnCj4=";
|
||||
hash = "sha256-3DuTirYd6lAQd5PRbdOa/6QaMknIqNMTVnxEESF0N/c=";
|
||||
};
|
||||
|
||||
packageResolutions.minimatch = "9.0.3";
|
||||
|
||||
yarnPreBuild = ''
|
||||
mkdir -p deps/Zammad
|
||||
cp -r ${src}/.eslint-plugin-zammad deps/Zammad/.eslint-plugin-zammad
|
||||
@@ -126,6 +126,7 @@ stdenv.mkDerivation {
|
||||
|
||||
nativeBuildInputs = [
|
||||
redis
|
||||
postgresql
|
||||
];
|
||||
|
||||
RAILS_ENV = "production";
|
||||
@@ -140,10 +141,17 @@ stdenv.mkDerivation {
|
||||
REDIS_PID=$!
|
||||
popd
|
||||
|
||||
rake DATABASE_URL="nulldb://user:pass@127.0.0.1/dbname" assets:precompile
|
||||
mkdir postgres-work
|
||||
initdb -D postgres-work --encoding=utf8
|
||||
pg_ctl start -D postgres-work -o "-k $PWD/postgres-work -h '''"
|
||||
createuser -h $PWD/postgres-work zammad -R -S
|
||||
createdb -h $PWD/postgres-work --encoding=utf8 --owner=zammad zammad
|
||||
|
||||
rake DATABASE_URL="postgresql:///zammad?host=$PWD/postgres-work" assets:precompile
|
||||
|
||||
kill $REDIS_PID
|
||||
rm -r redis-work
|
||||
pg_ctl stop -D postgres-work -m immediate
|
||||
rm -r redis-work postgres-work
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"private": true,
|
||||
"scripts": {
|
||||
"generate-graphql-api": "RAILS_ENV=development bundle exec rails generate zammad:graphql_introspection > app/graphql/graphql_introspection.json && npx graphql-codegen -c .graphql_code_generator.yml",
|
||||
"generate-graphql-api": "RAILS_ENV=development bundle exec rails generate zammad:graphql_introspection > app/graphql/graphql_introspection.json && npx graphql-codegen -c .graphql_code_generator.js",
|
||||
"generate-setting-types": "RAILS_ENV=development bundle exec rails generate zammad:setting_types",
|
||||
"dev": "RAILS_ENV=development forego start -f Procfile.dev",
|
||||
"dev:https": "VITE_RUBY_HOST=0.0.0.0 VITE_RUBY_HTTPS=true RAILS_ENV=development forego start -f Procfile.dev-https",
|
||||
@@ -14,134 +14,133 @@
|
||||
"test:ct": "CY_OPEN=true yarn --cwd ./.cypress cypress open --component --project ../ --config-file .cypress/cypress.config.mjs",
|
||||
"test:ci:ct": "CI=true yarn --cwd ./.cypress cypress run --component --project ../ --config-file .cypress/cypress.config.mjs --browser electron",
|
||||
"cypress:snapshots": "sh .cypress/visual-regression/snapshots.sh",
|
||||
"cypress:install": "yarn --cwd ./.cypress install",
|
||||
"story": "histoire dev",
|
||||
"story:build": "HISTOIRE_BUILD=1 histoire build"
|
||||
"cypress:install": "yarn --cwd ./.cypress install"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=18"
|
||||
"node": ">=18.12.0"
|
||||
},
|
||||
"packageManager": "yarn@1.22.21",
|
||||
"packageManager": "yarn@1.22.22",
|
||||
"devDependencies": {
|
||||
"@faker-js/faker": "^8.3.1",
|
||||
"@graphql-codegen/cli": "^5.0.0",
|
||||
"@graphql-codegen/introspection": "^4.0.0",
|
||||
"@faker-js/faker": "^8.4.1",
|
||||
"@graphql-codegen/cli": "^5.0.2",
|
||||
"@graphql-codegen/introspection": "^4.0.3",
|
||||
"@graphql-codegen/near-operation-file-preset": "^3.0.0",
|
||||
"@graphql-codegen/typescript": "^4.0.1",
|
||||
"@graphql-codegen/typescript-operations": "^4.0.1",
|
||||
"@graphql-codegen/typescript-vue-apollo": "^4.1.0",
|
||||
"@histoire/plugin-vue": "^0.17.5",
|
||||
"@graphql-codegen/typescript": "^4.0.6",
|
||||
"@graphql-codegen/typescript-operations": "^4.2.0",
|
||||
"@graphql-codegen/typescript-vue-apollo": "^4.1.1",
|
||||
"@pinia/testing": "^0.1.3",
|
||||
"@testing-library/jest-dom": "^6.1.4",
|
||||
"@testing-library/user-event": "^14.5.1",
|
||||
"@testing-library/vue": "^7.0.0",
|
||||
"@types/lodash-es": "^4.17.11",
|
||||
"@types/rails__actioncable": "^6.1.9",
|
||||
"@testing-library/jest-dom": "^6.4.2",
|
||||
"@testing-library/user-event": "^14.5.2",
|
||||
"@testing-library/vue": "^8.0.3",
|
||||
"@types/lodash-es": "^4.17.12",
|
||||
"@types/rails__actioncable": "^6.1.10",
|
||||
"@types/sinonjs__fake-timers": "^8.1.5",
|
||||
"@types/ua-parser-js": "^0.7.39",
|
||||
"@types/uuid": "^9.0.7",
|
||||
"@typescript-eslint/eslint-plugin": "^6.10.0",
|
||||
"@typescript-eslint/parser": "^6.10.0",
|
||||
"@vitejs/plugin-vue": "^4.5.0",
|
||||
"@vue/eslint-config-prettier": "^8.0.0",
|
||||
"@vue/eslint-config-typescript": "^12.0.0",
|
||||
"@vue/test-utils": "^2.4.2",
|
||||
"autoprefixer": "^10.4.16",
|
||||
"eslint": "^8.54.0",
|
||||
"@types/uuid": "^9.0.8",
|
||||
"@typescript-eslint/eslint-plugin": "^7.3.1",
|
||||
"@typescript-eslint/parser": "^7.3.1",
|
||||
"@vitejs/plugin-vue": "^5.0.4",
|
||||
"@vue/eslint-config-prettier": "^9.0.0",
|
||||
"@vue/eslint-config-typescript": "^13.0.0",
|
||||
"@vue/test-utils": "^2.4.5",
|
||||
"autoprefixer": "^10.4.18",
|
||||
"eslint": "^8.57.0",
|
||||
"eslint-config-airbnb-base": "^15.0.0",
|
||||
"eslint-config-prettier": "^9.0.0",
|
||||
"eslint-config-prettier": "^9.1.0",
|
||||
"eslint-import-resolver-alias": "^1.1.2",
|
||||
"eslint-import-resolver-typescript": "^3.6.1",
|
||||
"eslint-plugin-import": "^2.29.0",
|
||||
"eslint-plugin-prettier": "^5.0.1",
|
||||
"eslint-plugin-import": "^2.29.1",
|
||||
"eslint-plugin-prettier": "^5.1.3",
|
||||
"eslint-plugin-prettier-vue": "^5.0.0",
|
||||
"eslint-plugin-security": "^1.7.1",
|
||||
"eslint-plugin-sonarjs": "^0.23.0",
|
||||
"eslint-plugin-vue": "^9.18.1",
|
||||
"eslint-plugin-security": "^2.1.1",
|
||||
"eslint-plugin-sonarjs": "^0.24.0",
|
||||
"eslint-plugin-vue": "^9.23.0",
|
||||
"eslint-plugin-zammad": "file:.eslint-plugin-zammad",
|
||||
"histoire": "^0.17.5",
|
||||
"jsdom": "^22.1.0",
|
||||
"jsdom": "^24.0.0",
|
||||
"minimatch": "^9.0.3",
|
||||
"mock-apollo-client": "^1.2.1",
|
||||
"postcss": "^8.4.31",
|
||||
"postcss-html": "^1.5.0",
|
||||
"prettier": "3.1.0",
|
||||
"prettier-plugin-tailwindcss": "^0.5.7",
|
||||
"regenerator-runtime": "^0.14.0",
|
||||
"sass": "^1.69.5",
|
||||
"stylelint": "^15.11.0",
|
||||
"postcss": "^8.4.36",
|
||||
"postcss-html": "^1.6.0",
|
||||
"prettier": "3.2.5",
|
||||
"prettier-plugin-tailwindcss": "^0.5.12",
|
||||
"regenerator-runtime": "^0.14.1",
|
||||
"sass": "^1.72.0",
|
||||
"stylelint": "^16.2.1",
|
||||
"stylelint-config-prettier": "^9.0.5",
|
||||
"stylelint-config-recommended-vue": "^1.5.0",
|
||||
"stylelint-config-standard": "^34.0.0",
|
||||
"stylelint-config-standard-scss": "^11.1.0",
|
||||
"stylelint-prettier": "^4.0.2",
|
||||
"stylelint-scss": "^5.3.1",
|
||||
"stylelint-config-standard": "^36.0.0",
|
||||
"stylelint-config-standard-scss": "^13.0.0",
|
||||
"stylelint-prettier": "^5.0.0",
|
||||
"stylelint-scss": "^6.2.1",
|
||||
"svg-baker": "^1.7.0",
|
||||
"svgo": "^3.0.4",
|
||||
"tailwindcss": "^3.3.5",
|
||||
"svgo": "^3.2.0",
|
||||
"tailwindcss": "^3.4.1",
|
||||
"tailwindcss-unimportant": "^2.1.1",
|
||||
"timezone-mock": "^1.3.6",
|
||||
"type-fest": "^4.8.1",
|
||||
"typescript": "^5.2.2",
|
||||
"vite": "^4.5.0",
|
||||
"vite-plugin-pwa": "^0.17.0",
|
||||
"vite-plugin-ruby": "^3.2.2",
|
||||
"vitest": "^0.34.6",
|
||||
"type-fest": "^4.12.0",
|
||||
"typescript": "^5.4.2",
|
||||
"vite": "^5.2.6",
|
||||
"vite-plugin-pwa": "^0.19.7",
|
||||
"vite-plugin-ruby": "^5.0.0",
|
||||
"vitest": "^1.4.0",
|
||||
"vitest-axe": "^0.1.0",
|
||||
"vue-tsc": "^1.8.22"
|
||||
"vue-tsc": "^2.0.6"
|
||||
},
|
||||
"dependencies": {
|
||||
"@apollo/client": "^3.8.7",
|
||||
"@formkit/core": "^1.2.2",
|
||||
"@formkit/dev": "^1.2.2",
|
||||
"@formkit/i18n": "^1.2.2",
|
||||
"@formkit/inputs": "^1.2.2",
|
||||
"@formkit/rules": "^1.2.2",
|
||||
"@formkit/tailwindcss": "^1.2.2",
|
||||
"@formkit/themes": "^1.2.2",
|
||||
"@formkit/utils": "^1.2.2",
|
||||
"@formkit/validation": "^1.2.2",
|
||||
"@formkit/vue": "^1.2.2",
|
||||
"@apollo/client": "^3.9.9",
|
||||
"@formkit/core": "^1.6.0",
|
||||
"@formkit/dev": "^1.6.0",
|
||||
"@formkit/i18n": "^1.6.0",
|
||||
"@formkit/inputs": "^1.6.0",
|
||||
"@formkit/rules": "^1.6.0",
|
||||
"@formkit/tailwindcss": "^1.6.0",
|
||||
"@formkit/themes": "^1.6.0",
|
||||
"@formkit/utils": "^1.6.0",
|
||||
"@formkit/validation": "^1.6.0",
|
||||
"@formkit/vue": "^1.6.0",
|
||||
"@github/webauthn-json": "^2.1.1",
|
||||
"@rails/actioncable": "^7.0.8",
|
||||
"@sinonjs/fake-timers": "^11.2.2",
|
||||
"@tiptap/core": "^2.1.12",
|
||||
"@tiptap/extension-blockquote": "^2.1.12",
|
||||
"@tiptap/extension-character-count": "^2.1.12",
|
||||
"@tiptap/extension-hard-break": "^2.1.12",
|
||||
"@tiptap/extension-image": "^2.1.12",
|
||||
"@tiptap/extension-link": "^2.1.12",
|
||||
"@tiptap/extension-list-item": "^2.1.12",
|
||||
"@tiptap/extension-mention": "^2.1.12",
|
||||
"@tiptap/extension-ordered-list": "^2.1.12",
|
||||
"@tiptap/extension-paragraph": "^2.1.12",
|
||||
"@tiptap/extension-strike": "^2.1.12",
|
||||
"@tiptap/extension-underline": "^2.1.12",
|
||||
"@tiptap/pm": "^2.1.12",
|
||||
"@tiptap/starter-kit": "^2.1.12",
|
||||
"@tiptap/suggestion": "^2.1.12",
|
||||
"@tiptap/vue-3": "^2.1.12",
|
||||
"@vue/apollo-composable": "^4.0.0-beta.11",
|
||||
"@vueuse/core": "^10.6.1",
|
||||
"@vueuse/router": "^10.6.1",
|
||||
"@vueuse/shared": "^10.6.1",
|
||||
"async-mutex": "^0.4.0",
|
||||
"@tiptap/core": "^2.2.4",
|
||||
"@tiptap/extension-blockquote": "^2.2.4",
|
||||
"@tiptap/extension-character-count": "^2.2.4",
|
||||
"@tiptap/extension-hard-break": "^2.2.4",
|
||||
"@tiptap/extension-image": "^2.2.4",
|
||||
"@tiptap/extension-link": "^2.2.4",
|
||||
"@tiptap/extension-list-item": "^2.2.4",
|
||||
"@tiptap/extension-mention": "^2.2.4",
|
||||
"@tiptap/extension-ordered-list": "^2.2.4",
|
||||
"@tiptap/extension-paragraph": "^2.2.4",
|
||||
"@tiptap/extension-strike": "^2.2.4",
|
||||
"@tiptap/extension-underline": "^2.2.4",
|
||||
"@tiptap/pm": "^2.2.4",
|
||||
"@tiptap/starter-kit": "^2.2.4",
|
||||
"@tiptap/suggestion": "^2.2.4",
|
||||
"@tiptap/vue-3": "^2.2.4",
|
||||
"@vue/apollo-composable": "^4.0.2",
|
||||
"@vueuse/core": "^10.9.0",
|
||||
"@vueuse/router": "^10.9.0",
|
||||
"@vueuse/shared": "^10.9.0",
|
||||
"async-mutex": "^0.5.0",
|
||||
"daisyui": "^4.7.3",
|
||||
"flatpickr": "^4.6.13",
|
||||
"graphql": "^16.8.1",
|
||||
"graphql-ruby-client": "^1.11.10",
|
||||
"graphql-ruby-client": "^1.13.3",
|
||||
"graphql-tag": "^2.12.6",
|
||||
"linkify-string": "^4.1.2",
|
||||
"linkifyjs": "^4.1.2",
|
||||
"linkify-string": "^4.1.3",
|
||||
"linkifyjs": "^4.1.3",
|
||||
"lodash-es": "^4.17.21",
|
||||
"loglevel": "^1.8.1",
|
||||
"loglevel": "^1.9.1",
|
||||
"mitt": "^3.0.1",
|
||||
"pinia": "^2.1.7",
|
||||
"tippy.js": "^6.3.7",
|
||||
"tiptap-text-direction": "^0.3.0",
|
||||
"tiptap-text-direction": "^0.3.1",
|
||||
"ua-parser-js": "^1.0.37",
|
||||
"uuid": "^9.0.1",
|
||||
"vue": "^3.3.8",
|
||||
"vue": "^3.4.21",
|
||||
"vue-advanced-cropper": "^2.8.8",
|
||||
"vue-easy-lightbox": "1.16.0",
|
||||
"vue-router": "^4.2.5",
|
||||
"vue-easy-lightbox": "1.19.0",
|
||||
"vue-router": "^4.3.0",
|
||||
"vue3-draggable-resizable": "^1.6.5",
|
||||
"vuedraggable": "^4.1.0",
|
||||
"workbox-core": "^7.0.0",
|
||||
@@ -150,9 +149,13 @@
|
||||
},
|
||||
"resolutions": {
|
||||
"loader-utils": "^3.2.1",
|
||||
"postcss": "^8.4.31",
|
||||
"stylelint-config-recommended": "^13.0.0"
|
||||
"postcss": "^8.4.36",
|
||||
"stylelint-config-recommended": "^14.0.0",
|
||||
"prosemirror-model": "1.19.4",
|
||||
"prosemirror-state": "1.4.3",
|
||||
"prosemirror-transform": "1.8.0",
|
||||
"prosemirror-view": "1.33.3"
|
||||
},
|
||||
"name": "Zammad",
|
||||
"version": "6.2.0"
|
||||
"version": "6.3.1"
|
||||
}
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
{
|
||||
"owner": "zammad",
|
||||
"repo": "zammad",
|
||||
"rev": "6c358ca90cf7f7581aede5c45d10ac3f2e25bc52",
|
||||
"hash": "sha256-kZss5A5tgKnsANt34kk5J+824ghJoVIWXFNlb+ZkZ2Y=",
|
||||
"rev": "27f4405b9af46d74c01f07efae2309bba2066af1",
|
||||
"hash": "sha256-p9TZ7Pxnav9RcQWfHPKWOo+ZJ1RQ58ZAMzzMhaITEb0=",
|
||||
"fetchSubmodules": true
|
||||
}
|
||||
|
||||
|
||||
@@ -5,18 +5,18 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "storj-uplink";
|
||||
version = "1.113.4";
|
||||
version = "1.114.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "storj";
|
||||
repo = "storj";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-nf2fNnkY6Z0T5dfSRUmqYpstV5yP+dJiZqB/AF3NR94=";
|
||||
hash = "sha256-V7Vl2sViRl6olhCdJF4xtR7iyJCqJCrm39/Aq1T9GFQ=";
|
||||
};
|
||||
|
||||
subPackages = [ "cmd/uplink" ];
|
||||
|
||||
vendorHash = "sha256-NnFCs64xUoFFHFQs/3YtdJkUurd3TxNieZJ96VqnJaU=";
|
||||
vendorHash = "sha256-+eqT3VNqw3fOLwfCKPacIEcoXjuzPaY1EAZI95rgLDs=";
|
||||
|
||||
ldflags = [ "-s" "-w" ];
|
||||
|
||||
|
||||
@@ -0,0 +1,35 @@
|
||||
{
|
||||
lib,
|
||||
# Required based on 'go' directive in go.mod,
|
||||
# remove when Go in nixpkgs defaults to 1.23 or later.
|
||||
buildGo123Module,
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
|
||||
buildGo123Module rec {
|
||||
pname = "agebox";
|
||||
version = "0.7.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "slok";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-RtFa7k+tw0hyf7bYm51aIxptaD4uOH6/3WDjeoWEEKA=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-57YbYDvRYOzQATEFpAuGzQzOYNY8n5LUrcu8jhjSiNI=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-X main.Version=${version}"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/slok/agebox";
|
||||
changelog = "https://github.com/slok/agebox/releases/tag/v${version}";
|
||||
description = "Age based repository file encryption gitops tool";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ lesuisse ];
|
||||
mainProgram = "agebox";
|
||||
};
|
||||
}
|
||||
@@ -6,18 +6,18 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "containerlab";
|
||||
version = "0.57.3";
|
||||
version = "0.57.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "srl-labs";
|
||||
repo = "containerlab";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-OSisVSfbOKBA1INrhj8DaWnHOEsLPwazp6NSXwAG3PU=";
|
||||
hash = "sha256-mMxC+Oe+O89PU3dgAbJvcHJ9ZQs1vmfF3B8w27JBPv4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
vendorHash = "sha256-mI5w7hUfQZPWv5JPbBodHxonLxtZfnHRw2K7Nl6sDOE=";
|
||||
vendorHash = "sha256-L/6t5vHhUog684YEOg9WYvAKCtad1MmDmasqtdwSyio=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
+33
-16
@@ -699,6 +699,7 @@ dependencies = [
|
||||
"iana-time-zone",
|
||||
"js-sys",
|
||||
"num-traits",
|
||||
"pure-rust-locales",
|
||||
"wasm-bindgen",
|
||||
"windows-targets 0.52.6",
|
||||
]
|
||||
@@ -944,7 +945,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "cosmic-config"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/pop-os/libcosmic#f655710d55911d81e96ca58b5c9e814e75cba7b5"
|
||||
source = "git+https://github.com/pop-os/libcosmic#c9f8f485373e02ef849c83d3bbdf0fdd2bf4a24c"
|
||||
dependencies = [
|
||||
"atomicwrites",
|
||||
"calloop 0.14.0",
|
||||
@@ -964,7 +965,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "cosmic-config-derive"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/pop-os/libcosmic#f655710d55911d81e96ca58b5c9e814e75cba7b5"
|
||||
source = "git+https://github.com/pop-os/libcosmic#c9f8f485373e02ef849c83d3bbdf0fdd2bf4a24c"
|
||||
dependencies = [
|
||||
"quote",
|
||||
"syn 1.0.109",
|
||||
@@ -993,6 +994,7 @@ dependencies = [
|
||||
"cosmic-comp-config",
|
||||
"cosmic-config",
|
||||
"cosmic-dbus-networkmanager",
|
||||
"cosmic-greeter-config",
|
||||
"cosmic-greeter-daemon",
|
||||
"env_logger",
|
||||
"freedesktop_entry_parser",
|
||||
@@ -1017,6 +1019,15 @@ dependencies = [
|
||||
"zbus 4.4.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "cosmic-greeter-config"
|
||||
version = "0.1.0"
|
||||
dependencies = [
|
||||
"cosmic-config",
|
||||
"log",
|
||||
"serde",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "cosmic-greeter-daemon"
|
||||
version = "0.1.0"
|
||||
@@ -1075,7 +1086,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "cosmic-theme"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/pop-os/libcosmic#f655710d55911d81e96ca58b5c9e814e75cba7b5"
|
||||
source = "git+https://github.com/pop-os/libcosmic#c9f8f485373e02ef849c83d3bbdf0fdd2bf4a24c"
|
||||
dependencies = [
|
||||
"almost",
|
||||
"cosmic-config",
|
||||
@@ -2345,7 +2356,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "iced"
|
||||
version = "0.12.0"
|
||||
source = "git+https://github.com/pop-os/libcosmic#f655710d55911d81e96ca58b5c9e814e75cba7b5"
|
||||
source = "git+https://github.com/pop-os/libcosmic#c9f8f485373e02ef849c83d3bbdf0fdd2bf4a24c"
|
||||
dependencies = [
|
||||
"dnd",
|
||||
"iced_accessibility",
|
||||
@@ -2363,7 +2374,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "iced_accessibility"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/pop-os/libcosmic#f655710d55911d81e96ca58b5c9e814e75cba7b5"
|
||||
source = "git+https://github.com/pop-os/libcosmic#c9f8f485373e02ef849c83d3bbdf0fdd2bf4a24c"
|
||||
dependencies = [
|
||||
"accesskit",
|
||||
"accesskit_unix",
|
||||
@@ -2372,7 +2383,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "iced_core"
|
||||
version = "0.12.0"
|
||||
source = "git+https://github.com/pop-os/libcosmic#f655710d55911d81e96ca58b5c9e814e75cba7b5"
|
||||
source = "git+https://github.com/pop-os/libcosmic#c9f8f485373e02ef849c83d3bbdf0fdd2bf4a24c"
|
||||
dependencies = [
|
||||
"bitflags 2.6.0",
|
||||
"dnd",
|
||||
@@ -2394,7 +2405,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "iced_futures"
|
||||
version = "0.12.0"
|
||||
source = "git+https://github.com/pop-os/libcosmic#f655710d55911d81e96ca58b5c9e814e75cba7b5"
|
||||
source = "git+https://github.com/pop-os/libcosmic#c9f8f485373e02ef849c83d3bbdf0fdd2bf4a24c"
|
||||
dependencies = [
|
||||
"futures",
|
||||
"iced_core",
|
||||
@@ -2407,7 +2418,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "iced_graphics"
|
||||
version = "0.12.0"
|
||||
source = "git+https://github.com/pop-os/libcosmic#f655710d55911d81e96ca58b5c9e814e75cba7b5"
|
||||
source = "git+https://github.com/pop-os/libcosmic#c9f8f485373e02ef849c83d3bbdf0fdd2bf4a24c"
|
||||
dependencies = [
|
||||
"bitflags 2.6.0",
|
||||
"bytemuck",
|
||||
@@ -2431,7 +2442,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "iced_renderer"
|
||||
version = "0.12.0"
|
||||
source = "git+https://github.com/pop-os/libcosmic#f655710d55911d81e96ca58b5c9e814e75cba7b5"
|
||||
source = "git+https://github.com/pop-os/libcosmic#c9f8f485373e02ef849c83d3bbdf0fdd2bf4a24c"
|
||||
dependencies = [
|
||||
"iced_graphics",
|
||||
"iced_tiny_skia",
|
||||
@@ -2443,7 +2454,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "iced_runtime"
|
||||
version = "0.12.0"
|
||||
source = "git+https://github.com/pop-os/libcosmic#f655710d55911d81e96ca58b5c9e814e75cba7b5"
|
||||
source = "git+https://github.com/pop-os/libcosmic#c9f8f485373e02ef849c83d3bbdf0fdd2bf4a24c"
|
||||
dependencies = [
|
||||
"dnd",
|
||||
"iced_accessibility",
|
||||
@@ -2457,7 +2468,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "iced_sctk"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/pop-os/libcosmic#f655710d55911d81e96ca58b5c9e814e75cba7b5"
|
||||
source = "git+https://github.com/pop-os/libcosmic#c9f8f485373e02ef849c83d3bbdf0fdd2bf4a24c"
|
||||
dependencies = [
|
||||
"enum-repr",
|
||||
"float-cmp",
|
||||
@@ -2483,7 +2494,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "iced_style"
|
||||
version = "0.12.0"
|
||||
source = "git+https://github.com/pop-os/libcosmic#f655710d55911d81e96ca58b5c9e814e75cba7b5"
|
||||
source = "git+https://github.com/pop-os/libcosmic#c9f8f485373e02ef849c83d3bbdf0fdd2bf4a24c"
|
||||
dependencies = [
|
||||
"iced_core",
|
||||
"once_cell",
|
||||
@@ -2493,7 +2504,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "iced_tiny_skia"
|
||||
version = "0.12.0"
|
||||
source = "git+https://github.com/pop-os/libcosmic#f655710d55911d81e96ca58b5c9e814e75cba7b5"
|
||||
source = "git+https://github.com/pop-os/libcosmic#c9f8f485373e02ef849c83d3bbdf0fdd2bf4a24c"
|
||||
dependencies = [
|
||||
"bytemuck",
|
||||
"cosmic-text",
|
||||
@@ -2510,7 +2521,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "iced_wgpu"
|
||||
version = "0.12.0"
|
||||
source = "git+https://github.com/pop-os/libcosmic#f655710d55911d81e96ca58b5c9e814e75cba7b5"
|
||||
source = "git+https://github.com/pop-os/libcosmic#c9f8f485373e02ef849c83d3bbdf0fdd2bf4a24c"
|
||||
dependencies = [
|
||||
"as-raw-xcb-connection",
|
||||
"bitflags 2.6.0",
|
||||
@@ -2539,7 +2550,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "iced_widget"
|
||||
version = "0.12.0"
|
||||
source = "git+https://github.com/pop-os/libcosmic#f655710d55911d81e96ca58b5c9e814e75cba7b5"
|
||||
source = "git+https://github.com/pop-os/libcosmic#c9f8f485373e02ef849c83d3bbdf0fdd2bf4a24c"
|
||||
dependencies = [
|
||||
"dnd",
|
||||
"iced_renderer",
|
||||
@@ -2823,7 +2834,7 @@ checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
|
||||
[[package]]
|
||||
name = "libcosmic"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/pop-os/libcosmic#f655710d55911d81e96ca58b5c9e814e75cba7b5"
|
||||
source = "git+https://github.com/pop-os/libcosmic#c9f8f485373e02ef849c83d3bbdf0fdd2bf4a24c"
|
||||
dependencies = [
|
||||
"apply",
|
||||
"ashpd 0.9.1",
|
||||
@@ -3752,6 +3763,12 @@ version = "1.0.15"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "43d84d1d7a6ac92673717f9f6d1518374ef257669c24ebc5ac25d5033828be58"
|
||||
|
||||
[[package]]
|
||||
name = "pure-rust-locales"
|
||||
version = "0.8.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1190fd18ae6ce9e137184f207593877e70f39b015040156b1e05081cdfe3733a"
|
||||
|
||||
[[package]]
|
||||
name = "pwd"
|
||||
version = "1.4.0"
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, rust
|
||||
, rustPlatform
|
||||
, cmake
|
||||
, coreutils
|
||||
@@ -16,13 +15,13 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cosmic-greeter";
|
||||
version = "1.0.0-alpha.1";
|
||||
version = "1.0.0-alpha.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-greeter";
|
||||
rev = "epoch-${version}";
|
||||
hash = "sha256-dc+VV7eIEUKoio/bQieXcDVZCepf4HtQrIKRslym31Y=";
|
||||
hash = "sha256-5BSsiGgL369/PePS0FmuE42tktK2bpgJziYuUEnZ2jY=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
@@ -34,7 +33,7 @@ rustPlatform.buildRustPackage rec {
|
||||
"cosmic-bg-config-0.1.0" = "sha256-keKTWghlKehLQA9J9SQjAvGCaZY/7xWWteDtmLoThD0=";
|
||||
"cosmic-client-toolkit-0.1.0" = "sha256-1XtyEvednEMN4MApxTQid4eed19dEN5ZBDt/XRjuda0=";
|
||||
"cosmic-comp-config-0.1.0" = "sha256-5+AY6p31XV+y+rrIU6YCg37oa4ygFPjYb+Osml1O29Q=";
|
||||
"cosmic-config-0.1.0" = "sha256-qvpgX+JpnO3Kt+sYD+q1+avNzJ6IXlYkRQqKGqIZ/ik=";
|
||||
"cosmic-config-0.1.0" = "sha256-vkYq91Zvz8RNdXm5z26Rc3XaHtD2/PuUYfYJkORKdgE=";
|
||||
"cosmic-dbus-networkmanager-0.1.0" = "sha256-Bz/bzXCm60AF0inpZJDF4iNZIX3FssImORrE5nZpkyQ=";
|
||||
"cosmic-text-0.12.1" = "sha256-x0XTxzbmtE2d4XCG/Nuq3DzBpz15BbnjRRlirfNJEiU=";
|
||||
"d3d12-0.19.0" = "sha256-usrxQXWLGJDjmIdw1LBXtBvX+CchZDvE8fHC0LjvhD4=";
|
||||
|
||||
@@ -12,13 +12,13 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cosmic-workspaces-epoch";
|
||||
version = "1.0.0-alpha.1";
|
||||
version = "1.0.0-alpha.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = pname;
|
||||
repo = "cosmic-workspaces-epoch";
|
||||
rev = "epoch-${version}";
|
||||
hash = "sha256-z3xQ6Vgqkm8hYLo2550NbFRkTMRQ0F9zn85iobnykH4=";
|
||||
hash = "sha256-z3xQ6Vgqkm8hYLo2550NbFRkTMRQ0F9zn85iobnykH5=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
|
||||
+84
-78
@@ -1,53 +1,55 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitLab
|
||||
, fetchpatch
|
||||
, itstool
|
||||
, libxml2
|
||||
, meson
|
||||
, ninja
|
||||
, perl
|
||||
, python3
|
||||
, pkgconf
|
||||
, wrapGAppsHook3
|
||||
, at-spi2-core
|
||||
, dbus
|
||||
, elfutils
|
||||
, libepoxy
|
||||
, gexiv2
|
||||
, glib
|
||||
, gobject-introspection
|
||||
, gst-plugins-base
|
||||
, gstreamer
|
||||
, gtk3
|
||||
, lcms2
|
||||
, libdatrie
|
||||
, libgphoto2
|
||||
, libgudev
|
||||
, libpeas
|
||||
, libraw
|
||||
, libselinux
|
||||
, libsepol
|
||||
, libthai
|
||||
, libunwind
|
||||
, libxkbcommon
|
||||
, orc
|
||||
, pcre
|
||||
, pcre2
|
||||
, udev
|
||||
, util-linux
|
||||
, xorg
|
||||
, zstd
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitLab,
|
||||
fetchpatch,
|
||||
itstool,
|
||||
libxml2,
|
||||
meson,
|
||||
ninja,
|
||||
perl,
|
||||
python3,
|
||||
pkgconf,
|
||||
wrapGAppsHook3,
|
||||
at-spi2-core,
|
||||
dbus,
|
||||
elfutils,
|
||||
libepoxy,
|
||||
gexiv2,
|
||||
glib,
|
||||
gobject-introspection,
|
||||
gst_all_1,
|
||||
gtk3,
|
||||
lcms2,
|
||||
libdatrie,
|
||||
libgphoto2,
|
||||
libgudev,
|
||||
libpeas,
|
||||
libraw,
|
||||
libselinux,
|
||||
libsepol,
|
||||
lerc,
|
||||
libthai,
|
||||
libunwind,
|
||||
libxkbcommon,
|
||||
orc,
|
||||
pcre,
|
||||
pcre2,
|
||||
udev,
|
||||
util-linux,
|
||||
xorg,
|
||||
zstd,
|
||||
cmake,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "entangle";
|
||||
version = "3.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "entangle";
|
||||
repo = "entangle";
|
||||
rev = "v${version}";
|
||||
rev = "refs/tags/v${finalAttrs.version}";
|
||||
sha256 = "hz2WSDOjriQSavFlDT+35x1X5MeInq80ZrSP1WR/td0=";
|
||||
};
|
||||
|
||||
@@ -71,39 +73,43 @@ stdenv.mkDerivation rec {
|
||||
pkgconf
|
||||
wrapGAppsHook3
|
||||
gobject-introspection
|
||||
cmake
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
at-spi2-core
|
||||
dbus
|
||||
libepoxy
|
||||
elfutils
|
||||
gexiv2
|
||||
glib
|
||||
gst-plugins-base
|
||||
gstreamer
|
||||
gtk3
|
||||
lcms2
|
||||
libdatrie
|
||||
libgphoto2
|
||||
libgudev
|
||||
libpeas
|
||||
libraw
|
||||
libselinux
|
||||
libsepol
|
||||
libthai
|
||||
libunwind
|
||||
libxkbcommon
|
||||
orc
|
||||
pcre # required by libselinux before we USE_PCRE2
|
||||
pcre2 # required by glib-2.0
|
||||
udev
|
||||
util-linux
|
||||
zstd
|
||||
] ++ (with xorg; [
|
||||
libXdmcp
|
||||
libXtst
|
||||
]);
|
||||
buildInputs =
|
||||
[
|
||||
at-spi2-core
|
||||
dbus
|
||||
libepoxy
|
||||
elfutils
|
||||
gexiv2
|
||||
glib
|
||||
lerc
|
||||
gst_all_1.gst-plugins-base
|
||||
gst_all_1.gstreamer
|
||||
gtk3
|
||||
lcms2
|
||||
libdatrie
|
||||
libgphoto2
|
||||
libgudev
|
||||
libpeas
|
||||
libraw
|
||||
libselinux
|
||||
libsepol
|
||||
libthai
|
||||
libunwind
|
||||
libxkbcommon
|
||||
orc
|
||||
pcre # required by libselinux before we USE_PCRE2
|
||||
pcre2 # required by glib-2.0
|
||||
udev
|
||||
util-linux
|
||||
zstd
|
||||
]
|
||||
++ (with xorg; [
|
||||
libXdmcp
|
||||
libXtst
|
||||
]);
|
||||
|
||||
# Disable building of doc/reference since it requires network connection to render XML to HTML
|
||||
# Patch build script shebangs
|
||||
@@ -120,7 +126,7 @@ stdenv.mkDerivation rec {
|
||||
--replace "Exec=entangle" "Exec=$out/bin/entangle"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Tethered camera control and capture";
|
||||
longDescription = ''
|
||||
Entangle uses GTK and libgphoto2 to provide a graphical interface
|
||||
@@ -130,9 +136,9 @@ stdenv.mkDerivation rec {
|
||||
This app can also serve as a camera app for mobile devices.
|
||||
'';
|
||||
homepage = "https://gitlab.com/entangle/entangle";
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ ShamrockLee ];
|
||||
license = lib.licenses.gpl3Plus;
|
||||
platforms = lib.platforms.all;
|
||||
maintainers = with lib.maintainers; [ ShamrockLee ];
|
||||
mainProgram = "entangle";
|
||||
};
|
||||
}
|
||||
})
|
||||
@@ -0,0 +1,50 @@
|
||||
{ lib
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, pkg-config
|
||||
, libgit2
|
||||
, openssl
|
||||
, sqlite
|
||||
, zlib
|
||||
, stdenv
|
||||
, darwin
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "intelli-shell";
|
||||
version = "0.2.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lasantosr";
|
||||
repo = "intelli-shell";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-D7hB1vKi54L7hU3TqTvzxXIr6XohfYLUTidR6wFJmfo=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-OAQpOxPWg27kIeM37S5SEGFHMwJPvTGREtG9rd6+lDM=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libgit2
|
||||
openssl
|
||||
sqlite
|
||||
zlib
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
darwin.apple_sdk.frameworks.Security
|
||||
];
|
||||
|
||||
env = {
|
||||
OPENSSL_NO_VENDOR = true;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Like IntelliSense, but for shells";
|
||||
homepage = "https://github.com/lasantosr/intelli-shell";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ iogamaster ];
|
||||
mainProgram = "intelli-shell";
|
||||
};
|
||||
}
|
||||
@@ -5,10 +5,10 @@
|
||||
|
||||
let
|
||||
pname = "jan";
|
||||
version = "0.5.4";
|
||||
version = "0.5.6";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/janhq/jan/releases/download/v${version}/jan-linux-x86_64-${version}.AppImage";
|
||||
hash = "sha256-BrNfpf9v8yAs4y3vaPlqtOI9SE7IFfZm/CYegcuZT3c=";
|
||||
hash = "sha256-PkRizjF4RVhCH7YOPABb+SpZlO3aKT5W6b0YBuKTNWk=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extractType2 { inherit pname version src; };
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "quill-log";
|
||||
version = "7.2.2";
|
||||
version = "7.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "odygrd";
|
||||
repo = "quill";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-au3cuzWm+MUCMDnHb93gy9b/8ITbLTQ1PYCjonh7QKw=";
|
||||
hash = "sha256-wExPgq+La0PCTrUajn8VYWw6uReXHoAVngygMJ2B/Qs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@@ -0,0 +1,30 @@
|
||||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
, pandoc
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "seilfahrt";
|
||||
version = "1.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Nerdbergev";
|
||||
repo = "seilfahrt";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-2nbBG/LIx1JDUzxyASvM/5hAI2JbBRDuv8Jub+yTwdA=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-JU77EFk8SWgZkN4DEtkKS2MsBH16my4j9X/NJC/r6mI=";
|
||||
|
||||
buildInputs = [ pandoc ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Tool to create a wiki page from a HedgeDoc";
|
||||
homepage = "https://github.com/Nerdbergev/seilfahrt";
|
||||
changelog = "https://github.com/Nerdbergev/seilfahrt/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ xgwq ];
|
||||
mainProgram = "seilfahrt";
|
||||
};
|
||||
}
|
||||
@@ -28,13 +28,13 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "textlint";
|
||||
version = "14.2.0";
|
||||
version = "14.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "textlint";
|
||||
repo = "textlint";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-KNOloSc66IX8GApI5JJ7z2DxPthOaZ3xpw0rlmAgIXc=";
|
||||
hash = "sha256-M3ahoQxEBTGfQy2k3QqIefh0emgGF9q+AwWTReKWbhM=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@@ -44,7 +44,7 @@ buildNpmPackage rec {
|
||||
./remove-workspaces.patch
|
||||
];
|
||||
|
||||
npmDepsHash = "sha256-/m37+odnYsegls2JamkQsHT39/APynppQiTMtRh3ycE=";
|
||||
npmDepsHash = "sha256-6qP3caFg4Cpm7yckjopRdX/D8jH9ObLCba1k2TiQWCA=";
|
||||
|
||||
nativeBuildInputs =
|
||||
[
|
||||
|
||||
@@ -22,12 +22,12 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "tradingview";
|
||||
version = "2.8.1";
|
||||
revision = "56";
|
||||
version = "2.9.2";
|
||||
revision = "59";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://api.snapcraft.io/api/v1/snaps/download/nJdITJ6ZJxdvfu8Ch7n5kH5P99ClzBYV_${finalAttrs.revision}.snap";
|
||||
hash = "sha256-cl1c/ZRHBW6qHYaVD7BiC0CaZMsXOLGCF7lP+oBVnpk=";
|
||||
hash = "sha256-qGQZKl8h23H8npdIBeVw3aCZPZiCfPsawzQxUY31Ujs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -4,7 +4,6 @@
|
||||
, nix-update-script
|
||||
, pkg-config
|
||||
, meson
|
||||
, python3
|
||||
, ninja
|
||||
, sassc
|
||||
, vala
|
||||
@@ -18,20 +17,19 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "switchboard";
|
||||
version = "8.0.0";
|
||||
version = "8.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elementary";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-qSqZQcE/g9oOHI8OAxMACSIFXrJMgSFLraAbTHjggLY=";
|
||||
sha256 = "sha256-PRoaC+h9rlwu7Q5Fh/2lBxdod93h02S5dhUVMTEuKR4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
python3
|
||||
sassc
|
||||
vala
|
||||
wrapGAppsHook4
|
||||
@@ -50,11 +48,6 @@ stdenv.mkDerivation rec {
|
||||
./plugs-path-env.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
chmod +x meson/post_install.py
|
||||
patchShebangs meson/post_install.py
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script { };
|
||||
};
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "filesystem";
|
||||
version = "1.5.12";
|
||||
version = "1.5.14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gulrak";
|
||||
repo = "filesystem";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-j4RE5Ach7C7Kef4+H9AHSXa2L8OVyJljDwBduKcC4eE=";
|
||||
hash = "sha256-XZ0IxyNIAs2tegktOGQevkLPbWHam/AOFT+M6wAWPFg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nghttp3";
|
||||
version = "1.5.0";
|
||||
version = "1.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ngtcp2";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-sVEMFTe3+r11yz4gzV+0VC8ngaanoj27DLW5hakyc4Y=";
|
||||
hash = "sha256-5QsJLN79SkbrCfIGfeJ91AUEf9/V6BWkNE60wOkxdow=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -1,56 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
flit-core,
|
||||
matplotlib,
|
||||
numpy,
|
||||
pandas,
|
||||
pytestCheckHook,
|
||||
pythonOlder,
|
||||
scipy,
|
||||
tabulate,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "acoustics";
|
||||
version = "0.2.6-unstable-2023-08-20";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "python-acoustics";
|
||||
repo = "python-acoustics";
|
||||
rev = "99d79206159b822ea2f4e9d27c8b2fbfeb704d38";
|
||||
hash = "sha256-/4bVjlhj8ihpAFHEWPaZ/xBILi3rb8f0NmwAexJCg+o=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ flit-core ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
matplotlib
|
||||
numpy
|
||||
pandas
|
||||
scipy
|
||||
tabulate
|
||||
];
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
preCheck = ''
|
||||
export HOME=$TMPDIR
|
||||
mkdir -p $HOME/.matplotlib
|
||||
echo "backend: ps" > $HOME/.matplotlib/matplotlibrc
|
||||
'';
|
||||
|
||||
pytestFlagsArray = [ "-Wignore::DeprecationWarning" ];
|
||||
|
||||
pythonImportsCheck = [ "acoustics" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python package for acousticians";
|
||||
license = with licenses; [ bsd3 ];
|
||||
homepage = "https://github.com/python-acoustics/python-acoustics";
|
||||
};
|
||||
}
|
||||
@@ -1,39 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
pytestCheckHook,
|
||||
setuptools,
|
||||
pythonOlder,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiolip";
|
||||
version = "1.1.6";
|
||||
pyproject = true;
|
||||
disabled = pythonOlder "3.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bdraco";
|
||||
repo = "aiolip";
|
||||
rev = version;
|
||||
sha256 = "1bgmcl8q1p6f2xm3w2qylvla6vf6bd1p2hfwj4l8w6w0w04vr02g";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py --replace-fail "'pytest-runner'," ""
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [ "aiolip" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python module for the Lutron Integration Protocol";
|
||||
homepage = "https://github.com/bdraco/aiolip";
|
||||
license = with licenses; [ asl20 ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
@@ -1,56 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
pythonOlder,
|
||||
fetchFromGitHub,
|
||||
aiohttp,
|
||||
poetry-core,
|
||||
yarl,
|
||||
aresponses,
|
||||
pytest-asyncio,
|
||||
pytest-cov-stub,
|
||||
pytestCheckHook,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ambee";
|
||||
version = "0.4.0";
|
||||
disabled = pythonOlder "3.8";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "frenck";
|
||||
repo = "python-ambee";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-2wX2CLr6kdVw2AGPW6DmYI2OBfQFI/iWVorok2d3wx4=";
|
||||
};
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
|
||||
dependencies = [
|
||||
aiohttp
|
||||
yarl
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
aresponses
|
||||
pytest-asyncio
|
||||
pytest-cov-stub
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# Upstream doesn't set a version for the pyproject.toml
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace-fail "0.0.0" "${version}"
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [ "ambee" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python client for Ambee API";
|
||||
homepage = "https://github.com/frenck/python-ambee";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
@@ -1,30 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
pytestCheckHook,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "arnparse";
|
||||
version = "0.0.2";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "PokaInc";
|
||||
repo = "arnparse";
|
||||
rev = version;
|
||||
hash = "sha256-2+wxzYoS/KJXjYM6lZguxbr2Oxobo0eFNnzWZHLi0WM=";
|
||||
};
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
pythonImportsCheck = [ "arnparse" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Parse ARNs using Python";
|
||||
homepage = "https://github.com/PokaInc/arnparse";
|
||||
license = licenses.mit;
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
@@ -1,38 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
jinja2,
|
||||
msrest,
|
||||
vsts,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "0.0.22";
|
||||
format = "setuptools";
|
||||
pname = "azure-functions-devops-build";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Azure";
|
||||
repo = "azure-functions-devops-build";
|
||||
# rev picked based on pypi release date
|
||||
rev = "c8249670acc77333e3de8b21dec60faf7ecf0951";
|
||||
sha256 = "1slc7jd92v9q1qg1yacnrpi2a7hi7iw61wzbzfd6wx9q63pw9yqi";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
jinja2
|
||||
msrest
|
||||
vsts
|
||||
];
|
||||
|
||||
# circular dependency with azure-cli-core
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Integrate Azure Functions with Azure DevOps. Specifically made for the Azure CLI";
|
||||
homepage = "https://github.com/Azure/azure-functions-devops-build";
|
||||
license = licenses.mit;
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
@@ -1,45 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
mock,
|
||||
oauth2client,
|
||||
pytestCheckHook,
|
||||
pythonOlder,
|
||||
pyu2f,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-reauth";
|
||||
version = "0.1.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Google";
|
||||
repo = "google-reauth-python";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-J7GVh+iY+69rFzf4hN/KLFZMZ1/S3CL5TZ7SsP5Oy3g=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
oauth2client
|
||||
pyu2f
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
mock
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "google_reauth" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Auth plugin allowing use the use of OAuth 2.0 credentials for Google Cloud Storage";
|
||||
homepage = "https://github.com/Google/google-reauth-python";
|
||||
changelog = "https://github.com/google/google-reauth-python/releases/tag/${version}";
|
||||
license = with licenses; [ asl20 ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
@@ -1,64 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
boost,
|
||||
buildPythonPackage,
|
||||
cmake,
|
||||
cryptography,
|
||||
fetchFromGitHub,
|
||||
git,
|
||||
pc-ble-driver,
|
||||
pythonOlder,
|
||||
scikit-build,
|
||||
setuptools,
|
||||
swig,
|
||||
wrapt,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pc-ble-driver-py";
|
||||
version = "0.17.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "NordicSemiconductor";
|
||||
repo = "pc-ble-driver-py";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-brC33ar2Jq3R2xdrklvVsQKf6pcnKwD25PO4TIvXgTg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
swig
|
||||
git
|
||||
setuptools
|
||||
scikit-build
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
boost
|
||||
pc-ble-driver
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
cryptography
|
||||
wrapt
|
||||
];
|
||||
|
||||
dontUseCmakeConfigure = true;
|
||||
|
||||
# doCheck tries to write to the global python directory to install things
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "pc_ble_driver_py" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Bluetooth Low Energy nRF5 SoftDevice serialization";
|
||||
homepage = "https://github.com/NordicSemiconductor/pc-ble-driver-py";
|
||||
changelog = "https://github.com/NordicSemiconductor/pc-ble-driver-py/releases/tag/v${version}";
|
||||
license = licenses.unfreeRedistributable;
|
||||
maintainers = with maintainers; [ gebner ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
@@ -1,42 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
pdfminer-six,
|
||||
chardet,
|
||||
pytestCheckHook,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pdfx";
|
||||
version = "1.4.1";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "metachris";
|
||||
repo = "pdfx";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-POpP6XwcqwvImrtIiDjpnHoNE0MKapuPjxojo+ocBK0=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace requirements.txt \
|
||||
--replace "chardet==4.0.0" "chardet" \
|
||||
--replace "pdfminer.six==20201018" "pdfminer.six"
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
pdfminer-six
|
||||
chardet
|
||||
];
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
meta = with lib; {
|
||||
inherit (src.meta) homepage;
|
||||
description = "Extract references (pdf, url, doi, arxiv) and metadata from a PDF";
|
||||
mainProgram = "pdfx";
|
||||
license = licenses.asl20;
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
@@ -14,7 +14,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "solarlog-cli";
|
||||
version = "0.3.0";
|
||||
version = "0.3.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.12";
|
||||
@@ -23,7 +23,7 @@ buildPythonPackage rec {
|
||||
owner = "dontinelli";
|
||||
repo = "solarlog_cli";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-jNvwSh89Ncl/rR/cUNVbJfJThJTa9JlANjvH/vRruAU=";
|
||||
hash = "sha256-67ZEval+cRvjFhQynFVYf5FFDw+zWrAfSC/2d6X+oh4=";
|
||||
};
|
||||
|
||||
build-system = [ hatchling ];
|
||||
|
||||
@@ -8,13 +8,10 @@
|
||||
mkDerivation {
|
||||
pname = "ghc-settings-edit";
|
||||
version = "0.1.0";
|
||||
src = lib.fileset.toSource {
|
||||
root = ./.;
|
||||
fileset = lib.fileset.unions [
|
||||
./Setup.hs
|
||||
./ghc-settings-edit.lhs
|
||||
./ghc-settings-edit.cabal
|
||||
];
|
||||
src = builtins.path {
|
||||
path = ./.;
|
||||
name = "source";
|
||||
filter = path: _: (builtins.baseNameOf path) != "default.nix";
|
||||
};
|
||||
isLibrary = false;
|
||||
isExecutable = true;
|
||||
|
||||
@@ -11,13 +11,13 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "sentry-cli";
|
||||
version = "2.36.3";
|
||||
version = "2.36.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "getsentry";
|
||||
repo = "sentry-cli";
|
||||
rev = version;
|
||||
sha256 = "sha256-iqWOcGuDblFKla90w2J8gV2Fv8RjsgfG1VLuNDz4Poc=";
|
||||
sha256 = "sha256-l2Qj38wtlz0fSLvUdML36BRCCIk+Qnuv/cxPi33f+Zc=";
|
||||
};
|
||||
doCheck = false;
|
||||
|
||||
@@ -27,7 +27,7 @@ rustPlatform.buildRustPackage rec {
|
||||
buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices Security SystemConfiguration ];
|
||||
nativeBuildInputs = [ installShellFiles pkg-config ];
|
||||
|
||||
cargoHash = "sha256-TIAKUoiPWlNtcL0Iu/CGLSx8dm9x0GQCtxPCg+t9zyw=";
|
||||
cargoHash = "sha256-gyNP6qYg/uKOmhq3elYw8jPknjfAzoGyhGegSq1wDoo=";
|
||||
|
||||
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
|
||||
installShellCompletion --cmd sentry-cli \
|
||||
|
||||
@@ -1,31 +1,31 @@
|
||||
{ fetchurl, fetchzip }:
|
||||
{
|
||||
x86_64-darwin = fetchzip {
|
||||
sha256 = "sha256-+sPPhXO0fnHQfB7fqqQsZIUW+2bzAqjE6yMzd5tLRhI=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.52/AdGuardHome_darwin_amd64.zip";
|
||||
sha256 = "sha256-/6NiFNu0P3WIoJM26c6W9Bh/3+J9bkGDJmKUg1bhpkQ=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.53/AdGuardHome_darwin_amd64.zip";
|
||||
};
|
||||
aarch64-darwin = fetchzip {
|
||||
sha256 = "sha256-TebackOYGFA9Q99awS5RtIuj94ys3Jzg/EbCH8cmjTU=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.52/AdGuardHome_darwin_arm64.zip";
|
||||
sha256 = "sha256-iOEyRAmLEe8pRGVVUHov+YguvqihYBJaCd/Tcek7ooo=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.53/AdGuardHome_darwin_arm64.zip";
|
||||
};
|
||||
i686-linux = fetchurl {
|
||||
sha256 = "sha256-26iQrdenWI+88N6iy2zOXQ/+cTuQjCVtjjhzXmUotpk=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.52/AdGuardHome_linux_386.tar.gz";
|
||||
sha256 = "sha256-ATE57Xo/4AOEtZup52PBnVDiP+tpEQMF1Z7w4lh3/uU=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.53/AdGuardHome_linux_386.tar.gz";
|
||||
};
|
||||
x86_64-linux = fetchurl {
|
||||
sha256 = "sha256-omRezyPMrbsNl7Mkrvm8Z9EmuOOUQorlojwvG3PF0UA=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.52/AdGuardHome_linux_amd64.tar.gz";
|
||||
sha256 = "sha256-a+NhiHSTBvTkJedpTxhsl5JpuN/Mtb4+g7bhwxahMUw=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.53/AdGuardHome_linux_amd64.tar.gz";
|
||||
};
|
||||
aarch64-linux = fetchurl {
|
||||
sha256 = "sha256-hq56fC25wVi52581BWhIXjzMQ+cDliTRpbxQux3uEEg=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.52/AdGuardHome_linux_arm64.tar.gz";
|
||||
sha256 = "sha256-7Gt0udLXllYqso70u5lH7kuF96lRnnH614B3h89phwA=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.53/AdGuardHome_linux_arm64.tar.gz";
|
||||
};
|
||||
armv6l-linux = fetchurl {
|
||||
sha256 = "sha256-tMeNdlkqnzjzKX046GoaSjQgLD4nq82JlSH1PmSgmNM=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.52/AdGuardHome_linux_armv6.tar.gz";
|
||||
sha256 = "sha256-6RVRG5nM0zlLLYt/a7B4mHYV93oske+G51CIeIBJ4lA=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.53/AdGuardHome_linux_armv6.tar.gz";
|
||||
};
|
||||
armv7l-linux = fetchurl {
|
||||
sha256 = "sha256-fLa5H/wHo/sGjqk44JjFURvPwROC+h7nvA43/aeDiLs=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.52/AdGuardHome_linux_armv7.tar.gz";
|
||||
sha256 = "sha256-xpc83aflT+iWW2dboG1sD5xp1xd2THWd+YEggrYq90I=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.53/AdGuardHome_linux_armv7.tar.gz";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -7,7 +7,7 @@ in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "adguardhome";
|
||||
version = "0.107.52";
|
||||
version = "0.107.53";
|
||||
src = sources.${system} or (throw "Source for ${pname} is not available for ${system}");
|
||||
|
||||
installPhase = ''
|
||||
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
passthru = {
|
||||
updateScript = ./update.sh;
|
||||
schema_version = 28;
|
||||
schema_version = 29;
|
||||
tests.adguardhome = nixosTests.adguardhome;
|
||||
};
|
||||
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cnping";
|
||||
version = "unstable-2021-04-04";
|
||||
version = "1.0.0-unstable-2024-02-29";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cntools";
|
||||
repo = "cnping";
|
||||
rev = "6b89363e6b79ecbf612306d42a8ef94a5a2f756a";
|
||||
hash = "sha256-E3Wm5or6C4bHq7YoyaEbtDwyd+tDVYUOMeQrprlmL4A=";
|
||||
rev = "2498fa4df1b4eff0df1f75b5f393e620bafd6997";
|
||||
hash = "sha256-MMPLp/3GNal0AKkUgd850JrVjRO5rPHvbnOl1uogPCQ=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -95,7 +95,6 @@ mapAliases {
|
||||
aeon = throw "aeon has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2024-07-15
|
||||
afl = throw "afl has been removed as the upstream project was archived. Consider using 'aflplusplus'"; # Added 2024-04-21
|
||||
agda-pkg = throw "agda-pkg has been removed due to being unmaintained"; # Added 2024-09-10"
|
||||
agebox = throw "agebox has been removed due to lack of upstream maintenance"; # Added 2024-07-13
|
||||
airfield = throw "airfield has been removed due to being unmaintained"; # Added 2023-05-19
|
||||
alertmanager-bot = throw "alertmanager-bot is broken and has been archived by upstream"; # Added 2023-07-28
|
||||
alsa-project = throw "alsa-project was removed and its sub-attributes were promoted to top-level."; # Added 2023-11-12
|
||||
|
||||
@@ -29044,10 +29044,6 @@ with pkgs;
|
||||
|
||||
enhanced-ctorrent = callPackage ../applications/networking/p2p/enhanced-ctorrent { };
|
||||
|
||||
entangle = callPackage ../applications/video/entangle {
|
||||
inherit (gst_all_1) gstreamer gst-plugins-base;
|
||||
};
|
||||
|
||||
eolie = callPackage ../applications/networking/browsers/eolie { };
|
||||
|
||||
eos-installer = callPackage ../applications/misc/eos-installer { };
|
||||
|
||||
@@ -36,16 +36,19 @@ mapAliases ({
|
||||
aadict = throw "aadict was removed, it was introduced as a dependency for a package that never manifested and has been an unused leaf package ever since"; # added 2024-07-08
|
||||
abodepy = jaraco-abode; # added 2023-02-01
|
||||
acebinf = throw "acebinf has been removed because it is abandoned and broken."; # Added 2023-05-19
|
||||
acoustics = throw "acoustics has been removed because the upstream repository was archived in 2024"; # Added 2024-10-04
|
||||
adafruit-nrfutil = throw "adafruit-nrfutil has been promoted to a top-level attribute name: `pkgs.adafruit-nrfutil`."; # Added 2023-11-19
|
||||
aioaladdinconnect = throw "aioaladdinconnect has been removed, as the API is supported was obsoleted on 2024-01-24."; # Added 2024-06-07
|
||||
aiohttp-isal = throw "aiohttp-isal has been removed, as it has been archived and replace by aiohttp-fast-zlib"; # Added 2024-08-11
|
||||
aiomysensors = throw "aiomysensors has been removed, as it was packaged for Home Assistant, which migrated to pymysensors."; # Added 2024-07-07
|
||||
aioh2 = throw "aioh2 has been removed because it is abandoned and broken."; # Added 2022-03-30
|
||||
aiolip = throw "aiolip has been removed because the upstream repository was archived in 2021"; # Added 2024-10-04
|
||||
aionotify = throw "aionotify has been removed because is unmaintained and incompatible with python3.11."; # Added 2023-10-27
|
||||
aiosenseme = throw "aiosenseme has been removed, because it does no longer work with the latest firmware and has become unmaintained"; # Added 2023-07-05
|
||||
aioquic-mitmproxy = throw "aioquic-mitmproxy has been removed because mitmproxy no longer uses it"; # Added 2024-01-16
|
||||
amazon_kclpy = amazon-kclpy; # added 2023-08-08
|
||||
ambiclimate = throw "ambiclimate has been removed, because the service has been terminated after 2024-03-31."; # Added 2024-06-07
|
||||
ambee = throw "ambee has been removed because the upstream repository was archived in 2022"; # Added 2024-10-04
|
||||
ansible-base = throw "ansible-base has been removed, because it is end of life"; # added 2022-03-30
|
||||
ansible-doctor = throw "ansible-doctor has been promoted to a top-level attribute name: `pkgs.ansible-doctor`"; # Added 2023-05-16
|
||||
ansible-later = throw "ansible-later has been promoted to a top-level attribute name: `pkgs.ansible-later`"; # Added 2023-05-16
|
||||
@@ -54,6 +57,7 @@ mapAliases ({
|
||||
anyjson = throw "anyjson has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2022-01-18
|
||||
apache-airflow = throw "apache-airflow has been moved out of pythonPackages and is available as a standalone package"; # added 2023-06-05
|
||||
argon2_cffi = argon2-cffi; # added 2022-05-09
|
||||
arnparse = throw "arnparse has been removed because the upstream repository was archived in 2023"; # Added 2024-10-04
|
||||
APScheduler = apscheduler; # added 2023-02-19
|
||||
async_generator = async-generator; # added 2023-08-08
|
||||
async_stagger = async-stagger; # added 2023-08-08
|
||||
@@ -62,6 +66,7 @@ mapAliases ({
|
||||
atsim_potentials = atsim-potentials; # added 2023-10-08
|
||||
inherit (super.pkgs) autotrash; # added 2024-09-23
|
||||
awkward0 = throw "awkward0 has been removed, use awkward instead"; # added 2022-12-13
|
||||
azure-functions-devops-build = throw "azure-functions-devops-build has been removed, because it is abandoned"; # added 2024-10-04
|
||||
Babel = babel; # added 2022-05-06
|
||||
backports_csv = throw "backports_csv has been removed, since we no longer need to backport to python2"; # added 2023-07-28
|
||||
backports_functools_lru_cache = throw "backports_functools_lru_cache has been removed, since we no longer need to backport to python3.2"; # added 2023-07-28
|
||||
@@ -232,6 +237,7 @@ mapAliases ({
|
||||
glances = throw "glances has moved to pkgs.glances"; # added 2020-20-28
|
||||
glasgow = throw "glasgow has been promoted to a top-level attribute name: `pkgs.glasgow`"; # added 2023-02-05
|
||||
globre = throw "globre was removed, because it was disabled on all python version since 3.7 and last updated in 2020."; # added 2024-05-13
|
||||
google-reauth = throw "google-reauth has been removed because the upstream repository was archived in 2023"; # Added 2024-10-04
|
||||
google_api_python_client = google-api-python-client; # added 2021-03-19
|
||||
googleapis_common_protos = googleapis-common-protos; # added 2021-03-19
|
||||
google-apitools = throw "google-apitools was removed because it is deprecated and unsupported by upstream"; # added 2023-02-25
|
||||
@@ -384,8 +390,10 @@ mapAliases ({
|
||||
pathlib = throw "pathlib was removed as it has been integrated in python standard library in version 3.4"; # added 2024-05-13
|
||||
pathpy = path; # added 2022-04-12
|
||||
pcbnew-transition = pcbnewtransition; # added 2024-03-21
|
||||
pc-ble-driver-py = throw "pc-ble-driver-py has been removed because the upstream repository was archived in 2024"; # Added 2024-10-04
|
||||
pdfposter = throw "pdfposter was promoted to a top-level attribute"; # Added 2023-06-29
|
||||
pdfminer = pdfminer-six; # added 2022-05-25
|
||||
pdfx = throw "pdfx has been removed because the upstream repository was archived in 2023"; # Added 2024-10-04
|
||||
pep257 = pydocstyle; # added 2022-04-12
|
||||
pixelmatch = "pixelmatch has been removed as it was unmaintained"; # Added 2024-08-18
|
||||
pkutils = throw "pkutils was removed as it was unused and is not applicable to modern Python build tools"; # added 2024-07-28
|
||||
|
||||
@@ -47,8 +47,6 @@ self: super: with self; {
|
||||
|
||||
acme-tiny = callPackage ../development/python-modules/acme-tiny { };
|
||||
|
||||
acoustics = callPackage ../development/python-modules/acoustics { };
|
||||
|
||||
acquire = callPackage ../development/python-modules/acquire { };
|
||||
|
||||
actdiag = callPackage ../development/python-modules/actdiag { };
|
||||
@@ -317,8 +315,6 @@ self: super: with self; {
|
||||
|
||||
aiolimiter = callPackage ../development/python-modules/aiolimiter { };
|
||||
|
||||
aiolip = callPackage ../development/python-modules/aiolip { };
|
||||
|
||||
aiolivisi = callPackage ../development/python-modules/aiolivisi { };
|
||||
|
||||
aiolyric = callPackage ../development/python-modules/aiolyric { };
|
||||
@@ -566,8 +562,6 @@ self: super: with self; {
|
||||
|
||||
amazon-kclpy = callPackage ../development/python-modules/amazon-kclpy { };
|
||||
|
||||
ambee = callPackage ../development/python-modules/ambee { };
|
||||
|
||||
amberelectric = callPackage ../development/python-modules/amberelectric { };
|
||||
|
||||
amcrest = callPackage ../development/python-modules/amcrest { };
|
||||
@@ -792,8 +786,6 @@ self: super: with self; {
|
||||
|
||||
arpy = callPackage ../development/python-modules/arpy { };
|
||||
|
||||
arnparse = callPackage ../development/python-modules/arnparse { };
|
||||
|
||||
array-api-compat = callPackage ../development/python-modules/array-api-compat { };
|
||||
|
||||
array-api-strict = callPackage ../development/python-modules/array-api-strict { };
|
||||
@@ -1151,8 +1143,6 @@ self: super: with self; {
|
||||
|
||||
azure-eventhub = callPackage ../development/python-modules/azure-eventhub { };
|
||||
|
||||
azure-functions-devops-build = callPackage ../development/python-modules/azure-functions-devops-build { };
|
||||
|
||||
azure-graphrbac = callPackage ../development/python-modules/azure-graphrbac { };
|
||||
|
||||
azure-identity = callPackage ../development/python-modules/azure-identity { };
|
||||
@@ -5278,8 +5268,6 @@ self: super: with self; {
|
||||
|
||||
google-re2 = callPackage ../development/python-modules/google-re2 { };
|
||||
|
||||
google-reauth = callPackage ../development/python-modules/google-reauth { };
|
||||
|
||||
google-resumable-media = callPackage ../development/python-modules/google-resumable-media { };
|
||||
|
||||
google-search-results = callPackage ../development/python-modules/google-search-results { };
|
||||
@@ -9746,8 +9734,6 @@ self: super: with self; {
|
||||
|
||||
pbxproj = callPackage ../development/python-modules/pbxproj { };
|
||||
|
||||
pc-ble-driver-py = callPackage ../development/python-modules/pc-ble-driver-py { };
|
||||
|
||||
pcapy-ng = callPackage ../development/python-modules/pcapy-ng {
|
||||
inherit (pkgs) libpcap; # Avoid confusion with python package of the same name
|
||||
};
|
||||
@@ -9778,8 +9764,6 @@ self: super: with self; {
|
||||
|
||||
pdftotext = callPackage ../development/python-modules/pdftotext { };
|
||||
|
||||
pdfx = callPackage ../development/python-modules/pdfx { };
|
||||
|
||||
pdm-backend = callPackage ../development/python-modules/pdm-backend { };
|
||||
|
||||
pdm-build-locked = callPackage ../development/python-modules/pdm-build-locked { };
|
||||
|
||||
Reference in New Issue
Block a user