gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot]
2023-05-17 18:01:08 +00:00
committed by GitHub
parent 8c5c6b0b40 2515b0e0dc
commit 0f3ccf81bb
61 changed files with 25507 additions and 1857 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nixos/modules/services/development/zammad.nix
+1 -1
View File
@@ -254,7 +254,7 @@ in
preStart = ''
# Blindly copy the whole project here.
chmod -R +w .
rm -rf ./public/assets/*
rm -rf ./public/assets/
rm -rf ./tmp/*
rm -rf ./log/*
cp -r --no-preserve=owner ${cfg.package}/* .
nixos/modules/services/networking/syncthing.nix
+9 -7
View File
@@ -13,7 +13,11 @@ let
deviceID = device.id;
}) cfg.settings.devices;
folders = mapAttrsToList (_: folder: folder // {
folders = mapAttrsToList (_: folder: folder //
throwIf (folder?rescanInterval || folder?watch || folder?watchDelay) ''
The options services.syncthing.settings.folders.<name>.{rescanInterval,watch,watchDelay}
were removed. Please use, respectively, {rescanIntervalS,fsWatcherEnabled,fsWatcherDelayS} instead.
'' {
devices = map (device:
if builtins.isString device then
{ deviceId = cfg.settings.devices.${device}.id; }
@@ -121,10 +125,9 @@ in {
description = mdDoc ''
The options element contains all other global configuration options
'';
type = types.attrsOf (types.submodule ({ name, ... }: {
type = types.submodule ({ name, ... }: {
freeformType = settingsFormat.type;
options = {
localAnnounceEnabled = mkOption {
type = types.bool;
default = true;
@@ -176,7 +179,7 @@ in {
'';
};
};
}));
});
};
# device settings
@@ -344,6 +347,7 @@ in {
]
'';
type = with types; nullOr (submodule {
freeformType = settingsFormat.type;
options = {
type = mkOption {
type = enum [ "external" "simple" "staggered" "trashcan" ];
@@ -609,9 +613,7 @@ in {
];
};
};
syncthing-init = mkIf (
cfg.settings.devices != {} || cfg.folders != {} || cfg.extraOptions != {}
) {
syncthing-init = mkIf (cfg.settings != {}) {
description = "Syncthing configuration updater";
requisite = [ "syncthing.service" ];
after = [ "syncthing.service" ];
nixos/tests/syncthing-init.nix
+5
View File
@@ -10,12 +10,17 @@ in {
services.syncthing = {
enable = true;
settings = {
options.crashReportingEnabled = false;
devices.testDevice = {
id = testId;
};
folders.testFolder = {
path = "/tmp/test";
devices = [ "testDevice" ];
versioning = {
type = "simple";
params.keep = "10";
};
};
gui.user = "guiUser";
};
nixos/tests/zammad.nix
+1 -1
View File
@@ -4,7 +4,7 @@ import ./make-test-python.nix (
{
name = "zammad";
meta.maintainers = with lib.maintainers; [ garbas taeer ];
meta.maintainers = with lib.maintainers; [ garbas taeer n0emis ];
nodes.machine = { config, ... }: {
services.zammad.enable = true;
pkgs/applications/audio/mopidy/default.nix
+2
View File
@@ -37,6 +37,8 @@ lib.makeScope newScope (self: with self; {
mopidy-soundcloud = callPackage ./soundcloud.nix { };
mopidy-spotify = callPackage ./spotify.nix { };
mopidy-tidal = callPackage ./tidal.nix { };
mopidy-tunein = callPackage ./tunein.nix { };
pkgs/applications/audio/mopidy/mopidy.nix
+1
View File
@@ -21,6 +21,7 @@ pythonPackages.buildPythonApplication rec {
gst-plugins-base
gst-plugins-good
gst-plugins-ugly
gst-plugins-rs
];
propagatedBuildInputs = [
pkgs/applications/audio/mopidy/spotify.nix
+31
View File
@@ -0,0 +1,31 @@
{ lib, fetchFromGitHub, pythonPackages, mopidy }:
pythonPackages.buildPythonApplication rec {
pname = "mopidy-spotify";
version = "unstable-2023-04-21";
src = fetchFromGitHub {
owner = "mopidy";
repo = "mopidy-spotify";
rev = "984151ac96c5f9c35892055bff20cc11f46092d5";
hash = "sha256-4e9Aj0AOFR4/FK54gr1ZyPt0nYZDMrMetV4FPtBxapU=";
};
propagatedBuildInputs = [
mopidy
pythonPackages.responses
];
nativeBuildInputs = [
pythonPackages.pytestCheckHook
];
pythonImportsCheck = [ "mopidy_spotify" ];
meta = with lib; {
homepage = "https://github.com/mopidy/mopidy-spotify";
description = "Mopidy extension for playing music from Spotify";
license = licenses.asl20;
maintainers = with maintainers; [ lilyinstarlight ];
};
}
pkgs/applications/editors/android-studio/default.nix
+2 -2
View File
@@ -10,8 +10,8 @@ let
inherit tiling_wm;
};
stableVersion = {
version = "2022.2.1.18"; # "Android Studio Flamingo (2022.2.1)"
sha256Hash = "sha256-zdhSxEmbX3QC30Tfxp6MpBj/yaaEyqs0BHR2/SyyTvw=";
version = "2022.2.1.19"; # "Android Studio Flamingo (2022.2.1) Patch 1"
sha256Hash = "sha256-bAtPlJI3RwqQX6xpEi7S8T2IDc/39MONU3iFpfi8v3A=";
};
betaVersion = {
version = "2022.3.1.12"; # "Android Studio Giraffe (2022.3.1) Beta 1"
pkgs/applications/misc/1password/default.nix
+5 -5
View File
@@ -12,12 +12,12 @@ let
if extension == "zip" then fetchzip args else fetchurl args;
pname = "1password-cli";
version = "2.17.0";
version = "2.18.0";
sources = rec {
aarch64-linux = fetch "linux_arm64" "sha256-pnLAFCKhQKOIqp0qDv3DfAqF4fDXjFdw7Jl9WgDf7C0=" "zip";
i686-linux = fetch "linux_386" "sha256-o+pSWUOSzDKA5m+Riu3QOi9gQMyEmbIGcE/yUjKu9p8=" "zip";
x86_64-linux = fetch "linux_amd64" "sha256-aukQSeC+5p6ioTE6QlzEAM+9VOI34GfzzjaGt/N0klY=" "zip";
aarch64-darwin = fetch "apple_universal" "sha256-HSXbbeDWYrFTh9SsKwvNovprWRwaDr3rA6X6E1QJJos=" "pkg";
aarch64-linux = fetch "linux_arm64" "sha256-BmYGx4DI/Hvj9hBBZo5iprQeUgMNqEkESDjYcOVAt4Q=" "zip";
i686-linux = fetch "linux_386" "sha256-KpacioVLSPju9iW7B/yVCS66CZTwCTVAjxoaeBscJe8=" "zip";
x86_64-linux = fetch "linux_amd64" "sha256-p4wztBVQ2x2RrODJhX3z72QQtF8mnvqk3wT72hiPE3o=" "zip";
aarch64-darwin = fetch "apple_universal" "sha256-GfmTx4WS5oGgXXWqlA4bEmQJyFTu/bZnoEhIfZpfqpg=" "pkg";
x86_64-darwin = aarch64-darwin;
};
platforms = builtins.attrNames sources;
pkgs/applications/misc/phockup/default.nix
+2 -2
View File
@@ -4,13 +4,13 @@ let
in
stdenv.mkDerivation rec {
pname = "phockup";
version = "1.9.2";
version = "1.10.1";
src = fetchFromGitHub {
owner = "ivandokov";
repo = "phockup";
rev = version;
sha256 = "sha256-ge34Iv/+B0xdrSNc7w3nZJw0DHBUvuh2k/I8v/RRg10=";
sha256 = "sha256-wnTdNzH/2Lcr3FXqm84ITiAmbKpFWLo/0/cf0fCv+4M=";
};
nativeBuildInputs = [ makeWrapper ];
pkgs/applications/networking/browsers/mullvad-browser/default.nix
+4 -7
View File
@@ -76,14 +76,12 @@ let
++ lib.optionals mediaSupport [ ffmpeg ]
);
tag = "mullvad-browser-102.10.0esr-12.0-2-build2";
version = "12.0.5";
lang = "ALL";
version = "12.0.6";
srcs = {
x86_64-linux = fetchurl {
url = "https://github.com/mullvad/mullvad-browser/releases/download/${tag}/mullvad-browser-linux64-${version}_${lang}.tar.xz";
hash = "sha256-Ezs2pjJNGOinMIskBDwpj70eKSkfcV6ZCKb60I5J23w=";
url = "https://cdn.mullvad.net/browser/${version}/mullvad-browser-linux64-${version}_ALL.tar.xz";
hash = "sha256-XE6HFU38FhnikxGHRHxIGS3Z3Y2JNWH0yq2NejqbROI=";
};
};
@@ -222,8 +220,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Privacy-focused browser made in a collaboration between The Tor Project and Mullvad";
homepage = "https://www.mullvad.net/en/browser";
changelog = "https://github.com/mullvad/mullvad-browser/releases/tag/${tag}";
homepage = "https://mullvad.net/en/browser";
platforms = attrNames srcs;
maintainers = with maintainers; [ felschr ];
# MPL2.0+, GPL+, &c. While it's not entirely clear whether
pkgs/applications/networking/misc/zammad/default.nix
+15 -7
View File
@@ -1,5 +1,6 @@
{ stdenv
, lib
, nixosTests
, fetchFromGitHub
, applyPatches
, bundlerEnv
@@ -7,7 +8,7 @@
, callPackage
, writeText
, procps
, ruby_2_7
, ruby
, postgresql
, imlib2
, jq
@@ -21,7 +22,7 @@
let
pname = "zammad";
version = "5.1.1";
version = "5.4.1";
src = applyPatches {
@@ -30,9 +31,9 @@ let
patches = [ ./0001-nulldb.patch ];
postPatch = ''
sed -i -e "s|ruby '2.7.4'|ruby '${ruby_2_7.version}'|" Gemfile
sed -i -e "s|ruby 2.7.4p191|ruby ${ruby_2_7.version}|" Gemfile.lock
sed -i -e "s|2.7.4|${ruby_2_7.version}|" .ruby-version
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
${jq}/bin/jq '. += {name: "Zammad", version: "${version}"}' package.json | ${moreutils}/bin/sponge package.json
'';
};
@@ -53,7 +54,7 @@ let
# Which ruby version to select:
# https://docs.zammad.org/en/latest/prerequisites/software.html#ruby-programming-language
inherit ruby_2_7;
inherit ruby;
gemdir = src;
gemset = ./gemset.nix;
@@ -94,6 +95,12 @@ let
yarnLock = ./yarn.lock;
yarnNix = ./yarn.nix;
packageJSON = ./package.json;
yarnPreBuild = ''
mkdir -p deps/Zammad
cp -r ${src}/.eslint-plugin-zammad deps/Zammad/.eslint-plugin-zammad
chmod -R +w deps/Zammad/.eslint-plugin-zammad
'';
};
in
@@ -129,13 +136,14 @@ stdenv.mkDerivation {
passthru = {
inherit rubyEnv yarnEnv;
updateScript = [ "${callPackage ./update.nix {}}/bin/update.sh" pname (toString ./.) ];
tests = { inherit (nixosTests) zammad; };
};
meta = with lib; {
description = "Zammad, a web-based, open source user support/ticketing solution.";
homepage = "https://zammad.org";
license = licenses.agpl3Plus;
platforms = [ "x86_64-linux" ];
platforms = [ "x86_64-linux" "aarch64-linux" ];
maintainers = with maintainers; [ n0emis garbas taeer ];
};
}
pkgs/applications/networking/misc/zammad/gemset.nix
+579 -475
View File
File diff suppressed because it is too large Load Diff
pkgs/applications/networking/misc/zammad/package.json
+145 -11
View File
@@ -1,18 +1,152 @@
{
"private": true,
"scripts": {
"lint:css": "stylelint \"**/*.{css,scss}\"",
"lint:css:fix": "stylelint \"**/*.{css,scss}\" --fix"
"generate-graphql-api": "RAILS_ENV=development bundle exec rails generate zammad:graphql_introspection > tmp/graphql_introspection.json && npx graphql-codegen -c .graphql_code_generator.yml && rm tmp/graphql_introspection.json",
"dev": "RAILS_ENV=development forego start -f Procfile.dev",
"dev:https": "VITE_RUBY_HTTPS=true RAILS_ENV=development forego start -f Procfile.dev-https",
"https:generate": "sh contrib/ssl/generate-ssl.sh",
"i18n": "rails generate zammad:translation_catalog",
"lint": "vue-tsc --noEmit && eslint --cache --cache-location ./tmp/eslintcache.js -c .eslintrc.js --ext .js,.ts,.vue app/frontend/ .eslint-plugin-zammad/",
"lint:fix": "yarn lint -- --fix",
"lint:css": "stylelint **/*.{css,vue,scss}",
"lint:css:fix": "stylelint **/*.{css,vue,scss} --fix",
"test": "VTL_SKIP_AUTO_CLEANUP=true TZ=utc vitest",
"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",
"postinstall": "node script/fix-node-modules.mjs",
"story": "histoire dev",
"story:build": "HISTOIRE_BUILD=1 histoire build"
},
"engines": {
"node": ">=16"
},
"packageManager": "yarn@1.22.19",
"devDependencies": {
"postcss": "^8.4.4",
"postcss-html": "^1.3.0",
"prettier": "2.5.0",
"stylelint": "^14.1.0",
"stylelint-config-prettier": "^9.0.3",
"stylelint-config-standard": "^24.0.0",
"stylelint-config-standard-scss": "^3.0.0",
"stylelint-prettier": "^2.0.0"
"@graphql-codegen/cli": "^3.0.0",
"@graphql-codegen/introspection": "^3.0.0",
"@graphql-codegen/near-operation-file-preset": "^2.5.0",
"@graphql-codegen/typescript": "^3.0.0",
"@graphql-codegen/typescript-operations": "^3.0.0",
"@graphql-codegen/typescript-vue-apollo": "^3.3.7",
"@histoire/plugin-vue": "^0.14.2",
"@pinia/testing": "^0.0.14",
"@tailwindcss/line-clamp": "^0.4.2",
"@testing-library/jest-dom": "^5.16.5",
"@testing-library/user-event": "^14.4.3",
"@testing-library/vue": "^6.6.1",
"@types/lodash-es": "^4.17.6",
"@types/rails__actioncable": "^6.1.6",
"@types/ua-parser-js": "^0.7.36",
"@types/uuid": "^9.0.0",
"@typescript-eslint/eslint-plugin": "^5.51.0",
"@typescript-eslint/parser": "^5.51.0",
"@vitejs/plugin-vue": "^4.0.0",
"@vue/eslint-config-prettier": "^7.0.0",
"@vue/eslint-config-typescript": "^11.0.2",
"@vue/test-utils": "^2.2.10",
"autoprefixer": "^10.4.13",
"eslint": "^8.33.0",
"eslint-config-airbnb-base": "^15.0.0",
"eslint-config-prettier": "^8.6.0",
"eslint-import-resolver-alias": "^1.1.2",
"eslint-plugin-import": "^2.27.5",
"eslint-plugin-prettier": "^4.2.1",
"eslint-plugin-prettier-vue": "^4.2.0",
"eslint-plugin-security": "^1.7.1",
"eslint-plugin-sonarjs": "^0.18.0",
"eslint-plugin-vue": "^9.9.0",
"eslint-plugin-zammad": "file:.eslint-plugin-zammad",
"histoire": "^0.14.2",
"jsdom": "^21.1.0",
"mock-apollo-client": "^1.2.1",
"postcss": "^8.4.21",
"postcss-html": "^1.5.0",
"prettier": "2.8.4",
"prettier-plugin-tailwindcss": "^0.2.2",
"regenerator-runtime": "^0.13.11",
"sass": "^1.58.0",
"stylelint": "^14.16.1",
"stylelint-config-prettier": "^9.0.5",
"stylelint-config-recommended-vue": "^1.4.0",
"stylelint-config-standard": "^29.0.0",
"stylelint-config-standard-scss": "^6.1.0",
"stylelint-prettier": "^2.0.0",
"stylelint-scss": "^4.4.0",
"tailwindcss": "^3.2.6",
"timezone-mock": "^1.3.6",
"ts-node": "^10.9.1",
"type-fest": "^3.5.7",
"typescript": "^4.9.5",
"vite": "^4.0.4",
"vite-plugin-pwa": "^0.14.1",
"vite-plugin-ruby": "^3.1.3",
"vite-plugin-svg-icons": "^2.0.1",
"vitest": "^0.28.4",
"vitest-axe": "^0.1.0",
"vue-tsc": "^1.0.24"
},
"dependencies": {
"@apollo/client": "^3.7.7",
"@formkit/core": "^1.0.0-beta.13-c578106",
"@formkit/dev": "^1.0.0-beta.13-c578106",
"@formkit/i18n": "^1.0.0-beta.13-c578106",
"@formkit/inputs": "^1.0.0-beta.13-c578106",
"@formkit/rules": "^1.0.0-beta.13-c578106",
"@formkit/tailwindcss": "^1.0.0-beta.13-c578106",
"@formkit/themes": "^1.0.0-beta.13-c578106",
"@formkit/utils": "^1.0.0-beta.13-c578106",
"@formkit/validation": "^1.0.0-beta.13-c578106",
"@formkit/vue": "^1.0.0-beta.13-c578106",
"@rails/actioncable": "6.1.7",
"@tiptap/core": "^2.0.0-beta.217",
"@tiptap/extension-blockquote": "^2.0.0-beta.217",
"@tiptap/extension-character-count": "^2.0.0-beta.217",
"@tiptap/extension-image": "^2.0.0-beta.217",
"@tiptap/extension-link": "^2.0.0-beta.217",
"@tiptap/extension-list-item": "^2.0.0-beta.217",
"@tiptap/extension-mention": "^2.0.0-beta.217",
"@tiptap/extension-ordered-list": "^2.0.0-beta.217",
"@tiptap/extension-paragraph": "^2.0.0-beta.217",
"@tiptap/extension-strike": "^2.0.0-beta.217",
"@tiptap/extension-underline": "^2.0.0-beta.217",
"@tiptap/pm": "^2.0.0-beta.217",
"@tiptap/starter-kit": "^2.0.0-beta.217",
"@tiptap/suggestion": "^2.0.0-beta.217",
"@tiptap/vue-3": "^2.0.0-beta.217",
"@vue/apollo-composable": "^4.0.0-beta.2",
"@vueuse/core": "^9.12.0",
"@vueuse/router": "^9.12.0",
"@vueuse/shared": "^9.12.0",
"async-mutex": "^0.4.0",
"flatpickr": "^4.6.13",
"graphql": "^16.6.0",
"graphql-ruby-client": "^1.11.5",
"graphql-tag": "^2.12.6",
"linkify-string": "^4.1.0",
"linkifyjs": "^4.1.0",
"lodash-es": "^4.17.21",
"loglevel": "^1.8.1",
"mitt": "^3.0.0",
"pinia": "^2.0.30",
"tippy.js": "^6.3.7",
"ua-parser-js": "^1.0.33",
"uuid": "^9.0.0",
"vue": "^3.2.47",
"vue-advanced-cropper": "^2.8.8",
"vue-easy-lightbox": "1.12.0",
"vue-router": "^4.1.6",
"vue3-draggable-resizable": "^1.6.5",
"vuedraggable": "^4.1.0",
"workbox-core": "^6.5.4",
"workbox-precaching": "^6.5.4",
"workbox-window": "^6.5.4"
},
"resolutions": {
"loader-utils": "^3.2.1",
"postcss": "^8.4.21"
},
"name": "Zammad",
"version": "5.1.1"
"version": "5.4.1"
}
pkgs/applications/networking/misc/zammad/source.json
+2 -2
View File
@@ -1,8 +1,8 @@
{
"owner": "zammad",
"repo": "zammad",
"rev": "d71bd90ef964426230664cdfbaa2572325bfed4f",
"sha256": "yzDTkjnRBl71REtSKRblkanJWhj7gp/+exhWjxGCFWw=",
"rev": "643aba6ba4ba66c6127038c8cc2cc7a20b912678",
"sha256": "vLLn989M5ZN+jTh60BopEKbuaxOBfDsk6PiM+gHFClo=",
"fetchSubmodules": true
}
pkgs/applications/networking/misc/zammad/update.nix
+2
View File
@@ -3,6 +3,7 @@
, makeWrapper
, bundix
, common-updater-scripts
, xidel
, jq
, nix-prefetch-github
, yarn
@@ -23,6 +24,7 @@ stdenv.mkDerivation rec {
buildInputs = [
bundix
common-updater-scripts
xidel
jq
nix-prefetch-github
yarn
pkgs/applications/networking/misc/zammad/update.sh
+1 -1
View File
@@ -8,7 +8,7 @@ if [ "$#" -gt 2 ] || [[ "$1" == -* ]]; then
exit 1
fi
VERSION=$(curl -s https://ftp.zammad.com/ | grep -v latest | grep tar.gz | sed "s/<a href=\".*\">zammad-//" | sort -h | tail -n 1 | awk '{print $1}' | sed 's/.tar.gz<\/a>//')
VERSION=$(xidel -s https://ftp.zammad.com/ --extract "//a" | grep -E "zammad-[0-9.]*.tar.gz" | sort --version-sort | tail -n 1 | sed -e 's/zammad-//' -e 's/.tar.gz//')
TARGET_DIR="$2"
WORK_DIR=$(mktemp -d)
SOURCE_DIR=$WORK_DIR/zammad-$VERSION
pkgs/applications/networking/misc/zammad/yarn.lock
+9835 -300
View File
File diff suppressed because it is too large Load Diff
pkgs/applications/networking/misc/zammad/yarn.nix
+10126 -229
View File
File diff suppressed because it is too large Load Diff
pkgs/applications/networking/n8n/node-packages.nix
Generated
+591 -703
View File
File diff suppressed because it is too large Load Diff
pkgs/applications/version-management/glab/default.nix
+3 -3
View File
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "glab";
version = "1.28.0";
version = "1.29.4";
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "cli";
rev = "v${version}";
hash = "sha256-e3tblY/lf25TJrsLeQdaPcgVlsaEimkjQxO0P9X1o6w=";
hash = "sha256-ZmmsZ0+KuuLRgnFXGO0V+8Hm24THyHEZq/a+araTR9I=";
};
vendorHash = "sha256-PH0PJujdRtnVS0s6wWtS6kffQBQduqb2KJYru9ePatw=";
vendorHash = "sha256-WfzN70HHLatBuV+GW2VC+5laR3rBfDOqPydyxMSmL3s=";
ldflags = [
"-s"
pkgs/data/misc/v2ray-domain-list-community/default.nix
+2 -2
View File
@@ -3,12 +3,12 @@
let
generator = pkgsBuildBuild.buildGoModule rec {
pname = "v2ray-domain-list-community";
version = "20230407083123";
version = "20230517022917";
src = fetchFromGitHub {
owner = "v2fly";
repo = "domain-list-community";
rev = version;
hash = "sha256-+TOZR8ty4BqjPpzKZtqzfgduRSf4PiHoUUx0eMkV0mk=";
hash = "sha256-oRmVJyDfdJhAdF9nJrJs2SjoUs1pr39/xcCps5d3WyM=";
};
vendorHash = "sha256-zkf2neI1HiPkCrcw+cYoZ2L/OGkM8HPIv5gUqc05Wak=";
meta = with lib; {
pkgs/data/misc/v2ray-geoip/default.nix
+3 -3
View File
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "v2ray-geoip";
version = "202305040042";
version = "202305110042";
src = fetchFromGitHub {
owner = "v2fly";
repo = "geoip";
rev = "ef62a770a54006accfdfa8e3e38e2bdf5997baf0";
sha256 = "sha256-CThhxFVBIz9H0YiI3+fdy76kwq7bsMdONyRAvMQ5VrA=";
rev = "d3e53c0849b499829dfb97af7e10552257277d2e";
sha256 = "sha256-jCktxDGMkRiG8tiNx27V9s1LLqaitWDBAB063+eLwmg=";
};
installPhase = ''
pkgs/development/compilers/cakelisp/default.nix
+9 -6
View File
@@ -1,14 +1,13 @@
{ lib, stdenv, fetchFromGitHub, gcc }:
{ lib, stdenv, fetchgit, gcc }:
stdenv.mkDerivation rec {
pname = "cakelisp";
version = "0.1.0";
src = fetchFromGitHub {
owner = "makuto";
repo = "cakelisp";
src = fetchgit {
url = "https://macoy.me/code/macoy/cakelisp";
rev = "v${version}";
sha256 = "126va59jy7rvy6c2wrf8j44m307f2d8jixqkc49s9wllxprj1dmg";
sha256 = "sha256-r7Yg8+2U8qQTYRP3KFET7oBRCZHIZS6Y8TsfL1NR24g=";
};
buildInputs = [ gcc ];
@@ -25,16 +24,20 @@ stdenv.mkDerivation rec {
'';
buildPhase = ''
runHook preBuild
./Build.sh
runHook postBuild
'';
installPhase = ''
runHook preInstall
install -Dm755 bin/cakelisp -t $out/bin
runHook postInstall
'';
meta = with lib; {
description = "A performance-oriented Lisp-like language";
homepage = "https://github.com/makuto/cakelisp";
homepage = "https://macoy.me/code/macoy/cakelisp";
license = licenses.gpl3Plus;
platforms = platforms.darwin ++ platforms.linux;
maintainers = [ maintainers.sbond75 ];
pkgs/development/libraries/gstreamer/default.nix
+3
View File
@@ -11,6 +11,7 @@
, IOKit
, MediaToolbox
, OpenGL
, Security
, VideoToolbox
, ipu6ep-camera-hal
}:
@@ -30,6 +31,8 @@
gst-plugins-viperfx = callPackage ./viperfx { };
gst-plugins-rs = callPackage ./rs { inherit Security; };
gst-rtsp-server = callPackage ./rtsp-server { };
gst-libav = callPackage ./libav { };
pkgs/development/libraries/gstreamer/rs/Cargo.lock
Generated
+3766
View File
File diff suppressed because it is too large Load Diff
pkgs/development/libraries/gstreamer/rs/default.nix
+230
View File
@@ -0,0 +1,230 @@
{ lib
, stdenv
, fetchFromGitLab
, fetchpatch
, writeText
, rustPlatform
, meson
, ninja
, python3
, pkg-config
, rust
, rustc
, cargo
, cargo-c
, nasm
, gstreamer
, gst-plugins-base
, gst-plugins-bad
, gtk4
, cairo
, csound
, dav1d
, libsodium
, libwebp
, openssl
, pango
, Security
, gst-plugins-good
, nix-update-script
# TODO: required for case-insensitivity hack below
, yq
, moreutils
# specify a limited set of plugins to build if not all supported plugins
, plugins ? null
}:
let
# populated from meson_options.txt (manually for now, but that might change in the future)
validPlugins = {
# audio
audiofx = [ ];
claxon = [ ];
csound = [ csound ];
lewton = [ ];
spotify = [ ];
# generic
file = [ ];
sodium = [ libsodium ];
threadshare = [ ];
# mux
flavors = [ ];
fmp4 = [ ];
mp4 = [ ];
# net
aws = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ];
hlssink3 = [ ];
ndi = [ ];
onvif = [ pango ];
raptorq = [ ];
reqwest = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ];
rtp = [ ];
webrtc = [ gst-plugins-bad openssl ] ++ lib.optionals stdenv.isDarwin [ Security ];
webrtchttp = [ gst-plugins-bad openssl ] ++ lib.optionals stdenv.isDarwin [ Security ];
# text
textahead = [ ];
json = [ ];
regex = [ ];
textwrap = [ ];
# utils
fallbackswitch = [ gtk4 ];
livesync = [ gtk4 ];
togglerecord = [ gtk4 ];
tracers = [ ];
uriplaylistbin = [ ];
# video
cdg = [ ];
closedcaption = [ pango ];
dav1d = [ dav1d ];
ffv1 = [ ];
gif = [ ];
gtk4 = [ gtk4 ];
hsv = [ ];
png = [ ];
rav1e = [ ];
videofx = [ cairo ];
webp = [ libwebp ];
};
selectedPlugins = if plugins != null then lib.unique (lib.sort lib.lessThan plugins) else lib.subtractLists (
[
"audiofx" # tests have race-y failure, see https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/issues/337
"csound" # tests have weird failure on x86, does not currently work on arm or darwin
] ++ lib.optionals stdenv.isDarwin [
"reqwest" # tests hang on darwin
"threadshare" # tests cannot bind to localhost on darwin
"webp" # not supported on darwin (upstream crate issue)
] ++ lib.optionals (stdenv.isDarwin && !stdenv.isAarch64) [
# these require gstreamer-gl which requires darwin sdk bump
"gtk4"
"livesync"
"fallbackswitch"
"togglerecord"
]
) (lib.attrNames validPlugins);
invalidPlugins = lib.subtractLists (lib.attrNames validPlugins) selectedPlugins;
in
assert lib.assertMsg (invalidPlugins == [])
"Invalid gst-plugins-rs plugin${lib.optionalString (lib.length invalidPlugins > 1) "s"}: ${lib.concatStringsSep ", " invalidPlugins}";
stdenv.mkDerivation rec {
pname = "gst-plugins-rs";
version = "0.10.7";
outputs = [ "out" "dev" ];
src = fetchFromGitLab {
domain = "gitlab.freedesktop.org";
owner = "gstreamer";
repo = "gst-plugins-rs";
rev = version;
hash = "sha256-b+j7nAMK66+msRnIaj1S1DSvES5Gid3QazXgqO1II/Q=";
# TODO: temporary workaround for case-insensitivity problems with color-name crate - https://github.com/annymosse/color-name/pull/2
nativeBuildInputs = [ yq moreutils ];
postFetch = ''
tomlq --toml-output '.package |= map(if .name == "color-name"
then (.source = "git+https://github.com/lilyinstarlight/color-name#cac0ed5b7d2e0682c08c9bfd13089d5494e81b9a" | del(.checksum))
else .
end)' $out/Cargo.lock | sponge $out/Cargo.lock
'';
};
cargoDeps = rustPlatform.importCargoLock {
lockFile = ./Cargo.lock;
outputHashes = {
"cairo-rs-0.17.9" = "sha256-LiIb6y/Ks/o+rZhU8RpXN7jSo7JzBGmcNumxyx/lZs0=";
"color-name-1.1.0" = "sha256-RfMStbe2wX5qjPARHIFHlSDKjzx8DwJ+RjzyltM5K7A=";
"ffv1-0.0.0" = "sha256-af2VD00tMf/hkfvrtGrHTjVJqbl+VVpLaR0Ry+2niJE=";
"flavors-0.2.0" = "sha256-zBa0X75lXnASDBam9Kk6w7K7xuH9fP6rmjWZBUB5hxk=";
"gdk4-0.6.6" = "sha256-TI4F9MjIpxFEZItoewP/Zem1vM4MsKNJTzfgah1vjmI=";
"gstreamer-0.20.5" = "sha256-IQ56Upe73egId1IJRfzvqrJIzTc1x5FgAEbva9kuqPE=";
};
};
strictDeps = true;
nativeBuildInputs = [
rustPlatform.cargoSetupHook
meson
ninja
python3
python3.pkgs.tomli
pkg-config
rustc
cargo
cargo-c
nasm
];
buildInputs = [
gstreamer
gst-plugins-base
] ++ lib.concatMap (plugin: lib.getAttr plugin validPlugins) selectedPlugins;
checkInputs = [
gst-plugins-good
gst-plugins-bad
];
mesonFlags = (
map (plugin: lib.mesonEnable plugin true) selectedPlugins
) ++ [
(lib.mesonOption "sodium-source" "system")
(lib.mesonEnable "doc" false) # `hotdoc` not packaged in nixpkgs as of writing
] ++ (let
crossFile = writeText "cross-file.conf" ''
[binaries]
rust = [ 'rustc', '--target', '${rust.toRustTargetSpec stdenv.hostPlatform}' ]
'';
in lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
"--cross-file=${crossFile}"
]);
# turn off all auto plugins if a list is specified
mesonAutoFeatures = "disabled";
doCheck = true;
# csound lib dir must be manually specified for it to build
# webrtc and webrtchttp plugins are the only that need gstreamer-webrtc (from gst-plugins-bad, a heavy set)
preConfigure = ''
export CARGO_BUILD_JOBS=$NIX_BUILD_CORES
patchShebangs dependencies.py
'' + lib.optionalString (lib.elem "csound" selectedPlugins) ''
export CSOUND_LIB_DIR=${lib.getLib csound}/lib
'' + lib.optionalString (lib.mutuallyExclusive [ "webrtc" "webrtchttp" ] selectedPlugins) ''
sed -i "/\['gstreamer-webrtc-1\.0', 'gst-plugins-bad', 'gstwebrtc_dep', 'gstwebrtc'\]/d" meson.build
'' + lib.optionalString (stdenv.isDarwin && !stdenv.isAarch64) ''
sed -i "/\['gstreamer-gl-1\.0', 'gst-plugins-base', 'gst_gl_dep', 'gstgl'\]/d" meson.build
'';
# run tests ourselves to avoid meson timing out by default
checkPhase = ''
runHook preCheck
meson test --no-rebuild --verbose --timeout-multiplier 6
runHook postCheck
'';
passthru.updateScript = nix-update-script {
# use numbered releases rather than gstreamer-* releases
extraArgs = [ "--version-regex" "([0-9.]+)" ];
};
meta = with lib; {
description = "GStreamer plugins written in Rust";
homepage = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs";
license = with licenses; [ mpl20 asl20 mit lgpl21Plus ];
platforms = platforms.unix;
maintainers = with maintainers; [ lilyinstarlight ];
};
}
pkgs/development/libraries/kpmcore/default.nix
+10 -4
View File
@@ -1,16 +1,22 @@
{ stdenv, lib, fetchurl, extra-cmake-modules
, qca-qt5, kauth, kio, polkit-qt
{ stdenv
, lib
, fetchurl
, extra-cmake-modules
, qca-qt5
, kauth
, kio
, polkit-qt
, util-linux
}:
stdenv.mkDerivation rec {
pname = "kpmcore";
# NOTE: When changing this version, also change the version of `partition-manager`.
version = "22.12.1";
version = "23.04.1";
src = fetchurl {
url = "mirror://kde/stable/release-service/${version}/src/${pname}-${version}.tar.xz";
hash = "sha256-ZJ179jHCLEB0kFMWfCe+U6c7k7yZ3MztwqAcUd25t40=";
hash = "sha256-NFIq8CZwYvpqDOOYLlBqoGdgfNPsyf15FkB3dToDCB8=";
};
patches = [
pkgs/development/libraries/physics/rivet/default.nix
+2 -2
View File
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "rivet";
version = "3.1.7";
version = "3.1.8";
src = fetchurl {
url = "https://www.hepforge.org/archive/rivet/Rivet-${version}.tar.bz2";
hash = "sha256-J8fbvLX9fugcrxNtr06WC8oOwlXZ+hq+YC9NQwhhsno=";
hash = "sha256-dbPz1BnKY4jR/S7A7afh+Q8yS5lszwWR9IpdLijczBM=";
};
latex = texlive.combine { inherit (texlive)
pkgs/development/python-modules/ailment/default.nix
+2 -2
View File
@@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "ailment";
version = "9.2.50";
version = "9.2.51";
format = "pyproject";
disabled = pythonOlder "3.8";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "angr";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-npqwIwAUUFrwg9/+rERRhqU68GCDueTZ1N5LKFWvmms=";
hash = "sha256-X7dwwuEy5IVNmkNY82QUBEZMY8yPK2h4ov1pWQn3Rn0=";
};
nativeBuildInputs = [
pkgs/development/python-modules/angr/default.nix
+2 -2
View File
@@ -32,7 +32,7 @@
buildPythonPackage rec {
pname = "angr";
version = "9.2.50";
version = "9.2.51";
format = "pyproject";
disabled = pythonOlder "3.8";
@@ -41,7 +41,7 @@ buildPythonPackage rec {
owner = pname;
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-lsQ0pMabd1nC9ysR38u2rlGOGY+onk3qV1V68AZBQy4=";
hash = "sha256-sZRK6V9eq7tIUDLJ8r/zKu+9TwGaRr0zHGnVbrNdv1g=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/anthropic/default.nix
+2 -2
View File
@@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "anthropic";
version = "0.2.7";
version = "0.2.9";
format = "pyproject";
disabled = pythonOlder "3.8";
src = fetchPypi {
inherit pname version;
hash = "sha256-2v3WF8eRIruXvFNjRRno3LoXt+dlpaI3LHf243RBJ+U=";
hash = "sha256-LURWTTYsztbo5mI2bk3n+U3NxsthNGpeUoNZsK/B8vM=";
};
nativeBuildInputs = [
pkgs/development/python-modules/archinfo/default.nix
+2 -2
View File
@@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "archinfo";
version = "9.2.50";
version = "9.2.51";
format = "pyproject";
disabled = pythonOlder "3.8";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "angr";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-36BWuqK6/cPPSpL4sb97+w4re65bUU3ySiCcOUXh79M=";
hash = "sha256-sx+/2pFBwCTOjUO2fx9Me9UvJSEDk/wLoqCdmbY0TQ8=";
};
nativeBuildInputs = [
pkgs/development/python-modules/bundlewrap/default.nix
+2 -2
View File
@@ -18,7 +18,7 @@
buildPythonPackage rec {
pname = "bundlewrap";
version = "4.17.0";
version = "4.17.2";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
owner = "bundlewrap";
repo = "bundlewrap";
rev = "refs/tags/${version}";
hash = "sha256-hdTJcuhVMbLqtPclgj4u6XwH0A5DvnGpnkhIG6Gm8+4=";
hash = "sha256-0yg8+OflTF3pNYz2TPNUW8ubTZjrEgtihV/21PpJUlM=";
};
nativeBuildInputs = [ setuptools ];
pkgs/development/python-modules/claripy/default.nix
+2 -2
View File
@@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "claripy";
version = "9.2.50";
version = "9.2.51";
format = "pyproject";
disabled = pythonOlder "3.8";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "angr";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-bHo1hpLLrJVZ8BxupsavreY6JTmuGboLODT8so6Fx1c=";
hash = "sha256-QitBUufRt7AIeX19fvjXEhMtE90Cw2fL7EPj1OSjBug=";
};
nativeBuildInputs = [
pkgs/development/python-modules/cle/default.nix
+2 -2
View File
@@ -16,7 +16,7 @@
let
# The binaries are following the argr projects release cycle
version = "9.2.50";
version = "9.2.51";
# Binary files from https://github.com/angr/binaries (only used for testing and only here)
binaries = fetchFromGitHub {
@@ -38,7 +38,7 @@ buildPythonPackage rec {
owner = "angr";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-pThCJlxx2IkLJhc+U5H6fSQy8QLFQr6cIILsdlEA8wM=";
hash = "sha256-sk5TiDtfltiQLinXj2psLOY2wrNYXU9Ab+kDa/8C0VU=";
};
nativeBuildInputs = [
pkgs/development/python-modules/geoip2/default.nix
+2 -2
View File
@@ -14,14 +14,14 @@
buildPythonPackage rec {
pname = "geoip2";
version = "4.6.0";
version = "4.7.0";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
hash = "sha256-8OgLzoCwa7OL0Iv0h31ahONU6TIJXmzPtNJ7tZj6T4M=";
hash = "sha256-O93kmU9ryRfq+rW1Hnctc3sq4AA3pbhQAfsG3Gj3ed8=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/google-cloud-datastore/default.nix
+2 -2
View File
@@ -15,14 +15,14 @@
buildPythonPackage rec {
pname = "google-cloud-datastore";
version = "2.15.1";
version = "2.15.2";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-TC8OiCVIKomYyMW2cshiBqbZiORJ8lG7m/F9rpoFbC4=";
hash = "sha256-PnPP7FRrxKyuYTcFuSZdwUs+Ff06yPyJ8Omk6Zaufv0=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/mautrix/default.nix
+2 -2
View File
@@ -21,7 +21,7 @@
buildPythonPackage rec {
pname = "mautrix";
version = "0.19.13";
version = "0.19.14";
format = "setuptools";
disabled = pythonOlder "3.8";
@@ -30,7 +30,7 @@ buildPythonPackage rec {
owner = "mautrix";
repo = "python";
rev = "refs/tags/v${version}";
hash = "sha256-nmsYe/iDKW4dUSuxSoUz2NpAGLPOTzrBNy6AwYMVs8k=";
hash = "sha256-opaJR04ZF27NypDbhxSeim6/TusflNNdd/MQYhya1uk=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/maxminddb/default.nix
+2 -2
View File
@@ -11,12 +11,12 @@
buildPythonPackage rec {
pname = "maxminddb";
version = "2.2.0";
version = "2.3.0";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "e37707ec4fab115804670e0fb7aedb4b57075a8b6f80052bdc648d3c005184e5";
sha256 = "sha256-Egkg3d2VXzKuSMIHxs72/V3Ih0qIm6lLDywfc27N8wg=";
};
buildInputs = [ libmaxminddb ];
pkgs/development/python-modules/plugwise/default.nix
+2 -2
View File
@@ -21,7 +21,7 @@
buildPythonPackage rec {
pname = "plugwise";
version = "0.31.2";
version = "0.31.3";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -30,7 +30,7 @@ buildPythonPackage rec {
owner = pname;
repo = "python-plugwise";
rev = "refs/tags/v${version}";
hash = "sha256-lxeOGNO5OF4lLIQf/7TrrF091RKjdq8k80bBA/v5O4A=";
hash = "sha256-/J61J9r6nhY10aerhZ1+RK9hohV0NYiAve+06ubI8p8=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/pyvex/default.nix
+2 -2
View File
@@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "pyvex";
version = "9.2.50";
version = "9.2.51";
format = "pyproject";
disabled = pythonOlder "3.8";
src = fetchPypi {
inherit pname version;
hash = "sha256-DfC1POGV6bR3p0LqZBfmX2BkFvhdn4QjHgZkDwznSyE=";
hash = "sha256-/4AmEmbG1XWRPIVGcqcxhHrJmbq7RXcUuDFYZGhuUY4=";
};
nativeBuildInputs = [
pkgs/development/python-modules/shodan/default.nix
+3 -2
View File
@@ -11,14 +11,14 @@
buildPythonPackage rec {
pname = "shodan";
version = "1.28.0";
version = "1.29.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-GL0q6BEUtwg24OMxUicyXhQ5gnUiOZiowjWwmUMvSws=";
hash = "sha256-6+ptvBlESX6ROSY0I+pNED3NWMCFxd2/TWqx226x0UI=";
};
propagatedBuildInputs = [
@@ -39,6 +39,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Python library and command-line utility for Shodan";
homepage = "https://github.com/achillean/shodan-python";
changelog = "https://github.com/achillean/shodan-python/blob/${version}/CHANGELOG.md";
license = licenses.mit;
maintainers = with maintainers; [ lihop ];
};
pkgs/development/tools/analysis/rizin/cutter.nix
+2 -2
View File
@@ -11,13 +11,13 @@
mkDerivation rec {
pname = "cutter";
version = "2.2.0";
version = "2.2.1";
src = fetchFromGitHub {
owner = "rizinorg";
repo = "cutter";
rev = "v${version}";
hash = "sha256-TgYX7FKTi5FBlCRDskGC/OUyh5yvS0nsLUtfCCC4S1w=";
hash = "sha256-rzMLPkL382webds7cnfanHy9BsV+8ARkl6aES5ckmO4=";
fetchSubmodules = true;
};
pkgs/development/tools/oh-my-posh/default.nix
+5 -5
View File
@@ -6,16 +6,16 @@
buildGoModule rec {
pname = "oh-my-posh";
version = "15.4.2";
version = "16.4.2";
src = fetchFromGitHub {
owner = "jandedobbeleer";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-D1X0/r/OyQKPPE1aEwNVdGJYq6+i67xTvIQK3ZeI7pM=";
hash = "sha256-hCLnoT7xkXHKCp3dvNhMjEKvKCHEWsuO9+aORcH7E8E=";
};
vendorHash = "sha256-4exLY24baDjgGIDS1P7BIK38O4b+KeqNTMzA6wap05k=";
vendorHash = "sha256-KdvZ0OY6iJYwdK0oKqBp7bYlCe7F5BUfSWTEIMbkZcA=";
sourceRoot = "source/src";
@@ -36,8 +36,8 @@ buildGoModule rec {
];
postPatch = ''
# this test requires internet access
rm engine/migrate_glyphs_test.go
# these tests requires internet access
rm engine/image_test.go engine/migrate_glyphs_test.go
'';
postInstall = ''
pkgs/os-specific/linux/kernel/common-config.nix
+9 -4
View File
@@ -77,6 +77,10 @@ let
ACPI_APEI = (option yes);
# APEI Generic Hardware Error Source
ACPI_APEI_GHES = (option yes);
# Enable lazy RCUs for power savings:
# https://lore.kernel.org/rcu/20221019225138.GA2499943@paulmck-ThinkPad-P17-Gen-1/
RCU_LAZY = whenAtLeast "6.2" yes;
} // optionalAttrs (stdenv.hostPlatform.isx86) {
INTEL_IDLE = yes;
INTEL_RAPL = whenAtLeast "5.3" module;
@@ -679,10 +683,11 @@ let
};
zram = {
ZRAM = module;
ZSWAP = option yes;
ZBUD = option yes;
ZSMALLOC = module;
ZRAM = module;
ZRAM_WRITEBACK = option yes;
ZSWAP = option yes;
ZBUD = option yes;
ZSMALLOC = module;
};
brcmfmac = {
pkgs/os-specific/linux/kernel/hardened/patches.json
+10 -10
View File
@@ -32,12 +32,12 @@
"5.15": {
"patch": {
"extra": "-hardened1",
"name": "linux-hardened-5.15.110-hardened1.patch",
"sha256": "1kfad446bnkmsssvhn5w30v3qi4ysja6vgfa01jzwvlnvzizfy0c",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.110-hardened1/linux-hardened-5.15.110-hardened1.patch"
"name": "linux-hardened-5.15.111-hardened1.patch",
"sha256": "1d1myj6jv21pyhcw1nalhd2l9kfdrqgnkhs2wb1dh0nwvmw6qrn3",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.111-hardened1/linux-hardened-5.15.111-hardened1.patch"
},
"sha256": "0nqbhgafl513pdfn55j608829bsw8kn0v616gblxqy4rgg3zqacq",
"version": "5.15.110"
"sha256": "1hmfvii77w70dx1lsfigc7nmjblvs1q131q48didsn01khjymkkp",
"version": "5.15.111"
},
"5.4": {
"patch": {
@@ -52,11 +52,11 @@
"6.1": {
"patch": {
"extra": "-hardened1",
"name": "linux-hardened-6.1.27-hardened1.patch",
"sha256": "0bg149qx7nwpxhajn6283cfgrp151477xpbl5rqhcfk47w3alnk4",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/6.1.27-hardened1/linux-hardened-6.1.27-hardened1.patch"
"name": "linux-hardened-6.1.28-hardened1.patch",
"sha256": "0mywgd0xpy5x882sg9s2dp10m3vknjyqa87lgq76am7r6r7fbazp",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/6.1.28-hardened1/linux-hardened-6.1.28-hardened1.patch"
},
"sha256": "01grx5y48scyyihpj176knn5yvgpxv2gfkli03rwj31xvnb4pdy2",
"version": "6.1.27"
"sha256": "1w56qgf1vgk3dmh4xw6699kjm5pdqvyfzr19ah5yy3xj50a4q2bs",
"version": "6.1.28"
}
}
pkgs/os-specific/linux/kernel/linux-4.14.nix
+2 -2
View File
@@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "4.14.314";
version = "4.14.315";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = versions.pad 3 version;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "0lwiykv2ci7lrjvvykbiqavzzizdkf8xxqlybixi9l1as7q02v47";
sha256 = "17f9cbinysazllrxkv1qlhgi3x61isi7jqrv0qlfpjh69k1waim3";
};
} // (args.argsOverride or {}))
pkgs/os-specific/linux/kernel/linux-4.19.nix
+2 -2
View File
@@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "4.19.282";
version = "4.19.283";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = versions.pad 3 version;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "02z20879xl4ya957by1p35vi1a7myzxwiqd9cnvm541sgnci99a3";
sha256 = "1x2irhiv20aq2mrgqyz18d147shbmghwfxq4qi0sv5vc1k91cwq4";
};
} // (args.argsOverride or {}))
pkgs/os-specific/linux/kernel/linux-5.10.nix
+2 -2
View File
@@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "5.10.179";
version = "5.10.180";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = versions.pad 3 version;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "0abylcqbzpxxh45kmvd9i2cig64aajz87j5c8vm3w1ab2mf49g8v";
sha256 = "0a8cicvcyl5w4vi7gxhgd59ny44gj9cbv4z5pnwn9jgny55rm0ys";
};
} // (args.argsOverride or {}))
pkgs/os-specific/linux/kernel/linux-5.15.nix
+2 -2
View File
@@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "5.15.111";
version = "5.15.112";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = versions.pad 3 version;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "1hmfvii77w70dx1lsfigc7nmjblvs1q131q48didsn01khjymkkp";
sha256 = "0lfnd8mpb3nzvd0gk0jbls3zx7y5kskc4kgccjgkc34flgdyps5h";
};
} // (args.argsOverride or { }))
pkgs/os-specific/linux/kernel/linux-5.4.nix
+2 -2
View File
@@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "5.4.242";
version = "5.4.243";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = versions.pad 3 version;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "0a7wfi84p74qsnbj1vamz4qxzp94v054jp1csyfl0blz3knrlbql";
sha256 = "017b1xhmjpmiq48pzzx36wn6jwwgaq2kgia51h7pxr7fxr7ndky3";
};
} // (args.argsOverride or {}))
pkgs/os-specific/linux/kernel/linux-6.1.nix
+2 -2
View File
@@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "6.1.28";
version = "6.1.29";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = versions.pad 3 version;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz";
sha256 = "1w56qgf1vgk3dmh4xw6699kjm5pdqvyfzr19ah5yy3xj50a4q2bs";
sha256 = "1yzwp0496j63c6lhvsni1ynr8b2cpn552pli3nd3fdk0pp4nqwqy";
};
} // (args.argsOverride or { }))
pkgs/os-specific/linux/kernel/linux-6.2.nix
+2 -2
View File
@@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "6.2.15";
version = "6.2.16";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = versions.pad 3 version;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz";
sha256 = "1hcgxmwp1977wkj2ylxzbfqj5qwjc6czvd9yvdm0qrj422939ylz";
sha256 = "04w76lfkfiq7z4dl3cnq6yiqmiwjayhw3n7n81hv8d3919w0vzq6";
};
} // (args.argsOverride or { }))
pkgs/os-specific/linux/kernel/linux-6.3.nix
+2 -2
View File
@@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "6.3.2";
version = "6.3.3";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = versions.pad 3 version;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz";
sha256 = "0a2kki763lrlafh6kf9ca8nxrdrk5043k7vdzy4pjgyahbrfq4mn";
sha256 = "1ra4kr9bp1s9d7amvz6ik1q3chwps5lysn37b28770pfdim22xc9";
};
} // (args.argsOverride or { }))
pkgs/os-specific/linux/kernel/linux-rt-6.1.nix
+3 -3
View File
@@ -6,7 +6,7 @@
, ... } @ args:
let
version = "6.1.26-rt8"; # updated by ./update-rt.sh
version = "6.1.28-rt10"; # updated by ./update-rt.sh
branch = lib.versions.majorMinor version;
kversion = builtins.elemAt (lib.splitString "-" version) 0;
in buildLinux (args // {
@@ -18,14 +18,14 @@ in buildLinux (args // {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v6.x/linux-${kversion}.tar.xz";
sha256 = "0461ckgh9qm1pj9xyi61cvawqpavn2sb44wjx5g4mmkrm11w3p6z";
sha256 = "1w56qgf1vgk3dmh4xw6699kjm5pdqvyfzr19ah5yy3xj50a4q2bs";
};
kernelPatches = let rt-patch = {
name = "rt";
patch = fetchurl {
url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
sha256 = "1nwbj6cx2sa74f772wxmm5czd6c8v3s2f6919qri19xpm6kndkda";
sha256 = "1fwi113x85bq09y06jhmfn5wbfscb9l2cggvlzw4yam802vlp853";
};
}; in [ rt-patch ] ++ kernelPatches;
pkgs/servers/web-apps/wordpress/packages/generate.sh
+4 -1
View File
@@ -1,12 +1,15 @@
#!/usr/bin/env nix-shell
#! nix-shell -I nixpkgs=../../../../.. -i bash -p wp4nix
#!nix-shell -i bash -p wp4nix jq
set -e
set -u
set -o pipefail
set -x
cd $(dirname "$0")
nixFlags="--option experimental-features nix-command eval --raw --impure --expr"
export NIX_PATH=nixpkgs=../../../../..
export WP_VERSION=$(nix $nixFlags '(import <nixpkgs> {}).wordpress.version')
PLUGINS=`cat wordpress-plugins.json | jq -r '.[]' | sed -z 's/\n/,/g;s/,$/\n/'`
pkgs/tools/misc/partition-manager/default.nix
+36 -9
View File
@@ -1,9 +1,35 @@
{ mkDerivation, fetchurl, lib
, extra-cmake-modules, kdoctools, wrapGAppsHook
, kconfig, kcrash, kinit, kpmcore, polkit-qt
, cryptsetup, lvm2, mdadm, smartmontools, systemdMinimal, util-linux
, btrfs-progs, dosfstools, e2fsprogs, exfat, f2fs-tools, fatresize, hfsprogs
, jfsutils, nilfs-utils, ntfs3g, reiser4progs, reiserfsprogs, udftools, xfsprogs, zfs
{ mkDerivation
, fetchurl
, lib
, extra-cmake-modules
, kdoctools
, wrapGAppsHook
, kconfig
, kcrash
, kinit
, kpmcore
, polkit-qt
, cryptsetup
, lvm2
, mdadm
, smartmontools
, systemdMinimal
, util-linux
, btrfs-progs
, dosfstools
, e2fsprogs
, exfat
, f2fs-tools
, fatresize
, hfsprogs
, jfsutils
, nilfs-utils
, ntfs3g
, reiser4progs
, reiserfsprogs
, udftools
, xfsprogs
, zfs
}:
let
@@ -38,14 +64,15 @@ let
# FIXME: Missing command: tune.exfat hfsck hformat fsck.nilfs2 {fsck,mkfs,debugfs,tunefs}.ocfs2
];
in mkDerivation rec {
in
mkDerivation rec {
pname = "partitionmanager";
# NOTE: When changing this version, also change the version of `kpmcore`.
version = "22.12.1";
version = "23.04.1";
src = fetchurl {
url = "mirror://kde/stable/release-service/${version}/src/${pname}-${version}.tar.xz";
hash = "sha256-8uI7rWkjUALZAdciGwOpmjVzGDffwM86BI9B3S0eSho=";
hash = "sha256-iMf6/QOJIDTKHAsCg3ey4GX0QHwrYl2LcCWxZsolMl8=";
};
nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
pkgs/tools/networking/trippy/default.nix
+3 -3
View File
@@ -5,16 +5,16 @@
rustPlatform.buildRustPackage rec {
pname = "trippy";
version = "0.7.0";
version = "0.8.0";
src = fetchFromGitHub {
owner = "fujiapple852";
repo = "trippy";
rev = version;
hash = "sha256-ABdG1FKgFF/vMkAQl2tk8FcnSzC4Z3r9E67ZwAGPt8U=";
hash = "sha256-2bh4wNP8sQcojjjbx5DQctlkwCTYcPdSkpW4OCOyp9k=";
};
cargoHash = "sha256-1H3JHZbG8k15Qfpsk+XykmbotHcO+J4zTbwdlOR2kso=";
cargoHash = "sha256-C8SUceX9RwUyiCknmuRfBqG0vjesS54bZQHwi7krwKo=";
meta = with lib; {
description = "A network diagnostic tool";
pkgs/top-level/aliases.nix
-1
View File
@@ -1057,7 +1057,6 @@ mapAliases ({
mopidy-gmusic = throw "mopidy-gmusic has been removed because Google Play Music was discontinued"; # Added 2021-03-07
mopidy-local-images = throw "mopidy-local-images has been removed as it's unmaintained. Its functionality has been merged into the mopidy-local extension"; # Added 2020-10-18
mopidy-local-sqlite = throw "mopidy-local-sqlite has been removed as it's unmaintained. Its functionality has been merged into the mopidy-local extension"; # Added 2020-10-18
mopidy-spotify = throw "mopidy-spotify has been removed because Spotify stopped supporting libspotify"; # added 2022-05-29
mopidy-spotify-tunigo = throw "mopidy-spotify-tunigo has been removed because Spotify stopped supporting libspotify"; # added 2022-05-29
morituri = throw "'morituri' has been renamed to/replaced by 'whipper'"; # Converted to throw 2022-02-22
pkgs/top-level/all-packages.nix
+3 -2
View File
@@ -7088,7 +7088,7 @@ with pkgs;
schildichat-desktop = callPackage ../applications/networking/instant-messengers/schildichat/schildichat-desktop.nix {
inherit (darwin.apple_sdk.frameworks) Security AppKit CoreServices;
electron = electron_22;
electron = electron_24;
};
schildichat-desktop-wayland = writeScriptBin "schildichat-desktop" ''
#!/bin/sh
@@ -20724,7 +20724,7 @@ with pkgs;
gst_all_1 = recurseIntoAttrs(callPackage ../development/libraries/gstreamer {
callPackage = newScope (gst_all_1 // { libav = pkgs.ffmpeg-headless; });
inherit (darwin.apple_sdk.frameworks) AudioToolbox AVFoundation Cocoa CoreFoundation CoreMedia CoreServices CoreVideo DiskArbitration Foundation IOKit MediaToolbox OpenGL VideoToolbox;
inherit (darwin.apple_sdk.frameworks) AudioToolbox AVFoundation Cocoa CoreFoundation CoreMedia CoreServices CoreVideo DiskArbitration Foundation IOKit MediaToolbox OpenGL Security VideoToolbox;
});
gusb = callPackage ../development/libraries/gusb { };
@@ -32442,6 +32442,7 @@ with pkgs;
mopidy-scrobbler
mopidy-somafm
mopidy-soundcloud
mopidy-spotify
mopidy-subidy
mopidy-tidal
mopidy-tunein