Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
cd6011bf17
@ -6524,7 +6524,7 @@
|
||||
githubId = 18447310;
|
||||
};
|
||||
kloenk = {
|
||||
email = "me@kloenk.de";
|
||||
email = "me@kloenk.dev";
|
||||
matrix = "@kloenk:petabyte.dev";
|
||||
name = "Finn Behrens";
|
||||
github = "kloenk";
|
||||
@ -11553,6 +11553,12 @@
|
||||
githubId = 1699155;
|
||||
name = "Steve Elliott";
|
||||
};
|
||||
stehessel = {
|
||||
email = "stephan@stehessel.de";
|
||||
github = "stehessel";
|
||||
githubId = 55607356;
|
||||
name = "Stephan Heßelmann";
|
||||
};
|
||||
stelcodes = {
|
||||
email = "stel@stel.codes";
|
||||
github = "stelcodes";
|
||||
|
||||
@ -147,7 +147,7 @@ let
|
||||
|
||||
to run update script for specific package, or
|
||||
|
||||
% nix-shell maintainers/scripts/update.nix --arg predicate '(path: pkg: builtins.isList pkg.updateScript && builtins.length pkg.updateScript >= 1 && (let script = builtins.head pkg.updateScript; in builtins.isAttrs script && script.name == "gnome-update-script"))'
|
||||
% nix-shell maintainers/scripts/update.nix --arg predicate '(path: pkg: pkg.updateScript.name or null == "gnome-update-script")'
|
||||
|
||||
to run update script for all packages matching given predicate, or
|
||||
|
||||
|
||||
@ -88,6 +88,10 @@ async def commit_changes(name: str, merge_lock: asyncio.Lock, worktree: str, bra
|
||||
async with merge_lock:
|
||||
await check_subprocess('git', 'add', *change['files'], cwd=worktree)
|
||||
commit_message = '{attrPath}: {oldVersion} → {newVersion}'.format(**change)
|
||||
if 'commitMessage' in change:
|
||||
commit_message = change['commitMessage']
|
||||
elif 'commitBody' in change:
|
||||
commit_message = commit_message + '\n\n' + change['commitBody']
|
||||
await check_subprocess('git', 'commit', '--quiet', '-m', commit_message, cwd=worktree)
|
||||
await check_subprocess('git', 'cherry-pick', branch)
|
||||
|
||||
|
||||
@ -82,7 +82,7 @@ in
|
||||
git = 41;
|
||||
#fourstore = 42; # dropped in 20.03
|
||||
#fourstorehttp = 43; # dropped in 20.03
|
||||
virtuoso = 44;
|
||||
#virtuoso = 44; dropped module
|
||||
#rtkit = 45; # dynamically allocated 2021-09-03
|
||||
dovecot2 = 46;
|
||||
dovenull2 = 47;
|
||||
|
||||
@ -350,7 +350,6 @@
|
||||
./services/databases/redis.nix
|
||||
./services/databases/riak.nix
|
||||
./services/databases/victoriametrics.nix
|
||||
./services/databases/virtuoso.nix
|
||||
./services/desktops/accountsservice.nix
|
||||
./services/desktops/bamf.nix
|
||||
./services/desktops/blueman.nix
|
||||
|
||||
@ -87,10 +87,9 @@ with lib;
|
||||
(mkRemovedOptionModule [ "services" "racoon" ] ''
|
||||
The racoon module has been removed, because the software project was abandoned upstream.
|
||||
'')
|
||||
|
||||
(mkRemovedOptionModule [ "services" "shellinabox" ] "The corresponding package was removed from nixpkgs.")
|
||||
|
||||
(mkRemovedOptionModule [ "services" "gogoclient" ] "The corresponding package was removed from nixpkgs.")
|
||||
(mkRemovedOptionModule [ "services" "virtuoso" ] "The corresponding package was removed from nixpkgs.")
|
||||
|
||||
# Do NOT add any option renames here, see top of the file
|
||||
];
|
||||
|
||||
@ -1,99 +0,0 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
let
|
||||
cfg = config.services.virtuoso;
|
||||
virtuosoUser = "virtuoso";
|
||||
stateDir = "/var/lib/virtuoso";
|
||||
in
|
||||
with lib;
|
||||
{
|
||||
|
||||
###### interface
|
||||
|
||||
options = {
|
||||
|
||||
services.virtuoso = {
|
||||
|
||||
enable = mkEnableOption "Virtuoso Opensource database server";
|
||||
|
||||
config = mkOption {
|
||||
type = types.lines;
|
||||
default = "";
|
||||
description = "Extra options to put into Virtuoso configuration file.";
|
||||
};
|
||||
|
||||
parameters = mkOption {
|
||||
type = types.lines;
|
||||
default = "";
|
||||
description = "Extra options to put into [Parameters] section of Virtuoso configuration file.";
|
||||
};
|
||||
|
||||
listenAddress = mkOption {
|
||||
type = types.str;
|
||||
default = "1111";
|
||||
example = "myserver:1323";
|
||||
description = "ip:port or port to listen on.";
|
||||
};
|
||||
|
||||
httpListenAddress = mkOption {
|
||||
type = types.nullOr types.str;
|
||||
default = null;
|
||||
example = "myserver:8080";
|
||||
description = "ip:port or port for Virtuoso HTTP server to listen on.";
|
||||
};
|
||||
|
||||
dirsAllowed = mkOption {
|
||||
type = types.nullOr types.str; # XXX Maybe use a list in the future?
|
||||
default = null;
|
||||
example = "/www, /home/";
|
||||
description = "A list of directories Virtuoso is allowed to access";
|
||||
};
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
|
||||
###### implementation
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
|
||||
users.users.${virtuosoUser} =
|
||||
{ uid = config.ids.uids.virtuoso;
|
||||
description = "virtuoso user";
|
||||
home = stateDir;
|
||||
};
|
||||
|
||||
systemd.services.virtuoso = {
|
||||
after = [ "network.target" ];
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
|
||||
preStart = ''
|
||||
mkdir -p ${stateDir}
|
||||
chown ${virtuosoUser} ${stateDir}
|
||||
'';
|
||||
|
||||
script = ''
|
||||
cd ${stateDir}
|
||||
${pkgs.virtuoso}/bin/virtuoso-t +foreground +configfile ${pkgs.writeText "virtuoso.ini" cfg.config}
|
||||
'';
|
||||
};
|
||||
|
||||
services.virtuoso.config = ''
|
||||
[Database]
|
||||
DatabaseFile=${stateDir}/x-virtuoso.db
|
||||
TransactionFile=${stateDir}/x-virtuoso.trx
|
||||
ErrorLogFile=${stateDir}/x-virtuoso.log
|
||||
xa_persistent_file=${stateDir}/x-virtuoso.pxa
|
||||
|
||||
[Parameters]
|
||||
ServerPort=${cfg.listenAddress}
|
||||
RunAs=${virtuosoUser}
|
||||
${optionalString (cfg.dirsAllowed != null) "DirsAllowed=${cfg.dirsAllowed}"}
|
||||
${cfg.parameters}
|
||||
|
||||
[HTTPServer]
|
||||
${optionalString (cfg.httpListenAddress != null) "ServerPort=${cfg.httpListenAddress}"}
|
||||
'';
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
@ -151,7 +151,7 @@ in {
|
||||
};
|
||||
|
||||
systemd.services.backup-vaultwarden = mkIf (cfg.backupDir != null) {
|
||||
aliases = [ "backup-bitwarden_rs" ];
|
||||
aliases = [ "backup-bitwarden_rs.service" ];
|
||||
description = "Backup vaultwarden";
|
||||
environment = {
|
||||
DATA_FOLDER = "/var/lib/bitwarden_rs";
|
||||
@ -169,7 +169,7 @@ in {
|
||||
};
|
||||
|
||||
systemd.timers.backup-vaultwarden = mkIf (cfg.backupDir != null) {
|
||||
aliases = [ "backup-bitwarden_rs" ];
|
||||
aliases = [ "backup-bitwarden_rs.service" ];
|
||||
description = "Backup vaultwarden on time";
|
||||
timerConfig = {
|
||||
OnCalendar = mkDefault "23:00";
|
||||
|
||||
@ -3,13 +3,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "geonkick";
|
||||
version = "2.8.1";
|
||||
version = "2.9.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "iurie-sw";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-wSlZ9pVVqlrPSz20pRdcRLq6pTcibxD7326l9WY7ZDY=";
|
||||
sha256 = "sha256-/BDK1PyRw4xOt+rzC9yX29aRQb1aDnDBIenSz+859OY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "new-session-manager";
|
||||
version = "1.5.1";
|
||||
version = "1.5.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxaudio";
|
||||
repo = "new-session-manager";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-hcw+Fn5s1S786eqmR95RmkFcIaRzWaH38YE9DXVQJU0=";
|
||||
sha256 = "sha256-dQE7kUoxqDtTrk5euHqpMVeApxniecWZWOARcCl573o=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ meson pkg-config ninja ];
|
||||
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://linuxaudio.github.io/new-session-manager/";
|
||||
homepage = "https://new-session-manager.jackaudio.org/";
|
||||
description = "A session manager designed for audio applications.";
|
||||
maintainers = [ maintainers._6AA4FD ];
|
||||
license = licenses.gpl3Plus;
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "praat";
|
||||
version = "6.2.04";
|
||||
version = "6.2.07";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "praat";
|
||||
repo = "praat";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-xzEgj4pjW+y46CXtVq4myHKX6DImCibsUz8m0G6F+YQ=";
|
||||
sha256 = "sha256-MM8uC1+d1P7aZI460fCcHWtE7+xfJV1ZFj2cdp/b1rY=";
|
||||
};
|
||||
|
||||
configurePhase = ''
|
||||
|
||||
@ -1,8 +1,7 @@
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, genericUpdater
|
||||
, gitUpdater
|
||||
, substituteAll
|
||||
, common-updater-scripts
|
||||
, ffmpeg
|
||||
, python3Packages
|
||||
, sox
|
||||
@ -33,12 +32,7 @@ python3Packages.buildPythonApplication rec {
|
||||
# sandbox to be disabled.
|
||||
doCheck = false;
|
||||
|
||||
passthru = {
|
||||
updateScript = genericUpdater {
|
||||
inherit pname version;
|
||||
versionLister = "${common-updater-scripts}/bin/list-git-tags ${src.meta.homepage}";
|
||||
};
|
||||
};
|
||||
passthru.updateScript = gitUpdater { inherit pname version; };
|
||||
|
||||
meta = with lib; {
|
||||
description = "Fast audio loudness scanner & tagger (ReplayGain v2 / R128)";
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "erigon";
|
||||
version = "2022.01.02";
|
||||
version = "2022.02.02";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ledgerwatch";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-PzLFwpLKPMV9J2+hqwFppdrFvGxyWpSzYDiQTWZXKco=";
|
||||
sha256 = "sha256-hFoIPlmNzG2oQON86OUY9Y8oRbqexPVo4e7+pTbh1Kk=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-YslMHpc3ApPiZOhNZrKoLaQcUWZwj7WLxmzYFyThnRo=";
|
||||
vendorSha256 = "sha256-vXIuXT7BIs7xjGq1DBk0/dGQ0ccxfrFGLn6E03MUvY4=";
|
||||
proxyVendor = true;
|
||||
|
||||
# Build errors in mdbx when format hardening is enabled:
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "lightwalletd";
|
||||
version = "0.4.8";
|
||||
version = "0.4.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zcash";
|
||||
repo = "lightwalletd";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-3cjXQXJqdmAMc+APybAKbpBhTy8Pk/QyBygSa8pGGAs=";
|
||||
sha256 = "sha256-IksA06V+mP7ZAXXFYLKLacxrDXeMXHAk5w4t7pmobq4=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
|
||||
@ -26,7 +26,7 @@ getRepo() {
|
||||
}
|
||||
|
||||
getLatestVersionTag() {
|
||||
"$nixpkgs"/pkgs/common-updater/scripts/list-git-tags https://github.com/$(getRepo) 2>/dev/null \
|
||||
"$nixpkgs"/pkgs/common-updater/scripts/list-git-tags --url=https://github.com/$(getRepo) 2>/dev/null \
|
||||
| sort -V | tail -1 | sed 's|^v||'
|
||||
}
|
||||
|
||||
|
||||
@ -6,13 +6,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "markets";
|
||||
version = "0.5.3";
|
||||
version = "0.5.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bitstower";
|
||||
repo = "markets";
|
||||
rev = version;
|
||||
sha256 = "0sfdmz7cp8i2bymippp8jyxsidxjn69v9cqm40q77j81kfm84bfv";
|
||||
sha256 = "sha256-/g/r/1i69PmPND40zIID3Nun0I4ZFT1EFoNf1qprBjI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -220,7 +220,7 @@ let
|
||||
# Link to our own Node.js and Java (required during the build):
|
||||
mkdir -p third_party/node/linux/node-linux-x64/bin
|
||||
ln -s "${pkgsBuildHost.nodejs}/bin/node" third_party/node/linux/node-linux-x64/bin/node
|
||||
ln -s "${pkgsBuildHost.jre8}/bin/java" third_party/jdk/current/bin/
|
||||
ln -s "${pkgsBuildHost.jre8_headless}/bin/java" third_party/jdk/current/bin/
|
||||
|
||||
# Allow building against system libraries in official builds
|
||||
sed -i 's/OFFICIAL_BUILD/GOOGLE_CHROME_BUILD/' tools/generate_shim_headers/generate_shim_headers.py
|
||||
|
||||
@ -50,11 +50,11 @@ let
|
||||
in stdenv.mkDerivation rec {
|
||||
|
||||
pname = "opera";
|
||||
version = "82.0.4227.43";
|
||||
version = "83.0.4254.54";
|
||||
|
||||
src = fetchurl {
|
||||
url = "${mirror}/${version}/linux/${pname}-stable_${version}_amd64.deb";
|
||||
sha256 = "sha256-DFhf62dqk7qA2k+JgVqGLxF30UPwQwhXD105Qua25X0=";
|
||||
sha256 = "sha256-kv90FmenGpAbNyw/puwEbR/vVNHV2d5UdX3amMTcI7k=";
|
||||
};
|
||||
|
||||
unpackCmd = "${dpkg}/bin/dpkg-deb -x $curSrc .";
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "fn";
|
||||
version = "0.6.13";
|
||||
version = "0.6.14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fnproject";
|
||||
repo = "cli";
|
||||
rev = version;
|
||||
sha256 = "sha256-zynhDxhZEpLmO8Z8shU8DnJUJ+K0wmf8fkRjMMV35uE=";
|
||||
sha256 = "sha256-4gHwf8zOkCKbOPU4Zq1u4h5vn0r1Vi/B++ERxvr/iuk=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
|
||||
38
pkgs/applications/networking/cluster/odo/default.nix
Normal file
38
pkgs/applications/networking/cluster/odo/default.nix
Normal file
@ -0,0 +1,38 @@
|
||||
{ lib, buildGoModule, fetchFromGitHub, testVersion, odo }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "odo";
|
||||
version = "2.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "redhat-developer";
|
||||
repo = "odo";
|
||||
rev = "v${version}";
|
||||
sha256 = "KYJkCoF80UPsebWwxpc5gIfmT3Aj4OU8r6dDkaWXqbY=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
|
||||
buildPhase = ''
|
||||
make bin
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
cp -a odo $out/bin
|
||||
'';
|
||||
|
||||
passthru.tests.version = testVersion {
|
||||
package = odo;
|
||||
command = "odo version";
|
||||
version = "v${version}";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Developer-focused CLI for OpenShift and Kubernetes";
|
||||
license = licenses.asl20;
|
||||
homepage = "odo.dev";
|
||||
maintainers = with maintainers; [ stehessel ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
@ -122,7 +122,7 @@ stdenv.mkDerivation rec {
|
||||
description = "Matrix client / Element Desktop fork";
|
||||
homepage = "https://schildi.chat/";
|
||||
changelog = "https://github.com/SchildiChat/schildichat-desktop/releases";
|
||||
maintainers = lib.teams.matrix.members;
|
||||
maintainers = lib.teams.matrix.members ++ [ lib.maintainers.kloenk ];
|
||||
license = lib.licenses.asl20;
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
|
||||
@ -79,7 +79,7 @@ in stdenv.mkDerivation rec {
|
||||
description = "Matrix client / Element Web fork";
|
||||
homepage = "https://schildi.chat/";
|
||||
changelog = "https://github.com/SchildiChat/schildichat-desktop/releases";
|
||||
maintainers = lib.teams.matrix.members;
|
||||
maintainers = lib.teams.matrix.members ++ [ lib.maintainers.kloenk ];
|
||||
license = lib.licenses.asl20;
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
|
||||
226
pkgs/applications/networking/n8n/node-packages.nix
generated
226
pkgs/applications/networking/n8n/node-packages.nix
generated
@ -472,31 +472,31 @@ let
|
||||
sha512 = "YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw==";
|
||||
};
|
||||
};
|
||||
"@types/node-12.20.45" = {
|
||||
"@types/node-12.20.46" = {
|
||||
name = "_at_types_slash_node";
|
||||
packageName = "@types/node";
|
||||
version = "12.20.45";
|
||||
version = "12.20.46";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/@types/node/-/node-12.20.45.tgz";
|
||||
sha512 = "1Jg2Qv5tuxBqgQV04+wO5u+wmSHbHgpORCJdeCLM+E+YdPElpdHhgywU+M1V1InL8rfOtpqtOjswk+uXTKwx7w==";
|
||||
url = "https://registry.npmjs.org/@types/node/-/node-12.20.46.tgz";
|
||||
sha512 = "cPjLXj8d6anFPzFvOPxS3fvly3Shm5nTfl6g8X5smexixbuGUf7hfr21J5tX9JW+UPStp/5P5R8qrKL5IyVJ+A==";
|
||||
};
|
||||
};
|
||||
"@types/node-17.0.17" = {
|
||||
"@types/node-17.0.18" = {
|
||||
name = "_at_types_slash_node";
|
||||
packageName = "@types/node";
|
||||
version = "17.0.17";
|
||||
version = "17.0.18";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/@types/node/-/node-17.0.17.tgz";
|
||||
sha512 = "e8PUNQy1HgJGV3iU/Bp2+D/DXh3PYeyli8LgIwsQcs1Ar1LoaWHSIT6Rw+H2rNJmiq6SNWiDytfx8+gYj7wDHw==";
|
||||
url = "https://registry.npmjs.org/@types/node/-/node-17.0.18.tgz";
|
||||
sha512 = "eKj4f/BsN/qcculZiRSujogjvp5O/k4lOW5m35NopjZM/QwLOR075a8pJW5hD+Rtdm2DaCVPENS6KtSQnUD6BA==";
|
||||
};
|
||||
};
|
||||
"@types/node-fetch-2.5.12" = {
|
||||
"@types/node-fetch-2.6.1" = {
|
||||
name = "_at_types_slash_node-fetch";
|
||||
packageName = "@types/node-fetch";
|
||||
version = "2.5.12";
|
||||
version = "2.6.1";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.5.12.tgz";
|
||||
sha512 = "MKgC4dlq4kKNa/mYrwpKfzQMB5X3ee5U6fSprkKpToBqBmX4nFZL9cW5jl6sWn+xpRJ7ypWh2yyqqr8UUCstSw==";
|
||||
url = "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.6.1.tgz";
|
||||
sha512 = "oMqjURCaxoSIsHSr1E47QHzbmzNR5rK8McHuNb11BOM9cHcIK3Avy0s/b2JlXHoQGTYS3NsvWzV1M0iK7l0wbA==";
|
||||
};
|
||||
};
|
||||
"@types/promise-ftp-1.3.4" = {
|
||||
@ -976,13 +976,13 @@ let
|
||||
sha512 = "uUbetCWczQHbsKyX1C99XpQHBM8SWfovvaZhPIj23/1uV7SQf0WeRZbiLpw0JZm+LHTChfNgrLfDJOVoU2kU+A==";
|
||||
};
|
||||
};
|
||||
"aws-sdk-2.1073.0" = {
|
||||
"aws-sdk-2.1077.0" = {
|
||||
name = "aws-sdk";
|
||||
packageName = "aws-sdk";
|
||||
version = "2.1073.0";
|
||||
version = "2.1077.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1073.0.tgz";
|
||||
sha512 = "TtyHDL4ZEs8Zh/DqWY/hv745DTWrIwOyBAvfjBJ45RE9h0TjpWqCIowEtb6gRPAKyPPyfGH4s+rEYu07vNK1Hg==";
|
||||
url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1077.0.tgz";
|
||||
sha512 = "orJvJROs8hJaQRfHsX7Zl5PxEgrD/uTXyqXz9Yu9Io5VVxzvnOty9oHmvEMSlgTIf1qd01gnev/vpvP1HgzKtw==";
|
||||
};
|
||||
};
|
||||
"aws-sign2-0.7.0" = {
|
||||
@ -1174,13 +1174,13 @@ let
|
||||
sha512 = "c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==";
|
||||
};
|
||||
};
|
||||
"body-parser-1.19.1" = {
|
||||
"body-parser-1.19.2" = {
|
||||
name = "body-parser";
|
||||
packageName = "body-parser";
|
||||
version = "1.19.1";
|
||||
version = "1.19.2";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/body-parser/-/body-parser-1.19.1.tgz";
|
||||
sha512 = "8ljfQi5eBk8EJfECMrgqNGWPEY5jWP+1IzkzkGdFFEwFQZZyaZ21UqdaHktgiMlH0xLHqIFtE/u2OYE5dOtViA==";
|
||||
url = "https://registry.npmjs.org/body-parser/-/body-parser-1.19.2.tgz";
|
||||
sha512 = "SAAwOxgoCKMGs9uUAUFHygfLAyaniaoun6I8mFY9pRAJL9+Kec34aU+oIjDhTycub1jozEfEwx1W1IuOYxVSFw==";
|
||||
};
|
||||
};
|
||||
"body-parser-xml-2.0.3" = {
|
||||
@ -1318,13 +1318,13 @@ let
|
||||
sha1 = "d32815404d689699f85a4ea4fa8755dd13a96048";
|
||||
};
|
||||
};
|
||||
"bytes-3.1.1" = {
|
||||
"bytes-3.1.2" = {
|
||||
name = "bytes";
|
||||
packageName = "bytes";
|
||||
version = "3.1.1";
|
||||
version = "3.1.2";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/bytes/-/bytes-3.1.1.tgz";
|
||||
sha512 = "dWe4nWO/ruEOY7HkUJ5gFt1DCFV9zPRoJr8pV0/ASQermOZjtq8jMjOprC0Kd10GLN+l7xaUPvxzJFWtxGu8Fg==";
|
||||
url = "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz";
|
||||
sha512 = "/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==";
|
||||
};
|
||||
};
|
||||
"call-bind-1.0.2" = {
|
||||
@ -1777,13 +1777,13 @@ let
|
||||
sha512 = "Mn4AJiYkR3TAZH1Xm/RU7gFS/0kM5TBSAQDry8y40Aez0ASY+3boUhv+3QE5XbOXiXM2JjdhkKve3IsBvWCibQ==";
|
||||
};
|
||||
};
|
||||
"cookie-0.4.1" = {
|
||||
"cookie-0.4.2" = {
|
||||
name = "cookie";
|
||||
packageName = "cookie";
|
||||
version = "0.4.1";
|
||||
version = "0.4.2";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/cookie/-/cookie-0.4.1.tgz";
|
||||
sha512 = "ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA==";
|
||||
url = "https://registry.npmjs.org/cookie/-/cookie-0.4.2.tgz";
|
||||
sha512 = "aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==";
|
||||
};
|
||||
};
|
||||
"cookie-signature-1.0.6" = {
|
||||
@ -1795,13 +1795,13 @@ let
|
||||
sha1 = "e303a882b342cc3ee8ca513a79999734dab3ae2c";
|
||||
};
|
||||
};
|
||||
"core-js-3.21.0" = {
|
||||
"core-js-3.21.1" = {
|
||||
name = "core-js";
|
||||
packageName = "core-js";
|
||||
version = "3.21.0";
|
||||
version = "3.21.1";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/core-js/-/core-js-3.21.0.tgz";
|
||||
sha512 = "YUdI3fFu4TF/2WykQ2xzSiTQdldLB4KVuL9WeAy5XONZYt5Cun/fpQvctoKbCgvPhmzADeesTk/j2Rdx77AcKQ==";
|
||||
url = "https://registry.npmjs.org/core-js/-/core-js-3.21.1.tgz";
|
||||
sha512 = "FRq5b/VMrWlrmCzwRrpDYNxyHP9BcAZC+xHJaqTgIE5091ZV1NTmyh0sGOg5XqpnHvR0svdy0sv1gWA1zmhxig==";
|
||||
};
|
||||
};
|
||||
"core-util-is-1.0.2" = {
|
||||
@ -2434,13 +2434,13 @@ let
|
||||
sha1 = "97e801aa052df02454de46b02bf621642cdc8502";
|
||||
};
|
||||
};
|
||||
"express-4.17.2" = {
|
||||
"express-4.17.3" = {
|
||||
name = "express";
|
||||
packageName = "express";
|
||||
version = "4.17.2";
|
||||
version = "4.17.3";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/express/-/express-4.17.2.tgz";
|
||||
sha512 = "oxlxJxcQlYwqPWKVJJtvQiwHgosH/LrLSPA+H4UxpyvSS6jC5aH+5MoHFM+KABgTOt0APue4w66Ha8jCUo9QGg==";
|
||||
url = "https://registry.npmjs.org/express/-/express-4.17.3.tgz";
|
||||
sha512 = "yuSQpz5I+Ch7gFrPCk4/c+dIBKlQUxtgwqzph132bsT6qhuzss6I8cLJQz7B3rFblzd6wtcI0ZbGltH/C4LjUg==";
|
||||
};
|
||||
};
|
||||
"extend-3.0.2" = {
|
||||
@ -2587,13 +2587,13 @@ let
|
||||
sha512 = "GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw==";
|
||||
};
|
||||
};
|
||||
"follow-redirects-1.14.8" = {
|
||||
"follow-redirects-1.14.9" = {
|
||||
name = "follow-redirects";
|
||||
packageName = "follow-redirects";
|
||||
version = "1.14.8";
|
||||
version = "1.14.9";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.8.tgz";
|
||||
sha512 = "1x0S9UVJHsQprFcEC/qnNzBLcIxsjAV905f/UkQxbclCsoTWlacCNOpQa/anodLl2uaEKFhfWOvM2Qg77+15zA==";
|
||||
url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.9.tgz";
|
||||
sha512 = "MQDfihBQYMcyy5dhRDJUHcw7lb2Pv/TuE6xP1vyraLukNDHKbDxDNaOE3NbCAdKQApno+GPRyo1YAp89yCjK4w==";
|
||||
};
|
||||
};
|
||||
"for-each-0.3.3" = {
|
||||
@ -3595,13 +3595,13 @@ let
|
||||
sha1 = "bb935d48582cba168c06834957a54a3e07124f11";
|
||||
};
|
||||
};
|
||||
"isbot-3.4.2" = {
|
||||
"isbot-3.4.3" = {
|
||||
name = "isbot";
|
||||
packageName = "isbot";
|
||||
version = "3.4.2";
|
||||
version = "3.4.3";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/isbot/-/isbot-3.4.2.tgz";
|
||||
sha512 = "b59O14840ltLAGq8z+M8VhL+1CdrjbZYQIhQBPacutjl27Ypa2/UksJ1DRzWOz19F5H/2d2pstbdAp7+b0ph+A==";
|
||||
url = "https://registry.npmjs.org/isbot/-/isbot-3.4.3.tgz";
|
||||
sha512 = "5hAgiY9ysMIJcVQlGHcXptwgZr1yYbIGNBE36a3sPo7cLZ9eLTLx0qOssekFKaTHiXTwd/ZZMTuOS7w4faOmpw==";
|
||||
};
|
||||
};
|
||||
"isexe-2.0.0" = {
|
||||
@ -4288,13 +4288,13 @@ let
|
||||
sha512 = "UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==";
|
||||
};
|
||||
};
|
||||
"minimatch-3.1.1" = {
|
||||
"minimatch-3.1.2" = {
|
||||
name = "minimatch";
|
||||
packageName = "minimatch";
|
||||
version = "3.1.1";
|
||||
version = "3.1.2";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/minimatch/-/minimatch-3.1.1.tgz";
|
||||
sha512 = "reLxBcKUPNBnc/sVtAbxgRVFSegoGeLaSjmphNhcwcolhYLRgtJscn5mRl6YRZNQv40Y7P6JM2YhSIsbL9OB5A==";
|
||||
url = "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz";
|
||||
sha512 = "J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==";
|
||||
};
|
||||
};
|
||||
"minimist-1.2.5" = {
|
||||
@ -4477,13 +4477,13 @@ let
|
||||
sha512 = "z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==";
|
||||
};
|
||||
};
|
||||
"n8n-core-0.104.0" = {
|
||||
"n8n-core-0.105.0" = {
|
||||
name = "n8n-core";
|
||||
packageName = "n8n-core";
|
||||
version = "0.104.0";
|
||||
version = "0.105.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/n8n-core/-/n8n-core-0.104.0.tgz";
|
||||
sha512 = "rh8ooCF0zeVjic6JWByuCzcltpeV/OJjUmLcChXU3S6peggCvazvxlU6GOF/+YT69CeQdHwhTmOXSEevu0uzVQ==";
|
||||
url = "https://registry.npmjs.org/n8n-core/-/n8n-core-0.105.0.tgz";
|
||||
sha512 = "rYAtchFf7V94M9UP1ZCu9ie9O6OWncNconuzO9I1D/QLjBNVGzu0+SsG8be5bGTrAWO0WiNYdj84qMqqJS4NWg==";
|
||||
};
|
||||
};
|
||||
"n8n-design-system-0.11.0" = {
|
||||
@ -4495,31 +4495,31 @@ let
|
||||
sha512 = "KL64XTr9sqqiBEEV7on2cdLooleHPyXClFL+THUy2oXDbGqdlyCGykukU7S4aX+nSjrJEQEDMaMcbw3NCHrumg==";
|
||||
};
|
||||
};
|
||||
"n8n-editor-ui-0.130.0" = {
|
||||
"n8n-editor-ui-0.131.0" = {
|
||||
name = "n8n-editor-ui";
|
||||
packageName = "n8n-editor-ui";
|
||||
version = "0.130.0";
|
||||
version = "0.131.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.130.0.tgz";
|
||||
sha512 = "UNvZ3CTcqmxJs1JuhLPSMo18nlakzFYAyJ8UKwCvAOGVfGltHweVeaKHnAEs0legDAkdJ3yEtaebTrQjF+dCoA==";
|
||||
url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.131.0.tgz";
|
||||
sha512 = "Sexo31sn8PdiNjDckNfDCXBs9MBR/hF5NzuFtUCUNaXPR6Z5gql6EhPT+fJfG9Wdsj09L3vV+j3gTAbXqRgPIw==";
|
||||
};
|
||||
};
|
||||
"n8n-nodes-base-0.161.0" = {
|
||||
"n8n-nodes-base-0.162.0" = {
|
||||
name = "n8n-nodes-base";
|
||||
packageName = "n8n-nodes-base";
|
||||
version = "0.161.0";
|
||||
version = "0.162.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-0.161.0.tgz";
|
||||
sha512 = "WRTzmzDO3dKZF6WRzQ/d6w2TaYLoPUb+X1kjDWaxF5omwz6UFc63dVtJ+irhyQR8wRj3/ytdrS3xEMDxZ9vXlg==";
|
||||
url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-0.162.0.tgz";
|
||||
sha512 = "bi7vs//5OHrW6RowouusBwUzKutFKnysLWdDrlxlCENGtRDtI+7ELrLMWnKs6PYTRWz0OSBHpEMN64MDEIoEZg==";
|
||||
};
|
||||
};
|
||||
"n8n-workflow-0.86.0" = {
|
||||
"n8n-workflow-0.87.0" = {
|
||||
name = "n8n-workflow";
|
||||
packageName = "n8n-workflow";
|
||||
version = "0.86.0";
|
||||
version = "0.87.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/n8n-workflow/-/n8n-workflow-0.86.0.tgz";
|
||||
sha512 = "+Kdo5RMEsh7QJ8AkWNTSpyxYRtjpxPmPfifVAFg4HVguW7g5e7f74xlmqD2xnxQybC9B3f6jxvx6WMKbNcT/+A==";
|
||||
url = "https://registry.npmjs.org/n8n-workflow/-/n8n-workflow-0.87.0.tgz";
|
||||
sha512 = "ei5fvQK4jM3NotOA36d267o243m2MdlSPlG6cIutqx4lgUd1oXX7mYyCJzF3/kNcWbiI8QjdhUoURgdCOEzn8g==";
|
||||
};
|
||||
};
|
||||
"named-placeholders-1.1.2" = {
|
||||
@ -4540,13 +4540,13 @@ let
|
||||
sha512 = "wynEP02LmIbLpcYw8uBKpcfF6dmg2vcpKqxeH5UcoKEYdExslsdUA4ugFauuaeYdTB76ez6gJW8XAZ6CgkXYxA==";
|
||||
};
|
||||
};
|
||||
"nanoid-3.2.0" = {
|
||||
"nanoid-3.3.1" = {
|
||||
name = "nanoid";
|
||||
packageName = "nanoid";
|
||||
version = "3.2.0";
|
||||
version = "3.3.1";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/nanoid/-/nanoid-3.2.0.tgz";
|
||||
sha512 = "fmsZYa9lpn69Ad5eDn7FMcnnSR+8R34W9qJEijxYhTbfOWzr22n1QxCMzXLK+ODyW2973V3Fux959iQoUxzUIA==";
|
||||
url = "https://registry.npmjs.org/nanoid/-/nanoid-3.3.1.tgz";
|
||||
sha512 = "n6Vs/3KGyxPQd6uO0eH4Bv0ojGSUvuLlIHtC3Y0kEO23YRge8H9x1GCzLn28YX0H66pMkxuaeESFq4tKISKwdw==";
|
||||
};
|
||||
};
|
||||
"native-duplexpair-1.0.0" = {
|
||||
@ -5566,13 +5566,13 @@ let
|
||||
sha512 = "qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==";
|
||||
};
|
||||
};
|
||||
"qs-6.9.6" = {
|
||||
"qs-6.9.7" = {
|
||||
name = "qs";
|
||||
packageName = "qs";
|
||||
version = "6.9.6";
|
||||
version = "6.9.7";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/qs/-/qs-6.9.6.tgz";
|
||||
sha512 = "TIRk4aqYLNoJUbd+g2lEdz5kLWIuTMRagAXxl78Q0RiVjAOugHmeKNGdd3cwo/ktpf9aL9epCfFqWDEKysUlLQ==";
|
||||
url = "https://registry.npmjs.org/qs/-/qs-6.9.7.tgz";
|
||||
sha512 = "IhMFgUmuNpyRfxA90umL7ByLlgRXu6tIfKPpF5TmcfRLlLCckfP/g3IQmju6jjpu+Hh8rA+2p6A27ZSPOOHdKw==";
|
||||
};
|
||||
};
|
||||
"querystring-0.2.0" = {
|
||||
@ -5656,13 +5656,13 @@ let
|
||||
sha512 = "Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==";
|
||||
};
|
||||
};
|
||||
"raw-body-2.4.2" = {
|
||||
"raw-body-2.4.3" = {
|
||||
name = "raw-body";
|
||||
packageName = "raw-body";
|
||||
version = "2.4.2";
|
||||
version = "2.4.3";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/raw-body/-/raw-body-2.4.2.tgz";
|
||||
sha512 = "RPMAFUJP19WIet/99ngh6Iv8fzAbqum4Li7AD6DtGaW2RpMB/11xDoalPiJMTbu6I3hkbMVkATvZrqb9EEqeeQ==";
|
||||
url = "https://registry.npmjs.org/raw-body/-/raw-body-2.4.3.tgz";
|
||||
sha512 = "UlTNLIcu0uzb4D2f4WltY6cVjLi+/jEN4lgEUj3E04tpMDpUlkBo/eSn6zou9hum2VMNpCCUone0O0WeJim07g==";
|
||||
};
|
||||
};
|
||||
"rc-1.2.8" = {
|
||||
@ -6259,13 +6259,13 @@ let
|
||||
sha512 = "LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg==";
|
||||
};
|
||||
};
|
||||
"snowflake-sdk-1.6.6" = {
|
||||
"snowflake-sdk-1.6.7" = {
|
||||
name = "snowflake-sdk";
|
||||
packageName = "snowflake-sdk";
|
||||
version = "1.6.6";
|
||||
version = "1.6.7";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/snowflake-sdk/-/snowflake-sdk-1.6.6.tgz";
|
||||
sha512 = "b8mbYI6TFGe8H0m0eviNd4FC/3jsw02OHNt21k9sLWkBp4re2VUhaJf7555ln7thMSnMcbkdAB8zQBZcbqdoPg==";
|
||||
url = "https://registry.npmjs.org/snowflake-sdk/-/snowflake-sdk-1.6.7.tgz";
|
||||
sha512 = "pisHqO5ALTggbNhE7LGEG5bnD6NKebcqyirOl4IsoKsD7g6d+vC3gHgRR/cm8kAH1GhLHY/WwhDq2fr7lundpA==";
|
||||
};
|
||||
};
|
||||
"source-map-0.6.1" = {
|
||||
@ -7015,13 +7015,13 @@ let
|
||||
sha1 = "021e4d9c7705f21bbf37d03ceb58767402774c64";
|
||||
};
|
||||
};
|
||||
"url-parse-1.5.6" = {
|
||||
"url-parse-1.5.9" = {
|
||||
name = "url-parse";
|
||||
packageName = "url-parse";
|
||||
version = "1.5.6";
|
||||
version = "1.5.9";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/url-parse/-/url-parse-1.5.6.tgz";
|
||||
sha512 = "xj3QdUJ1DttD1LeSfvJlU1eiF1RvBSBfUu8GplFGdUzSO28y5yUtEl7wb//PI4Af6qh0o/K8545vUmucRrfWsw==";
|
||||
url = "https://registry.npmjs.org/url-parse/-/url-parse-1.5.9.tgz";
|
||||
sha512 = "HpOvhKBvre8wYez+QhHcYiVvVmeF6DVnuSOOPhe3cTum3BnqHhvKaZm8FU5yTiOu/Jut2ZpB2rA/SbBA1JIGlQ==";
|
||||
};
|
||||
};
|
||||
"utf7-1.0.2" = {
|
||||
@ -7141,13 +7141,13 @@ let
|
||||
sha1 = "3a105ca17053af55d6e270c1f8288682e18da400";
|
||||
};
|
||||
};
|
||||
"vm2-3.9.7" = {
|
||||
"vm2-3.9.8" = {
|
||||
name = "vm2";
|
||||
packageName = "vm2";
|
||||
version = "3.9.7";
|
||||
version = "3.9.8";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/vm2/-/vm2-3.9.7.tgz";
|
||||
sha512 = "g/GZ7V0Mlmch3eDVOATvAXr1GsJNg6kQ5PjvYy3HbJMCRn5slNbo/u73Uy7r5yUej1cRa3ZjtoVwcWSQuQ/fow==";
|
||||
url = "https://registry.npmjs.org/vm2/-/vm2-3.9.8.tgz";
|
||||
sha512 = "/1PYg/BwdKzMPo8maOZ0heT7DLI0DAFTm7YQaz/Lim9oIaFZsJs3EdtalvXuBfZwczNwsYhju75NW4d6E+4q+w==";
|
||||
};
|
||||
};
|
||||
"vue-fragment-1.5.2" = {
|
||||
@ -7462,10 +7462,10 @@ in
|
||||
n8n = nodeEnv.buildNodePackage {
|
||||
name = "n8n";
|
||||
packageName = "n8n";
|
||||
version = "0.163.1";
|
||||
version = "0.164.1";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/n8n/-/n8n-0.163.1.tgz";
|
||||
sha512 = "lhup+qIy3cG0oWvBuOWi57Tn3F2k5NBD00KJ3ilKgnk4VsY+LmAca2xvyZNKvlRPa9i++3ukG6XioPTDuXylgw==";
|
||||
url = "https://registry.npmjs.org/n8n/-/n8n-0.164.1.tgz";
|
||||
sha512 = "8eUhHHikLspebbc1AjatdSQeaQAVgeYMIMFZmiUPMUw8FVtQ67otse6t/RvBE2RXTzxKer54Nr8eA+cF5dHi8g==";
|
||||
};
|
||||
dependencies = [
|
||||
(sources."@azure/abort-controller-1.0.5" // {
|
||||
@ -7577,8 +7577,8 @@ in
|
||||
sources."@types/lodash-4.14.178"
|
||||
sources."@types/lossless-json-1.0.1"
|
||||
sources."@types/mime-1.3.2"
|
||||
sources."@types/node-17.0.17"
|
||||
(sources."@types/node-fetch-2.5.12" // {
|
||||
sources."@types/node-17.0.18"
|
||||
(sources."@types/node-fetch-2.6.1" // {
|
||||
dependencies = [
|
||||
sources."form-data-3.0.1"
|
||||
];
|
||||
@ -7646,7 +7646,7 @@ in
|
||||
];
|
||||
})
|
||||
sources."avsc-5.7.3"
|
||||
(sources."aws-sdk-2.1073.0" // {
|
||||
(sources."aws-sdk-2.1077.0" // {
|
||||
dependencies = [
|
||||
sources."buffer-4.9.2"
|
||||
sources."events-1.1.1"
|
||||
@ -7700,7 +7700,7 @@ in
|
||||
})
|
||||
sources."bluebird-3.7.2"
|
||||
sources."bn.js-4.12.0"
|
||||
(sources."body-parser-1.19.1" // {
|
||||
(sources."body-parser-1.19.2" // {
|
||||
dependencies = [
|
||||
sources."debug-2.6.9"
|
||||
sources."ms-2.0.0"
|
||||
@ -7719,7 +7719,7 @@ in
|
||||
sources."buffer-writer-2.0.0"
|
||||
sources."bull-3.29.3"
|
||||
sources."byte-length-1.0.2"
|
||||
sources."bytes-3.1.1"
|
||||
sources."bytes-3.1.2"
|
||||
sources."call-bind-1.0.2"
|
||||
sources."callback-stream-1.1.0"
|
||||
sources."callsites-3.1.0"
|
||||
@ -7817,9 +7817,9 @@ in
|
||||
sources."content-disposition-0.5.4"
|
||||
sources."content-type-1.0.4"
|
||||
sources."convict-6.2.1"
|
||||
sources."cookie-0.4.1"
|
||||
sources."cookie-0.4.2"
|
||||
sources."cookie-signature-1.0.6"
|
||||
sources."core-js-3.21.0"
|
||||
sources."core-js-3.21.1"
|
||||
sources."core-util-is-1.0.2"
|
||||
(sources."crc-32-1.2.1" // {
|
||||
dependencies = [
|
||||
@ -7902,7 +7902,7 @@ in
|
||||
sources."eventsource-1.1.0"
|
||||
sources."exit-on-epipe-1.0.1"
|
||||
sources."expand-tilde-2.0.2"
|
||||
(sources."express-4.17.2" // {
|
||||
(sources."express-4.17.3" // {
|
||||
dependencies = [
|
||||
sources."debug-2.6.9"
|
||||
sources."ms-2.0.0"
|
||||
@ -7933,7 +7933,7 @@ in
|
||||
})
|
||||
sources."flatted-3.2.5"
|
||||
sources."fn.name-1.1.0"
|
||||
sources."follow-redirects-1.14.8"
|
||||
sources."follow-redirects-1.14.9"
|
||||
sources."for-each-0.3.3"
|
||||
sources."forever-agent-0.6.1"
|
||||
sources."form-data-4.0.0"
|
||||
@ -8059,7 +8059,7 @@ in
|
||||
sources."is-windows-1.0.2"
|
||||
sources."is-wsl-2.2.0"
|
||||
sources."isarray-0.0.1"
|
||||
sources."isbot-3.4.2"
|
||||
sources."isbot-3.4.3"
|
||||
sources."isexe-2.0.0"
|
||||
sources."iso-639-1-2.1.13"
|
||||
sources."isstream-0.1.2"
|
||||
@ -8162,7 +8162,7 @@ in
|
||||
sources."mime-types-2.1.34"
|
||||
sources."mimic-fn-2.1.0"
|
||||
sources."minimalistic-assert-1.0.1"
|
||||
sources."minimatch-3.1.1"
|
||||
sources."minimatch-3.1.2"
|
||||
sources."minimist-1.2.5"
|
||||
(sources."minipass-2.9.0" // {
|
||||
dependencies = [
|
||||
@ -8205,19 +8205,19 @@ in
|
||||
];
|
||||
})
|
||||
sources."mz-2.7.0"
|
||||
(sources."n8n-core-0.104.0" // {
|
||||
(sources."n8n-core-0.105.0" // {
|
||||
dependencies = [
|
||||
sources."qs-6.10.3"
|
||||
];
|
||||
})
|
||||
sources."n8n-design-system-0.11.0"
|
||||
sources."n8n-editor-ui-0.130.0"
|
||||
(sources."n8n-nodes-base-0.161.0" // {
|
||||
sources."n8n-editor-ui-0.131.0"
|
||||
(sources."n8n-nodes-base-0.162.0" // {
|
||||
dependencies = [
|
||||
sources."iconv-lite-0.6.3"
|
||||
];
|
||||
})
|
||||
sources."n8n-workflow-0.86.0"
|
||||
sources."n8n-workflow-0.87.0"
|
||||
(sources."named-placeholders-1.1.2" // {
|
||||
dependencies = [
|
||||
sources."lru-cache-4.1.5"
|
||||
@ -8225,7 +8225,7 @@ in
|
||||
];
|
||||
})
|
||||
sources."nanoclone-0.2.1"
|
||||
sources."nanoid-3.2.0"
|
||||
sources."nanoid-3.3.1"
|
||||
sources."native-duplexpair-1.0.0"
|
||||
(sources."nearley-2.20.1" // {
|
||||
dependencies = [
|
||||
@ -8393,7 +8393,7 @@ in
|
||||
})
|
||||
sources."punycode-2.1.1"
|
||||
sources."python-struct-1.1.3"
|
||||
sources."qs-6.9.6"
|
||||
sources."qs-6.9.7"
|
||||
sources."querystring-0.2.0"
|
||||
sources."querystringify-2.2.0"
|
||||
sources."queue-microtask-1.2.3"
|
||||
@ -8403,7 +8403,7 @@ in
|
||||
sources."random-bytes-1.0.0"
|
||||
sources."randombytes-2.1.0"
|
||||
sources."range-parser-1.2.1"
|
||||
sources."raw-body-2.4.2"
|
||||
sources."raw-body-2.4.3"
|
||||
sources."rc-1.2.8"
|
||||
sources."readable-stream-1.1.14"
|
||||
sources."readable-web-to-node-stream-2.0.0"
|
||||
@ -8494,7 +8494,7 @@ in
|
||||
sources."tslib-2.3.1"
|
||||
];
|
||||
})
|
||||
(sources."snowflake-sdk-1.6.6" // {
|
||||
(sources."snowflake-sdk-1.6.7" // {
|
||||
dependencies = [
|
||||
sources."agent-base-4.3.0"
|
||||
sources."debug-3.2.7"
|
||||
@ -8545,7 +8545,7 @@ in
|
||||
sources."tdigest-0.1.1"
|
||||
(sources."tedious-6.7.1" // {
|
||||
dependencies = [
|
||||
sources."@types/node-12.20.45"
|
||||
sources."@types/node-12.20.46"
|
||||
sources."bl-3.0.1"
|
||||
sources."depd-2.0.0"
|
||||
sources."iconv-lite-0.5.2"
|
||||
@ -8627,7 +8627,7 @@ in
|
||||
sources."punycode-1.3.2"
|
||||
];
|
||||
})
|
||||
sources."url-parse-1.5.6"
|
||||
sources."url-parse-1.5.9"
|
||||
(sources."utf7-1.0.2" // {
|
||||
dependencies = [
|
||||
sources."semver-5.3.0"
|
||||
@ -8643,7 +8643,7 @@ in
|
||||
sources."validator-13.7.0"
|
||||
sources."vary-1.1.2"
|
||||
sources."verror-1.10.0"
|
||||
sources."vm2-3.9.7"
|
||||
sources."vm2-3.9.8"
|
||||
sources."vue-fragment-1.5.2"
|
||||
sources."vue-i18n-8.27.0"
|
||||
sources."webidl-conversions-3.0.1"
|
||||
|
||||
@ -1,8 +1,7 @@
|
||||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
, genericUpdater
|
||||
, common-updater-scripts
|
||||
, gitUpdater
|
||||
, makeWrapper
|
||||
, openssh
|
||||
}:
|
||||
@ -25,9 +24,8 @@ buildGoModule rec {
|
||||
ldflags = [ "-s" "-w" "-X main.AgentVersion=v${version}" ];
|
||||
|
||||
passthru = {
|
||||
updateScript = genericUpdater {
|
||||
updateScript = gitUpdater {
|
||||
inherit pname version;
|
||||
versionLister = "${common-updater-scripts}/bin/list-git-tags ${src.meta.homepage}";
|
||||
rev-prefix = "v";
|
||||
ignoredVersions = ".(rc|beta).*";
|
||||
};
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gurobi";
|
||||
version = "9.1.2";
|
||||
version = "9.5.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://packages.gurobi.com/${lib.versions.majorMinor version}/gurobi${version}_linux64.tar.gz";
|
||||
sha256 = "7f60bd675f79476bb2b32cd632aa1d470f8246f2b033b7652d8de86f6e7e429b";
|
||||
sha256 = "sha256-u1QuWl0WhfbjZOrwXqbFVySF/8N6IkUWnPPLQCiLwp4=";
|
||||
};
|
||||
|
||||
sourceRoot = "gurobi${builtins.replaceStrings ["."] [""] version}/linux64";
|
||||
|
||||
@ -4,8 +4,7 @@
|
||||
, pbr
|
||||
, requests
|
||||
, setuptools
|
||||
, genericUpdater
|
||||
, common-updater-scripts
|
||||
, gitUpdater
|
||||
}:
|
||||
|
||||
buildPythonApplication rec {
|
||||
@ -42,10 +41,7 @@ buildPythonApplication rec {
|
||||
|
||||
pythonImportsCheck = [ "git_review" ];
|
||||
|
||||
passthru.updateScript = genericUpdater {
|
||||
inherit pname version;
|
||||
versionLister = "${common-updater-scripts}/bin/list-git-tags ${src.meta.homepage}";
|
||||
};
|
||||
passthru.updateScript = gitUpdater { inherit pname version; };
|
||||
|
||||
meta = with lib; {
|
||||
description = "Tool to submit code to Gerrit";
|
||||
|
||||
@ -1,14 +1,14 @@
|
||||
{
|
||||
"version": "14.7.2",
|
||||
"repo_hash": "1jnwbcsswvy6jjrc2jclrxyyxi54caf8w51sgyiqaik5s3p4wgnx",
|
||||
"version": "14.7.3",
|
||||
"repo_hash": "1by4r7an5s5n9jka77mvp9ysc9c5kyvld9fvwr0r5qw2h39akl9g",
|
||||
"yarn_hash": "12k2r1y7kw95kfsmy0s8rbsf0vldr8c2liah0rkc7pihr19gq3w7",
|
||||
"owner": "gitlab-org",
|
||||
"repo": "gitlab",
|
||||
"rev": "v14.7.2-ee",
|
||||
"rev": "v14.7.3-ee",
|
||||
"passthru": {
|
||||
"GITALY_SERVER_VERSION": "14.7.2",
|
||||
"GITALY_SERVER_VERSION": "14.7.3",
|
||||
"GITLAB_PAGES_VERSION": "1.51.0",
|
||||
"GITLAB_SHELL_VERSION": "13.22.2",
|
||||
"GITLAB_WORKHORSE_VERSION": "14.7.2"
|
||||
"GITLAB_WORKHORSE_VERSION": "14.7.3"
|
||||
}
|
||||
}
|
||||
|
||||
@ -25,7 +25,7 @@ let
|
||||
gemdir = ./.;
|
||||
};
|
||||
|
||||
version = "14.7.2";
|
||||
version = "14.7.3";
|
||||
gitaly_package = "gitlab.com/gitlab-org/gitaly/v${lib.versions.major version}";
|
||||
in
|
||||
|
||||
@ -37,7 +37,7 @@ buildGoModule {
|
||||
owner = "gitlab-org";
|
||||
repo = "gitaly";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-gtQmRryTYwT2e4lamWYJ7Ri7dEGI7vg/Ir1gnuGmHQg=";
|
||||
sha256 = "sha256-5m+bhHtI1VZr8Di3LNG0Z7yk8oVTv6re7rckFDjaVvk=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-eapqtSstc7d3R7A/5krKV0uVr9GhGkHHMrmsBOpWAbo=";
|
||||
|
||||
@ -5,7 +5,7 @@ in
|
||||
buildGoModule rec {
|
||||
pname = "gitlab-workhorse";
|
||||
|
||||
version = "14.7.2";
|
||||
version = "14.7.3";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = data.owner;
|
||||
|
||||
@ -13,7 +13,7 @@ let
|
||||
inherit pname version;
|
||||
attrPath = lib.toLower pname;
|
||||
rev-prefix = "v";
|
||||
versionLister = "${common-updater-scripts}/bin/list-git-tags ${homepage}";
|
||||
versionLister = "${common-updater-scripts}/bin/list-git-tags --url=${homepage}";
|
||||
};
|
||||
updateScript = builtins.elemAt updater 0;
|
||||
updateArgs = map (lib.escapeShellArg) (builtins.tail updater);
|
||||
|
||||
@ -17,7 +17,7 @@ let
|
||||
|
||||
# exclude prerelease versions
|
||||
versionLister = writers.writeBash "list-mirakurun-versions" ''
|
||||
${common-updater-scripts}/bin/list-git-tags ${homepage} \
|
||||
${common-updater-scripts}/bin/list-git-tags --url=${homepage} \
|
||||
| grep '^[0-9]\+\.[0-9]\+\.[0-9]\+$'
|
||||
'';
|
||||
};
|
||||
|
||||
@ -17,8 +17,7 @@
|
||||
, qtgraphicaleffects
|
||||
, qmake
|
||||
, qttools
|
||||
, genericUpdater
|
||||
, common-updater-scripts
|
||||
, gitUpdater
|
||||
}:
|
||||
|
||||
assert lib.versionAtLeast mlt.version "6.24.0";
|
||||
@ -76,9 +75,8 @@ mkDerivation rec {
|
||||
cp -r src/qml $out/share/shotcut/
|
||||
'';
|
||||
|
||||
passthru.updateScript = genericUpdater {
|
||||
passthru.updateScript = gitUpdater {
|
||||
inherit pname version;
|
||||
versionLister = "${common-updater-scripts}/bin/list-git-tags ${src.meta.homepage}";
|
||||
rev-prefix = "v";
|
||||
};
|
||||
|
||||
|
||||
@ -55,7 +55,7 @@ let
|
||||
return 1
|
||||
}
|
||||
|
||||
tags=$($version_lister $pname ${fileForGitCommands}) || exit 1
|
||||
tags=$($version_lister --pname=${pname} --file="${fileForGitCommands}") || exit 1
|
||||
|
||||
# print available tags
|
||||
for tag in $tags; do
|
||||
|
||||
17
pkgs/common-updater/git-updater.nix
Normal file
17
pkgs/common-updater/git-updater.nix
Normal file
@ -0,0 +1,17 @@
|
||||
{ genericUpdater
|
||||
, common-updater-scripts
|
||||
}:
|
||||
|
||||
{ pname
|
||||
, version
|
||||
, attrPath ? pname
|
||||
, ignoredVersions ? ""
|
||||
, rev-prefix ? ""
|
||||
, odd-unstable ? false
|
||||
, patchlevel-unstable ? false
|
||||
}:
|
||||
|
||||
genericUpdater {
|
||||
inherit pname version attrPath ignoredVersions rev-prefix odd-unstable patchlevel-unstable;
|
||||
versionLister = "${common-updater-scripts}/bin/list-git-tags";
|
||||
}
|
||||
19
pkgs/common-updater/http-two-levels-updater.nix
Normal file
19
pkgs/common-updater/http-two-levels-updater.nix
Normal file
@ -0,0 +1,19 @@
|
||||
{ lib
|
||||
, genericUpdater
|
||||
, common-updater-scripts
|
||||
}:
|
||||
|
||||
{ pname
|
||||
, version
|
||||
, attrPath ? pname
|
||||
, ignoredVersions ? ""
|
||||
, rev-prefix ? ""
|
||||
, odd-unstable ? false
|
||||
, patchlevel-unstable ? false
|
||||
, url ? null
|
||||
}:
|
||||
|
||||
genericUpdater {
|
||||
inherit pname version attrPath ignoredVersions rev-prefix odd-unstable patchlevel-unstable;
|
||||
versionLister = "${common-updater-scripts}/bin/list-archive-two-levels-versions ${lib.optionalString (url != null) "--url=${url}"}";
|
||||
}
|
||||
@ -1,35 +0,0 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
# lists all available versions listed for a package in a site (http)
|
||||
|
||||
scriptName=list-archive-two-level-versions # do not use the .wrapped name
|
||||
|
||||
usage() {
|
||||
echo "Usage: $scriptName <archive url> [<package name> [<debug file path>]]"
|
||||
}
|
||||
|
||||
archive="$1" # archive url
|
||||
pname="$2" # package name
|
||||
file="$3" # file for writing debugging information
|
||||
|
||||
if [ -z "$archive" ]; then
|
||||
echo "$scriptName: Missing archive url"
|
||||
usage
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# print a debugging message
|
||||
if [ -n "$file" ]; then
|
||||
echo "# Listing versions for $pname at $archive" >> $file
|
||||
fi
|
||||
|
||||
# list all major-minor versions from archive
|
||||
tags1=$(curl -sS "$archive/")
|
||||
tags1=$(echo "$tags1" | sed -rne 's,^<a href="([0-9]+\.[0-9]+)/">.*,\1,p')
|
||||
|
||||
# print available versions
|
||||
for tag in $tags1; do
|
||||
tags2=$(curl -sS "$archive/$tag/")
|
||||
tags2=$(echo "$tags2" | sed -rne "s,^<a href=\"$pname-([0-9.]+)\\.[^0-9].*\">.*,\\1,p")
|
||||
echo "$tags2"
|
||||
done
|
||||
54
pkgs/common-updater/scripts/list-archive-two-levels-versions
Executable file
54
pkgs/common-updater/scripts/list-archive-two-levels-versions
Executable file
@ -0,0 +1,54 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
# lists all available versions listed for a package in a site (http)
|
||||
|
||||
archive="" # archive url
|
||||
pname="" # package name
|
||||
file="" # file for writing debugging information
|
||||
|
||||
while (( $# > 0 )); do
|
||||
flag="$1"
|
||||
shift 1
|
||||
case "$flag" in
|
||||
--url=*)
|
||||
archive="${flag#*=}"
|
||||
;;
|
||||
--pname=*)
|
||||
pname="${flag#*=}"
|
||||
;;
|
||||
--file=*)
|
||||
file="${flag#*=}"
|
||||
;;
|
||||
*)
|
||||
echo "$0: unknown option ‘${flag}’"
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
done
|
||||
|
||||
# by default set url to the base dir of the first url in src.urls
|
||||
if [[ -z "$archive" ]]; then
|
||||
archive="$(nix-instantiate $systemArg --eval -E \
|
||||
"with import ./. {}; dirOf (dirOf (lib.head $UPDATE_NIX_ATTR_PATH.src.urls))" \
|
||||
| tr -d '"')"
|
||||
fi
|
||||
|
||||
if [[ -z "$pname" ]]; then
|
||||
pname="$UPDATE_NIX_ATTR_PATH"
|
||||
fi
|
||||
|
||||
# print a debugging message
|
||||
if [[ -n "$file" ]]; then
|
||||
echo "# Listing versions for '$pname' at $archive" >> $file
|
||||
fi
|
||||
|
||||
# list all major-minor versions from archive
|
||||
tags1=$(curl -sS "$archive/")
|
||||
tags1=$(echo "$tags1" | sed -rne 's,^<a href="([0-9]+\.[0-9]+)/">.*,\1,p')
|
||||
|
||||
# print available versions
|
||||
for tag in $tags1; do
|
||||
tags2=$(curl -sS "$archive/$tag/")
|
||||
tags2=$(echo "$tags2" | sed -rne "s,^<a href=\"$pname-([0-9.]+)\\.[^0-9].*\">.*,\\1,p")
|
||||
echo "$tags2"
|
||||
done
|
||||
@ -2,29 +2,50 @@
|
||||
|
||||
# lists all available tags from a git repository
|
||||
|
||||
scriptName=list-git-tags # do not use the .wrapped name
|
||||
echo "# pname=$UPDATE_NIX_ATTR_PATH" > /tmp/test.txt
|
||||
|
||||
usage() {
|
||||
echo "Usage: $scriptName <repository url> [<package name> [<debug file path>]]"
|
||||
}
|
||||
url="" # git repository url
|
||||
pname="" # package name
|
||||
file="" # file for writing debugging information
|
||||
|
||||
repo="$1" # git repository url
|
||||
pname="$2" # package name
|
||||
file="$3" # file for writing debugging information
|
||||
while (( $# > 0 )); do
|
||||
flag="$1"
|
||||
shift 1
|
||||
case "$flag" in
|
||||
--url=*)
|
||||
url="${flag#*=}"
|
||||
;;
|
||||
--pname=*)
|
||||
pname="${flag#*=}"
|
||||
;;
|
||||
--file=*)
|
||||
file="${flag#*=}"
|
||||
;;
|
||||
*)
|
||||
echo "$0: unknown option ‘${flag}’"
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
done
|
||||
|
||||
if [ -z "$repo" ]; then
|
||||
echo "$scriptName: Missing git repository url"
|
||||
usage
|
||||
exit 1
|
||||
# By default we set url to src.url or src.meta.homepage
|
||||
if [[ -z "$url" ]]; then
|
||||
url="$(nix-instantiate $systemArg --eval -E \
|
||||
"with import ./. {}; $UPDATE_NIX_ATTR_PATH.src.url or $UPDATE_NIX_ATTR_PATH.src.meta.homepage" \
|
||||
| tr -d '"')"
|
||||
fi
|
||||
|
||||
if [[ -z "$pname" ]]; then
|
||||
pname="$UPDATE_NIX_ATTR_PATH"
|
||||
fi
|
||||
|
||||
# print a debugging message
|
||||
if [ -n "$file" ]; then
|
||||
echo "# Listing tags for $pname at $repo" >> $file
|
||||
if [[ -n "$file" ]]; then
|
||||
echo "# Listing tags for '$pname' at $url" >> $file
|
||||
fi
|
||||
|
||||
# list all tags from the remote repository
|
||||
tags=$(git ls-remote --tags --refs "$repo")
|
||||
tags=$(git ls-remote --tags --refs "$url")
|
||||
|
||||
# keep only the version part of the tag
|
||||
tags=$(echo "$tags" | cut --delimiter=/ --field=3)
|
||||
|
||||
@ -8,7 +8,7 @@ repo=https://github.com/be5invis/Iosevka
|
||||
|
||||
# Discover the latest version.
|
||||
current_version=$(nix-instantiate "$nixpkgs" --eval --strict -A iosevka.version | tr -d '"')
|
||||
new_version=$(list-git-tags "$repo" | sort --reverse --version-sort | awk 'match($0, /^v([0-9.]+)$/, m) { print m[1]; exit; }')
|
||||
new_version=$(list-git-tags --url="$repo" | sort --reverse --version-sort | awk 'match($0, /^v([0-9.]+)$/, m) { print m[1]; exit; }')
|
||||
if [[ "$new_version" == "$current_version" ]]; then
|
||||
echo "iosevka: no update found"
|
||||
exit
|
||||
|
||||
@ -1,15 +1,25 @@
|
||||
{ lib, stdenv, fetchurl, osinfo-db-tools, gettext, libxml2 }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, osinfo-db-tools
|
||||
, gettext
|
||||
, libxml2
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "osinfo-db";
|
||||
version = "20211216";
|
||||
version = "20220214";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://releases.pagure.org/libosinfo/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-CeznsOUhMw4x0SpZFx408JcYGny7zW+M1J+SiSO7EII=";
|
||||
sha256 = "sha256-E+bJAOuCAPFmD4oe13Xs7NWgH9skv7bu4c5l3XvP06k=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ osinfo-db-tools gettext libxml2 ];
|
||||
nativeBuildInputs = [
|
||||
osinfo-db-tools
|
||||
gettext
|
||||
libxml2
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
osinfo-db-import --dir "$out/share/osinfo" "${src}"
|
||||
@ -18,6 +28,7 @@ stdenv.mkDerivation rec {
|
||||
meta = with lib; {
|
||||
description = "Osinfo database of information about operating systems for virtualization provisioning tools";
|
||||
homepage = "https://gitlab.com/libosinfo/osinfo-db/";
|
||||
changelog = "https://gitlab.com/libosinfo/osinfo-db/-/commits/v${version}";
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.bjornfor ];
|
||||
|
||||
@ -5,6 +5,7 @@
|
||||
, gtk-engine-murrine
|
||||
, gtk_engines
|
||||
, librsvg
|
||||
, gitUpdater
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -37,6 +38,8 @@ stdenv.mkDerivation rec {
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.updateScript = gitUpdater {inherit pname version; };
|
||||
|
||||
meta = with lib; {
|
||||
description = "GTK theme supporting Budgie, Pantheon, Mate, Xfce4 and GNOME desktops";
|
||||
homepage = "https://www.pling.com/p/1239855/";
|
||||
|
||||
@ -1,26 +1,42 @@
|
||||
{ stdenv, pkgs, lib, writeScript, python3, common-updater-scripts }:
|
||||
{ stdenv, bash, pkgs, lib, writeScript, python3, common-updater-scripts }:
|
||||
{ packageName, attrPath ? packageName, versionPolicy ? "tagged", freeze ? false }:
|
||||
|
||||
let
|
||||
python = python3.withPackages (p: [ p.requests p.libversion ]);
|
||||
upperBoundFlag =
|
||||
package = lib.attrByPath (lib.splitString "." attrPath) (throw "Cannot find attribute ‘${attrPath}’.") pkgs;
|
||||
packageVersion = lib.getVersion package;
|
||||
upperBound =
|
||||
let
|
||||
package = lib.attrByPath (lib.splitString "." attrPath) (throw "Cannot find attribute ‘${attrPath}’.") pkgs;
|
||||
packageVersion = lib.getVersion package;
|
||||
versionComponents = lib.versions.splitVersion packageVersion;
|
||||
minorVersion = lib.versions.minor packageVersion;
|
||||
minorAvailable = builtins.length versionComponents > 1 && builtins.match "[0-9]+" minorVersion != null;
|
||||
nextMinor = builtins.fromJSON minorVersion + 1;
|
||||
upperBound = "${lib.versions.major packageVersion}.${builtins.toString nextMinor}";
|
||||
in lib.optionalString (freeze && minorAvailable) ''--upper-bound="${upperBound}"'';
|
||||
in lib.optionals (freeze && minorAvailable) [ upperBound ];
|
||||
updateScript = writeScript "gnome-update-script" ''
|
||||
#!${stdenv.shell}
|
||||
#!${bash}/bin/bash
|
||||
set -o errexit
|
||||
package_name="$1"
|
||||
attr_path="$2"
|
||||
version_policy="$3"
|
||||
attr_path="$1"
|
||||
package_name="$2"
|
||||
package_version="$3"
|
||||
version_policy="$4"
|
||||
|
||||
flvFlags=("$package_name" "$version_policy" "''${GNOME_UPDATE_STABILITY:-stable}")
|
||||
|
||||
if (( $# >= 5 )); then
|
||||
upper_bound="$5"
|
||||
flvFlags+=("--upper-bound=$upper_bound")
|
||||
fi
|
||||
|
||||
PATH=${lib.makeBinPath [ common-updater-scripts python ]}
|
||||
latest_tag=$(python "${./find-latest-version.py}" "$package_name" "$version_policy" "stable" ${upperBoundFlag})
|
||||
latest_tag=$(python "${./find-latest-version.py}" "''${flvFlags[@]}")
|
||||
update-source-version "$attr_path" "$latest_tag"
|
||||
echo '[ { "commitBody": "https://gitlab.gnome.org/GNOME/'$package_name'/-/compare/'$package_version'...'$latest_tag'" } ]'
|
||||
'';
|
||||
in [ updateScript packageName attrPath versionPolicy ]
|
||||
in {
|
||||
name = "gnome-update-script";
|
||||
command = [ updateScript attrPath packageName packageVersion versionPolicy ] ++ upperBound;
|
||||
supportedFeatures = [
|
||||
"commit"
|
||||
];
|
||||
}
|
||||
|
||||
@ -4,10 +4,9 @@ let
|
||||
|
||||
# Update script tailored to LXQt packages from git repository
|
||||
lxqtUpdateScript = { pname, version, src }:
|
||||
pkgs.genericUpdater {
|
||||
pkgs.gitUpdater {
|
||||
inherit pname version;
|
||||
attrPath = "lxqt.${pname}";
|
||||
versionLister = "${pkgs.common-updater-scripts}/bin/list-git-tags ${src.meta.homepage}";
|
||||
};
|
||||
|
||||
# For compiling information, see:
|
||||
|
||||
@ -7,10 +7,9 @@ let
|
||||
|
||||
# Update script tailored to mate packages from git repository
|
||||
mateUpdateScript = { pname, version, odd-unstable ? true, url ? "https://pub.mate-desktop.org/releases" }:
|
||||
pkgs.genericUpdater {
|
||||
inherit pname version odd-unstable;
|
||||
pkgs.httpTwoLevelsUpdater {
|
||||
inherit pname version odd-unstable url;
|
||||
attrPath = "mate.${pname}";
|
||||
versionLister = "${pkgs.common-updater-scripts}/bin/list-archive-two-level-versions ${url}";
|
||||
};
|
||||
|
||||
atril = callPackage ./atril { };
|
||||
|
||||
@ -9,8 +9,7 @@
|
||||
, gobject-introspection
|
||||
, wrapGAppsHook
|
||||
, glib
|
||||
, genericUpdater
|
||||
, common-updater-scripts
|
||||
, gitUpdater
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
@ -74,10 +73,9 @@ python3Packages.buildPythonApplication rec {
|
||||
done
|
||||
'';
|
||||
|
||||
passthru.updateScript = genericUpdater {
|
||||
passthru.updateScript = gitUpdater {
|
||||
inherit pname version;
|
||||
attrPath = "mate.${pname}";
|
||||
versionLister = "${common-updater-scripts}/bin/list-git-tags ${src.meta.homepage}";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -38,10 +38,9 @@ stdenv.mkDerivation rec {
|
||||
})
|
||||
];
|
||||
|
||||
passthru.updateScript = xfce.updateScript {
|
||||
passthru.updateScript = xfce.archiveUpdater {
|
||||
category = "apps";
|
||||
inherit pname version;
|
||||
attrPath = "xfce.${pname}";
|
||||
versionLister = xfce.archiveLister "apps" pname;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -28,11 +28,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
dontDropIconThemeCache = true;
|
||||
|
||||
passthru.updateScript = xfce.updateScript {
|
||||
inherit pname version;
|
||||
attrPath = "xfce.${pname}";
|
||||
versionLister = xfce.archiveLister category pname;
|
||||
};
|
||||
passthru.updateScript = xfce.archiveUpdater { inherit category pname version; };
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://www.xfce.org/";
|
||||
|
||||
@ -13,11 +13,7 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "sha256-MhTV8A6XA7XoyefDKH1gbe3scoXOtNXbMy6TraZv1XU=";
|
||||
};
|
||||
|
||||
passthru.updateScript = xfce.updateScript {
|
||||
inherit pname version;
|
||||
attrPath = "xfce.${pname}";
|
||||
versionLister = xfce.archiveLister category pname;
|
||||
};
|
||||
passthru.updateScript = xfce.archiveUpdater { inherit category pname version; };
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://www.xfce.org/";
|
||||
|
||||
@ -3,13 +3,14 @@
|
||||
lib.makeScope pkgs.newScope (self: with self; {
|
||||
#### NixOS support
|
||||
|
||||
updateScript = pkgs.genericUpdater;
|
||||
genericUpdater = pkgs.genericUpdater;
|
||||
|
||||
gitLister = url:
|
||||
"${pkgs.common-updater-scripts}/bin/list-git-tags ${url}";
|
||||
|
||||
archiveLister = category: name:
|
||||
"${pkgs.common-updater-scripts}/bin/list-archive-two-level-versions https://archive.xfce.org/src/${category}/${name}";
|
||||
archiveUpdater = { category, pname, version }:
|
||||
pkgs.httpTwoLevelsUpdater {
|
||||
inherit pname version;
|
||||
attrPath = "xfce.${pname}";
|
||||
url = "https://archive.xfce.org/src/${category}/${pname}";
|
||||
};
|
||||
|
||||
mkXfceDerivation = callPackage ./mkXfceDerivation.nix { };
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchFromGitLab, pkg-config, xfce4-dev-tools, hicolor-icon-theme, xfce, wrapGAppsHook }:
|
||||
{ lib, stdenv, fetchFromGitLab, pkg-config, xfce4-dev-tools, hicolor-icon-theme, xfce, wrapGAppsHook, gitUpdater }:
|
||||
|
||||
{ category
|
||||
, pname
|
||||
@ -41,9 +41,8 @@ let
|
||||
|
||||
pos = builtins.unsafeGetAttrPos "pname" args;
|
||||
|
||||
passthru.updateScript = xfce.updateScript {
|
||||
passthru.updateScript = gitUpdater {
|
||||
inherit pname version attrPath rev-prefix odd-unstable patchlevel-unstable;
|
||||
versionLister = xfce.gitLister src.meta.homepage;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -45,11 +45,7 @@ in stdenv.mkDerivation rec {
|
||||
hicolor-icon-theme
|
||||
];
|
||||
|
||||
passthru.updateScript = xfce.updateScript {
|
||||
inherit pname version;
|
||||
attrPath = "xfce.${pname}";
|
||||
versionLister = xfce.archiveLister category pname;
|
||||
};
|
||||
passthru.updateScript = xfce.archiveUpdater { inherit category pname version; };
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://docs.xfce.org/panel-plugins/xfce4-cpugraph-plugin";
|
||||
|
||||
@ -33,11 +33,7 @@ in stdenv.mkDerivation rec {
|
||||
gtk2
|
||||
];
|
||||
|
||||
passthru.updateScript = xfce.updateScript {
|
||||
inherit pname version;
|
||||
attrPath = "xfce.${pname}";
|
||||
versionLister = xfce.archiveLister category pname;
|
||||
};
|
||||
passthru.updateScript = xfce.archiveUpdater { inherit category pname version; };
|
||||
|
||||
meta = with lib;{
|
||||
homepage = "https://docs.xfce.org/panel-plugins/xfce4-embed-plugin";
|
||||
|
||||
@ -35,11 +35,7 @@ in stdenv.mkDerivation rec {
|
||||
gtk3
|
||||
];
|
||||
|
||||
passthru.updateScript = xfce.updateScript {
|
||||
inherit pname version;
|
||||
attrPath = "xfce.${pname}";
|
||||
versionLister = xfce.archiveLister category pname;
|
||||
};
|
||||
passthru.updateScript = xfce.archiveUpdater { inherit category pname version; };
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://docs.xfce.org/panel-plugins/xfce4-eyes-plugin";
|
||||
|
||||
@ -35,11 +35,7 @@ in stdenv.mkDerivation rec {
|
||||
gtk3
|
||||
];
|
||||
|
||||
passthru.updateScript = xfce.updateScript {
|
||||
inherit pname version;
|
||||
attrPath = "xfce.${pname}";
|
||||
versionLister = xfce.archiveLister category pname;
|
||||
};
|
||||
passthru.updateScript = xfce.archiveUpdater { inherit category pname version; };
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://docs.xfce.org/panel-plugins/xfce4-fsguard-plugin";
|
||||
|
||||
@ -33,11 +33,7 @@ in stdenv.mkDerivation rec {
|
||||
gtk3
|
||||
];
|
||||
|
||||
passthru.updateScript = xfce.updateScript {
|
||||
inherit pname version;
|
||||
attrPath = "xfce.${pname}";
|
||||
versionLister = xfce.archiveLister category pname;
|
||||
};
|
||||
passthru.updateScript = xfce.archiveUpdater { inherit category pname version; };
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://docs.xfce.org/panel-plugins/xfce4-genmon-plugin";
|
||||
|
||||
@ -27,11 +27,7 @@ stdenv.mkDerivation rec {
|
||||
libgcrypt
|
||||
];
|
||||
|
||||
passthru.updateScript = xfce.updateScript {
|
||||
inherit pname version;
|
||||
attrPath = "xfce.${pname}";
|
||||
versionLister = xfce.archiveLister category pname;
|
||||
};
|
||||
passthru.updateScript = xfce.archiveUpdater { inherit category pname version; };
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://docs.xfce.org/panel-plugins/xfce4-mailwatch-plugin";
|
||||
|
||||
@ -27,11 +27,7 @@ stdenv.mkDerivation rec {
|
||||
exo
|
||||
];
|
||||
|
||||
passthru.updateScript = xfce.updateScript {
|
||||
inherit pname version;
|
||||
attrPath = "xfce.${pname}";
|
||||
versionLister = xfce.archiveLister category pname;
|
||||
};
|
||||
passthru.updateScript = xfce.archiveUpdater { inherit category pname version; };
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://docs.xfce.org/panel-plugins/xfce4-mpc-plugin";
|
||||
|
||||
@ -1,5 +1,7 @@
|
||||
{ lib, stdenv, pkg-config, fetchFromGitHub, python3, vala
|
||||
, gtk3, libwnck, libxfce4util, xfce4-panel, wafHook, xfce }:
|
||||
, gtk3, libwnck, libxfce4util, xfce4-panel, wafHook, xfce
|
||||
, gitUpdater
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "xfce4-namebar-plugin";
|
||||
@ -20,10 +22,9 @@ stdenv.mkDerivation rec {
|
||||
substituteInPlace src/preferences.vala --replace 'var dir_strings = Environment.get_system_data_dirs()' "string[] dir_strings = { \"$out/share\" }"
|
||||
'';
|
||||
|
||||
passthru.updateScript = xfce.updateScript {
|
||||
passthru.updateScript = gitUpdater {
|
||||
inherit pname version;
|
||||
attrPath = "xfce.${pname}";
|
||||
versionLister = xfce.gitLister src.meta.homepage;
|
||||
rev-prefix = "v";
|
||||
};
|
||||
|
||||
|
||||
@ -31,11 +31,7 @@ in stdenv.mkDerivation rec {
|
||||
xfconf
|
||||
];
|
||||
|
||||
passthru.updateScript = xfce.updateScript {
|
||||
inherit pname version;
|
||||
attrPath = "xfce.${pname}";
|
||||
versionLister = xfce.archiveLister category pname;
|
||||
};
|
||||
passthru.updateScript = xfce.archiveUpdater { inherit category pname version; };
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://docs.xfce.org/panel-plugins/xfce4-notes-plugin";
|
||||
|
||||
@ -38,11 +38,7 @@ stdenv.mkDerivation rec {
|
||||
"--with-pathnetcat=${netcat-gnu}/bin/netcat"
|
||||
];
|
||||
|
||||
passthru.updateScript = xfce.updateScript {
|
||||
inherit pname version;
|
||||
attrPath = "xfce.${pname}";
|
||||
versionLister = xfce.archiveLister category pname;
|
||||
};
|
||||
passthru.updateScript = xfce.archiveUpdater { inherit category pname version; };
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://docs.xfce.org/panel-plugins/xfce4-sensors-plugin";
|
||||
|
||||
@ -31,11 +31,7 @@ in stdenv.mkDerivation rec {
|
||||
xfconf
|
||||
];
|
||||
|
||||
passthru.updateScript = xfce.updateScript {
|
||||
inherit pname version;
|
||||
attrPath = "xfce.${pname}";
|
||||
versionLister = xfce.archiveLister category pname;
|
||||
};
|
||||
passthru.updateScript = xfce.archiveUpdater { inherit category pname version; };
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://docs.xfce.org/panel-plugins/xfce4-systemload-plugin";
|
||||
|
||||
@ -28,11 +28,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
passthru.updateScript = xfce.updateScript {
|
||||
inherit pname version;
|
||||
attrPath = "xfce.${pname}";
|
||||
versionLister = xfce.archiveLister category pname;
|
||||
};
|
||||
passthru.updateScript = xfce.archiveUpdater { inherit category pname version; };
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://docs.xfce.org/panel-plugins/xfce4-timer-plugin";
|
||||
|
||||
@ -31,11 +31,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
passthru.updateScript = xfce.updateScript {
|
||||
inherit pname version;
|
||||
attrPath = "xfce.${pname}";
|
||||
versionLister = xfce.archiveLister category pname;
|
||||
};
|
||||
passthru.updateScript = xfce.archiveUpdater { inherit category pname version; };
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://docs.xfce.org/panel-plugins/xfce4-weather-plugin";
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchFromGitHub, pkg-config, intltool, python3, imagemagick, libwnck, libxfce4ui, xfce4-panel, xfconf, xfce4-dev-tools, xfce }:
|
||||
{ lib, stdenv, fetchFromGitHub, pkg-config, intltool, python3, imagemagick, libwnck, libxfce4ui, xfce4-panel, xfconf, xfce4-dev-tools, xfce, gitUpdater }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "xfce4-windowck-plugin";
|
||||
@ -33,10 +33,9 @@ stdenv.mkDerivation rec {
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
passthru.updateScript = xfce.updateScript {
|
||||
passthru.updateScript = gitUpdater {
|
||||
inherit pname version;
|
||||
attrPath = "xfce.${pname}";
|
||||
versionLister = xfce.gitLister src.meta.homepage;
|
||||
rev-prefix = "v";
|
||||
};
|
||||
|
||||
|
||||
@ -6,6 +6,7 @@
|
||||
, cmake
|
||||
, ninja
|
||||
, xfce
|
||||
, gitUpdater
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -30,10 +31,9 @@ stdenv.mkDerivation rec {
|
||||
gtk3
|
||||
];
|
||||
|
||||
passthru.updateScript = xfce.updateScript {
|
||||
passthru.updateScript = gitUpdater {
|
||||
inherit pname version;
|
||||
attrPath = "xfce.thunar-dropbox-plugin";
|
||||
versionLister = xfce.gitLister src.meta.homepage;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -24,7 +24,7 @@ in rebar3Relx rec {
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
latest=$(list-git-tags https://github.com/${owner}/${repo}.git | sort -V | tail -1)
|
||||
latest=$(list-git-tags --url=https://github.com/${owner}/${repo}.git | sort -V | tail -1)
|
||||
if [ "$latest" != "${version}" ]; then
|
||||
nixpkgs="$(git rev-parse --show-toplevel)"
|
||||
nix_path="$nixpkgs/pkgs/development/beam-modules/elvis-erlang"
|
||||
|
||||
@ -51,7 +51,7 @@ rebar3Relx {
|
||||
#! nix-shell -i bash -p common-updater-scripts coreutils git gnused gnutar gzip "rebar3WithPlugins { globalPlugins = [ beamPackages.rebar3-nix ]; }"
|
||||
|
||||
set -ox errexit
|
||||
latest=$(list-git-tags https://github.com/${owner}/${repo}.git | sed -n '/[\d\.]\+/p' | sort -V | tail -1)
|
||||
latest=$(list-git-tags --url=https://github.com/${owner}/${repo}.git | sed -n '/[\d\.]\+/p' | sort -V | tail -1)
|
||||
if [[ "$latest" != "${version}" ]]; then
|
||||
nixpkgs="$(git rev-parse --show-toplevel)"
|
||||
nix_path="$nixpkgs/pkgs/development/beam-modules/erlang-ls"
|
||||
|
||||
@ -6,10 +6,12 @@ with lib; mkCoqDerivation rec {
|
||||
owner = "iris";
|
||||
inherit version;
|
||||
defaultVersion = with versions; switch coq.coq-version [
|
||||
{ case = isEq "8.14"; out = "3.5.0"; }
|
||||
{ case = range "8.13" "8.15"; out = "3.6.0"; }
|
||||
{ case = range "8.12" "8.14"; out = "3.5.0"; }
|
||||
{ case = range "8.11" "8.13"; out = "3.4.0"; }
|
||||
{ case = range "8.9" "8.10"; out = "3.3.0"; }
|
||||
] null;
|
||||
release."3.6.0".sha256 = "sha256:02vbq597fjxd5znzxdb54wfp36412wz2d4yash4q8yddgl1kakmj";
|
||||
release."3.5.0".sha256 = "0hh14m0anfcv65rxm982ps2vp95vk9fwrpv4br8bxd9vz0091d70";
|
||||
release."3.4.0".sha256 = "0vdc2mdqn5jjd6yz028c0c6blzrvpl0c7apx6xas7ll60136slrb";
|
||||
release."3.3.0".sha256 = "0az4gkp5m8sq0p73dlh0r7ckkzhk7zkg5bndw01bdsy5ywj0vilp";
|
||||
|
||||
@ -6,10 +6,12 @@ with lib; mkCoqDerivation rec {
|
||||
domain = "gitlab.mpi-sws.org";
|
||||
owner = "iris";
|
||||
defaultVersion = with versions; switch coq.coq-version [
|
||||
{ case = isEq "8.14"; out = "1.6.0"; }
|
||||
{ case = range "8.13" "8.15"; out = "1.7.0"; }
|
||||
{ case = range "8.12" "8.14"; out = "1.6.0"; }
|
||||
{ case = range "8.11" "8.13"; out = "1.5.0"; }
|
||||
{ case = range "8.8" "8.10"; out = "1.4.0"; }
|
||||
] null;
|
||||
release."1.7.0".sha256 = "sha256:0447wbzm23f9rl8byqf6vglasfn6c1wy6cxrrwagqjwsh3i5lx8y";
|
||||
release."1.6.0".sha256 = "1l1w6srzydjg0h3f4krrfgvz455h56shyy2lbcnwdbzjkahibl7v";
|
||||
release."1.5.0".sha256 = "1ym0fy620imah89p8b6rii8clx2vmnwcrbwxl3630h24k42092nf";
|
||||
release."1.4.0".sha256 = "1m6c7ibwc99jd4cv14v3r327spnfvdf3x2mnq51f9rz99rffk68r";
|
||||
|
||||
@ -154,7 +154,7 @@ stdenv.mkDerivation ({
|
||||
#!${stdenv.shell}
|
||||
set -ox errexit
|
||||
PATH=${lib.makeBinPath [ common-updater-scripts coreutils git gnused ]}
|
||||
latest=$(list-git-tags https://github.com/erlang/otp.git | sed -n 's/^OTP-${major}/${major}/p' | sort -V | tail -1)
|
||||
latest=$(list-git-tags --url=https://github.com/erlang/otp.git | sed -n 's/^OTP-${major}/${major}/p' | sort -V | tail -1)
|
||||
if [ "$latest" != "${version}" ]; then
|
||||
nixpkgs="$(git rev-parse --show-toplevel)"
|
||||
nix_file="$nixpkgs/pkgs/development/interpreters/erlang/R${major}.nix"
|
||||
|
||||
@ -1,5 +1,7 @@
|
||||
{ lib, stdenv
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
@ -10,13 +12,21 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "babl";
|
||||
version = "0.1.88";
|
||||
version = "0.1.90";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
patches = [
|
||||
# Fix darwin build
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.gnome.org/GNOME/babl/-/commit/33b18e74c9589fd4d5507ab88bd1fb19c15965dd.patch";
|
||||
sha256 = "bEjjOjHGTF55o1z31G9GNDqERxn/7vUuWZQYHosSEBQ=";
|
||||
})
|
||||
];
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.gimp.org/pub/babl/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-Tw1/SqoLsucl80mt97NRqVfZ+ybVVdmJWnr4FrQWcDk=";
|
||||
sha256 = "sha256-bi67Y283WBWI49AkmbPS9p+axz40omL0KRHX9ZBqkkM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -34,6 +44,7 @@ stdenv.mkDerivation rec {
|
||||
meta = with lib; {
|
||||
description = "Image pixel format conversion library";
|
||||
homepage = "https://gegl.org/babl/";
|
||||
changelog = "https://gitlab.gnome.org/GNOME/babl/-/blob/BABL_${lib.replaceStrings [ "." ] [ "_" ] version}/NEWS";
|
||||
license = licenses.lgpl3Plus;
|
||||
maintainers = with maintainers; [ jtojnar ];
|
||||
platforms = platforms.unix;
|
||||
|
||||
@ -5,11 +5,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "drumstick";
|
||||
version = "2.4.1";
|
||||
version = "2.5.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/drumstick/${version}/${pname}-${version}.tar.bz2";
|
||||
sha256 = "sha256-nmqgS08ZBQ2vBEDtoriNbYLaNQA1DWeDhbRo70rBOP0=";
|
||||
hash = "sha256-V57YnyeOVBXL5qjuCO1j1Ozy9CeaXxadw6ed1suUUIU=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
|
||||
meta = with lib; {
|
||||
maintainers = [];
|
||||
description = "MIDI libraries for Qt5/C++";
|
||||
homepage = "http://drumstick.sourceforge.net/";
|
||||
homepage = "https://drumstick.sourceforge.io/";
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ lib, stdenv, fetchFromGitLab, pkg-config
|
||||
, qmake, qtbase, qtdeclarative, wrapQtAppsHook
|
||||
, glib, gobject-introspection
|
||||
, genericUpdater, common-updater-scripts
|
||||
, gitUpdater
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -55,10 +55,9 @@ stdenv.mkDerivation rec {
|
||||
done
|
||||
'';
|
||||
|
||||
passthru.updateScript = genericUpdater {
|
||||
passthru.updateScript = gitUpdater {
|
||||
inherit pname version;
|
||||
rev-prefix = "v";
|
||||
versionLister = "${common-updater-scripts}/bin/list-git-tags ${src.meta.homepage}";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -1,19 +1,28 @@
|
||||
{ mkDerivation
|
||||
{ lib
|
||||
, mkDerivation
|
||||
, fetchFromGitLab
|
||||
, extra-cmake-modules
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "kquickimageeditor";
|
||||
version = "0.1.3";
|
||||
version = "0.2.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "invent.kde.org";
|
||||
owner = "libraries";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-p2uOssS5MQSkmppNKOjTxp866Qx1rIB6ZPhcmVvfBxs=";
|
||||
sha256 = "sha256-g7+BAWjpQBJPbrwnIwSudjBFtwaj4JKemV+BLfPzl4I=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ extra-cmake-modules ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Set of QtQuick components providing basic image editing capabilities";
|
||||
homepage = "https://invent.kde.org/libraries/kquickimageeditor";
|
||||
license = licenses.lgpl21Plus;
|
||||
platforms = platforms.unix;
|
||||
badPlatforms = platforms.darwin;
|
||||
};
|
||||
}
|
||||
|
||||
@ -23,11 +23,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libosinfo";
|
||||
version = "1.9.0";
|
||||
version = "1.10.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://releases.pagure.org/${pname}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-tPNBgVTvP0PZQggnKUkWrqGCcCGvwG4WRPxWlRgwo1k=";
|
||||
sha256 = "sha256-olLgD8WA3rIdoNqMCqA7jDHoRAuESMi5gUP6tHfTIwU=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" "devdoc" ];
|
||||
@ -77,6 +77,7 @@ stdenv.mkDerivation rec {
|
||||
meta = with lib; {
|
||||
description = "GObject based library API for managing information about operating systems, hypervisors and the (virtual) hardware devices they can support";
|
||||
homepage = "https://libosinfo.org/";
|
||||
changelog = "https://gitlab.com/libosinfo/libosinfo/-/blob/v${version}/NEWS";
|
||||
license = licenses.lgpl2Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.bjornfor ];
|
||||
|
||||
@ -16,11 +16,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "librsb";
|
||||
version = "1.2.0.9";
|
||||
version = "1.2.0.10";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz";
|
||||
sha256 = "1ynrsgnvv1jfm8dv3jwjrip9x9icxv7w3qrk149025j6fbaza8gl";
|
||||
sha256 = "sha256-7Enz94p8Q/yeEJdlk9EAqkmxhjMJ7Y+jzLt6rVLS97g=";
|
||||
};
|
||||
|
||||
# The default configure flags are still present when building
|
||||
|
||||
@ -10,8 +10,7 @@
|
||||
, pcre2
|
||||
|
||||
# update script
|
||||
, genericUpdater
|
||||
, common-updater-scripts
|
||||
, gitUpdater
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -40,9 +39,8 @@ stdenv.mkDerivation rec {
|
||||
"-DCMAKE_BUILD_TYPE:String=Release"
|
||||
];
|
||||
|
||||
passthru.updateScript = genericUpdater {
|
||||
passthru.updateScript = gitUpdater {
|
||||
inherit pname version;
|
||||
versionLister = "${common-updater-scripts}/bin/list-git-tags ${src.meta.homepage}";
|
||||
rev-prefix = "v";
|
||||
};
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ lib, stdenv, fetchFromGitHub, makeWrapper
|
||||
, SDL, ffmpeg_4, frei0r, libjack2, libdv, libsamplerate, libexif
|
||||
, libvorbis, libxml2, movit, pkg-config, sox, fftw, opencv4, SDL2
|
||||
, gtk2, genericUpdater, common-updater-scripts, libebur128
|
||||
, gtk2, gitUpdater, libebur128
|
||||
, jack2, ladspa-sdk, swig, which, ncurses
|
||||
, enablePython ? false, python3
|
||||
}:
|
||||
@ -51,9 +51,8 @@ stdenv.mkDerivation rec {
|
||||
sed -i ${outPythonPath}/mlt/__init__.py -e "s|return importlib.import_module('_mlt')|return importlib.import_module('mlt._mlt')|g"
|
||||
'';
|
||||
|
||||
passthru.updateScript = genericUpdater {
|
||||
passthru.updateScript = gitUpdater {
|
||||
inherit pname version;
|
||||
versionLister = "${common-updater-scripts}/bin/list-git-tags ${src.meta.homepage}";
|
||||
rev-prefix = "v";
|
||||
};
|
||||
|
||||
|
||||
@ -18,8 +18,7 @@
|
||||
, vid-stab
|
||||
, opencv3
|
||||
, ladspa-sdk
|
||||
, genericUpdater
|
||||
, common-updater-scripts
|
||||
, gitUpdater
|
||||
, ladspaPlugins
|
||||
, mkDerivation
|
||||
, which
|
||||
@ -70,9 +69,8 @@ mkDerivation rec {
|
||||
inherit ffmpeg;
|
||||
};
|
||||
|
||||
passthru.updateScript = genericUpdater {
|
||||
passthru.updateScript = gitUpdater {
|
||||
inherit pname version;
|
||||
versionLister = "${common-updater-scripts}/bin/list-git-tags ${src.meta.homepage}";
|
||||
rev-prefix = "v";
|
||||
};
|
||||
|
||||
|
||||
@ -14,13 +14,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "notcurses";
|
||||
version = "3.0.6";
|
||||
version = "3.0.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dankamongmen";
|
||||
repo = "notcurses";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-DGAE3XomAoRhAkKUCxmr8R0dhNXeusSgETzmsbV1RhQ=";
|
||||
sha256 = "sha256-tFdxQEYmSFr3GlJMud2ICToR+IB5sGnQkARUd/LtJXg=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fastjet-contrib";
|
||||
version = "1.046";
|
||||
version = "1.048";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://fastjet.hepforge.org/contrib/downloads/fjcontrib-${version}.tar.gz";
|
||||
sha256 = "sha256-cgavrH/rIHXZn7sDa7NRPTKy2sOvMDQQJjmGNUeT7s8=";
|
||||
url = "https://fastjet.hepforge.org/contrib/downloads/fjcontrib-${version}.tar.gz";
|
||||
sha256 = "sha256-+ZidO2rrIoSLz5EJXDBgfwJ9PvJ3pPD3BKjw/C52aYE=";
|
||||
};
|
||||
|
||||
buildInputs = [ fastjet ];
|
||||
@ -33,7 +33,8 @@ stdenv.mkDerivation rec {
|
||||
meta = with lib; {
|
||||
description = "Third party extensions for FastJet";
|
||||
homepage = "http://fastjet.fr/";
|
||||
license = licenses.gpl2;
|
||||
changelog = "https://phab.hepforge.org/source/fastjetsvn/browse/contrib/tags/${version}/NEWS?as=source&blame=off";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ veprbl ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "portmidi";
|
||||
version = "2.0.2";
|
||||
version = "2.0.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "zOmzJ2MLGhGXiN0XjcmnnUrk/uqxP9IaZbqCG5XchC4=";
|
||||
sha256 = "sha256-bLGqi3b9FHBA43baNDT8jkPBQSXAUDfurQSJHLcy3AE=";
|
||||
};
|
||||
|
||||
cmakeFlags = [
|
||||
|
||||
@ -1,27 +0,0 @@
|
||||
{ lib, stdenv, fetchurl, cmake, qt4, clucene_core, librdf_redland, libiodbc
|
||||
, pkg-config }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "soprano";
|
||||
version = "2.9.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/soprano/${pname}-${version}.tar.bz2";
|
||||
sha256 = "1rg0x7yg0a1cbnxz7kqk52580wla8jbnj4d4r3j7l7g7ajyny1k4";
|
||||
};
|
||||
|
||||
patches = [ ./find-virtuoso.patch ];
|
||||
|
||||
# We disable the Java backend, since we do not need them and they make the closure size much bigger
|
||||
buildInputs = [ qt4 clucene_core librdf_redland libiodbc ];
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
|
||||
meta = {
|
||||
homepage = "http://soprano.sourceforge.net/";
|
||||
description = "An object-oriented C++/Qt4 framework for RDF data";
|
||||
license = "LGPL";
|
||||
maintainers = with lib.maintainers; [ sander ];
|
||||
inherit (qt4.meta) platforms;
|
||||
};
|
||||
}
|
||||
@ -1,86 +0,0 @@
|
||||
From: Yury G. Kudryashov <urkud.urkud@gmail.com>
|
||||
Subject: [PATCH] Find virtuoso if virtuoso-t is in PATH
|
||||
|
||||
---
|
||||
backends/virtuoso/virtuosobackend.cpp | 31 ++++++++++++++++++++++---------
|
||||
backends/virtuoso/virtuosobackend.h | 2 +-
|
||||
2 files changed, 23 insertions(+), 10 deletions(-)
|
||||
|
||||
diff --git a/backends/virtuoso/virtuosobackend.cpp b/backends/virtuoso/virtuosobackend.cpp
|
||||
index c245101..249958a 100644
|
||||
--- a/backends/virtuoso/virtuosobackend.cpp
|
||||
+++ b/backends/virtuoso/virtuosobackend.cpp
|
||||
@@ -28,6 +28,7 @@
|
||||
#include "odbcconnectionpool.h"
|
||||
|
||||
#include "sopranodirs.h"
|
||||
+#include "soprano-config.h"
|
||||
|
||||
#include <QtCore/QDebug>
|
||||
#include <QtCore/QtPlugin>
|
||||
@@ -210,19 +211,19 @@ Soprano::BackendFeatures Soprano::Virtuoso::BackendPlugin::supportedFeatures() c
|
||||
|
||||
bool Soprano::Virtuoso::BackendPlugin::isAvailable() const
|
||||
{
|
||||
-#ifndef Q_OS_WIN
|
||||
- if ( findVirtuosoDriver().isEmpty() ) {
|
||||
- qDebug() << Q_FUNC_INFO << "could not find Virtuoso ODBC driver";
|
||||
- return false;
|
||||
- }
|
||||
-#endif
|
||||
-
|
||||
QString virtuosoBin = locateVirtuosoBinary();
|
||||
if ( virtuosoBin.isEmpty() ) {
|
||||
qDebug() << Q_FUNC_INFO << "could not find virtuoso-t binary";
|
||||
return false;
|
||||
}
|
||||
|
||||
+#ifndef Q_OS_WIN
|
||||
+ if ( findVirtuosoDriver( virtuosoBin ).isEmpty() ) {
|
||||
+ qDebug() << Q_FUNC_INFO << "could not find Virtuoso ODBC driver";
|
||||
+ return false;
|
||||
+ }
|
||||
+#endif
|
||||
+
|
||||
QString vs = determineVirtuosoVersion( virtuosoBin );
|
||||
if ( vs.isEmpty() ) {
|
||||
qDebug() << Q_FUNC_INFO << "Failed to determine version of the Virtuoso server at" << virtuosoBin;
|
||||
@@ -267,9 +268,21 @@ QString Soprano::Virtuoso::BackendPlugin::locateVirtuosoBinary()
|
||||
|
||||
#ifndef Q_OS_WIN
|
||||
// static
|
||||
-QString Soprano::Virtuoso::BackendPlugin::findVirtuosoDriver()
|
||||
+QString Soprano::Virtuoso::BackendPlugin::findVirtuosoDriver( const QString &virtuosoBinHint )
|
||||
{
|
||||
- return Soprano::findLibraryPath( "virtodbc_r", QStringList(), QStringList() << QLatin1String( "virtuoso/plugins/" ) << QLatin1String( "odbc/" ) );
|
||||
+ QString virtuosoBin;
|
||||
+ if (virtuosoBinHint.isEmpty())
|
||||
+ virtuosoBin = locateVirtuosoBinary();
|
||||
+ else
|
||||
+ virtuosoBin = virtuosoBinHint;
|
||||
+
|
||||
+ QDir virtuosoBinDir = QFileInfo(virtuosoBin).absoluteDir();
|
||||
+ return Soprano::findLibraryPath( "virtodbc_r",
|
||||
+ QStringList()
|
||||
+ << virtuosoBinDir.absoluteFilePath("../lib"SOPRANO_LIB_SUFFIX)
|
||||
+ << virtuosoBinDir.absoluteFilePath("../lib"),
|
||||
+ QStringList() << QLatin1String( "virtuoso/plugins/" ) <<
|
||||
+ QLatin1String( "odbc/" ) );
|
||||
}
|
||||
#endif
|
||||
|
||||
diff --git a/backends/virtuoso/virtuosobackend.h b/backends/virtuoso/virtuosobackend.h
|
||||
index 646b9f8..535fbb9 100644
|
||||
--- a/backends/virtuoso/virtuosobackend.h
|
||||
+++ b/backends/virtuoso/virtuosobackend.h
|
||||
@@ -52,7 +52,7 @@ namespace Soprano {
|
||||
|
||||
#ifndef Q_OS_WIN
|
||||
private:
|
||||
- static QString findVirtuosoDriver();
|
||||
+ static QString findVirtuosoDriver(const QString &virtuosoBinHint = QString());
|
||||
#endif
|
||||
};
|
||||
}
|
||||
--
|
||||
tg: (2321148..) t/find-virtuoso (depends on: master)
|
||||
@ -6,13 +6,13 @@
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "dose3";
|
||||
version = "6.1";
|
||||
version = "7.0.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "irill";
|
||||
repo = "dose3";
|
||||
rev = version;
|
||||
sha256 = "sha256-RFChY7VH2pVD4u5U1qng46h9aAv8I/3yXVaNmFDmKFI=";
|
||||
sha256 = "sha256-K0fYSAWV48Rers/foDrEIqieyJ0PvpXkuYrFrZGBkkE=";
|
||||
};
|
||||
|
||||
minimalOCamlVersion = "4.03";
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ lib, buildPecl, fetchFromGitHub, writeText, libcouchbase, zlib, php, substituteAll }:
|
||||
let
|
||||
pname = "couchbase";
|
||||
version = "3.2.1";
|
||||
version = "3.2.2";
|
||||
in
|
||||
buildPecl {
|
||||
inherit pname version;
|
||||
@ -10,7 +10,7 @@ buildPecl {
|
||||
owner = "couchbase";
|
||||
repo = "php-couchbase";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Ti1jo1do0xiY/FAfyG/YI/TTcgFTMWy8cuhorDodUko=";
|
||||
sha256 = "sha256-JpzLR4NcyShl2VTivj+15iAsTTsZmdMIdZYc3dLCbIA=";
|
||||
};
|
||||
|
||||
configureFlags = [ "--with-couchbase" ];
|
||||
|
||||
@ -5,17 +5,16 @@
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "beartype";
|
||||
version = "0.10.1";
|
||||
version = "0.10.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-7yKOZpOLT0SH2LMGodGaCTi8TvJEthYjCfQjzMjO/HY=";
|
||||
hash = "sha256-Lo1AUxj+QR7N2Tdif58zGBMSp5Pr0jmz2nacRDnLS5g=";
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
|
||||
@ -15,14 +15,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "django-configurations";
|
||||
version = "2.3.1";
|
||||
version = "2.3.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "e2ca25530e184f0ee3b7f5ae69563461a93a8914493306ee0bf6d71e7d8ad1d0";
|
||||
sha256 = "bd1a77a60735839b7d105912cc3977735fa005ea06544c632fbd322d1e021677";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@ -7,12 +7,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "matrix_common";
|
||||
version = "1.0.0";
|
||||
version = "1.1.0";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-ZmiKRoJ8hv1USuJBDzV2U1uIFt2lRxmT+iAOqOShJK4=";
|
||||
sha256 = "sha256-qCOHSK/Cs3B5gYNn/tUVbzVXcbB8j/ChdZNPR+D/MnY=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ attrs ];
|
||||
|
||||
@ -11,14 +11,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "shodan";
|
||||
version = "1.26.1";
|
||||
version = "1.27.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-8oJ7QNaRiYjvn18W3LihM4OqrhooRYmPcBLqyJBru4c=";
|
||||
sha256 = "sha256-XkrnBuALYxZ6n/f34PM0QvxqxvC08mKci9Mswwf41VA=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -7,6 +7,7 @@
|
||||
, hiro
|
||||
, poetry-core
|
||||
, pytestCheckHook
|
||||
, pythonAtLeast
|
||||
, pythonOlder
|
||||
, redis
|
||||
, starlette
|
||||
@ -16,6 +17,7 @@ buildPythonPackage rec {
|
||||
pname = "slowapi";
|
||||
version = "0.1.5";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
@ -42,13 +44,23 @@ buildPythonPackage rec {
|
||||
starlette
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace 'limits = "^1.5"' 'limits = "*"' \
|
||||
--replace 'redis = "^3.4.1"' 'redis = "*"'
|
||||
'';
|
||||
|
||||
disabledTests = [
|
||||
# E AssertionError: Regex pattern 'parameter `request` must be an instance of starlette.requests.Request' does not match 'This portal is not running'.
|
||||
# AssertionError: Regex pattern 'parameter `request` must be an instance of starlette.requests.Request' does not match 'This portal is not running'.
|
||||
"test_endpoint_request_param_invalid"
|
||||
"test_endpoint_response_param_invalid"
|
||||
] ++ lib.optionals (pythonAtLeast "3.10") [
|
||||
"test_multiple_decorators"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "slowapi" ];
|
||||
pythonImportsCheck = [
|
||||
"slowapi"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python library for API rate limiting";
|
||||
|
||||
@ -81,7 +81,7 @@ let
|
||||
(rebar3WithPlugins { globalPlugins = [rebar3-nix]; })
|
||||
]
|
||||
}
|
||||
latest=$(list-git-tags https://github.com/${owner}/${pname}.git | sed -n '/[\d\.]\+/p' | sort -V | tail -1)
|
||||
latest=$(list-git-tags --url=https://github.com/${owner}/${pname}.git | sed -n '/[\d\.]\+/p' | sort -V | tail -1)
|
||||
if [ "$latest" != "${version}" ]; then
|
||||
nixpkgs="$(git rev-parse --show-toplevel)"
|
||||
nix_path="$nixpkgs/pkgs/development/tools/build-managers/rebar3"
|
||||
|
||||
@ -1,15 +1,15 @@
|
||||
{ stdenv, coreutils, lib, installShellFiles, zlib, autoPatchelfHook, fetchurl }:
|
||||
|
||||
let
|
||||
version = "0.1.1";
|
||||
version = "0.1.2";
|
||||
assets = {
|
||||
x86_64-darwin = {
|
||||
asset = "scala-cli-x86_64-apple-darwin.gz";
|
||||
sha256 = "sha256-wULC0/n0ZFdBXOjxVe/VYsdsGBorNd51HczCK20Pmwc=";
|
||||
sha256 = "10453af2kz10k9vmcgdwpk10z36cnblnj6l09wkqngxwx9vxbf9q";
|
||||
};
|
||||
x86_64-linux = {
|
||||
asset = "scala-cli-x86_64-pc-linux.gz";
|
||||
sha256 = "sha256-tXcg+FOm+Ig61/Jw9ibEp0sHeXI9tpt+ya3Z/yS7MCk=";
|
||||
sha256 = "0720c4s717hcssp4b3x295rhgac4ifjr95zn45bm1n70jr3xqzyj";
|
||||
};
|
||||
};
|
||||
in
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "picotool";
|
||||
version = "1.0.1";
|
||||
version = "1.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "raspberrypi";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1k5j742sj91akdrgnd3wa5csqb638dgaz0c09zsr22fcqz0qhzig";
|
||||
sha256 = "sha256-YjDHoRcDoezyli42bJ0bnfjdNNY8l6ZilrxhOudqvwE=";
|
||||
};
|
||||
|
||||
buildInputs = [ libusb1 pico-sdk ];
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "sqlx-cli";
|
||||
version = "0.5.10";
|
||||
version = "0.5.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "launchbadge";
|
||||
repo = "sqlx";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-OBIuURj0C/ws71KTGN9EbMwN4QsGMEdgoWyctmHaHjQ=";
|
||||
sha256 = "sha256-Tz7YzGkQUwH0U14dvsttP2GpnM9kign6L9PkAVs3dEc=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-9+I4mi7w1WK2NkmN65EtC52KtSZR9GjrHCPE9w82IXw=";
|
||||
cargoSha256 = "sha256-EKuRaVxwotgTPj95GJnrQGbulsFPClSettwS5f0TzoM=";
|
||||
|
||||
doCheck = false;
|
||||
cargoBuildFlags = [ "-p sqlx-cli" ];
|
||||
|
||||
@ -3,14 +3,14 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "blackshades";
|
||||
version = "2.4.7";
|
||||
version = "2.4.9";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~cnx";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
fetchSubmodules = true;
|
||||
sha256 = "sha256-hvJwWUUmGeb7MQgKe79cPS2ckPZ9z0Yc5S9IiwuXPD8=";
|
||||
sha256 = "sha256-Hg+VcWI28GzY/CPm1lUftP0RGztOnzizrKJQVTmeJ9I=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ zig ];
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, lib, fetchurl, fetchpatch, makeWrapper, autoreconfHook
|
||||
{ stdenv, lib, fetchFromGitLab, fetchpatch, makeWrapper, autoreconfHook
|
||||
, pkg-config, which
|
||||
, flex, bison
|
||||
, linuxHeaders ? stdenv.cc.libc.linuxHeaders
|
||||
@ -21,7 +21,7 @@
|
||||
}:
|
||||
|
||||
let
|
||||
apparmor-version = "3.0.3";
|
||||
apparmor-version = "3.0.4";
|
||||
|
||||
apparmor-meta = component: with lib; {
|
||||
homepage = "https://apparmor.net/";
|
||||
@ -31,9 +31,11 @@ let
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
|
||||
apparmor-sources = fetchurl {
|
||||
url = "https://launchpad.net/apparmor/${lib.versions.majorMinor apparmor-version}/${apparmor-version}/+download/apparmor-${apparmor-version}.tar.gz";
|
||||
sha256 = "0nasq8pdmzkrf856yg1v8z5hcs0nn6gw2qr60ab0a7j9ixfv0g8m";
|
||||
apparmor-sources = fetchFromGitLab {
|
||||
owner = "apparmor";
|
||||
repo = "apparmor";
|
||||
rev = "v${apparmor-version}";
|
||||
sha256 = "1a217j28rgfq4lsmpn0wv1xgmdr9ba8iysv9i6q477kj6z77zrb9";
|
||||
};
|
||||
|
||||
aa-teardown = writeShellScript "aa-teardown" ''
|
||||
@ -48,8 +50,9 @@ let
|
||||
substituteInPlace ./common/Make.rules \
|
||||
--replace "/usr/bin/pod2man" "${buildPackages.perl}/bin/pod2man" \
|
||||
--replace "/usr/bin/pod2html" "${buildPackages.perl}/bin/pod2html" \
|
||||
--replace "/usr/include/linux/capability.h" "${linuxHeaders}/include/linux/capability.h" \
|
||||
--replace "/usr/share/man" "share/man"
|
||||
substituteInPlace ./utils/Makefile \
|
||||
--replace "/usr/include/linux/capability.h" "${linuxHeaders}/include/linux/capability.h"
|
||||
'';
|
||||
|
||||
patches = lib.optionals stdenv.hostPlatform.isMusl [
|
||||
@ -60,6 +63,8 @@ let
|
||||
})
|
||||
];
|
||||
|
||||
python = python3.withPackages (ps: with ps; [ setuptools ]);
|
||||
|
||||
# Set to `true` after the next FIXME gets fixed or this gets some
|
||||
# common derivation infra. Too much copy-paste to fix one by one.
|
||||
doCheck = false;
|
||||
@ -86,19 +91,16 @@ let
|
||||
ncurses
|
||||
which
|
||||
perl
|
||||
] ++ lib.optional withPython python3;
|
||||
] ++ lib.optional withPython python;
|
||||
|
||||
buildInputs = lib.optional withPerl perl
|
||||
++ lib.optional withPython python3;
|
||||
++ lib.optional withPython python;
|
||||
|
||||
# required to build apparmor-parser
|
||||
dontDisableStatic = true;
|
||||
|
||||
prePatch = prePatchCommon + ''
|
||||
substituteInPlace ./libraries/libapparmor/swig/perl/Makefile.am --replace install_vendor install_site
|
||||
substituteInPlace ./libraries/libapparmor/swig/perl/Makefile.in --replace install_vendor install_site
|
||||
substituteInPlace ./libraries/libapparmor/src/Makefile.am --replace "/usr/include/netinet/in.h" "${lib.getDev stdenv.cc.libc}/include/netinet/in.h"
|
||||
substituteInPlace ./libraries/libapparmor/src/Makefile.in --replace "/usr/include/netinet/in.h" "${lib.getDev stdenv.cc.libc}/include/netinet/in.h"
|
||||
'';
|
||||
inherit patches;
|
||||
|
||||
@ -132,12 +134,12 @@ let
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [ makeWrapper which python3 ];
|
||||
nativeBuildInputs = [ makeWrapper which python ];
|
||||
|
||||
buildInputs = [
|
||||
bash
|
||||
perl
|
||||
python3
|
||||
python
|
||||
libapparmor
|
||||
libapparmor.python
|
||||
];
|
||||
@ -159,7 +161,7 @@ let
|
||||
postInstall = ''
|
||||
sed -i $out/bin/aa-unconfined -e "/my_env\['PATH'\]/d"
|
||||
for prog in aa-audit aa-autodep aa-cleanprof aa-complain aa-disable aa-enforce aa-genprof aa-logprof aa-mergeprof aa-unconfined ; do
|
||||
wrapProgram $out/bin/$prog --prefix PYTHONPATH : "$out/lib/${python3.libPrefix}/site-packages:$PYTHONPATH"
|
||||
wrapProgram $out/bin/$prog --prefix PYTHONPATH : "$out/lib/${python.libPrefix}/site-packages:$PYTHONPATH"
|
||||
done
|
||||
|
||||
substituteInPlace $out/bin/aa-notify \
|
||||
|
||||
39
pkgs/os-specific/linux/dddvb/default.nix
Normal file
39
pkgs/os-specific/linux/dddvb/default.nix
Normal file
@ -0,0 +1,39 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, kernel
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dddvb";
|
||||
version = "0.9.33-404-ge9ccab3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "DigitalDevices";
|
||||
repo = "dddvb";
|
||||
rev = "e9ccab3578965234c0ea38c5b30969f33600561d";
|
||||
sha256 = "sha256-gOG+dAeQ++kTC5xaEpsr3emz3s6FXiKeCHmA9shYBJk=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
sed -i '/depmod/d' Makefile
|
||||
'';
|
||||
|
||||
nativeBuildInputs = kernel.moduleBuildDependencies;
|
||||
|
||||
makeFlags = [
|
||||
"KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
|
||||
];
|
||||
|
||||
INSTALL_MOD_PATH = placeholder "out";
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/DigitalDevices/dddvb";
|
||||
description = "ddbridge linux driver";
|
||||
license = licenses.gpl2Only;
|
||||
maintainers = with maintainers; [ hexa ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
@ -2,51 +2,51 @@
|
||||
"4.14": {
|
||||
"patch": {
|
||||
"extra": "-hardened1",
|
||||
"name": "linux-hardened-4.14.264-hardened1.patch",
|
||||
"sha256": "1zlsww0mqaw5cswwqjvc9magh2a31v6ii7a4ivdra6nsv1xrdimy",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.264-hardened1/linux-hardened-4.14.264-hardened1.patch"
|
||||
"name": "linux-hardened-4.14.267-hardened1.patch",
|
||||
"sha256": "0fd3x22j8i3w3knilh8v6sadw3pvl03vfzg9dpi2mgy6kxxxb3qv",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.267-hardened1/linux-hardened-4.14.267-hardened1.patch"
|
||||
},
|
||||
"sha256": "1d1588f0zrq93dk9j8gmvfm9mlniyw98s0i3gmg2sa7h1p04pc2m",
|
||||
"version": "4.14.264"
|
||||
"sha256": "13hq4hcq686gdragjcgmz3m0kkk8abz5lna0ildaa9gybj43yd4c",
|
||||
"version": "4.14.267"
|
||||
},
|
||||
"4.19": {
|
||||
"patch": {
|
||||
"extra": "-hardened1",
|
||||
"name": "linux-hardened-4.19.227-hardened1.patch",
|
||||
"sha256": "127l8s1wb71iyb4iw1bxkxn48qcchz50qwjpx9r2vm81cihasxs7",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.227-hardened1/linux-hardened-4.19.227-hardened1.patch"
|
||||
"name": "linux-hardened-4.19.230-hardened1.patch",
|
||||
"sha256": "1yf65n69rlhl0cdgaaj45ylsjf8x4xrbvj0wfxfwd2kxwbjxp9jr",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.230-hardened1/linux-hardened-4.19.230-hardened1.patch"
|
||||
},
|
||||
"sha256": "0d1jyyxdrpyi35033fjg8g6zz99ffry2ks1wlldfaxfa6wh9dp39",
|
||||
"version": "4.19.227"
|
||||
"sha256": "107sqv4izdnazscwhyam88vbinsvnd33z8agn4awc42hkqh9l20p",
|
||||
"version": "4.19.230"
|
||||
},
|
||||
"5.10": {
|
||||
"patch": {
|
||||
"extra": "-hardened1",
|
||||
"name": "linux-hardened-5.10.98-hardened1.patch",
|
||||
"sha256": "13cjr3k2vyxmwk5gjrkwklzvl38p1d4qrzfqm7nqssvh52kqzkq1",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.98-hardened1/linux-hardened-5.10.98-hardened1.patch"
|
||||
"name": "linux-hardened-5.10.101-hardened1.patch",
|
||||
"sha256": "1nhxkzkhqff97lhc0piczn8v02hyva5gm004l79v31xklxhpc9r0",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.101-hardened1/linux-hardened-5.10.101-hardened1.patch"
|
||||
},
|
||||
"sha256": "0hwl1ypllx9l5pv04yavz627qb31ki9mhznsak5bq48hbz0wc90v",
|
||||
"version": "5.10.98"
|
||||
"sha256": "13hwpb85dynbayghxs3ln3hbyh8djgl5fj63vxwc8izfny62aj87",
|
||||
"version": "5.10.101"
|
||||
},
|
||||
"5.15": {
|
||||
"patch": {
|
||||
"extra": "-hardened1",
|
||||
"name": "linux-hardened-5.15.21-hardened1.patch",
|
||||
"sha256": "1j01mlyr53wry8n7bzg6pi4nilj3i9jpq5aml6f25fjckz5apll7",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.21-hardened1/linux-hardened-5.15.21-hardened1.patch"
|
||||
"name": "linux-hardened-5.15.24-hardened1.patch",
|
||||
"sha256": "1lz4p2rvp1q9c4s6czqvwlhb2gkcix8vmg9gcyd4vpzjmd0dhws4",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.24-hardened1/linux-hardened-5.15.24-hardened1.patch"
|
||||
},
|
||||
"sha256": "1lgvf3mrsbwjdjfvznbf5c3np76a7xxqr2rw7i6196ywsxnfnki9",
|
||||
"version": "5.15.21"
|
||||
"sha256": "0zx9big7n8gh6y14c05llxsqh543q0czjdrq906m8cc7r01yp5pl",
|
||||
"version": "5.15.24"
|
||||
},
|
||||
"5.4": {
|
||||
"patch": {
|
||||
"extra": "-hardened1",
|
||||
"name": "linux-hardened-5.4.177-hardened1.patch",
|
||||
"sha256": "1xyfc1hsphjgaxr2b36y7r3mzm3vn8vd1av73cwr42flc0qn3g4j",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.177-hardened1/linux-hardened-5.4.177-hardened1.patch"
|
||||
"name": "linux-hardened-5.4.180-hardened1.patch",
|
||||
"sha256": "1cjxi6i8l5s2q54jiqpki4m25w9wp91yrbck86sxfr2ljhll0j1c",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.180-hardened1/linux-hardened-5.4.180-hardened1.patch"
|
||||
},
|
||||
"sha256": "0wvb5is8rqvfxia1i8lw4yd3fm2bhb6wdl0bdjq90dx7y46wpxqq",
|
||||
"version": "5.4.177"
|
||||
"sha256": "07ckmgcqpr39bzpp8v60b2vkb03p8931k7sl3ywg6f00lvcbaf8n",
|
||||
"version": "5.4.180"
|
||||
}
|
||||
}
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
, ... } @ args:
|
||||
|
||||
let
|
||||
version = "5.10.78-rt55"; # updated by ./update-rt.sh
|
||||
version = "5.10.100-rt62"; # 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/v5.x/linux-${kversion}.tar.xz";
|
||||
sha256 = "03q5lrv8gr9hnm7984pxi9kwsvxrn21qwykj60amisi2wac6r05y";
|
||||
sha256 = "16892wnfkdpqy3v4xmdzlqn5zlfrgz9wqh6vadnx58xnr6pnasfm";
|
||||
};
|
||||
|
||||
kernelPatches = let rt-patch = {
|
||||
name = "rt";
|
||||
patch = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
|
||||
sha256 = "1wcw682r238qi5jgn5zk9m6j2506p9ypfax13bzhjfyjzz3h98kp";
|
||||
sha256 = "1wimp4ckaqp5cfvkf50gv3s5biyr0sjifz4faw23m07ciydm15k0";
|
||||
};
|
||||
}; in [ rt-patch ] ++ kernelPatches;
|
||||
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user