Merge remote-tracking branch 'origin/master' into staging-next

Conflicts:
	pkgs/development/python-modules/opensimplex/default.nix
	pkgs/development/python-modules/pygame-gui/default.nix
	pkgs/top-level/aliases.nix
	pkgs/top-level/python-aliases.nix
This commit is contained in:
Jonathan Ringer 2022-02-08 21:19:24 -08:00
commit 5df08e00cd
No known key found for this signature in database
GPG Key ID: 5C841D3CFDFEC4E0
195 changed files with 3423 additions and 1719 deletions

View File

@ -13842,4 +13842,10 @@
github = "AmeerTaweel";
githubId = 20538273;
};
nigelgbanks = {
name = "Nigel Banks";
email = "nigel.g.banks@gmail.com";
github = "nigelgbanks";
githubId = 487373;
};
}

View File

@ -240,6 +240,19 @@
<literal>haskellPackages.callPackage</literal>).
</para>
</listitem>
<listitem>
<para>
<literal>pkgs.ghc.withPackages</literal> as well as
<literal>haskellPackages.ghcWithPackages</literal> etc. now
needs be overridden directly, as opposed to overriding the
result of calling it. Additionally, the
<literal>withLLVM</literal> parameter has been renamed to
<literal>useLLVM</literal>. So instead of
<literal>(ghc.withPackages (p: [])).override { withLLVM = true; }</literal>,
one needs to use
<literal>(ghc.withPackages.override { useLLVM = true; }) (p: [])</literal>.
</para>
</listitem>
<listitem>
<para>
<literal>pkgs.emacsPackages.orgPackages</literal> is removed
@ -317,6 +330,15 @@
<literal>writers.writePyPy2</literal> needs to be used.
</para>
</listitem>
<listitem>
<para>
<literal>buildGoModule</literal> was updated to use
<literal>go_1_17</literal>, third party derivations that
specify &gt;= go 1.17 in the main <literal>go.mod</literal>
will need to regenerate their <literal>vendorSha256</literal>
hash.
</para>
</listitem>
<listitem>
<para>
The <literal>gnome-passwordsafe</literal> package updated to

View File

@ -81,6 +81,12 @@ In addition to numerous new and upgraded packages, this release has the followin
instead to ensure cross compilation keeps working (or switch to
`haskellPackages.callPackage`).
- `pkgs.ghc.withPackages` as well as `haskellPackages.ghcWithPackages` etc.
now needs be overridden directly, as opposed to overriding the result of
calling it. Additionally, the `withLLVM` parameter has been renamed to
`useLLVM`. So instead of `(ghc.withPackages (p: [])).override { withLLVM = true; }`,
one needs to use `(ghc.withPackages.override { useLLVM = true; }) (p: [])`.
- `pkgs.emacsPackages.orgPackages` is removed because org elpa is deprecated.
The packages in the top level of `pkgs.emacsPackages`, such as org and
org-contrib, refer to the ones in `pkgs.emacsPackages.elpaPackages` and
@ -105,6 +111,8 @@ In addition to numerous new and upgraded packages, this release has the followin
- The `writers.writePython2` and corresponding `writers.writePython2Bin` convenience functions to create executable Python 2 scripts in the store were removed in preparation of removal of the Python 2 interpreter.
Scripts have to be converted to Python 3 for use with `writers.writePython3` or `writers.writePyPy2` needs to be used.
- `buildGoModule` was updated to use `go_1_17`, third party derivations that specify >= go 1.17 in the main `go.mod` will need to regenerate their `vendorSha256` hash.
- The `gnome-passwordsafe` package updated to [version 6.x](https://gitlab.gnome.org/World/secrets/-/tags/6.0) and renamed to `gnome-secrets`.
- If you previously used `/etc/docker/daemon.json`, you need to incorporate the changes into the new option `virtualisation.docker.daemon.settings`.

View File

@ -1075,7 +1075,6 @@
./services/web-servers/phpfpm/default.nix
./services/web-servers/pomerium.nix
./services/web-servers/unit/default.nix
./services/web-servers/shellinabox.nix
./services/web-servers/tomcat.nix
./services/web-servers/traefik.nix
./services/web-servers/trafficserver/default.nix

View File

@ -21,11 +21,24 @@ my $res = $dbh->selectall_arrayref(
"select package from Programs where system = ? and name = ?",
{ Slice => {} }, $system, $program);
if (!defined $res || scalar @$res == 0) {
my $len = !defined $res ? 0 : scalar @$res;
if ($len == 0) {
print STDERR "$program: command not found\n";
} elsif (scalar @$res == 1) {
} elsif ($len == 1) {
my $package = @$res[0]->{package};
if ($ENV{"NIX_AUTO_RUN"} // "") {
if ($ENV{"NIX_AUTO_RUN_INTERACTIVE"} // "") {
while (1) {
print STDERR "'$program' from package '$package' will be run, confirm? [yn]: ";
chomp(my $comfirm = <STDIN>);
if (lc $comfirm eq "n") {
exit 0;
} elsif (lc $comfirm eq "y") {
last;
}
}
}
exec("nix-shell", "-p", $package, "--run", shell_quote("exec", @ARGV));
} else {
print STDERR <<EOF;
@ -35,11 +48,30 @@ ephemeral shell by typing:
EOF
}
} else {
print STDERR <<EOF;
if ($ENV{"NIX_AUTO_RUN"} // "") {
print STDERR "Select a package that provides '$program':\n";
for my $i (0 .. $len - 1) {
print STDERR " [", $i + 1, "]: @$res[$i]->{package}\n";
}
my $choice = 0;
while (1) { # exec will break this loop
no warnings "numeric";
print STDERR "Your choice [1-${len}]: ";
# 0 can be invalid user input like non-number string
# so we start from 1
$choice = <STDIN> + 0;
if (1 <= $choice && $choice <= $len) {
exec("nix-shell", "-p", @$res[$choice - 1]->{package},
"--run", shell_quote("exec", @ARGV));
}
}
} else {
print STDERR <<EOF;
The program '$program' is not in your PATH. It is provided by several packages.
You can make it available in an ephemeral shell by typing one of the following:
EOF
print STDERR " nix-shell -p $_->{package}\n" foreach @$res;
print STDERR " nix-shell -p $_->{package}\n" foreach @$res;
}
}
exit 127;

View File

@ -88,6 +88,8 @@ with lib;
The racoon module has been removed, because the software project was abandoned upstream.
'')
(mkRemovedOptionModule [ "services" "shellinabox" ] "The corresponding package was removed from nixpkgs.")
# Do NOT add any option renames here, see top of the file
];
}

View File

@ -317,7 +317,8 @@ in
(isYes "NET")
];
boot.extraModprobeConfig = "options firmware_class path=${config.hardware.firmware}/lib/firmware";
# We don't place this into `extraModprobeConfig` so that stage-1 ramdisk doesn't bloat.
environment.etc."modprobe.d/firmware.conf".text = "options firmware_class path=${config.hardware.firmware}/lib/firmware";
system.activationScripts.udevd =
''

View File

@ -43,6 +43,7 @@ in {
ExecStart = "${pkgs.autorandr}/bin/autorandr --batch --change --default ${cfg.defaultTarget}";
Type = "oneshot";
RemainAfterExit = false;
KillMode = "process";
};
};

View File

