Merge staging-next into staging

This commit is contained in:
github-actions[bot] 2023-05-07 18:01:53 +00:00 committed by GitHub
commit 048e91e57b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
44 changed files with 302 additions and 419 deletions

View file

@ -2406,6 +2406,12 @@
githubId = 51231053;
name = "Daniel";
};
cadkin = {
email = "cva@siliconslumber.net";
name = "Cameron Adkins";
github = "cadkin";
githubId = 34077838;
};
cafkafk = {
email = "christina@cafkafk.com";
matrix = "@cafkafk:matrix.cafkafk.com";

View file

@ -1189,6 +1189,7 @@
./services/web-apps/komga.nix
./services/web-apps/lemmy.nix
./services/web-apps/limesurvey.nix
./services/web-apps/mainsail.nix
./services/web-apps/mastodon.nix
./services/web-apps/matomo.nix
./services/web-apps/mattermost.nix

View file

@ -72,7 +72,7 @@ in {
example = {
authorization = {
trusted_clients = [ "10.0.0.0/24" ];
cors_domains = [ "https://app.fluidd.xyz" ];
cors_domains = [ "https://app.fluidd.xyz" "https://my.mainsail.xyz" ];
};
};
description = lib.mdDoc ''

View file

@ -0,0 +1,66 @@
{ config, lib, pkgs, ... }:
with lib;
let
cfg = config.services.mainsail;
moonraker = config.services.moonraker;
in
{
options.services.mainsail = {
enable = mkEnableOption (lib.mdDoc "a modern and responsive user interface for Klipper");
package = mkOption {
type = types.package;
description = lib.mdDoc "Mainsail package to be used in the module";
default = pkgs.mainsail;
defaultText = literalExpression "pkgs.mainsail";
};
hostName = mkOption {
type = types.str;
default = "localhost";
description = lib.mdDoc "Hostname to serve mainsail on";
};
nginx = mkOption {
type = types.submodule
(import ../web-servers/nginx/vhost-options.nix { inherit config lib; });
default = { };
example = literalExpression ''
{
serverAliases = [ "mainsail.''${config.networking.domain}" ];
}
'';
description = lib.mdDoc "Extra configuration for the nginx virtual host of mainsail.";
};
};
config = mkIf cfg.enable {
services.nginx = {
enable = true;
upstreams.mainsail-apiserver.servers."${moonraker.address}:${toString moonraker.port}" = { };
virtualHosts."${cfg.hostName}" = mkMerge [
cfg.nginx
{
root = mkForce "${cfg.package}/share/mainsail";
locations = {
"/" = {
index = "index.html";
tryFiles = "$uri $uri/ /index.html";
};
"/index.html".extraConfig = ''
add_header Cache-Control "no-store, no-cache, must-revalidate";
'';
"/websocket" = {
proxyWebsockets = true;
proxyPass = "http://mainsail-apiserver/websocket";
};
"~ ^/(printer|api|access|machine|server)/" = {
proxyWebsockets = true;
proxyPass = "http://mainsail-apiserver$request_uri";
};
};
}
];
};
};
}

View file

@ -50,7 +50,7 @@ let
passthru = {
inherit wrap wrapWithBuildEnv;
inherit wrap wrapWithBuildEnv faust2ApplBase;
};

View file

@ -0,0 +1,38 @@
{ faust
, baseName ? "faust2sc"
, supercollider
, makeWrapper
, python3
, stdenv
}@args:
let
faustDefaults = faust.faust2ApplBase
(args // {
baseName = "${baseName}.py";
});
in
stdenv.mkDerivation (faustDefaults // {
nativeBuildInputs = [ makeWrapper ];
propagatedBuildInputs = [ python3 faust supercollider ];
postInstall = ''
mv "$out/bin/${baseName}.py" "$out"/bin/${baseName}
'';
postFixup = ''
# export parts of the build environment
mkdir "$out"/include
# until pr #887 is merged and released in faust we need to link the header folders
ln -s "${supercollider}"/include/SuperCollider/plugin_interface "$out"/include/plugin_interface
ln -s "${supercollider}"/include/SuperCollider/common "$out"/include/common
ln -s "${supercollider}"/include/SuperCollider/server "$out"/include/server
wrapProgram "$out"/bin/${baseName} \
--append-flags "--import-dir ${faust}/share/faust" \
--append-flags "--architecture-dir ${faust}/share/faust" \
--append-flags "--architecture-dir ${faust}/include" \
--append-flags "-p $out" \
--prefix PATH : "$PATH"
'';
})

View file

