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

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot]
2021-04-14 12:06:16 +00:00
committed by GitHub
parent 25ae1fd29f 963ba38ad9
commit 4208cc9f7c
204 changed files with 5723 additions and 4039 deletions
Download Patch File Download Diff File Expand all files Collapse all files
maintainers/maintainer-list.nix
+18
View File
@@ -224,6 +224,12 @@
githubId = 1773511;
name = "Adrien Devresse";
};
addict3d = {
email = "nickbathum@gmail.com";
github = "addict3d";
githubId = 49227;
name = "Nick Bathum";
};
adisbladis = {
email = "adisbladis@gmail.com";
github = "adisbladis";
@@ -2731,6 +2737,12 @@
githubId = 18535642;
name = "Emily";
};
enderger = {
email = "endergeryt@gmail.com";
github = "enderger";
githubId = 36283171;
name = "Daniel";
};
endocrimes = {
email = "dani@builds.terrible.systems";
github = "endocrimes";
@@ -5379,6 +5391,12 @@
githubId = 55911173;
name = "Gwendolyn Quasebarth";
};
larsr = {
email = "Lars.Rasmusson@gmail.com";
github = "larsr";
githubId = 182024;
name = "Lars Rasmusson";
};
lasandell = {
email = "lasandell@gmail.com";
github = "lasandell";
nixos/doc/manual/release-notes/rl-2105.xml
+13
View File
@@ -669,6 +669,12 @@ environment.systemPackages = [
Environment variables can be set using <option>environment.variables</option>.
</para>
</listitem>
<listitem>
<para>
<option>services.minio.dataDir</option> changed type to a list of paths, required for specifiyng multiple data directories for using with erasure coding.
Currently, the service doesn't enforce nor checks the correct number of paths to correspond to minio requirements.
</para>
</listitem>
</itemizedlist>
</section>
@@ -935,6 +941,13 @@ environment.systemPackages = [
option.
</para>
</listitem>
<listitem>
<para>
Prior to this release, systemd would also read system units from an undocumented <literal>/etc/systemd-mutable/system</literal> path.
This path has been dropped from the defaults. That path (or others) can be re-enabled by adding it to the
<link linkend="opt-boot.extraSystemdUnitPaths">boot.extraSystemdUnitPaths</link> list.
</para>
</listitem>
</itemizedlist>
</section>
</section>
nixos/lib/make-options-doc/default.nix
+26
View File
@@ -126,11 +126,37 @@ let
}
'';
singleMDDoc = name: value: ''
## ${lib.escape [ "<" ">" ] name}
${value.description}
${lib.optionalString (value ? type) ''
*_Type_*:
${value.type}
''}
${lib.optionalString (value ? default) ''
*_Default_*
```
${builtins.toJSON value.default}
```
''}
${lib.optionalString (value ? example) ''
*_Example_*
```
${builtins.toJSON value.example}
```
''}
'';
in {
inherit optionsNix;
optionsAsciiDoc = lib.concatStringsSep "\n" (lib.mapAttrsToList singleAsciiDoc optionsNix);
optionsMDDoc = lib.concatStringsSep "\n" (lib.mapAttrsToList singleMDDoc optionsNix);
optionsJSON = pkgs.runCommand "options.json"
{ meta.description = "List of NixOS options in JSON format";
buildInputs = [ pkgs.brotli ];
nixos/modules/hardware/rtl-sdr.nix
+3 -4
View File
@@ -6,14 +6,13 @@ let
in {
options.hardware.rtl-sdr = {
enable = lib.mkEnableOption ''
Enables rtl-sdr udev rules and ensures 'plugdev' group exists.
This is a prerequisite to using devices supported by rtl-sdr without
being root, since rtl-sdr USB descriptors will be owned by plugdev
through udev.
Enables rtl-sdr udev rules, ensures 'plugdev' group exists, and blacklists DVB kernel modules.
This is a prerequisite to using devices supported by rtl-sdr without being root, since rtl-sdr USB descriptors will be owned by plugdev through udev.
'';
};
config = lib.mkIf cfg.enable {
boot.blacklistedKernelModules = [ "dvb_usb_rtl28xxu" "e4000" "rtl2832" ];
services.udev.packages = [ pkgs.rtl-sdr ];
users.groups.plugdev = {};
};
nixos/modules/services/cluster/k3s/default.nix
+6 -1
View File
@@ -83,7 +83,8 @@ in
systemd.services.k3s = {
description = "k3s service";
after = mkIf cfg.docker [ "docker.service" ];
after = [ "network.service" "firewall.service" ] ++ (optional cfg.docker "docker.service");
wants = [ "network.service" "firewall.service" ];
wantedBy = [ "multi-user.target" ];
serviceConfig = {
# See: https://github.com/rancher/k3s/blob/dddbd16305284ae4bd14c0aade892412310d7edc/install.sh#L197
@@ -92,6 +93,10 @@ in
Delegate = "yes";
Restart = "always";
RestartSec = "5s";
LimitNOFILE = 1048576;
LimitNPROC = "infinity";
LimitCORE = "infinity";
TasksMax = "infinity";
ExecStart = concatStringsSep " \\\n " (
[
"${cfg.package}/bin/k3s ${cfg.role}"
nixos/modules/services/hardware/sane.nix
+1
View File
@@ -163,6 +163,7 @@ in
users.users.scanner = {
uid = config.ids.uids.scanner;
group = "scanner";
extraGroups = [ "lp" ] ++ optionals config.services.avahi.enable [ "avahi" ];
};
})
];
nixos/modules/services/mail/mailman.nix
+2 -1
View File
@@ -263,7 +263,8 @@ in {
# settings_local.json is loaded.
os.environ["SECRET_KEY"] = ""
from mailman_web.settings import *
from mailman_web.settings.base import *
from mailman_web.settings.mailman import *
import json
nixos/modules/services/networking/babeld.nix
+1 -1
View File
@@ -102,7 +102,7 @@ in
ProtectKernelModules = true;
ProtectKernelLogs = true;
ProtectControlGroups = true;
RestrictAddressFamilies = [ "AF_NETLINK" "AF_INET6" ];
RestrictAddressFamilies = [ "AF_NETLINK" "AF_INET6" "AF_INET" ];
RestrictNamespaces = true;
RestrictRealtime = true;
RestrictSUIDSGID = true;
nixos/modules/services/ttys/getty.nix
+14 -6
View File
@@ -5,17 +5,16 @@ with lib;
let
cfg = config.services.getty;
loginArgs = [
baseArgs = [
"--login-program" "${pkgs.shadow}/bin/login"
] ++ optionals (cfg.autologinUser != null) [
"--autologin" cfg.autologinUser
] ++ optionals (cfg.loginOptions != null) [
"--login-options" cfg.loginOptions
];
] ++ cfg.extraArgs;
gettyCmd = extraArgs:
"@${pkgs.util-linux}/sbin/agetty agetty ${escapeShellArgs loginArgs} "
+ extraArgs;
gettyCmd = args:
"@${pkgs.util-linux}/sbin/agetty agetty ${escapeShellArgs baseArgs} ${args}";
in
@@ -54,7 +53,16 @@ in
will not be invoked with a <option>--login-options</option>
option.
'';
example = "-h darkstar -- \u";
example = "-h darkstar -- \\u";
};
extraArgs = mkOption {
type = types.listOf types.str;
default = [ ];
description = ''
Additional arguments passed to agetty.
'';
example = [ "--nohostname" ];
};
greetingLine = mkOption {
nixos/modules/services/web-servers/minio.nix
+5 -6
View File
@@ -18,9 +18,9 @@ in
};
dataDir = mkOption {
default = "/var/lib/minio/data";
type = types.path;
description = "The data directory, for storing the objects.";
default = [ "/var/lib/minio/data" ];
type = types.listOf types.path;
description = "The list of data directories for storing the objects. Use one path for regular operation and the minimum of 4 endpoints for Erasure Code mode.";
};
configDir = mkOption {
@@ -74,15 +74,14 @@ in
config = mkIf cfg.enable {
systemd.tmpfiles.rules = [
"d '${cfg.configDir}' - minio minio - -"
"d '${cfg.dataDir}' - minio minio - -"
];
] ++ (map (x: "d '" + x + "' - minio minio - - ") cfg.dataDir);
systemd.services.minio = {
description = "Minio Object Storage";
after = [ "network.target" ];
wantedBy = [ "multi-user.target" ];
serviceConfig = {
ExecStart = "${cfg.package}/bin/minio server --json --address ${cfg.listenAddress} --config-dir=${cfg.configDir} ${cfg.dataDir}";
ExecStart = "${cfg.package}/bin/minio server --json --address ${cfg.listenAddress} --config-dir=${cfg.configDir} ${toString cfg.dataDir}";
Type = "simple";
User = "minio";
Group = "minio";
nixos/modules/services/x11/window-managers/default.nix
+1
View File
@@ -15,6 +15,7 @@ in
./cwm.nix
./clfswm.nix
./dwm.nix
./e16.nix
./evilwm.nix
./exwm.nix
./fluxbox.nix
nixos/modules/services/x11/window-managers/e16.nix
+26
View File
@@ -0,0 +1,26 @@
{ config , lib , pkgs , ... }:
with lib;
let
cfg = config.services.xserver.windowManager.e16;
in
{
###### interface
options = {
services.xserver.windowManager.e16.enable = mkEnableOption "e16";
};
###### implementation
config = mkIf cfg.enable {
services.xserver.windowManager.session = singleton {
name = "E16";
start = ''
${pkgs.e16}/bin/e16 &
waitPID=$!
'';
};
environment.systemPackages = [ pkgs.e16 ];
};
}
nixos/tests/kernel-generic.nix
+2 -2
View File
@@ -1,7 +1,7 @@
{ system ? builtins.currentSystem
, config ? { }
, pkgs ? import ../.. { inherit system config; }
}:
}@args:
with pkgs.lib;
@@ -22,7 +22,7 @@ let
assert "Linux" in machine.succeed("uname -s")
assert "${linuxPackages.kernel.modDirVersion}" in machine.succeed("uname -a")
'';
}));
}) args);
in
with pkgs; {
linux_4_4 = makeKernelTest "4.4" linuxPackages_4_4;
pkgs/applications/audio/CHOWTapeModel/default.nix
+70
View File
@@ -0,0 +1,70 @@
{ alsaLib
, curl
, fetchFromGitHub
, freeglut
, freetype
, libGL
, libXcursor
, libXext
, libXinerama
, libXrandr
, libjack2
, pkg-config
, python3
, stdenv
, lib
}:
stdenv.mkDerivation rec {
pname = "CHOWTapeModel";
version = "unstable-2020-12-12";
src = fetchFromGitHub {
owner = "jatinchowdhury18";
repo = "AnalogTapeModel";
rev = "a7cf10c3f790d306ce5743bb731e4bc2c1230d70";
sha256 = "09nq8x2dwabncbp039dqm1brzcz55zg9kpxd4p5348xlaz5m4661";
fetchSubmodules = true;
};
nativeBuildInputs = [
pkg-config
];
buildInputs = [
alsaLib
curl
freeglut
freetype
libGL
libXcursor
libXext
libXinerama
libXrandr
libjack2
python3
];
buildPhase = ''
cd Plugin/
./build_linux.sh
'';
installPhase = ''
mkdir -p $out/lib/lv2 $out/lib/vst3 $out/bin $out/share/doc/CHOWTapeModel/
cd Builds/LinuxMakefile/build/
cp CHOWTapeModel.a $out/lib
cp -r CHOWTapeModel.lv2 $out/lib/lv2
cp -r CHOWTapeModel.vst3 $out/lib/vst3
cp CHOWTapeModel $out/bin
cp ../../../../Manual/ChowTapeManual.pdf $out/share/doc/CHOWTapeModel/
'';
meta = with lib; {
homepage = "https://github.com/jatinchowdhury18/AnalogTapeModel";
description = "Physical modelling signal processing for analog tape recording. LV2, VST3 and standalone";
license = with licenses; [ gpl3Only ];
maintainers = with maintainers; [ magnetophon ];
platforms = platforms.linux;
};
}
pkgs/applications/audio/bchoppr/default.nix
+2 -2
View File
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "bchoppr";
version = "1.10.4";
version = "1.10.6";
src = fetchFromGitHub {
owner = "sjaehn";
repo = pname;
rev = version;
sha256 = "sha256-/csds8QOgn5IogyMg/5PMKdlCISakS3GDkyj2tTt0BY=";
sha256 = "sha256-iCDAIV2p1OkZxOMo8A6zBrOGd49FXAGqLZWk0Kbvgec=";
};
nativeBuildInputs = [ pkg-config ];
pkgs/applications/audio/bsequencer/default.nix
+2 -2
View File
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "BSEQuencer";
version = "1.8.6";
version = "1.8.8";
src = fetchFromGitHub {
owner = "sjaehn";
repo = pname;
rev = version;
sha256 = "sha256-PZ2Ft7y2mbb5Wpa7mWPys2BVpcQC3WE5rKu2sRqkf8w=";
sha256 = "sha256-OArIMf0XP9CKDdb3H4s8jMzVRjoLFQDPmTS9rS2KW3w=";
};
nativeBuildInputs = [ pkg-config ];
pkgs/applications/audio/bshapr/default.nix
+2 -2
View File
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "BShapr";
version = "0.10";
version = "0.12";
src = fetchFromGitHub {
owner = "sjaehn";
repo = pname;
rev = "v${version}";
sha256 = "sha256-oEBsaIcw/Ltxr2CUPGBjwcxOPhNQoYPZDkfQE7QA940=";
sha256 = "sha256-2DySlD5ZTxeQ2U++Dr67bek5oVbAiOHCxM6S5rTTZN0=";
};
nativeBuildInputs = [ pkg-config ];
pkgs/applications/audio/bslizr/default.nix
+2 -2
View File
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "BSlizr";
version = "1.2.10";
version = "1.2.12";
src = fetchFromGitHub {
owner = "sjaehn";
repo = pname;
rev = version;
sha256 = "sha256-tEGJrVg8dN9Torybx02qIpXsGOuCgn/Wb+jemfCjiK4=";
sha256 = "sha256-vPkcgG+pAfjsPRMyxdMRUxWGch+RG+pdaAcekP5pKEA=";
};
nativeBuildInputs = [ pkg-config ];
pkgs/applications/audio/distrho/default.nix
+17 -18
View File
@@ -1,26 +1,23 @@
{ stdenv
{ lib
, stdenv
, alsaLib
, curl
, fetchFromGitHub
, fftwFloat
, freetype
, glib
, lib
, libGL
, libX11
, libXcursor
, libXext
, libXinerama
, libXrandr
, libXrender
, libgcc
, libglvnd
, libsecret
, meson
, ninja
, pkg-config
}:
let rpathLibs = [
fftwFloat
];
in
stdenv.mkDerivation rec {
pname = "distrho-ports";
version = "2021-03-15";
@@ -34,24 +31,26 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config meson ninja ];
buildInputs = [
buildInputs = rpathLibs ++ [
alsaLib
curl
fftwFloat
freetype
glib
libGL
libX11
libXcursor
libXext
libXinerama
libXrandr
libXrender
libgcc
libglvnd
libsecret
];
postFixup = ''
for file in \
$out/lib/lv2/vitalium.lv2/vitalium.so \
$out/lib/vst/vitalium.so \
$out/lib/vst3/vitalium.vst3/Contents/x86_64-linux/vitalium.so
do
patchelf --set-rpath "${lib.makeLibraryPath rpathLibs}:$(patchelf --print-rpath $file)" $file
done
'';
meta = with lib; {
homepage = "http://distrho.sourceforge.net/ports";
description = "Linux audio plugins and LV2 ports";
pkgs/applications/audio/drumgizmo/default.nix
+7 -15
View File
@@ -1,37 +1,29 @@
{ lib, stdenv, fetchurl, fetchpatch, alsaLib, expat, glib, libjack2, libXext, libX11, libpng
{ lib, stdenv, fetchurl, alsaLib, expat, glib, libjack2, libXext, libX11, libpng
, libpthreadstubs, libsmf, libsndfile, lv2, pkg-config, zita-resampler
}:
stdenv.mkDerivation rec {
version = "0.9.18.1";
version = "0.9.19";
pname = "drumgizmo";
src = fetchurl {
url = "https://www.drumgizmo.org/releases/${pname}-${version}/${pname}-${version}.tar.gz";
sha256 = "0bpbkzcr3znbwfdk79c14n5k5hh80iqlk2nc03q95vhimbadk8k7";
sha256 = "18x28vhif0c97xz02k22xwqxxig6fi6j0356mlz2vf7vb25z69kl";
};
patches = [
# Fix build for lv2 1.18.0
(fetchpatch {
url = "http://cgit.drumgizmo.org/plugingizmo.git/patch/?id=be64ddf9da525cd5c6757464efc966052731ba71";
sha256 = "17w8g78i5avssc7m8rpw64ka3rai8dff81wfzir9cpxp8s2h44qf";
extraPrefix = "plugin/plugingizmo/";
stripLen = 1;
})
];
configureFlags = [ "--enable-lv2" ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [
alsaLib expat glib libjack2 libXext libX11 libpng libpthreadstubs
libsmf libsndfile lv2 pkg-config zita-resampler
libsmf libsndfile lv2 zita-resampler
];
meta = with lib; {
description = "An LV2 sample based drum plugin";
homepage = "https://www.drumgizmo.org";
license = licenses.lgpl3;
license = licenses.lgpl3Plus;
platforms = platforms.linux;
maintainers = [ maintainers.goibhniu maintainers.nico202 ];
};
pkgs/applications/audio/geonkick/default.nix
+4 -5
View File
@@ -1,24 +1,23 @@
{ lib, stdenv, fetchFromGitLab, cmake, pkg-config, redkite, libsndfile, rapidjson
{ lib, stdenv, fetchFromGitLab, cmake, pkg-config, libsndfile, rapidjson
, libjack2, lv2, libX11, cairo }:
stdenv.mkDerivation rec {
pname = "geonkick";
version = "2.6.1";
version = "2.8.0";
src = fetchFromGitLab {
owner = "iurie-sw";
repo = pname;
rev = "v${version}";
sha256 = "1l647j11pb9lkknnh4q99mmfcvr644b02lfcdjh98z60vqm1s54c";
sha256 = "0dpwdjyy6phhr1jm1cabj2gc3rfsdan513mijbgnpzkq9w9jfb60";
};
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ redkite libsndfile rapidjson libjack2 lv2 libX11 cairo ];
buildInputs = [ libsndfile rapidjson libjack2 lv2 libX11 cairo ];
# https://github.com/iurie-sw/geonkick/issues/120
cmakeFlags = [
"-DGKICK_REDKITE_SDK_PATH=${redkite}"
"-DCMAKE_INSTALL_LIBDIR=lib"
];
pkgs/applications/audio/mopidy/default.nix
+21 -28
View File
@@ -1,46 +1,39 @@
{ newScope, python }:
{ lib, newScope, python }:
# Create a custom scope so we are consistent in which python version is used
lib.makeScope newScope (self: with self; {
inherit python;
pythonPackages = python.pkgs;
let
callPackage = newScope self;
mopidy = callPackage ./mopidy.nix { };
self = {
mopidy-iris = callPackage ./iris.nix { };
inherit python;
pythonPackages = python.pkgs;
mopidy-local = callPackage ./local.nix { };
mopidy = callPackage ./mopidy.nix { };
mopidy-moped = callPackage ./moped.nix { };
mopidy-iris = callPackage ./iris.nix { };
mopidy-mopify = callPackage ./mopify.nix { };
mopidy-local = callPackage ./local.nix { };
mopidy-mpd = callPackage ./mpd.nix { };
mopidy-moped = callPackage ./moped.nix { };
mopidy-mpris = callPackage ./mpris.nix { };
mopidy-mopify = callPackage ./mopify.nix { };
mopidy-musicbox-webclient = callPackage ./musicbox-webclient.nix { };
mopidy-mpd = callPackage ./mpd.nix { };
mopidy-scrobbler = callPackage ./scrobbler.nix { };
mopidy-mpris = callPackage ./mpris.nix { };
mopidy-somafm = callPackage ./somafm.nix { };
mopidy-musicbox-webclient = callPackage ./musicbox-webclient.nix { };
mopidy-soundcloud = callPackage ./soundcloud.nix { };
mopidy-scrobbler = callPackage ./scrobbler.nix { };
mopidy-spotify = callPackage ./spotify.nix { };
mopidy-somafm = callPackage ./somafm.nix { };
mopidy-spotify-tunigo = callPackage ./spotify-tunigo.nix { };
mopidy-soundcloud = callPackage ./soundcloud.nix { };
mopidy-tunein = callPackage ./tunein.nix { };
mopidy-spotify = callPackage ./spotify.nix { };
mopidy-youtube = callPackage ./youtube.nix { };
mopidy-spotify-tunigo = callPackage ./spotify-tunigo.nix { };
mopidy-tunein = callPackage ./tunein.nix { };
mopidy-youtube = callPackage ./youtube.nix { };
mopidy-subidy = callPackage ./subidy.nix { };
};
in self
mopidy-subidy = callPackage ./subidy.nix { };
})
pkgs/applications/audio/ncspot/bump-security-framework-crate.patch
-19
View File
@@ -1,19 +0,0 @@
Bump security-framework from 2.1.1 to 2.1.2
security-framework=2.1.1 doesn't build on Darwin 10.12.
https://github.com/kornelski/rust-security-framework/issues/124
--- c/Cargo.lock
+++ i/Cargo.lock
@@ -3138,9 +3138,9 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
[[package]]
name = "security-framework"
-version = "2.1.1"
+version = "2.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2dfd318104249865096c8da1dfabf09ddbb6d0330ea176812a62ec75e40c4166"
+checksum = "d493c5f39e02dfb062cd8f33301f90f9b13b650e8c1b1d0fd75c19dd64bff69d"
dependencies = [
"bitflags 1.2.1",
"core-foundation",
pkgs/applications/audio/ncspot/default.nix
+3 -5
View File
@@ -14,23 +14,21 @@ let
in
rustPlatform.buildRustPackage rec {
pname = "ncspot";
version = "0.5.0";
version = "0.6.0";
src = fetchFromGitHub {
owner = "hrkfdn";
repo = "ncspot";
rev = "v${version}";
sha256 = "1h1il2mzngxmcsl169431lwzl0skv420arg9i06856r5wil37jf7";
sha256 = "0j4ax3yh0l8v5bd5i3ijd8ys27dcrh7byigjip52mw1qlqfnh8wk";
};
cargoSha256 = "13yn7l4hhl48lbpj0zsbraqzkkz6knc373j6rcf8d1p4z76yili4";
cargoSha256 = "022q6rlac97dr6l7rd9xalgx0w257r364i1pij080qx8rk97msb9";
cargoBuildFlags = [ "--no-default-features" "--features" "${lib.concatStringsSep "," features}" ];
nativeBuildInputs = [ pkg-config ];
cargoPatches = [ ./bump-security-framework-crate.patch ];
buildInputs = [ ncurses openssl ]
++ lib.optional stdenv.isDarwin libiconv
++ lib.optional withALSA alsaLib
pkgs/applications/audio/x42-plugins/default.nix
+2 -2
View File
@@ -3,12 +3,12 @@
, libGLU, lv2, gtk2, cairo, pango, fftwFloat, zita-convolver }:
stdenv.mkDerivation rec {
version = "20200714";
version = "20210114";
pname = "x42-plugins";
src = fetchurl {
url = "https://gareus.org/misc/x42-plugins/${pname}-${version}.tar.xz";
sha256 = "1av05ykph8x67018hm9zfgh1vk0zi39mvrsxkj6bm4hkarxf0vvl";
sha256 = "sha256-xUiA/k5ZbI/SkY8a20FsyRwqPxxMteiFdEhFF/8e2OA=";
};
nativeBuildInputs = [ pkg-config ];
pkgs/applications/editors/jetbrains/default.nix
+2 -2
View File
@@ -386,12 +386,12 @@ in
rider = buildRider rec {
name = "rider-${version}";
version = "2021.1"; /* updated by script */
version = "2021.1.1"; /* updated by script */
description = "A cross-platform .NET IDE based on the IntelliJ platform and ReSharper";
license = lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/rider/JetBrains.Rider-${version}.tar.gz";
sha256 = "089j52sig2ac21v6zl9mvb7x4sr9c428nn930b41y3qd6bg52xxx"; /* updated by script */
sha256 = "00kdbsjw9hmq7x94pjscslv0b412g8l0jbvyi7jiyay8xc6wiaaj"; /* updated by script */
};
wmClass = "jetbrains-rider";
update-channel = "Rider RELEASE";
pkgs/applications/graphics/hydrus/default.nix
+4 -4
View File
@@ -10,14 +10,14 @@
pythonPackages.buildPythonPackage rec {
pname = "hydrus";
version = "431";
version = "434";
format = "other";
src = fetchFromGitHub {
owner = "hydrusnetwork";
repo = "hydrus";
rev = "v${version}";
sha256 = "0mfql27n725k6ynvhkgzmxxpfbjlzil2fjpy082gz257kb0880zy";
sha256 = "sha256-7Allc9zawja8DO2idv+MAYZ/cBRTCMd0mbgBLfEVii8=";
};
nativeBuildInputs = [
@@ -75,11 +75,11 @@ pythonPackages.buildPythonPackage rec {
-e TestServer \
'';
extraOutputsToLink = [ "doc" ];
outputs = [ "out" "doc" ];
postPatch = ''
sed 's;os\.path\.join(\sHC\.BIN_DIR,.*;"${miniupnpc_2}/bin/upnpc";' \
-i ./hydrus/core/HydrusNATPunch.py
-i ./hydrus/core/networking/HydrusNATPunch.py
sed 's;os\.path\.join(\sHC\.BIN_DIR,.*;"${swftools}/bin/swfrender";' \
-i ./hydrus/core/HydrusFlashHandling.py
pkgs/applications/graphics/lightburn/default.nix
+2 -2
View File
@@ -6,7 +6,7 @@
stdenv.mkDerivation rec {
pname = "lightburn";
version = "0.9.22";
version = "0.9.23";
nativeBuildInputs = [
p7zip
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://github.com/LightBurnSoftware/deployment/releases/download/${version}/LightBurn-Linux64-v${version}.7z";
sha256 = "sha256-DOiO36suytukkviqYyLL47DFVzsJt2ZfSnnni95CLaA=";
sha256 = "sha256-OiW9UBophyEF3J0FOSMkbwDJ6d8SEDNrr+H0B4Ndo/Y=";
};
buildInputs = [
pkgs/applications/graphics/megapixels/default.nix
+7 -5
View File
@@ -1,6 +1,6 @@
{ stdenv
, lib
, fetchgit
, fetchFromSourcehut
, meson
, ninja
, pkg-config
@@ -26,12 +26,13 @@ let
in
stdenv.mkDerivation rec {
pname = "megapixels";
version = "0.15.0";
version = "0.16.0";
src = fetchgit {
url = "https://git.sr.ht/~martijnbraam/megapixels";
src = fetchFromSourcehut {
owner = "~martijnbraam";
repo = "megapixels";
rev = version;
sha256 = "1y8irwi8lbjs948j90gpic96dx5wjmwacd41hb3d9vzhkyni2dvb";
sha256 = "0z7sx76x18yqf7carq6mg9lib0zbz0yrd1dsg9qd6hbf5niqis37";
};
nativeBuildInputs = [ meson ninja pkg-config wrapGAppsHook ];
@@ -49,6 +50,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "GTK3 camera application using raw v4l2 and media-requests";
homepage = "https://sr.ht/~martijnbraam/Megapixels";
changelog = "https://git.sr.ht/~martijnbraam/megapixels/refs/${version}";
license = licenses.gpl3Only;
maintainers = with maintainers; [ OPNA2608 ];
platforms = platforms.linux;
pkgs/applications/graphics/round/default.nix
+27
View File
@@ -0,0 +1,27 @@
{ lib
, buildGoModule
, fetchFromGitHub
}:
buildGoModule rec {
pname = "round";
version = "0.0.2";
src = fetchFromGitHub {
owner = "mingrammer";
repo = pname;
rev = "v${version}";
sha256 = "09brjr3h4qnhlidxlki1by5anahxy16ai078zm4k7ryl579amzdw";
};
vendorSha256 = null;
subPackages = [ "." ];
meta = with lib; {
description = "Round image corners from CLI";
homepage = "https://github.com/mingrammer/round";
license = licenses.mit;
maintainers = with maintainers; [ addict3d ];
};
}
pkgs/applications/misc/clight/default.nix
+2 -2
View File
@@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "clight";
version = "4.2";
version = "4.5";
src = fetchFromGitHub {
owner = "FedeDP";
repo = "Clight";
rev = version;
sha256 = "sha256-NmfnE6ZWgG9erBmrFFIhutnB1t2Ix/6jo+EeXYVtehg=";
sha256 = "sha256-fvi0JGNNDoxE0iH//HneYwQBBP4mY75AeViLHKQUI30=";
};
# dbus-1.pc has datadir=/etc
pkgs/applications/misc/logseq/default.nix
+2 -2
View File
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "logseq";
version = "0.0.15";
version = "0.0.16";
src = fetchurl {
url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-linux-x64-${version}.AppImage";
sha256 = "4mnS2ikDPmIyT4P8zXssk6AVx50C24bsP4WpD5xJbD8=";
sha256 = "dmgwFHJRy5qE71naRJKX0HCrVG0qQBOIM9TvCh4j/lY=";
name = "${pname}-${version}.AppImage";
};
pkgs/applications/misc/lutris/default.nix
+15 -4
View File
@@ -17,11 +17,13 @@
, dbus-python
, distro
, evdev
, lxml
, pillow
, pygobject3
, pyyaml
, requests
, keyring
, python_magic
# commands that lutris needs
, xrandr
@@ -71,13 +73,13 @@ let
in buildPythonApplication rec {
pname = "lutris-original";
version = "0.5.7.1";
version = "0.5.8.3";
src = fetchFromGitHub {
owner = "lutris";
repo = "lutris";
rev = "v${version}";
sha256 = "12ispwkbbm5aq263n3bdjmjfkpwplizacnqs2c0wnag4zj4kpm29";
sha256 = "sha256-NnWIP9oEndk/hDo5Z33pkmZ61pxT/ScmZ4YpS2ajK/8=";
};
nativeBuildInputs = [ wrapGAppsHook ];
@@ -94,7 +96,16 @@ in buildPythonApplication rec {
] ++ gstDeps;
propagatedBuildInputs = [
evdev distro pyyaml pygobject3 requests pillow dbus-python keyring
evdev
distro
lxml
pyyaml
pygobject3
requests
pillow
dbus-python
keyring
python_magic
];
# avoid double wrapping
@@ -112,7 +123,7 @@ in buildPythonApplication rec {
meta = with lib; {
homepage = "https://lutris.net";
description = "Open Source gaming platform for GNU/Linux";
license = licenses.gpl3;
license = licenses.gpl3Plus;
maintainers = with maintainers; [ chiiruno ];
platforms = platforms.linux;
};
pkgs/applications/misc/navi/default.nix
+6 -4
View File
@@ -1,20 +1,22 @@
{ fetchFromGitHub, fzf, lib, makeWrapper, rustPlatform, wget }:
{ stdenv, fetchFromGitHub, fzf, lib, makeWrapper, rustPlatform, wget, libiconv }:
rustPlatform.buildRustPackage rec {
pname = "navi";
version = "2.14.0";
version = "2.15.0";
src = fetchFromGitHub {
owner = "denisidoro";
repo = "navi";
rev = "v${version}";
sha256 = "sha256-4XR+HazX65jiMvZpLNMNOc8gVVAxMx3bNcVNT6UPJ3o=";
sha256 = "sha256-qcfSGV/+FkyWGAApekRZHWGmeB9gIURt11DKn7lEh+o=";
};
cargoSha256 = "sha256-ZBs9/yoY3na21rQd5zJzFujZZSq2BDoENKYAWI1fnTg=";
cargoSha256 = "sha256-HpGzDZMIzO0lpussmm+kJNOU7zghcYrQWZo3WZ5FOmA=";
nativeBuildInputs = [ makeWrapper ];
buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];
postInstall = ''
wrapProgram $out/bin/navi \
--prefix PATH : "$out/bin" \
pkgs/applications/misc/stretchly/default.nix
+3 -6
View File
@@ -2,24 +2,21 @@
, lib
, fetchurl
, makeWrapper
, electron_9
, electron
, common-updater-scripts
, writeShellScript
, jq
, makeDesktopItem
}:
let
electron = electron_9;
in
stdenv.mkDerivation rec {
pname = "stretchly";
version = "1.2.0";
version = "1.5.0";
src = fetchurl {
url = "https://github.com/hovancik/stretchly/releases/download/v${version}/stretchly-${version}.tar.xz";
sha256 = "07v9yk9qgya9ladfgbfkwwnbzvczs1cv6yn3zrg9rviyv8zlqjls";
sha256 = "19czwmwqsn82zdzln9zqqyl9sb3dm95gp58dqn1459gyinkzpvda";
};
icon = fetchurl {
pkgs/applications/misc/unipicker/default.nix
+2 -2
View File
@@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
pname = "unipicker";
version = "unstable-2018-07-10";
version = "2.0.1";
src = fetchFromGitHub {
owner = "jeremija";
repo = pname;
rev = "767571c87cdb1e654408d19fc4db98e5e6725c04";
rev = "v${version}";
sha256 = "1k4v53pm3xivwg9vq2kndpcmah0yn4679r5jzxvg38bbkfdk86c1";
};
pkgs/applications/networking/browsers/chromium/browser.nix
-1
View File
@@ -89,6 +89,5 @@ mkChromiumDerivation (base: rec {
then ["aarch64-linux" "x86_64-linux"]
else [];
timeout = 172800; # 48 hours (increased from the Hydra default of 10h)
broken = elem channel [ "dev" ];
};
})
pkgs/applications/networking/browsers/chromium/common.nix
+9 -2
View File
@@ -161,8 +161,15 @@ let
url = "https://raw.githubusercontent.com/archlinux/svntogit-packages/61b0ab526d2aa3c62fa20bb756461ca9a482f6c6/trunk/chromium-fix-libva-redef.patch";
sha256 = "1qj4sn1ngz0p1l1w3346kanr1sqlr3xdzk1f1i86lqa45mhv77ny";
}) ++ optional (chromiumVersionAtLeast "90")
./fix-missing-atspi2-dependency.patch
;
./patches/fix-missing-atspi2-dependency.patch
++ optionals (chromiumVersionAtLeast "91") [
./patches/closure_compiler-Use-the-Java-binary-from-the-system.patch
(githubPatch
# Revert "Reland #7 of "Force Python 3 to be used in build.""
"38b6a9a8e5901766613879b6976f207aa163588a"
"1lvxbd7rl6hz5j6kh6q83yb6vd9g7anlqbai8g1w1bp6wdpgwvp9"
)
];
postPatch = ''
# remove unused third-party
pkgs/applications/networking/browsers/chromium/patches/closure_compiler-Use-the-Java-binary-from-the-system.patch
+31
View File
@@ -0,0 +1,31 @@
From e031b8be0fb2a22f953c034cdf08ca9befe130d2 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Sun, 11 Apr 2021 18:05:12 +0200
Subject: [PATCH] closure_compiler: Use the Java binary from the system
The bundled Java binary (third_party/jdk/current/bin/java) is missing in
the tarball and we want to use the one from the system anyway.
This reverts part of [0].
[0]: https://chromium-review.googlesource.com/c/chromium/src/+/2778794
---
third_party/closure_compiler/compiler.py | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/third_party/closure_compiler/compiler.py b/third_party/closure_compiler/compiler.py
index 75690ceb9749..7b9c76f74290 100755
--- a/third_party/closure_compiler/compiler.py
+++ b/third_party/closure_compiler/compiler.py
@@ -13,8 +13,7 @@ import subprocess
_CURRENT_DIR = os.path.join(os.path.dirname(__file__))
-_JAVA_PATH = os.path.join(_CURRENT_DIR, "..", "jdk", "current", "bin", "java")
-assert os.path.isfile(_JAVA_PATH), "java only allowed in android builds"
+_JAVA_PATH = "java"
class Compiler(object):
"""Runs the Closure compiler on given source files to typecheck them
--
2.20.1
pkgs/applications/networking/browsers/chromium/fix-missing-atspi2-dependency.patch → pkgs/applications/networking/browsers/chromium/patches/fix-missing-atspi2-dependency.patch
View File
pkgs/applications/networking/browsers/chromium/upstream-info.json
+3 -3
View File
@@ -18,9 +18,9 @@
}
},
"beta": {
"version": "90.0.4430.61",
"sha256": "01vssy3q64pv9rw4cdxv5rdg7yrxmhyc03a5r75fhxc95fj66iac",
"sha256bin64": "07l8dzyv0hav1gls3xw91q9ay2l8xxmsf7yagg940cya9ncl0lhi",
"version": "90.0.4430.70",
"sha256": "0jnyqnqwdccv3i55grd12wr2w5ffxyzmj2l3c1i24xawf2zdzyym",
"sha256bin64": "1lv9gz6llphyvlvn92yw1cyhj4i6jzhy1l7hk01418prmhb4nfws",
"deps": {
"gn": {
"version": "2021-02-09",
pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix
+2 -2
View File
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "helm-secrets";
version = "3.5.0";
version = "3.6.1";
src = fetchFromGitHub {
owner = "jkroepke";
repo = pname;
rev = "v${version}";
hash = "sha256-EXCr0QjupsBBKTm6Opw5bcNwAD4FGGyOiqaa8L91/OI=";
hash = "sha256-RACETma0AaqaAfe0HWC541/i+knr+emMUauFWnkEuMI=";
};
nativeBuildInputs = [ makeWrapper ];
pkgs/applications/networking/cluster/minikube/default.nix
+3 -3
View File
@@ -11,9 +11,9 @@
buildGoModule rec {
pname = "minikube";
version = "1.18.1";
version = "1.19.0";
vendorSha256 = "sha256-rw1tqz+Y5iSXWIxXV4433Hwgyfz8jYMzKWurCi2hmhM=";
vendorSha256 = "sha256-WGW2uz3YJIUjLsYQ6rXNvgJGLrZSIkEEk07llLzMVXA=";
doCheck = false;
@@ -21,7 +21,7 @@ buildGoModule rec {
owner = "kubernetes";
repo = "minikube";
rev = "v${version}";
sha256 = "sha256-8QI/Kn5LHSD3at7icmEDhjuYP811A4l+2KrRmKTwi8w=";
sha256 = "sha256-F+nPSWX9gs/hvOR6g8MW4b+JW+w3ScDaaF/FLHbLspY=";
};
nativeBuildInputs = [ go-bindata installShellFiles pkg-config which ];
pkgs/applications/networking/cluster/nixops/poetry-git-overlay.nix
+8 -8
View File
@@ -5,8 +5,8 @@ self: super: {
_: {
src = pkgs.fetchgit {
url = "https://github.com/NixOS/nixops.git";
rev = "1ed5a091bc52de6c91319f446f833018a1cb326e";
sha256 = "1fx17qv9cl7hz7322zh4xlg02xn7bwwjj82cdcvqpsjf83crz3xi";
rev = "45256745cef246dabe1ae8a7d109988f190cd7ef";
sha256 = "0ni1v8ppg5cf35gq7nzd50kajxzp5zkbzhf022in0fgbjcprlzr2";
};
}
);
@@ -15,8 +15,8 @@ self: super: {
_: {
src = pkgs.fetchgit {
url = "https://github.com/NixOS/nixops-aws.git";
rev = "dbbaa1b15b6cf7ca1ceeb0a6195f5ee27693c505";
sha256 = "13gw3h7g19a0s7dpayjfksrmw6g0364dcm5z2d6mlyzdkfgak4jn";
rev = "3f66ee06f689021cd4c985b9b49697bdda64d961";
sha256 = "17vn8bpy9kr259anmh3g5xwp08q69l9sz7s3nzn8sy5flqa87w50";
};
}
);
@@ -25,8 +25,8 @@ self: super: {
_: {
src = pkgs.fetchgit {
url = "https://github.com/nix-community/nixops-encrypted-links.git";
rev = "0bb9aa50a7294ee9dca10a18ff7d9024234913e1";
sha256 = "00wj03wcry83acwljq5v80dyrqaxpqb4j3jsdkfy3d7n5g4aq19l";
rev = "e2f196fce15fcfb00d18c055e1ac53aec33b8fb1";
sha256 = "12ynqwd5ad6wfyv6sma55wnmrlr8i14kd5d42zqv4zl23h0xnd6m";
};
}
);
@@ -35,8 +35,8 @@ self: super: {
_: {
src = pkgs.fetchgit {
url = "https://github.com/nix-community/nixops-gce.git";
rev = "23596af53eabc4e3bcf72beaaed82b2c8d40e419";
sha256 = "10gfdhf4b3ldrpns8z66mqxwfcbgf9ccz8fx0rcp7gsgsffb0i3c";
rev = "fed6aadace9a9e914425589c065bb969d53f2309";
sha256 = "096ic1kzlcv8cx51hnhlq37pkg4pis2rk5kri14dwp3865si1mdw";
};
}
);
pkgs/applications/networking/cluster/nixops/poetry.lock
Generated
+81 -85
View File
@@ -38,20 +38,20 @@ python-versions = "*"
[[package]]
name = "boto3"
version = "1.17.0"
version = "1.17.35"
description = "The AWS SDK for Python"
category = "main"
optional = false
python-versions = ">= 2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*"
[package.dependencies]
botocore = ">=1.20.0,<1.21.0"
botocore = ">=1.20.35,<1.21.0"
jmespath = ">=0.7.1,<1.0.0"
s3transfer = ">=0.3.0,<0.4.0"
[[package]]
name = "botocore"
version = "1.20.0"
version = "1.20.35"
description = "Low-level, data-driven core of boto 3."
category = "main"
optional = false
@@ -62,6 +62,9 @@ jmespath = ">=0.7.1,<1.0.0"
python-dateutil = ">=2.1,<3.0.0"
urllib3 = ">=1.25.4,<1.27"
[package.extras]
crt = ["awscrt (==0.10.8)"]
[[package]]
name = "certifi"
version = "2020.12.5"
@@ -72,7 +75,7 @@ python-versions = "*"
[[package]]
name = "cffi"
version = "1.14.4"
version = "1.14.5"
description = "Foreign Function Interface for Python calling C code."
category = "main"
optional = false
@@ -99,22 +102,22 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
[[package]]
name = "cryptography"
version = "3.3.1"
version = "3.4.6"
description = "cryptography is a package which provides cryptographic recipes and primitives to Python developers."
category = "main"
optional = false
python-versions = ">=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*"
python-versions = ">=3.6"
[package.dependencies]
cffi = ">=1.12"
six = ">=1.4.1"
[package.extras]
docs = ["sphinx (>=1.6.5,!=1.8.0,!=3.1.0,!=3.1.1)", "sphinx-rtd-theme"]
docstest = ["doc8", "pyenchant (>=1.6.11)", "twine (>=1.12.0)", "sphinxcontrib-spelling (>=4.0.1)"]
pep8test = ["black", "flake8", "flake8-import-order", "pep8-naming"]
sdist = ["setuptools-rust (>=0.11.4)"]
ssh = ["bcrypt (>=3.1.5)"]
test = ["pytest (>=3.6.0,!=3.9.0,!=3.9.1,!=3.9.2)", "pretend", "iso8601", "pytz", "hypothesis (>=1.11.4,!=3.79.2)"]
test = ["pytest (>=6.0)", "pytest-cov", "pytest-subtests", "pytest-xdist", "pretend", "iso8601", "pytz", "hypothesis (>=1.11.4,!=3.79.2)"]
[[package]]
name = "docutils"
@@ -197,7 +200,7 @@ typing-extensions = "^3.7.4"
type = "git"
url = "https://github.com/NixOS/nixops.git"
reference = "master"
resolved_reference = "1ed5a091bc52de6c91319f446f833018a1cb326e"
resolved_reference = "45256745cef246dabe1ae8a7d109988f190cd7ef"
[[package]]
name = "nixops-aws"
@@ -219,7 +222,7 @@ typing-extensions = "^3.7.4"
type = "git"
url = "https://github.com/NixOS/nixops-aws.git"
reference = "master"
resolved_reference = "dbbaa1b15b6cf7ca1ceeb0a6195f5ee27693c505"
resolved_reference = "3f66ee06f689021cd4c985b9b49697bdda64d961"
[[package]]
name = "nixops-encrypted-links"
@@ -237,7 +240,7 @@ nixops = "branch master"
type = "git"
url = "https://github.com/nix-community/nixops-encrypted-links.git"
reference = "master"
resolved_reference = "0bb9aa50a7294ee9dca10a18ff7d9024234913e1"
resolved_reference = "e2f196fce15fcfb00d18c055e1ac53aec33b8fb1"
[[package]]
name = "nixops-gcp"
@@ -258,7 +261,7 @@ nixos-modules-contrib = "branch master"
type = "git"
url = "https://github.com/nix-community/nixops-gce.git"
reference = "master"
resolved_reference = "23596af53eabc4e3bcf72beaaed82b2c8d40e419"
resolved_reference = "fed6aadace9a9e914425589c065bb969d53f2309"
[[package]]
name = "nixops-virtd"
@@ -355,7 +358,7 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
[[package]]
name = "pygments"
version = "2.7.4"
version = "2.8.1"
description = "Pygments is a syntax highlighting package written in Python."
category = "dev"
optional = false
@@ -408,7 +411,7 @@ socks = ["PySocks (>=1.5.6,!=1.5.7)", "win-inet-pton"]
[[package]]
name = "s3transfer"
version = "0.3.4"
version = "0.3.6"
description = "An Amazon S3 Transfer Manager"
category = "main"
optional = false
@@ -435,7 +438,7 @@ python-versions = "*"
[[package]]
name = "sphinx"
version = "3.4.3"
version = "3.5.3"
description = "Python documentation generator"
category = "dev"
optional = false
@@ -461,7 +464,7 @@ sphinxcontrib-serializinghtml = "*"
[package.extras]
docs = ["sphinxcontrib-websupport"]
lint = ["flake8 (>=3.5.0)", "isort", "mypy (>=0.790)", "docutils-stubs"]
lint = ["flake8 (>=3.5.0)", "isort", "mypy (>=0.800)", "docutils-stubs"]
test = ["pytest", "pytest-cov", "html5lib", "cython", "typed-ast"]
[[package]]
@@ -537,7 +540,7 @@ test = ["pytest"]
[[package]]
name = "typeguard"
version = "2.10.0"
version = "2.11.1"
description = "Run-time type checker for Python"
category = "main"
optional = false
@@ -545,7 +548,7 @@ python-versions = ">=3.5.3"
[package.extras]
doc = ["sphinx-rtd-theme", "sphinx-autodoc-typehints (>=1.2.0)"]
test = ["pytest", "typing-extensions"]
test = ["pytest", "typing-extensions", "mypy"]
[[package]]
name = "typing-extensions"
@@ -557,16 +560,16 @@ python-versions = "*"
[[package]]
name = "urllib3"
version = "1.26.3"
version = "1.26.4"
description = "HTTP library with thread-safe connection pooling, file post, and more."
category = "main"
optional = false
python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, <4"
[package.extras]
brotli = ["brotlipy (>=0.6.0)"]
secure = ["pyOpenSSL (>=0.14)", "cryptography (>=1.3.4)", "idna (>=2.0.0)", "certifi", "ipaddress"]
socks = ["PySocks (>=1.5.6,!=1.5.7,<2.0)"]
brotli = ["brotlipy (>=0.6.0)"]
[metadata]
lock-version = "1.1"
@@ -591,55 +594,55 @@ boto = [
{file = "boto-2.49.0.tar.gz", hash = "sha256:ea0d3b40a2d852767be77ca343b58a9e3a4b00d9db440efb8da74b4e58025e5a"},
]
boto3 = [
{file = "boto3-1.17.0-py2.py3-none-any.whl", hash = "sha256:b4860f56bc585d3d1fde90d288da5eb4d1198401d72201dc3e25de8887b080e2"},
{file = "boto3-1.17.0.tar.gz", hash = "sha256:2a39bd5e5f2d50ce9267d682cc92750f8771399665021f47e80f9c8d2fb812a6"},
{file = "boto3-1.17.35-py2.py3-none-any.whl", hash = "sha256:1e6e06b2f1eee5a76acdde1e7b4f57c93c1bf2905341207d74f2a140ce060cd8"},
{file = "boto3-1.17.35.tar.gz", hash = "sha256:40e84a5f7888924db74a2710dbe48d066b51fe1f5549efaffe90e6efe813f37b"},
]
botocore = [
{file = "botocore-1.20.0-py2.py3-none-any.whl", hash = "sha256:634b39ab0d55477cfbffb0e5dff31b7ab4bb171b04a0c69f8bcf65135f26ba94"},
{file = "botocore-1.20.0.tar.gz", hash = "sha256:a608d6d644b852f3c154fc433eaae52febbebc7c474fa8f4d666797d0931770a"},
{file = "botocore-1.20.35-py2.py3-none-any.whl", hash = "sha256:e34bbb7d7de154c2ff2a73ae0691c601a69c5bda887374c8a6a23072380b07a4"},
{file = "botocore-1.20.35.tar.gz", hash = "sha256:9119ffb231145ffadd55391c9356dcdb18e3de65c3a7c82844634e949f0ca5a0"},
]
certifi = [
{file = "certifi-2020.12.5-py2.py3-none-any.whl", hash = "sha256:719a74fb9e33b9bd44cc7f3a8d94bc35e4049deebe19ba7d8e108280cfd59830"},
{file = "certifi-2020.12.5.tar.gz", hash = "sha256:1a4995114262bffbc2413b159f2a1a480c969de6e6eb13ee966d470af86af59c"},
]
cffi = [
{file = "cffi-1.14.4-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:ebb253464a5d0482b191274f1c8bf00e33f7e0b9c66405fbffc61ed2c839c775"},
{file = "cffi-1.14.4-cp27-cp27m-manylinux1_i686.whl", hash = "sha256:2c24d61263f511551f740d1a065eb0212db1dbbbbd241db758f5244281590c06"},
{file = "cffi-1.14.4-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:9f7a31251289b2ab6d4012f6e83e58bc3b96bd151f5b5262467f4bb6b34a7c26"},
{file = "cffi-1.14.4-cp27-cp27m-win32.whl", hash = "sha256:5cf4be6c304ad0b6602f5c4e90e2f59b47653ac1ed9c662ed379fe48a8f26b0c"},
{file = "cffi-1.14.4-cp27-cp27m-win_amd64.whl", hash = "sha256:f60567825f791c6f8a592f3c6e3bd93dd2934e3f9dac189308426bd76b00ef3b"},
{file = "cffi-1.14.4-cp27-cp27mu-manylinux1_i686.whl", hash = "sha256:c6332685306b6417a91b1ff9fae889b3ba65c2292d64bd9245c093b1b284809d"},
{file = "cffi-1.14.4-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:d9efd8b7a3ef378dd61a1e77367f1924375befc2eba06168b6ebfa903a5e59ca"},
{file = "cffi-1.14.4-cp35-cp35m-macosx_10_9_x86_64.whl", hash = "sha256:51a8b381b16ddd370178a65360ebe15fbc1c71cf6f584613a7ea08bfad946698"},
{file = "cffi-1.14.4-cp35-cp35m-manylinux1_i686.whl", hash = "sha256:1d2c4994f515e5b485fd6d3a73d05526aa0fcf248eb135996b088d25dfa1865b"},
{file = "cffi-1.14.4-cp35-cp35m-manylinux1_x86_64.whl", hash = "sha256:af5c59122a011049aad5dd87424b8e65a80e4a6477419c0c1015f73fb5ea0293"},
{file = "cffi-1.14.4-cp35-cp35m-win32.whl", hash = "sha256:594234691ac0e9b770aee9fcdb8fa02c22e43e5c619456efd0d6c2bf276f3eb2"},
{file = "cffi-1.14.4-cp35-cp35m-win_amd64.whl", hash = "sha256:64081b3f8f6f3c3de6191ec89d7dc6c86a8a43911f7ecb422c60e90c70be41c7"},
{file = "cffi-1.14.4-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:f803eaa94c2fcda012c047e62bc7a51b0bdabda1cad7a92a522694ea2d76e49f"},
{file = "cffi-1.14.4-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:105abaf8a6075dc96c1fe5ae7aae073f4696f2905fde6aeada4c9d2926752362"},
{file = "cffi-1.14.4-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:0638c3ae1a0edfb77c6765d487fee624d2b1ee1bdfeffc1f0b58c64d149e7eec"},
{file = "cffi-1.14.4-cp36-cp36m-manylinux2014_aarch64.whl", hash = "sha256:7c6b1dece89874d9541fc974917b631406233ea0440d0bdfbb8e03bf39a49b3b"},
{file = "cffi-1.14.4-cp36-cp36m-win32.whl", hash = "sha256:155136b51fd733fa94e1c2ea5211dcd4c8879869008fc811648f16541bf99668"},
{file = "cffi-1.14.4-cp36-cp36m-win_amd64.whl", hash = "sha256:6bc25fc545a6b3d57b5f8618e59fc13d3a3a68431e8ca5fd4c13241cd70d0009"},
{file = "cffi-1.14.4-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:a7711edca4dcef1a75257b50a2fbfe92a65187c47dab5a0f1b9b332c5919a3fb"},
{file = "cffi-1.14.4-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:00e28066507bfc3fe865a31f325c8391a1ac2916219340f87dfad602c3e48e5d"},
{file = "cffi-1.14.4-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:798caa2a2384b1cbe8a2a139d80734c9db54f9cc155c99d7cc92441a23871c03"},
{file = "cffi-1.14.4-cp37-cp37m-manylinux2014_aarch64.whl", hash = "sha256:a5ed8c05548b54b998b9498753fb9cadbfd92ee88e884641377d8a8b291bcc01"},
{file = "cffi-1.14.4-cp37-cp37m-win32.whl", hash = "sha256:00a1ba5e2e95684448de9b89888ccd02c98d512064b4cb987d48f4b40aa0421e"},
{file = "cffi-1.14.4-cp37-cp37m-win_amd64.whl", hash = "sha256:9cc46bc107224ff5b6d04369e7c595acb700c3613ad7bcf2e2012f62ece80c35"},
{file = "cffi-1.14.4-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:df5169c4396adc04f9b0a05f13c074df878b6052430e03f50e68adf3a57aa28d"},
{file = "cffi-1.14.4-cp38-cp38-manylinux1_i686.whl", hash = "sha256:9ffb888f19d54a4d4dfd4b3f29bc2c16aa4972f1c2ab9c4ab09b8ab8685b9c2b"},
{file = "cffi-1.14.4-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:8d6603078baf4e11edc4168a514c5ce5b3ba6e3e9c374298cb88437957960a53"},
{file = "cffi-1.14.4-cp38-cp38-manylinux2014_aarch64.whl", hash = "sha256:d5ff0621c88ce83a28a10d2ce719b2ee85635e85c515f12bac99a95306da4b2e"},
{file = "cffi-1.14.4-cp38-cp38-win32.whl", hash = "sha256:b4e248d1087abf9f4c10f3c398896c87ce82a9856494a7155823eb45a892395d"},
{file = "cffi-1.14.4-cp38-cp38-win_amd64.whl", hash = "sha256:ec80dc47f54e6e9a78181ce05feb71a0353854cc26999db963695f950b5fb375"},
{file = "cffi-1.14.4-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:840793c68105fe031f34d6a086eaea153a0cd5c491cde82a74b420edd0a2b909"},
{file = "cffi-1.14.4-cp39-cp39-manylinux1_i686.whl", hash = "sha256:b18e0a9ef57d2b41f5c68beefa32317d286c3d6ac0484efd10d6e07491bb95dd"},
{file = "cffi-1.14.4-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:045d792900a75e8b1e1b0ab6787dd733a8190ffcf80e8c8ceb2fb10a29ff238a"},
{file = "cffi-1.14.4-cp39-cp39-manylinux2014_aarch64.whl", hash = "sha256:7ef7d4ced6b325e92eb4d3502946c78c5367bc416398d387b39591532536734e"},
{file = "cffi-1.14.4-cp39-cp39-win32.whl", hash = "sha256:ba4e9e0ae13fc41c6b23299545e5ef73055213e466bd107953e4a013a5ddd7e3"},
{file = "cffi-1.14.4-cp39-cp39-win_amd64.whl", hash = "sha256:f032b34669220030f905152045dfa27741ce1a6db3324a5bc0b96b6c7420c87b"},
{file = "cffi-1.14.4.tar.gz", hash = "sha256:1a465cbe98a7fd391d47dce4b8f7e5b921e6cd805ef421d04f5f66ba8f06086c"},
{file = "cffi-1.14.5-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:bb89f306e5da99f4d922728ddcd6f7fcebb3241fc40edebcb7284d7514741991"},
{file = "cffi-1.14.5-cp27-cp27m-manylinux1_i686.whl", hash = "sha256:34eff4b97f3d982fb93e2831e6750127d1355a923ebaeeb565407b3d2f8d41a1"},
{file = "cffi-1.14.5-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:99cd03ae7988a93dd00bcd9d0b75e1f6c426063d6f03d2f90b89e29b25b82dfa"},
{file = "cffi-1.14.5-cp27-cp27m-win32.whl", hash = "sha256:65fa59693c62cf06e45ddbb822165394a288edce9e276647f0046e1ec26920f3"},
{file = "cffi-1.14.5-cp27-cp27m-win_amd64.whl", hash = "sha256:51182f8927c5af975fece87b1b369f722c570fe169f9880764b1ee3bca8347b5"},
{file = "cffi-1.14.5-cp27-cp27mu-manylinux1_i686.whl", hash = "sha256:43e0b9d9e2c9e5d152946b9c5fe062c151614b262fda2e7b201204de0b99e482"},
{file = "cffi-1.14.5-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:cbde590d4faaa07c72bf979734738f328d239913ba3e043b1e98fe9a39f8b2b6"},
{file = "cffi-1.14.5-cp35-cp35m-macosx_10_9_x86_64.whl", hash = "sha256:5de7970188bb46b7bf9858eb6890aad302577a5f6f75091fd7cdd3ef13ef3045"},
{file = "cffi-1.14.5-cp35-cp35m-manylinux1_i686.whl", hash = "sha256:a465da611f6fa124963b91bf432d960a555563efe4ed1cc403ba5077b15370aa"},
{file = "cffi-1.14.5-cp35-cp35m-manylinux1_x86_64.whl", hash = "sha256:d42b11d692e11b6634f7613ad8df5d6d5f8875f5d48939520d351007b3c13406"},
{file = "cffi-1.14.5-cp35-cp35m-win32.whl", hash = "sha256:72d8d3ef52c208ee1c7b2e341f7d71c6fd3157138abf1a95166e6165dd5d4369"},
{file = "cffi-1.14.5-cp35-cp35m-win_amd64.whl", hash = "sha256:29314480e958fd8aab22e4a58b355b629c59bf5f2ac2492b61e3dc06d8c7a315"},
{file = "cffi-1.14.5-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:3d3dd4c9e559eb172ecf00a2a7517e97d1e96de2a5e610bd9b68cea3925b4892"},
{file = "cffi-1.14.5-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:48e1c69bbacfc3d932221851b39d49e81567a4d4aac3b21258d9c24578280058"},
{file = "cffi-1.14.5-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:69e395c24fc60aad6bb4fa7e583698ea6cc684648e1ffb7fe85e3c1ca131a7d5"},
{file = "cffi-1.14.5-cp36-cp36m-manylinux2014_aarch64.whl", hash = "sha256:9e93e79c2551ff263400e1e4be085a1210e12073a31c2011dbbda14bda0c6132"},
{file = "cffi-1.14.5-cp36-cp36m-win32.whl", hash = "sha256:58e3f59d583d413809d60779492342801d6e82fefb89c86a38e040c16883be53"},
{file = "cffi-1.14.5-cp36-cp36m-win_amd64.whl", hash = "sha256:005a36f41773e148deac64b08f233873a4d0c18b053d37da83f6af4d9087b813"},
{file = "cffi-1.14.5-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:2894f2df484ff56d717bead0a5c2abb6b9d2bf26d6960c4604d5c48bbc30ee73"},
{file = "cffi-1.14.5-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:0857f0ae312d855239a55c81ef453ee8fd24136eaba8e87a2eceba644c0d4c06"},
{file = "cffi-1.14.5-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:cd2868886d547469123fadc46eac7ea5253ea7fcb139f12e1dfc2bbd406427d1"},
{file = "cffi-1.14.5-cp37-cp37m-manylinux2014_aarch64.whl", hash = "sha256:35f27e6eb43380fa080dccf676dece30bef72e4a67617ffda586641cd4508d49"},
{file = "cffi-1.14.5-cp37-cp37m-win32.whl", hash = "sha256:9ff227395193126d82e60319a673a037d5de84633f11279e336f9c0f189ecc62"},
{file = "cffi-1.14.5-cp37-cp37m-win_amd64.whl", hash = "sha256:9cf8022fb8d07a97c178b02327b284521c7708d7c71a9c9c355c178ac4bbd3d4"},
{file = "cffi-1.14.5-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:8b198cec6c72df5289c05b05b8b0969819783f9418e0409865dac47288d2a053"},
{file = "cffi-1.14.5-cp38-cp38-manylinux1_i686.whl", hash = "sha256:ad17025d226ee5beec591b52800c11680fca3df50b8b29fe51d882576e039ee0"},
{file = "cffi-1.14.5-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:6c97d7350133666fbb5cf4abdc1178c812cb205dc6f41d174a7b0f18fb93337e"},
{file = "cffi-1.14.5-cp38-cp38-manylinux2014_aarch64.whl", hash = "sha256:8ae6299f6c68de06f136f1f9e69458eae58f1dacf10af5c17353eae03aa0d827"},
{file = "cffi-1.14.5-cp38-cp38-win32.whl", hash = "sha256:b85eb46a81787c50650f2392b9b4ef23e1f126313b9e0e9013b35c15e4288e2e"},
{file = "cffi-1.14.5-cp38-cp38-win_amd64.whl", hash = "sha256:1f436816fc868b098b0d63b8920de7d208c90a67212546d02f84fe78a9c26396"},
{file = "cffi-1.14.5-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:1071534bbbf8cbb31b498d5d9db0f274f2f7a865adca4ae429e147ba40f73dea"},
{file = "cffi-1.14.5-cp39-cp39-manylinux1_i686.whl", hash = "sha256:9de2e279153a443c656f2defd67769e6d1e4163952b3c622dcea5b08a6405322"},
{file = "cffi-1.14.5-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:6e4714cc64f474e4d6e37cfff31a814b509a35cb17de4fb1999907575684479c"},
{file = "cffi-1.14.5-cp39-cp39-manylinux2014_aarch64.whl", hash = "sha256:158d0d15119b4b7ff6b926536763dc0714313aa59e320ddf787502c70c4d4bee"},
{file = "cffi-1.14.5-cp39-cp39-win32.whl", hash = "sha256:afb29c1ba2e5a3736f1c301d9d0abe3ec8b86957d04ddfa9d7a6a42b9367e396"},
{file = "cffi-1.14.5-cp39-cp39-win_amd64.whl", hash = "sha256:f2d45f97ab6bb54753eab54fffe75aaf3de4ff2341c9daee1987ee1837636f1d"},
{file = "cffi-1.14.5.tar.gz", hash = "sha256:fd78e5fee591709f32ef6edb9a015b4aa1a5022598e36227500c8f4e02328d9c"},
]
chardet = [
{file = "chardet-4.0.0-py2.py3-none-any.whl", hash = "sha256:f864054d66fd9118f2e67044ac8981a54775ec5b67aed0441892edb553d21da5"},
@@ -650,20 +653,13 @@ colorama = [
{file = "colorama-0.4.4.tar.gz", hash = "sha256:5941b2b48a20143d2267e95b1c2a7603ce057ee39fd88e7329b0c292aa16869b"},
]
cryptography = [
{file = "cryptography-3.3.1-cp27-cp27m-macosx_10_10_x86_64.whl", hash = "sha256:c366df0401d1ec4e548bebe8f91d55ebcc0ec3137900d214dd7aac8427ef3030"},
{file = "cryptography-3.3.1-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:9f6b0492d111b43de5f70052e24c1f0951cb9e6022188ebcb1cc3a3d301469b0"},
{file = "cryptography-3.3.1-cp27-cp27m-manylinux2010_x86_64.whl", hash = "sha256:a69bd3c68b98298f490e84519b954335154917eaab52cf582fa2c5c7efc6e812"},
{file = "cryptography-3.3.1-cp27-cp27m-win32.whl", hash = "sha256:84ef7a0c10c24a7773163f917f1cb6b4444597efd505a8aed0a22e8c4780f27e"},
{file = "cryptography-3.3.1-cp27-cp27m-win_amd64.whl", hash = "sha256:594a1db4511bc4d960571536abe21b4e5c3003e8750ab8365fafce71c5d86901"},
{file = "cryptography-3.3.1-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:0003a52a123602e1acee177dc90dd201f9bb1e73f24a070db7d36c588e8f5c7d"},
{file = "cryptography-3.3.1-cp27-cp27mu-manylinux2010_x86_64.whl", hash = "sha256:83d9d2dfec70364a74f4e7c70ad04d3ca2e6a08b703606993407bf46b97868c5"},
{file = "cryptography-3.3.1-cp36-abi3-macosx_10_10_x86_64.whl", hash = "sha256:dc42f645f8f3a489c3dd416730a514e7a91a59510ddaadc09d04224c098d3302"},
{file = "cryptography-3.3.1-cp36-abi3-manylinux1_x86_64.whl", hash = "sha256:788a3c9942df5e4371c199d10383f44a105d67d401fb4304178020142f020244"},
{file = "cryptography-3.3.1-cp36-abi3-manylinux2010_x86_64.whl", hash = "sha256:69e836c9e5ff4373ce6d3ab311c1a2eed274793083858d3cd4c7d12ce20d5f9c"},
{file = "cryptography-3.3.1-cp36-abi3-manylinux2014_aarch64.whl", hash = "sha256:9e21301f7a1e7c03dbea73e8602905a4ebba641547a462b26dd03451e5769e7c"},
{file = "cryptography-3.3.1-cp36-abi3-win32.whl", hash = "sha256:b4890d5fb9b7a23e3bf8abf5a8a7da8e228f1e97dc96b30b95685df840b6914a"},
{file = "cryptography-3.3.1-cp36-abi3-win_amd64.whl", hash = "sha256:0e85aaae861d0485eb5a79d33226dd6248d2a9f133b81532c8f5aae37de10ff7"},
{file = "cryptography-3.3.1.tar.gz", hash = "sha256:7e177e4bea2de937a584b13645cab32f25e3d96fc0bc4a4cf99c27dc77682be6"},
{file = "cryptography-3.4.6-cp36-abi3-macosx_10_10_x86_64.whl", hash = "sha256:57ad77d32917bc55299b16d3b996ffa42a1c73c6cfa829b14043c561288d2799"},
{file = "cryptography-3.4.6-cp36-abi3-manylinux2010_x86_64.whl", hash = "sha256:93cfe5b7ff006de13e1e89830810ecbd014791b042cbe5eec253be11ac2b28f3"},
{file = "cryptography-3.4.6-cp36-abi3-manylinux2014_aarch64.whl", hash = "sha256:5ecf2bcb34d17415e89b546dbb44e73080f747e504273e4d4987630493cded1b"},
{file = "cryptography-3.4.6-cp36-abi3-manylinux2014_x86_64.whl", hash = "sha256:fec7fb46b10da10d9e1d078d1ff8ed9e05ae14f431fdbd11145edd0550b9a964"},
{file = "cryptography-3.4.6-cp36-abi3-win32.whl", hash = "sha256:df186fcbf86dc1ce56305becb8434e4b6b7504bc724b71ad7a3239e0c9d14ef2"},
{file = "cryptography-3.4.6-cp36-abi3-win_amd64.whl", hash = "sha256:66b57a9ca4b3221d51b237094b0303843b914b7d5afd4349970bb26518e350b0"},
{file = "cryptography-3.4.6.tar.gz", hash = "sha256:2d32223e5b0ee02943f32b19245b61a62db83a882f0e76cc564e1cec60d48f87"},
]
docutils = [
{file = "docutils-0.16-py2.py3-none-any.whl", hash = "sha256:0c5b78adfbf7762415433f5515cd5c9e762339e23369dbe8000d84a4bf4ab3af"},
@@ -767,8 +763,8 @@ pycparser = [
{file = "pycparser-2.20.tar.gz", hash = "sha256:2d475327684562c3a96cc71adf7dc8c4f0565175cf86b6d7a404ff4c771f15f0"},
]
pygments = [
{file = "Pygments-2.7.4-py3-none-any.whl", hash = "sha256:bc9591213a8f0e0ca1a5e68a479b4887fdc3e75d0774e5c71c31920c427de435"},
{file = "Pygments-2.7.4.tar.gz", hash = "sha256:df49d09b498e83c1a73128295860250b0b7edd4c723a32e9bc0d295c7c2ec337"},
{file = "Pygments-2.8.1-py3-none-any.whl", hash = "sha256:534ef71d539ae97d4c3a4cf7d6f110f214b0e687e92f9cb9d2a3b0d3101289c8"},
{file = "Pygments-2.8.1.tar.gz", hash = "sha256:2656e1a6edcdabf4275f9a3640db59fd5de107d88e8663c5d4e9a0fa62f77f94"},
]
pyparsing = [
{file = "pyparsing-2.4.7-py2.py3-none-any.whl", hash = "sha256:ef9d7589ef3c200abe66653d3f1ab1033c3c419ae9b9bdb1240a85b024efc88b"},
@@ -787,8 +783,8 @@ requests = [
{file = "requests-2.25.1.tar.gz", hash = "sha256:27973dd4a904a4f13b263a19c866c13b92a39ed1c964655f025f3f8d3d75b804"},
]
s3transfer = [
{file = "s3transfer-0.3.4-py2.py3-none-any.whl", hash = "sha256:1e28620e5b444652ed752cf87c7e0cb15b0e578972568c6609f0f18212f259ed"},
{file = "s3transfer-0.3.4.tar.gz", hash = "sha256:7fdddb4f22275cf1d32129e21f056337fd2a80b6ccef1664528145b72c49e6d2"},
{file = "s3transfer-0.3.6-py2.py3-none-any.whl", hash = "sha256:5d48b1fd2232141a9d5fb279709117aaba506cacea7f86f11bc392f06bfa8fc2"},
{file = "s3transfer-0.3.6.tar.gz", hash = "sha256:c5dadf598762899d8cfaecf68eba649cd25b0ce93b6c954b156aaa3eed160547"},
]
six = [
{file = "six-1.15.0-py2.py3-none-any.whl", hash = "sha256:8b74bedcbbbaca38ff6d7491d76f2b06b3592611af620f8426e82dddb04a5ced"},
@@ -799,8 +795,8 @@ snowballstemmer = [
{file = "snowballstemmer-2.1.0.tar.gz", hash = "sha256:e997baa4f2e9139951b6f4c631bad912dfd3c792467e2f03d7239464af90e914"},
]
sphinx = [
{file = "Sphinx-3.4.3-py3-none-any.whl", hash = "sha256:c314c857e7cd47c856d2c5adff514ac2e6495f8b8e0f886a8a37e9305dfea0d8"},
{file = "Sphinx-3.4.3.tar.gz", hash = "sha256:41cad293f954f7d37f803d97eb184158cfd90f51195131e94875bc07cd08b93c"},
{file = "Sphinx-3.5.3-py3-none-any.whl", hash = "sha256:3f01732296465648da43dec8fb40dc451ba79eb3e2cc5c6d79005fd98197107d"},
{file = "Sphinx-3.5.3.tar.gz", hash = "sha256:ce9c228456131bab09a3d7d10ae58474de562a6f79abb3dc811ae401cf8c1abc"},
]
sphinxcontrib-applehelp = [
{file = "sphinxcontrib-applehelp-1.0.2.tar.gz", hash = "sha256:a072735ec80e7675e3f432fcae8610ecf509c5f1869d17e2eecff44389cdbc58"},
@@ -827,8 +823,8 @@ sphinxcontrib-serializinghtml = [
{file = "sphinxcontrib_serializinghtml-1.1.4-py2.py3-none-any.whl", hash = "sha256:f242a81d423f59617a8e5cf16f5d4d74e28ee9a66f9e5b637a18082991db5a9a"},
]
typeguard = [
{file = "typeguard-2.10.0-py3-none-any.whl", hash = "sha256:a75c6d86ac9d1faf85c5ae952de473e5d26824dda6d4394ff6bc676849cfb939"},
{file = "typeguard-2.10.0.tar.gz", hash = "sha256:d830132dcd544d3f8a2a842ea739eaa0d7c099fcebb9dcdf3802f4c9929d8191"},
{file = "typeguard-2.11.1-py3-none-any.whl", hash = "sha256:c62706201ec6c14962162fa67d70bd2762753247533d70ff2442e5ac08f94fa2"},
{file = "typeguard-2.11.1.tar.gz", hash = "sha256:33243c1cbfcb9736a06c6db22dd08876b5f297e6344aa272a2862c0f8e669f64"},
]
typing-extensions = [
{file = "typing_extensions-3.7.4.3-py2-none-any.whl", hash = "sha256:dafc7639cde7f1b6e1acc0f457842a83e722ccca8eef5270af2d74792619a89f"},
@@ -836,6 +832,6 @@ typing-extensions = [
{file = "typing_extensions-3.7.4.3.tar.gz", hash = "sha256:99d4073b617d30288f569d3f13d2bd7548c3a7e4c8de87db09a9d29bb3a4a60c"},
]
urllib3 = [
{file = "urllib3-1.26.3-py2.py3-none-any.whl", hash = "sha256:1b465e494e3e0d8939b50680403e3aedaa2bc434b7d5af64dfd3c958d7f5ae80"},
{file = "urllib3-1.26.3.tar.gz", hash = "sha256:de3eedaad74a2683334e282005cd8d7f22f4d55fa690a2a1020a416cb0a47e73"},
{file = "urllib3-1.26.4-py2.py3-none-any.whl", hash = "sha256:2f4da4594db7e1e110a944bb1b551fdf4e6c136ad42e4234131391e21eb5b0df"},
{file = "urllib3-1.26.4.tar.gz", hash = "sha256:e7b021f7241115872f92f43c6508082facffbd1c048e3c6e2bb9c2a157e28937"},
]
pkgs/applications/networking/cluster/tektoncd-cli/default.nix
+2 -2
View File
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "tektoncd-cli";
version = "0.17.1";
version = "0.17.2";
src = fetchFromGitHub {
owner = "tektoncd";
repo = "cli";
rev = "v${version}";
sha256 = "sha256-xwUTSJ0rlNzQqGQp6jL03L4SuHUvvD3aWXxa1Xp0UyM=";
sha256 = "sha256-7VG9OFt1yVt4st8EM1aiRqLCHwjSqib28GoamoJHHnM=";
};
vendorSha256 = null;
pkgs/applications/networking/cluster/terragrunt/default.nix
+2 -2
View File
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "terragrunt";
version = "0.28.19";
version = "0.28.20";
src = fetchFromGitHub {
owner = "gruntwork-io";
repo = pname;
rev = "v${version}";
sha256 = "sha256-REcVc4u7pDTDHvoI1Fw36Mioyg1D4U29Hq0ih8Bt95s=";
sha256 = "sha256-Hg4eeLFNm2cXUjp3T2VK6q+mgawqkHju9P3Vq9wnB9c=";
};
vendorSha256 = "sha256-kcRM76xfajtQist1aJTmaRludxRlfvHQ9ucB3LOgnBk=";
pkgs/applications/networking/feedreaders/feeds/default.nix → pkgs/applications/networking/feedreaders/gnome-feeds/default.nix
+2 -1
View File
@@ -17,8 +17,9 @@
, webkitgtk
, python3
}:
python3.pkgs.buildPythonApplication rec {
pname = "feeds";
pname = "gnome-feeds";
version = "0.16.1";
src = fetchFromGitLab {
pkgs/applications/networking/feedreaders/feeds/listparser.nix → pkgs/applications/networking/feedreaders/gnome-feeds/listparser.nix
View File
pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
+7 -3
View File
@@ -25,7 +25,7 @@ let
else "");
in stdenv.mkDerivation rec {
pname = "signal-desktop";
version = "1.40.1"; # Please backport all updates to the stable channel.
version = "5.0.0"; # Please backport all updates to the stable channel.
# All releases have a limited lifetime and "expire" 90 days after the release.
# When releases "expire" the application becomes unusable until an update is
# applied. The expiration date for the current release can be extracted with:
@@ -35,7 +35,7 @@ in stdenv.mkDerivation rec {
src = fetchurl {
url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
sha256 = "0k57r1x64w38n0295qdrf3p19d3z8m530h46ps0j2x0krhah47w7";
sha256 = "17hxg61m9kk1kph6ifqy6507kzx5hi6yafr2mj8n0a6c39vc8f9g";
};
nativeBuildInputs = [
@@ -97,6 +97,8 @@ in stdenv.mkDerivation rec {
dontAutoPatchelf = true;
installPhase = ''
runHook preInstall
mkdir -p $out/lib
mv usr/share $out/share
@@ -110,6 +112,8 @@ in stdenv.mkDerivation rec {
# Symlink to bin
mkdir -p $out/bin
ln -s $out/lib/Signal/signal-desktop $out/bin/signal-desktop
runHook postInstall
'';
preFixup = ''
@@ -137,7 +141,7 @@ in stdenv.mkDerivation rec {
'';
homepage = "https://signal.org/";
changelog = "https://github.com/signalapp/Signal-Desktop/releases/tag/v${version}";
license = lib.licenses.gpl3;
license = lib.licenses.agpl3Only;
maintainers = with lib.maintainers; [ ixmatus primeos equirosa ];
platforms = [ "x86_64-linux" ];
};
pkgs/applications/networking/instant-messengers/teams/default.nix
+2 -2
View File
@@ -15,11 +15,11 @@
stdenv.mkDerivation rec {
pname = "teams";
version = "1.4.00.4855";
version = "1.4.00.7556";
src = fetchurl {
url = "https://packages.microsoft.com/repos/ms-teams/pool/main/t/teams/teams_${version}_amd64.deb";
sha256 = "1g0lsydz4l536qf890drdz6g86xb0sm3326hz3ymj9pi8vvbs7d9";
sha256 = "0yak3jxh0gdn57wjss0s7sdjssf1b70j0klrcpv66bizqvw1xl7b";
};
nativeBuildInputs = [ dpkg autoPatchelfHook wrapGAppsHook ];
pkgs/applications/networking/irc/convos/default.nix
+2 -2
View File
@@ -6,13 +6,13 @@ with lib;
perlPackages.buildPerlPackage rec {
pname = "convos";
version = "6.06";
version = "6.11";
src = fetchFromGitHub {
owner = "convos-chat";
repo = pname;
rev = "v${version}";
sha256 = "0b3c8hj9cjmpzy9k949vdv1y3v7b94nh0mq15rcv3ax0sj3gd0qr";
sha256 = "19nzm7f3glvj34nj9pvnp0h9xx6baq58c11ddkqfmq7w3sci49hi";
};
nativeBuildInputs = [ makeWrapper ]
pkgs/applications/science/physics/sherpa/default.nix
+1
View File
@@ -23,6 +23,7 @@ stdenv.mkDerivation rec {
"--enable-fastjet=${fastjet}"
"--enable-lhapdf=${lhapdf}"
"--enable-rivet=${rivet}"
"--enable-pythia"
];
meta = with lib; {
pkgs/applications/terminal-emulators/wezterm/default.nix
+25 -28
View File
@@ -2,22 +2,16 @@
, rustPlatform
, lib
, fetchFromGitHub
, pkg-config
, fontconfig
, python3
, openssl
, perl
# Apple frameworks
, CoreGraphics
, Cocoa
, Foundation
, dbus
, libX11
, xcbutil
, libxcb
, xcbutilimage
, xcbutilkeysyms
, xcbutilwm # contains xcb-ewmh among others
, libxkbcommon
@@ -28,6 +22,11 @@
, libGL
, freetype
, zlib
# Apple frameworks
, CoreGraphics
, Cocoa
, Foundation
, libiconv
}:
let
runtimeDeps = [
@@ -38,6 +37,7 @@ let
libX11
xcbutil
libxcb
xcbutilimage
xcbutilkeysyms
xcbutilwm
libxkbcommon
@@ -47,51 +47,48 @@ let
wayland
libGLU
libGL
openssl
] ++ lib.optionals (stdenv.isDarwin) [
Foundation
CoreGraphics
Cocoa
libiconv
];
pname = "wezterm";
in
rustPlatform.buildRustPackage {
inherit pname;
version = "unstable-2020-11-22";
rustPlatform.buildRustPackage rec {
pname = "wezterm";
version = "20210407-nightly";
src = fetchFromGitHub {
owner = "wez";
repo = pname;
rev = "3bd8d8c84591f4d015ff9a47ddb478e55c231fda";
sha256 = "13xf3685kir4p159hsxrqkj9p2lwgfp0n13h9zadslrd44l8b8j8";
rev = "d2419fb99e567e3b260980694cc840a1a3b86922";
sha256 = "4tVjrdDlrDPKzcbTYK9vRlzfC9tfvkD+D0aN19A8RWE=";
fetchSubmodules = true;
};
cargoSha256 = "1ghjpyd3f5dqi6bblr6d2lihdschpyj5djfd1600hvb41x75lmhx";
cargoSha256 = "sha256-UaXeeuRuQk+CWF936mEAaWTjZuTSRPmxbQ/9E2oZIqg=";
nativeBuildInputs = [
pkg-config
python3
openssl.dev
perl
];
buildInputs = runtimeDeps;
installPhase = "" + lib.optionalString stdenv.isLinux ''
preFixup = lib.optionalString stdenv.isLinux ''
for artifact in wezterm wezterm-gui wezterm-mux-server strip-ansi-escapes; do
patchelf --set-rpath "${lib.makeLibraryPath runtimeDeps}" $releaseDir/$artifact
install -D $releaseDir/$artifact -t $out/bin
patchelf --set-rpath "${lib.makeLibraryPath runtimeDeps}" $out/bin/$artifact
done
'' + lib.optionalString stdenv.isDarwin ''
mkdir -p "$out/Applications"
OUT_APP="$out/Applications/WezTerm.app"
cp -r assets/macos/WezTerm.app "$OUT_APP"
rm $OUT_APP/*.dylib
cp -r assets/shell-integration/* "$OUT_APP"
cp $releaseDir/wezterm "$OUT_APP"
cp $releaseDir/wezterm-mux-server "$OUT_APP"
cp $releaseDir/wezterm-gui "$OUT_APP"
cp $releaseDir/strip-ansi-escapes "$OUT_APP"
mkdir -p "$out/Applications"
OUT_APP="$out/Applications/WezTerm.app"
cp -r assets/macos/WezTerm.app "$OUT_APP"
rm $OUT_APP/*.dylib
cp -r assets/shell-integration/* "$OUT_APP"
ln -s $out/bin/{wezterm,wezterm-mux-server,wezterm-gui,strip-ansi-escapes} "$OUT_APP"
'';
# prevent further changes to the RPATH
@@ -101,7 +98,7 @@ rustPlatform.buildRustPackage {
description = "A GPU-accelerated cross-platform terminal emulator and multiplexer written by @wez and implemented in Rust";
homepage = "https://wezfurlong.org/wezterm";
license = licenses.mit;
maintainers = with maintainers; [ steveej ];
maintainers = with maintainers; [ steveej SuperSandro2000 ];
platforms = platforms.unix;
};
}
pkgs/applications/version-management/cvs/default.nix
+11 -2
View File
@@ -28,14 +28,23 @@ stdenv.mkDerivation {
done
'';
buildInputs = [ nano ];
configureFlags = [
"--with-editor=${nano}/bin/nano"
# Required for cross-compilation.
"cvs_cv_func_printf_ptr=yes"
];
makeFlags = [
"AR=${stdenv.cc.targetPrefix}ar"
];
doCheck = false; # fails 1 of 1 tests
meta = with lib; {
homepage = "http://cvs.nongnu.org";
description = "Concurrent Versions System - a source control system";
license = licenses.gpl2; # library is GPLv2, main is GPLv1
license = licenses.gpl2Plus; # library is GPLv2, main is GPLv1
platforms = platforms.all;
};
}
pkgs/applications/version-management/git-and-tools/git-cinnabar/default.nix
+2 -2
View File
@@ -8,13 +8,13 @@ in
stdenv.mkDerivation rec {
pname = "git-cinnabar";
version = "0.5.6";
version = "0.5.7";
src = fetchFromGitHub {
owner = "glandium";
repo = "git-cinnabar";
rev = version;
sha256 = "1wbp4xqpkaqhhkjw8rbbsagwiciqffacqqbm4j49q41mlk371ai3";
sha256 = "04dsjlsw98avrckldx7rc70b2zsbajzkyqqph4c7d9xd5djh3yaj";
fetchSubmodules = true;
};
pkgs/applications/version-management/gitkraken/default.nix
+2 -2
View File
@@ -13,11 +13,11 @@ let
in
stdenv.mkDerivation rec {
pname = "gitkraken";
version = "7.5.4";
version = "7.5.5";
src = fetchzip {
url = "https://release.axocdn.com/linux/GitKraken-v${version}.tar.gz";
sha256 = "1laqki01zcmsl9s18dnwg3x3jbbs0xcipiyj2qlsb1sx9y4x05wm";
sha256 = "0l40ap0ck2ywjarmn7lmpw4qbsdkx717d9kmx67p4qlmbwpimqhg";
};
dontBuild = true;
pkgs/applications/video/lbry/default.nix
+49
View File
@@ -0,0 +1,49 @@
{ lib, fetchurl, appimageTools}:
let
pname = "lbry-desktop";
version = "0.50.2";
in appimageTools.wrapAppImage rec {
name = "${pname}-${version}";
# Fetch from GitHub Releases and extract
src = appimageTools.extract {
inherit name;
src = fetchurl {
url = "https://github.com/lbryio/lbry-desktop/releases/download/v${version}/LBRY_${version}.AppImage";
# Gotten from latest-linux.yml
sha512 = "br6HvVRz+ybmAhmQh3vOC5wgLmOCVrGHDn59ueWk6rFoKOCbm8WdmdadOZvHeN1ld2nlvPzEy+KXMOEfF1LeQg==";
};
};
# At runtime, Lbry likes to have access to Ffmpeg
extraPkgs = pkgs: with pkgs; [
ffmpeg
];
# General fixup
extraInstallCommands = ''
# Firstly, rename the executable to lbry for convinence
mv $out/bin/${name} $out/bin/lbry
# Now, install assets such as the desktop file and icons
install -m 444 -D ${src}/lbry.desktop -t $out/share/applications
substituteInPlace $out/share/applications/lbry.desktop \
--replace 'AppRun' '$out/bin/lbry'
cp -r ${src}/usr/share/icons $out/share
'';
meta = with lib; {
description = "A browser and wallet for LBRY, the decentralized, user-controlled content marketplace";
longDescription = ''
The LBRY app is a graphical browser for the decentralized content marketplace provided by the LBRY protocol.
It is essentially the lbry daemon bundled with a UI using Electron.
'';
license = licenses.mit;
homepage = "https://lbry.com/";
downloadPage = "https://lbry.com/get/";
changelog = "https://github.com/lbryio/lbry-desktop/blob/master/CHANGELOG.md";
maintainers = with maintainers; [ enderger ];
platforms = [ "x86_64-linux" ];
};
}
pkgs/applications/video/mpv/scripts/mpvacious.nix
+2 -2
View File
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "mpvacious";
version = "0.12";
version = "0.14";
src = fetchFromGitHub {
owner = "Ajatt-Tools";
repo = "mpvacious";
rev = "v${version}";
sha256 = "1xz4qh2ibfv03m3pfdasim9byvlm78wigx1linmih19vgg99vky2";
sha256 = "0r031hh3hpim9dli15m9q4cwka4ljvwg0hdgyp36r1n097q44r5f";
};
postPatch = ''
pkgs/applications/video/obs-studio/default.nix
+4 -1
View File
@@ -34,6 +34,8 @@
, pulseaudioSupport ? config.pulseaudio or stdenv.isLinux
, libpulseaudio
, libcef
, pipewireSupport ? stdenv.isLinux
, pipewire
}:
let
@@ -76,7 +78,8 @@ in mkDerivation rec {
]
++ optionals scriptingSupport [ luajit swig python3 ]
++ optional alsaSupport alsaLib
++ optional pulseaudioSupport libpulseaudio;
++ optional pulseaudioSupport libpulseaudio
++ optional pipewireSupport pipewire;
# Copied from the obs-linuxbrowser
postUnpack = ''
pkgs/applications/virtualization/cri-o/default.nix
+2 -2
View File
@@ -15,13 +15,13 @@
buildGoModule rec {
pname = "cri-o";
version = "1.20.1";
version = "1.21.0";
src = fetchFromGitHub {
owner = "cri-o";
repo = "cri-o";
rev = "v${version}";
sha256 = "sha256-cli/ipWxZgAeDMBUMuOU3l2mKv4POvOhi7ctbVdU6jc=";
sha256 = "sha256-qhS1RLkM7xDsH3qDVL+ORXmwULYz8UK1oJM29oRqJ0M=";
};
vendorSha256 = null;
pkgs/applications/virtualization/singularity/default.nix
+2 -2
View File
@@ -15,11 +15,11 @@ with lib;
buildGoPackage rec {
pname = "singularity";
version = "3.7.2";
version = "3.7.3";
src = fetchurl {
url = "https://github.com/hpcng/singularity/releases/download/v${version}/singularity-${version}.tar.gz";
sha256 = "sha256-NpFiIuJvuTRATwdm4P82jtrDbX/DHKVx9fYJRmYJBms=";
sha256 = "sha256-ZmfriHXStm1zUE9AyVa0KxNRdE9IjRZCBDdiFdiF2lw=";
};
goPackagePath = "github.com/sylabs/singularity";
pkgs/applications/window-managers/e16/default.nix
+62
View File
@@ -0,0 +1,62 @@
{ lib
, stdenv
, fetchurl
, pkg-config
, freetype
, imlib2
, libSM
, libXcomposite
, libXdamage
, libXext
, libXfixes
, libXft
, libXinerama
, libXrandr
, libpulseaudio
, libsndfile
, pango
, perl
}:
stdenv.mkDerivation rec {
pname = "e16";
version = "1.0.23";
src = fetchurl {
url = "mirror://sourceforge/enlightenment/e16-${version}.tar.xz";
sha256 = "028rn1plggacsvdd035qnnph4xw8nya34mmjvvl7d4gqj9pj293f";
};
nativeBuildInputs = [
pkg-config
];
buildInputs = [
freetype
imlib2
libSM
libXcomposite
libXdamage
libXext
libXfixes
libXft
libXinerama
libXrandr
libpulseaudio
libsndfile
pango
perl
];
postPatch = ''
substituteInPlace scripts/e_gen_menu --replace "/usr/local:" "/run/current-system/sw:/usr/local:"
'';
meta = with lib; {
homepage = "https://www.enlightenment.org/e16";
description = "Enlightenment DR16 window manager";
license = licenses.bsd2;
platforms = platforms.linux;
maintainers = [ maintainers.romildo ];
};
}
pkgs/desktops/gnome-3/extensions/system-monitor/default.nix
+4 -4
View File
@@ -1,14 +1,14 @@
{ lib, stdenv, substituteAll, fetchpatch, fetchFromGitHub, glib, glib-networking, libgtop, gnome3 }:
{ lib, stdenv, substituteAll, fetchFromGitHub, glib, glib-networking, libgtop, gnome3 }:
stdenv.mkDerivation rec {
pname = "gnome-shell-system-monitor";
version = "2020-04-27-unstable";
version = "unstable-2021-04-08";
src = fetchFromGitHub {
owner = "paradoxxxzero";
repo = "gnome-shell-system-monitor-applet";
rev = "7f8f0a7b255473941f14d1dcaa35ebf39d3bccd0";
sha256 = "tUUvBY0UEUE+T79zVZEAICpKoriFZuuZzi9ArdHdXks=";
rev = "942603da39de12f50b1f86efbde92d7526d1290e";
sha256 = "0lzb7064bigw2xsqkzr8qfhp9wfmxyi3823j2782v99jpcz423aw";
};
buildInputs = [
pkgs/desktops/xfce/applications/xfdashboard/default.nix
+2 -2
View File
@@ -17,11 +17,11 @@
mkXfceDerivation {
category = "apps";
pname = "xfdashboard";
version = "0.9.1";
version = "0.9.2";
rev-prefix = "";
odd-unstable = false;
sha256 = "14k774wxbk3w0ci2mmm6bhq4i742qahd0j0dr40iwmld55473zgd";
sha256 = "06pvzhhkr2mimsrzlkpsrzf5fxag4fhabyb3cpmgpyp5hcbgvaj3";
buildInputs = [
clutter
pkgs/desktops/xfce/core/exo/default.nix
+2 -2
View File
@@ -4,9 +4,9 @@
mkXfceDerivation {
category = "xfce";
pname = "exo";
version = "4.16.1";
version = "4.16.2";
sha256 = "1220mq8gs5s8l0d1p92j6icldzqj6zaisp27ss5jm7hwkkcnms9n";
sha256 = "0rsp92j4hkr5jrkrj8anzw9fwd96xbxzpzqzqiyjjwdiq7b29l1v";
nativeBuildInputs = [
libxslt
pkgs/development/coq-modules/ITree/default.nix
+17
View File
@@ -0,0 +1,17 @@
{ lib, mkCoqDerivation, coq, version ? null , paco, coq-ext-lib }:
with lib; mkCoqDerivation rec {
pname = "ITree";
owner = "DeepSpec";
inherit version;
defaultVersion = with versions; switch coq.coq-version [
{ case = range "8.10" "8.13"; out = "4.0.0"; }
] null;
release."4.0.0".sha256 = "0h5rhndl8syc24hxq1gch86kj7mpmgr89bxp2hmf28fd7028ijsm";
releaseRev = v: "${v}";
propagatedBuildInputs = [ coq-ext-lib paco ];
meta = {
description = "A Library for Representing Recursive and Impure Programs in Coq";
maintainers = with maintainers; [ larsr ];
};
}
pkgs/development/coq-modules/coq-elpi/default.nix
+8 -3
View File
@@ -12,16 +12,21 @@ in mkCoqDerivation {
owner = "LPCIC";
inherit version;
defaultVersion = lib.switch coq.coq-version [
{ case = "8.13"; out = "1.9.4"; }
{ case = "8.12"; out = "1.8.0"; }
{ case = "8.11"; out = "1.6.1_8.11"; }
{ case = "8.13"; out = "1.9.5"; }
{ case = "8.12"; out = "1.8.2_8.12"; }
{ case = "8.11"; out = "1.6.2_8.11"; }
] null;
release."1.9.5".sha256 = "0gjdwmb6bvb5gh0a6ra48bz5fb3pr5kpxijb7a8mfydvar5i9qr6";
release."1.9.4".sha256 = "0nii7238mya74f9g6147qmpg6gv6ic9b54x5v85nb6q60d9jh0jq";
release."1.9.3".sha256 = "198irm800fx3n8n56vx1c6f626cizp1d7jfkrc6ba4iqhb62ma0z";
release."1.9.2".sha256 = "1rr2fr8vjkc0is7vh1461aidz2iwkigdkp6bqss4hhv0c3ijnn07";
release."1.8.2_8.12".sha256 = "1n6jwcdazvjgj8vsv2r9zgwpw5yqr5a1ndc2pwhmhqfl04b5dk4y";
release."1.8.2_8.12".version = "1.8.2";
release."1.8.1".sha256 = "1fbbdccdmr8g4wwpihzp4r2xacynjznf817lhijw6kqfav75zd0r";
release."1.8.0".sha256 = "13ywjg94zkbki22hx7s4gfm9rr87r4ghsgan23xyl3l9z8q0idd1";
release."1.7.0".sha256 = "1ws5cqr0xawv69prgygbl3q6dgglbaw0vc397h9flh90kxaqgyh8";
release."1.6.2_8.11".sha256 = "06xrx0ljilwp63ik2sxxr7h617dgbch042xfcnfpy5x96br147rn";
release."1.6.2_8.11".version = "1.6.2";
release."1.6.1_8.11".sha256 = "0yyyh35i1nb3pg4hw7cak15kj4y6y9l84nwar9k1ifdsagh5zq53";
release."1.6.1_8.11".version = "1.6.1";
release."1.6.0_8.11".sha256 = "0ahxjnzmd7kl3gl38kyjqzkfgllncr2ybnw8bvgrc6iddgga7bpq";
pkgs/development/coq-modules/coq-ext-lib/default.nix
+1 -1
View File
@@ -5,7 +5,7 @@ with lib; mkCoqDerivation rec {
owner = "coq-ext-lib";
inherit version;
defaultVersion = with versions; switch coq.coq-version [
{ case = range "8.8" "8.12"; out = "0.11.3"; }
{ case = range "8.8" "8.13"; out = "0.11.3"; }
{ case = "8.7"; out = "0.9.7"; }
{ case = "8.6"; out = "0.9.5"; }
{ case = "8.5"; out = "0.9.4"; }
pkgs/development/coq-modules/equations/default.nix
+9 -2
View File
@@ -6,8 +6,9 @@ with lib; mkCoqDerivation {
repo = "Coq-Equations";
inherit version;
defaultVersion = switch coq.coq-version [
{ case = "8.12"; out = "1.2.3+coq8.12"; }
{ case = "8.11"; out = "1.2.3+coq8.11"; }
{ case = "8.13"; out = "1.2.4+coq8.13"; }
{ case = "8.12"; out = "1.2.4+coq8.12"; }
{ case = "8.11"; out = "1.2.4+coq8.11"; }
{ case = "8.10"; out = "1.2.1+coq8.10-2"; }
{ case = "8.9"; out = "1.2.1+coq8.9"; }
{ case = "8.8"; out = "1.2+coq8.8"; }
@@ -36,6 +37,12 @@ with lib; mkCoqDerivation {
release."1.2.3+coq8.12".version = "1.2.3";
release."1.2.3+coq8.12".rev = "v1.2.3-8.12";
release."1.2.3+coq8.12".sha256 = "1y0jkvzyz5ssv5vby41p1i8zs7nsdc8g3pzyq73ih9jz8h252643";
release."1.2.4+coq8.11".rev = "v1.2.4-8.11";
release."1.2.4+coq8.11".sha256 = "01fihyav8jbjinycgjc16adpa0zy5hcav5mlkf4s9zvqxka21i52";
release."1.2.4+coq8.12".rev = "v1.2.4-8.12";
release."1.2.4+coq8.12".sha256 = "1n0w8is464qcq8mk2mv7amaf0khbjz5mpc9phf0rhpjm0lb22cb3";
release."1.2.4+coq8.13".rev = "v1.2.4-8.13";
release."1.2.4+coq8.13".sha256 = "0i014lshsdflzw6h0qxra9d2f0q82vffxv2f29awbb9ad0p4rq4q";
mlPlugin = true;
preBuild = "coq_makefile -f _CoqProject -o Makefile";
pkgs/development/coq-modules/simple-io/default.nix
+1 -1
View File
@@ -5,7 +5,7 @@ with lib; mkCoqDerivation {
owner = "Lysxia";
repo = "coq-simple-io";
inherit version;
defaultVersion = if versions.range "8.7" "8.12" coq.coq-version then "1.3.0" else null;
defaultVersion = if versions.range "8.7" "8.13" coq.coq-version then "1.3.0" else null;
release."1.3.0".sha256 = "1yp7ca36jyl9kz35ghxig45x6cd0bny2bpmy058359p94wc617ax";
extraBuildInputs = (with coq.ocamlPackages; [ ocaml ocamlbuild ]);
propagatedBuildInputs = [ coq-ext-lib ];
pkgs/development/libraries/civetweb/default.nix
+2 -2
View File
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "civetweb";
version = "1.13";
version = "1.14";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "/q7Q1lavIR3i126uI4NsKByHJ6Tp+DSN60R4YxR506U=";
sha256 = "sha256-6qBsM9zkN838cMtpE3+c7qcrFpZCS/Av7Ch7EWmlnD4=";
};
makeFlags = [
pkgs/development/libraries/libsearpc/default.nix
+6 -11
View File
@@ -1,4 +1,5 @@
{lib, stdenv, fetchFromGitHub, automake, autoconf, pkg-config, libtool, python2Packages, glib, jansson}:
{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, python3Packages
, glib, jansson }:
stdenv.mkDerivation rec {
version = "3.2.0";
@@ -11,21 +12,15 @@ stdenv.mkDerivation rec {
sha256 = "18i5zvrp6dv6vygxx5nc93mai2p2x786n5lnf5avrin6xiz2j6hd";
};
patches = [ ./libsearpc.pc.patch ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ automake autoconf libtool python2Packages.python python2Packages.simplejson ];
nativeBuildInputs = [ autoreconfHook pkg-config ];
buildInputs = with python3Packages; [ python simplejson ];
propagatedBuildInputs = [ glib jansson ];
postPatch = "patchShebangs autogen.sh";
preConfigure = "./autogen.sh";
meta = with lib; {
homepage = "https://github.com/haiwen/libsearpc";
description = "A simple and easy-to-use C language RPC framework (including both server side & client side) based on GObject System";
description = "A simple and easy-to-use C language RPC framework based on GObject System";
license = licenses.lgpl3;
platforms = platforms.linux;
maintainers = with maintainers; [ ];
maintainers = with maintainers; [ greizgh ];
};
}
pkgs/development/libraries/libsearpc/libsearpc.pc.patch
-10
View File
@@ -1,10 +0,0 @@
From: Aaron Lindsay <aaron@aclindsay.com>
--- a/libsearpc.pc.in 2013-01-10 01:35:24.000000000 -0500
+++ b/libsearpc.pc.in 2013-01-19 11:31:50.479301798 -0500
@@ -1,4 +1,4 @@
-prefix=(DESTDIR)@prefix@
+prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@
pkgs/development/libraries/openimagedenoise/1_2_x.nix
+23
View File
@@ -0,0 +1,23 @@
{ lib, stdenv, fetchzip, cmake, tbb, python3, ispc }:
stdenv.mkDerivation rec {
pname = "openimagedenoise";
version = "1.2.2";
# The release tarballs include pretrained weights, which would otherwise need to be fetched with git-lfs
src = fetchzip {
url = "https://github.com/OpenImageDenoise/oidn/releases/download/v${version}/oidn-${version}.src.tar.gz";
sha256 = "0wyaarjxkzlvljmpnr7qm06ma2wl1aik3z664gwpzhizswygk6yp";
};
nativeBuildInputs = [ cmake python3 ispc ];
buildInputs = [ tbb ];
meta = with lib; {
homepage = "https://openimagedenoise.github.io";
description = "High-Performance Denoising Library for Ray Tracing";
license = licenses.asl20;
maintainers = [ maintainers.leshainc ];
platforms = platforms.unix;
};
}
pkgs/development/libraries/openimagedenoise/default.nix
+4 -4
View File
@@ -1,16 +1,16 @@
{ lib, stdenv, fetchzip, cmake, tbb, python, ispc }:
{ lib, stdenv, fetchzip, cmake, tbb, python3, ispc }:
stdenv.mkDerivation rec {
pname = "openimagedenoise";
version = "1.2.2";
version = "1.3.0";
# The release tarballs include pretrained weights, which would otherwise need to be fetched with git-lfs
src = fetchzip {
url = "https://github.com/OpenImageDenoise/oidn/releases/download/v${version}/oidn-${version}.src.tar.gz";
sha256 = "0wyaarjxkzlvljmpnr7qm06ma2wl1aik3z664gwpzhizswygk6yp";
sha256 = "sha256-ls0F2D5pC+wqhQn1Zh8m8Q/KoK7rAkhKatTY9k+letQ=";
};
nativeBuildInputs = [ cmake python ispc ];
nativeBuildInputs = [ cmake python3 ispc ];
buildInputs = [ tbb ];
meta = with lib; {
pkgs/development/libraries/proj/5.2.nix
-20
View File
@@ -1,20 +0,0 @@
{ lib, stdenv, fetchurl }:
stdenv.mkDerivation {
name = "proj-5.2.0";
src = fetchurl {
url = "https://download.osgeo.org/proj/proj-5.2.0.tar.gz";
sha256 = "0q3ydh2j8qhwlxmnac72pg69rw2znbi5b6k5wama8qmwzycr94gg";
};
doCheck = stdenv.is64bit;
meta = with lib; {
description = "Cartographic Projections Library";
homepage = "https://proj4.org";
license = licenses.mit;
platforms = platforms.linux ++ platforms.darwin;
maintainers = with maintainers; [ vbgl ];
};
}
pkgs/development/libraries/proj/default.nix
+4 -4
View File
@@ -1,21 +1,21 @@
{ lib, stdenv, fetchFromGitHub, pkg-config, sqlite, autoreconfHook }:
{ lib, stdenv, fetchFromGitHub, pkg-config, sqlite, autoreconfHook, libtiff, curl }:
stdenv.mkDerivation rec {
pname = "proj";
version = "6.3.1";
version = "7.2.1";
src = fetchFromGitHub {
owner = "OSGeo";
repo = "PROJ";
rev = version;
sha256 = "1ildcp57qsa01kvv2qxd05nqw5mg0wfkksiv9l138dbhp0s7rkxp";
sha256 = "0mymvfvs8xggl4axvlj7kc1ksd9g94kaz6w1vdv0x2y5mqk93gx9";
};
outputs = [ "out" "dev"];
nativeBuildInputs = [ pkg-config autoreconfHook ];
buildInputs = [ sqlite ];
buildInputs = [ sqlite libtiff curl ];
doCheck = stdenv.is64bit;
pkgs/development/libraries/redkite/default.nix
-25
View File
@@ -1,25 +0,0 @@
{ lib, stdenv, fetchFromGitHub, cmake, cairo }:
stdenv.mkDerivation rec {
pname = "redkite";
version = "1.3.1";
src = fetchFromGitHub {
owner = "iurie-sw";
repo = pname;
rev = "v${version}";
sha256 = "sha256-bf8kz9RyhDDuUHKiKvLiQLBIEXbIyoy3yuKfSpSYYv0=";
};
nativeBuildInputs = [ cmake ];
buildInputs = [ cairo ];
meta = with lib; {
homepage = "https://gitlab.com/iurie-sw/redkite";
description = "A small GUI toolkit";
license = licenses.gpl3Plus;
platforms = platforms.linux;
maintainers = [ maintainers.magnetophon ];
};
}
pkgs/development/node-packages/node-packages.json
+2
View File
@@ -29,6 +29,7 @@
, "coc-diagnostic"
, "coc-emmet"
, "coc-eslint"
, "coc-explorer"
, "coc-git"
, "coc-go"
, "coc-highlight"
@@ -141,6 +142,7 @@
, "karma"
, "lcov-result-merger"
, "leetcode-cli"
, "vsc-leetcode-cli"
, "lerna"
, "less"
, "less-plugin-clean-css"
pkgs/development/node-packages/node-packages.nix
Generated
+2722 -1821
View File
File diff suppressed because it is too large Load Diff
pkgs/development/ocaml-modules/rpclib/default.nix
+2 -2
View File
@@ -5,13 +5,13 @@
buildDunePackage rec {
pname = "rpclib";
version = "8.0.0";
version = "8.1.0";
useDune2 = true;
src = fetchurl {
url = "https://github.com/mirage/ocaml-rpc/releases/download/v${version}/rpclib-v${version}.tbz";
sha256 = "1kqbixk4d9y15ns566fiyzid5jszkamm1kv7iks71invv33v7krz";
sha256 = "0fbajg8wq8hjhkvvfnq68br0m0pa8zf2qzadhfgi2nnr9713rada";
};
buildInputs = [ cmdliner yojson ];
pkgs/development/python-modules/aiodiscover/default.nix
+19 -6
View File
@@ -2,22 +2,23 @@
, async-dns
, buildPythonPackage
, fetchFromGitHub
, fetchpatch
, ifaddr
, pyroute2
, pytest-asyncio
, pytestCheckHook
, pythonOlder
}:
buildPythonPackage rec {
pname = "aiodiscover";
version = "1.3.3";
version = "1.3.4";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "bdraco";
repo = pname;
rev = "v${version}";
sha256 = "186agrjx818vn00d3pqlka5ir48rgpbfyn1cifkn9ylsxg9cz3ph";
sha256 = "sha256-TmWl5d5HwyqWPUjwtEvc5FzVfxV/K1pekljcMkGN0Ag=";
};
propagatedBuildInputs = [
@@ -30,9 +31,21 @@ buildPythonPackage rec {
substituteInPlace setup.py --replace '"pytest-runner>=5.2",' ""
'';
# Tests require access to /etc/resolv.conf
# pythonImportsCheck doesn't work as async-dns wants to create its CONFIG_DIR
doCheck = false;
checkInputs = [
pytest-asyncio
pytestCheckHook
];
preBuild = ''
export HOME=$TMPDIR
'';
disabledTests = [
# Tests require access to /etc/resolv.conf
"test_async_discover_hosts"
];
pythonImportsCheck = ["aiodiscover"];
meta = with lib; {
description = "Python module to discover hosts via ARP and PTR lookup";
pkgs/development/python-modules/aiohomekit/default.nix
+2 -2
View File
@@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "aiohomekit";
version = "0.2.60";
version = "0.2.61";
format = "pyproject";
disabled = pythonAtLeast "3.9";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "Jc2k";
repo = pname;
rev = version;
sha256 = "03llk5i22hq163x568kz0qar5h0sda8f8cxbmgya6z2dcxv0a83p";
sha256 = "047ql5a4i4354jgr8xr2waim8j522z58vbfi7aa62jqc9l8jzxzk";
};
nativeBuildInputs = [ poetry ];
pkgs/development/python-modules/amiibo-py/default.nix
+35
View File
@@ -0,0 +1,35 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, pythonOlder
, aiohttp
, requests
}:
buildPythonPackage rec {
pname = "amiibo-py";
version = "unstable-2021-01-16";
disabled = pythonOlder "3.5.3"; # Older versions are not supported upstream
src = fetchFromGitHub {
owner = "XiehCanCode";
repo = "amiibo.py";
rev = "4766037530f41ad11368240e994888d196783b83";
sha256 = "0ln8ykaws8c5fvzlzccn60mpbdbvxlhkp3nsvs2xqdbsqp270yv2";
};
propagatedBuildInputs = [
aiohttp
requests
];
doCheck = false; # No tests are available upstream
pythonImportsCheck = [ "amiibo" ];
meta = with lib; {
description = "API Wrapper for amiiboapi.com";
homepage = "https://github.com/XiehCanCode/amiibo.py";
license = licenses.mit;
maintainers = [ maintainers.ivar ];
};
}
pkgs/development/python-modules/asyncio-throttle/default.nix
+2 -2
View File
@@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "asyncio-throttle";
version = "1.0.1";
version = "1.0.2";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "hallazzang";
repo = pname;
rev = "v${version}";
sha256 = "0raqnrnp42cn1c7whbm7ajbgaczx33k6hbxsj30nh998pqxhh4sj";
sha256 = "1hsjcymdcm0hf4l68scf9n8j7ba89azgh96xhxrnyvwxfs5acnmv";
};
checkInputs = [
pkgs/development/python-modules/basemap/default.nix
+2
View File
@@ -1,6 +1,7 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, pythonAtLeast
, numpy
, matplotlib
, pillow
@@ -43,6 +44,7 @@ buildPythonPackage rec {
http://matplotlib.github.com/basemap/users/examples.html for examples of what it can do.
'';
license = with licenses; [ mit gpl2 ];
broken = pythonAtLeast "3.9";
};
}
pkgs/development/python-modules/boto3/default.nix
+2 -2
View File
@@ -13,11 +13,11 @@
buildPythonPackage rec {
pname = "boto3";
version = "1.17.46"; # N.B: if you change this, change botocore and awscli to a matching version
version = "1.17.49"; # N.B: if you change this, change botocore and awscli to a matching version
src = fetchPypi {
inherit pname version;
sha256 = "sha256-Xe4Vv5YepYTWgfrkLFADTIOXF+dFTD2pDLV6bFLpdTI=";
sha256 = "sha256-pIITXDD6B+r0NwMU3Q+0kRciKiZtBCOyB1rtODXtHwQ=";
};
propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ];
pkgs/development/python-modules/botocore/default.nix
+2 -2
View File
@@ -13,11 +13,11 @@
buildPythonPackage rec {
pname = "botocore";
version = "1.20.46"; # N.B: if you change this, change boto3 and awscli to a matching version
version = "1.20.49"; # N.B: if you change this, change boto3 and awscli to a matching version
src = fetchPypi {
inherit pname version;
sha256 = "sha256-ULvD6TQcfaqCGduYw48mASoVHKiPomAUjlvzrcvLlUE=";
sha256 = "sha256-9/ED+gZRxp3TYMfQ7Nh0hUMD3lzAhp4MvCgYpSuqzGk=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/cartopy/default.nix
+29 -26
View File
@@ -1,10 +1,9 @@
{ buildPythonPackage, lib, fetchPypi
, pytest_4, filelock, mock, pep8
, cython, isPy27
{ buildPythonPackage, lib, fetchPypi, fetchpatch
, pytestCheckHook, filelock, mock, pep8
, cython
, six, pyshp, shapely, geos, numpy
, gdal, pillow, matplotlib, pyepsg, pykdtree, scipy, owslib, fiona
, xvfb_run
, proj_5 # see https://github.com/SciTools/cartopy/pull/1252 for status on proj 6 support
, proj
}:
buildPythonPackage rec {
@@ -17,28 +16,16 @@ buildPythonPackage rec {
sha256 = "0d24fk0cbp29gmkysrwq05vry13swmwi3vx3cpcy04c0ixz33ykz";
};
checkInputs = [ filelock mock pytest_4 pep8 ];
# several tests require network connectivity: we disable them.
# also py2.7's tk is over-eager in trying to open an x display,
# so give it xvfb
checkPhase = let
maybeXvfbRun = lib.optionalString isPy27 "${xvfb_run}/bin/xvfb-run";
in ''
export HOME=$(mktemp -d)
${maybeXvfbRun} pytest --pyargs cartopy \
-m "not network and not natural_earth" \
-k "not test_nightshade_image and not background_img"
'';
nativeBuildInputs = [
cython
geos # for geos-config
proj_5
patches = [
# Fix numpy-1.20 compatibility. Will be part of 0.19.
(fetchpatch {
url = "https://github.com/SciTools/cartopy/commit/e663bbbef07989a5f8484a8f36ea9c07e61d14ce.patch";
sha256 = "061kbjgzkc3apaz6sxy00pkgy3n9dxcgps5wzj4rglb5iy86n2kq";
})
];
buildInputs = [
geos proj_5
geos proj
];
propagatedBuildInputs = [
@@ -49,12 +36,28 @@ buildPythonPackage rec {
gdal pillow matplotlib pyepsg pykdtree scipy fiona owslib
];
checkInputs = [ pytestCheckHook filelock mock pep8 ];
pytestFlagsArray = [
"--pyargs" "cartopy"
"-m" "'not network and not natural_earth'"
];
disabledTests = [
"test_nightshade_image"
"background_img"
];
nativeBuildInputs = [
cython
geos # for geos-config
proj
];
meta = with lib; {
description = "Process geospatial data to create maps and perform analyses";
license = licenses.lgpl3;
homepage = "https://scitools.org.uk/cartopy/docs/latest/";
maintainers = with maintainers; [ mredaelli ];
# following tests fail: test_eccentric_globe and test_ellipse_globe
broken = true;
};
}
pkgs/development/python-modules/colorlog/default.nix
+2 -2
View File
@@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "colorlog";
version = "4.8.0";
version = "5.0.1";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-WbUxYMYJAsQFzewo04NW4J1AaGZZBIiT4CbsvViVFrE=";
sha256 = "sha256-8XwBOgaWKwL0RJ7gfP2+ayh98p78LJoVFbSjdvTliOo=";
};
checkInputs = [ pytestCheckHook ];
pkgs/development/python-modules/cvxpy/default.nix
+13 -2
View File
@@ -1,4 +1,5 @@
{ lib
, stdenv
, pythonOlder
, buildPythonPackage
, fetchPypi
@@ -8,19 +9,21 @@
, osqp
, scipy
, scs
, useOpenmp ? true
# Check inputs
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "cvxpy";
version = "1.1.11";
version = "1.1.12";
format = "pyproject";
disabled = pythonOlder "3.5";
src = fetchPypi {
inherit pname version;
hash = "sha256-W4qly+g07Q1iYJ76/tGZNkBPa+oavhTDUYRQ3cZ+s1I=";
hash = "sha256-tJnr+uT8ZF6VI2IVc//LHFtoVKG1wM4dZqippFhgWAc=";
};
propagatedBuildInputs = [
@@ -32,12 +35,20 @@ buildPythonPackage rec {
scs
];
# Required flags from https://github.com/cvxgrp/cvxpy/releases/tag/v1.1.11
preBuild = lib.optional useOpenmp ''
export CFLAGS="-fopenmp"
export LDFLAGS="-lgomp"
'';
checkInputs = [ pytestCheckHook ];
pytestFlagsArray = [ "./cvxpy" ];
# Disable the slowest benchmarking tests, cuts test time in half
disabledTests = [
"test_tv_inpainting"
"test_diffcp_sdp_example"
] ++ lib.optionals stdenv.isAarch64 [
"test_ecos_bb_mi_lp_2" # https://github.com/cvxgrp/cvxpy/issues/1241#issuecomment-780912155
];
meta = with lib; {
pkgs/development/python-modules/datadog/default.nix
+1 -2
View File
@@ -43,12 +43,11 @@ buildPythonPackage rec {
];
disabledTestPaths = [
"tests/unit/dogstatsd/test_statsd.py" # does not work in sandbox
"tests/performance"
];
disabledTests = [
"test_default_settings_set"
"test_threadstats_thread_safety"
];
pythonImportsCheck = [ "datadog" ];
pkgs/development/python-modules/diagrams/build_poetry.patch
+12
View File
@@ -0,0 +1,12 @@
diff --git a/pyproject.toml b/pyproject.toml
index 2c93a39..6c800e2 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -24,3 +24,7 @@ isort = "^4.3"
[tool.black]
line-length = 120
+
+[build-system]
+requires = ["poetry_core>=1.0.0"]
+build-backend = "poetry.core.masonry.api"
pkgs/development/python-modules/diagrams/default.nix
+49
View File
@@ -0,0 +1,49 @@
{ lib
, buildPythonPackage
, pythonOlder
, fetchFromGitHub
, black
, jinja2
, poetry-core
, round
, graphviz
, inkscape
, imagemagick
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "diagrams";
version = "0.19.1";
format = "pyproject";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "mingrammer";
repo = pname;
rev = "v${version}";
sha256 = "0qvk0cp3026n5jmwp9z7m70b6pws0h6a7slxr23glg18baxr44d4";
};
preConfigure = ''
patchShebangs autogen.sh
./autogen.sh
'';
patches = [ ./build_poetry.patch ];
checkInputs = [ pytestCheckHook ];
# Despite living in 'tool.poetry.dependencies',
# these are only used at build time to process the image resource files
nativeBuildInputs = [ black inkscape imagemagick jinja2 poetry-core round ];
propagatedBuildInputs = [ graphviz ];
meta = with lib; {
description = "Diagram as Code";
homepage = "https://diagrams.mingrammer.com/";
license = licenses.mit;
maintainers = with maintainers; [ addict3d ];
};
}
pkgs/development/python-modules/hcloud/default.nix
+2 -2
View File
@@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "hcloud";
version = "1.11.0";
version = "1.12.0";
src = fetchPypi {
inherit pname version;
sha256 = "1yq7g9hk6b95nqd0f7kvh9r8ij8k9hs6gmjif83qip98xvkdwf0b";
sha256 = "1fka4m3kbz52pksrjw3v42k611x5kl06dxrc7p5rb64jg6gayjfl";
};
propagatedBuildInputs = [ future requests python-dateutil ];
pkgs/development/python-modules/ipfsapi/default.nix
-30
View File
@@ -1,30 +0,0 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, isPy27
, six
, requests
}:
buildPythonPackage rec {
pname = "ipfsapi";
version = "0.7.0";
disabled = isPy27;
src = fetchFromGitHub {
owner = "ipfs";
repo = "py-ipfs-api";
rev = version;
sha256 = "02yx7x9pdnfcav4vqd6ygqcisd3483b0zbx2j4brb4gxixk2hlyj";
};
propagatedBuildInputs = [ six requests ];
meta = with lib; {
description = "A python client library for the IPFS API";
license = licenses.mit;
maintainers = with maintainers; [ mguentner ];
homepage = "https://pypi.python.org/pypi/ipfsapi";
};
}
pkgs/development/python-modules/ipfshttpclient/default.nix
+82
View File
@@ -0,0 +1,82 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, pythonOlder
, python
, py-multiaddr
, requests
, pytestCheckHook
, pytest-cov
, pytest-dependency
, pytest-localserver
, pytest-mock
, pytest-order
, pytest-cid
, mock
, ipfs
, httpx
, httpcore
}:
buildPythonPackage rec {
pname = "ipfshttpclient";
version = "0.7.0";
format = "flit";
disabled = pythonOlder "3.5";
src = fetchFromGitHub {
owner = "ipfs-shipyard";
repo = "py-ipfs-http-client";
rev = version;
sha256 = "sha256-0lMoZo/9kZUXkaKvD9ZAZDQdGX7eNLzJVszZdlM/3Qs=";
};
propagatedBuildInputs = [
py-multiaddr
requests
];
checkInputs = [
pytestCheckHook
pytest-cov
pytest-dependency
pytest-localserver
pytest-mock
pytest-order
pytest-cid
mock
ipfs
httpcore
httpx
];
postPatch = ''
# Remove when the package supports the latest IPFS version by default
substituteInPlace ipfshttpclient/client/__init__.py \
--replace 'VERSION_MAXIMUM = "0.8.0"' \
'VERSION_MAXIMUM = "0.9.0"'
# Use pytest-order instead of pytest-ordering since the latter is unmaintained and broken
substituteInPlace test/run-tests.py \
--replace 'pytest_ordering' 'pytest_order'
substituteInPlace test/functional/test_miscellaneous.py \
--replace '@pytest.mark.last' '@pytest.mark.order("last")'
'';
checkPhase = ''
runHook preCheck
${python.interpreter} -X utf8 test/run-tests.py
runHook postCheck
'';
pythonImportsCheck = [ "ipfshttpclient" ];
meta = with lib; {
description = "A python client library for the IPFS API";
homepage = "https://github.com/ipfs-shipyard/py-ipfs-http-client";
license = licenses.mit;
maintainers = with maintainers; [ mguentner Luflosi ];
};
}
pkgs/development/python-modules/ircrobots/default.nix
+2 -2
View File
@@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "ircrobots";
version = "0.3.7";
version = "0.3.8";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "jesopo";
repo = pname;
rev = "v${version}";
sha256 = "0cm4hcmprca24d979ydbzwn9mfxw16jki6ld7yykxryf0983nqc7";
sha256 = "06q86dqllxvi3nssfplmjk9yxaybighwh87lrxfpfhl8yy4z68jz";
};
postPatch = ''
pkgs/development/python-modules/ircstates/default.nix
+2 -2
View File
@@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "ircstates";
version = "0.11.7";
version = "0.11.8";
disabled = pythonOlder "3.6"; # f-strings
src = fetchFromGitHub {
owner = "jesopo";
repo = pname;
rev = "v${version}";
sha256 = "00dyd6mry10na98x1gs92xnfpjf1wd9zpblx1wcx8ggv5rqvgqrm";
sha256 = "0scxqcgby4vzh2q937r0wy2mb46aghjf47q3z6fp6di1b6hlj7zh";
};
propagatedBuildInputs = [

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