@ -13,7 +13,7 @@ let
(iniFmt.generate "PackageKit.conf" (recursiveUpdate
{
Daemon = {
DefaultBackend = "test_nop";
DefaultBackend = "nix";
KeepCache = false;
};
}
@ -35,7 +35,7 @@ let
in
{
imports = [
(mkRemovedOptionModule [ "services" "packagekit" "backend" ] "The only backend that doesn't blow up is `test_nop`.")
(mkRemovedOptionModule [ "services" "packagekit" "backend" ] "Always set to Nix.")
];
options.services.packagekit = {
@ -62,6 +62,8 @@ in
services.dbus.packages = with pkgs; [ packagekit ];
environment.systemPackages = with pkgs; [ packagekit ];
systemd.packages = with pkgs; [ packagekit ];
environment.etc = listToAttrs (map

View File

@ -326,7 +326,7 @@ in
type = types.package;
default = pkgs.iptables;
defaultText = literalExpression "pkgs.iptables";
example = literalExpression "pkgs.iptables-nftables-compat";
example = literalExpression "pkgs.iptables-legacy";
description =
''
The iptables package to use for running the firewall service."

View File

@ -143,7 +143,7 @@ in
"sshd.service" "sshd-keygen.service" ];
after = [ "network-online.target" "cloud-init-local.service" ];
before = [ "sshd.service" "sshd-keygen.service" ];
requires = [ "network.target "];
requires = [ "network.target"];
path = path;
serviceConfig =
{ Type = "oneshot";

View File

@ -1,122 +0,0 @@
{ config, lib, pkgs, ... }:
with lib;
let
cfg = config.services.shellinabox;
# If a certificate file is specified, shellinaboxd requires
# a file descriptor to retrieve it
fd = "3";
createFd = optionalString (cfg.certFile != null) "${fd}<${cfg.certFile}";
# Command line arguments for the shellinabox daemon
args = [ "--background" ]
++ optional (! cfg.enableSSL) "--disable-ssl"
++ optional (cfg.certFile != null) "--cert-fd=${fd}"
++ optional (cfg.certDirectory != null) "--cert=${cfg.certDirectory}"
++ cfg.extraOptions;
# Command to start shellinaboxd
cmd = "${pkgs.shellinabox}/bin/shellinaboxd ${concatStringsSep " " args}";
# Command to start shellinaboxd if certFile is specified
wrappedCmd = "${pkgs.bash}/bin/bash -c 'exec ${createFd} && ${cmd}'";
in
{
###### interface
options = {
services.shellinabox = {
enable = mkEnableOption "shellinabox daemon";
user = mkOption {
type = types.str;
default = "root";
description = ''
User to run shellinaboxd as. If started as root, the server drops
privileges by changing to nobody, unless overridden by the
<literal>--user</literal> option.
'';
};
enableSSL = mkOption {
type = types.bool;
default = false;
description = ''
Whether or not to enable SSL (https) support.
'';
};
certDirectory = mkOption {
type = types.nullOr types.path;
default = null;
example = "/var/certs";
description = ''
The daemon will look in this directory far any certificates.
If the browser negotiated a Server Name Identification the daemon
will look for a matching certificate-SERVERNAME.pem file. If no SNI
handshake takes place, it will fall back on using the certificate in the
certificate.pem file.
If no suitable certificate is installed, shellinaboxd will attempt to
create a new self-signed certificate. This will only succeed if, after
dropping privileges, shellinaboxd has write permissions for this
directory.
'';
};
certFile = mkOption {
type = types.nullOr types.path;
default = null;
example = "/var/certificate.pem";
description = "Path to server SSL certificate.";
};
extraOptions = mkOption {
type = types.listOf types.str;
default = [ ];
example = [ "--port=443" "--service /:LOGIN" ];
description = ''
A list of strings to be appended to the command line arguments
for shellinaboxd. Please see the manual page
<link xlink:href="https://code.google.com/p/shellinabox/wiki/shellinaboxd_man"/>
for a full list of available arguments.
'';
};
};
};
###### implementation
config = mkIf cfg.enable {
assertions =
[ { assertion = cfg.enableSSL == true
-> cfg.certDirectory != null || cfg.certFile != null;
message = "SSL is enabled for shellinabox, but no certDirectory or certFile has been specefied."; }
{ assertion = ! (cfg.certDirectory != null && cfg.certFile != null);
message = "Cannot set both certDirectory and certFile for shellinabox."; }
];
systemd.services.shellinaboxd = {
description = "Shellinabox Web Server Daemon";
wantedBy = [ "multi-user.target" ];
requires = [ "sshd.service" ];
after = [ "sshd.service" ];
serviceConfig = {
Type = "forking";
User = "${cfg.user}";
ExecStart = "${if cfg.certFile == null then "${cmd}" else "${wrappedCmd}"}";
ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
};
};
};
}

View File

@ -350,6 +350,9 @@ let
'';
symlink = "/etc/modprobe.d/ubuntu.conf";
}
{ object = config.environment.etc."modprobe.d/nixos.conf".source;
symlink = "/etc/modprobe.d/nixos.conf";
}
{ object = pkgs.kmod-debian-aliases;
symlink = "/etc/modprobe.d/debian.conf";
}

View File

@ -4,14 +4,15 @@
, fetchFromGitHub
, calf
, fftwFloat
, fmt
, glib
, glibmm
, gtk4
, gtkmm4
, itstool
, libadwaita
, libbs2b
, libebur128
, libsamplerate
, libsigcxx30
, libsndfile
, lilv
, lsp-plugins
@ -26,6 +27,7 @@
, rnnoise
, rubberband
, speexdsp
, tbb
, wrapGAppsHook4
, zam-plugins
, zita-convolver
@ -33,13 +35,13 @@
stdenv.mkDerivation rec {
pname = "easyeffects";
version = "6.1.3";
version = "6.2.3";
src = fetchFromGitHub {
owner = "wwmm";
repo = "easyeffects";
rev = "v${version}";
sha256 = "sha256-1UfeqPJxY4YT98UdqTZtG+QUBOZlKfK+7WbszhO22A0=";
sha256 = "sha256-A1UanrAbmZFGCmDNIr1h+v5RVMsIl4qgM/veBirudQM=";
};
nativeBuildInputs = [
@ -54,13 +56,14 @@ stdenv.mkDerivation rec {
buildInputs = [
fftwFloat
fmt
glib
glibmm
gtk4
gtkmm4
libadwaita
libbs2b
libebur128
libsamplerate
libsigcxx30
libsndfile
lilv
lv2
@ -69,14 +72,13 @@ stdenv.mkDerivation rec {
rnnoise
rubberband
speexdsp
tbb
zita-convolver
];
postPatch = ''
chmod +x meson_post_install.py
patchShebangs meson_post_install.py
# https://github.com/wwmm/easyeffects/pull/1205
substituteInPlace meson_post_install.py --replace "gtk-update-icon-cache" "gtk4-update-icon-cache"
'';
preFixup =

View File

@ -0,0 +1,64 @@
{ lib
, mkDerivation
, fetchFromGitHub
, pipewire
, glibmm
, qmake
, makeDesktopItem
, pkg-config
, libarchive
, fetchpatch
}:
mkDerivation rec{
pname = "jamesdsp";
version = "2.3";
src = fetchFromGitHub rec{
owner = "Audio4Linux";
repo = "JDSP4Linux";
fetchSubmodules = true;
rev = version;
hash = "sha256-Hkzurr+s+vvSyOMCYH9kHI+nIm6mL9yORGNzY2FXslc=";
};
patches = [
# fixing /usr install assumption, remove on version bump
(fetchpatch {
url = "https://github.com/Audio4Linux/JDSP4Linux/commit/003c9e9fc426f83e269aed6e05be3ed55273931a.patch";
hash = "sha256-crll/a7C9pUq9eL5diq8/YgC5bNC6SrdijZEBxZpJ8E=";
})
];
nativeBuildInputs = [ qmake pkg-config ];
buildInputs = [
glibmm
libarchive
pipewire
];
desktopItems = [
(makeDesktopItem {
name = "jamesdsp.desktop";
desktopName = "JamesDSP";
genericName = "Audio effects processor";
exec = "jamesdsp";
icon = "jamesdsp";
comment = "JamesDSP for Linux";
categories = "AudioVideo;Audio";
startupNotify = false;
terminal = false;
type = "Application";
extraDesktopEntries = {
Keywords = "equalizer;audio;effect";
};
})
];
meta = with lib;{
description = "An audio effect processor for PipeWire clients";
homepage = "https://github.com/Audio4Linux/JDSP4Linux";
license = licenses.gpl3Only;
maintainers = with maintainers;[ pasqui23 ];
platforms = platforms.linux;
};
}

View File

@ -0,0 +1,29 @@
{ lib, stdenv, fetchurl, makeWrapper, jre }:
stdenv.mkDerivation rec {
pname = "besu";
version = "21.10.8";
src = fetchurl {
url = "https://hyperledger.jfrog.io/artifactory/${pname}-binaries/${pname}/${version}/${pname}-${version}.tar.gz";
sha256 = "sha256-0yXi42vDinB6nuv5IGj1AhYGqMa2Rku0tNWQCO+AFPw=";
};
nativeBuildInputs = [ makeWrapper ];
installPhase = ''
mkdir -p $out/bin
cp -r bin $out/
mkdir -p $out/lib
cp -r lib $out/
wrapProgram $out/bin/${pname} --set JAVA_HOME "${jre}"
'';
meta = with lib; {
description = "An enterprise-grade Java-based, Apache 2.0 licensed Ethereum client";
homepage = "https://www.hyperledger.org/projects/besu";
license = licenses.asl20;
platforms = platforms.all;
maintainers = with maintainers; [ mmahut ];
};
}

View File

@ -3,13 +3,13 @@
buildDotnetModule rec {
pname = "btcpayserver";
version = "1.4.3";
version = "1.4.4";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "sha256-CMa0+Djx07q77W/ezMhU+JP5EPXz4nfZ35TN8O6R/nc=";
sha256 = "sha256-PW5a1Bw21skpboWDtlZHGWtFwfImznD7nYI92RT7GGQ=";
};
projectFile = "BTCPayServer/BTCPayServer.csproj";

View File

@ -2,12 +2,12 @@
let
pname = "ledger-live-desktop";
version = "2.37.2";
version = "2.38.2";
name = "${pname}-${version}";
src = fetchurl {
url = "https://github.com/LedgerHQ/${pname}/releases/download/v${version}/${pname}-${version}-linux-x86_64.AppImage";
hash = "sha256-etbMd0qUAsd5B3QH+DBVI9QLROjZXkGr4sAUlO8cRek=";
hash = "sha256-k6Rbxpe5BpRmlE+WL7iiFUtRCs5KlrLH2c3iSucUhqo=";
};
appimageContents = appimageTools.extractType2 {

View File

@ -5,16 +5,16 @@
buildGoModule rec {
pname = "lightning-loop";
version = "0.16.0-beta";
version = "0.17.0-beta";
src = fetchFromGitHub {
owner = "lightninglabs";
repo = "loop";
rev = "v${version}";
sha256 = "0q4lk338mr30frilgnjr43gd55z7ryj2s260437b4pnp03hmbf10";
sha256 = "0hjawagn1dfgj67i52bvf3phvm9f9708z3jqs6cvyz0w7vp107py";
};
vendorSha256 = "14862603rrss14p537j9i7iwflaaprwrnslmqm9hpb7hj52bxqfv";
vendorSha256 = "1fpc73hwdn3baz5ykrykvqdr5861gj9p6liy8qll5525kdv560f6";
subPackages = [ "cmd/loop" "cmd/loopd" ];

View File

@ -9,8 +9,8 @@ let
inherit buildFHSUserEnv;
};
stableVersion = {
version = "2021.1.1.20"; # "Android Studio Bumblebee (2021.1.1)"
sha256Hash = "LwG5IDJBFpdlspDoTNpbi1togri2fvEOEDbkkiYvrJE=";
version = "2021.1.1.21"; # "Android Studio Bumblebee (2021.1.1 Patch 1)"
sha256Hash = "PeMJIILfaunTlpR4EV76qQlTlZDcWoKes61qe9W9oqQ=";
};
betaVersion = {
version = "2021.2.1.8"; # "Android Studio Chipmunk (2021.2.1) Beta 1"

View File

@ -82,10 +82,10 @@ with stdenv; lib.makeOverridable mkDerivation (rec {
libnotify
] ++ extraLdPath)}" \
${lib.concatStringsSep " " extraWrapperArgs} \
--set JDK_HOME "$jdk" \
--set-default JDK_HOME "$jdk" \
--set-default ANDROID_JAVA_HOME "$jdk" \
--set-default JAVA_HOME "$jdk" \
--set ${hiName}_JDK "$jdk" \
--set ANDROID_JAVA_HOME "$jdk" \
--set JAVA_HOME "$jdk" \
--set ${hiName}_VM_OPTIONS ${vmoptsFile}
ln -s "$item/share/applications" $out/share

View File

@ -5,16 +5,21 @@
, python3Packages
, nodePackages
, wkhtmltopdf
, callPackage
}:
with python3Packages;
let
werkzeug = python3Packages.callPackage ../../../development/python-modules/werkzeug/1.nix {};
in
buildPythonApplication rec {
pname = "odoo";
major = "15";
minor = "0";
patch = "20211029";
patch = "20220126";
version = "${major}.${minor}.${patch}";
@ -22,7 +27,7 @@ buildPythonApplication rec {
src = fetchurl {
url = "https://nightly.odoo.com/${major}.${minor}/nightly/src/odoo_${version}.tar.gz";
name = "${pname}-${version}";
sha256 = "sha256-/E+bLBbiz7fRyTwP+0AMpqbuRkOpE4B4P6kREIB4m1Q=";
hash = "sha256-mofV0mNCdyzJecp0XegZBR/5NzHjis9kbpsUA/KJbZg=";
};
nativeBuildInputs = [

View File

@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
dontFixup = true;
outputHashAlgo = "sha256";
outputHashMode = "recursive";
outputHash = "sha256-pfYNHue7tZKYgU16kypZEfr2bXuDoPc4KorIAVjSylo=";
outputHash = "sha256-fJs/XM8PZqm/CrhShtcy4R/4s8dCc1WdXIvYSCYZ4dw=";
};
nativeBuildInputs = [

View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "gpxsee";
version = "10.1";
version = "10.3";
src = fetchFromGitHub {
owner = "tumic0";
repo = "GPXSee";
rev = version;
sha256 = "sha256-tU37dKBxzz+sxe4R7xbscpD28if8QOm6xpZEOdhK8lE=";
sha256 = "sha256-rKUj2XeVI2KdyCinwqipINg9OO0IhCSFBjSeYBSMLcQ=";
};
patches = (substituteAll {

View File

@ -1,7 +1,7 @@
{ lib
, stdenv
, autoconf
, automake115x
, automake
, c-ares
, cryptopp
, curl
@ -25,22 +25,17 @@
stdenv.mkDerivation rec {
pname = "megacmd";
version = "1.4.0";
version = "1.5.0";
src = fetchFromGitHub {
owner = "meganz";
repo = "MEGAcmd";
rev = "${version}_Linux";
sha256 = "sha256-Q1SZSDTPGgBA/W/ZVYfTQsiP41RE1LJ+esQ3PK9EjIc=";
sha256 = "Y/FkbN9mTuBpcKCSQg0M+3/IPzJ58X4iZhX2kMVDv7A=";
fetchSubmodules = true;
};
nativeBuildInputs = [
autoconf
automake115x
libtool
pkg-config
];
nativeBuildInputs = [ autoconf automake libtool pkg-config ];
buildInputs = [
c-ares
@ -82,7 +77,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "MEGA Command Line Interactive and Scriptable Application";
homepage = "https://mega.nz/cmd";
homepage = "https://mega.io/cmd";
license = with licenses; [ bsd2 gpl3Only ];
platforms = [ "i686-linux" "x86_64-linux" ];
maintainers = with maintainers; [ lunik1 ];

View File

@ -14,13 +14,13 @@
stdenv.mkDerivation rec {
pname = "osmium-tool";
version = "1.13.2";
version = "1.14.0";
src = fetchFromGitHub {
owner = "osmcode";
repo = "osmium-tool";
rev = "v${version}";
sha256 = "sha256-dLYmY2bS+DycYBLZdLw8CsRIIE8EfDJEx6RZ/r9yMS8=";
sha256 = "sha256-xedunFzar44o+b/45isXWacDcC81wWkxgGwnpLPH/n0=";
};
nativeBuildInputs = [

View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "pdfsam-basic";
version = "4.2.10";
version = "4.2.12";
src = fetchurl {
url = "https://github.com/torakiki/pdfsam/releases/download/v${version}/pdfsam_${version}-1_amd64.deb";
sha256 = "sha256-YxUozMrsR65A7+xeerMaYxkGALobG1wLguWGZnoQYcU=";
sha256 = "sha256-B9V3dw5A52yPoNfROI3+wAql+Y0hY4T3sTm9uN70TQQ=";
};
unpackPhase = ''

View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "rofi-file-browser-extended";
version = "1.3.0";
version = "1.3.1";
src = fetchFromGitHub {
owner = "marvinkreis";
repo = pname;
rev = version;
sha256 = "sha256-TNAAImQaIJRgvD8kFf2oHNj4bQiq1NhD8KkCgW5dSK8=";
sha256 = "sha256-UEFv0skFzWhgFkmz1h8uV1ygW977zNq1Dw8VAawqUgw=";
fetchSubmodules = true;
};

View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "spicetify-cli";
version = "2.8.5";
version = "2.9.0";
src = fetchFromGitHub {
owner = "khanhas";
repo = pname;
rev = "v${version}";
sha256 = "sha256-cCIlKTHo+LyhIZkN6ncggBvZMwDBgXqDJVAfGWbUtj8=";
sha256 = "sha256-PHKmrLN/JVPqefcK1FQByPWvMzNxHG5htXzgZ1D+Eds=";
};
vendorSha256 = "sha256-g0RYIVIq4oMXdRZDBDnVYg7ombN5WEo/6O9hChQvOYs=";

View File

@ -20,7 +20,8 @@ let
inherit version;
src = subsurfaceSrc;
sourceRoot = "source/libdivecomputer";
prePatch = "cd libdivecomputer";
nativeBuildInputs = [ autoreconfHook ];

View File

@ -8,23 +8,15 @@
mkDerivation rec {
pname = "falkon";
version = "3.1.0";
version = "3.2.0";
src = fetchFromGitHub {
owner = "KDE";
repo = "falkon";
rev = "v${version}";
sha256 = "1w64slh9wpcfi4v7ds9wci1zvwh0dh787ndpi6hd4kmdgnswvsw7";
sha256 = "sha256-esi9YWd1PtQpDBhI1NtWEjZIoMoNUpAF+kQad67mLzE=";
};
patches = [
# fixes build with qt5 5.14
(fetchpatch {
url = "https://github.com/KDE/falkon/commit/bbde5c6955c43bc744ed2c4024598495de908f2a.diff";
sha256 = "0f7qcddvvdnij3di0acg7jwvwfwyd0xizlav4wccclbj8x7qp5ld";
})
];
preConfigure = ''
export NONBLOCK_JS_DIALOGS=true
export KDE_INTEGRATION=true

View File

@ -134,9 +134,6 @@ buildStdenv.mkDerivation ({
lib.optional (lib.versionAtLeast version "90" && lib.versionOlder version "95") ./no-buildconfig-ffx90.patch ++
lib.optional (lib.versionAtLeast version "96") ./no-buildconfig-ffx96.patch ++
# Fix wayland 1.20 compatibility (https://bugzilla.mozilla.org/show_bug.cgi?id=1745560:)
lib.optional (lib.versionOlder version "96") ./fix-build-with-wayland-1.20.patch ++
patches;
# Ignore trivial whitespace changes in patches, this fixes compatibility of
@ -178,6 +175,8 @@ buildStdenv.mkDerivation ({
rm -rf obj-x86_64-pc-linux-gnu
substituteInPlace toolkit/xre/glxtest.cpp \
--replace 'dlopen("libpci.so' 'dlopen("${pciutils}/lib/libpci.so'
patchShebangs mach
'';
nativeBuildInputs =

View File

@ -1,13 +0,0 @@
diff --git a/widget/gtk/mozwayland/mozwayland.c b/widget/gtk/mozwayland/mozwayland.c
index 7a448e6..7792581 100644
--- a/widget/gtk/mozwayland/mozwayland.c
+++ b/widget/gtk/mozwayland/mozwayland.c
@@ -200,3 +200,8 @@ MOZ_EXPORT int wl_list_empty(const struct wl_list* list) { return -1; }
MOZ_EXPORT void wl_list_insert_list(struct wl_list* list,
struct wl_list* other) {}
+
+MOZ_EXPORT struct wl_proxy *
+wl_proxy_marshal_flags(struct wl_proxy *proxy, uint32_t opcode,
+ const struct wl_interface *interface, uint32_t version,
+ uint32_t flags, ...) { return NULL; }

View File

@ -7,10 +7,10 @@ in
rec {
firefox = common rec {
pname = "firefox";
version = "96.0.3";
version = "97.0";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "3dd5fbc96e369d5f4fb3eca778c2bd3e2313d089f867de9fac3556810a797e9b5629ef1b8840fb2f22a18df7de95ea1993eee052f691d861a555cea544b05966";
sha512 = "a913695a42cb06ee9bda2a20e65cc573e40ca93e9f75b7ee0a43ebd1935b371e7e80d5fc8d5f126ad0712ab848635a8624bbeed43807e5c179537aa32c884186";
};
meta = {
@ -32,10 +32,10 @@ rec {
firefox-esr-91 = common rec {
pname = "firefox-esr";
version = "91.5.1esr";
version = "91.6.0esr";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "26239e7a94b79f1e24a6667d7cf1c398d75992e8850144affbc5d3f34f04b91f0c9b020cab662b2cd4927924839ff2ddd2f3605c537bb5494fd9ac0d951b14fa";
sha512 = "3dd1929f93cdd087a93fc3597f32d9005c986b59832954e01a8c2472b179c92ad611eaa73d3fc000a08b838a0b70da73ff5ba82d6009160655ba6894cf04520e";
};
meta = {

View File

@ -1,9 +1,9 @@
{ lib, buildGoModule, fetchFromGitHub, fetchzip, installShellFiles }:
let
version = "0.26.1";
sha256 = "10l02cw0ypci9vaman1nm9z36fshqwwf0gk16rvsc82d02lv4iq5";
manifestsSha256 = "0gffjmcxsf9c4f6g60nwq88snm6lar0qd53xp0csr4n5sy7zg6dm";
version = "0.26.2";
sha256 = "1p99bjqlwyibycpby9fnzfmfd826zaw7k7d4f4p4gjpd7dphlrp1";
manifestsSha256 = "1s1hx754xa63s7in7gcrr146nkyvadba6vmy1bagjcxibxc3qdqy";
manifests = fetchzip {
url =
@ -23,7 +23,7 @@ in buildGoModule rec {
inherit sha256;
};
vendorSha256 = "sha256-IJGp4QWZbTzPHeawyjJI0aN4LP5ZV2mb5pUusfQ4rfE=";
vendorSha256 = "sha256-9MMEqJiplg7kmMmbHnTBEQ+GF+dBL7bpzs5Q0IYcMXU=";
postUnpack = ''
cp -r ${manifests} source/cmd/flux/manifests

View File

@ -10,42 +10,42 @@ let
# Our generic constructor to build new providers.
#
# Is designed to combine with the terraform.withPlugins implementation.
mkProvider =
{ owner
, repo
, rev
, version
, sha256
, vendorSha256 ? throw "vendorSha256 missing: please use `buildGoModule`" /* added 2022/01 */
, deleteVendor ? false
, proxyVendor ? false
, # Looks like "registry.terraform.io/vancluever/acme"
provider-source-address
}@attrs:
buildGoModule {
pname = repo;
inherit vendorSha256 version deleteVendor proxyVendor;
subPackages = [ "." ];
doCheck = false;
# https://github.com/hashicorp/terraform-provider-scaffolding/blob/a8ac8375a7082befe55b71c8cbb048493dd220c2/.goreleaser.yml
# goreleaser (used for builds distributed via terraform registry) requires that CGO is disabled
CGO_ENABLED = 0;
ldflags = [ "-s" "-w" "-X main.version=${version}" "-X main.commit=${rev}" ];
src = fetchFromGitHub {
inherit owner repo rev sha256;
};
mkProvider = lib.makeOverridable
({ owner
, repo
, rev
, version
, sha256
, vendorSha256 ? throw "vendorSha256 missing: please use `buildGoModule`" /* added 2022/01 */
, deleteVendor ? false
, proxyVendor ? false
, # Looks like "registry.terraform.io/vancluever/acme"
provider-source-address
}@attrs:
buildGoModule {
pname = repo;
inherit vendorSha256 version deleteVendor proxyVendor;
subPackages = [ "." ];
doCheck = false;
# https://github.com/hashicorp/terraform-provider-scaffolding/blob/a8ac8375a7082befe55b71c8cbb048493dd220c2/.goreleaser.yml
# goreleaser (used for builds distributed via terraform registry) requires that CGO is disabled
CGO_ENABLED = 0;
ldflags = [ "-s" "-w" "-X main.version=${version}" "-X main.commit=${rev}" ];
src = fetchFromGitHub {
inherit owner repo rev sha256;
};
# Move the provider to libexec
postInstall = ''
dir=$out/libexec/terraform-providers/${provider-source-address}/${version}/''${GOOS}_''${GOARCH}
mkdir -p "$dir"
mv $out/bin/* "$dir/terraform-provider-$(basename ${provider-source-address})_${version}"
rmdir $out/bin
'';
# Move the provider to libexec
postInstall = ''
dir=$out/libexec/terraform-providers/${provider-source-address}/${version}/''${GOOS}_''${GOARCH}
mkdir -p "$dir"
mv $out/bin/* "$dir/terraform-provider-$(basename ${provider-source-address})_${version}"
rmdir $out/bin
'';
# Keep the attributes around for later consumption
passthru = attrs;
};
# Keep the attributes around for later consumption
passthru = attrs;
});
list = lib.importJSON ./providers.json;

View File

@ -86,7 +86,26 @@ let
withPlugins (x: newplugins x ++ actualPlugins);
full = withPlugins (p: lib.filter lib.isDerivation (lib.attrValues p));
# Ouch
# Expose wrappers around the override* functions of the terraform
# derivation.
#
# Note that this does not behave as anyone would expect if plugins
# are specified. The overrides are not on the user-visible wrapper
# derivation but instead on the function application that eventually
# generates the wrapper. This means:
#
# 1. When using overrideAttrs, only `passthru` attributes will
# become visible on the wrapper derivation. Other overrides that
# modify the derivation *may* still have an effect, but it can be
# difficult to follow.
#
# 2. Other overrides may work if they modify the terraform
# derivation, or they may have no effect, depending on what
# exactly is being changed.
#
# 3. Specifying overrides on the wrapper is unsupported.
#
# See nixpkgs#158620 for details.
overrideDerivation = f:
(pluggable (terraform.overrideDerivation f)).withPlugins plugins;
overrideAttrs = f:
@ -105,6 +124,12 @@ let
inherit (terraform) name meta;
nativeBuildInputs = [ makeWrapper ];
# Expose the passthru set with the override functions
# defined above, as well as any passthru values already
# set on `terraform` at this point (relevant in case a
# user overrides attributes).
passthru = terraform.passthru // passthru;
buildCommand = ''
# Create wrappers for terraform plugins because Terraform only
# walks inside of a tree of files.
@ -128,8 +153,6 @@ let
--set NIX_TERRAFORM_PLUGIN_DIR $out/libexec/terraform-providers \
--prefix PATH : "${lib.makeBinPath wrapperInputs}"
'';
inherit passthru;
});
in
withPlugins (_: [ ]);

View File

@ -9,11 +9,11 @@
stdenv.mkDerivation rec {
pname = "jitsi-meet-electron";
version = "2.8.11";
version = "2022.1.1";
src = fetchurl {
url = "https://github.com/jitsi/jitsi-meet-electron/releases/download/v${version}/jitsi-meet-x86_64.AppImage";
sha256 = "sha256-DznbSwA1UISw3EkIfM5hGgmIToeXsH1b1HB7UOgDTKU=";
sha256 = "0x3fdqgjnsd570b7nszfx3h8l5c8x2kg32ig85n2a2g481c7xi6l";
name = "${pname}-${version}.AppImage";
};

View File

@ -1,6 +1,6 @@
{
"version": "1.9.7-sc.1",
"srcHash": "0qrjjwcxa141phsgdz325rrkfmjqdmxc3h917cs9c9kf6cblkxaq",
"webYarnHash": "19c594pql2yz1z15phfdlkwcvrcbm8k058fcq7p0k6840dhif5fd",
"desktopYarnHash": "058ihkljb1swjzvgf8gqci5ghvwapmpcf2bsab3yr66lhps7fhci"
"version": "1.9.8-sc.1",
"srcHash": "1ki4ccsa2i0mv10ypxg6bx9njikipdqkc5bsq5h7bi86scjm4lni",
"webYarnHash": "1za6r0snrflh2605xw4m19p88chx19ip8jj592bqjdagildqm50l",
"desktopYarnHash": "176ih0nzzx2yds6kp3lzdsrlp0glb9nqw146z0s1az7pjp6nrf18"
}

View File

@ -12,6 +12,8 @@ nodePackages.n8n.override {
node-pre-gyp
];
passthru.updateScript = ./generate-dependencies.sh;
meta = with lib; {
description = "Free and open fair-code licensed node based Workflow Automation Tool";
maintainers = with maintainers; [ freezeboy k900 ];

View File

@ -10,6 +10,7 @@
# -> cpu-features
# -> node-gyp@3.8.0 -> python2
# -> cmake
cd "$(dirname $(readlink -f $0))"
node2nix \
--14 \

View File

@ -31,13 +31,13 @@ let
sha512 = "7CU6DmCHIZp5ZPiZ9r3J17lTKMmYsm/zGvNkjArQwPkrLlZ1TZ+EUYfGgh2X31OLMVAQCTJZW4cXHJi02EbJnA==";
};
};
"@azure/core-http-2.2.3" = {
"@azure/core-http-2.2.4" = {
name = "_at_azure_slash_core-http";
packageName = "@azure/core-http";
version = "2.2.3";
version = "2.2.4";
src = fetchurl {
url = "https://registry.npmjs.org/@azure/core-http/-/core-http-2.2.3.tgz";
sha512 = "xr8AeszxP418rI//W38NfJDDr0kbVAPZkURZnZ+Fle+lLWeURjDE5zNIuocA1wUPoKSP8iXc0ApW6nPtbLGswA==";
url = "https://registry.npmjs.org/@azure/core-http/-/core-http-2.2.4.tgz";
sha512 = "QmmJmexXKtPyc3/rsZR/YTLDvMatzbzAypJmLzvlfxgz/SkgnqV/D4f6F2LsK6tBj1qhyp8BoXiOebiej0zz3A==";
};
};
"@azure/core-lro-2.2.3" = {
@ -112,13 +112,13 @@ let
sha512 = "c8+Wz19xauW0bGkTCoqZH4dYfbtBniPiGiRQOn1ca6G5jsjr4azwaTk9gwjVY8r3vY2Taf95eivLzipfIfiS4A==";
};
};
"@babel/runtime-7.16.7" = {
"@babel/runtime-7.17.0" = {
name = "_at_babel_slash_runtime";
packageName = "@babel/runtime";
version = "7.16.7";
version = "7.17.0";
src = fetchurl {
url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.16.7.tgz";
sha512 = "9E9FJowqAsytyOY6LG+1KuueckRL+aQW+mKvXRXnuFGyRAyepJPmEo9vgMfXUA6O9u3IeEdv9MAkppFcaQwogQ==";
url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.17.0.tgz";
sha512 = "etcO/ohMNaNA2UBdaXBBSX/3aEzFMRrVfaPv8Ptc0k+cWpWW0QFiGZ2XnVqQZI1Cf734LbPGmqBKWESfW4x/dQ==";
};
};
"@dabh/diagnostics-2.0.2" = {
@ -130,13 +130,13 @@ let
sha512 = "+A1YivoVDNNVCdfozHSR8v/jyuuLTMXwjWuxPFlFlUapXoGc+Gj9mDlTDDfrwl7rXCl2tNZ0kE8sIBO6YOn96Q==";
};
};
"@fontsource/open-sans-4.5.2" = {
"@fontsource/open-sans-4.5.4" = {
name = "_at_fontsource_slash_open-sans";
packageName = "@fontsource/open-sans";
version = "4.5.2";
version = "4.5.4";
src = fetchurl {
url = "https://registry.npmjs.org/@fontsource/open-sans/-/open-sans-4.5.2.tgz";
sha512 = "aDQrW8s0KslG2aKb9nM5R6fiQR9iPomqWXf6iZCC30qv/UFlSY14SppodA3rE//+w37EqsJjyUq3BSEYzLdisg==";
url = "https://registry.npmjs.org/@fontsource/open-sans/-/open-sans-4.5.4.tgz";
sha512 = "iaEuU7l3VGA/bqWW9UsBD2bgFwCwDFwKlmOUft4Jps3pD3Zc9POMNYV0+mNyKbA4OIcIice32l+BMif8vY6pdg==";
};
};
"@icetee/ftp-0.3.15" = {
@ -220,6 +220,15 @@ let
sha512 = "cE3qfHWv8hGRCP31j7fIS7BfCflm/BNZ2HNqHexH+fDrdF2f1D5S8VmXWLC77ffv3oDvWyvE9AZeR0RfmHCCaA==";
};
};
"@oclif/config-1.18.3" = {
name = "_at_oclif_slash_config";
packageName = "@oclif/config";
version = "1.18.3";
src = fetchurl {
url = "https://registry.npmjs.org/@oclif/config/-/config-1.18.3.tgz";
sha512 = "sBpko86IrTscc39EvHUhL+c++81BVTsIZ3ETu/vG+cCdi0N6vb2DoahR67A9FI2CGnxRRHjnTfa3m6LulwNATA==";
};
};
"@oclif/errors-1.3.5" = {
name = "_at_oclif_slash_errors";
packageName = "@oclif/errors";
@ -256,13 +265,13 @@ let
sha512 = "tXb0NKgSgNxmf6baN6naK+CCwOueaFk93FG9u202U7mTBHUKsioOUlw1SG/iPi9aJM3WE4pHLXmty59pci0OEw==";
};
};
"@opentelemetry/api-1.0.4" = {
"@opentelemetry/api-1.1.0" = {
name = "_at_opentelemetry_slash_api";
packageName = "@opentelemetry/api";
version = "1.0.4";
version = "1.1.0";
src = fetchurl {
url = "https://registry.npmjs.org/@opentelemetry/api/-/api-1.0.4.tgz";
sha512 = "BuJuXRSJNQ3QoKA6GWWDyuLpOUck+9hAXNMCnrloc1aWVoy6Xq6t9PUV08aBZ4Lutqq2LEHM486bpZqoViScog==";
url = "https://registry.npmjs.org/@opentelemetry/api/-/api-1.1.0.tgz";
sha512 = "hf+3bwuBwtXsugA2ULBc95qxrOqP2pOekLz34BJhcAKawt94vfeNyUKpYc0lZQ/3sCP6LqRa7UAdHA7i5UODzQ==";
};
};
"@rudderstack/rudder-sdk-node-1.0.6" = {
@ -454,22 +463,22 @@ let
sha512 = "YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw==";
};
};
"@types/node-12.20.42" = {
"@types/node-12.20.43" = {
name = "_at_types_slash_node";
packageName = "@types/node";
version = "12.20.42";
version = "12.20.43";
src = fetchurl {
url = "https://registry.npmjs.org/@types/node/-/node-12.20.42.tgz";
sha512 = "aI3/oo5DzyiI5R/xAhxxRzfZlWlsbbqdgxfTPkqu/Zt+23GXiJvMCyPJT4+xKSXOnLqoL8jJYMLTwvK2M3a5hw==";
url = "https://registry.npmjs.org/@types/node/-/node-12.20.43.tgz";
sha512 = "HCfJdaYqJX3BCzeihgZrD7b85Cu05OC/GVJ4kEYIflwUs4jbnUlLLWoq7hw1LBcdvUyehO+gr6P5JQ895/2ZfA==";
};
};
"@types/node-17.0.10" = {
"@types/node-17.0.15" = {
name = "_at_types_slash_node";
packageName = "@types/node";
version = "17.0.10";
version = "17.0.15";
src = fetchurl {
url = "https://registry.npmjs.org/@types/node/-/node-17.0.10.tgz";
sha512 = "S/3xB4KzyFxYGCppyDt68yzBU9ysL88lSdIah4D6cptdcltc4NCPCAMc0+PCpg/lLIyC7IPvj2Z52OJWeIUkog==";
url = "https://registry.npmjs.org/@types/node/-/node-17.0.15.tgz";
sha512 = "zWt4SDDv1S9WRBNxLFxFRHxdD9tvH8f5/kg5/IaLFdnSNXsDY4eL3Q3XXN+VxUnWIhyVFDwcsmAprvwXoM/ClA==";
};
};
"@types/node-fetch-2.5.12" = {
@ -589,13 +598,13 @@ let
sha512 = "h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==";
};
};
"accepts-1.3.7" = {
"accepts-1.3.8" = {
name = "accepts";
packageName = "accepts";
version = "1.3.7";
version = "1.3.8";
src = fetchurl {
url = "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz";
sha512 = "Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==";
url = "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz";
sha512 = "PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==";
};
};
"access-control-1.0.1" = {
@ -940,13 +949,13 @@ let
sha512 = "uUbetCWczQHbsKyX1C99XpQHBM8SWfovvaZhPIj23/1uV7SQf0WeRZbiLpw0JZm+LHTChfNgrLfDJOVoU2kU+A==";
};
};
"aws-sdk-2.1062.0" = {
"aws-sdk-2.1069.0" = {
name = "aws-sdk";
packageName = "aws-sdk";
version = "2.1062.0";
version = "2.1069.0";
src = fetchurl {
url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1062.0.tgz";
sha512 = "QIU8jwi7Uqyvw2HjsXXXUZv3V/6TinUzLewrdl2EdvonqZCXhwMgnZx2F9I2x62IKH1RqnINwFWdoK+OTgcAjA==";
url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1069.0.tgz";
sha512 = "AF7/5JotrVd8g/D3WWHgQto+IryB1V7iudIYm+H+qxmkGOU3xvL63ChhEoLTY/CxuK/diayg0oWILEsXUn3dfw==";
};
};
"aws-sign2-0.7.0" = {
@ -1768,13 +1777,13 @@ let
sha1 = "e303a882b342cc3ee8ca513a79999734dab3ae2c";
};
};
"core-js-3.20.3" = {
"core-js-3.21.0" = {
name = "core-js";
packageName = "core-js";
version = "3.20.3";
version = "3.21.0";
src = fetchurl {
url = "https://registry.npmjs.org/core-js/-/core-js-3.20.3.tgz";
sha512 = "vVl8j8ph6tRS3B8qir40H7yw7voy17xL0piAjlbBUsH7WIfzoedL/ZOr1OV9FyZQLWXsayOJyV4tnRyXR85/ag==";
url = "https://registry.npmjs.org/core-js/-/core-js-3.21.0.tgz";
sha512 = "YUdI3fFu4TF/2WykQ2xzSiTQdldLB4KVuL9WeAy5XONZYt5Cun/fpQvctoKbCgvPhmzADeesTk/j2Rdx77AcKQ==";
};
};
"core-util-is-1.0.2" = {
@ -1786,13 +1795,13 @@ let
sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7";
};
};
"crc-32-1.2.0" = {
"crc-32-1.2.1" = {
name = "crc-32";
packageName = "crc-32";
version = "1.2.0";
version = "1.2.1";
src = fetchurl {
url = "https://registry.npmjs.org/crc-32/-/crc-32-1.2.0.tgz";
sha512 = "1uBwHxF+Y/4yF5G48fwnKq6QsIXheor3ZLPT80yGBV1oEUwpPojlEhQbWKVw1VwcTQyMGHK1/XMmTjmlsmTTGA==";
url = "https://registry.npmjs.org/crc-32/-/crc-32-1.2.1.tgz";
sha512 = "Dn/xm/1vFFgs3nfrpEVScHoIslO9NZRITWGz/1E/St6u4xw99vfZzVkW0OSnzx2h9egej9xwMCEut6sqwokM/w==";
};
};
"cron-1.7.2" = {
@ -2542,22 +2551,13 @@ let
sha512 = "aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==";
};
};
"flatted-2.0.2" = {
"flatted-3.2.5" = {
name = "flatted";
packageName = "flatted";
version = "2.0.2";
version = "3.2.5";
src = fetchurl {
url = "https://registry.npmjs.org/flatted/-/flatted-2.0.2.tgz";
sha512 = "r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA==";
};
};
"flatted-3.2.4" = {
name = "flatted";
packageName = "flatted";
version = "3.2.4";
src = fetchurl {
url = "https://registry.npmjs.org/flatted/-/flatted-3.2.4.tgz";
sha512 = "8/sOawo8tJ4QOBX8YlQBMxL8+RLZfxMQOif9o0KUKTNTjMYElWPE0r/m5VNFxTRd0NSw8qSy8dajrwX4RYI1Hw==";
url = "https://registry.npmjs.org/flatted/-/flatted-3.2.5.tgz";
sha512 = "WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg==";
};
};
"fn.name-1.1.0" = {
@ -3235,13 +3235,13 @@ let
sha512 = "O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA==";
};
};
"ioredis-4.28.3" = {
"ioredis-4.28.5" = {
name = "ioredis";
packageName = "ioredis";
version = "4.28.3";
version = "4.28.5";
src = fetchurl {
url = "https://registry.npmjs.org/ioredis/-/ioredis-4.28.3.tgz";
sha512 = "9JOWVgBnuSxpIgfpjc1OeY1OLmA4t2KOWWURTDRXky+eWO0LZhI33pQNT9gYxANUXfh5p/zYephYni6GPRsksQ==";
url = "https://registry.npmjs.org/ioredis/-/ioredis-4.28.5.tgz";
sha512 = "3GYo0GJtLqgNXj4YhrisLaNNvWSNwSS2wS4OELGfGxH8I69+XfNdnmV1AyN+ZqMh0i7eX+SWjrwFKDBDgfBC1A==";
};
};
"ip-regex-2.1.0" = {
@ -3577,13 +3577,13 @@ let
sha1 = "bb935d48582cba168c06834957a54a3e07124f11";
};
};
"isbot-3.4.0" = {
"isbot-3.4.1" = {
name = "isbot";
packageName = "isbot";
version = "3.4.0";
version = "3.4.1";
src = fetchurl {
url = "https://registry.npmjs.org/isbot/-/isbot-3.4.0.tgz";
sha512 = "0WOb6bbJ6gtpWVHQ30r5MzqvSrCNbZ70wFXAJWdXt/0LulF59uvBQnPgA7IelbOXEpV+CtLWkDxLB4TU7f0+VA==";
url = "https://registry.npmjs.org/isbot/-/isbot-3.4.1.tgz";
sha512 = "CyapceDROQ9dp9uGUh2d0D7q/MDGDt2B3rl/da+BZ0maCBI9bNlZMk3fr4dEO+LEsRY7ur3mfYNQPavCRDRJxg==";
};
};
"isexe-2.0.0" = {
@ -3820,13 +3820,13 @@ let
sha512 = "2Bm96d5ktnE217Ib1FldvUaPAaOst6GtZrsxJCwnJgi9lnsoAKIHyU0sae8rNx6DNYbjdqqh8lv5/b9poD8qOg==";
};
};
"libphonenumber-js-1.9.44" = {
"libphonenumber-js-1.9.48" = {
name = "libphonenumber-js";
packageName = "libphonenumber-js";
version = "1.9.44";
version = "1.9.48";
src = fetchurl {
url = "https://registry.npmjs.org/libphonenumber-js/-/libphonenumber-js-1.9.44.tgz";
sha512 = "zhw8nUMJuQf7jG1dZfEOKKOS6M3QYIv3HnvB/vGohNd0QfxIQcObH3a6Y6s350H+9xgBeOXClOJkS0hJ0yvS3g==";
url = "https://registry.npmjs.org/libphonenumber-js/-/libphonenumber-js-1.9.48.tgz";
sha512 = "2aiDGkr5Ty7LZRhKhnMeV9tfRbzd2zahgF12I0v11AFwEelSdiu5t8/Npf3UejKcuoO4anqTdjnIW3dEtj1xYQ==";
};
};
"libqp-1.1.0" = {
@ -3991,6 +3991,15 @@ let
sha1 = "d527dfb5456eca7cc9bb95d5daeaf88ba54a5451";
};
};
"lodash.merge-4.6.2" = {
name = "lodash.merge";
packageName = "lodash.merge";
version = "4.6.2";
src = fetchurl {
url = "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz";
sha512 = "0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==";
};
};
"lodash.once-4.1.1" = {
name = "lodash.once";
packageName = "lodash.once";
@ -4144,13 +4153,13 @@ let
sha512 = "etgt+n4LlOkGSJbBTV9VROHA5R7ekIPS4vfh+bCAoJgRrJWdqJCBbpS3osRJ/HrT7R68MzMiY3L3sDJ/Fd8aBg==";
};
};
"mappersmith-2.36.3" = {
"mappersmith-2.37.1" = {
name = "mappersmith";
packageName = "mappersmith";
version = "2.36.3";
version = "2.37.1";
src = fetchurl {
url = "https://registry.npmjs.org/mappersmith/-/mappersmith-2.36.3.tgz";
sha512 = "izy4Gc7+VafMR/fDQukiEEBAfFoPGRYLBzFxXqXMR1IwAHqlQgSPRX+g/uIkaVqGRh+eb5c7sy8HNaBq9opwkA==";
url = "https://registry.npmjs.org/mappersmith/-/mappersmith-2.37.1.tgz";
sha512 = "3QiXhRADHTK/it1riJMJm/sHmLlGdw3pfLgZJQu9MfT1CNeiO93keNY0BVLlRmpPBsMER/P7kj3mtcAK2V331Q==";
};
};
"md5-2.3.0" = {
@ -4450,49 +4459,49 @@ let
sha512 = "z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==";
};
};
"n8n-core-0.102.0" = {
"n8n-core-0.104.0" = {
name = "n8n-core";
packageName = "n8n-core";
version = "0.102.0";
version = "0.104.0";
src = fetchurl {
url = "https://registry.npmjs.org/n8n-core/-/n8n-core-0.102.0.tgz";
sha512 = "9/suLELO/HBoEZ06bEv3cN7HZoR43qZlubM0BDXDhXJHBasfKcfegXYYacSfBxtTVX71cLffVgshJoJt8OtDcw==";
url = "https://registry.npmjs.org/n8n-core/-/n8n-core-0.104.0.tgz";
sha512 = "rh8ooCF0zeVjic6JWByuCzcltpeV/OJjUmLcChXU3S6peggCvazvxlU6GOF/+YT69CeQdHwhTmOXSEevu0uzVQ==";
};
};
"n8n-design-system-0.9.0" = {
"n8n-design-system-0.11.0" = {
name = "n8n-design-system";
packageName = "n8n-design-system";
version = "0.9.0";
version = "0.11.0";
src = fetchurl {
url = "https://registry.npmjs.org/n8n-design-system/-/n8n-design-system-0.9.0.tgz";
sha512 = "E1DoUDIvPTLAQ72mkg+MVS72QxDxa5UPxVqX4QeF/xAhUrXKfTWHveG5OxugW+mrEF5nO8IG08MEDOQCOzJZpQ==";
url = "https://registry.npmjs.org/n8n-design-system/-/n8n-design-system-0.11.0.tgz";
sha512 = "KL64XTr9sqqiBEEV7on2cdLooleHPyXClFL+THUy2oXDbGqdlyCGykukU7S4aX+nSjrJEQEDMaMcbw3NCHrumg==";
};
};
"n8n-editor-ui-0.127.0" = {
"n8n-editor-ui-0.129.0" = {
name = "n8n-editor-ui";
packageName = "n8n-editor-ui";
version = "0.127.0";
version = "0.129.0";
src = fetchurl {
url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.127.0.tgz";
sha512 = "XCiLwXing2nSidUfrEqcYxG7Zc7TBbJDxmUjSwv2fdH4SK4vMPcUINJbEQOHPIhc6GNEjSt1J/tbCEJJC/acbg==";
url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.129.0.tgz";
sha512 = "LEYqSL04FWh9dPM/YhL1yySOYCN7IB5uP7uLjfiDR+B7BQcmpq1Do6NzuKqdzfoN8MwMZy6avQrw691rq266nQ==";
};
};
"n8n-nodes-base-0.158.0" = {
"n8n-nodes-base-0.160.0" = {
name = "n8n-nodes-base";
packageName = "n8n-nodes-base";
version = "0.158.0";
version = "0.160.0";
src = fetchurl {
url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-0.158.0.tgz";
sha512 = "qs/T0S2BHrovOFh6mnCRpuY9qhKZxub160+qtvXMVsiUWCpKEW1eIA4owYHLH3DLYqW0izQJap0sGlZEzV3xTg==";
url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-0.160.0.tgz";
sha512 = "q1eJBZSRgafVZBoCgmqxP0vnGDbgUpru0SOgtPgvvZxceo02PiBn8X8N8UjZ5ZeqIekO25tWvbJjGZpyIQ5/sg==";
};
};
"n8n-workflow-0.84.0" = {
"n8n-workflow-0.86.0" = {
name = "n8n-workflow";
packageName = "n8n-workflow";
version = "0.84.0";
version = "0.86.0";
src = fetchurl {
url = "https://registry.npmjs.org/n8n-workflow/-/n8n-workflow-0.84.0.tgz";
sha512 = "ibZ/oCWd81DMhjUQcAMC5GNs2C/dm+4boKTIjRuFHmbGzF2elwpb5s2nlkRn5REj9aZseZ0N9bfJ6slcLbw/Sw==";
url = "https://registry.npmjs.org/n8n-workflow/-/n8n-workflow-0.86.0.tgz";
sha512 = "+Kdo5RMEsh7QJ8AkWNTSpyxYRtjpxPmPfifVAFg4HVguW7g5e7f74xlmqD2xnxQybC9B3f6jxvx6WMKbNcT/+A==";
};
};
"named-placeholders-1.1.2" = {
@ -4549,13 +4558,13 @@ let
sha512 = "6R9fqJ5Zcmf+uYaFgdIHmLwNldn5HbK8L5ybn7Uz+ylX/rnOsSp1AHcvQSrCaFN+qNM1wpymHqD7mVasEOlHGQ==";
};
};
"negotiator-0.6.2" = {
"negotiator-0.6.3" = {
name = "negotiator";
packageName = "negotiator";
version = "0.6.2";
version = "0.6.3";
src = fetchurl {
url = "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz";
sha512 = "hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==";
url = "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz";
sha512 = "+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==";
};
};
"neo-async-2.6.2" = {
@ -5107,13 +5116,13 @@ let
sha512 = "v6ZJ/efsBpGrGGknjtq9J/oC8tZWq0KWL5vQrk2GlzLEQPUDB1ex+13Rmidl1neNN358Jn9EHZw5y07FFtaC7A==";
};
};
"peek-readable-4.0.2" = {
"peek-readable-4.1.0" = {
name = "peek-readable";
packageName = "peek-readable";
version = "4.0.2";
version = "4.1.0";
src = fetchurl {
url = "https://registry.npmjs.org/peek-readable/-/peek-readable-4.0.2.tgz";
sha512 = "9fMaz6zoxw9ypO1KZy5RDJgSupEtu0Q+g/OqqsVHX3rKGR8qehRLYzsFARZ4bVvdvfknKiXvuDbkMnO1g6cRpQ==";
url = "https://registry.npmjs.org/peek-readable/-/peek-readable-4.1.0.tgz";
sha512 = "ZI3LnwUv5nOGbQzD9c2iDG6toheuXSZP5esSHBjopsXH4dg19soufvpUGA3uohi5anFtGb2lhAVdHzH6R/Evvg==";
};
};
"performance-now-2.1.0" = {
@ -5134,6 +5143,15 @@ let
sha512 = "7bdYcv7V6U3KAtWjpQJJBww0UEsWuh4yQ/EjNf2HeO/NnvKjpvhEIe/A/TleP6wtmSKnUnghs5A9jUoK6iDdkA==";
};
};
"pg-8.7.3" = {
name = "pg";
packageName = "pg";
version = "8.7.3";
src = fetchurl {
url = "https://registry.npmjs.org/pg/-/pg-8.7.3.tgz";
sha512 = "HPmH4GH4H3AOprDJOazoIcpI49XFsHCe8xlrjHkWiapdbHK+HLtbm/GQzXYAZwmPju/kzKhjaSfMACG+8cgJcw==";
};
};
"pg-connection-string-2.5.0" = {
name = "pg-connection-string";
packageName = "pg-connection-string";
@ -5161,13 +5179,13 @@ let
sha512 = "1KdmFGGTP6jplJoI8MfvRlfvMiyBivMRP7/ffh4a11RUFJ7kC2J0ZHlipoKiH/1hz+DVgceon9U2qbaHpPeyPg==";
};
};
"pg-pool-3.4.1" = {
"pg-pool-3.5.1" = {
name = "pg-pool";
packageName = "pg-pool";
version = "3.4.1";
version = "3.5.1";
src = fetchurl {
url = "https://registry.npmjs.org/pg-pool/-/pg-pool-3.4.1.tgz";
sha512 = "TVHxR/gf3MeJRvchgNHxsYsTCHQ+4wm3VIHSS19z8NC0+gioEhq1okDY1sm/TYbfoP6JLFx01s0ShvZ3puP/iQ==";
url = "https://registry.npmjs.org/pg-pool/-/pg-pool-3.5.1.tgz";
sha512 = "6iCR0wVrro6OOHFsyavV+i6KYL4lVNyYAB9RD18w66xSzN+d8b66HiwuP30Gp1SH5O9T82fckkzsRjlrhD0ioQ==";
};
};
"pg-promise-10.11.1" = {
@ -5332,13 +5350,13 @@ let
sha512 = "sanczS6xOJOg7IKDvi4sGOUOe7c1tsEzjwlLFH/zgwx/uyImVM9/rgBkc8AfiQa/Vg54nRd8mkm9yI7WV/O+WA==";
};
};
"printj-1.3.0" = {
"printj-1.3.1" = {
name = "printj";
packageName = "printj";
version = "1.3.0";
version = "1.3.1";
src = fetchurl {
url = "https://registry.npmjs.org/printj/-/printj-1.3.0.tgz";
sha512 = "017o8YIaz8gLhaNxRB9eBv2mWXI2CtzhPJALnQTP+OPpuUfP0RMWqr/mHCzqVeu1AQxfzSfAtAq66vKB8y7Lzg==";
url = "https://registry.npmjs.org/printj/-/printj-1.3.1.tgz";
sha512 = "GA3TdL8szPK4AQ2YnOe/b+Y1jUFwmmGMMK/qbY7VcE3Z7FU8JstbKiKRzO6CIiAKPhTO8m01NoQ0V5f3jc4OGg==";
};
};
"process-0.11.10" = {
@ -5971,6 +5989,15 @@ let
sha512 = "ERq4hUjKDbJfE4+XtZLFPCDi8Vb1JqaxAPTxWFLBx8XcAlf9Bda/ZJdVezs/NAfsMQScyIlUMx+Yeu7P7rx5jw==";
};
};
"safe-stable-stringify-2.3.1" = {
name = "safe-stable-stringify";
packageName = "safe-stable-stringify";
version = "2.3.1";
src = fetchurl {
url = "https://registry.npmjs.org/safe-stable-stringify/-/safe-stable-stringify-2.3.1.tgz";
sha512 = "kYBSfT+troD9cDA85VDnHZ1rpHC50O0g1e6WlGHVCz/g+JS+9WKLj+XwFYyR8UbrZN8ll9HUpDAAddY58MGisg==";
};
};
"safer-buffer-2.1.2" = {
name = "safer-buffer";
packageName = "safer-buffer";
@ -6169,13 +6196,13 @@ let
sha512 = "q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==";
};
};
"signal-exit-3.0.6" = {
"signal-exit-3.0.7" = {
name = "signal-exit";
packageName = "signal-exit";
version = "3.0.6";
version = "3.0.7";
src = fetchurl {
url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.6.tgz";
sha512 = "sDl4qMFpijcGw22U5w63KmD3cZJfBuFlVNbVMKje2keoKML7X2UzWbc4XrmEbDwg0NXJc3yv4/ox7b+JWb57kQ==";
url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz";
sha512 = "wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==";
};
};
"simple-git-2.48.0" = {
@ -6322,22 +6349,22 @@ let
sha512 = "+idbmIXoYET47hH+d7dfm2epdOMUDjqcB4648sTZ+t2JwoyBFL/insLfB/racrDmsKB3diwsDA696pZMieAC5g==";
};
};
"ssh2-1.5.0" = {
"ssh2-1.6.0" = {
name = "ssh2";
packageName = "ssh2";
version = "1.5.0";
version = "1.6.0";
src = fetchurl {
url = "https://registry.npmjs.org/ssh2/-/ssh2-1.5.0.tgz";
sha512 = "iUmRkhH9KGeszQwDW7YyyqjsMTf4z+0o48Cp4xOwlY5LjtbIAvyd3fwnsoUZW/hXmTCRA3yt7S/Jb9uVjErVlA==";
url = "https://registry.npmjs.org/ssh2/-/ssh2-1.6.0.tgz";
sha512 = "lxc+uvXqOxyQ99N2M7k5o4pkYDO5GptOTYduWw7hIM41icxvoBcCNHcj+LTKrjkL0vFcAl+qfZekthoSFRJn2Q==";
};
};
"ssh2-sftp-client-7.2.1" = {
"ssh2-sftp-client-7.2.2" = {
name = "ssh2-sftp-client";
packageName = "ssh2-sftp-client";
version = "7.2.1";
version = "7.2.2";
src = fetchurl {
url = "https://registry.npmjs.org/ssh2-sftp-client/-/ssh2-sftp-client-7.2.1.tgz";
sha512 = "kr5QFL+d8Ta28wGhlRqkHo812PjMhKrBK7oTaYGNHqTvXAUjxZR6SeWRXbwKASE3dh2xeDz5aXHcg01bzfAeCA==";
url = "https://registry.npmjs.org/ssh2-sftp-client/-/ssh2-sftp-client-7.2.2.tgz";
sha512 = "qZYivU1zezyRomCf+TtsCYVAsc0TDQWzxJMMUN8NknEPonm2TYGxJAzrW8acUh2ILYgA0ZPOJElLV/qp9nRVYQ==";
};
};
"sshpk-1.17.0" = {
@ -6493,13 +6520,13 @@ let
sha1 = "3c531942e908c2697c0ec344858c286c7ca0a60a";
};
};
"strtok3-6.2.4" = {
"strtok3-6.3.0" = {
name = "strtok3";
packageName = "strtok3";
version = "6.2.4";
version = "6.3.0";
src = fetchurl {
url = "https://registry.npmjs.org/strtok3/-/strtok3-6.2.4.tgz";
sha512 = "GO8IcFF9GmFDvqduIspUBwCzCbqzegyVKIsSymcMgiZKeCfrN9SowtUoi8+b59WZMAjIzVZic/Ft97+pynR3Iw==";
url = "https://registry.npmjs.org/strtok3/-/strtok3-6.3.0.tgz";
sha512 = "fZtbhtvI9I48xDSywd/somNqgUHl2L2cstmXCCif0itOf96jeW18MBSyrLuNicYQVkvpOxkZtkzujiTJ9LW5Jw==";
};
};
"supports-color-2.0.0" = {
@ -7186,22 +7213,22 @@ let
sha512 = "NsmoXalsWVDMGupxZ5R08ka9flZjjiLvHVAWYOKtiKM8ujtZWr9cRffak+uSE48+Ob8ObalXpwyeUiyDD6QFgg==";
};
};
"winston-3.4.0" = {
"winston-3.5.1" = {
name = "winston";
packageName = "winston";
version = "3.4.0";
version = "3.5.1";
src = fetchurl {
url = "https://registry.npmjs.org/winston/-/winston-3.4.0.tgz";
sha512 = "FqilVj+5HKwCfIHQzMxrrd5tBIH10JTS3koFGbLVWBODjiIYq7zir08rFyBT4rrTYG/eaTqDcfSIbcjSM78YSw==";
url = "https://registry.npmjs.org/winston/-/winston-3.5.1.tgz";
sha512 = "tbRtVy+vsSSCLcZq/8nXZaOie/S2tPXPFt4be/Q3vI/WtYwm7rrwidxVw2GRa38FIXcJ1kUM6MOZ9Jmnk3F3UA==";
};
};
"winston-transport-4.4.2" = {
"winston-transport-4.5.0" = {
name = "winston-transport";
packageName = "winston-transport";
version = "4.4.2";
version = "4.5.0";
src = fetchurl {
url = "https://registry.npmjs.org/winston-transport/-/winston-transport-4.4.2.tgz";
sha512 = "9jmhltAr5ygt5usgUTQbEiw/7RYXpyUbEAFRCSicIacpUzPkrnQsQZSPGEI12aLK9Jth4zNcYJx3Cvznwrl8pw==";
url = "https://registry.npmjs.org/winston-transport/-/winston-transport-4.5.0.tgz";
sha512 = "YpZzcUzBedhlTAfJg6vJDlyEai/IFMIVcaEZZyl3UXIl4gmqRpU7AE89AHLkbzLUsv0NVmw7ts+iztqKxxPW1Q==";
};
};
"wmf-1.0.2" = {
@ -7426,10 +7453,10 @@ in
n8n = nodeEnv.buildNodePackage {
name = "n8n";
packageName = "n8n";
version = "0.160.0";
version = "0.162.0";
src = fetchurl {
url = "https://registry.npmjs.org/n8n/-/n8n-0.160.0.tgz";
sha512 = "mdjD4tKohZP8kMbFa+gGWx5rYXLz9HprXr2tPHUpAvZ6x7JGb06uY2ieNifSAH9Ap3CR+qfg6HkPgSKe183CIA==";
url = "https://registry.npmjs.org/n8n/-/n8n-0.162.0.tgz";
sha512 = "76fcq99iZXy+j+BiuZMrR1rgeBgWRGOVwNeqlEqWCJ3u8kg6iDsGRuo9nSdx11OzP17hAJJKLtYHxLfTBV3kUw==";
};
dependencies = [
(sources."@azure/abort-controller-1.0.5" // {
@ -7443,7 +7470,7 @@ in
sources."tslib-2.3.1"
];
})
(sources."@azure/core-http-2.2.3" // {
(sources."@azure/core-http-2.2.4" // {
dependencies = [
sources."tough-cookie-4.0.0"
sources."tslib-2.3.1"
@ -7481,14 +7508,14 @@ in
sources."tslib-2.3.1"
];
})
sources."@babel/runtime-7.16.7"
sources."@babel/runtime-7.17.0"
(sources."@dabh/diagnostics-2.0.2" // {
dependencies = [
sources."enabled-2.0.0"
sources."kuler-2.0.0"
];
})
sources."@fontsource/open-sans-4.5.2"
sources."@fontsource/open-sans-4.5.4"
sources."@icetee/ftp-0.3.15"
sources."@kafkajs/confluent-schema-registry-1.0.6"
sources."@kwsites/file-exists-1.1.1"
@ -7497,7 +7524,7 @@ in
sources."@nodelib/fs.stat-2.0.5"
sources."@nodelib/fs.walk-1.2.8"
sources."@oclif/command-1.8.16"
(sources."@oclif/config-1.18.2" // {
(sources."@oclif/config-1.18.3" // {
dependencies = [
sources."tslib-2.3.1"
];
@ -7507,14 +7534,19 @@ in
sources."wrap-ansi-7.0.0"
];
})
sources."@oclif/help-1.0.1"
(sources."@oclif/help-1.0.1" // {
dependencies = [
sources."@oclif/config-1.18.2"
sources."tslib-2.3.1"
];
})
sources."@oclif/linewrap-1.0.0"
(sources."@oclif/parser-3.8.6" // {
dependencies = [
sources."tslib-2.3.1"
];
})
sources."@opentelemetry/api-1.0.4"
sources."@opentelemetry/api-1.1.0"
sources."@rudderstack/rudder-sdk-node-1.0.6"
sources."@segment/loosely-validate-event-2.0.0"
sources."@selderee/plugin-htmlparser2-0.6.0"
@ -7535,7 +7567,7 @@ 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.10"
sources."@types/node-17.0.15"
(sources."@types/node-fetch-2.5.12" // {
dependencies = [
sources."form-data-3.0.1"
@ -7553,7 +7585,7 @@ in
sources."@xmldom/xmldom-0.7.5"
sources."abbrev-1.1.1"
sources."abort-controller-3.0.0"
sources."accepts-1.3.7"
sources."accepts-1.3.8"
sources."access-control-1.0.1"
(sources."adal-node-0.2.3" // {
dependencies = [
@ -7602,7 +7634,7 @@ in
];
})
sources."avsc-5.7.3"
(sources."aws-sdk-2.1062.0" // {
(sources."aws-sdk-2.1069.0" // {
dependencies = [
sources."buffer-4.9.2"
sources."events-1.1.1"
@ -7697,7 +7729,7 @@ in
sources."printj-1.2.3"
];
})
sources."printj-1.3.0"
sources."printj-1.3.1"
];
})
sources."chalk-4.1.2"
@ -7776,9 +7808,13 @@ in
sources."convict-6.2.1"
sources."cookie-0.4.1"
sources."cookie-signature-1.0.6"
sources."core-js-3.20.3"
sources."core-js-3.21.0"
sources."core-util-is-1.0.2"
sources."crc-32-1.2.0"
(sources."crc-32-1.2.1" // {
dependencies = [
sources."printj-1.3.1"
];
})
sources."cron-1.7.2"
sources."cron-parser-2.18.0"
(sources."cross-spawn-4.0.2" // {
@ -7884,7 +7920,7 @@ in
sources."ms-2.0.0"
];
})
sources."flatted-2.0.2"
sources."flatted-3.2.5"
sources."fn.name-1.1.0"
sources."follow-redirects-1.14.7"
sources."for-each-0.3.3"
@ -7977,7 +8013,7 @@ in
sources."ini-1.3.8"
sources."inquirer-7.3.3"
sources."internal-slot-1.0.3"
sources."ioredis-4.28.3"
sources."ioredis-4.28.5"
sources."ip-regex-2.1.0"
sources."ipaddr.js-1.9.1"
sources."is-absolute-1.0.0"
@ -8012,7 +8048,7 @@ in
sources."is-windows-1.0.2"
sources."is-wsl-2.2.0"
sources."isarray-0.0.1"
sources."isbot-3.4.0"
sources."isbot-3.4.1"
sources."isexe-2.0.0"
sources."iso-639-1-2.1.12"
sources."isstream-0.1.2"
@ -8045,7 +8081,7 @@ in
sources."iconv-lite-0.6.2"
];
})
sources."libphonenumber-js-1.9.44"
sources."libphonenumber-js-1.9.48"
sources."libqp-1.1.0"
sources."limiter-1.1.5"
sources."linkify-it-3.0.3"
@ -8068,11 +8104,16 @@ in
sources."lodash.isnumber-3.0.3"
sources."lodash.isplainobject-4.0.6"
sources."lodash.isstring-4.0.1"
sources."lodash.merge-4.6.2"
sources."lodash.once-4.1.1"
sources."lodash.set-4.3.2"
sources."lodash.uniqby-4.7.0"
sources."lodash.unset-4.5.2"
sources."logform-2.3.2"
(sources."logform-2.3.2" // {
dependencies = [
sources."safe-stable-stringify-1.1.1"
];
})
sources."long-4.0.0"
sources."lossless-json-1.0.5"
(sources."lower-case-2.0.2" // {
@ -8101,7 +8142,7 @@ in
})
sources."make-error-1.3.6"
sources."make-error-cause-2.3.0"
sources."mappersmith-2.36.3"
sources."mappersmith-2.37.1"
sources."md5-2.3.0"
sources."media-typer-0.3.0"
sources."merge-descriptors-1.0.1"
@ -8157,20 +8198,19 @@ in
];
})
sources."mz-2.7.0"
(sources."n8n-core-0.102.0" // {
(sources."n8n-core-0.104.0" // {
dependencies = [
sources."flatted-3.2.4"
sources."qs-6.10.3"
];
})
sources."n8n-design-system-0.9.0"
sources."n8n-editor-ui-0.127.0"
(sources."n8n-nodes-base-0.158.0" // {
sources."n8n-design-system-0.11.0"
sources."n8n-editor-ui-0.129.0"
(sources."n8n-nodes-base-0.160.0" // {
dependencies = [
sources."iconv-lite-0.6.3"
];
})
sources."n8n-workflow-0.84.0"
sources."n8n-workflow-0.86.0"
(sources."named-placeholders-1.1.2" // {
dependencies = [
sources."lru-cache-4.1.5"
@ -8190,7 +8230,7 @@ in
sources."debug-3.2.7"
];
})
sources."negotiator-0.6.2"
sources."negotiator-0.6.3"
sources."neo-async-2.6.2"
(sources."no-case-3.0.4" // {
dependencies = [
@ -8289,14 +8329,18 @@ in
sources."debug-3.2.7"
];
})
sources."peek-readable-4.0.2"
sources."peek-readable-4.1.0"
sources."performance-now-2.1.0"
sources."pg-8.7.1"
sources."pg-8.7.3"
sources."pg-connection-string-2.5.0"
sources."pg-int8-1.0.1"
sources."pg-minify-1.6.2"
sources."pg-pool-3.4.1"
sources."pg-promise-10.11.1"
sources."pg-pool-3.5.1"
(sources."pg-promise-10.11.1" // {
dependencies = [
sources."pg-8.7.1"
];
})
sources."pg-protocol-1.5.0"
sources."pg-types-2.2.0"
(sources."pgpass-1.0.5" // {
@ -8401,7 +8445,7 @@ in
sources."run-parallel-1.2.0"
sources."rxjs-6.6.7"
sources."safe-buffer-5.2.1"
sources."safe-stable-stringify-1.1.1"
sources."safe-stable-stringify-2.3.1"
sources."safer-buffer-2.1.2"
sources."sax-1.2.4"
sources."sb-promise-queue-2.1.0"
@ -8433,7 +8477,7 @@ in
sources."sha.js-2.4.11"
sources."shell-escape-0.2.0"
sources."side-channel-1.0.4"
sources."signal-exit-3.0.6"
sources."signal-exit-3.0.7"
sources."simple-git-2.48.0"
sources."simple-lru-cache-0.0.2"
sources."simple-swizzle-0.2.2"
@ -8467,8 +8511,8 @@ in
sources."sqlstring-2.3.2"
sources."sse-channel-3.1.1"
sources."ssf-0.11.2"
sources."ssh2-1.5.0"
sources."ssh2-sftp-client-7.2.1"
sources."ssh2-1.6.0"
sources."ssh2-sftp-client-7.2.2"
sources."sshpk-1.17.0"
sources."stack-trace-0.0.10"
sources."standard-as-callback-2.1.0"
@ -8482,7 +8526,7 @@ in
sources."string_decoder-0.10.31"
sources."strip-ansi-6.0.1"
sources."strip-json-comments-2.0.1"
sources."strtok3-6.2.4"
sources."strtok3-6.3.0"
sources."supports-color-7.2.0"
(sources."tar-4.4.19" // {
dependencies = [
@ -8494,7 +8538,7 @@ in
sources."tdigest-0.1.1"
(sources."tedious-6.7.1" // {
dependencies = [
sources."@types/node-12.20.42"
sources."@types/node-12.20.43"
sources."bl-3.0.1"
sources."depd-2.0.0"
sources."iconv-lite-0.5.2"
@ -8601,14 +8645,14 @@ in
sources."which-boxed-primitive-1.0.2"
sources."wide-align-1.1.5"
sources."widest-line-3.1.0"
(sources."winston-3.4.0" // {
(sources."winston-3.5.1" // {
dependencies = [
sources."async-3.2.3"
sources."readable-stream-3.6.0"
sources."string_decoder-1.3.0"
];
})
(sources."winston-transport-4.4.2" // {
(sources."winston-transport-4.5.0" // {
dependencies = [
sources."readable-stream-3.6.0"
sources."string_decoder-1.3.0"

View File

@ -5,13 +5,13 @@
mkDerivation rec {
pname = "qownnotes";
version = "22.1.11";
version = "22.2.1";
src = fetchurl {
url = "https://download.tuxfamily.org/${pname}/src/${pname}-${version}.tar.xz";
# Fetch the checksum of current version with curl:
# curl https://download.tuxfamily.org/qownnotes/src/qownnotes-<version>.tar.xz.sha256
sha256 = "7fa21ca9b8b0df6f1bda7a7dc21d53642eccf8de6a31a9a29a251e0a17c00c83";
sha256 = "26dfd41430e9efa5cc93c2d67156387a564efd0843c2020284658100b298d54c";
};
nativeBuildInputs = [ qmake qttools ];

View File

@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
pname = "lean";
version = "3.39.0";
version = "3.39.1";
src = fetchFromGitHub {
owner = "leanprover-community";
@ -11,8 +11,8 @@ stdenv.mkDerivation rec {
# from. this is then used to check whether an olean file should be
# rebuilt. don't use a tag as rev because this will get replaced into
# src/githash.h.in in preConfigure.
rev = "85c581588857624e9cd562aaa0301a951c497833";
sha256 = "1v9rqvpgm2hw0mvsg1arp7xp4r9h9p286364hn3if55pg3h8bjzn";
rev = "1781ded0d0062f40a7eaf3ead8dcbef4429c6321";
sha256 = "0xdpbfjfa1q4cnf87nl7l760ivr4agpqmy3i1f2b132sgbjzm1xx";
};
nativeBuildInputs = [ cmake ];

View File

@ -15,16 +15,16 @@
rustPlatform.buildRustPackage rec {
pname = "git-branchless";
version = "0.3.8";
version = "0.3.9";
src = fetchFromGitHub {
owner = "arxanas";
repo = "git-branchless";
rev = "v${version}";
sha256 = "sha256-eDVC1tvAkCioV0Mi5f/Qkc0MMTNaoFXuvWXpllZ7PgE=";
sha256 = "sha256-SEmIZy8ql1MxcFR6zeif03DVha/SRZHajVwt3QOBBYU=";
};
cargoSha256 = "sha256-wtG/WTmZ13jxIawI9j9QKQm7jPx5TUs7MjqX+lq/Vf0=";
cargoSha256 = "sha256-mKfPxU1JoN/xLdPdwy3vo1M0qF9ag0T4Ls4dfvHn6Pc=";
nativeBuildInputs = [ pkg-config ];

View File

@ -0,0 +1,24 @@
{ lib, stdenv, fetchurl, m4 }:
let
version = "0.7.3";
in
stdenv.mkDerivation {
pname = "gforth-boot";
inherit version;
src = fetchurl {
url = "https://ftp.gnu.org/gnu/gforth/gforth-${version}.tar.gz";
sha256 = "1c1bahc9ypmca8rv2dijiqbangm1d9av286904yw48ph7ciz4qig";
};
buildInputs = [ m4 ];
configureFlags = lib.optional stdenv.isDarwin [ "--build=x86_64-apple-darwin" ];
meta = {
description = "The Forth implementation of the GNU project (outdated version used to bootstrap)";
homepage = "https://www.gnu.org/software/gforth/";
license = lib.licenses.gpl3;
platforms = lib.platforms.all;
};
}

View File

@ -1,17 +1,30 @@
{ lib, stdenv, fetchurl, m4 }:
{ lib, stdenv, fetchFromGitHub, callPackage
, autoreconfHook, texinfo, libffi
}:
let
version = "0.7.3";
in
stdenv.mkDerivation {
swig = callPackage ./swig.nix { };
bootForth = callPackage ./boot-forth.nix { };
in stdenv.mkDerivation rec {
pname = "gforth";
inherit version;
src = fetchurl {
url = "https://ftp.gnu.org/gnu/gforth/gforth-${version}.tar.gz";
sha256 = "1c1bahc9ypmca8rv2dijiqbangm1d9av286904yw48ph7ciz4qig";
version = "0.7.9_20220127";
src = fetchFromGitHub {
owner = "forthy42";
repo = "gforth";
rev = version;
sha256 = "sha256-3+ObHhsPvW44UFiN0GWOhwo7aiqhjwxNY8hw2Wv4MK0=";
};
buildInputs = [ m4 ];
nativeBuildInputs = [
autoreconfHook texinfo bootForth swig
];
buildInputs = [
libffi
];
passthru = { inherit bootForth; };
configureFlags = lib.optional stdenv.isDarwin [ "--build=x86_64-apple-darwin" ];
@ -22,7 +35,7 @@ stdenv.mkDerivation {
meta = {
description = "The Forth implementation of the GNU project";
homepage = "https://www.gnu.org/software/gforth/";
homepage = "https://github.com/forthy42/gforth";
license = lib.licenses.gpl3;
platforms = lib.platforms.all;
};

View File

@ -0,0 +1,16 @@
{ swig3, fetchFromGitHub }:
## for updating to swig4, see
## https://github.com/GeraldWodni/swig/pull/6
swig3.overrideDerivation (old: {
version = "3.0.9-forth";
src = fetchFromGitHub {
owner = "GeraldWodni";
repo = "swig";
rev = "a45b807e5f9d8ca1a43649c8265d2741a393862a";
sha256 = "sha256-6nOOPFGFNaQInEkul0ZAh+ks9n3wqCQ6/tbduvG/To0=";
};
configureFlags = old.configureFlags ++ [
"--enable-forth"
];
})

View File

@ -2,12 +2,13 @@
openjdk11.overrideAttrs (oldAttrs: rec {
pname = "jetbrains-jdk";
version = "11_0_11-b1504.13";
version = "11_0_13-b1751.25";
src = fetchFromGitHub {
owner = "JetBrains";
repo = "JetBrainsRuntime";
rev = "jb${version}";
sha256 = "1xpgsgmmj5jp5qyw98hqmik6a7z3hfwmij023ij3qqymyj3nhm2i";
sha256 = "sha256-TPNYZUkAoiZfp7Ci3fslKnRNGY1lnyIhXYUt6J31lwI=";
};
patches = [];
meta = with lib; {

View File

@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
pname = "julia-bin";
version = "1.7.1";
version = "1.7.2";
src = {
x86_64-linux = fetchurl {
url = "https://julialang-s3.julialang.org/bin/linux/x64/${lib.versions.majorMinor version}/julia-${version}-linux-x86_64.tar.gz";
sha256 = "04czipzai5628v1npa2y2xff0bd4rj8d2fcjnnsvkqj5gff8wra4";
sha256 = "15dsfdcxvx0wizkkn85ldz0mg0h7cjziz1lw4kky0b9v9xr48lm7";
};
}.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");

View File

@ -595,11 +595,6 @@ self: super: builtins.intersectAttrs super {
sha256 = "1hjdprm990vyxz86fgq14ajn0lkams7i00h8k2i2g1a0hjdwppq6";
};
spagoWithOverrides = super.spago.override {
# spago has not yet been updated for the latest dhall.
dhall = self.dhall_1_38_1;
};
spagoDocs = overrideCabal (drv: {
postUnpack = (drv.postUnpack or "") + ''
# Spago includes the following two files directly into the binary
@ -625,7 +620,7 @@ self: super: builtins.intersectAttrs super {
"$sourceRoot/templates/docs-search-app-0.0.11.js" \
"$sourceRoot/templates/purescript-docs-search-0.0.11"
'';
}) spagoWithOverrides;
}) super.spago;
# Tests require network access.
spagoWithoutChecks = dontCheck spagoDocs;

View File

@ -164,5 +164,20 @@ symlinkJoin {
passthru = {
preferLocalBuild = true;
inherit (ghc) version meta;
# Inform users about backwards incompatibilities with <= 21.05
override = _: throw ''
The ghc.withPackages wrapper itself can now be overridden, but no longer
the result of calling it (as before). Consequently overrides need to be
adjusted: Instead of
(ghc.withPackages (p: [ p.my-package ])).override { withLLLVM = true; }
use
(ghc.withPackages.override { useLLVM = true; }) (p: [ p.my-package ])
Also note that withLLVM has been renamed to useLLVM for consistency with
the GHC Nix expressions.'';
};
}

View File

@ -1,6 +1,14 @@
{ stdenv, lib, fetchFromGitHub, bash, makeWrapper, coreutils, gnugrep, ncurses, doCheck ? true }:
{ resholvePackage
, lib
, fetchFromGitHub
, bash
, coreutils
, gnugrep
, ncurses
, doInstallCheck ? true
}:
stdenv.mkDerivation rec {
resholvePackage rec {
pname = "bats";
version = "1.5.0";
@ -11,20 +19,34 @@ stdenv.mkDerivation rec {
sha256 = "sha256-MEkMi2w8G9FZhE3JvzzbqObcErQ9WFXy5mtKwQOoxbk=";
};
nativeBuildInputs = [ makeWrapper ];
patchPhase = ''
patchShebangs .
'';
installPhase = ''
./install.sh $out
wrapProgram $out/bin/bats --suffix PATH : "${lib.makeBinPath [ bash coreutils gnugrep ]}"
'';
inherit doCheck;
checkInputs = [ ncurses ];
checkPhase = ''
solutions = {
bats = {
scripts = [ "bin/bats" ];
interpreter = "${bash}/bin/bash";
inputs = [ bash coreutils gnugrep ];
fake = {
external = [ "greadlink" ];
};
fix = {
"$BATS_ROOT" = [ "${placeholder "out"}" ];
};
keep = {
"${placeholder "out"}/libexec/bats-core/bats" = true;
};
};
};
inherit doInstallCheck;
installCheckInputs = [ ncurses ];
installCheckPhase = ''
# TODO: cut if https://github.com/bats-core/bats-core/issues/418 allows
sed -i '/test works even if PATH is reset/a skip' test/bats.bats

View File

@ -0,0 +1,25 @@
{ lib, stdenv, pkg-config, darwin, fetchurl, SDL2, freetype, libGL }:
stdenv.mkDerivation rec {
pname = "SDL2_ttf";
version = "2.0.15";
src = fetchurl {
url = "https://www.libsdl.org/projects/SDL_ttf/release/${pname}-${version}.tar.gz";
sha256 = "0cyd48dipc0m399qy8s03lci8b0bpiy8xlkvrm2ia7wcv0dfpv59";
};
configureFlags = lib.optional stdenv.isDarwin "--disable-sdltest";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ SDL2 freetype libGL ]
++ lib.optional stdenv.isDarwin darwin.libobjc;
meta = with lib; {
description = "SDL TrueType library";
platforms = platforms.unix;
license = licenses.zlib;
homepage = "https://www.libsdl.org/projects/SDL_ttf/";
};
}

View File

@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
pname = "libnats";
version = "2.1.0";
version = "3.2.0";
src = fetchFromGitHub {
owner = "nats-io";
repo = "nats.c";
rev = "refs/tags/v${version}";
sha256 = "16a0f0gvrmyrqvmh6vinqny3qhm6wyzw5ijnn3r82b1gqlpws0fz";
rev = "v${version}";
sha256 = "1ngji3sa44y27lnq4x5dzbd117s9psx4w0j50b4c2b72cf2z139q";
};
nativeBuildInputs = [ cmake ];

View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "libosmium";
version = "2.17.3";
version = "2.18.0";
src = fetchFromGitHub {
owner = "osmcode";
repo = "libosmium";
rev = "v${version}";
sha256 = "sha256-XpC5gb19jPakYS3QSgOU6WnGad+VEoEtxyT38d9Beug=";
sha256 = "sha256-IPdaBT6hRNHo8kuOsiKdyiQkRxA/l+44U3qGGG89BTo=";
};
nativeBuildInputs = [ cmake ];

View File

@ -27,7 +27,7 @@ let
in
stdenv.mkDerivation rec {
pname = "wireplumber";
version = "0.4.7";
version = "0.4.8";
outputs = [ "out" "dev" ] ++ lib.optional enableDocs "doc";
@ -36,18 +36,9 @@ stdenv.mkDerivation rec {
owner = "pipewire";
repo = "wireplumber";
rev = version;
sha256 = "sha256-yp4xtp+s+h+43LGVtYonoJ2tQaLRfwyMY4fp8z1l0CM=";
sha256 = "sha256-xwfggrjKHh5mZdvH6dKqQo6o1ltxuYdjoGYaWl31C/Y=";
};
patches = [
# backport a fix for default device selection
# FIXME remove this after 0.4.8
(fetchpatch {
url = "https://gitlab.freedesktop.org/pipewire/wireplumber/-/commit/211f1e6b6cd4898121e4c2b821fae4dea6cc3317.patch";
sha256 = "sha256-EGcbJ8Rq/5ft6SV0VC+mTkhVE7Ycze4TL6AVc9KH7+M=";
})
];
nativeBuildInputs = [
meson
pkg-config

View File

@ -4,7 +4,7 @@
, curl
}:
let
version = "2020.3.11";
version = "2020.3.12";
shortVersion = builtins.substring 0 6 version;
in
stdenv.mkDerivation rec {
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://sourceforge/flightgear/release-${shortVersion}/${pname}-${version}.tar.bz2";
sha256 = "sha256-u438vCo7AUPR/88B0alh5WbvId0z2cx2jW2apYcdTzw=";
sha256 = "sha256-W7KZzFU5qZE6tOv9YSzH3yoNi8YET2yzmThMcl23140=";
};
nativeBuildInputs = [ cmake ];

View File

@ -1,6 +1,6 @@
{ lib, stdenv
{ stdenv
, lib
, fetchFromGitLab
, fetchpatch
, pkg-config
, glib
, sqlite
@ -20,7 +20,7 @@
stdenv.mkDerivation rec {
pname = "zeitgeist";
version = "1.0.3";
version = "1.0.4";
outputs = [ "out" "lib" "dev" "man" ] ++ lib.optional pythonSupport "py";
@ -29,17 +29,9 @@ stdenv.mkDerivation rec {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "0y6fyzxl5np4yskcxibd0p03h619w9ir907nhf40h02y0pk1kgkp";
sha256 = "kG1N8DXgjYAJ8fbrGHsp7eTqB20H5smzRnW0PSRUYR0=";
};
patches = [
# Fix build with Vala 0.52
(fetchpatch {
url = "https://gitlab.freedesktop.org/zeitgeist/zeitgeist/commit/64ac3a6f94cd299e5e14945dc31b48f009dec152.patch";
sha256 = "Dw1kNE3JoFdmgcQ0eFoFLYvmxlPjXNj56Jkn2meINz4=";
})
];
nativeBuildInputs = [
autoconf
automake

View File

@ -299,9 +299,9 @@ with self;
};
core = janePackage {
version = "0.11.2";
version = "0.11.3";
pname = "core";
hash = "0vpsvd75lxb09il2rnzyib9mlr51v1hzqdc9fdxgx353pb5agh8a";
hash = "0pzl8n09z4f3i7z2wq4cjxfqrr8mj6xcdp7rbg0nxap2zdhjgvrq";
propagatedBuildInputs = [ core_kernel spawn ];
meta.description = "Jane Street's standard library overlay";
};

View File

@ -6,13 +6,13 @@
buildPythonPackage rec {
pname = "adafruit-platformdetect";
version = "3.19.4";
version = "3.19.5";
format = "setuptools";
src = fetchPypi {
pname = "Adafruit-PlatformDetect";
inherit version;
sha256 = "sha256-b/uAmrFdAtmXUjaW038mKeZgWHCSIEzCZvCy/9Z3ghw=";
sha256 = "sha256-vbiMD0En11VDJUGnEc5ww0AhQ12vkbTCm/pqF7wnywI=";
};
nativeBuildInputs = [

View File

@ -23,6 +23,15 @@ buildPythonPackage rec {
sha256 = "sha256-HAgt52Bo2NOUkpr5xvWTcRyrLKpfcBDlVAZxgDNI7hY=";
};
postPatch = ''
substituteInPlace pyproject.toml \
--replace "--cov" "" \
--replace '"0.0.0"' '"${version}"'
substituteInPlace tests/test_adguardhome.py \
--replace 0.0.0 ${version}
'';
nativeBuildInputs = [ poetry-core ];
propagatedBuildInputs = [
@ -36,10 +45,6 @@ buildPythonPackage rec {
pytestCheckHook
];
postPatch = ''
substituteInPlace pyproject.toml --replace "--cov" ""
'';
pythonImportsCheck = [ "adguardhome" ];
meta = with lib; {

View File

@ -11,7 +11,6 @@ buildPythonPackage rec {
version = "0.14.3";
format = "pyproject";
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
@ -21,6 +20,11 @@ buildPythonPackage rec {
hash = "sha256-ELdNxeU9dajWr4VeOyuvNrSi7B+ImVJM/BlZsw3tcKE=";
};
postPatch = ''
substituteInPlace pyproject.toml \
--replace '"0.0.0"' '"${version}"'
'';
nativeBuildInputs = [
poetry-core
];

View File

@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "aionanoleaf";
version = "0.1.1";
version = "0.2.0";
format = "setuptools";
disabled = pythonOlder "3.8";
@ -16,7 +16,7 @@ buildPythonPackage rec {
owner = "milanmeu";
repo = pname;
rev = "v${version}";
sha256 = "10gi8fpv3xkdjaqig84723m3j0kxgxvqwqvjxmysq2sw4cjmsvz6";
sha256 = "sha256-bz568DlodWtSu2WTTd/QMhdiX9IkllW7UYVXuNlKFaY=";
};
propagatedBuildInputs = [

View File

@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "aiooncue";
version = "0.3.2";
version = "0.3.3";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -16,7 +16,7 @@ buildPythonPackage rec {
owner = "bdraco";
repo = pname;
rev = version;
hash = "sha256-6GnXuYpggUMisfeOnl52xvWFIZRV+oCwsFKAjPwscTU=";
hash = "sha256-rzgSvgVfpz2AVwqnat+TO+QhA3KcXV/a1HDNAP1fNPM=";
};
propagatedBuildInputs = [

View File

@ -0,0 +1,39 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, ifaddr
, pythonOlder
}:
buildPythonPackage rec {
pname = "aiosenseme";
version = "0.6.1";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "bdraco";
repo = pname;
rev = "v${version}";
hash = "sha256-ShK4DP1lAtAFI6z2kf5T1ecbNTKUn2kqUjps2ABRegg=";
};
propagatedBuildInputs = [
ifaddr
];
pythonImportsCheck = [
"aiosenseme"
];
# Module has no tests
doCheck = false;
meta = with lib; {
description = "Module to interact with SenseME fans and lights by Big Ass Fans";
homepage = "https://github.com/bdraco/aiosenseme";
license = with licenses; [ gpl3Only ];
maintainers = with maintainers; [ fab ];
};
}

View File

@ -3,6 +3,7 @@
, fetchPypi
, findutils
, pytestCheckHook
, setuptools-scm
}:
buildPythonPackage rec {
@ -15,6 +16,10 @@ buildPythonPackage rec {
sha256 = "10iqjzmya2h4sk765dlm1pbqypwlqyh8rw59a5m9i63d3klnz2mc";
};
nativeBuildInputs = [
setuptools-scm
];
patches = [ ./permissions.patch ];
checkInputs = [ findutils pytestCheckHook ];

View File

@ -7,29 +7,43 @@
, requests_oauthlib
, six
, pytestCheckHook
, pythonOlder
}:
buildPythonPackage rec {
pname = "atlassian-python-api";
version = "3.18.1";
version = "3.19.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "atlassian-api";
repo = pname;
rev = version;
sha256 = "09xvkbdfhkrdkn8axb6bhi7p12lm2z1z84rx1wksfw9mffqk90v9";
sha256 = "sha256-SJsqk8TM+5UztN1ZDyYrOjNIWDLhm5XtLxPflIGPxKQ=";
};
propagatedBuildInputs = [
deprecated
oauthlib
requests
requests_oauthlib
six
];
checkInputs = [
pytestCheckHook
];
propagatedBuildInputs = [ deprecated oauthlib requests requests_oauthlib six ];
pythonImportsCheck = [
"atlassian"
];
meta = with lib; {
description = "Python Atlassian REST API Wrapper";
homepage = "https://github.com/atlassian-api/atlassian-python-api";
license = licenses.asl20;
maintainers = [ maintainers.arnoldfarkas ];
maintainers = with maintainers; [ arnoldfarkas ];
};
}

View File

@ -10,12 +10,12 @@
buildPythonPackage rec {
pname = "azure-mgmt-iothubprovisioningservices";
version = "1.0.0";
version = "1.1.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "e5871b03488b5ae6dfc441cdbda40cb39c000635ee57c513053792b3c15826a9";
sha256 = "sha256-04OoJuff93L62G6IozpmHpEaUbHHHD6nKlkMHVoJvJ4=";
};
propagatedBuildInputs = [

View File

@ -1,4 +1,4 @@
{ lib, fetchPypi, buildPythonPackage, isPy3k, boost, numpy, pytestCheckHook, pytest-benchmark }:
{ lib, fetchPypi, buildPythonPackage, isPy3k, boost, numpy, pytestCheckHook, pytest-benchmark, setuptools-scm }:
buildPythonPackage rec {
pname = "boost-histogram";
@ -11,7 +11,10 @@ buildPythonPackage rec {
sha256 = "a27842b2f1cfecc509382da2b25b03056354696482b38ec3c0220af0fc9b7579";
};
nativeBuildInputs = [ setuptools-scm ];
buildInputs = [ boost ];
propagatedBuildInputs = [ numpy ];
checkInputs = [ pytestCheckHook pytest-benchmark ];
@ -20,7 +23,6 @@ buildPythonPackage rec {
description = "Python bindings for the C++14 Boost::Histogram library";
homepage = "https://github.com/scikit-hep/boost-histogram";
license = licenses.bsd3;
platforms = platforms.unix;
maintainers = with maintainers; [ veprbl ];
};
}

View File

@ -1,6 +1,6 @@
{ buildPythonPackage, lib, fetchPypi
, pytestCheckHook, filelock, mock, pep8
, cython
, cython, setuptools-scm
, six, pyshp, shapely, geos, numpy
, gdal, pillow, matplotlib, pyepsg, pykdtree, scipy, owslib, fiona
, proj, flufl_lock
@ -23,6 +23,13 @@ buildPythonPackage rec {
--replace "test_epsg(" "dont_test_epsg("
'';
nativeBuildInputs = [
cython
geos # for geos-config
proj
setuptools-scm
];
buildInputs = [
geos proj
];
@ -48,12 +55,6 @@ buildPythonPackage rec {
"test_gridliner_labels_bbox_style"
];
nativeBuildInputs = [
cython
geos # for geos-config
proj
];
meta = with lib; {
description = "Process geospatial data to create maps and perform analyses";
license = licenses.lgpl3Plus;

View File

@ -4,6 +4,7 @@
, astropy
, dask
, numpy
, setuptools-scm
}:
buildPythonPackage rec {
@ -16,6 +17,8 @@ buildPythonPackage rec {
sha256 = "16rypj65wdfxxrilxfhbk563lxv86if4vvs9zfq3f8bkzdr8xl9s";
};
nativeBuildInputs = [ setuptools-scm ];
propagatedBuildInputs = [ astropy dask numpy ];
# Tests require a large (800 Mb) dataset
@ -25,7 +28,7 @@ buildPythonPackage rec {
meta = {
description = "Dask-based reader for CASA data";
homepage = "http://radio-astro-tools.github.io";
homepage = "https://casa-formats-io.readthedocs.io/";
license = lib.licenses.lgpl2Only;
maintainers = with lib.maintainers; [ smaret ];
};

View File

@ -9,7 +9,7 @@
}:
buildPythonPackage rec {
version = "0.1.5";
version = "0.1.6";
pname = "cdcs";
format = "setuptools";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "usnistgov";
repo = "pycdcs";
rev = "v${version}";
sha256 = "0sd0s0mka2bvpxxiz98cjc2h5ncsb7d03af1q3w9w8pmvfsgj7pc";
sha256 = "sha256-w9CBNOK9oXTIUa+SsnepRN0wAz7WPZGfUNDSbtVn1L8=";
};
propagatedBuildInputs = [

View File

@ -4,15 +4,19 @@
, click
, six
, pytestCheckHook
, pythonOlder
}:
buildPythonPackage rec {
pname = "click-configfile";
version = "0.2.3";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "lb7sE77pUOmPQ8gdzavvT2RAkVWepmKY+drfWTUdkNE=";
hash = "sha256-lb7sE77pUOmPQ8gdzavvT2RAkVWepmKY+drfWTUdkNE=";
};
propagatedBuildInputs = [
@ -24,6 +28,15 @@ buildPythonPackage rec {
pytestCheckHook
];
postPatch = ''
substituteInPlace setup.py \
--replace "install_requires=install_requires," 'install_requires=["click >= 6.6", "six >= 1.10"],'
'';
pythonImportsCheck = [
"click_configfile"
];
disabledTests = [
"test_configfile__with_unbound_section"
"test_matches_section__with_bad_arg"

View File

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "cocotb";
version = "1.6.1";
version = "1.6.2";
# - we need to use the tarball from PyPi
# or the full git checkout (with .git)
@ -20,7 +20,7 @@ buildPythonPackage rec {
# because it does not include required metadata
src = fetchPypi {
inherit pname version;
sha256 = "b644a15ea1e62c55041176468976541cba30a8a5e99a5e9a2c07ee595c2b4e95";
sha256 = "sha256-SY+1727DbWMg6CnmHw8k/VP0dwBRYszn+YyyvZXgvUs=";
};
nativeBuildInputs = [ setuptools-scm ];

View File

@ -1,13 +1,13 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, pythonAtLeast
, pythonOlder
, attrs
, isodate
, python-dateutil
, rfc3986
, uritemplate
, mock
, pytestCheckHook
, pytest-mock
}:
@ -15,6 +15,8 @@
buildPythonPackage rec {
pname = "csvw";
version = "1.11.0";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
@ -24,10 +26,6 @@ buildPythonPackage rec {
sha256 = "1393xwqawaxsflbq62vks92vv4zch8p6dd1mdvdi7j4vvf0zljkg";
};
patchPhase = ''
substituteInPlace setup.cfg --replace "--cov" ""
'';
propagatedBuildInputs = [
attrs
isodate
@ -37,15 +35,28 @@ buildPythonPackage rec {
];
checkInputs = [
mock
pytestCheckHook
pytest-mock
];
patchPhase = ''
substituteInPlace setup.cfg \
--replace "--cov" ""
'';
disabledTests = [
# this test is flaky on darwin because it depends on the resolution of filesystem mtimes
# https://github.com/cldf/csvw/blob/45584ad63ff3002a9b3a8073607c1847c5cbac58/tests/test_db.py#L257
"test_write_file_exists"
] ++ lib.optionals (pythonAtLeast "3.10") [
# https://github.com/cldf/csvw/issues/58
"test_roundtrip_escapechar"
"test_escapequote_escapecharquotechar_final"
"test_doubleQuote"
];
pythonImportsCheck = [
"csvw"
];
meta = with lib; {

View File

@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "deep-translator";
version = "1.6.1";
version = "1.7.0";
src = fetchPypi {
inherit pname version;
sha256 = "2611c54209b234730f3e5e6481cb875e120e49d9ec1a27a1fa89850150485975";
sha256 = "sha256-k4RhUZN/aC9D1NKkmCGZGZNU9In577RobBnDagMYHbo=";
};
propagatedBuildInputs = [

View File

@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "deezer-python";
version = "5.1.0";
version = "5.1.1";
format = "pyproject";
disabled = pythonOlder "3.6";
@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "browniebroke";
repo = pname;
rev = "v${version}";
sha256 = "sha256-hBZBbREPxfAkGf2KRZtO3BpscFGlYiecQjM5l1/Edo0=";
sha256 = "sha256-gzavZ6/8k/JfcOlwWuMV+4AQxbkfWWgbBrHNcnuU51E=";
};
nativeBuildInputs = [

View File

@ -5,6 +5,7 @@
, pytestCheckHook
, pythonOlder
, requests
, setuptools-scm
, websocket-client
, zeroconf
}:
@ -21,6 +22,12 @@ buildPythonPackage rec {
sha256 = "sha256-N/48Q2IEL194vCzrPPuy+mRNejXfkoXy2t2oe0Y6ug4=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;
nativeBuildInputs = [
setuptools-scm
];
propagatedBuildInputs = [
requests
zeroconf
@ -32,13 +39,6 @@ buildPythonPackage rec {
pytest-mock
];
postPatch = ''
# setup.py is not able to detect the version with setuptools_scm
substituteInPlace setup.py \
--replace "setuptools_scm" "" \
--replace 'use_scm_version=True' 'use_scm_version="${version}"'
'';
# Disable test that requires network access
disabledTests = [
"test__on_pong"

View File

@ -1,8 +1,11 @@
{ lib
, buildPythonPackage
, fetchPypi, isPy27
, ldap , django
, fetchPypi
, isPy27
, ldap
, django
, mock
, setuptools-scm
}:
buildPythonPackage rec {
@ -14,7 +17,10 @@ buildPythonPackage rec {
sha256 = "276f79e624ce083ce13f161387f65ff1c0efe83ef8a42f2b9830d43317b15239";
};
nativeBuildInputs = [ setuptools-scm ];
propagatedBuildInputs = [ ldap django ];
checkInputs = [ mock ];
# django.core.exceptions.ImproperlyConfigured: Requested setting INSTALLED_APPS, but settings are not configured. You must either define the environment variable DJANGO_SETTINGS_MODULE or call settings.configure() before accessing settings

View File

@ -0,0 +1,107 @@
{ lib
, stdenv
, buildPythonPackage
, fetchPypi
, pythonOlder
, substituteAll
# patched in
, geos
, gdal
, withGdal ? false
# propagated
, asgiref
, backports-zoneinfo
, sqlparse
# tests
, aiosmtpd
, argon2_cffi
, bcrypt
, docutils
, geoip2
, jinja2
, memcached
, numpy
, pillow
, pylibmc
, pymemcache
, python
, pytz
, pywatchman
, pyyaml
, redis
, selenium
, tblib
, tzdata
}:
buildPythonPackage rec {
pname = "Django";
version = "4.0.2";
format = "pyproject";
disabled = pythonOlder "3.8";
src = fetchPypi {
inherit pname version;
hash = "sha256-EQ+1j7Euylngcq1Z/ELXcc1kLdei8kFlgqqdp6jvlUo=";
};
patches = lib.optional withGdal
(substituteAll {
src = ./django_4_set_geos_gdal_lib.patch;
geos = geos;
gdal = gdal;
extension = stdenv.hostPlatform.extensions.sharedLibrary;
});
propagatedBuildInputs = [
asgiref
sqlparse
] ++ lib.optionals (pythonOlder "3.9") [
backports-zoneinfo
];
# Fails to import asgiref in ~200 tests
# ModuleNotFoundError: No module named 'asgiref'
doCheck = false;
checkInputs = [
aiosmtpd
argon2_cffi
asgiref
bcrypt
docutils
geoip2
jinja2
memcached
numpy
pillow
pylibmc
pymemcache
pytz
pywatchman
pyyaml
redis
selenium
tblib
tzdata
];
checkPhase = ''
runHook preCheck
${python.interpreter} tests/runtests.py
runHook postCheck
'';
meta = with lib; {
description = "A high-level Python Web framework that encourages rapid development and clean, pragmatic design.";
homepage = "https://www.djangoproject.com";
license = licenses.bsd3;
maintainers = with maintainers; [ hexa ];
};
}

View File

@ -0,0 +1,26 @@
diff --git a/django/contrib/gis/gdal/libgdal.py b/django/contrib/gis/gdal/libgdal.py
index 05b5732..91fafee 100644
--- a/django/contrib/gis/gdal/libgdal.py
+++ b/django/contrib/gis/gdal/libgdal.py
@@ -14,7 +14,7 @@ try:
from django.conf import settings
lib_path = settings.GDAL_LIBRARY_PATH
except (AttributeError, ImportError, ImproperlyConfigured, OSError):
- lib_path = None
+ lib_path = ""@gdal@/lib/libgdal@extension@"
if lib_path:
lib_names = None
diff --git a/django/contrib/gis/geos/libgeos.py b/django/contrib/gis/geos/libgeos.py
index 2cdb5d3..fac2d04 100644
--- a/django/contrib/gis/geos/libgeos.py
+++ b/django/contrib/gis/geos/libgeos.py
@@ -24,7 +24,7 @@ def load_geos():
from django.conf import settings
lib_path = settings.GEOS_LIBRARY_PATH
except (AttributeError, ImportError, ImproperlyConfigured, OSError):
- lib_path = None
+ lib_path = "@geos@/lib/libgeos_c@extension@"
# Setting the appropriate names for the GEOS-C library.
if lib_path:

View File

@ -8,6 +8,7 @@
, pytestCheckHook
, pythonOlder
, restructuredtext_lint
, setuptools-scm
, stevedore
}:
@ -23,6 +24,10 @@ buildPythonPackage rec {
sha256 = "376e50f4e70a1ae935416ddfcf93db35dd5d4cc0e557f2ec72f0667d0ace4548";
};
nativeBuildInputs = [
setuptools-scm
];
buildInputs = [
pbr
];

View File

@ -8,6 +8,7 @@
, pytestCheckHook
, pytest-doctestplus
, pythonOlder
, setuptools-scm
}:
buildPythonPackage rec {
@ -21,6 +22,10 @@ buildPythonPackage rec {
sha256 = "sha256-Id8rPK8qq71gHn5DKnEi7Lp081GFbcFtGU+v89Vlt9o=";
};
nativeBuildInputs = [
setuptools-scm
];
propagatedBuildInputs = [
numpy
pandas

View File

@ -1,4 +1,5 @@
{ lib
, stdenv
, buildPythonPackage
, fastnumbers
, fetchFromGitHub
@ -26,6 +27,10 @@ buildPythonPackage rec {
typing-extensions
];
# Tests fail due to numeric precision differences on ARM
# See https://github.com/SethMMorton/fastnumbers/issues/28
doCheck = !(stdenv.isAarch64 || stdenv.isAarch32);
checkInputs = [
hypothesis
pytestCheckHook

View File

@ -6,12 +6,12 @@
buildPythonPackage rec {
pname = "fiona";
version = "1.8.20";
version = "1.8.21";
src = fetchPypi {
pname = "Fiona";
inherit version;
sha256 = "a70502d2857b82f749c09cb0dea3726787747933a2a1599b5ab787d74e3c143b";
sha256 = "sha256-Og7coqegcNtAXXEYchSkPSMzpXtAl1RKP8woIGali/w=";
};
CXXFLAGS = lib.optionalString stdenv.cc.isClang "-std=c++11";

View File

@ -1,32 +1,48 @@
{ lib
, buildPythonPackage
, fetchPypi
, isPy27
, botocore
, boto3
, docutils
, unittest2
, mock
, botocore
, buildPythonPackage
, fetchFromGitHub
, parquet
, pytestCheckHook
, python-dateutil
, pythonOlder
}:
buildPythonPackage rec {
pname = "flowlogs_reader";
version = "3.1.0";
disabled = isPy27;
pname = "flowlogs-reader";
version = "3.2.0";
format = "setuptools";
src = fetchPypi {
inherit pname version;
sha256 = "d99636423abc83bb4042d63edd56852ede9e2949cadcc3339eda8f3367826dd4";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "obsrvbl";
repo = pname;
# https://github.com/obsrvbl/flowlogs-reader/issues/57
rev = "fac4c6c63348ff67fd0a8f51d391ba7c9f59e5ed";
hash = "sha256-bGb2CLp33aIr0R/lBPWAF3CbtVTWpqmcvYgZ6bcARTc=";
};
propagatedBuildInputs = [ botocore boto3 docutils ];
buildInputs = [ unittest2 mock ];
propagatedBuildInputs = [
botocore
boto3
parquet
python-dateutil
];
checkInputs = [
pytestCheckHook
];
pythonImportsCheck = [
"flowlogs_reader"
];
meta = with lib; {
description = "Python library to make retrieving Amazon VPC Flow Logs from CloudWatch Logs a bit easier";
homepage = "https://github.com/obsrvbl/flowlogs-reader";
maintainers = with maintainers; [ cransom ];
license = licenses.asl20;
maintainers = with maintainers; [ cransom ];
};
}

View File

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "flux-led";
version = "0.28.21";
version = "0.28.22";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "Danielhiversen";
repo = "flux_led";
rev = version;
sha256 = "sha256-Vt+vlJlOznGShPUUQUt4zL9ht52TvNWbRRO9v9C0cqg=";
sha256 = "sha256-GNuc8WAiC0S4WFFUYgayU6c0treWCPfPhbyteZ68eWs=";
};
propagatedBuildInputs = [

View File

@ -18,6 +18,8 @@ buildPythonPackage rec {
sha256 = "sha256-UrLy+j8YDWuS9pciEDKb/+UoCcw54XWiIUAEYC72/W0=";
};
PACKAGE_VERSION = version;
propagatedBuildInputs = [
aiodns
aiohttp

View File

@ -19,6 +19,11 @@ buildPythonPackage rec {
sha256 = "16f2742r9p3mrg2nz8lnkgsxabbjga2qnp9vzq59026q6mmfwkm9";
};
postPatch = ''
substituteInPlace pyproject.toml \
--replace '"0.0.0"' '"${version}"'
'';
nativeBuildInputs = [
poetry-core
];
@ -34,7 +39,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Python client for getting garage occupancy in Amsterdam";
homepage = "https://github.com/klaasnicolaas/garages_amsterdam";
homepage = "https://github.com/klaasnicolaas/python-garages-amsterdam";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
};

View File

@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "google-cloud-bigtable";
version = "2.4.0";
version = "2.5.0";
src = fetchPypi {
inherit pname version;
sha256 = "b8472c91b05159f20121fcca6ebdc2a3b5648d68158ec747860914279b6b983b";
sha256 = "sha256-R7HGbURhqOxPXUlKN3+mk5+qP6Em5HmxBAa7LHsjJJk=";
};
propagatedBuildInputs = [

View File

@ -14,11 +14,11 @@
buildPythonPackage rec {
pname = "google-cloud-spanner";
version = "3.12.1";
version = "3.13.0";
src = fetchPypi {
inherit pname version;
sha256 = "98e53298a7c79f0af351c80e6fc0b57bc735afdec764424e459179ef04f5a40f";
sha256 = "sha256-Y+MA7Nlx3+8eaBptI6eZgSPGc4MvxSrA9YA+K+VSblw=";
};
propagatedBuildInputs = [

View File

@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "google-resumable-media";
version = "2.1.0";
version = "2.2.0";
src = fetchPypi {
inherit pname version;
sha256 = "725b989e0dd387ef2703d1cc8e86217474217f4549593c477fd94f4024a0f911";
sha256 = "sha256-nzDOf80TuO8Vmyy5WD1Km7mef3uFgWsRIFmwMvLwhKA=";
};
propagatedBuildInputs = [ google-auth google-crc32c requests ];

View File

@ -1,14 +1,16 @@
{ lib
, aniso8601
, buildPythonPackage
, fetchFromGitHub
, aniso8601
, graphql-core
, graphql-relay
, promise
, pytestCheckHook
, pytest-asyncio
, pytest-benchmark
, pytest-mock
, pytestCheckHook
, pythonAtLeast
, pythonOlder
, pytz
, snapshottest
}:
@ -16,6 +18,9 @@
buildPythonPackage rec {
pname = "graphene";
version = "3.0.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "graphql-python";
@ -40,15 +45,22 @@ buildPythonPackage rec {
snapshottest
];
pytestFlagsArray = [ "--benchmark-disable" ];
pytestFlagsArray = [
"--benchmark-disable"
];
disabledTests = [
# Expects different Exeception classes, but receives none of them
# https://github.com/graphql-python/graphene/issues/1346
"test_unexpected_error"
] ++ lib.optionals (pythonAtLeast "3.10") [
"test_objecttype_as_container_extra_args"
"test_objecttype_as_container_invalid_kwargs"
];
pythonImportsCheck = [ "graphene" ];
pythonImportsCheck = [
"graphene"
];
meta = with lib; {
description = "GraphQL Framework for Python";

View File

@ -22,6 +22,12 @@ buildPythonPackage rec {
hash = "sha256-Y8IgqrU8zzV020qwyyb57Tp2j7laQ3JsCOCYBuf8vsQ=";
};
postPatch = ''
# upstream issue for proper solution https://github.com/cmroche/greeclimate/issues/46
substituteInPlace setup.py \
--replace 'name="greeclimate",' 'name="greeclimate",version="${version}",'
'';
propagatedBuildInputs = [
netifaces
pycryptodome

View File

@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "heatzypy";
version = "2.0.1";
version = "2.0.2";
format = "setuptools";
disabled = pythonOlder "3.8";
@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "Cyr-ius";
repo = pname;
rev = version;
sha256 = "sha256-PnDsgTfr2F/fgbONP2qvuPhbw3X50AqriEmsFFjll2Y=";
sha256 = "sha256-VdvgrTZLFTtOu34lWxoPkHAI6Z2Me1/3xauQxzIBJNs=";
};
propagatedBuildInputs = [

View File

@ -39,7 +39,8 @@ buildPythonPackage rec {
postPatch = ''
substituteInPlace setup.py \
--replace 'libusb1>=1.7,<2.0' 'libusb1>=1.7' \
--replace "'python_requires': '>=3.6,<3.10'," "'python_requires': '>=3.6,<4',"
--replace "'python_requires': '>=3.6,<3.10'," "'python_requires': '>=3.6,<4'," \
--replace 'typing-extensions>=3.7,<4.0' 'typing-extensions>=3.7'
'';
# tests require to clone quite a few firmwares

View File

@ -7,12 +7,12 @@
buildPythonPackage rec {
pname = "ipyvuetify";
version = "1.8.1";
version = "1.8.2";
# GitHub version tries to run npm (Node JS)
src = fetchPypi {
inherit pname version;
sha256 = "2d17367ce7da45a2622107d55c8b4c5475aace99ed5d95e5d7d3f93aa4c0c566";
sha256 = "sha256-uFjS7lv8kDRultRqqu2++1eieLs67dLolVurTXWls8A=";
};
propagatedBuildInputs = [ ipyvue ];

View File

@ -14,11 +14,11 @@
buildPythonPackage rec {
pname = "librosa";
version = "0.8.1";
version = "0.9.0";
src = fetchPypi {
inherit pname version;
sha256 = "c53d05e768ae4a3e553ae21c2e5015293e5efbfd5c12d497f1104cb519cca6b3";
sha256 = "sha256-zSFnXTuYWPjRs7FDKzYONoFFvtN4B+HxOwcRqozTkP0=";
};
propagatedBuildInputs = [ joblib matplotlib six scikit-learn decorator audioread resampy soundfile pooch ];

Some files were not shown because too many files have changed in this diff Show More