alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge branch 'master' into staging-next

Browse source 
Conflicts:
  pkgs/servers/x11/xorg/default.nix
This commit is contained in:
Jonathan Ringer 2021-06-15 19:32:36 -07:00
parent 91171e2955 56e1dac7c8
commit d1d37feb6d
No known key found for this signature in database
GPG key ID: 5C841D3CFDFEC4E0
159 changed files with 5833 additions and 1071 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
maintainers/maintainer-list.nix
View file

@ -796,6 +796,12 @@
githubId = 718812;
name = "Antoine R. Dumont";
};
arezvov = {
email = "alex@rezvov.ru";
github = "arezvov";
githubId = 58516559;
name = "Alexander Rezvov";
};
arianvp = {
email = "arian.vanputten@gmail.com";
github = "arianvp";
@ -902,6 +908,12 @@
githubId = 869771;
name = "Kirill Boltaev";
};
ashley = {
email = "personavinny@protonmail.com";
github = "paranoidcat";
githubId = 84152630;
name = "Ashley Chiara";
};
asppsa = {
email = "asppsa@gmail.com";
github = "asppsa";
@ -6438,12 +6450,6 @@
githubId = 2649304;
name = "M. Baeten";
};
mbakke = {
email = "mbakke@fastmail.com";
github = "mbakke";
githubId = 1269099;
name = "Marius Bakke";
};
mbaillie = {
email = "martin@baillie.id";
github = "martinbaillie";
@ -8193,6 +8199,12 @@
githubId = 1829032;
name = "Paul Hendry";
};
polygon = {
email = "polygon@wh2.tu-dresden.de";
name = "Polygon";
github = "polygon";
githubId = 51489;
};
polyrod = {
email = "dc1mdp@gmail.com";
github = "polyrod";

69
nixos/doc/manual/from_md/release-notes/rl-2111.section.xml
View file

@ -232,6 +232,75 @@
<literal>services.x2goserver</literal>
</para>
</listitem>
<listitem>
<para>
The following dotnet-related packages have been removed for
being unmaintaned. Please use <literal>fetchNuGet</literal>
for specific packages.
</para>
<itemizedlist spacing="compact">
<listitem>
<para>
Autofac
</para>
</listitem>
<listitem>
<para>
SystemValueTuple
</para>
</listitem>
<listitem>
<para>
MicrosoftDiaSymReader
</para>
</listitem>
<listitem>
<para>
MicrosoftDiaSymReaderPortablePdb
</para>
</listitem>
<listitem>
<para>
SystemCollectionsImmutable
</para>
</listitem>
<listitem>
<para>
SystemCollectionsImmutable131
</para>
</listitem>
<listitem>
<para>
SystemReflectionMetadata
</para>
</listitem>
<listitem>
<para>
NUnit350
</para>
</listitem>
<listitem>
<para>
Deedle
</para>
</listitem>
<listitem>
<para>
ExcelDna
</para>
</listitem>
<listitem>
<para>
GitVersionTree
</para>
</listitem>
<listitem>
<para>
NDeskOptions
</para>
</listitem>
</itemizedlist>
</listitem>
</itemizedlist>
</section>
<section xml:id="other-notable-changes">

15
nixos/doc/manual/release-notes/rl-2111.section.md
View file

@ -66,4 +66,19 @@ In addition to numerous new and upgraded packages, this release has the followin
* `programs.x2goserver` is now `services.x2goserver`
* The following dotnet-related packages have been removed for being unmaintaned.
Please use `fetchNuGet` for specific packages.
- Autofac
- SystemValueTuple
- MicrosoftDiaSymReader
- MicrosoftDiaSymReaderPortablePdb
- SystemCollectionsImmutable
- SystemCollectionsImmutable131
- SystemReflectionMetadata
- NUnit350
- Deedle
- ExcelDna
- GitVersionTree
- NDeskOptions
## Other Notable Changes

13
nixos/modules/config/swap.nix
View file

@ -114,6 +114,19 @@ let
'';
};
discardPolicy = mkOption {
default = null;
example = "once";
type = types.nullOr (types.enum ["once" "pages" "both" ]);
description = ''
Specify the discard policy for the swap device. If "once", then the
whole swap space is discarded at swapon invocation. If "pages",
asynchronous discard on freed pages is performed, before returning to
the available pages pool. With "both", both policies are activated.
See swapon(8) for more information.
'';
};
deviceName = mkOption {
type = types.str;
internal = true;

1
nixos/modules/services/desktops/espanso.nix
View file

@ -12,7 +12,6 @@ in {
config = mkIf cfg.enable {
systemd.user.services.espanso = {
description = "Espanso daemon";
path = with pkgs; [ espanso libnotify xclip ];
serviceConfig = {
ExecStart = "${pkgs.espanso}/bin/espanso daemon";
Restart = "on-failure";

4
nixos/modules/services/misc/home-assistant.nix
View file

@ -66,7 +66,9 @@ in {
meta.maintainers = teams.home-assistant.members;
options.services.home-assistant = {
enable = mkEnableOption "Home Assistant";
# Running home-assistant on NixOS is considered an installation method that is unsupported by the upstream project.
# https://github.com/home-assistant/architecture/blob/master/adr/0012-define-supported-installation-method.md#decision
enable = mkEnableOption "Home Assistant. Please note that this installation method is unsupported upstream";
configDir = mkOption {
default = "/var/lib/hass";

12
nixos/modules/services/networking/solanum.nix
View file

@ -2,7 +2,7 @@
let
inherit (lib) mkEnableOption mkIf mkOption types;
inherit (pkgs) solanum;
inherit (pkgs) solanum util-linux;
cfg = config.services.solanum;
configFile = pkgs.writeText "solanum.conf" cfg.config;
@ -78,12 +78,20 @@ in
config = mkIf cfg.enable (lib.mkMerge [
{
environment.etc."solanum/ircd.conf".source = configFile;
systemd.services.solanum = {
description = "Solanum IRC daemon";
after = [ "network.target" ];
wantedBy = [ "multi-user.target" ];
reloadIfChanged = true;
restartTriggers = [
configFile
];
serviceConfig = {
ExecStart = "${solanum}/bin/solanum -foreground -logfile /dev/stdout -configfile ${configFile} -pidfile /run/solanum/ircd.pid";
ExecStart = "${solanum}/bin/solanum -foreground -logfile /dev/stdout -configfile /etc/solanum/ircd.conf -pidfile /run/solanum/ircd.pid";
ExecReload = "${util-linux}/bin/kill -HUP $MAINPID";
DynamicUser = true;
User = "solanum";
StateDirectory = "solanum";

16
nixos/modules/services/networking/ssh/sshd.nix
View file

@ -41,6 +41,10 @@ let
Warning: If you are using <literal>NixOps</literal> then don't use this
option since it will replace the key required for deployment via ssh.
'';
example = [
"ssh-rsa AAAAB3NzaC1yc2etc/etc/etcjwrsh8e596z6J0l7 example@host"
"ssh-ed25519 AAAAC3NzaCetcetera/etceteraJZMfk3QPfQ foo@bar"
];
};
keyFiles = mkOption {
@ -252,7 +256,17 @@ in
authorizedKeysFiles = mkOption {
type = types.listOf types.str;
default = [];
description = "Files from which authorized keys are read.";
description = ''
Specify the rules for which files to read on the host.
This is an advanced option. If you're looking to configure user
keys, you can generally use <xref linkend="opt-users.users._name_.openssh.authorizedKeys.keys"/>
or <xref linkend="opt-users.users._name_.openssh.authorizedKeys.keyFiles"/>.
These are paths relative to the host root file system or home
directories and they are subject to certain token expansion rules.
See AuthorizedKeysFile in man sshd_config for details.
'';
};
authorizedKeysCommand = mkOption {

7
nixos/modules/tasks/filesystems.nix
View file

@ -254,8 +254,11 @@ in
skipCheck = fs: fs.noCheck || fs.device == "none" || builtins.elem fs.fsType fsToSkipCheck;
# https://wiki.archlinux.org/index.php/fstab#Filepath_spaces
escape = string: builtins.replaceStrings [ " " "\t" ] [ "\\040" "\\011" ] string;
swapOptions = sw: "defaults"
+ optionalString (sw.priority != null) ",pri=${toString sw.priority}";
swapOptions = sw: concatStringsSep "," (
[ "defaults" ]
++ optional (sw.priority != null) "pri=${toString sw.priority}"
++ optional (sw.discardPolicy != null) "discard${optionalString (sw.discardPolicy != "both") "=${toString sw.discardPolicy}"}"
);
in ''
# This is a generated file. Do not edit!
#

8
nixos/tests/solanum.nix
View file

@ -16,6 +16,10 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
networking.firewall.allowedTCPPorts = [ ircPort ];
services.solanum = {
enable = true;
motd = ''
The default MOTD doesn't contain the word "nixos" in it.
This one does.
'';
};
};
} // lib.listToAttrs (builtins.map (client: lib.nameValuePair client {
@ -48,6 +52,10 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
${client}.wait_for_unit("ii")
${client}.wait_for_file("${iiDir}/${server}/out")
''
# look for the custom text in the MOTD.
''
${client}.wait_until_succeeds("grep 'nixos' ${iiDir}/${server}/out")
''
# wait until first PING from server arrives before joining,
# so we don't try it too early
''

4
pkgs/applications/audio/songrec/default.nix
View file

@ -25,6 +25,10 @@ rustPlatform.buildRustPackage rec {
buildInputs = [ alsa-lib gtk3 openssl ffmpeg ];
postInstall = ''
mv packaging/rootfs/usr/share $out/share
'';
meta = with lib; {
description = "An open-source Shazam client for Linux, written in Rust";
homepage = "https://github.com/marin-m/SongRec";

7
pkgs/applications/editors/emacs/27.nix
View file

@ -1,7 +1,12 @@
import ./generic.nix (rec {
version = "27.2";
sha256 = "sha256-tKfMTnjmPzeGJOCRkhW5EK9bsqCvyBn60pgnLp9Awbk=";
patches = [
patches = fetchpatch: [
./tramp-detect-wrapped-gvfsd.patch
(fetchpatch {
name = "fix-aarch64-darwin-triplet.patch";
url = "https://git.savannah.gnu.org/cgit/emacs.git/patch/?id=a88f63500e475f842e5fbdd9abba4ce122cdb082";
sha256 = "sha256-RF9b5PojFUAjh2TDUW4+HaWveV30Spy1iAXhaWf1ZVg=";
})
];
})

14
pkgs/applications/editors/emacs/generic.nix
View file

@ -10,7 +10,7 @@
, Xaw3d, libXcursor, pkg-config, gettext, libXft, dbus, libpng, libjpeg, giflib
, libtiff, librsvg, gconf, libxml2, imagemagick, gnutls, libselinux
, alsa-lib, cairo, acl, gpm, AppKit, GSS, ImageIO, m17n_lib, libotf
, jansson, harfbuzz
, sigtool, jansson, harfbuzz
, dontRecurseIntoAttrs ,emacsPackagesFor
, libgccjit, targetPlatform, makeWrapper # native-comp params
, systemd ? null
@ -46,10 +46,10 @@ assert withXwidgets -> withGTK3 && webkitgtk != null;
let emacs = stdenv.mkDerivation (lib.optionalAttrs nativeComp {
NATIVE_FULL_AOT = "1";
LIBRARY_PATH = "${lib.getLib stdenv.cc.libc}/lib";
} // lib.optionalAttrs stdenv.isDarwin {
CFLAGS = "-DMAC_OS_X_VERSION_MAX_ALLOWED=101200";
} // {
inherit pname version patches;
inherit pname version;
patches = patches fetchpatch;
src = fetchurl {
url = "mirror://gnu/emacs/${name}.tar.xz";
@ -118,8 +118,8 @@ let emacs = stdenv.mkDerivation (lib.optionalAttrs nativeComp {
++ lib.optional (withX && withMotif) motif
++ lib.optionals (withX && withXwidgets) [ webkitgtk glib-networking ]
++ lib.optionals withNS [ AppKit GSS ImageIO ]
++ lib.optionals nativeComp [ libgccjit ]
;
++ lib.optionals stdenv.isDarwin [ sigtool ]
++ lib.optionals nativeComp [ libgccjit ];
hardeningDisable = [ "format" ];
@ -138,7 +138,7 @@ let emacs = stdenv.mkDerivation (lib.optionalAttrs nativeComp {
++ lib.optional withXwidgets "--with-xwidgets"
++ lib.optional nativeComp "--with-native-compilation"
++ lib.optional withImageMagick "--with-imagemagick"
;
;
installTargets = [ "tags" "install" ];

22
pkgs/applications/editors/jetbrains/default.nix
View file

@ -307,12 +307,12 @@ in
mps = buildMps rec {
name = "mps-${version}";
version = "2020.3.3"; /* updated by script */
version = "2021.1"; /* updated by script */
description = "Create your own domain-specific language";
license = lib.licenses.asl20;
src = fetchurl {
url = "https://download.jetbrains.com/mps/2020.3/MPS-${version}.tar.gz";
sha256 = "0sb50f7d4272dzx84njc326xvhbqn3xwrphvdq4zl3pk3wl8f4nz"; /* updated by script */
url = "https://download.jetbrains.com/mps/${version}/MPS-${version}.tar.gz";
sha256 = "0fdh8lzsi2zryi0xs961vrf3l8kqk5imlj56dhifywi7xkhs3vwn"; /* updated by script */
};
wmClass = "jetbrains-mps";
update-channel = "MPS RELEASE";
@ -320,12 +320,12 @@ in
phpstorm = buildPhpStorm rec {
name = "phpstorm-${version}";
version = "2021.1.2"; /* updated by script */
version = "2021.1.3"; /* updated by script */
description = "Professional IDE for Web and PHP developers";
license = lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz";
sha256 = "02s75fqd9hfh302zha4jw6qynpgm9nkrlq7s78nk3fc3d3hw8v5y"; /* updated by script */
sha256 = "05hjv1nz1b82bkakadjvsy23v0qv8fyni6h31lcg9198h1890f7v"; /* updated by script */
};
wmClass = "jetbrains-phpstorm";
update-channel = "PhpStorm RELEASE";
@ -333,12 +333,12 @@ in
pycharm-community = buildPycharm rec {
name = "pycharm-community-${version}";
version = "2021.1.1"; /* updated by script */
version = "2021.1.2"; /* updated by script */
description = "PyCharm Community Edition";
license = lib.licenses.asl20;
src = fetchurl {
url = "https://download.jetbrains.com/python/${name}.tar.gz";
sha256 = "04bs9sz872b0h1zzax23irvj6q5wxnzp6fl4f177j94kh4116cqh"; /* updated by script */
sha256 = "0sp7w1xrl0y36dai08kqfd0jk06yr7jdbaf1a9f3fgxp5pmspxp1"; /* updated by script */
};
wmClass = "jetbrains-pycharm-ce";
update-channel = "PyCharm RELEASE";
@ -346,12 +346,12 @@ in
pycharm-professional = buildPycharm rec {
name = "pycharm-professional-${version}";
version = "2021.1.1"; /* updated by script */
version = "2021.1.2"; /* updated by script */
description = "PyCharm Professional Edition";
license = lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/python/${name}.tar.gz";
sha256 = "0wc9j7nilakmm7scf7a71zb3k9vixgih05ni3n3pp4iznvwb3nxg"; /* updated by script */
sha256 = "0ny7rbl8g5azpqnlcq8l6bwh6hrp8rgp06lf4a8gdr9rpvw9xsqb"; /* updated by script */
};
wmClass = "jetbrains-pycharm";
update-channel = "PyCharm RELEASE";
@ -372,12 +372,12 @@ in
ruby-mine = buildRubyMine rec {
name = "ruby-mine-${version}";
version = "2021.1.1"; /* updated by script */
version = "2021.1.2"; /* updated by script */
description = "The Most Intelligent Ruby and Rails IDE";
license = lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz";
sha256 = "05sfjf5523idsl7byc7400r4xqv1d65gpmkh5x0lbgf1k3bx2wlm"; /* updated by script */
sha256 = "0r80y8y38rdxgc9sim0q2p7bmgxlp4pdxydr0w9gjikwnjxnvz51"; /* updated by script */
};
wmClass = "jetbrains-rubymine";
update-channel = "RubyMine RELEASE";

5
pkgs/applications/editors/jetbrains/update.pl
View file

@ -61,8 +61,9 @@ sub update_nix_block {
# try to interpret some nix
my ($name) = $block =~ /name\s*=\s*"([^"]+)"/;
$name =~ s/\$\{version\}/$latest_versions{$channel}/;
$url =~ s/\$\{name\}/$name/;
$url =~ s/\$\{version\}/$latest_versions{$channel}/;
# Some url paattern contain variables more than once
$url =~ s/\$\{name\}/$name/g;
$url =~ s/\$\{version\}/$latest_versions{$channel}/g;
die "$url still has some interpolation" if $url =~ /\$/;
my ($sha256) = get("$url.sha256") =~ /^([0-9a-f]{64})/;
my $version_string = $latest_versions{$channel};

4
pkgs/applications/editors/nano/default.nix
View file

@ -16,11 +16,11 @@ let
in stdenv.mkDerivation rec {
pname = "nano";
version = "5.7";
version = "5.8";
src = fetchurl {
url = "mirror://gnu/nano/${pname}-${version}.tar.xz";
sha256 = "1ynarilx0ca0a5h6hl5bf276cymyy8s9wr5l24vyy7f15v683cfl";
sha256 = "133nhxg4xfxisjzi85rn2l575hdbvcax1s13l4m6wcvq5zdn6fz4";
};
nativeBuildInputs = [ texinfo ] ++ optional enableNls gettext;

3
pkgs/applications/editors/vim/configurable.nix
View file

@ -175,7 +175,8 @@ in stdenv.mkDerivation rec {
ln -sfn '${nixosRuntimepath}' "$out"/share/vim/vimrc
'' + lib.optionalString wrapPythonDrv ''
wrapProgram "$out/bin/vim" --prefix PATH : "${python3}/bin"
wrapProgram "$out/bin/vim" --prefix PATH : "${python3}/bin" \
--set NIX_PYTHONPATH "${python3}/${python3.sitePackages}"
'' + lib.optionalString (guiSupport == "gtk3") ''
rewrap () {

9
pkgs/applications/misc/keepassx/community.nix
View file

@ -1,8 +1,6 @@
{ lib, stdenv
, fetchFromGitHub
, fetchpatch
, cmake
, makeWrapper
, qttools
, darwin
@ -43,13 +41,13 @@ with lib;
stdenv.mkDerivation rec {
pname = "keepassxc";
version = "2.6.4";
version = "2.6.6";
src = fetchFromGitHub {
owner = "keepassxreboot";
repo = "keepassxc";
rev = version;
sha256 = "02ajfkw818cmalvkl0kqvza85rgdgs59kw2v7b3c4v8kv00c41j3";
sha256 = "15rm3avdmc2x2n92zq6w1zbcranak4j6dds2sxmgdqi1ffc0a3ci";
};
NIX_CFLAGS_COMPILE = optionalString stdenv.cc.isClang [
@ -92,10 +90,9 @@ stdenv.mkDerivation rec {
runHook postCheck
'';
nativeBuildInputs = [ cmake wrapQtAppsHook qttools pkg-config ];
nativeBuildInputs = [ asciidoctor cmake wrapQtAppsHook qttools pkg-config ];
buildInputs = [
asciidoctor
curl
glibcLocales
libXi

2
pkgs/applications/misc/octoprint/default.nix
View file

@ -134,7 +134,7 @@ let
tornado
unidecode
watchdog
websocket_client
websocket-client
werkzeug
wrapt
zeroconf

2
pkgs/applications/misc/rofi/default.nix
View file

@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
description = "Window switcher, run dialog and dmenu replacement";
homepage = "https://github.com/davatorium/rofi";
license = licenses.mit;
maintainers = with maintainers; [ mbakke ];
maintainers = with maintainers; [ ];
platforms = with platforms; linux;
};
}

2
pkgs/applications/misc/ulauncher/default.nix
View file

@ -59,7 +59,7 @@ python3Packages.buildPythonApplication rec {
python-Levenshtein
pyxdg
requests
websocket_client
websocket-client
];
checkInputs = with python3Packages; [

12
pkgs/applications/networking/browsers/chromium/upstream-info.json
View file

@ -1,8 +1,8 @@
{
"stable": {
"version": "91.0.4472.101",
"sha256": "1d3y621iclkq6nvxrapk5aihv50x13hjha0c2gcp2xxfma96253q",
"sha256bin64": "12j5q5b9v0jpiznjnh89831w8lv399vd1z4ljhbsnsidbsygrbr1",
"version": "91.0.4472.106",
"sha256": "1fxy1l2dl0f6v8566lykcng18ma6fv4nlwxmdb0hh06fgp6khpjl",
"sha256bin64": "11l88fqrl1r7b02j78zgrr6kajayl8kw8mb8b91ard18w5kz1xvd",
"deps": {
"gn": {
"version": "2021-04-06",
@ -12,9 +12,9 @@
}
},
"chromedriver": {
"version": "91.0.4472.19",
"sha256_linux": "0pg9y55644i87qxa0983lvfizbmfiak9bg9249xhifl5kykghrb2",
"sha256_darwin": "07v5k07100vrzsbm6r59xg8j80ffzs3gnnf2kcfgqrzprx284gf2"
"version": "91.0.4472.101",
"sha256_linux": "0dzx565z2rd0y4i57rv5kd7dsm69sffza96y3c773hqaghm4y1ng",
"sha256_darwin": "0nff1jmmrn6a4clfvhyzrhfp8hx85z72563jwk28apflqmnm0k68"
}
},
"beta": {

4
pkgs/applications/networking/browsers/lagrange/default.nix
View file

@ -15,13 +15,13 @@
stdenv.mkDerivation rec {
pname = "lagrange";
version = "1.5.0";
version = "1.5.2";
src = fetchFromGitHub {
owner = "skyjake";
repo = "lagrange";
rev = "v${version}";
sha256 = "sha256-W7uSyApTKBTE7bgprgCd8T5dKQ/nLYKIzFxjDMCRmZQ=";
sha256 = "sha256-NjiTjY2YuxUs/Wny7aDqHGw/2ML1fenjHrl089rLXFI=";
fetchSubmodules = true;
};

8
pkgs/applications/networking/cluster/terraform-providers/providers.json
View file

@ -513,10 +513,10 @@
"owner": "Mongey",
"provider-source-address": "registry.terraform.io/Mongey/kafka",
"repo": "terraform-provider-kafka",
"rev": "v0.2.12",
"sha256": "0jm592chliiph5643rymzpwnlcq7q6bpwg2h86x5qmbzbiyqsi83",
"vendorSha256": "08wg16g4mvn6kl8xwn89195a826cb132ijvrgf32c6p7zp4lgmjd",
"version": "0.2.12"
"rev": "v0.3.3",
"sha256": "10il2mmsrk27zgzdkwn495sfhlad2nnc2xa7qzn7rlqzh92bb8rb",
"vendorSha256": "1gxx561s7jghiq6kqb2nns52bbcp0ks2dylrb1lvy7g2798cpspf",
"version": "0.3.3"
},
"kafka-connect": {
"owner": "Mongey",

143
pkgs/applications/networking/cluster/terraform/default.nix
View file

@ -1,10 +1,21 @@
{ stdenv, lib, buildGoModule, fetchFromGitHub, makeWrapper, coreutils
, runCommand, runtimeShell, writeText, terraform-providers, fetchpatch }:
{ stdenv
, lib
, buildGoModule
, fetchFromGitHub
, makeWrapper
, coreutils
, runCommand
, runtimeShell
, writeText
, terraform-providers
, fetchpatch
}:
let
generic = { version, sha256, vendorSha256 ? null, ... }@attrs:
let attrs' = builtins.removeAttrs attrs [ "version" "sha256" "vendorSha256" ];
in buildGoModule ({
in
buildGoModule ({
name = "terraform-${version}";
inherit vendorSha256;
@ -62,33 +73,37 @@ let
actualPlugins = plugins terraform.plugins;
# Make providers available in Terraform 0.13 and 0.12 search paths.
pluginDir = lib.concatMapStrings (pl: let
inherit (pl) version GOOS GOARCH;
pluginDir = lib.concatMapStrings
(pl:
let
inherit (pl) version GOOS GOARCH;
pname = pl.pname or (throw "${pl.name} is missing a pname attribute");
pname = pl.pname or (throw "${pl.name} is missing a pname attribute");
# This is just the name, without the terraform-provider- prefix
plugin_name = lib.removePrefix "terraform-provider-" pname;
# This is just the name, without the terraform-provider- prefix
plugin_name = lib.removePrefix "terraform-provider-" pname;
slug = pl.passthru.provider-source-address or "registry.terraform.io/nixpkgs/${plugin_name}";
slug = pl.passthru.provider-source-address or "registry.terraform.io/nixpkgs/${plugin_name}";
shim = writeText "shim" ''
#!${runtimeShell}
exec ${pl}/bin/${pname}_v${version} "$@"
'';
in ''
TF_0_13_PROVIDER_PATH=$out/plugins/${slug}/${version}/${GOOS}_${GOARCH}/${pname}_v${version}
mkdir -p "$(dirname $TF_0_13_PROVIDER_PATH)"
shim = writeText "shim" ''
#!${runtimeShell}
exec ${pl}/bin/${pname}_v${version} "$@"
'';
in
''
TF_0_13_PROVIDER_PATH=$out/plugins/${slug}/${version}/${GOOS}_${GOARCH}/${pname}_v${version}
mkdir -p "$(dirname $TF_0_13_PROVIDER_PATH)"
cp ${shim} "$TF_0_13_PROVIDER_PATH"
chmod +x "$TF_0_13_PROVIDER_PATH"
cp ${shim} "$TF_0_13_PROVIDER_PATH"
chmod +x "$TF_0_13_PROVIDER_PATH"
TF_0_12_PROVIDER_PATH=$out/plugins/${pname}_v${version}
TF_0_12_PROVIDER_PATH=$out/plugins/${pname}_v${version}
cp ${shim} "$TF_0_12_PROVIDER_PATH"
chmod +x "$TF_0_12_PROVIDER_PATH"
''
) actualPlugins;
cp ${shim} "$TF_0_12_PROVIDER_PATH"
chmod +x "$TF_0_12_PROVIDER_PATH"
''
)
actualPlugins;
# Wrap PATH of plugins propagatedBuildInputs, plugins may have runtime dependencies on external binaries
wrapperInputs = lib.unique (lib.flatten
@ -110,9 +125,10 @@ let
};
# Don't bother wrapping unless we actually have plugins, since the wrapper will stop automatic downloading
# of plugins, which might be counterintuitive if someone just wants a vanilla Terraform.
in if actualPlugins == [ ] then
in
if actualPlugins == [ ] then
terraform.overrideAttrs
(orig: { passthru = orig.passthru // passthru; })
(orig: { passthru = orig.passthru // passthru; })
else
lib.appendToName "with-plugins" (stdenv.mkDerivation {
inherit (terraform) name meta;
@ -127,76 +143,47 @@ let
inherit passthru;
});
in withPlugins (_: [ ]);
in
withPlugins (_: [ ]);
plugins = removeAttrs terraform-providers [
"override"
"overrideDerivation"
"recurseForDerivations"
];
in rec {
terraform_0_12 = pluggable (generic {
version = "0.12.31";
sha256 = "03p698xdbk5gj0f9v8v1fpd74zng3948dyy4f2hv7zgks9hid7fg";
patches = [
./provider-path.patch
(fetchpatch {
name = "fix-mac-mojave-crashes.patch";
url = "https://github.com/hashicorp/terraform/commit/cd65b28da051174a13ac76e54b7bb95d3051255c.patch";
sha256 = "1k70kk4hli72x8gza6fy3vpckdm3sf881w61fmssrah3hgmfmbrs";
}) ];
passthru = { inherit plugins; };
});
in
rec {
# Constructor for other terraform versions
mkTerraform = attrs: pluggable (generic attrs);
terraform_0_13 = pluggable (generic {
version = "0.13.7";
sha256 = "1cahnmp66dk21g7ga6454yfhaqrxff7hpwpdgc87cswyq823fgjn";
patches = [ ./provider-path.patch ];
passthru = { inherit plugins; };
});
terraform_0_14 = pluggable (generic {
version = "0.14.11";
sha256 = "1yi1jj3n61g1kn8klw6l78shd23q79llb7qqwigqrx3ki2mp279j";
vendorSha256 = "1d93aqkjdrvabkvix6h1qaxpjzv7w1wa7xa44czdnjs2lapx4smm";
patches = [ ./provider-path.patch ];
passthru = { inherit plugins; };
});
terraform_0_15 = pluggable (generic {
version = "0.15.5";
sha256 = "18f4a6l24s3cym7gk40agxikd90i56q84wziskw1spy9rgv2yx6d";
vendorSha256 = "12hrpxay6k3kz89ihyhl91c4lw4wp821ppa245w9977fq09fhnx0";
patches = [ ./provider-path-0_15.patch ];
passthru = { inherit plugins; };
});
terraform_1_0_0 = pluggable (generic {
terraform_1_0 = mkTerraform {
version = "1.0.0";
sha256 = "sha256-ddcT/I2Qn1pKFyhXgh+CcD3fSv2steSNmjyyiS2SE/o=";
vendorSha256 = "sha256-oFvoEsDunJR4IULdGwS6nHBKWEgUehgT+nNM41W/GYo=";
patches = [ ./provider-path-0_15.patch ];
passthru = { inherit plugins; };
});
};
# Tests that the plugins are being used. Terraform looks at the specific
# file pattern and if the plugin is not found it will try to download it
# from the Internet. With sandboxing enable this test will fail if that is
# the case.
terraform_plugins_test = let
mainTf = writeText "main.tf" ''
resource "random_id" "test" {}
'';
terraform = terraform_0_12.withPlugins (p: [ p.random ]);
test =
runCommand "terraform-plugin-test" { buildInputs = [ terraform ]; } ''
set -e
# make it fail outside of sandbox
export HTTP_PROXY=http://127.0.0.1:0 HTTPS_PROXY=https://127.0.0.1:0
cp ${mainTf} main.tf
terraform init
touch $out
terraform_plugins_test =
let
mainTf = writeText "main.tf" ''
resource "random_id" "test" {}
'';
in test;
terraform = terraform_1_0.withPlugins (p: [ p.random ]);
test =
runCommand "terraform-plugin-test" { buildInputs = [ terraform ]; } ''
set -e
# make it fail outside of sandbox
export HTTP_PROXY=http://127.0.0.1:0 HTTPS_PROXY=https://127.0.0.1:0
cp ${mainTf} main.tf
terraform init
touch $out
'';
in
test;
}

6
pkgs/applications/networking/cluster/terragrunt/default.nix
View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "terragrunt";
version = "0.29.9";
version = "0.30.3";
src = fetchFromGitHub {
owner = "gruntwork-io";
repo = pname;
rev = "v${version}";
sha256 = "sha256-xgoKxA8lc72yhFVHeFkbF5j5/vGAd9TTaJ/aDEYL8Wg=";
sha256 = "sha256-kGeGqn0Jgim3gpZUwhIMPV84XD8yYEyH5YMtzidxWRU=";
};
vendorSha256 = "sha256-qlSCQtiGHmlk3DyETMoQbbSYhuUSZTsvAnBKuDJI8x8=";
vendorSha256 = "sha256-OgNNq1qRhCufcWemLxh50pzs432RxZpWWcyBB7xeiOs=";
doCheck = false;

4
pkgs/applications/networking/irc/convos/default.nix
View file

@ -6,13 +6,13 @@ with lib;
perlPackages.buildPerlPackage rec {
pname = "convos";
version = "6.11";
version = "6.24";
src = fetchFromGitHub {
owner = "convos-chat";
repo = pname;
rev = "v${version}";
sha256 = "19nzm7f3glvj34nj9pvnp0h9xx6baq58c11ddkqfmq7w3sci49hi";
sha256 = "0hrz74fybypkjf9hraknylxrhnz7bhk00pk6wla2wfg8s2798zlx";
};
nativeBuildInputs = [ makeWrapper ]

2
pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix
View file

@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
env = "${buildEnv {
name = "wee-slack-env";
paths = with python3Packages; [
websocket_client
websocket-client
six
];
}}/${python3Packages.python.sitePackages}";

2
pkgs/applications/networking/p2p/zeronet/default.nix
View file

@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec {
};
propagatedBuildInputs = with python3Packages; [
gevent msgpack base58 merkletools rsa pysocks pyasn1 websocket_client
gevent msgpack base58 merkletools rsa pysocks pyasn1 websocket-client
gevent-websocket rencode bitcoinlib maxminddb pyopenssl
];

8
pkgs/applications/office/espanso/default.nix
View file

@ -10,6 +10,7 @@
, openssl
, xclip
, xdotool
, makeWrapper
}:
rustPlatform.buildRustPackage rec {
@ -28,6 +29,7 @@ rustPlatform.buildRustPackage rec {
nativeBuildInputs = [
extra-cmake-modules
pkg-config
makeWrapper
];
buildInputs = [
@ -35,6 +37,7 @@ rustPlatform.buildRustPackage rec {
libXtst
libXi
libnotify
xclip
openssl
xdotool
];
@ -42,6 +45,11 @@ rustPlatform.buildRustPackage rec {
# Some tests require networking
doCheck = false;
postInstall = ''
wrapProgram $out/bin/espanso \
--prefix PATH : ${lib.makeBinPath [ libnotify xclip ]}
'';
meta = with lib; {
description = "Cross-platform Text Expander written in Rust";
homepage = "https://espanso.org";

9
pkgs/applications/science/biology/truvari/default.nix
View file

@ -5,15 +5,20 @@
python3Packages.buildPythonApplication rec {
pname = "truvari";
version = "2.0.2";
version = "2.1.1";
src = fetchFromGitHub {
owner = "spiralgenetics";
repo = "truvari";
rev = "v${version}";
sha256 = "0lp1wnldjv92k4ncga1h0icb0dpjsrx427vggg40x04a7kp9lwx0";
sha256 = "14nsdbj063qm175xxixs34cihvsiskc9gym8pg7gbwsh13k5a00h";
};
postPatch = ''
substituteInPlace setup.py \
--replace 'python-Levenshtein==0.12.1' 'python-Levenshtein>=0.12.1'
'';
propagatedBuildInputs = with python3Packages; [
pyvcf
python-Levenshtein

6
pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix
View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "diff-so-fancy";
version = "1.4.1";
version = "1.4.2";
src = fetchFromGitHub {
owner = "so-fancy";
repo = "diff-so-fancy";
rev = "v${version}";
sha256 = "sha256-bV22x459QerWg4MVLWsXPDhM38QWG6BE+dVmKIFfDiE=";
sha256 = "sha256-1kBarsRiuB8fv7VLlWfpotPfHeMrfmIXHXTFu8TzC2A=";
};
nativeBuildInputs = [
@ -52,6 +52,6 @@ stdenv.mkDerivation rec {
diff-so-fancy builds on the good-lookin' output of git contrib's
diff-highlight to upgrade your diffs' appearances.
'';
maintainers = with maintainers; [ fpletz globin ];
maintainers = with maintainers; [ fpletz globin ma27 ];
};
}

10
pkgs/applications/version-management/gitlab/data.json
View file

@ -1,13 +1,13 @@
{
"version": "13.12.3",
"repo_hash": "0kpdl1gwcxy13lwyl96nsia62wysrnxdygil6sz6s72hg0y2fsgr",
"version": "13.12.4",
"repo_hash": "1jp97vwwfnh3iqkh58y0zqcx6lsvqcpnxy8ipd4j9hbmag1jr36i",
"owner": "gitlab-org",
"repo": "gitlab",
"rev": "v13.12.3-ee",
"rev": "v13.12.4-ee",
"passthru": {
"GITALY_SERVER_VERSION": "13.12.3",
"GITALY_SERVER_VERSION": "13.12.4",
"GITLAB_PAGES_VERSION": "1.39.0",
"GITLAB_SHELL_VERSION": "13.18.0",
"GITLAB_WORKHORSE_VERSION": "13.12.3"
"GITLAB_WORKHORSE_VERSION": "13.12.4"
}
}

4
pkgs/applications/version-management/gitlab/gitaly/default.nix
View file

@ -21,14 +21,14 @@ let
};
};
in buildGoModule rec {
version = "13.12.3";
version = "13.12.4";
pname = "gitaly";
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitaly";
rev = "v${version}";
sha256 = "sha256-qqLVYNCE8rKPBY5tj6AAoWcyIEtQZkO980NVPg0WO18=";
sha256 = "sha256-5I06tzeOfVdtblgqI7neKBgwzXuU9hI/0V3gYEPMJJ0=";
};
vendorSha256 = "sha256-drS0L0olEFHYJVC0VYwEZeNYa8fjwrfxlhrEQa4pqzY=";

2
pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
View file

@ -5,7 +5,7 @@ in
buildGoModule rec {
pname = "gitlab-workhorse";
version = "13.12.3";
version = "13.12.4";
src = fetchFromGitLab {
owner = data.owner;

45
pkgs/applications/video/flowblade/default.nix Normal file
View file

@ -0,0 +1,45 @@
{ lib, fetchFromGitHub, stdenv
, ffmpeg, frei0r, sox, gtk3, python3, ladspaPlugins
, gobject-introspection, makeWrapper, wrapGAppsHook
}:
stdenv.mkDerivation rec {
pname = "flowblade";
version = "2.8.0.3";
src = fetchFromGitHub {
owner = "jliljebl";
repo = pname;
rev = "v${version}";
sha256 = "sha256-/EkI3qiceB5eKTVQnpG+z4e6yaE9hDtn6I+iN/J+h/g=";
};
buildInputs = [
ffmpeg frei0r sox gtk3 gobject-introspection ladspaPlugins
(python3.withPackages (ps: with ps; [ mlt pygobject3 dbus-python numpy pillow ]))
];
nativeBuildInputs = [ gobject-introspection makeWrapper wrapGAppsHook ];
installPhase = ''
runHook preInstall
mkdir -p $out
cp -a ${src}/flowblade-trunk $out/flowblade
makeWrapper $out/flowblade/flowblade $out/bin/flowblade \
--set FREI0R_PATH ${frei0r}/lib/frei0r-1 \
--set LADSPA_PATH ${ladspaPlugins}/lib/ladspa \
''${gappsWrapperArgs[@]}
runHook postInstall
'';
meta = with lib; {
description = "Multitrack Non-Linear Video Editor";
homepage = "https://jliljebl.github.io/flowblade/";
license = with licenses; [ gpl3Plus ];
platforms = platforms.linux;
maintainers = with maintainers; [ polygon ];
};
}

2
pkgs/applications/video/streamlink/default.nix
View file

@ -28,7 +28,7 @@ python3.pkgs.buildPythonApplication rec {
requests
iso-639
iso3166
websocket_client
websocket-client
isodate
]) ++ [
rtmpdump

4
pkgs/applications/virtualization/docker-compose/default.nix
View file

@ -3,7 +3,7 @@
, mock, pytest, nose
, pyyaml, backports_ssl_match_hostname, colorama, docopt
, dockerpty, docker, ipaddress, jsonschema, requests
, six, texttable, websocket_client, cached-property
, six, texttable, websocket-client, cached-property
, enum34, functools32, paramiko, distro, python-dotenv
}:
@ -22,7 +22,7 @@ buildPythonApplication rec {
checkInputs = [ mock pytest nose ];
propagatedBuildInputs = [
pyyaml colorama dockerpty docker
ipaddress jsonschema requests six texttable websocket_client
ipaddress jsonschema requests six texttable websocket-client
docopt cached-property paramiko distro python-dotenv
] ++ lib.optional (pythonOlder "3.7") backports_ssl_match_hostname
++ lib.optional (pythonOlder "3.4") enum34

4
pkgs/applications/virtualization/docker-slim/default.nix
View file

@ -6,7 +6,7 @@
buildGoPackage rec {
pname = "docker-slim";
version = "1.35.2";
version = "1.36.0";
goPackagePath = "github.com/docker-slim/docker-slim";
@ -14,7 +14,7 @@ buildGoPackage rec {
owner = "docker-slim";
repo = "docker-slim";
rev = version;
sha256 = "sha256-Pg3vPvnEo1OkCakwkwS/HaFnvmpjuHHlGqIjddO6jwQ=";
sha256 = "sha256-4wSQ5R0haVnbtWk2im83A1FzrJDHVEFLqnkROGNF4q8=";
};
subPackages = [ "cmd/docker-slim" "cmd/docker-slim-sensor" ];

4
pkgs/data/fonts/emacs-all-the-icons-fonts/default.nix
View file

@ -1,7 +1,7 @@
{ lib, fetchzip }:
let
version = "3.2.0";
version = "5.0.0";
in fetchzip {
name = "emacs-all-the-icons-fonts-${version}";
@ -12,7 +12,7 @@ in fetchzip {
unzip -j $downloadedFile \*.ttf -d $out/share/fonts/all-the-icons
'';
sha256 = "0ps8q9nkx67ivgn8na4s012360v36jwr0951rsg7j6dyyw9g41jq";
sha256 = "0vc9bkm4pcc05llcd2c9zr3d88h3zmci0izla5wnw8hg1n0rsrii";
meta = with lib; {
description = "Icon fonts for emacs all-the-icons";

4
pkgs/desktops/xfce/core/xfce4-settings/default.nix
View file

@ -5,9 +5,9 @@
mkXfceDerivation {
category = "xfce";
pname = "xfce4-settings";
version = "4.16.1";
version = "4.16.2";
sha256 = "0mjhglfsqmiycpv98l09n2556288g2713n4pvxn0srivm017fdir";
sha256 = "09npyqxsbrvz60bkbardqrizd5rvray5hkp84qgjzc10z4qrnk0f";
postPatch = ''
for f in xfsettingsd/pointers.c dialogs/mouse-settings/main.c; do

4
pkgs/development/beam-modules/erlang-ls/default.nix
View file

@ -1,6 +1,6 @@
{ fetchFromGitHub, fetchHex, rebar3Relx, buildRebar3, rebar3-proper, lib }:
let
version = "0.16.0";
version = "0.17.0";
owner = "erlang-ls";
repo = "erlang_ls";
deps = import ./rebar-deps.nix {
@ -17,7 +17,7 @@ in rebar3Relx {
inherit version;
src = fetchFromGitHub {
inherit owner repo;
sha256 = "0l09yhj3rsb9zj4cs6a1bcfmi6zbyb3xk1lv494xbyiv5d61vkwm";
sha256 = "0szg9hx436cvy80sh94dzmf2rainnw3fjc84bv3hlzjwwzmxj9aw";
rev = version;
};
releaseType = "escript";

25
pkgs/development/compilers/flutter/default.nix
View file

@ -5,36 +5,13 @@ let
let files = builtins.attrNames (builtins.readDir dir);
in map (f: dir + ("/" + f)) files;
version = "2.2.1";
dartVersion = "2.13.1";
channel = "stable";
filename = "flutter_linux_${version}-${channel}.tar.xz";
dartStable = dart.override {
version = dartVersion;
sources = {
"${dartVersion}-x86_64-darwin" = fetchurl {
url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${dartVersion}/sdk/dartsdk-macos-x64-release.zip";
sha256 = "0kb6r2rmp5d0shvgyy37fmykbgww8qaj4f8k79rmqfv5lwa3izya";
};
"${dartVersion}-x86_64-linux" = fetchurl {
url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${dartVersion}/sdk/dartsdk-linux-x64-release.zip";
sha256 = "0zq8wngyrw01wjc5s6w1vz2jndms09ifiymjjixxby9k41mr6jrq";
};
"${dartVersion}-i686-linux" = fetchurl {
url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${dartVersion}/sdk/dartsdk-linux-ia32-release.zip";
sha256 = "0zv4q8xv2i08a6izpyhhnil75qhs40m5mgyvjqjsswqkwqdf7lkj";
};
"${dartVersion}-aarch64-linux" = fetchurl {
url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${dartVersion}/sdk/dartsdk-linux-arm64-release.zip";
sha256 = "0bb9jdmg5p608jmmiqibp13ydiw9avgysxlmljvgsl7wl93j6rgc";
};
};
};
in
{
mkFlutter = mkFlutter;
stable = mkFlutter rec {
dart = dartStable;
inherit version;
inherit dart version;
pname = "flutter";
src = fetchurl {
url = "https://storage.googleapis.com/flutter_infra/releases/${channel}/linux/${filename}";

6
pkgs/development/compilers/nim/default.nix
View file

@ -95,12 +95,12 @@ in {
nim-unwrapped = stdenv.mkDerivation rec {
pname = "nim-unwrapped";
version = "1.4.6";
version = "1.4.8";
strictDeps = true;
src = fetchurl {
url = "https://nim-lang.org/download/nim-${version}.tar.xz";
hash = "sha256-D7wPkoLP/oXembxHv6h2Ulud3aKi6uVcGFoIgEuY070=";
hash = "sha256-t5jFd0EdfZW4YxJh27Nnbp0a/Z42dA0ESWagVVtBRBo=";
};
buildInputs = [ boehmgc openssl pcre readline sqlite ];
@ -290,6 +290,8 @@ in {
makeWrapper \
${nim'}/nim/bin/nim $out/bin/${targetPlatform.config}-nim \
--set-default CC $(command -v $CC) \
--set-default CXX $(command -v $CXX) \
$wrapperArgs
ln -s $out/bin/${targetPlatform.config}-nim $out/bin/nim

19
pkgs/development/interpreters/dart/default.nix
View file

@ -2,33 +2,32 @@
, lib
, fetchurl
, unzip
, version ? "2.12.2"
, sources ?
let
, version ? "2.13.1"
, sources ? let
base = "https://storage.googleapis.com/dart-archive/channels";
x86_64 = "x64";
i686 = "ia32";
aarch64 = "arm64";
# Make sure that if the user overrides version parameter they're
# also need to override sources, to avoid mistakes
version = "2.12.2";
version = "2.13.1";
in
{
"${version}-x86_64-darwin" = fetchurl {
url = "${base}/stable/release/${version}/sdk/dartsdk-macos-${x86_64}-release.zip";
sha256 = "0h6mpy0kfc842vhg053fyxbjnd8lw1d1shdcsj800048260lxhyd";
sha256 = "0kb6r2rmp5d0shvgyy37fmykbgww8qaj4f8k79rmqfv5lwa3izya";
};
"${version}-x86_64-linux" = fetchurl {
url = "${base}/stable/release/${version}/sdk/dartsdk-linux-${x86_64}-release.zip";
sha256 = "1gg210gf4yif3bl9k19znkndc4c1cd529xwxpi20ykaw3zfxxz2z";
sha256 = "0zq8wngyrw01wjc5s6w1vz2jndms09ifiymjjixxby9k41mr6jrq";
};
"${version}-i686-linux" = fetchurl {
url = "${base}/stable/release/${version}/sdk/dartsdk-linux-${i686}-release.zip";
sha256 = "1wngxba71j20gq9vy7n8q0m9rnqs047xm5b03bxk3hhaq6dyzkwn";
sha256 = "0zv4q8xv2i08a6izpyhhnil75qhs40m5mgyvjqjsswqkwqdf7lkj";
};
"${version}-aarch64-linux" = fetchurl {
url = "${base}/stable/release/${version}/sdk/dartsdk-linux-${aarch64}-release.zip";
sha256 = "0rqsmzl5g5kgk54qb03kamjm5n5g5pqfl79np37xdzwqbv0zx22b";
sha256 = "0bb9jdmg5p608jmmiqibp13ydiw9avgysxlmljvgsl7wl93j6rgc";
};
}
}:
@ -40,9 +39,7 @@ stdenv.mkDerivation {
pname = "dart";
inherit version;
nativeBuildInputs = [
unzip
];
nativeBuildInputs = [ unzip ];
src = sources."${version}-${stdenv.hostPlatform.system}" or (throw "unsupported version/system: ${version}/${stdenv.hostPlatform.system}");

1
pkgs/development/interpreters/gnu-apl/default.nix
View file

@ -37,6 +37,7 @@ stdenv.mkDerivation rec {
maintainers = [ maintainers.kovirobi ];
platforms = with platforms; linux ++ darwin;
inherit version;
mainProgram = "apl";
longDescription = ''
GNU APL is a free interpreter for the programming language APL, with an

47
pkgs/development/interpreters/micropython/default.nix
View file

@ -1,4 +1,12 @@
{ stdenv, lib, fetchFromGitHub, pkg-config, libffi, python3, readline }:
{ stdenv
, lib
, fetchFromGitHub
, fetchpatch
, pkg-config
, libffi
, python3
, readline
}:
stdenv.mkDerivation rec {
pname = "micropython";
@ -12,21 +20,50 @@ stdenv.mkDerivation rec {
fetchSubmodules = true;
};
# drop the following patches when upgrading to 1.16
patches = [
# fix build with modern clang https://github.com/micropython/micropython/pull/7254
(fetchpatch {
url = "https://github.com/micropython/micropython/commit/126b1c727118352923703719a2a3d45b9fad3c97.patch";
sha256 = "13a2bmz24syhd1qsqbx39dcjkjdhf05ln7lanh816m94lkfib21j";
})
# fix build with modern clang https://github.com/micropython/micropython/pull/7254
(fetchpatch {
url = "https://github.com/micropython/micropython/commit/7ceccad4e2f1e9d073f5781c32e5b377e8391a25.patch";
sha256 = "04mbxmb5yr6pbhhf9villq8km4wy579r46v9p4n0ysivrxij7i6f";
})
# fix build on aarch64-darwin https://github.com/micropython/micropython/pull/7393
(fetchpatch {
url = "https://github.com/micropython/micropython/commit/95048129b1d93854c25f501c02801929aeeb23f0.patch";
sha256 = "1cngcwq4jviyhdnfcrrkdadfikhffzbj0d634j0344cp247jb41n";
})
];
nativeBuildInputs = [ pkg-config python3 ];
buildInputs = [ libffi readline ];
doCheck = true;
buildPhase = ''
runHook preBuild
make -C mpy-cross
make -C ports/unix
runHook postBuild
'';
doCheck = true;
skippedTests = ""
+ lib.optionalString (stdenv.isDarwin) " -e uasyncio_basic -e uasyncio_wait_task"
+ lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) " -e ffi_callback"
+ lib.optionalString (stdenv.isLinux && stdenv.isAarch64) " -e float_parse"
;
checkPhase = ''
runHook preCheck
pushd tests
MICROPY_MICROPYTHON=../ports/unix/micropython ${python3.interpreter} ./run-tests.py
${python3.interpreter} ./run-tests.py ${skippedTests}
popd
runHook postCheck
'';
installPhase = ''
@ -39,7 +76,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "A lean and efficient Python implementation for microcontrollers and constrained systems";
homepage = "https://micropython.org";
platforms = [ "x86_64-linux" ];
platforms = platforms.unix;
license = licenses.mit;
maintainers = with maintainers; [ sgo ];
};

17
pkgs/development/libraries/kyotocabinet/default.nix
View file

@ -1,11 +1,12 @@
{ lib, stdenv, fetchurl, zlib }:
stdenv.mkDerivation rec {
name = "kyotocabinet-1.2.76";
pname = "kyotocabinet";
version = "1.2.79";
src = fetchurl {
url = "http://fallabs.com/kyotocabinet/pkg/${name}.tar.gz";
sha256 = "0g6js20x7vnpq4p8ghbw3mh9wpqksya9vwhzdx6dnlf354zjsal1";
url = "https://dbmx.net/kyotocabinet/pkg/kyotocabinet-${version}.tar.gz";
sha256 = "079ymsahlrijswgwfr2la9yw5h57l752cprhp5dz31iamsj1vyv7";
};
prePatch = lib.optionalString stdenv.isDarwin ''
@ -24,18 +25,12 @@ stdenv.mkDerivation rec {
--replace stdc++ c++
'';
patches = [(fetchurl {
name = "gcc6.patch";
url = "https://src.fedoraproject.org/rpms/kyotocabinet/raw/master/f/kyotocabinet-1.2.76-gcc6.patch";
sha256 = "1h5k38mkiq7lz8nd2gbn7yvimcz49g3z7phn1cr560bzjih8rz23";
})];
buildInputs = [ zlib ];
meta = with lib; {
homepage = "http://fallabs.com/kyotocabinet";
homepage = "https://dbmx.net/kyotocabinet";
description = "A library of routines for managing a database";
license = licenses.gpl3;
license = licenses.gpl3Plus;
platforms = platforms.all;
};
}

23
pkgs/development/libraries/mlt/default.nix
View file

@ -2,6 +2,8 @@
, SDL, ffmpeg, frei0r, libjack2, libdv, libsamplerate, libexif
, libvorbis, libxml2, movit, pkg-config, sox, fftw, opencv4, SDL2
, gtk2, genericUpdater, common-updater-scripts, libebur128
, jack2, ladspa-sdk, swig, which, ncurses
, enablePython ? false, python
}:
stdenv.mkDerivation rec {
@ -16,18 +18,22 @@ stdenv.mkDerivation rec {
};
buildInputs = [
SDL ffmpeg frei0r libjack2 libdv libsamplerate libvorbis libxml2
makeWrapper movit pkg-config sox libexif gtk2 fftw libebur128
opencv4 SDL2
];
SDL ffmpeg frei0r libjack2 libdv libsamplerate libvorbis libxml2.dev
movit sox libexif gtk2 fftw libebur128 opencv4 SDL2 jack2
ladspa-sdk
] ++ lib.optional enablePython ncurses;
nativeBuildInputs = [ pkg-config makeWrapper which ]
++ lib.optionals enablePython [ python swig ];
# Mostly taken from:
# http://www.kdenlive.org/user-manual/downloading-and-installing-kdenlive/installing-source/installing-mlt-rendering-engine
configureFlags = [
"--avformat-swscale" "--enable-gpl" "--enable-gpl3" "--enable-opengl"
];
] ++ lib.optional enablePython "--swig-languages=python";
enableParallelBuilding = true;
outPythonPath = lib.optionalString enablePython "$(toPythonPath $out)";
postInstall = ''
wrapProgram $out/bin/melt --prefix FREI0R_PATH : ${frei0r}/lib/frei0r-1
@ -36,6 +42,11 @@ stdenv.mkDerivation rec {
s=${movit.dev}/include
t=$(for ((i = 0; i < ''${#s}; i++)); do echo -n X; done)
sed -i $out/lib/mlt/libmltopengl.so -e "s|$s|$t|g"
'' + lib.optionalString enablePython ''
mkdir -p ${outPythonPath}/mlt
cp -a src/swig/python/_mlt.so ${outPythonPath}/mlt/
cp -a src/swig/python/mlt.py ${outPythonPath}/mlt/__init__.py
sed -i ${outPythonPath}/mlt/__init__.py -e "s|return importlib.import_module('_mlt')|return importlib.import_module('mlt._mlt')|g"
'';
passthru.updateScript = genericUpdater {
@ -47,7 +58,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Open source multimedia framework, designed for television broadcasting";
homepage = "https://www.mltframework.org";
license = licenses.gpl3;
license = with licenses; [ gpl3Only gpl2Only lgpl21Only ];
maintainers = with maintainers; [ tohl peti ];
platforms = platforms.linux;
};

70
pkgs/development/libraries/retro-gtk/default.nix Normal file
View file

@ -0,0 +1,70 @@
{ lib
, stdenv
, fetchurl
, cmake
, meson
, ninja
, pkg-config
, epoxy
, glib
, gtk3
, libpulseaudio
, libsamplerate
, gobject-introspection
, vala
, gtk-doc
}:
stdenv.mkDerivation rec {
pname = "retro-gtk";
version = "1.0.2";
src = fetchurl {
url = "mirror://gnome/sources/retro-gtk/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1lnb7dwcj3lrrvdzd85dxwrlid28xf4qdbrgfjyg1wn1z6sv063i";
};
patches = [
# https://gitlab.gnome.org/GNOME/retro-gtk/-/merge_requests/150
./gio-unix.patch
];
nativeBuildInputs = [
gobject-introspection
gtk-doc
meson
ninja
pkg-config
vala
];
buildInputs = [
epoxy
glib
gtk3
libpulseaudio
libsamplerate
];
meta = with lib; {
description = "The GTK Libretro frontend framework";
longDescription = ''
Libretro is a plugin format design to implement video game
console emulators, video games and similar multimedia
software. Such plugins are called Libretro cores.
RetroGTK is a framework easing the use of Libretro cores in
conjunction with GTK.
It encourages the cores to be installed in a well defined
centralized place — namely the libretro subdirectory of your lib
directory — and it recommends them to come with Libretro core
descriptors.
'';
homepage = "https://gitlab.gnome.org/GNOME/retro-gtk";
changelog = "https://gitlab.gnome.org/GNOME/retro-gtk/-/blob/master/NEWS";
license = licenses.gpl3Plus;
maintainers = [ maintainers.DamienCassou ];
platforms = platforms.all;
};
}

11
pkgs/development/libraries/retro-gtk/gio-unix.patch Normal file
View file

@ -0,0 +1,11 @@
--- a/retro-gtk/meson.build 2021-03-21 20:25:51.000000000 +0100
+++ b/retro-gtk/meson.build 2021-05-23 17:36:46.793693816 +0200
@@ -103,6 +103,7 @@
retro_gtk_deps = [
epoxy,
gio,
+ gio_unix,
glib,
gmodule,
gobject,

4
pkgs/development/libraries/sope/default.nix
View file

@ -4,13 +4,13 @@ with lib;
gnustep.stdenv.mkDerivation rec {
pname = "sope";
version = "5.0.1";
version = "5.1.1";
src = fetchFromGitHub {
owner = "inverse-inc";
repo = pname;
rev = "SOPE-${version}";
sha256 = "031m8ydr4jhh29332mfbsw0i5d0cjfqfyfs55jm832dlmv4447gb";
sha256 = "0pap7c38kgadyp1a6qkmf9xhk69ybpmhfd4kc2n5nafhdbvks985";
};
hardeningDisable = [ "format" ];

18
pkgs/development/ocaml-modules/opam-file-format/default.nix
View file

@ -1,22 +1,22 @@
{ lib, buildDunePackage, fetchFromGitHub }:
{ lib, fetchFromGitHub, buildDunePackage }:
buildDunePackage rec {
version = "2.1.2";
pname = "opam-file-format";
useDune2 = true;
version = "2.1.3";
src = fetchFromGitHub {
owner = "ocaml";
repo = pname;
rev = version;
sha256 = "19xppn2s3yjid8jc1wh8gdf5mgmlpzby2cf2slmnbyrgln3vj6i2";
sha256 = "1fxhppdmrysr2nb5z3c448h17np48f3ga9jih33acj78r4rdblcs";
};
meta = {
useDune2 = true;
meta = with lib; {
description = "Parser and printer for the opam file syntax";
license = lib.licenses.lgpl21;
maintainers = [ lib.maintainers.vbgl ];
inherit (src.meta) homepage;
license = licenses.lgpl21;
maintainers = with maintainers; [ vbgl ];
homepage = "https://github.com/ocaml/opam-file-format/";
};
}

4
pkgs/development/python-modules/aio-geojson-geonetnz-quakes/default.nix
View file

@ -11,13 +11,13 @@
buildPythonPackage rec {
pname = "aio-geojson-geonetnz-quakes";
version = "0.12";
version = "0.13";
src = fetchFromGitHub {
owner = "exxamalte";
repo = "python-aio-geojson-geonetnz-quakes";
rev = "v${version}";
sha256 = "166gvcc1rzigb822k1373y18k54x5aklikr8sc7hyml5vz937xr7";
sha256 = "sha256-M1QleYVPqLFjxBmOlNJdydxDTk0JJf+GYVtOTC3YUTA=";
};
propagatedBuildInputs = [

17
pkgs/development/python-modules/anyio/default.nix
View file

@ -8,6 +8,8 @@
, typing-extensions
, curio
, hypothesis
, mock
, pytest-mock
, pytestCheckHook
, trio
, trustme
@ -16,7 +18,7 @@
buildPythonPackage rec {
pname = "anyio";
version = "2.2.0";
version = "3.1.0";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -24,7 +26,7 @@ buildPythonPackage rec {
owner = "agronholm";
repo = pname;
rev = version;
sha256 = "0ram1niv2lg9qj53zssph104a4kxl8f94ilfn6mibn034m3ikcc8";
sha256 = "sha256-zQiSAQN7cp1s+8hDTvYaMkHUXV1ccNwIsl2IOztH7J8=";
};
propagatedBuildInputs = [
@ -37,18 +39,21 @@ buildPythonPackage rec {
checkInputs = [
curio
hypothesis
pytest-mock
pytestCheckHook
trio
trustme
uvloop
] ++ lib.optionals (pythonOlder "3.8") [
mock
];
pytestFlagsArray = [
# lots of DNS lookups
"--ignore=tests/test_sockets.py"
disabledTestPaths = [
# lots of DNS lookups
"tests/test_sockets.py"
] ++ lib.optionals stdenv.isDarwin [
# darwin sandboxing limitations
"--ignore=tests/streams/test_tls.py"
"tests/streams/test_tls.py"
];
pythonImportsCheck = [ "anyio" ];

4
pkgs/development/python-modules/aria2p/default.nix
View file

@ -1,6 +1,6 @@
{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder
, aria2, poetry, pytest, pytestcov, pytest_xdist, responses
, asciimatics, loguru, requests, setuptools, websocket_client
, asciimatics, loguru, requests, setuptools, websocket-client
}:
buildPythonPackage rec {
@ -32,7 +32,7 @@ buildPythonPackage rec {
pytest -nauto -k "not test_api and not test_cli and not test_interface"
'';
propagatedBuildInputs = [ asciimatics loguru requests setuptools websocket_client ];
propagatedBuildInputs = [ asciimatics loguru requests setuptools websocket-client ];
meta = with lib; {
homepage = "https://github.com/pawamoy/aria2p";

37
pkgs/development/python-modules/azure-eventhub/default.nix Normal file
View file

@ -0,0 +1,37 @@
{ lib
, buildPythonPackage
, fetchPypi
, azure-core
, uamqp
}:
buildPythonPackage rec {
pname = "azure-eventhub";
version = "5.5.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "7b757b4910ac74902564b38089b9861c1bc51ff15bd49ff056888f939f7c4c49";
};
propagatedBuildInputs = [
azure-core
uamqp
];
# too complicated to set up
doCheck = false;
pythonImportsCheck = [
"azure.eventhub"
"azure.eventhub.aio"
];
meta = with lib; {
description = "Microsoft Azure Event Hubs Client Library for Python";
homepage = "https://github.com/Azure/azure-sdk-for-python/tree/master/sdk/eventhub/azure-eventhub";
license = licenses.mit;
maintainers = with maintainers; [ dotlambda ];
};
}

25
pkgs/development/python-modules/backports-zoneinfo/default.nix
View file

@ -1,6 +1,9 @@
{ lib, buildPythonPackage, fetchFromGitHub
, pythonOlder
, python
, substituteAll
, importlib-resources
, tzdata
, hypothesis
, pytestCheckHook
}:
@ -16,7 +19,17 @@ buildPythonPackage rec {
sha256 = "sha256-00xdDOVdDanfsjQTd3yjMN2RFGel4cWRrAA3CvSnl24=";
};
propagatedBuildInputs = lib.optionals (pythonOlder "3.7") [
patches = [
(substituteAll {
name = "zoneinfo-path";
src = ./zoneinfo.patch;
zoneinfo = "${tzdata}/lib/${python.libPrefix}/site-packages/tzdata/zoneinfo";
})
];
propagatedBuildInputs = [
tzdata
] ++ lib.optionals (pythonOlder "3.7") [
importlib-resources
];
@ -27,8 +40,14 @@ buildPythonPackage rec {
pytestCheckHook
];
# unfortunately /etc/zoneinfo doesn't exist in sandbox, and many tests fail
doCheck = false;
disabledTests = [
# AssertionError: 'AEDT' != 'AEST'
"test_folds_and_gaps"
# AssertionError: 0 != 1 : (datetime.datetime(1917, 3, 25, 2, 0, 1, tzinfo=backports.zoneinfo.ZoneInfo(key='Australia/Sydney')), datetime.datetime(1917, 3, 24, 15, 0, tzinfo=datetime.timezone.utc))
"test_folds_from_utc"
# backports.zoneinfo._common.ZoneInfoNotFoundError: 'No time zone found with key Eurasia/Badzone'
"test_bad_keys"
];
meta = with lib; {
description = "Backport of the standard library module zoneinfo";

17
pkgs/development/python-modules/backports-zoneinfo/zoneinfo.patch Normal file
View file

@ -0,0 +1,17 @@
diff --git a/src/backports/zoneinfo/_tzpath.py b/src/backports/zoneinfo/_tzpath.py
index 9baaf6b..3f842af 100644
--- a/src/backports/zoneinfo/_tzpath.py
+++ b/src/backports/zoneinfo/_tzpath.py
@@ -24,10 +24,7 @@ def reset_tzpath(to=None):
base_tzpath = _parse_python_tzpath(env_var)
elif sys.platform != "win32":
base_tzpath = [
- "/usr/share/zoneinfo",
- "/usr/lib/zoneinfo",
- "/usr/share/lib/zoneinfo",
- "/etc/zoneinfo",
+ "@zoneinfo@"
]
base_tzpath.sort(key=lambda x: not os.path.exists(x))

49
pkgs/development/python-modules/blebox-uniapi/default.nix Normal file
View file

@ -0,0 +1,49 @@
{ lib
, buildPythonPackage
, pythonOlder
, fetchFromGitHub
, aiohttp
, semver
, asynctest
, deepmerge
, pytest-asyncio
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "blebox-uniapi";
version = "1.3.3";
src = fetchFromGitHub {
owner = "blebox";
repo = "blebox_uniapi";
rev = "v${version}";
sha256 = "0qvv2697yhqjmgvh37h8wgz3a77n61kqmxvsk4pf47wn43hks15c";
};
postPatch = ''
substituteInPlace setup.py \
--replace "pytest-runner" ""
'';
propagatedBuildInputs = [
aiohttp
semver
];
checkInputs = [
asynctest
deepmerge
pytest-asyncio
pytestCheckHook
];
pythonImportsCheck = [ "blebox_uniapi" ];
meta = with lib; {
description = "Python API for accessing BleBox smart home devices";
homepage = "https://github.com/blebox/blebox_uniapi";
license = licenses.asl20;
maintainers = with maintainers; [ dotlambda ];
};
}

39
pkgs/development/python-modules/bond-api/default.nix Normal file
View file

@ -0,0 +1,39 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, aiohttp
, aioresponses
, pytest-asyncio
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "bond-api";
version = "0.1.12";
src = fetchFromGitHub {
owner = "prystupa";
repo = "bond-api";
rev = "v${version}";
sha256 = "0zqaqqadr4x4vmq28nfk5x67gfwqqfy19z0cgrpxlbbvxamccym0";
};
propagatedBuildInputs = [
aiohttp
];
checkInputs = [
aioresponses
pytest-asyncio
pytestCheckHook
];
pythonImportsCheck = [ "bond_api" ];
meta = with lib; {
description = "Asynchronous Python wrapper library over Bond Local API";
homepage = "https://github.com/prystupa/bond-api";
license = licenses.mit;
maintainers = with maintainers; [ dotlambda ];
};
}

26
pkgs/development/python-modules/boost-histogram/default.nix Normal file
View file

@ -0,0 +1,26 @@
{ lib, fetchPypi, buildPythonPackage, isPy3k, boost, numpy, pytestCheckHook, pytest-benchmark }:
buildPythonPackage rec {
pname = "boost-histogram";
version = "1.0.2";
disabled = !isPy3k;
src = fetchPypi {
pname = "boost_histogram";
inherit version;
sha256 = "b79cb9a00c5b8e44ff24ffcbec0ce5d3048dd1570c8592066344b6d2f2369fa2";
};
buildInputs = [ boost ];
propagatedBuildInputs = [ numpy ];
checkInputs = [ pytestCheckHook pytest-benchmark ];
meta = with lib; {
description = "Python bindings for the C++14 Boost::Histogram library";
homepage = "https://github.com/scikit-hep/boost-histogram";
license = licenses.bsd3;
platforms = platforms.unix;
maintainers = with maintainers; [ veprbl ];
};
}

4
pkgs/development/python-modules/devolo-home-control-api/default.nix
View file

@ -6,7 +6,7 @@
, pytestCheckHook
, pythonOlder
, requests
, websocket_client
, websocket-client
, zeroconf
}:
@ -25,7 +25,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [
requests
zeroconf
websocket_client
websocket-client
];
checkInputs = [

4
pkgs/development/python-modules/docker-py/default.nix
View file

@ -1,4 +1,4 @@
{ lib, buildPythonPackage, fetchPypi, six, requests, websocket_client, docker_pycreds }:
{ lib, buildPythonPackage, fetchPypi, six, requests, websocket-client, docker_pycreds }:
buildPythonPackage rec {
version = "1.10.6";
@ -15,7 +15,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [
six
requests
websocket_client
websocket-client
docker_pycreds
];

4
pkgs/development/python-modules/docker/default.nix
View file

@ -9,7 +9,7 @@
, pytestCheckHook
, requests
, six
, websocket_client
, websocket-client
}:
buildPythonPackage rec {
@ -27,7 +27,7 @@ buildPythonPackage rec {
paramiko
requests
six
websocket_client
websocket-client
] ++ lib.optional isPy27 backports_ssl_match_hostname;
checkInputs = [

41
pkgs/development/python-modules/foobot-async/default.nix Normal file
View file

@ -0,0 +1,41 @@
{ lib
, buildPythonPackage
, pythonOlder
, fetchPypi
, aiohttp
, async-timeout
, aioresponses
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "foobot-async";
version = "1.0.0";
disabled = pythonOlder "3.5";
src = fetchPypi {
pname = "foobot_async";
inherit version;
sha256 = "fa557a22de925139cb4a21034ffdbcd01d28bf166c0e680eaf84a99206327f40";
};
propagatedBuildInputs = [
aiohttp
async-timeout
];
checkInputs = [
aioresponses
pytestCheckHook
];
pythonImportsCheck = [ "foobot_async" ];
meta = with lib; {
description = "API Client for Foobot Air Quality Monitoring devices";
homepage = "https://github.com/reefab/foobot_async";
license = licenses.mit;
maintainers = with maintainers; [ dotlambda ];
};
}

4
pkgs/development/python-modules/gradient/default.nix
View file

@ -17,7 +17,7 @@
, requests
, requests_toolbelt
, terminaltables
, websocket_client
, websocket-client
}:
buildPythonPackage rec {
@ -55,7 +55,7 @@ buildPythonPackage rec {
requests
requests_toolbelt
terminaltables
websocket_client
websocket-client
];
# tries to use /homeless-shelter to mimic container usage, etc

38
pkgs/development/python-modules/graphql-subscription-manager/default.nix Normal file
View file

@ -0,0 +1,38 @@
{ lib
, buildPythonPackage
, pythonOlder
, fetchFromGitHub
, setuptools
, websockets
}:
buildPythonPackage rec {
pname = "graphql-subscription-manager";
version = "0.4.0";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "Danielhiversen";
repo = "PyGraphqlWebsocketManager";
rev = version;
sha256 = "1176xzr9fa7gl5cm0pcv5lb45d2ms5awi601rjcr3a0a14a1i8fz";
};
propagatedBuildInputs = [
setuptools
websockets
];
# no tests implemented
doCheck = false;
pythonImportsCheck = [ "graphql_subscription_manager" ];
meta = with lib; {
description = "Python3 library for graphql subscription manager";
homepage = "https://github.com/Danielhiversen/PyGraphqlWebsocketManager";
license = licenses.mit;
maintainers = with maintainers; [ dotlambda ];
};
}

48
pkgs/development/python-modules/greeclimate/default.nix Normal file
View file

@ -0,0 +1,48 @@
{ lib
, buildPythonPackage
, pythonOlder
, fetchFromGitHub
, netifaces
, pycryptodome
, pytest-asyncio
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "greeclimate";
version = "0.11.8";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "cmroche";
repo = "greeclimate";
rev = version;
sha256 = "1n46klbhl0gpd5x995mrcr1qfd77hrfm501qns1zhvv0zk8mdsf4";
};
propagatedBuildInputs = [
netifaces
pycryptodome
];
checkInputs = [
pytest-asyncio
pytestCheckHook
];
pythonImportsCheck = [
"greeclimate"
"greeclimate.device"
"greeclimate.discovery"
"greeclimate.exceptions"
"greeclimate.network"
];
meta = with lib; {
description = "Discover, connect and control Gree based minisplit systems";
homepage = "https://github.com/cmroche/greeclimate";
license = licenses.gpl3Only;
maintainers = with maintainers; [ dotlambda ];
};
}

4
pkgs/development/python-modules/homematicip/default.nix
View file

@ -10,7 +10,7 @@
, pytest-aiohttp
, pytest-asyncio
, requests
, websocket_client
, websocket-client
, websockets
}:
@ -31,7 +31,7 @@ buildPythonPackage rec {
aiohttp
async-timeout
requests
websocket_client
websocket-client
websockets
];

17
pkgs/development/python-modules/httpcore/default.nix
View file

@ -2,31 +2,33 @@
, buildPythonPackage
, pythonOlder
, fetchFromGitHub
, anyio
, h11
, h2
, pproxy
, pytest-asyncio
, pytest-trio
, pytestCheckHook
, pytestcov
, sniffio
, trio
, trustme
, uvicorn
}:
buildPythonPackage rec {
pname = "httpcore";
version = "0.13.0";
version = "0.13.4";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "encode";
repo = pname;
rev = version;
sha256 = "sha256-KvqBVQUaF3p2oJz0tt3Bkn2JiKEHqrZ3b6I9f0JK5h8=";
sha256 = "0vfdkd3bq14mnjd2gfg3ajsgygmd796md7pv96nicpx20prw3a2p";
};
propagatedBuildInputs = [
anyio
h11
h2
sniffio
@ -35,16 +37,23 @@ buildPythonPackage rec {
checkInputs = [
pproxy
pytest-asyncio
pytest-trio
pytestCheckHook
pytestcov
trio
trustme
uvicorn
];
postPatch = ''
# The anyio 3.1.0 release is not picked-up proberly
substituteInPlace setup.py --replace "anyio==3.*" "anyio"
'';
disabledTestPaths = [
# these tests fail during dns lookups: httpcore.ConnectError: [Errno -2] Name or service not known
"tests/test_threadsafety.py"
"tests/async_tests/"
"tests/sync_tests/test_interfaces.py"
"tests/sync_tests/test_retries.py"
];

4
pkgs/development/python-modules/ibm-watson/default.nix
View file

@ -8,7 +8,7 @@
, tox
, requests
, python-dateutil
, websocket_client
, websocket-client
, ibm-cloud-sdk-core
}:
@ -34,7 +34,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [
requests
python-dateutil
websocket_client
websocket-client
ibm-cloud-sdk-core
];

4
pkgs/development/python-modules/jellyfin-apiclient-python/default.nix
View file

@ -1,5 +1,5 @@
{ lib, buildPythonPackage, fetchPypi, requests
, websocket_client, pythonOlder }:
, websocket-client, pythonOlder }:
buildPythonPackage rec {
pname = "jellyfin-apiclient-python";
@ -11,7 +11,7 @@ buildPythonPackage rec {
sha256 = "sha256-nSLUa9/jAT6XrHo77kV5HYBxPO/lhcWKqPfpES7ul9A=";
};
propagatedBuildInputs = [ requests websocket_client ];
propagatedBuildInputs = [ requests websocket-client ];
doCheck = false; # no tests
pythonImportsCheck = [ "jellyfin_apiclient_python" ];

4
pkgs/development/python-modules/kubernetes/default.nix
View file

@ -1,5 +1,5 @@
{ lib, buildPythonPackage, fetchPypi, pythonAtLeast,
ipaddress, websocket_client, urllib3, pyyaml, requests_oauthlib, python-dateutil, google-auth, adal,
ipaddress, websocket-client, urllib3, pyyaml, requests_oauthlib, python-dateutil, google-auth, adal,
isort, pytest, coverage, mock, sphinx, autopep8, pep8, codecov, recommonmark, nose }:
buildPythonPackage rec {
@ -28,7 +28,7 @@ buildPythonPackage rec {
};
checkInputs = [ isort coverage pytest mock sphinx autopep8 pep8 codecov recommonmark nose ];
propagatedBuildInputs = [ ipaddress websocket_client urllib3 pyyaml requests_oauthlib python-dateutil google-auth adal ];
propagatedBuildInputs = [ ipaddress websocket-client urllib3 pyyaml requests_oauthlib python-dateutil google-auth adal ];
meta = with lib; {
description = "Kubernetes python client";

4
pkgs/development/python-modules/ledgerblue/default.nix
View file

@ -1,6 +1,6 @@
{ lib, fetchPypi, buildPythonPackage, hidapi
, pycrypto, pillow, protobuf, future, ecpy, python-u2flib-host, pycryptodomex
, websocket_client
, websocket-client
}:
buildPythonPackage rec {
@ -13,7 +13,7 @@ buildPythonPackage rec {
};
propagatedBuildInputs = [
hidapi pycrypto pillow protobuf future ecpy python-u2flib-host pycryptodomex websocket_client
hidapi pycrypto pillow protobuf future ecpy python-u2flib-host pycryptodomex websocket-client
];
# No tests

4
pkgs/development/python-modules/libsoundtouch/default.nix
View file

@ -3,7 +3,7 @@
, fetchFromGitHub
, enum-compat
, requests
, websocket_client
, websocket-client
, zeroconf
, pytestCheckHook
}:
@ -22,7 +22,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [
requests
enum-compat
websocket_client
websocket-client
zeroconf
];

2
pkgs/development/python-modules/orvibo/default.nix
View file

@ -6,7 +6,7 @@
, pytest-runner
, pytestCheckHook
, requests
, websocket_client
, websocket-client
}:
buildPythonPackage rec {

4
pkgs/development/python-modules/plexapi/default.nix
View file

@ -3,7 +3,7 @@
, fetchFromGitHub
, requests
, tqdm
, websocket_client
, websocket-client
, isPy27
}:
@ -22,7 +22,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [
requests
tqdm
websocket_client
websocket-client
];
# Tests require a running Plex instance

4
pkgs/development/python-modules/praw/6.3.nix
View file

@ -9,7 +9,7 @@
, pytest
, requests-toolbelt
, update_checker
, websocket_client
, websocket-client
}:
buildPythonPackage rec {
@ -31,7 +31,7 @@ buildPythonPackage rec {
mock
prawcore
update_checker
websocket_client
websocket-client
];
checkInputs = [

4
pkgs/development/python-modules/praw/default.nix
View file

@ -9,7 +9,7 @@
, pytestCheckHook
, requests-toolbelt
, update_checker
, websocket_client
, websocket-client
}:
buildPythonPackage rec {
@ -27,7 +27,7 @@ buildPythonPackage rec {
mock
prawcore
update_checker
websocket_client
websocket-client
];
checkInputs = [

4
pkgs/development/python-modules/pushbullet/default.nix
View file

@ -2,7 +2,7 @@
, buildPythonPackage
, fetchPypi
, requests
, websocket_client
, websocket-client
, python_magic
, cryptography
, pytestCheckHook
@ -17,7 +17,7 @@ buildPythonPackage rec {
sha256 = "917883e1af4a0c979ce46076b391e0243eb8fe0a81c086544bcfa10f53e5ae64";
};
propagatedBuildInputs = [ cryptography requests websocket_client python_magic ];
propagatedBuildInputs = [ cryptography requests websocket-client python_magic ];
preCheck = ''
export PUSHBULLET_API_KEY=""

4
pkgs/development/python-modules/pyarrow/default.nix
View file

@ -57,8 +57,8 @@ buildPythonPackage rec {
meta = with lib; {
description = "A cross-language development platform for in-memory data";
homepage = "https://arrow.apache.org/";
license = lib.licenses.asl20;
license = licenses.asl20;
platforms = platforms.unix;
maintainers = with lib.maintainers; [ veprbl ];
maintainers = with maintainers; [ veprbl ];
};
}

37
pkgs/development/python-modules/pyfireservicerota/default.nix Normal file
View file

@ -0,0 +1,37 @@
{ lib
, buildPythonPackage
, fetchPypi
, pytz
, oauthlib
, requests
, websocket-client
}:
buildPythonPackage rec {
pname = "pyfireservicerota";
version = "0.0.40";
src = fetchPypi {
inherit pname version;
sha256 = "8d8173f6682ef2a61367660a15559c8c7a7e00db3f98092e0fa52e771df356f4";
};
propagatedBuildInputs = [
pytz
oauthlib
requests
websocket-client
];
# no tests implemented
doCheck = false;
pythonImportsCheck = [ "pyfireservicerota" ];
meta = with lib; {
description = "Python 3 API wrapper for FireServiceRota/BrandweerRooster";
homepage = "https://github.com/cyberjunky/python-fireservicerota";
license = licenses.mit;
maintainers = with maintainers; [ dotlambda ];
};
}

40
pkgs/development/python-modules/pyflick/default.nix Normal file
View file

@ -0,0 +1,40 @@
{ lib
, buildPythonPackage
, pythonOlder
, fetchPypi
, aiohttp
, dateutil
}:
buildPythonPackage rec {
pname = "pyflick";
version = "0.0.2";
disabled = pythonOlder "3.6";
src = fetchPypi {
pname = "PyFlick";
inherit version;
sha256 = "705c82d8caedfff19117c8859cc1b4f56e15ab8dbc0d64d63b79d8634007897f";
};
propagatedBuildInputs = [
aiohttp
dateutil
];
# no tests implemented
doCheck = false;
pythonImportsCheck = [
"pyflick"
"pyflick.authentication"
];
meta = with lib; {
description = "Python API For Flick Electric in New Zealand";
homepage = "https://github.com/ZephireNZ/PyFlick";
license = licenses.mit;
maintainers = with maintainers; [ dotlambda ];
};
}

4
pkgs/development/python-modules/pysc2/default.nix
View file

@ -12,7 +12,7 @@
, pygame
, s2clientprotocol
, six
, websocket_client
, websocket-client
, sc2-headless
}:
@ -49,7 +49,7 @@ buildPythonPackage {
pygame
s2clientprotocol
six
websocket_client
websocket-client
sc2-headless
];

4
pkgs/development/python-modules/python-engineio/3.nix
View file

@ -10,7 +10,7 @@
, requests
, six
, tornado
, websocket_client
, websocket-client
, websockets
, pytestCheckHook
, pythonAtLeast
@ -37,7 +37,7 @@ buildPythonPackage rec {
mock
requests
tornado
websocket_client
websocket-client
websockets
pytestCheckHook
];

4
pkgs/development/python-modules/python-engineio/default.nix
View file

@ -9,7 +9,7 @@
, requests
, six
, tornado
, websocket_client
, websocket-client
, websockets
, pytestCheckHook
}:
@ -31,7 +31,7 @@ buildPythonPackage rec {
mock
requests
tornado
websocket_client
websocket-client
websockets
pytestCheckHook
];

4
pkgs/development/python-modules/python-mpv-jsonipc/default.nix
View file

@ -1,5 +1,5 @@
{ lib, buildPythonPackage, fetchFromGitHub, requests
, tqdm, websocket_client, pythonOlder }:
, tqdm, websocket-client, pythonOlder }:
buildPythonPackage rec {
pname = "python-mpv-jsonipc";
@ -16,7 +16,7 @@ buildPythonPackage rec {
# 'mpv-jsonipc' does not have any tests
doCheck = false;
propagatedBuildInputs = [ requests tqdm websocket_client ];
propagatedBuildInputs = [ requests tqdm websocket-client ];
pythonImportsCheck = [ "python_mpv_jsonipc" ];

51
pkgs/development/python-modules/pytibber/default.nix Normal file
View file

@ -0,0 +1,51 @@
{ lib
, buildPythonPackage
, pythonOlder
, fetchFromGitHub
, aiohttp
, async-timeout
, graphql-subscription-manager
, python-dateutil
, pytz
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "pytibber";
version = "0.17.1";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "Danielhiversen";
repo = "pyTibber";
rev = version;
sha256 = "1zda9cvg6hy0n7sr2z71lkyl93n1gnzxrvf56lhz13pcsffshhdk";
};
propagatedBuildInputs = [
aiohttp
async-timeout
graphql-subscription-manager
python-dateutil
pytz
];
checkInputs = [
pytestCheckHook
];
pytestFlagsArray = [ "test/test.py" ];
# tests access network
doCheck = false;
pythonImportsCheck = [ "tibber" ];
meta = with lib; {
description = "A python3 library to communicate with Tibber";
homepage = "https://github.com/Danielhiversen/pyTibber";
license = licenses.mit;
maintainers = with maintainers; [ dotlambda ];
};
}

4
pkgs/development/python-modules/roonapi/default.nix
View file

@ -7,7 +7,7 @@
, pythonOlder
, requests
, six
, websocket_client
, websocket-client
}:
buildPythonPackage rec {
@ -31,7 +31,7 @@ buildPythonPackage rec {
ifaddr
requests
six
websocket_client
websocket-client
];
patches = [

4
pkgs/development/python-modules/runway-python/default.nix
View file

@ -21,7 +21,7 @@
, deepdiff
, pytestCheckHook
, pytestcov
, websocket_client
, websocket-client
}:
buildPythonPackage rec {
@ -62,7 +62,7 @@ buildPythonPackage rec {
deepdiff
pytestCheckHook
pytestcov
websocket_client
websocket-client
];
disabledTests = [

4
pkgs/development/python-modules/samsungctl/default.nix
View file

@ -1,5 +1,5 @@
{ lib, buildPythonPackage, fetchPypi
, websocket_client
, websocket-client
}:
buildPythonPackage rec {
@ -12,7 +12,7 @@ buildPythonPackage rec {
};
propagatedBuildInputs = [
websocket_client
websocket-client
];
# no tests

4
pkgs/development/python-modules/samsungtvws/default.nix
View file

@ -1,6 +1,6 @@
{ lib, buildPythonPackage, fetchPypi, isPy27
, requests
, websocket_client
, websocket-client
}:
buildPythonPackage rec {
@ -14,7 +14,7 @@ buildPythonPackage rec {
};
propagatedBuildInputs = [
websocket_client
websocket-client
requests
];

4
pkgs/development/python-modules/slack-sdk/default.nix
View file

@ -15,7 +15,7 @@
, pytestCheckHook
, pytestrunner
, sqlalchemy
, websocket_client
, websocket-client
, websockets
}:
@ -36,7 +36,7 @@ buildPythonPackage rec {
aiohttp
boto3
sqlalchemy
websocket_client
websocket-client
websockets
];

4
pkgs/development/python-modules/slackclient/default.nix
View file

@ -14,7 +14,7 @@
, requests
, responses
, six
, websocket_client
, websocket-client
}:
buildPythonPackage rec {
@ -32,7 +32,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [
aiohttp
websocket_client
websocket-client
requests
six
];

3
pkgs/development/python-modules/uvloop/default.nix
View file

@ -48,6 +48,9 @@ buildPythonPackage rec {
# test gets stuck in epoll_pwait on hydras aarch64 builders
# https://github.com/MagicStack/uvloop/issues/412
"--deselect" "tests/test_tcp.py::Test_AIO_TCPSSL::test_remote_shutdown_receives_trailing_data"
] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [
# Flaky test: https://github.com/MagicStack/uvloop/issues/412
"--deselect" "tests/test_tcp.py::Test_UV_TCPSSL::test_shutdown_timeout_handler_not_set"
];
disabledTestPaths = [

36
pkgs/development/python-modules/wallbox/default.nix Normal file
View file

@ -0,0 +1,36 @@
{ lib
, buildPythonPackage
, pythonOlder
, fetchPypi
, requests
, simplejson
}:
buildPythonPackage rec {
pname = "wallbox";
version = "0.4.5";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "cf1616d79cb0345849ceff1b89a7c80e26ae19b3c2d818def62d6975665838c1";
};
propagatedBuildInputs = [
requests
simplejson
];
# no tests implemented
doCheck = false;
pythonImportsCheck = [ "wallbox" ];
meta = with lib; {
description = "Module for interacting with Wallbox EV charger api";
homepage = "https://github.com/cliviu74/wallbox";
license = licenses.mit;
maintainers = with maintainers; [ dotlambda ];
};
}

4
pkgs/development/python-modules/waterfurnace/default.nix
View file

@ -6,7 +6,7 @@
, pytest-runner
, pytestCheckHook
, requests
, websocket_client
, websocket-client
}:
buildPythonPackage rec {
@ -24,7 +24,7 @@ buildPythonPackage rec {
click
pytest-runner
requests
websocket_client
websocket-client
];
checkInputs = [

5
pkgs/development/python-modules/websocket_client/default.nix → pkgs/development/python-modules/websocket-client/default.nix
View file

@ -8,11 +8,12 @@
}:
buildPythonPackage rec {
pname = "websocket_client";
pname = "websocket-client";
version = "0.58.0";
src = fetchPypi {
inherit pname version;
pname = "websocket_client";
inherit version;
sha256 = "sha256-Y1CbQdFYrlt/Z+tK0g/su07umUNOc+FANU3D/44JcW8=";
};

4
pkgs/development/python-modules/wled/default.nix
View file

@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "wled";
version = "0.5.0";
version = "0.6.0";
disabled = pythonOlder "3.8";
format = "pyproject";
@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "frenck";
repo = "python-wled";
rev = "v${version}";
sha256 = "123806fmdihdf9y8dqp5rli5c4i9a74j9rmhay8m68igm1326d5f";
sha256 = "sha256-aFBcSGPCT49TbqzjUv/d8agdPOCC090rNxDnE9y91Pk=";
};
nativeBuildInputs = [

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