@ -87,8 +87,8 @@ let
fundamental-source = fetchFromGitHub {
owner = "VCVRack";
repo = "Fundamental";
rev = "f80e1a0e78dc043a0ff0b777ef98a36b91063622"; # tip of branch v2
sha256 = "0hnwrr1xhf7dpkw1v63f633x5dlrvijgbah4aj5h5xr2jchip9nx";
rev = "v2.3.1"; # tip of branch v2
sha256 = "1rd5yvdr6k03mc3r2y7wxhmiqd69jfvqmpqagxb83y1mn0zfv0pr";
};
vcv-rtaudio = stdenv.mkDerivation rec {
pname = "vcv-rtaudio";
@ -115,7 +115,7 @@ let
in
stdenv.mkDerivation rec {
pname = "VCV-Rack";
version = "2.2.1";
version = "2.3.0";
desktopItems = [
(makeDesktopItem {
@ -135,7 +135,7 @@ stdenv.mkDerivation rec {
owner = "VCVRack";
repo = "Rack";
rev = "v${version}";
sha256 = "079alr6y0101k92v5lrnycljcbifh0hsvklbf4w5ax2zrxnyplq8";
sha256 = "1aj7pcvks1da5ydagyxsdksp31rf8dn0bixw55kn34k0g4ky5jiw";
};
patches = [

View file

@ -6,13 +6,13 @@
buildDotnetModule rec {
pname = "btcpayserver";
version = "1.7.12";
version = "1.9.2";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "sha256-NRmpKr0lqe2NUlpyzkdtn7nN0rFrZakryNR1WAOzx9Q=";
sha256 = "sha256-N/6/a9K8ROSJ+rsip85Av1jmggI12Clr61+9Dh56Lls=";
};
projectFile = "BTCPayServer/BTCPayServer.csproj";

View file

@ -8,15 +8,15 @@
(fetchNuGet { pname = "AWSSDK.S3"; version = "3.3.110.10"; sha256 = "1lf1hfbx792dpa1hxgn0a0jrrvldd16hgbxx229dk2qcz5qlnc38"; })
(fetchNuGet { pname = "BIP78.Sender"; version = "0.2.2"; sha256 = "12pm2s35c0qzc06099q2z1pxwq94rq85n74yz8fs8gwvm2ksgp4p"; })
(fetchNuGet { pname = "BTCPayServer.Hwi"; version = "2.0.2"; sha256 = "0lh3n1qncqs4kbrmx65xs271f0d9c7irrs9qnsa9q51cbbqbljh9"; })
(fetchNuGet { pname = "BTCPayServer.Lightning.All"; version = "1.4.20"; sha256 = "1vnzmczd4z25vbf987p4vp6sxc09fp6mvhrvq41iwj1ks5zcprlf"; })
(fetchNuGet { pname = "BTCPayServer.Lightning.All"; version = "1.4.23"; sha256 = "11nb7ba93g51n5f5aa6sd6s3f9x82g1vbi8rcj04x5anbh2g451n"; })
(fetchNuGet { pname = "BTCPayServer.Lightning.Charge"; version = "1.3.20"; sha256 = "0nk82hkgs67mxfxkgbav8yxxd79m0xyqaan7vay00gg33pjqdjvj"; })
(fetchNuGet { pname = "BTCPayServer.Lightning.CLightning"; version = "1.3.25"; sha256 = "0172czzzlgsljgmhb5wh8cb1cl12ac54qyzmd3w18wbkxmr205qk"; })
(fetchNuGet { pname = "BTCPayServer.Lightning.CLightning"; version = "1.3.26"; sha256 = "0sbcl1jdpjgjpa4cagcrppk124nkk2hxsvlj8nr6zf3fcdwllagj"; })
(fetchNuGet { pname = "BTCPayServer.Lightning.Common"; version = "1.3.16"; sha256 = "1g37736b4k0ncpyy2qycbk4l85fqvgwac3k98nbdj0dvhfghp1dn"; })
(fetchNuGet { pname = "BTCPayServer.Lightning.Common"; version = "1.3.21"; sha256 = "042xwfsxd30zgwiz0w14ynb755w5sldkplxgw1fkw68lrz66x5s4"; })
(fetchNuGet { pname = "BTCPayServer.Lightning.Eclair"; version = "1.3.20"; sha256 = "093w82mcxxxbvx66j0sp3lsfm2bkbi3igm80iz9zdghy85845kc9"; })
(fetchNuGet { pname = "BTCPayServer.Lightning.LNBank"; version = "1.3.24"; sha256 = "0dah7q90x29rqhngxd9226pfn1k4bbhhfgnkpjpw64529m29cdks"; })
(fetchNuGet { pname = "BTCPayServer.Lightning.LND"; version = "1.4.14"; sha256 = "1gzqz34lgk42kf86ldi3z0k4m9x91hlkqh6d7rq93nphl57mwqar"; })
(fetchNuGet { pname = "BTCPayServer.Lightning.LNDhub"; version = "1.0.18"; sha256 = "0vnnnm9c5w8ag3a25fzmsjax028ykb7xr4fp7saq4si3bmzkjswp"; })
(fetchNuGet { pname = "BTCPayServer.Lightning.LND"; version = "1.4.15"; sha256 = "18qnpdxbz359ygygllsrf95fbalsfyjrf6j9wi7c8qd39jwcignx"; })
(fetchNuGet { pname = "BTCPayServer.Lightning.LNDhub"; version = "1.0.19"; sha256 = "164c5nmsqzgz9v6fw0ml0d9m5hcp449468giakv3cihq25cd6giz"; })
(fetchNuGet { pname = "BTCPayServer.NETCore.Plugins"; version = "1.4.4"; sha256 = "0rk0prmb0539ji5fd33cqy3yvw51i5i8m5hb43admr5z8960dd6l"; })
(fetchNuGet { pname = "BTCPayServer.NETCore.Plugins.Mvc"; version = "1.4.4"; sha256 = "1kmmj5m7s41wc1akpqw1b1j7pp4c0vn6sqxb487980ibpj6hyisl"; })
(fetchNuGet { pname = "CsvHelper"; version = "15.0.5"; sha256 = "01y8bhsnxghn3flz0pr11vj6wjrpmia8rpdrsp7kjfc1zmhqlgma"; })
@ -38,7 +38,7 @@
(fetchNuGet { pname = "HtmlSanitizer"; version = "5.0.372"; sha256 = "1gllp58vdbql2ybwf05i2178x7p4g8zyyk64317d1pyss5217g7r"; })
(fetchNuGet { pname = "Humanizer.Core"; version = "2.8.26"; sha256 = "1v8xd12yms4qq1md4vh6faxicmqrvahqdd7sdkyzrphab9v44nsm"; })
(fetchNuGet { pname = "libsodium"; version = "1.0.18"; sha256 = "15qzl5k31yaaapqlijr336lh4lzz1qqxlimgxy8fdyig8jdmgszn"; })
(fetchNuGet { pname = "LNURL"; version = "0.0.28"; sha256 = "1fcrq5ib02scz6n4zvmnbvm2aahj6qwwq6wsfix90caqm2c2bq64"; })
(fetchNuGet { pname = "LNURL"; version = "0.0.29"; sha256 = "00d9n2lgn3paqm12c563rv8slxrbbxq6m58m098l30wsm96llj0r"; })
(fetchNuGet { pname = "MailKit"; version = "3.3.0"; sha256 = "18l0jkrc4d553kiw4vdjzzpafpvsgjs1n19kjbi8isnhzidmsl4j"; })
(fetchNuGet { pname = "Microsoft.AspNet.SignalR.Client"; version = "2.4.3"; sha256 = "1whxcmxydcxjkw84sqk5idd406v3ia0xj2m4ia4b6wqbvkdqn7rf"; })
(fetchNuGet { pname = "Microsoft.AspNet.WebApi.Client"; version = "5.2.9"; sha256 = "1sy1q36bm9fz3gi780w4jgysw3dwaz2f3a5gcn6jxw1gkmdasb08"; })

View file

@ -5,11 +5,11 @@
stdenvNoCC.mkDerivation rec {
pname = "mainsail";
version = "2.4.1";
version = "2.5.1";
src = fetchzip {
url = "https://github.com/mainsail-crew/mainsail/releases/download/v${version}/mainsail.zip";
sha256 = "sha256-WgTzRVycrZcJ5JVXJQHLvQGg8FLm4y020/eULAqDpmA=";
hash = "sha256-xdmi1Q2j2gG4ajh57mBsjH3qCBwpsZCQbh0INFKifg4=";
stripRoot = false;
};
@ -31,6 +31,6 @@ stdenvNoCC.mkDerivation rec {
changelog = "https://github.com/mainsail-crew/mainsail/releases/tag/v${version}";
license = licenses.gpl3Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ shhht ];
maintainers = with maintainers; [ shhht lovesegfault ];
};
}

View file

@ -13,11 +13,11 @@
stdenv.mkDerivation rec {
pname = "appflowy";
version = "0.1.3";
version = "0.1.4";
src = fetchzip {
url = "https://github.com/AppFlowy-IO/appflowy/releases/download/${version}/AppFlowy_x86_64-unknown-linux-gnu_ubuntu-20.04.tar.gz";
sha256 = "sha256-dZqnwROrw3ioCzUNvpklGOCr5cyjXU1Iqkp6xBdr3rA=";
sha256 = "sha256-hNk1sypMZYZA1s3rQyaOY5J829PWo2b9Q/VCDcfRKPM=";
stripRoot = false;
};

View file

@ -43,22 +43,22 @@ stdenv.mkDerivation rec {
export CFLAGS="-fPIC"
export MYSQLINC=$(mysql_config --include | sed -e 's/^-I//g')
export MYSQLLIBS=$(mysql_config --libs)
export DESTBINDIR=$NIX_BUILD_TOP/bin
export HOME=$NIX_BUILD_TOP
export HOME=$TMPDIR
export DESTBINDIR=$HOME/bin
mkdir -p $HOME/lib $HOME/bin/x86_64
cd ./src
chmod +x ./checkUmask.sh
./checkUmask.sh
mkdir -p $NIX_BUILD_TOP/lib
mkdir -p $NIX_BUILD_TOP/bin/x86_64
make libs
cd jkOwnLib
make
cp ../lib/x86_64/jkOwnLib.a $NIX_BUILD_TOP/lib
cp ../lib/x86_64/jkweb.a $NIX_BUILD_TOP/lib
cp ../lib/x86_64/jkOwnLib.a $HOME/lib
cp ../lib/x86_64/jkweb.a $HOME/lib
cp -r ../inc $HOME/
cd ../utils
make
@ -69,11 +69,11 @@ stdenv.mkDerivation rec {
installPhase = ''
runHook preInstall
mkdir -p $out/bin
mkdir -p $out/lib
cp $NIX_BUILD_TOP/lib/jkOwnLib.a $out/lib
cp $NIX_BUILD_TOP/lib/jkweb.a $out/lib
cp $NIX_BUILD_TOP/bin/x86_64/* $out/bin
mkdir -p $out/bin $out/lib $out/inc
cp $HOME/lib/jkOwnLib.a $out/lib
cp $HOME/lib/jkweb.a $out/lib
cp $HOME/bin/x86_64/* $out/bin
cp -r $HOME/inc/* $out/inc/
runHook postInstall
'';

View file

@ -20,11 +20,11 @@
stdenv.mkDerivation rec {
pname = "mate-session-manager";
version = "1.26.0";
version = "1.26.1";
src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "05hqi8wlwjr07mp5njhp7h06mgnv98zsxaxkmxc5w3iwb3va45ar";
sha256 = "W4x9ZEH9nCk8hjiCq2enSTxTzfZOqyfAlFdfQj69Qng=";
};
patches = [

View file

@ -6,11 +6,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "lightning";
version = "2.2.1";
version = "2.2.2";
src = fetchurl {
url = "mirror://gnu/lightning/${finalAttrs.pname}-${finalAttrs.version}.tar.gz";
hash = "sha256-mGcWgdVoR3DMsGoH+juPAypFS9tW6vwY5vqwRFnqPKo=";
hash = "sha256-CsqCQt6tF9YhF7z8sHjmqeqFbMgXQoE8noOUvM5zs+I=";
};
nativeCheckInputs = [ libopcodes ];

View file

@ -36,6 +36,7 @@ in
mapAliases {
"@antora/cli" = pkgs.antora; # Added 2023-05-06
"@githubnext/github-copilot-cli" = pkgs.github-copilot-cli; # Added 2023-05-02
"@google/clasp" = pkgs.google-clasp; # Added 2023-05-07
"@nestjs/cli" = pkgs.nest-cli; # Added 2023-05-06
manta = pkgs.node-manta; # Added 2023-05-06
trito = pkgs.triton; # Added 2023-05-06

View file

@ -20,7 +20,6 @@
"@commitlint/cli" = "commitlint";
"@forge/cli" = "forge";
"@gitbeaker/cli" = "gitbeaker";
"@google/clasp" = "clasp";
"@medable/mdctl-cli" = "mdctl";
"@mermaid-js/mermaid-cli" = "mmdc";
"@nerdwallet/shepherd" = "shepherd";

View file

@ -7,7 +7,6 @@
, "@commitlint/config-conventional"
, "@emacs-eask/cli"
, "@forge/cli"
, "@google/clasp"
, "@medable/mdctl-cli"
, "@microsoft/rush"
, "@nerdwallet/shepherd"

View file

@ -88155,339 +88155,6 @@ in
bypassCache = true;
reconstructLock = true;
};
"@google/clasp" = nodeEnv.buildNodePackage {
name = "_at_google_slash_clasp";
packageName = "@google/clasp";
version = "2.4.2";
src = fetchurl {
url = "https://registry.npmjs.org/@google/clasp/-/clasp-2.4.2.tgz";
sha512 = "SrHzWSotR8c7mNBVwH81sFCc4HhoDrCevicJehQlvrvgdTvLIiU0Pfb5EYCzWUPBSC4Ez/nvW6wxsgaK7RrPjQ==";
};
dependencies = [
sources."@babel/code-frame-7.21.4"
sources."@babel/helper-validator-identifier-7.19.1"
(sources."@babel/highlight-7.18.6" // {
dependencies = [
sources."ansi-styles-3.2.1"
sources."chalk-2.4.2"
sources."color-convert-1.9.3"
sources."color-name-1.1.3"
sources."has-flag-3.0.0"
sources."supports-color-5.5.0"
];
})
sources."@sindresorhus/is-4.6.0"
sources."@szmarczak/http-timer-4.0.6"
sources."@types/cacheable-request-6.0.3"
sources."@types/http-cache-semantics-4.0.1"
sources."@types/keyv-3.1.4"
sources."@types/minimatch-3.0.5"
sources."@types/node-18.16.3"
sources."@types/normalize-package-data-2.4.1"
sources."@types/responselike-1.0.0"
sources."abort-controller-3.0.0"
sources."agent-base-6.0.2"
sources."aggregate-error-3.1.0"
sources."ansi-escapes-4.3.2"
sources."ansi-regex-6.0.1"
sources."ansi-styles-4.3.0"
sources."anymatch-3.1.3"
sources."array-differ-3.0.0"
sources."array-find-index-1.0.2"
sources."array-union-2.1.0"
sources."arrify-2.0.1"
sources."balanced-match-1.0.2"
sources."base64-js-1.5.1"
sources."bignumber.js-9.1.1"
sources."binary-extensions-2.2.0"
sources."bl-4.1.0"
sources."brace-expansion-1.1.11"
sources."braces-3.0.2"
sources."buffer-5.7.1"
sources."buffer-equal-constant-time-1.0.1"
sources."cacheable-lookup-5.0.4"
sources."cacheable-request-7.0.2"
sources."call-bind-1.0.2"
sources."chalk-4.1.2"
sources."chardet-0.7.0"
sources."chokidar-3.5.3"
sources."clean-stack-2.2.0"
sources."cli-cursor-3.1.0"
sources."cli-spinners-2.9.0"
sources."cli-truncate-3.1.0"
sources."cli-width-3.0.0"
sources."clone-1.0.4"
sources."clone-response-1.0.3"
sources."color-convert-2.0.1"
sources."color-name-1.1.4"
sources."commander-8.3.0"
sources."concat-map-0.0.1"
sources."currently-unhandled-0.4.1"
sources."debounce-1.2.1"
sources."debug-4.3.4"
(sources."decompress-response-6.0.0" // {
dependencies = [
sources."mimic-response-3.1.0"
];
})
sources."defaults-1.0.4"
sources."defer-to-connect-2.0.1"
sources."define-lazy-prop-2.0.0"
sources."dotf-2.0.2"
sources."eastasianwidth-0.2.0"
sources."ecdsa-sig-formatter-1.0.11"
sources."emoji-regex-9.2.2"
sources."encoding-0.1.13"
sources."end-of-stream-1.4.4"
sources."error-ex-1.3.2"
sources."escape-string-regexp-1.0.5"
sources."event-target-shim-5.0.1"
sources."extend-3.0.2"
(sources."external-editor-3.1.0" // {
dependencies = [
sources."iconv-lite-0.4.24"
];
})
sources."fast-text-encoding-1.0.6"
sources."figures-3.2.0"
sources."fill-range-7.0.1"
sources."find-up-6.3.0"
sources."fs-extra-10.1.0"
sources."fsevents-2.3.2"
sources."function-bind-1.1.1"
sources."fuzzy-0.1.3"
sources."gaxios-4.3.3"
sources."gcp-metadata-4.3.1"
sources."get-intrinsic-1.2.0"
sources."get-stream-5.2.0"
sources."glob-parent-5.1.2"
sources."google-auth-library-7.14.1"
sources."google-p12-pem-3.1.4"
sources."googleapis-84.0.0"
sources."googleapis-common-5.1.0"
sources."got-11.8.6"
sources."graceful-fs-4.2.11"
sources."gtoken-5.3.2"
sources."has-1.0.3"
sources."has-flag-4.0.0"
sources."has-symbols-1.0.3"
sources."hosted-git-info-4.1.0"
sources."http-cache-semantics-4.1.1"
sources."http2-wrapper-1.0.3"
sources."https-proxy-agent-5.0.1"
sources."iconv-lite-0.6.3"
sources."ieee754-1.2.1"
sources."indent-string-4.0.0"
sources."inherits-2.0.4"
(sources."inquirer-8.2.5" // {
dependencies = [
sources."ansi-regex-5.0.1"
sources."emoji-regex-8.0.0"
sources."is-fullwidth-code-point-3.0.0"
sources."log-symbols-4.1.0"
sources."ora-5.4.1"
sources."string-width-4.2.3"
sources."strip-ansi-6.0.1"
];
})
(sources."inquirer-autocomplete-prompt-ipt-2.0.0" // {
dependencies = [
sources."ansi-styles-3.2.1"
sources."chalk-2.4.2"
sources."color-convert-1.9.3"
sources."color-name-1.1.3"
sources."has-flag-3.0.0"
sources."rxjs-6.6.7"
sources."supports-color-5.5.0"
sources."tslib-1.14.1"
];
})
sources."is-arrayish-0.2.1"
sources."is-binary-path-2.1.0"
sources."is-core-module-2.12.0"
sources."is-docker-2.2.1"
sources."is-extglob-2.1.1"
sources."is-fullwidth-code-point-4.0.0"
sources."is-glob-4.0.3"
sources."is-interactive-1.0.0"
sources."is-number-7.0.0"
sources."is-port-reachable-3.1.0"
sources."is-reachable-5.2.1"
sources."is-stream-2.0.1"
sources."is-unicode-supported-0.1.0"
sources."is-wsl-2.2.0"
sources."js-tokens-4.0.0"
sources."json-bigint-1.0.0"
sources."json-buffer-3.0.1"
sources."json-parse-even-better-errors-2.3.1"
sources."jsonfile-6.1.0"
sources."jwa-2.0.0"
sources."jws-4.0.0"
sources."keyv-4.5.2"
sources."lines-and-columns-1.2.4"
sources."locate-path-7.2.0"
sources."lodash-4.17.21"
(sources."log-symbols-5.1.0" // {
dependencies = [
sources."chalk-5.2.0"
sources."is-unicode-supported-1.3.0"
];
})
sources."loud-rejection-2.2.0"
sources."lowercase-keys-2.0.0"
sources."lru-cache-6.0.0"
sources."make-dir-3.1.0"
sources."mimic-fn-2.1.0"
sources."mimic-response-1.0.1"
sources."minimatch-3.1.2"
sources."ms-2.1.2"
sources."multimatch-5.0.0"
sources."mute-stream-0.0.8"
sources."node-fetch-2.6.9"
sources."node-forge-1.3.1"
sources."normalize-newline-4.1.0"
(sources."normalize-package-data-3.0.3" // {
dependencies = [
sources."semver-7.5.0"
];
})
sources."normalize-path-3.0.0"
sources."normalize-url-6.1.0"
sources."object-inspect-1.12.3"
sources."once-1.4.0"
sources."onetime-5.1.2"
sources."open-8.4.2"
(sources."ora-6.3.0" // {
dependencies = [
sources."chalk-5.2.0"
sources."cli-cursor-4.0.0"
sources."is-interactive-2.0.0"
sources."is-unicode-supported-1.3.0"
sources."restore-cursor-4.0.0"
];
})
sources."os-tmpdir-1.0.2"
sources."p-any-3.0.0"
sources."p-cancelable-2.1.1"
sources."p-finally-1.0.0"
sources."p-limit-4.0.0"
sources."p-locate-6.0.0"
(sources."p-map-5.5.0" // {
dependencies = [
sources."aggregate-error-4.0.1"
sources."clean-stack-4.2.0"
sources."escape-string-regexp-5.0.0"
sources."indent-string-5.0.0"
];
})
sources."p-some-5.0.0"
sources."p-timeout-3.2.0"
sources."parse-json-5.2.0"
sources."path-exists-5.0.0"
sources."picomatch-2.3.1"
sources."prepend-http-3.0.1"
sources."pump-3.0.0"
sources."qs-6.11.1"
sources."querystringify-2.2.0"
sources."quick-lru-5.1.1"
(sources."read-pkg-6.0.0" // {
dependencies = [
sources."type-fest-1.4.0"
];
})
(sources."read-pkg-up-8.0.0" // {
dependencies = [
sources."find-up-5.0.0"
sources."locate-path-6.0.0"
sources."p-limit-3.1.0"
sources."p-locate-5.0.0"
sources."path-exists-4.0.0"
sources."type-fest-1.4.0"
sources."yocto-queue-0.1.0"
];
})
sources."readable-stream-3.6.2"
sources."readdirp-3.6.0"
sources."recursive-readdir-2.2.3"
sources."replace-buffer-1.2.1"
sources."requires-port-1.0.0"
sources."resolve-alpn-1.2.1"
sources."responselike-2.0.1"
sources."restore-cursor-3.1.0"
sources."router-ips-1.0.0"
sources."run-async-2.4.1"
sources."rxjs-7.8.1"
sources."safe-buffer-5.2.1"
sources."safer-buffer-2.1.2"
sources."semver-6.3.0"
sources."server-destroy-1.0.1"
sources."side-channel-1.0.4"
sources."signal-exit-3.0.7"
(sources."slice-ansi-5.0.0" // {
dependencies = [
sources."ansi-styles-6.2.1"
];
})
sources."spdx-correct-3.2.0"
sources."spdx-exceptions-2.3.0"
sources."spdx-expression-parse-3.0.1"
sources."spdx-license-ids-3.0.13"
sources."split-lines-3.0.0"
(sources."stdin-discarder-0.1.0" // {
dependencies = [
sources."bl-5.1.0"
sources."buffer-6.0.3"
];
})
sources."string-width-5.1.2"
sources."string_decoder-1.3.0"
sources."strip-ansi-7.0.1"
sources."strip-bom-5.0.0"
sources."supports-color-7.2.0"
sources."through-2.3.8"
sources."tmp-0.0.33"
sources."to-regex-range-5.0.1"
sources."tr46-0.0.3"
(sources."ts2gas-4.2.0" // {
dependencies = [
sources."type-fest-2.19.0"
];
})
sources."tslib-2.5.0"
sources."type-fest-0.21.3"
sources."typescript-4.9.5"
sources."universalify-2.0.0"
sources."url-parse-1.5.10"
sources."url-template-2.0.8"
sources."util-deprecate-1.0.2"
sources."uuid-8.3.2"
sources."validate-npm-package-license-3.0.4"
sources."wcwidth-1.0.1"
sources."webidl-conversions-3.0.1"
sources."whatwg-url-5.0.0"
(sources."wrap-ansi-7.0.0" // {
dependencies = [
sources."ansi-regex-5.0.1"
sources."emoji-regex-8.0.0"
sources."is-fullwidth-code-point-3.0.0"
sources."string-width-4.2.3"
sources."strip-ansi-6.0.1"
];
})
sources."wrappy-1.0.2"
sources."yallist-4.0.0"
sources."yocto-queue-1.0.0"
];
buildInputs = globalBuildInputs;
meta = {
description = "Develop Apps Script Projects locally";
homepage = "https://github.com/google/clasp#readme";
license = "Apache-2.0";
};
production = true;
bypassCache = true;
reconstructLock = true;
};
"@medable/mdctl-cli" = nodeEnv.buildNodePackage {
name = "_at_medable_slash_mdctl-cli";
packageName = "@medable/mdctl-cli";

View file

@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "aionotion";
version = "2023.05.0";
version = "2023.05.1";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "bachya";
repo = pname;
rev = version;
hash = "sha256-wnyM8ERHJydhBdX9ZAskGdvIrvZNhYh/UVJv/JdxChE=";
hash = "sha256-gCHJBgPWe5aSzTvvETjfn3zoEuuCJV1s4lMQLP72a/8=";
};
nativeBuildInputs = [

View file

@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "aiowebostv";
version = "0.3.2";
version = "0.3.3";
format = "setuptools";
disabled = pythonOlder "3.8";
@ -16,7 +16,7 @@ buildPythonPackage rec {
owner = "home-assistant-libs";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-SNrznJY/HKUhDsClpC4j6Z/qE9qOsrdfc7Fu0W8ru/c=";
hash = "sha256-djcfYpHkhXhjQwJzHP3mNflKrcP6Yj3/z62qeXg67ss=";
};
propagatedBuildInputs = [

View file

@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "azure-mgmt-netapp";
version = "9.0.1";
version = "10.0.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-PYRMOWaJUXrRgqW3+pLBY+L6HvU1WlPvaatFe4O7RY8=";
hash = "sha256-9+cXsY8Qr5ds9lYw39duWdcqm6QUTedQbjn8x6zJoyE=";
extension = "zip";
};

View file

@ -17,14 +17,14 @@
buildPythonPackage rec {
pname = "django-auth-ldap";
version = "4.2.0";
version = "4.3.0";
format = "pyproject";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
hash = "sha256-qsceZbCovc/FzQi3CZfuPNw3eG/9XZdbfiz6R1ldQn8=";
hash = "sha256-eItbHucAVGgdf659CF3qp28vpvZMyf49152u9iwvYSE=";
};
nativeBuildInputs = [

View file

@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "emoji";
version = "2.3.0";
version = "2.4.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -16,7 +16,7 @@ buildPythonPackage rec {
owner = "carpedm20";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-Zo5mH+AAi75vbjsV0UmEOrXKw1IUwspjWStJa+PI/as=";
hash = "sha256-tbNatosXt+KV1K3bvdz8lY73Yx/ClJcxUWHiPetp5wM=";
};
nativeCheckInputs = [

View file

@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "enaml";
version = "0.16.0";
version = "0.16.1";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -25,7 +25,7 @@ buildPythonPackage rec {
owner = "nucleic";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-0W5FWGS4vu5+O6/C4El60QDsRNj+P4xGQ62NdkfJd5I=";
hash = "sha256-bXbexHd/SJjfAAREhQ8V4PekI9mle3GcUPjMn0zDAyw=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;

View file

@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "glymur";
version = "0.12.4";
version = "0.12.5";
format = "pyproject";
disabled = pythonOlder "3.6";
@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "quintusdias";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-H7aA1nHd8JI3+4dzZhu+GOv/0Y2KRdDkn6Fvc76ny/A=";
hash = "sha256-9NMSAt5yFRnlCUDP37/ozhDsS8FTdRkfjUz8kQwWzVc=";
};
nativeBuildInputs = [

View file

@ -16,14 +16,14 @@
buildPythonPackage rec {
pname = "google-cloud-pubsub";
version = "2.16.0";
version = "2.16.1";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-WH2n1TXKhYzu7XA2IFNV5abdPkTqSryW9OUNGr/YhDs=";
hash = "sha256-MeJxvnVe1xQ64M3+0FBvr0DXUEtG+lyLW6tLki9sPTs=";
};
propagatedBuildInputs = [

View file

@ -22,7 +22,7 @@
buildPythonPackage rec {
pname = "gql";
version = "3.4.0";
version = "3.4.1";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -31,7 +31,7 @@ buildPythonPackage rec {
owner = "graphql-python";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-yr8IyAwZ6y2MPTe6bHRW+CIp19R3ZJWHuqdN5qultnQ=";
hash = "sha256-/uPaRju2AJCjMCfA29IKQ4Hu71RBu/Yz8jHwk9EE1Eg=";
};
postPatch = ''

View file

@ -6,7 +6,7 @@
buildPythonPackage rec {
pname = "panacotta";
version = "0.1";
version = "0.2";
format = "setuptools";
disabled = pythonOlder "3.8";
@ -15,7 +15,7 @@ buildPythonPackage rec {
owner = "u1f35c";
repo = "python-panacotta";
rev = "panacotta-${version}";
sha256 = "0v2fa18n50iy18n22klkgjral728iplj6yk3b6hjkzas5dk9wd9c";
hash = "sha256-0Ygmj9iRWKvjAuy6j6HjGhl9qJJylfvT5+Uwj44jLgE=";
};
# Project has no tests

View file

@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "pulsectl";
version = "22.3.2";
version = "23.5.1";
src = fetchPypi {
inherit pname version;
hash = "sha256-zBdOHO69TmIixbePT0FfEugHU8mrdas1QVm0y1lQsIQ=";
hash = "sha256-jvwmDtchLuT55QqLhWyEkRJl9OrELMbALHs3yFGig0s=";
};
patches = [
@ -30,7 +30,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Python high-level interface and ctypes-based bindings for PulseAudio (libpulse)";
homepage = "https://pypi.python.org/pypi/pulsectl/";
homepage = "https://github.com/mk-fg/python-pulse-control";
license = licenses.mit;
maintainers = with maintainers; [ hexa ];
};

View file

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "pulumi-aws";
# Version is independant of pulumi's.
version = "5.30.0";
version = "5.40.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "pulumi";
repo = "pulumi-aws";
rev = "refs/tags/v${version}";
hash = "sha256-XRn5kMbbbbk5+X8vah44cAHv2MMySK0ToO8ga5FWSuA=";
hash = "sha256-DMSBQhBxbVfU7ULkLI8KV7JJLBsaVb/Z9BZZG2GEOzQ=";
};
sourceRoot = "${src.name}/sdk/python";

View file

@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "pytest-playwright";
version = "0.3.0";
version = "0.3.3";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "microsoft";
repo = "playwright-pytest";
rev = "refs/tags/v${version}";
hash = "sha256-fHzQxbQBSEkCFu/ualjzSmIt3SiEa2ktTvIJKPZLT9Q=";
hash = "sha256-2xdRW8Q10x6mtNs/EdAsgrOtVmvLAOdbIGXfyeB8ZAg=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;

View file

@ -0,0 +1,56 @@
{
lib
, stdenv
, fetchFromGitHub
, llvmPackages
, cmake
, makeWrapper
}:
stdenv.mkDerivation rec {
pname = "clazy";
version = "1.11";
src = fetchFromGitHub {
owner = "KDE";
repo = "clazy";
rev = "v${version}";
sha256 = "sha256-kcl4dUg84fNdizKUS4kpvIKFfajtTRdz+MYUbKcMFvg=";
};
buildInputs = [
llvmPackages.llvm
llvmPackages.libclang
];
nativeBuildInputs = [
cmake
makeWrapper
];
postInstall = ''
wrapProgram $out/bin/clazy \
--suffix PATH : "${llvmPackages.clang}/bin/" \
--suffix CPATH : "$(<${llvmPackages.clang}/nix-support/libc-cflags)" \
--suffix CPATH : "${llvmPackages.clang}/resource-root/include" \
--suffix CPLUS_INCLUDE_PATH : "$(<${llvmPackages.clang}/nix-support/libcxx-cxxflags)" \
--suffix CPLUS_INCLUDE_PATH : "$(<${llvmPackages.clang}/nix-support/libc-cflags)" \
--suffix CPLUS_INCLUDE_PATH : "${llvmPackages.clang}/resource-root/include"
wrapProgram $out/bin/clazy-standalone \
--suffix CPATH : "$(<${llvmPackages.clang}/nix-support/libc-cflags)" \
--suffix CPATH : "${llvmPackages.clang}/resource-root/include" \
--suffix CPLUS_INCLUDE_PATH : "$(<${llvmPackages.clang}/nix-support/libcxx-cxxflags)" \
--suffix CPLUS_INCLUDE_PATH : "$(<${llvmPackages.clang}/nix-support/libc-cflags)" \
--suffix CPLUS_INCLUDE_PATH : "${llvmPackages.clang}/resource-root/include"
'';
meta = {
description = "Qt-oriented static code analyzer based on the Clang framework";
homepage = "https://github.com/KDE/clazy";
license = lib.licenses.lgpl2Plus;
maintainers = [ lib.maintainers.cadkin ];
platforms = lib.platforms.linux;
};
}

View file

@ -0,0 +1,29 @@
{ lib
, buildNpmPackage
, fetchFromGitHub
}:
buildNpmPackage rec {
pname = "clasp";
version = "2.4.2";
src = fetchFromGitHub {
owner = "google";
repo = "clasp";
rev = "refs/tags/v${version}";
hash = "sha256-Cnnqbxjfx7hlRYIDtbjSbDO0QBHqLsleIGrAUQDLaCw=";
};
npmDepsHash = "sha256-4oYpGBpk4WBVnE1HNYmRRGHZgcPgta2YQB00YyWvbiI=";
# `npm run build` tries installing clasp globally
npmBuildScript = [ "compile" ];
meta = with lib; {
description = "Develop Apps Script Projects locally";
homepage = "https://github.com/google/clasp#readme";
changelog = "https://github.com/google/clasp/releases/tag/v${version}";
license = licenses.asl20;
maintainers = with maintainers; [ natsukium ];
};
}

View file

@ -3,10 +3,13 @@
, stdenv
, fetchFromGitHub
, makeWrapper
, nodejs
, nodejs_18
, pkgs
}:
let
nodejs = nodejs_18;
in
stdenv.mkDerivation rec {
pname = "haste-server";
version = "b52b394bad909ddf151073987671e843540d91d6";

View file

@ -9,16 +9,16 @@
rustPlatform.buildRustPackage rec {
pname = "router";
version = "1.15.1";
version = "1.18.0";
src = fetchFromGitHub {
owner = "apollographql";
repo = pname;
rev = "v${version}";
sha256 = "sha256-xekMw0StdCSI3tls0D2I5rqRV8fVtecGSEzlB3ao6zY=";
sha256 = "sha256-PJEXsICqoc/9UHlQbXwQgf7IlZCWW0I87mThevnIMZQ=";
};
cargoSha256 = "sha256-F9MomJQShJUE9QIJJmdFxSs/FVctig17ZclndFl1SUY=";
cargoSha256 = "sha256-0/KA5i1DRvXT5DVzhrEtyxpNFd637IXHQgo36a+08FA=";
nativeBuildInputs = [
pkg-config

View file

@ -46,7 +46,8 @@
installPhase = ''
mkdir -p $out
cp ./.config $out/config
cp -r out/* $out
cp out/klipper.bin $out/ || true
cp out/klipper.elf $out/ || true
'';
dontFixup = true;

View file

@ -15,16 +15,16 @@ let
in
buildGoModule rec {
pname = "minio";
version = "2023-04-20T17-56-55Z";
version = "2023-04-28T18-11-17Z";
src = fetchFromGitHub {
owner = "minio";
repo = "minio";
rev = "RELEASE.${version}";
sha256 = "sha256-PMGQwqHXIadPRGPtY1++KNCh1HaeNwUP6pSW0Hf+Nj8=";
sha256 = "sha256-aNJ0HbFMl5Ihm5zmxS/1AMxxE3FobraBn4Kahl0bqpA=";
};
vendorHash = "sha256-D/LeNIsYTN1P6pSQZ0AICAhqY63nmhodb9xJXr6cJX4=";
vendorHash = "sha256-6O6fuScGu7OBNC/iJAzV7AXGz0pAodEiqXhRpRTY9e0=";
doCheck = false;

View file

@ -3,14 +3,14 @@
}:
stdenv.mkDerivation rec {
version = "2.0.72";
version = "2.0.73";
pname = "munin";
src = fetchFromGitHub {
owner = "munin-monitoring";
repo = "munin";
rev = version;
sha256 = "sha256-w2/S7MnL/LFYzNFtC2YbBjJRhVA5kLvwd3IWVHC+o9Q=";
sha256 = "sha256-KyPId549mTm/DrtityM4NHDlZt081UKwfRWS/eWQbXw=";
};
nativeBuildInputs = [

View file

@ -7,16 +7,16 @@
buildGoModule rec {
pname = "gh-dash";
version = "3.7.8";
version = "3.7.9";
src = fetchFromGitHub {
owner = "dlvhdr";
repo = "gh-dash";
rev = "v${version}";
hash = "sha256-nt/HJGWdDMolJJzuOpKZ7USgzmq7gJIeHGTzSnkXdzw=";
hash = "sha256-loAtRXns7plBeVOM+d/euyRS86MG+NRhGB4WpHT7KlM=";
};
vendorHash = "sha256-F/T4VU9FhztGEl7bpbAr8CIA4LInen5q/Y3ycBIHJV0=";
vendorHash = "sha256-0ySTcQDM7Dole6ojnhr7vwUWOM4p6kFN69VqMP0jAY0=";
ldflags = [
"-s"

View file

@ -1,14 +1,14 @@
{ lib, stdenv, fetchFromGitHub, makeWrapper, parallel, sqlite, bc, file }:
stdenv.mkDerivation rec {
version = "2.44";
version = "2.45";
pname = "profile-cleaner";
src = fetchFromGitHub {
owner = "graysky2";
repo = "profile-cleaner";
rev = "v${version}";
sha256 = "sha256-OkrZb8skglczJEjwJSZINELeStdsILQO4GfZ1uLSnQY=";
sha256 = "sha256-10e1S+li7SXKJX2lETSdx84GavWqQYQqyLoBIVToTBI=";
};
nativeBuildInputs = [ makeWrapper ];

View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "minio-client";
version = "2023-04-12T02-21-51Z";
version = "2023-05-04T18-10-16Z";
src = fetchFromGitHub {
owner = "minio";
repo = "mc";
rev = "RELEASE.${version}";
sha256 = "sha256-jNgReeR4KNzB1LKbiAOLWiYeJJ61qgf3J9nMy97FVGU=";
sha256 = "sha256-xh88GOdaeLEZZhCZrms+IovanjgkfQrieHYcofdfZHM=";
};
vendorHash = "sha256-d8cC/exdM7OMGE24bN00BVE3jqE1tj6727JiON/aJkc=";

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "hcxtools";
version = "6.2.9";
version = "6.3.0";
src = fetchFromGitHub {
owner = "ZerBea";
repo = pname;
rev = version;
sha256 = "sha256-oDAyK3/+X7fmaRoK4AUbczQJk+sHrNTeTfHcMoDFTjQ=";
sha256 = "sha256-p1G+Kxh0OfTRDTSBl2NxhRrQYsehGuCxmGU87CBjyW0=";
};
nativeBuildInputs = [ pkg-config ];

View file

@ -1,14 +1,14 @@
{ lib, buildGoModule, fetchFromGitHub }:
{ lib, buildGoModule, fetchFromGitHub, nix-update-script }:
buildGoModule rec {
pname = "passphrase2pgp";
version = "1.2.1";
version = "1.3.0";
src = fetchFromGitHub {
owner = "skeeto";
repo = pname;
rev = "v${version}";
hash = "sha256-Ik/W3gGvrOyUvYgMYqT8FIFoxp62BXd2GpV14pYXEuY=";
hash = "sha256-it1XYzLiteL0oq4SZp5E3s6oSkFKi3ZY0Lt+P0gmNag=";
};
vendorSha256 = "sha256-2H9YRVCaari47ppSkcQYg/P4Dzb4k5PLjKAtfp39NR8=";
@ -18,6 +18,16 @@ buildGoModule rec {
cp README.md $out/share/doc/$name
'';
checkPhase = ''
output=$(echo NONE | ../go/bin/passphrase2pgp -a -u NONE -i /dev/stdin | sha256sum)
if [[ "$output" != "23f59f4346f35e2feca6ef703ea64973524dec365ea672f23e7afe79be1049dd -" ]] ; then
echo "passphrase2pgp introduced backward-incompatible change"
exit 1
fi
'';
passthru.updateScript = nix-update-script { };
meta = with lib; {
description = "Predictable, passphrase-based PGP key generator";
homepage = "https://github.com/skeeto/passphrase2pgp";

View file

@ -8019,7 +8019,7 @@ with pkgs;
google-fonts = callPackage ../data/fonts/google-fonts { };
google-clasp = nodePackages."@google/clasp";
google-clasp = callPackage ../development/tools/google-clasp { };
google-compute-engine = with python38.pkgs; toPythonApplication google-compute-engine;
@ -14622,6 +14622,11 @@ with pkgs;
inherit (llvmPackages_latest) clang;
};
clazy = callPackage ../development/tools/analysis/clazy {
llvmPackages = llvmPackages_latest;
stdenv = llvmPackages_latest.stdenv;
};
#Use this instead of stdenv to build with clang
clangStdenv = if stdenv.cc.isClang then stdenv else lowPrio llvmPackages.stdenv;
clang-sierraHack-stdenv = overrideCC stdenv buildPackages.clang-sierraHack;
@ -38605,6 +38610,8 @@ with pkgs;
faust2csound = callPackage ../applications/audio/faust/faust2csound.nix { };
faust2sc = callPackage ../applications/audio/faust/faust2sc.nix { };
faust2firefox = callPackage ../applications/audio/faust/faust2firefox.nix { };
faust2jack = callPackage ../applications/audio/faust/faust2jack.nix { };