Merge master into staging-next

This commit is contained in:
Frederik Rietdijk 2019-07-17 10:14:04 +02:00
commit 69476b4d90
265 changed files with 5677 additions and 809 deletions

View File

@ -5836,4 +5836,9 @@
github = "turboMaCk";
name = "Marek Fajkus";
};
melling = {
email = "mattmelling@fastmail.com";
github = "mattmelling";
name = "Matt Melling";
};
}

View File

@ -7,16 +7,6 @@ with lib;
let
cfg = config.networking;
dnsmasqResolve = config.services.dnsmasq.enable &&
config.services.dnsmasq.resolveLocalQueries;
hasLocalResolver = config.services.bind.enable ||
config.services.unbound.enable ||
dnsmasqResolve;
resolvconfOptions = cfg.resolvconfOptions
++ optional cfg.dnsSingleRequest "single-request"
++ optional cfg.dnsExtensionMechanism "edns0";
localhostMapped4 = cfg.hosts ? "127.0.0.1" && elem "localhost" cfg.hosts."127.0.0.1";
localhostMapped6 = cfg.hosts ? "::1" && elem "localhost" cfg.hosts."::1";
@ -64,48 +54,6 @@ in
'';
};
networking.dnsSingleRequest = lib.mkOption {
type = types.bool;
default = false;
description = ''
Recent versions of glibc will issue both ipv4 (A) and ipv6 (AAAA)
address queries at the same time, from the same port. Sometimes upstream
routers will systemically drop the ipv4 queries. The symptom of this problem is
that 'getent hosts example.com' only returns ipv6 (or perhaps only ipv4) addresses. The
workaround for this is to specify the option 'single-request' in
/etc/resolv.conf. This option enables that.
'';
};
networking.dnsExtensionMechanism = lib.mkOption {
type = types.bool;
default = true;
description = ''
Enable the <code>edns0</code> option in <filename>resolv.conf</filename>. With
that option set, <code>glibc</code> supports use of the extension mechanisms for
DNS (EDNS) specified in RFC 2671. The most popular user of that feature is DNSSEC,
which does not work without it.
'';
};
networking.extraResolvconfConf = lib.mkOption {
type = types.lines;
default = "";
example = "libc=NO";
description = ''
Extra configuration to append to <filename>resolvconf.conf</filename>.
'';
};
networking.resolvconfOptions = lib.mkOption {
type = types.listOf types.str;
default = [];
example = [ "ndots:1" "rotate" ];
description = ''
Set the options in <filename>/etc/resolv.conf</filename>.
'';
};
networking.timeServers = mkOption {
default = [
"0.nixos.pool.ntp.org"
@ -240,35 +188,6 @@ in
# /etc/host.conf: resolver configuration file
"host.conf".text = cfg.hostConf;
# /etc/resolvconf.conf: Configuration for openresolv.
"resolvconf.conf".text =
''
# This is the default, but we must set it here to prevent
# a collision with an apparently unrelated environment
# variable with the same name exported by dhcpcd.
interface_order='lo lo[0-9]*'
'' + optionalString config.services.nscd.enable ''
# Invalidate the nscd cache whenever resolv.conf is
# regenerated.
libc_restart='${pkgs.systemd}/bin/systemctl try-restart --no-block nscd.service 2> /dev/null'
'' + optionalString (length resolvconfOptions > 0) ''
# Options as described in resolv.conf(5)
resolv_conf_options='${concatStringsSep " " resolvconfOptions}'
'' + optionalString hasLocalResolver ''
# This hosts runs a full-blown DNS resolver.
name_servers='127.0.0.1'
'' + optionalString dnsmasqResolve ''
dnsmasq_conf=/etc/dnsmasq-conf.conf
dnsmasq_resolv=/etc/dnsmasq-resolv.conf
'' + cfg.extraResolvconfConf + ''
'';
} // optionalAttrs config.services.resolved.enable {
# symlink the dynamic stub resolver of resolv.conf as recommended by upstream:
# https://www.freedesktop.org/software/systemd/man/systemd-resolved.html#/etc/resolv.conf
"resolv.conf".source = "/run/systemd/resolve/stub-resolv.conf";
} // optionalAttrs (config.services.resolved.enable && dnsmasqResolve) {
"dnsmasq-resolv.conf".source = "/run/systemd/resolve/resolv.conf";
} // optionalAttrs (pkgs.stdenv.hostPlatform.libc == "glibc") {
# /etc/rpc: RPC program numbers.
"rpc".source = pkgs.glibc.out + "/etc/rpc";
@ -295,29 +214,6 @@ in
# Install the proxy environment variables
environment.sessionVariables = cfg.proxy.envVars;
# This is needed when /etc/resolv.conf is being overriden by networkd
# and other configurations. If the file is destroyed by an environment
# activation then it must be rebuilt so that applications which interface
# with /etc/resolv.conf directly don't break.
system.activationScripts.resolvconf = stringAfter [ "etc" "specialfs" "var" ]
''
# Systemd resolved controls its own resolv.conf
rm -f /run/resolvconf/interfaces/systemd
${optionalString config.services.resolved.enable ''
rm -rf /run/resolvconf/interfaces
mkdir -p /run/resolvconf/interfaces
ln -s /run/systemd/resolve/resolv.conf /run/resolvconf/interfaces/systemd
''}
# Make sure resolv.conf is up to date if not managed manually, by systemd or
# by NetworkManager
${optionalString (!config.environment.etc?"resolv.conf" &&
(cfg.networkmanager.enable ->
cfg.networkmanager.rc-manager == "resolvconf")) ''
${pkgs.openresolv}/bin/resolvconf -u
''}
'';
};
}

View File

@ -0,0 +1,149 @@
# /etc files related to networking, such as /etc/services.
{ config, lib, pkgs, ... }:
with lib;
let
cfg = config.networking.resolvconf;
resolvconfOptions = cfg.extraOptions
++ optional cfg.dnsSingleRequest "single-request"
++ optional cfg.dnsExtensionMechanism "edns0";
configText =
''
# This is the default, but we must set it here to prevent
# a collision with an apparently unrelated environment
# variable with the same name exported by dhcpcd.
interface_order='lo lo[0-9]*'
'' + optionalString config.services.nscd.enable ''
# Invalidate the nscd cache whenever resolv.conf is
# regenerated.
libc_restart='${pkgs.systemd}/bin/systemctl try-restart --no-block nscd.service 2> /dev/null'
'' + optionalString (length resolvconfOptions > 0) ''
# Options as described in resolv.conf(5)
resolv_conf_options='${concatStringsSep " " resolvconfOptions}'
'' + optionalString cfg.useLocalResolver ''
# This hosts runs a full-blown DNS resolver.
name_servers='127.0.0.1'
'' + cfg.extraConfig;
in
{
options = {
networking.resolvconf = {
enable = mkOption {
type = types.bool;
default = false;
internal = true;
description = ''
DNS configuration is managed by resolvconf.
'';
};
useHostResolvConf = mkOption {
type = types.bool;
default = false;
description = ''
In containers, whether to use the
<filename>resolv.conf</filename> supplied by the host.
'';
};
dnsSingleRequest = lib.mkOption {
type = types.bool;
default = false;
description = ''
Recent versions of glibc will issue both ipv4 (A) and ipv6 (AAAA)
address queries at the same time, from the same port. Sometimes upstream
routers will systemically drop the ipv4 queries. The symptom of this problem is
that 'getent hosts example.com' only returns ipv6 (or perhaps only ipv4) addresses. The
workaround for this is to specify the option 'single-request' in
/etc/resolv.conf. This option enables that.
'';
};
dnsExtensionMechanism = mkOption {
type = types.bool;
default = true;
description = ''
Enable the <code>edns0</code> option in <filename>resolv.conf</filename>. With
that option set, <code>glibc</code> supports use of the extension mechanisms for
DNS (EDNS) specified in RFC 2671. The most popular user of that feature is DNSSEC,
which does not work without it.
'';
};
extraConfig = mkOption {
type = types.lines;
default = "";
example = "libc=NO";
description = ''
Extra configuration to append to <filename>resolvconf.conf</filename>.
'';
};
extraOptions = mkOption {
type = types.listOf types.str;
default = [];
example = [ "ndots:1" "rotate" ];
description = ''
Set the options in <filename>/etc/resolv.conf</filename>.
'';
};
useLocalResolver = mkOption {
type = types.bool;
default = false;
description = ''
Use local DNS server for resolving.
'';
};
};
};
config = mkMerge [
{
networking.resolvconf.enable = !(config.environment.etc ? "resolv.conf");
environment.etc."resolvconf.conf".text =
if !cfg.enable then
# Force-stop any attempts to use resolvconf
''
echo "resolvconf is disabled on this system but was used anyway:" >&2
echo "$0 $*" >&2
exit 1
''
else configText;
}
(mkIf cfg.enable {
environment.systemPackages = [ pkgs.openresolv ];
systemd.services.resolvconf = {
description = "resolvconf update";
before = [ "network-pre.target" ];
wants = [ "network-pre.target" ];
wantedBy = [ "multi-user.target" ];
restartTriggers = [ config.environment.etc."resolvconf.conf".source ];
serviceConfig = {
Type = "oneshot";
ExecStart = "${pkgs.openresolv}/bin/resolvconf -u";
RemainAfterExit = true;
};
};
})
];
}

View File

@ -25,6 +25,7 @@
./config/nsswitch.nix
./config/power-management.nix
./config/pulseaudio.nix
./config/resolvconf.nix
./config/shells-environment.nix
./config/swap.nix
./config/sysctl.nix

View File

@ -248,6 +248,12 @@ with lib;
# KSM
(mkRenamedOptionModule [ "hardware" "enableKSM" ] [ "hardware" "ksm" "enable" ])
# resolvconf
(mkRenamedOptionModule [ "networking" "dnsSingleRequest" ] [ "networking" "resolvconf" "dnsSingleRequest" ])
(mkRenamedOptionModule [ "networking" "dnsExtensionMechanism" ] [ "networking" "resolvconf" "dnsExtensionMechanism" ])
(mkRenamedOptionModule [ "networking" "extraResolvconfConf" ] [ "networking" "resolvconf" "extraConfig" ])
(mkRenamedOptionModule [ "networking" "resolvconfOptions" ] [ "networking" "resolvconf" "extraOptions" ])
] ++ (flip map [ "blackboxExporter" "collectdExporter" "fritzboxExporter"
"jsonExporter" "minioExporter" "nginxExporter" "nodeExporter"
"snmpExporter" "unifiExporter" "varnishExporter" ]

View File

@ -237,8 +237,8 @@ in
config = mkIf cfg.enable {
assertions = [
{
assertion = cfg.rootpwFile != null || cfg.rootpw != null;
message = "Either services.openldap.rootpw or services.openldap.rootpwFile must be set";
assertion = cfg.configDir != null || cfg.rootpwFile != null || cfg.rootpw != null;
message = "services.openldap: Unless configDir is set, either rootpw or rootpwFile must be set";
}
];

View File

@ -12,10 +12,13 @@ let
else pkgs.buildEnv {
name = "postgresql-and-plugins-${(builtins.parseDrvName pg.name).version}";
paths = [ pg pg.lib ] ++ cfg.extraPlugins;
# We include /bin to ensure the $out/bin directory is created which is
# needed because we'll be removing files from that directory in postBuild
# below. See #22653
pathsToLink = [ "/" "/bin" ];
buildInputs = [ pkgs.makeWrapper ];
postBuild =
''
mkdir -p $out/bin
rm $out/bin/{pg_config,postgres,pg_ctl}
cp --target-directory=$out/bin ${pg}/bin/{postgres,pg_config,pg_ctl}
wrapProgram $out/bin/postgres --set NIX_PGLIBDIR $out/lib

View File

@ -168,7 +168,9 @@ in
###### implementation
config = mkIf config.services.bind.enable {
config = mkIf cfg.enable {
networking.resolvconf.useLocalResolver = mkDefault true;
users.users = singleton
{ name = bindUser;

View File

@ -79,7 +79,7 @@ in
###### implementation
config = mkIf config.services.dnsmasq.enable {
config = mkIf cfg.enable {
networking.nameservers =
optional cfg.resolveLocalQueries "127.0.0.1";
@ -92,6 +92,15 @@ in
description = "Dnsmasq daemon user";
};
networking.resolvconf = mkIf cfg.resolveLocalQueries {
useLocalResolver = mkDefault true;
extraConfig = ''
dnsmasq_conf=/etc/dnsmasq-conf.conf
dnsmasq_resolv=/etc/dnsmasq-resolv.conf
'';
};
systemd.services.dnsmasq = {
description = "Dnsmasq Daemon";
after = [ "network.target" "systemd-resolved.service" ];

View File

@ -16,7 +16,8 @@ let
plugins=keyfile
dhcp=${cfg.dhcp}
dns=${cfg.dns}
rc-manager=${cfg.rc-manager}
# If resolvconf is disabled that means that resolv.conf is managed by some other module.
rc-manager=${if config.networking.resolvconf.enable then "resolvconf" else "unmanaged"}
[keyfile]
${optionalString (cfg.unmanaged != [])
@ -268,25 +269,6 @@ in {
'';
};
rc-manager = mkOption {
type = types.enum [ "symlink" "file" "resolvconf" "netconfig" "unmanaged" "none" ];
default = "resolvconf";
description = ''
Set the <literal>resolv.conf</literal> management mode.
</para>
<para>
A description of these modes can be found in the main section of
<link xlink:href="https://developer.gnome.org/NetworkManager/stable/NetworkManager.conf.html">
https://developer.gnome.org/NetworkManager/stable/NetworkManager.conf.html
</link>
or in
<citerefentry>
<refentrytitle>NetworkManager.conf</refentrytitle>
<manvolnum>5</manvolnum>
</citerefentry>.
'';
};
dispatcherScripts = mkOption {
type = types.listOf (types.submodule {
options = {
@ -513,7 +495,7 @@ in {
networking = {
useDHCP = false;
# use mkDefault to trigger the assertion about the conflict above
wireless.enable = lib.mkDefault false;
wireless.enable = mkDefault false;
};
security.polkit.extraConfig = polkitConf;

View File

@ -35,6 +35,11 @@ in
config = mkIf config.services.rdnssd.enable {
assertions = [{
assertion = config.networking.resolvconf.enable;
message = "rdnssd needs resolvconf to work (probably something sets up a static resolv.conf)";
}];
systemd.services.rdnssd = {
description = "RDNSS daemon";
after = [ "network.target" ];

View File

@ -101,6 +101,8 @@ in
isSystemUser = true;
};
networking.resolvconf.useLocalResolver = mkDefault true;
systemd.services.unbound = {
description = "Unbound recursive Domain Name Server";
after = [ "network.target" ];

View File

@ -3,6 +3,10 @@
with lib;
let
cfg = config.services.resolved;
dnsmasqResolve = config.services.dnsmasq.enable &&
config.services.dnsmasq.resolveLocalQueries;
in
{
@ -126,6 +130,12 @@ in
config = mkIf cfg.enable {
assertions = [
{ assertion = !config.networking.useHostResolvConf;
message = "Using host resolv.conf is not supported with systemd-resolved";
}
];
systemd.additionalUpstreamSystemUnits = [
"systemd-resolved.service"
];
@ -135,21 +145,30 @@ in
restartTriggers = [ config.environment.etc."systemd/resolved.conf".source ];
};
environment.etc."systemd/resolved.conf".text = ''
[Resolve]
${optionalString (config.networking.nameservers != [])
"DNS=${concatStringsSep " " config.networking.nameservers}"}
${optionalString (cfg.fallbackDns != [])
"FallbackDNS=${concatStringsSep " " cfg.fallbackDns}"}
${optionalString (cfg.domains != [])
"Domains=${concatStringsSep " " cfg.domains}"}
LLMNR=${cfg.llmnr}
DNSSEC=${cfg.dnssec}
${config.services.resolved.extraConfig}
'';
environment.etc = {
"systemd/resolved.conf".text = ''
[Resolve]
${optionalString (config.networking.nameservers != [])
"DNS=${concatStringsSep " " config.networking.nameservers}"}
${optionalString (cfg.fallbackDns != [])
"FallbackDNS=${concatStringsSep " " cfg.fallbackDns}"}
${optionalString (cfg.domains != [])
"Domains=${concatStringsSep " " cfg.domains}"}
LLMNR=${cfg.llmnr}
DNSSEC=${cfg.dnssec}
${config.services.resolved.extraConfig}
'';
# symlink the dynamic stub resolver of resolv.conf as recommended by upstream:
# https://www.freedesktop.org/software/systemd/man/systemd-resolved.html#/etc/resolv.conf
"resolv.conf".source = "/run/systemd/resolve/stub-resolv.conf";
} // optionalAttrs dnsmasqResolve {
"dnsmasq-resolv.conf".source = "/run/systemd/resolve/resolv.conf";
};
# If networkmanager is enabled, ask it to interface with resolved.
networking.networkmanager.dns = "systemd-resolved";
};
}

View File

@ -4,19 +4,20 @@ with lib;
let
useHostResolvConf = config.networking.resolvconf.enable && config.networking.useHostResolvConf;
bootStage2 = pkgs.substituteAll {
src = ./stage-2-init.sh;
shellDebug = "${pkgs.bashInteractive}/bin/bash";
shell = "${pkgs.bash}/bin/bash";
isExecutable = true;
inherit (config.nix) readOnlyStore;
inherit (config.networking) useHostResolvConf;
inherit useHostResolvConf;
inherit (config.system.build) earlyMountScript;
path = lib.makeBinPath [
path = lib.makeBinPath ([
pkgs.coreutils
pkgs.utillinux
pkgs.openresolv
];
] ++ lib.optional useHostResolvConf pkgs.openresolv);
fsPackagesPath = lib.makeBinPath config.system.fsPackages;
postBootCommands = pkgs.writeText "local-cmds"
''

View File

@ -6,7 +6,7 @@ with import ./systemd-lib.nix { inherit config lib pkgs; };
let
checkService = checkUnitConfig "Service" [
(assertValueOneOf "Type" [
"simple" "forking" "oneshot" "dbus" "notify" "idle"
"exec" "simple" "forking" "oneshot" "dbus" "notify" "idle"
])
(assertValueOneOf "Restart" [
"no" "on-success" "on-failure" "on-abnormal" "on-abort" "always"

View File

@ -103,7 +103,7 @@ let
script =
''
${optionalString (!config.environment.etc?"resolv.conf") ''
${optionalString config.networking.resolvconf.enable ''
# Set the static DNS configuration, if given.
${pkgs.openresolv}/sbin/resolvconf -m 1 -a static <<EOF
${optionalString (cfg.nameservers != [] && cfg.domain != null) ''

View File

@ -1017,7 +1017,6 @@ in
pkgs.iproute
pkgs.iputils
pkgs.nettools
pkgs.openresolv
]
++ optionals config.networking.wireless.enable [
pkgs.wirelesstools # FIXME: obsolete?

View File

@ -2,6 +2,7 @@
, cmake, pkgconfig, git
, boost, miniupnpc, openssl, unbound, cppzmq
, zeromq, pcsclite, readline, libsodium, hidapi
, python3Packages
, CoreData, IOKit, PCSC
}:
@ -25,6 +26,7 @@ stdenv.mkDerivation rec {
boost miniupnpc openssl unbound
cppzmq zeromq pcsclite readline
libsodium hidapi
python3Packages.protobuf
] ++ optionals stdenv.isDarwin [ IOKit CoreData PCSC ];
cmakeFlags = [

View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "parlatype";
version = "1.6-beta";
version = "1.6.1";
src = fetchFromGitHub {
owner = "gkarsay";
repo = pname;
rev = "v${version}";
sha256 = "0bi0djic9kf178s7vl3y83v4rzhvynlvyf64n94fy80n2f100dj9";
sha256 = "0b811lwiylrjirx88gi9az1b1b71j2i5a4a6g56wp9qxln6lzjj2";
};
nativeBuildInputs = [

View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "qsynth-${version}";
version = "0.5.6";
version = "0.5.7";
src = fetchurl {
url = "mirror://sourceforge/qsynth/${name}.tar.gz";
sha256 = "0h4hhja8qbyzd6v24flw9wr4mwl03nplryx1gyrppn7sg13l1sx6";
sha256 = "18im4w8agj60nkppwbkxqnhpp13z5li3w30kklv4lgs20rvgbvl6";
};
nativeBuildInputs = [ autoconf pkgconfig ];

View File

@ -13,8 +13,8 @@ let
else throw "ImageMagick is not supported on this platform.";
cfg = {
version = "7.0.8-46";
sha256 = "1si3rv3b9jgjkwyny5ja76s8c0z9vyic28fm63j1jrqdd2jyq3pk";
version = "7.0.8-53";
sha256 = "0cgfsng2d14891fqwf7mlclsi576c42v0h5r6i4208bakcr25vzk";
patches = [];
};
in

View File

@ -14,13 +14,13 @@
stdenv.mkDerivation rec {
pname = "openimageio";
version = "2.0.8";
version = "2.0.9";
src = fetchFromGitHub {
owner = "OpenImageIO";
repo = "oiio";
rev = "Release-${version}";
sha256 = "0nk72h7q1n664b268zkhibb7a3i7fb3nl2z7fg31ys5r9zlq6mnp";
sha256 = "17diyfk586hll54cl476kbhbcm3nihw6cb4bgjkjxxzxbd3wx839";
};
outputs = [ "bin" "out" "dev" "doc" ];

View File

@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
name = "tesseract-${version}";
version = "4.0.0";
version = "4.1.0";
src = fetchFromGitHub {
owner = "tesseract-ocr";
repo = "tesseract";
rev = version;
sha256 = "1b5fi2vibc4kk9b30kkk4ais4bw8fbbv24bzr5709194hb81cav8";
sha256 = "06i7abxy2ifmdx1fak81cx0kns85n8hvp0339jk6242fhshibljx";
};
enableParallelBuilding = true;

View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "josm-${version}";
version = "15155";
version = "15238";
src = fetchurl {
url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar";
sha256 = "0qws5bgv7mm1iynsdrn7cdi16rd8k4139iia3bnjpm04xn69i5im";
sha256 = "0zh84glb4545av0s1qnccqqp8nrnfsr7rnwgbqpwwzvc2ngk91gv";
};
buildInputs = [ jdk11 makeWrapper ];

View File

@ -1,38 +1,45 @@
{ stdenv, fetchFromGitHub, perl, python, sqlite, gpsbabel
, withWebKit ? false }:
{ stdenv
, fetchFromGitHub
, perl
, python3
, sqlite
, gpsbabel
, gnome3
, gobject-introspection
, wrapGAppsHook
, gtk3
, xvfb_run
, webkitgtk
, glib-networking
, glibcLocales
, tzdata
, substituteAll
}:
let
# Pytrainer needs a matplotlib with GTK backend. Also ensure we are
# using the pygtk with glade support as needed by pytrainer.
matplotlibGtk = python.pkgs.matplotlib.override {
enableGtk2 = true;
pygtk = python.pkgs.pyGtkGlade;
# Pytrainer needs a matplotlib with GTK backend.
matplotlibGtk = python3.pkgs.matplotlib.override {
enableGtk3 = true;
};
in
python.pkgs.buildPythonApplication rec {
name = "pytrainer-${version}";
version = "1.12.1";
python3.pkgs.buildPythonApplication rec {
pname = "pytrainer";
version = "2.0.0";
src = fetchFromGitHub {
owner = "pytrainer";
repo = "pytrainer";
rev = "v${version}";
sha256 = "0rzf8kks96qzlknh6g3b9pjq04j7qk6rmz58scp7sck8xz9rjbwx";
sha256 = "1w5z1xwb2g6j2izm89b7lv9n92r1zhsr8bglxcn7jc5gwbvwysvd";
};
namePrefix = "";
patches = [
# The test fails in the UTC timezone and C locale.
./fix-test-tz.patch
# The existing use of pywebkitgtk shows raw HTML text instead of
# map. This patch solves the problems by showing the file from a
# string, which allows setting an explicit MIME type.
./pytrainer-webkit.patch
(substituteAll {
src = ./fix-paths.patch;
perl = "${perl}/bin/perl";
})
];
postPatch = ''
@ -40,18 +47,40 @@ python.pkgs.buildPythonApplication rec {
--replace "'mysqlclient'," ""
'';
propagatedBuildInputs = with python.pkgs; [
dateutil lxml matplotlibGtk pyGtkGlade sqlalchemy sqlalchemy_migrate psycopg2
] ++ stdenv.lib.optional withWebKit [ pywebkitgtk ];
propagatedBuildInputs = with python3.pkgs; [
dateutil
lxml
matplotlibGtk
pygobject3
sqlalchemy
sqlalchemy_migrate
psycopg2
requests
certifi
];
buildInputs = [ perl gpsbabel sqlite ];
nativeBuildInputs = [
gobject-introspection
wrapGAppsHook
xvfb_run
];
# This package contains no binaries to patch or strip.
dontPatchELF = true;
dontStrip = true;
buildInputs = [
gpsbabel
sqlite
gtk3
webkitgtk
glib-networking
glibcLocales
gnome3.adwaita-icon-theme
];
checkPhase = ''
${python.interpreter} -m unittest discover
env HOME=$TEMPDIR TZDIR=${tzdata}/share/zoneinfo \
TZ=Europe/Kaliningrad \
LC_ALL=en_US.UTF-8 \
xvfb-run -s '-screen 0 800x600x24' \
${python3.interpreter} setup.py test
'';
meta = with stdenv.lib; {

View File

@ -0,0 +1,11 @@
--- a/imports/file_garminfit.py
+++ b/imports/file_garminfit.py
@@ -81,7 +81,7 @@
logging.debug(">>")
result = False
try:
- result = subprocess.check_output(["perl",
+ result = subprocess.check_output(["@perl@",
self.main_data_path+"plugins/garmin-fit/bin/fit2tcx",
filename])
except subprocess.CalledProcessError:

View File

@ -1,45 +0,0 @@
diff -Nurp source.orig/pytrainer/test/core/test_activity.py source/pytrainer/test/core/test_activity.py
--- source.orig/pytrainer/test/core/test_activity.py 2018-02-27 22:15:32.078243354 +0100
+++ source/pytrainer/test/core/test_activity.py 2018-02-27 22:16:33.936867052 +0100
@@ -92,7 +92,7 @@ class ActivityTest(unittest.TestCase):
self.assertEquals(self.activity.time, self.activity.duration)
def test_activity_starttime(self):
- self.assertEquals(self.activity.starttime, '12:58:23 PM')
+ self.assertEquals(self.activity.starttime, '12:58:23')
def test_activity_time_tuple(self):
self.assertEquals(self.activity.time_tuple, (2, 3, 46))
diff -Nurp source.orig/pytrainer/test/imports/test_garmintcxv2.py source/pytrainer/test/imports/test_garmintcxv2.py
--- source.orig/pytrainer/test/imports/test_garmintcxv2.py 2018-02-27 22:15:32.079243364 +0100
+++ source/pytrainer/test/imports/test_garmintcxv2.py 2018-02-27 22:17:10.778333751 +0100
@@ -39,7 +39,7 @@ class GarminTCXv2Test(unittest.TestCase)
self.fail()
def test_workout_summary(self):
- summary = [(0, False, '2012-10-14T12:02:42', '10.12', '00:39:51', 'Running')]
+ summary = [(0, False, '2012-10-14T10:02:42', '10.12', '00:39:51', 'Running')]
try:
current_path = os.path.dirname(os.path.abspath(__file__))
data_path = os.path.dirname(os.path.dirname(os.path.dirname(current_path))) + "/"
@@ -52,7 +52,7 @@ class GarminTCXv2Test(unittest.TestCase)
self.fail()
def test_summary_in_database(self):
- summary = [(0, True, '2012-10-14T12:02:42', '10.12', '00:39:51', 'Running')]
+ summary = [(0, True, '2012-10-14T10:02:42', '10.12', '00:39:51', 'Running')]
activity = Activity(date_time_utc='2012-10-14T10:02:42Z', sport_id='1')
self.ddbb.session.add(activity)
self.ddbb.session.commit(
diff -Nurp source.orig/pytrainer/test/lib/test_date.py source/pytrainer/test/lib/test_date.py
--- source.orig/pytrainer/test/lib/test_date.py 2018-05-10 21:15:22.196275555 +0200
+++ source/pytrainer/test/lib/test_date.py 2018-05-10 21:22:43.647870401 +0200
@@ -47,7 +47,7 @@ class DateFunctionTest(unittest.TestCase
def test_getDateTime(self):
utctime, localtime = getDateTime('Tue Nov 24 17:29:05 UTC 2015')
self.assertEqual(datetime.datetime(2015, 11, 24, 17, 29, 5, tzinfo=tzutc()), utctime)
- self.assertEqual(datetime.datetime(2015, 11, 24, 19, 29, 5, tzinfo=tzlocal()), localtime)
+ self.assertEqual(datetime.datetime(2015, 11, 24, 17, 29, 5, tzinfo=tzlocal()), localtime)
class DateRangeTest(unittest.TestCase):

View File

@ -1,14 +0,0 @@
diff -Nurp pytrainer-1.10.0-orig/pytrainer/extensions/mapviewer.py pytrainer-1.10.0/pytrainer/extensions/mapviewer.py
--- pytrainer-1.10.0-orig/pytrainer/extensions/mapviewer.py 2013-03-31 12:28:29.000000000 +0200
+++ pytrainer-1.10.0/pytrainer/extensions/mapviewer.py 2014-12-22 11:44:44.367032126 +0100
@@ -46,7 +46,9 @@ class MapViewer:
logging.debug(">>")
if htmlfile is None:
htmlfile = self.createErrorHtml()
- self.wkview.load_uri("file://%s" % (htmlfile))
+ content = open(htmlfile, 'r').read()
+ self.wkview.load_string(content, 'text/html', 'UTF-8', 'file:///')
+ #self.wkview.load_uri("file://%s" % (htmlfile))
#self.box.show_all()
logging.debug("<<")

View File

@ -3,7 +3,7 @@
, makeWrapper, perlPackages }:
let
version = "1.5";
version = "1.5.90";
in stdenv.mkDerivation rec {
name = "qdirstat-${version}";
@ -11,7 +11,7 @@ in stdenv.mkDerivation rec {
owner = "shundhammer";
repo = "qdirstat";
rev = "${version}";
sha256 = "1v879kd7zahalb2qazq61wzi364k5cy3lgy6c8wj6mclwxjws1vc";
sha256 = "161jzii5p0dflbpixibn3yhp13smjf6aw802rz1q4879s12gqdq6";
};
nativeBuildInputs = [ qmake makeWrapper ];

View File

@ -1,26 +1,24 @@
{ buildGoModule
{ buildGoPackage
, fetchFromGitHub
, lib
}:
buildGoModule rec {
buildGoPackage rec {
pname = "wtf";
version = "0.11.0";
version = "0.17.1";
src = fetchFromGitHub {
owner = "wtfutil";
repo = pname;
rev = "v${version}";
sha256 = "1b671jhf3xaaisgpiad5apmvwkp40qr2hm4n21m0ya7k5ckps09z";
sha256 = "1qiwl6z5rraspjqry8dwnx8fgl9vv70sn5kgvh8074vl651yjq8c";
};
modSha256 = "0as736nnx7ci4w9gdp27g55g6dny9bh1fryz3g89gxm2sa2nlb9l";
buildFlagsArray = [ "-ldflags=" "-X main.version=${version}" ];
goPackagePath = "github.com/wtfutil/wtf";
meta = with lib; {
description = "The personal information dashboard for your terminal";
homepage = http://wtfutil.com/;
homepage = "https://wtfutil.com/";
license = licenses.mpl20;
maintainers = with maintainers; [ kalbasit ];
platforms = platforms.linux ++ platforms.darwin;

View File

@ -4,7 +4,7 @@
, isIceCatLike ? false, icversion ? null
, isTorBrowserLike ? false, tbversion ? null }:
{ lib, stdenv, pkgconfig, pango, perl, python2, zip, libIDL
{ lib, stdenv, pkgconfig, pango, perl, python2, python3, zip, libIDL
, libjpeg, zlib, dbus, dbus-glib, bzip2, xorg
, freetype, fontconfig, file, nspr, nss, libnotify
, yasm, libGLU_combined, sqlite, unzip, makeWrapper
@ -164,12 +164,15 @@ stdenv.mkDerivation rec {
postPatch = lib.optionalString (lib.versionAtLeast ffversion "63.0" && !isTorBrowserLike) ''
substituteInPlace third_party/prio/prio/rand.c --replace 'nspr/prinit.h' 'prinit.h'
'' + lib.optionalString (lib.versionAtLeast ffversion "68") ''
rm -rf obj-x86_64-pc-linux-gnu
'';
nativeBuildInputs =
[ autoconf213 which gnused pkgconfig perl python2 cargo rustc ]
++ lib.optional gtk3Support wrapGAppsHook
++ lib.optionals stdenv.isDarwin [ xcbuild rsync ]
++ lib.optional (lib.versionAtLeast ffversion "61.0") [ python3 ]
++ lib.optionals (lib.versionAtLeast ffversion "63.0") [ rust-cbindgen nodejs ]
++ lib.optionals (lib.versionAtLeast ffversion "67.0") [ llvmPackages.llvm ] # llvm-objdump is required in version >=67.0
++ extraNativeBuildInputs;

View File

@ -1,4 +1,4 @@
{ lib, callPackage, fetchurl, fetchFromGitHub, python3, overrideCC, gccStdenv, gcc6 }:
{ lib, callPackage, fetchurl, fetchFromGitHub, overrideCC, gccStdenv, gcc6 }:
let
@ -17,18 +17,16 @@ rec {
firefox = common rec {
pname = "firefox";
ffversion = "67.0.4";
ffversion = "68.0";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz";
sha512 = "3krwkc90m320a74vjyzlrxs4jc63cykbmpgisac9kv8m9n0bis5i1yf0dl9n14d9p4p541wvzhqygx7byj6mnvkhbk5b2l0nlvwias2";
sha512 = "0pg8ww2ldlvdlri0zrzv20x69x00gxshr4afq62pnz7rgrnppkdd0pw5snflisgvpxq1syxcrg5750wz1k4bfjwnyq47jk9h3fzddpw";
};
patches = [
./no-buildconfig-ffx65.patch
];
extraNativeBuildInputs = [ python3 ];
meta = {
description = "A web browser built from Firefox source tree";
homepage = http://www.mozilla.com/en-US/firefox/;
@ -72,10 +70,11 @@ rec {
firefox-esr-60 = common rec {
pname = "firefox-esr";
ffversion = "60.7.2esr";
ffversion = "60.8.0esr";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz";
sha512 = "0mw5dgrxd5vj6cngd9v3dy6hzdsg82s0cs9fabhrzrl1dy3pqdkccqqnj9r0hxwmcrdgca3s35i5lwwmlljagq6nyb5q6qv4fzv0n0j";
sha512 = "0332b6049b97e488e55a3b9540baad3bd159e297084e9a625b8492497c73f86eb3e144219dabc5e9f2c2e4a27630d83d243c919cd4f86b7f59f47133ed3afc54";
};
patches = [
@ -98,6 +97,28 @@ rec {
};
};
firefox-esr-68 = common rec {
pname = "firefox-esr";
ffversion = "68.0esr";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz";
sha512 = "29iqxxwkz2zgk2ppgq05w0bhs8c0938gina5s8brmwn6zn15nv379pa82a9djpzjryl6c5ff0hk0z7gx6n3xvf7w7ky9010h9il0kbg";
};
patches = [
./no-buildconfig-ffx65.patch
];
meta = firefox.meta // {
description = "A web browser built from Firefox Extended Support Release source tree";
};
updateScript = callPackage ./update.nix {
attrPath = "firefox-esr-68-unwrapped";
versionSuffix = "esr";
versionKey = "ffversion";
};
};
} // (let
iccommon = args: common (args // {

View File

@ -7,7 +7,7 @@ let
# Please keep the version x.y.0.z and do not update to x.y.76.z because the
# source of the latter disappears much faster.
version = "8.47.0.59";
version = "8.49.0.49";
rpath = stdenv.lib.makeLibraryPath [
alsaLib
@ -58,7 +58,7 @@ let
if stdenv.hostPlatform.system == "x86_64-linux" then
fetchurl {
url = "https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb";
sha256 = "0haiccmimbj1nyyyj556b0a181walmxwbbr0m18m2w67wi5z783r";
sha256 = "0l5q336kkw9i13076qn7fkknypg7cwjp58qi8xd6h0rwha3kkqa2";
}
else
throw "Skype for linux is not supported on ${stdenv.hostPlatform.system}";

View File

@ -2,7 +2,7 @@
buildPythonApplication rec {
name = "syncplay-${version}";
version = "1.6.3";
version = "1.6.4";
format = "other";
@ -10,7 +10,7 @@ buildPythonApplication rec {
owner = "Syncplay";
repo = "syncplay";
rev = "v${version}";
sha256 = "03xw44lxdk1h9kbvfviqzpmxxld6zvp07i0hvdm1chchyp0a109h";
sha256 = "0afh2a0l1c3hwgj5q6wy0v5iimg8qcjam3pw7b8mf63lasx6iqk4";
};
propagatedBuildInputs = [ pyside twisted certifi ] ++ twisted.extras.tls;

View File

@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
pname = "vnstat";
version = "2.2";
version = "2.3";
src = fetchurl {
sha256 = "0b7020rlc568pz6vkiy28kl8493z88wzrn18wv9b0iq2bv1pn2n6";
sha256 = "138s79dqxrm59xc2s2xch16qkzzjks580sac4ppq8jy5lxrzj2i8";
url = "https://humdi.net/${pname}/${pname}-${version}.tar.gz";
};

View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "picard-tools-${version}";
version = "2.20.2";
version = "2.20.3";
src = fetchurl {
url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar";
sha256 = "0qpc6pi3fmzv8rs5cmk3dd4clrkzbrngsl384b5g0y7471lhavbi";
sha256 = "0qgj062c983w6qlgfkj6in5cl5rmvpak7rdwmjg2gv972kcfs7lp";
};
nativeBuildInputs = [ makeWrapper ];

View File

@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
pname = "stacks";
version = "2.4";
version = "2.41";
src = fetchurl {
url = "http://catchenlab.life.illinois.edu/stacks/source/${pname}-${version}.tar.gz";
sha256 = "1ha1avkh6rqqvsy4k42336a2gj14y1jq19a2x8cjmiidi9l3s29h";
sha256 = "0q420rzjb05jfchcls3pysm4hxfgs6xj2jw246isx0il10g93gkq";
};
buildInputs = [ zlib ];

View File

@ -2,18 +2,18 @@
rustPlatform.buildRustPackage rec {
pname = "git-absorb";
version = "0.4.0";
version = "0.5.0";
src = fetchFromGitHub {
owner = "tummychow";
repo = pname;
rev = "refs/tags/${version}";
sha256 = "1clmd1b90vppbzng1kq0vzfh7964m3fk64q6h1vfcd1cfqj63r5v";
sha256 = "0lggv3knh6iglkh8x2zqvqcs3dlwfsdiclg7pmdrycny72la4k2j";
};
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ];
cargoSha256 = "0q40qcki49dw23n3brgdz5plvigmsf61jm0kfy48j89mijih8zy7";
cargoSha256 = "1khplyglavsidh13nnq9y5rxd5w89ail08wgzn29a5m03zir1yfd";
meta = with stdenv.lib; {
homepage = "https://github.com/tummychow/git-absorb";

View File

@ -1,17 +1,20 @@
{ fetchFromGitHub, git, gnupg, makeWrapper, openssl, stdenv }:
{ fetchFromGitHub, git, gnupg, makeWrapper, openssl, stdenv
, libxslt, docbook_xsl
}:
stdenv.mkDerivation rec {
name = "git-crypt-${version}";
pname = "git-crypt";
version = "0.6.0";
src = fetchFromGitHub {
owner = "AGWA";
repo = "git-crypt";
rev = "${version}";
repo = pname;
rev = version;
sha256 = "13m9y0m6gc3mlw3pqv9x4i0him2ycbysizigdvdanhh514kga602";
inherit name;
};
nativeBuildInputs = [ libxslt ];
buildInputs = [ openssl makeWrapper ];
patchPhase = ''
@ -19,9 +22,14 @@ stdenv.mkDerivation rec {
--replace '(escape_shell_arg(our_exe_path()))' '= "git-crypt"'
'';
installPhase = ''
make install PREFIX=$out
wrapProgram $out/bin/* --prefix PATH : $out/bin:${git}/bin:${gnupg}/bin
makeFlags = [
"PREFIX=${placeholder ''out''}"
"ENABLE_MAN=yes"
"DOCBOOK_XSL=${docbook_xsl}/share/xml/docbook-xsl-nons/manpages/docbook.xsl"
];
postFixup = ''
wrapProgram $out/bin/git-crypt --prefix PATH : $out/bin:${git}/bin:${gnupg}/bin
'';
meta = with stdenv.lib; {

View File

@ -1,7 +1,7 @@
{ stdenv, fetchurl, unzip, makeWrapper, jre }:
stdenv.mkDerivation rec {
name = "subgit-3.3.6";
name = "subgit-3.3.7";
meta = {
description = "A tool for a smooth, stress-free SVN to Git migration";
@ -21,6 +21,6 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "http://subgit.com/download/${name}.zip";
sha256 = "1zfhl583lx7xdw9jwskv25p6m385wm3s5a311y0hnxxqwkjbgq1j";
sha256 = "1cpssmvp961kw8s3b9s9bv9jmsm1gk3napggw5810c4rnnihjvrn";
};
}

View File

@ -1,4 +1,4 @@
{ stdenv, bazel, cacert, enableNixHacks ? true }:
{ stdenv, bazel, cacert }:
args@{ name, bazelFlags ? [], bazelTarget, buildAttrs, fetchAttrs, ... }:
@ -37,7 +37,15 @@ in stdenv.mkDerivation (fBuildAttrs // {
# We disable multithreading for the fetching phase since it can lead to timeouts with many dependencies/threads:
# https://github.com/bazelbuild/bazel/issues/6502
BAZEL_USE_CPP_ONLY_TOOLCHAIN=1 USER=homeless-shelter bazel --output_base="$bazelOut" --output_user_root="$bazelUserRoot" fetch --loading_phase_threads=1 $bazelFlags $bazelTarget
BAZEL_USE_CPP_ONLY_TOOLCHAIN=1 \
USER=homeless-shelter \
bazel \
--output_base="$bazelOut" \
--output_user_root="$bazelUserRoot" \
fetch \
--loading_phase_threads=1 \
$bazelFlags \
$bazelTarget
runHook postBuild
'';
@ -74,12 +82,14 @@ in stdenv.mkDerivation (fBuildAttrs // {
'';
dontFixup = true;
allowedRequisites = [];
outputHashMode = "recursive";
outputHashAlgo = "sha256";
outputHash = fetchAttrs.sha256;
});
nativeBuildInputs = fBuildAttrs.nativeBuildInputs or [] ++ [ (if enableNixHacks then (bazel.override { enableNixHacks = true; }) else bazel) ];
nativeBuildInputs = fBuildAttrs.nativeBuildInputs or [] ++ [ (bazel.override { enableNixHacks = true; }) ];
preHook = fBuildAttrs.preHook or "" + ''
export bazelOut="$NIX_BUILD_TOP/output"
@ -99,29 +109,6 @@ in stdenv.mkDerivation (fBuildAttrs // {
buildPhase = fBuildAttrs.buildPhase or ''
runHook preBuild
# Bazel sandboxes the execution of the tools it invokes, so even though we are
# calling the correct nix wrappers, the values of the environment variables
# the wrappers are expecting will not be set. So instead of relying on the
# wrappers picking them up, pass them in explicitly via `--copt`, `--linkopt`
# and related flags.
#
copts=()
host_copts=()
for flag in $NIX_CFLAGS_COMPILE; do
copts+=( "--copt=$flag" )
host_copts+=( "--host_copt=$flag" )
done
for flag in $NIX_CXXSTDLIB_COMPILE; do
copts+=( "--copt=$flag" )
host_copts+=( "--host_copt=$flag" )
done
linkopts=()
host_linkopts=()
for flag in $NIX_LD_FLAGS; do
linkopts+=( "--linkopt=$flag" )
host_linkopts+=( "--host_linkopt=$flag" )
done
BAZEL_USE_CPP_ONLY_TOOLCHAIN=1 \
USER=homeless-shelter \
bazel \
@ -129,10 +116,6 @@ in stdenv.mkDerivation (fBuildAttrs // {
--output_user_root="$bazelUserRoot" \
build \
-j $NIX_BUILD_CORES \
"''${copts[@]}" \
"''${host_copts[@]}" \
"''${linkopts[@]}" \
"''${host_linkopts[@]}" \
$bazelFlags \
$bazelTarget

View File

@ -94,17 +94,21 @@ rec {
/*
* Writes a text file to nix store in a specific directory with no
* optional parameters available. Name passed is the destination.
* optional parameters available.
*
* Example:
* # Writes contents of file to /nix/store/<store path>/<name>
* # Writes contents of file to /nix/store/<store path>/share/my-file
* writeTextDir "share/my-file"
* ''
* Contents of File
* '';
*
*/
writeTextDir = name: text: writeTextFile {inherit name text; destination = "/${name}";};
writeTextDir = path: text: writeTextFile {
inherit text;
name = builtins.baseNameOf path;
destination = "/${path}";
};
/*
* Writes a text file to /nix/store/<store path> and marks the file as

View File

@ -7,11 +7,11 @@
stdenv.mkDerivation rec {
name = "totem-${version}";
version = "3.32.0";
version = "3.32.1";
src = fetchurl {
url = "mirror://gnome/sources/totem/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "12iykwslvnpgmrm4bcchx5rzn2g4rl5r9s86n2001djn58yw6m6r";
sha256 = "0yra8apc7smpwf7d1k8crhrm8d4wix24ds6i9yxbch1v11jnhr3v";
};
doCheck = true;

View File

@ -63,7 +63,7 @@ let
export MIX_ENV=prod
export MIX_NO_DEPS=1
mix compile ${debugInfoFlag}
mix compile ${debugInfoFlag} --no-deps-check
runHook postBuild
''

View File

@ -8,13 +8,13 @@ in clangStdenv.mkDerivation rec {
# In theory this could use GCC + Clang rather than just Clang,
# but https://github.com/NixOS/nixpkgs/issues/29877 stops this
name = "openshadinglanguage-${version}";
version = "1.10.5";
version = "1.10.6";
src = fetchFromGitHub {
owner = "imageworks";
repo = "OpenShadingLanguage";
rev = "Release-1.10.5";
sha256 = "1g7izkjqb5xmp87k2aw0fgkxhcf7b9jn9hi60lwav3yhs50j8qsi";
rev = "Release-1.10.6";
sha256 = "1g8g853iq56knlvn1hdsck78by3843vyly9wji5ip41r6i2s0zla";
};
cmakeFlags = [ "-DUSE_BOOST_WAVE=ON" "-DENABLERTTI=ON" ];

View File

@ -163,6 +163,7 @@ rec {
markBroken = drv: overrideCabal drv (drv: { broken = true; hydraPlatforms = []; });
unmarkBroken = drv: overrideCabal drv (drv: { broken = false; });
markBrokenVersion = version: drv: assert drv.version == version; markBroken drv;
markUnbroken = drv: overrideCabal drv (drv: { broken = false; });
enableLibraryProfiling = drv: overrideCabal drv (drv: { enableLibraryProfiling = true; });
disableLibraryProfiling = drv: overrideCabal drv (drv: { enableLibraryProfiling = false; });

View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "SDL2_image-${version}";
version = "2.0.4";
version = "2.0.5";
src = fetchurl {
url = "https://www.libsdl.org/projects/SDL_image/release/${name}.tar.gz";
sha256 = "1b6f7002bm007y3zpyxb5r6ag0lml51jyvx1pwpj9sq24jfc8kp7";
sha256 = "1l0864kas9cwpp2d32yxl81g98lx40dhbdp03dz7sbv84vhgdmdx";
};
buildInputs = [ SDL2 libpng libjpeg libtiff libungif libwebp libXpm zlib ]

View File

@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
name = "intel-media-driver-${version}";
version = "19.1.0";
version = "19.2";
src = fetchFromGitHub {
owner = "intel";
repo = "media-driver";
rev = "intel-media-${version}";
sha256 = "072ry87h1lds14fqb2sfz3n2sssvacamaxv2gj4nd8agnzbwizn7";
sha256 = "118cg1grzm62lppaygvh7mgxn23bicjkwjwpxhbyqs9g6yhdj3p8";
};
cmakeFlags = [

View File

@ -1,10 +1,10 @@
{stdenv, fetchurl}:
stdenv.mkDerivation {
name = "libcdaudio-0.99.12";
name = "libcdaudio-0.99.12p2";
src = fetchurl {
url = mirror://sourceforge/libcdaudio/libcdaudio-0.99.12.tar.gz ;
sha256 = "1g3ba1n12g8h7pps0vlxx8di6cmf108mbcvbl6hj8x71ndkglygb" ;
url = mirror://sourceforge/libcdaudio/libcdaudio-0.99.12p2.tar.gz ;
sha256 = "1fsy6dlzxrx177qc877qhajm9l4g28mvh06h2l15rxy4bapzknjz" ;
};
meta = {

View File

@ -1,7 +1,7 @@
{ stdenv, fetchurl, bison, libuuid, curl, libxml2, flex }:
stdenv.mkDerivation rec {
version = "3.20.3";
version = "3.20.4";
name = "libdap-${version}";
nativeBuildInputs = [ bison flex ];
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://www.opendap.org/pub/source/${name}.tar.gz";
sha256 = "0n6ciicaa7sn88gvg5sgcq0438i3vh6xbl9lxgafjqiznli1k5i9";
sha256 = "0x44igs389b49nb2psd656wpvmbx9bwmla2l5ahfa09vxb314s5i";
};
meta = with stdenv.lib; {

View File

@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "libgweather";
version = "3.32.1";
version = "3.32.2";
outputs = [ "out" "dev" "devdoc" ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1079d26y8d2zaw9w50l9scqjhbrynpdd6kyaa32x4393f7nih8hw";
sha256 = "00iwbllh8dmnqch0ysng9xhkzzs3ir9jl9f4hp41vbvg1pq5zv98";
};
nativeBuildInputs = [ meson ninja pkgconfig gettext vala gtk-doc docbook_xsl docbook_xml_dtd_43 gobject-introspection python3 ];

View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, intltool, gobject-introspection, gtk-doc, docbook_xsl
{ stdenv, fetchurl, fetchpatch, pkgconfig, intltool, gobject-introspection, gtk-doc, docbook_xsl
, glib, libsoup, libxml2, libxslt, check, curl, perl, hwdata, osinfo-db, vala ? null
}:
@ -21,6 +21,17 @@ stdenv.mkDerivation rec {
patches = [
./osinfo-db-data-dir.patch
# https://nvd.nist.gov/vuln/detail/CVE-2019-13313
(fetchpatch {
url = "https://gitlab.com/libosinfo/libosinfo/commit/3654abee6ead9f11f8bb9ba8fc71efd6fa4dabbc.patch";
name = "CVE-2019-13313-1.patch";
sha256 = "1lybywfj6b41zfjk33ap90bab5l84lf5y3kif7vd2b6wq5r91rcn";
})
(fetchpatch {
url = "https://gitlab.com/libosinfo/libosinfo/commit/08fb8316b4ac42fe74c1fa5ca0ac593222cdf81a.patch";
name = "CVE-2019-13313-2.patch";
sha256 = "1f6rhkrgy3j8nmidk97wnz6p35zs1dsd63d3np76q7qs7ra74w9z";
})
];
postPatch = ''

View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "libraw-${version}";
version = "0.19.2";
version = "0.19.3";
src = fetchurl {
url = "https://www.libraw.org/data/LibRaw-${version}.tar.gz";
sha256 = "0i4nhjm5556xgn966x0i503ygk2wafq6z83kg0lisacjjab4f3a0";
sha256 = "0xs1qb6pcvc4c43fy5xi3nkqxcif77gakkw99irf0fc5iccdd5px";
};
outputs = [ "out" "lib" "dev" "doc" ];

View File

@ -0,0 +1,28 @@
{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig
, boost, openssl, log4cpp, libopus, protobuf }:
with lib; stdenv.mkDerivation rec {
pname = "mumlib";
version = "unstable-2018-12-12";
src = fetchFromGitHub {
owner = "slomkowski";
repo = "mumlib";
rev = "f91720de264c0ab5e02bb30deafc5c4b2c245eac";
sha256 = "0p29z8379dp2ra0420x8xjp4d3r2mf680lj38xmlc8npdzqjqjdp";
};
buildInputs = [ boost openssl libopus protobuf log4cpp ];
nativeBuildInputs = [ cmake pkgconfig ];
installPhase = ''
install -Dm555 libmumlib.so $out/lib/libmumlib.so
cp -a ../include $out
'';
meta = {
description = "Fairy simple Mumble library written in C++, using boost::asio asynchronous networking framework";
homepage = "https://github.com/slomkowski/mumlib";
maintainers = with maintainers; [ das_j ];
license = licenses.gpl2;
platforms = platforms.linux;
};
}

View File

@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
name = "poco-${version}";
version = "1.9.0";
version = "1.9.2";
src = fetchurl {
url = "https://pocoproject.org/releases/${name}/${name}-all.tar.gz";
sha256 = "11z1i0drbacs7c7d5virc3kz7wh79svd06iffh8j6giikl7vz1q3";
sha256 = "0jkbxw6z8l7zpr7bh2xcyzk8a5apzyz4ranhl66gxna1ay0gpzvd";
};
nativeBuildInputs = [ cmake pkgconfig ];

View File

@ -49,6 +49,16 @@ stdenv.mkDerivation rec {
name = "CVE-2019-11498-4.patch";
sha256 = "0qdw071b14hmxkjw6kn83d8hzq89l3hqh64pl1f1wb8m51w5xfg7";
})
(fetchpatch {
url = "https://github.com/dbry/WavPack/commit/070ef6f138956d9ea9612e69586152339dbefe51.patch";
name = "CVE-2018-19840.patch";
sha256 = "08y27py8hnki74ad8wbknnd36vj5pzzcm2vk3ngcbsjnj7x5mffz";
})
(fetchpatch {
url = "https://github.com/dbry/WavPack/commit/bba5389dc598a92bdf2b297c3ea34620b6679b5b.patch";
name = "CVE-2018-19841.patch";
sha256 = "08gx5xx51bi86cqqy7cv1d25k669a7wnkksasjspphwkpwkcxymy";
})
];
meta = with stdenv.lib; {

View File

@ -1,14 +1,14 @@
{ fetchurl, stdenv, flex }:
stdenv.mkDerivation rec {
version = "6.2";
version = "6.3";
name = "wcslib-${version}";
buildInputs = [ flex ];
src = fetchurl {
url = "ftp://ftp.atnf.csiro.au/pub/software/wcslib/${name}.tar.bz2";
sha256 ="01fqckazhbfqqhyr0wd9vcks1m2afmsh83l981alxg2r54jgwkdv";
sha256 ="1si272bms58yv1zmymx9ypx1ycka8bfqy8wk03rvl6nmciyz0dsc";
};
prePatch = ''

View File

@ -3,11 +3,11 @@
buildPythonPackage rec {
pname = "ROPGadget";
version = "5.4";
version = "5.8";
src = fetchPypi {
inherit pname version;
sha256 = "19wly4x3mq73c91pplqjk0c7sx6710887czh514qk5l7j0ky6dxg";
sha256 = "184qncm2ss474prphw0xnf7ifkpgj955dzlb2vqq94z6xvf3xyd9";
};
propagatedBuildInputs = [ capstone ];

View File

@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "Wand";
version = "0.5.4";
version = "0.5.5";
src = fetchPypi {
inherit pname version;
sha256 = "e2e08e19a37c61e85eaa307fe319889af46fe4cac6c23e3ae668b96be3e497ff";
sha256 = "1qjwqshcrfsa2a0j9bk0w01y857idzic1bj202p9cpar3xsjjw69";
};
postPatch = ''

View File

@ -0,0 +1,40 @@
{ lib
, buildPythonPackage
, fetchPypi
, isPy27
, pytest
, pytest-asyncio
, pytestcov
, trustme
, async-timeout
}:
buildPythonPackage rec {
pname = "aioftp";
version = "0.13.0";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
sha256 = "5711c03433b510c101e9337069033133cca19b508b5162b414bed24320de6c18";
};
checkInputs = [
pytest
pytest-asyncio
pytestcov
trustme
async-timeout
];
checkPhase = ''
pytest
'';
meta = with lib; {
description = "Ftp client/server for asyncio";
homepage = https://github.com/aio-libs/aioftp;
license = licenses.asl20;
maintainers = [ maintainers.costrouc ];
};
}

View File

@ -0,0 +1,32 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, pytest
}:
buildPythonPackage rec {
pname = "asciitree";
version = "0.3.3";
src = fetchFromGitHub {
owner = "mbr";
repo = pname;
rev = version;
sha256 = "071wlpyi8pa262sj9xdy0zbj163z84dasxad363z3sfndqxw78h1";
};
checkInputs = [
pytest
];
checkPhase = ''
pytest
'';
meta = with lib; {
description = "Draws ASCII trees";
homepage = https://github.com/mbr/asciitree;
license = licenses.mit;
maintainers = [ maintainers.costrouc ];
};
}

View File

@ -0,0 +1,47 @@
{ lib
, buildPythonPackage
, fetchPypi
, pytest-astropy
, semantic-version
, pyyaml
, jsonschema
, six
, numpy
, isPy27
, astropy
}:
buildPythonPackage rec {
pname = "asdf";
version = "2.3.3";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
sha256 = "d02e936a83abd206e7bc65050d94e8848da648344dbec9e49dddc2bdc3bd6870";
};
checkInputs = [
pytest-astropy
astropy
];
propagatedBuildInputs = [
semantic-version
pyyaml
jsonschema
six
numpy
];
checkPhase = ''
pytest
'';
meta = with lib; {
description = "Python tools to handle ASDF files";
homepage = https://github.com/spacetelescope/asdf;
license = licenses.bsd3;
maintainers = [ maintainers.costrouc ];
};
}

View File

@ -1,6 +1,6 @@
{ stdenv, buildPythonPackage, pythonOlder, fetchFromGitHub, async-timeout, pytest, pytest-asyncio }:
buildPythonPackage rec {
version = "3.1.2";
version = "3.1.4";
pname = "asgiref";
disabled = pythonOlder "3.5";
@ -10,7 +10,7 @@ buildPythonPackage rec {
owner = "django";
repo = pname;
rev = version;
sha256 = "1y32ys1q07nyri0b053mx24qvkw305iwvqvqgi2fdhx0va8d7qfy";
sha256 = "0rmasjrvf083c7855xnggy251gm8vaxyv970b2rd6198h8s3rldh";
};
propagatedBuildInputs = [ async-timeout ];

View File

@ -0,0 +1,32 @@
{ lib
, buildPythonPackage
, fetchPypi
, azure-common
, msrest
}:
buildPythonPackage rec {
pname = "azure-applicationinsights";
version = "0.1.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "6e1839169bb6ffd2d2c21ee3f4afbdd068ea428ad47cf884ea3167ecf7fd0859";
};
propagatedBuildInputs = [
azure-common
msrest
];
# has no tests
doCheck = false;
meta = with lib; {
description = "This is the Microsoft Azure Application Insights Client Library";
homepage = https://github.com/Azure/azure-sdk-for-python/tree/master/azure-applicotioninsights;
license = licenses.mit;
maintainers = with maintainers; [ mwilsoninsight ];
};
}

View File

@ -0,0 +1,34 @@
{ lib
, buildPythonPackage
, fetchPypi
, msrest
, azure-common
, msrestazure
}:
buildPythonPackage rec {
pname = "azure-batch";
version = "6.0.1";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "d5b0de3db0058cd69baf30e059874094abf865e24ccd82e3cd25f3a48b9676d1";
};
propagatedBuildInputs = [
msrest
msrestazure
azure-common
];
# has no tests
doCheck = false;
meta = with lib; {
description = "This is the Microsoft Azure Batch Client Library";
homepage = https://docs.microsoft.com/en-us/python/api/overview/azure/batch?view=azure-python;
license = licenses.mit;
maintainers = with maintainers; [ mwilsoninsight ];
};
}

View File

@ -4,6 +4,7 @@
, azure-nspkg
, isPyPy
, python
, isPy3k
}:
buildPythonPackage rec {
@ -17,16 +18,20 @@ buildPythonPackage rec {
sha256 = "25d696d2affbf5fe9b13aebe66271fce545e673e7e1eeaaec2d73599ba639d63";
};
propagatedBuildInputs = [ azure-nspkg ];
propagatedBuildInputs = [
azure-nspkg
];
postInstall = ''
postInstall = if isPy3k then "" else ''
echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py
'';
doCheck = false;
meta = with pkgs.lib; {
description = "Microsoft Azure SDK for Python";
homepage = "https://azure.microsoft.com/en-us/develop/python/";
license = licenses.asl20;
maintainers = with maintainers; [ olcai ];
description = "This is the Microsoft Azure common code";
homepage = https://github.com/Azure/azure-sdk-for-python/tree/master/azure-common;
license = licenses.mit;
maintainers = with maintainers; [ olcai mwilsoninsight ];
};
}

View File

@ -0,0 +1,29 @@
{ lib
, buildPythonPackage
, fetchPypi
, azure-nspkg
}:
buildPythonPackage rec {
pname = "azure-cosmosdb-nspkg";
version = "2.0.2";
src = fetchPypi {
inherit pname version;
sha256 = "acf691e692818d9a65c653c7a3485eb8e35c0bdc496bba652e5ea3905ba09cd8";
};
propagatedBuildInputs = [
azure-nspkg
];
# has no tests
doCheck = false;
meta = with lib; {
description = "This is the Microsoft Azure CosmosDB namespace package";
homepage = https://github.com/Azure/azure-cosmos-table-python/tree/master/azure-cosmosdb-nspkg;
license = licenses.mit;
maintainers = with maintainers; [ mwilsoninsight ];
};
}

View File

@ -0,0 +1,39 @@
{ lib
, buildPythonPackage
, fetchPypi
, cryptography
, azure-common
, azure-storage-common
, azure-cosmosdb-nspkg
, futures
, isPy3k
}:
buildPythonPackage rec {
pname = "azure-cosmosdb-table";
version = "1.0.5";
src = fetchPypi {
inherit pname version;
sha256 = "4a34c2c792036afc2a3811f4440ab967351e9ceee6542cc96453b63c678c0145";
};
propagatedBuildInputs = [
cryptography
azure-common
azure-storage-common
azure-cosmosdb-nspkg
] ++ lib.optionals (!isPy3k) [
futures
];
# has no tests
doCheck = false;
meta = with lib; {
description = "This is the Microsoft Azure Log Analytics Client Library";
homepage = https://docs.microsoft.com/en-us/python/api/overview/azure/cosmosdb?view=azure-python;
license = licenses.mit;
maintainers = with maintainers; [ mwilsoninsight ];
};
}

View File

@ -0,0 +1,39 @@
{ lib
, buildPythonPackage
, fetchPypi
, requests
, adal
, azure-common
, futures
, pathlib2
, isPy3k
}:
buildPythonPackage rec {
pname = "azure-datalake-store";
version = "0.0.45";
src = fetchPypi {
inherit pname version;
sha256 = "1k2wkpdv30wjmi53zdcsa5xfqw8gyak39na73ja6rb7wy8196wbd";
};
propagatedBuildInputs = [
requests
adal
azure-common
] ++ lib.optionals (!isPy3k) [
futures
pathlib2
];
# has no tests
doCheck = false;
meta = with lib; {
description = "This project is the Python filesystem library for Azure Data Lake Store";
homepage = https://docs.microsoft.com/en-us/python/api/overview/azure/data-lake-store?view=azure-python;
license = licenses.mit;
maintainers = with maintainers; [ mwilsoninsight ];
};
}

View File

@ -0,0 +1,34 @@
{ lib
, buildPythonPackage
, fetchPypi
, msrest
, azure-common
, msrestazure
}:
buildPythonPackage rec {
pname = "azure-eventgrid";
version = "1.2.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "7ebbe1c4266ba176aa4969d9755c08f10b89848ad50fb0bfd16fa82e29234f95";
};
propagatedBuildInputs = [
msrest
msrestazure
azure-common
];
# has no tests
doCheck = false;
meta = with lib; {
description = "A fully-managed intelligent event routing service that allows for uniform event consumption using a publish-subscribe model";
homepage = https://docs.microsoft.com/en-us/python/api/overview/azure/event-grid?view=azure-python;
license = licenses.mit;
maintainers = with maintainers; [ mwilsoninsight ];
};
}

View File

@ -0,0 +1,34 @@
{ lib
, buildPythonPackage
, fetchPypi
, msrest
, msrestazure
, azure-common
}:
buildPythonPackage rec {
version = "0.61.0";
pname = "azure-graphrbac";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "4ab27db29d730e4d35f420466500f8ee60a26a8151dbd121a6c353ccd9d4ee55";
};
propagatedBuildInputs = [
msrest
msrestazure
azure-common
];
# has no tests
doCheck = false;
meta = with lib; {
description = "This is the Microsoft Azure Graph RBAC Client Library";
homepage = https://github.com/Azure/azure-sdk-for-python/tree/master/azure-graphrbac;
license = licenses.mit;
maintainers = with maintainers; [ mwilsoninsight ];
};
}

View File

@ -0,0 +1,38 @@
{ lib
, buildPythonPackage
, fetchPypi
, azure-common
, azure-nspkg
, msrest
, msrestazure
, cryptography
}:
buildPythonPackage rec {
pname = "azure-keyvault";
version = "1.1.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "37a8e5f376eb5a304fcd066d414b5d93b987e68f9212b0c41efa37d429aadd49";
};
propagatedBuildInputs = [
azure-common
azure-nspkg
msrest
msrestazure
cryptography
];
# has no tests
doCheck = false;
meta = with lib; {
description = "This is the Microsoft Azure Key Vault Client Library";
homepage = https://docs.microsoft.com/en-us/python/api/overview/azure/key-vault?view=azure-python;
license = licenses.mit;
maintainers = with maintainers; [ mwilsoninsight ];
};
}

View File

@ -0,0 +1,32 @@
{ lib
, buildPythonPackage
, fetchPypi
, msrest
, azure-common
}:
buildPythonPackage rec {
version = "0.1.0";
pname = "azure-loganalytics";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "3ceb350def677a351f34b0a0d1637df6be0c6fe87ff32a5270b17f540f6da06e";
};
propagatedBuildInputs = [
msrest
azure-common
];
# has no tests
doCheck = false;
meta = with lib; {
description = "This is the Microsoft Azure Log Analytics Client Library";
homepage = https://docs.microsoft.com/en-us/python/api/overview/azure/loganalytics/client?view=azure-python;
license = licenses.mit;
maintainers = with maintainers; [ mwilsoninsight ];
};
}

View File

@ -0,0 +1,38 @@
{ lib
, buildPythonPackage
, fetchPypi
, msrest
, msrestazure
, azure-common
, isPy3k
, azure-mgmt-nspkg
}:
buildPythonPackage rec {
pname = "azure-mgmt-advisor";
version = "2.0.1";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "1929d6d5ba49d055fdc806e981b93cf75ea42ba35f78222aaf42d8dcf29d4ef3";
};
propagatedBuildInputs = [
msrest
msrestazure
azure-common
] ++ lib.optionals (!isPy3k) [
azure-mgmt-nspkg
];
# has no tests
doCheck = false;
meta = with lib; {
description = "This is the Microsoft Azure Advisor Client Library";
homepage = https://github.com/Azure/azure-sdk-for-python/tree/master/azure-mgmt-advisor;
license = licenses.mit;
maintainers = with maintainers; [ mwilsoninsight ];
};
}

View File

@ -0,0 +1,38 @@
{ lib
, buildPythonPackage
, fetchPypi
, msrest
, msrestazure
, azure-common
, azure-mgmt-nspkg
, isPy3k
}:
buildPythonPackage rec {
pname = "azure-mgmt-applicationinsights";
version = "0.2.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "1hm6s7vym1y072jqypjgbhps8lza1d5kb8qcpyxnw4zsmsvshdp5";
};
propagatedBuildInputs = [
msrest
msrestazure
azure-common
] ++ lib.optionals (!isPy3k) [
azure-mgmt-nspkg
];
# has no tests
doCheck = false;
meta = with lib; {
description = "This is the Microsoft Azure Application Insights Management Client Library";
homepage = https://github.com/Azure/sdk-for-python/tree/master/azure-mgmt-applicationinsights;
license = licenses.mit;
maintainers = with maintainers; [ mwilsoninsight ];
};
}

View File

@ -0,0 +1,38 @@
{ lib
, buildPythonPackage
, fetchPypi
, msrest
, msrestazure
, azure-common
, azure-mgmt-nspkg
, isPy3k
}:
buildPythonPackage rec {
pname = "azure-mgmt-authorization";
version = "0.51.1";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "d2789e21c6b85591b38d5d4e9b835b6546824c14e14aaa366da0ef50a95d2478";
};
propagatedBuildInputs = [
msrest
msrestazure
azure-common
] ++ lib.optionals (!isPy3k) [
azure-mgmt-nspkg
];
# has no tests
doCheck = false;
meta = with lib; {
description = "This is the Microsoft Azure Authorization Management Client Library";
homepage = https://github.com/Azure/sdk-for-python/tree/master/azure-mgmt-authorization;
license = licenses.mit;
maintainers = with maintainers; [ mwilsoninsight ];
};
}

View File

@ -0,0 +1,38 @@
{ lib
, buildPythonPackage
, fetchPypi
, msrest
, msrestazure
, azure-common
, azure-mgmt-nspkg
, isPy3k
}:
buildPythonPackage rec {
pname = "azure-mgmt-batch";
version = "6.0.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "dc929d2a0a65804c28a75dc00bb84ba581f805582a09238f4e7faacb15f8a2a3";
};
propagatedBuildInputs = [
msrest
msrestazure
azure-common
] ++ lib.optionals (!isPy3k) [
azure-mgmt-nspkg
];
# has no tests
doCheck = false;
meta = with lib; {
description = "This is the Microsoft Azure Batch Management Client Library";
homepage = https://github.com/Azure/sdk-for-python/tree/master/azure-mgmt-batch;
license = licenses.mit;
maintainers = with maintainers; [ mwilsoninsight ];
};
}

View File

@ -0,0 +1,36 @@
{ lib
, buildPythonPackage
, fetchPypi
, azure-common
, azure-mgmt-nspkg
, msrestazure
, python
, isPy3k
}:
buildPythonPackage rec {
pname = "azure-mgmt-batchai";
version = "2.0.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "f1870b0f97d5001cdb66208e5a236c9717a0ed18b34dbfdb238a828f3ca2a683";
};
propagatedBuildInputs = [
msrestazure
azure-common
azure-mgmt-nspkg
];
# has no tests
doCheck = false;
meta = with lib; {
description = "This is the Microsoft Azure Batch AI Management Client Library";
homepage = https://github.com/Azure/sdk-for-python/tree/master/azure-mgmt-batchai;
license = licenses.mit;
maintainers = with maintainers; [ mwilsoninsight ];
};
}

View File

@ -0,0 +1,41 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, msrestazure
, azure-common
, azure-mgmt-nspkg
, python
, isPy3k
}:
buildPythonPackage rec {
pname = "azure-mgmt-billing";
version = "0.2.0"; #pypi's 0.2.0 doesn't build ootb
src = fetchFromGitHub {
owner = "Azure";
repo = "azure-sdk-for-python";
rev = "ee5b47525d6c1eae3b1fd5f65b0421eab62a6e6f";
sha256 = "0xzdn7da5c3q5knh033vbsqk36vwbm75cx8vf10x0yj58krb4kn4";
};
preBuild = ''
cd ./azure-mgmt-billing
'';
propagatedBuildInputs = [
msrestazure
azure-common
azure-mgmt-nspkg
];
# has no tests
doCheck = false;
meta = with lib; {
description = "This is the Microsoft Azure Billing Client Library";
homepage = https://github.com/Azure/sdk-for-python/tree/master/azure-mgmt-billing;
license = licenses.mit;
maintainers = with maintainers; [ mwilsoninsight ];
};
}

View File

@ -0,0 +1,38 @@
{ lib
, buildPythonPackage
, fetchPypi
, msrest
, msrestazure
, azure-common
, azure-mgmt-nspkg
, isPy3k
}:
buildPythonPackage rec {
pname = "azure-mgmt-cdn";
version = "3.1.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "0cdbe0914aec544884ef681e31950efa548d9bec6d6dc354e00c3dbdab9e76e3";
};
propagatedBuildInputs = [
msrest
msrestazure
azure-common
] ++ lib.optionals (!isPy3k) [
azure-mgmt-nspkg
];
# has no tests
doCheck = false;
meta = with lib; {
description = "This is the Microsoft Azure CDN Management Client Library";
homepage = https://github.com/Azure/sdk-for-python/tree/master/azure-mgmt-cdn;
license = licenses.mit;
maintainers = with maintainers; [ mwilsoninsight ];
};
}

View File

@ -0,0 +1,34 @@
{ lib
, buildPythonPackage
, fetchPypi
, azure-common
, azure-mgmt-nspkg
, msrestazure
}:
buildPythonPackage rec {
pname = "azure-mgmt-cognitiveservices";
version = "4.0.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "05zbgy1d6mschqv6y14byr4nwdnv48x9skx4rbsbz1fcqqx3j2sd";
};
propagatedBuildInputs = [
msrestazure
azure-common
azure-mgmt-nspkg
];
# has no tests
doCheck = false;
meta = with lib; {
description = "This is the Microsoft Azure Cognitive Services Management Client Library";
homepage = https://github.com/Azure/sdk-for-python/tree/master/azure-mgmt-cognitiveservices;
license = licenses.mit;
maintainers = with maintainers; [ mwilsoninsight ];
};
}

View File

@ -0,0 +1,41 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, msrestazure
, azure-common
, azure-mgmt-nspkg
, python
, isPy3k
}:
buildPythonPackage rec {
pname = "azure-mgmt-commerce";
version = "1.0.1";
src = fetchFromGitHub {
owner = "Azure";
repo = "azure-sdk-for-python";
rev = "ee5b47525d6c1eae3b1fd5f65b0421eab62a6e6f";
sha256 = "0xzdn7da5c3q5knh033vbsqk36vwbm75cx8vf10x0yj58krb4kn4";
};
preBuild = ''
cd ./azure-mgmt-commerce
'';
propagatedBuildInputs = [
msrestazure
azure-common
azure-mgmt-nspkg
];
# has no tests
doCheck = false;
meta = with lib; {
description = "This is the Microsoft Azure Commerce Management Client Library";
homepage = https://github.com/Azure/sdk-for-python/tree/master/azure-mgmt-commerce;
license = licenses.mit;
maintainers = with maintainers; [ mwilsoninsight ];
};
}

View File

@ -6,6 +6,7 @@
, azure-mgmt-nspkg
, requests
, msrestazure
, isPy3k
}:
buildPythonPackage rec {
@ -15,20 +16,26 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "1rmzpz3733wv31rsnqpdy4bbafvk5dhbqx7q0xf62dlz7p0i4f66";
sha256 = "c63812c13d9f36615c07f874bc602b733bb516f1ed62ab73189b8f71c6bfbfe6";
};
propagatedBuildInputs = [ azure-common azure-mgmt-nspkg requests msrestazure ];
propagatedBuildInputs = [
azure-common
azure-mgmt-nspkg
requests
msrestazure
];
postInstall = ''
echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py
postInstall = if isPy3k then "" else ''
echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/mgmt/__init__.py
'';
doCheck = false;
meta = with pkgs.lib; {
description = "Microsoft Azure SDK for Python";
homepage = "https://azure.microsoft.com/en-us/develop/python/";
license = licenses.asl20;
maintainers = with maintainers; [ olcai ];
description = "This is the Microsoft Azure Resource Management common code";
homepage = https://pypi.org/project/azure-mgmt-common;
license = licenses.mit;
maintainers = with maintainers; [ olcai mwilsoninsight ];
};
}

View File

@ -1,31 +1,37 @@
{ pkgs
{ lib
, buildPythonPackage
, fetchPypi
, python
, azure-mgmt-common
, isPy3k
}:
buildPythonPackage rec {
version = "4.4.0";
version = "5.0.0";
pname = "azure-mgmt-compute";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "356219a354140ea26e6b4f4be4f855f1ffaf63af60de24cd2ca335b4ece9db00";
sha256 = "1zdypc8f825n60341ai2482rwgsc7l8dpr691j8hqz571l80y85w";
};
postInstall = ''
postInstall = if isPy3k then "" else ''
echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py
echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/mgmt/__init__.py
'';
propagatedBuildInputs = [ azure-mgmt-common ];
propagatedBuildInputs = [
azure-mgmt-common
];
meta = with pkgs.lib; {
description = "Microsoft Azure SDK for Python";
homepage = "https://azure.microsoft.com/en-us/develop/python/";
license = licenses.asl20;
maintainers = with maintainers; [ olcai ];
# has no tests
doCheck = false;
meta = with lib; {
description = "This is the Microsoft Azure Compute Management Client Library";
homepage = https://github.com/Azure/azure-sdk-for-python/tree/master/azure-mgmt-compute;
license = licenses.mit;
maintainers = with maintainers; [ olcai mwilsoninsight ];
};
}

View File

@ -0,0 +1,34 @@
{ lib
, buildPythonPackage
, fetchPypi
, msrestazure
, azure-common
, azure-mgmt-nspkg
}:
buildPythonPackage rec {
pname = "azure-mgmt-consumption";
version = "3.0.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "0nqgywknpj2a69an5yrn0c32fk01v5gi05za7dlf4ivwr9s4np83";
};
propagatedBuildInputs = [
msrestazure
azure-common
azure-mgmt-nspkg
];
# has no tests
doCheck = false;
meta = with lib; {
description = "This is the Microsoft Azure Consumption Management Client Library";
homepage = https://github.com/Azure/sdk-for-python/tree/master/azure-mgmt-consumption;
license = licenses.mit;
maintainers = with maintainers; [ mwilsoninsight ];
};
}

View File

@ -0,0 +1,38 @@
{ lib
, buildPythonPackage
, fetchPypi
, msrest
, msrestazure
, azure-common
, azure-mgmt-nspkg
, isPy3k
}:
buildPythonPackage rec {
pname = "azure-mgmt-containerinstance";
version = "1.4.1";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "87919f3e618ec0a40fd163d763113eef908e78c50d8b76bf4dd795444cb069fd";
};
propagatedBuildInputs = [
msrest
msrestazure
azure-common
] ++ lib.optionals (!isPy3k) [
azure-mgmt-nspkg
];
# has no tests
doCheck = false;
meta = with lib; {
description = "This is the Microsoft Azure Container Instance Client Library";
homepage = https://github.com/Azure/sdk-for-python/tree/master/azure-mgmt-containerinstance;
license = licenses.mit;
maintainers = with maintainers; [ mwilsoninsight ];
};
}

View File

@ -0,0 +1,38 @@
{ lib
, buildPythonPackage
, fetchPypi
, msrest
, msrestazure
, azure-common
, azure-mgmt-nspkg
, isPy3k
}:
buildPythonPackage rec {
pname = "azure-mgmt-containerservice";
version = "5.3.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "1dhni22n85x76709mvjmby8i8hvginzniq1dna6f5cidfcalc0vs";
};
propagatedBuildInputs = [
msrest
msrestazure
azure-common
] ++ lib.optionals (!isPy3k) [
azure-mgmt-nspkg
];
# has no tests
doCheck = false;
meta = with lib; {
description = "This is the Microsoft Azure Container Service Management Client Library";
homepage = https://github.com/Azure/sdk-for-python/tree/master/azure-mgmt-containerservice;
license = licenses.mit;
maintainers = with maintainers; [ mwilsoninsight ];
};
}

View File

@ -0,0 +1,38 @@
{ lib
, buildPythonPackage
, fetchPypi
, msrest
, msrestazure
, azure-common
, azure-mgmt-nspkg
, isPy3k
}:
buildPythonPackage rec {
pname = "azure-mgmt-cosmosdb";
version = "0.6.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "0g4znanx540p983gzr55z0n0jyzfnzmnzlshl92hm4gldwjdd91d";
};
propagatedBuildInputs = [
msrest
msrestazure
azure-common
] ++ lib.optionals (!isPy3k) [
azure-mgmt-nspkg
];
# has no tests
doCheck = false;
meta = with lib; {
description = "This is the Microsoft Azure Cosmos DB Management Client Library";
homepage = https://github.com/Azure/sdk-for-python/tree/master/azure-mgmt-cosmosdb;
license = licenses.mit;
maintainers = with maintainers; [ mwilsoninsight ];
};
}

View File

@ -0,0 +1,38 @@
{ lib
, buildPythonPackage
, fetchPypi
, msrest
, msrestazure
, azure-common
, azure-mgmt-nspkg
, isPy3k
}:
buildPythonPackage rec {
pname = "azure-mgmt-datafactory";
version = "0.7.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "7a50da8415e316bd3be0c90ff7e2bffee2afb959aefea23b5923f22dd7094a37";
};
propagatedBuildInputs = [
msrest
msrestazure
azure-common
] ++ lib.optionals (!isPy3k) [
azure-mgmt-nspkg
];
# has no tests
doCheck = false;
meta = with lib; {
description = "This is the Microsoft Azure Data Factory Management Client Library";
homepage = https://github.com/Azure/sdk-for-python/tree/master/azure-mgmt-datafactory;
license = licenses.mit;
maintainers = with maintainers; [ mwilsoninsight ];
};
}

View File

@ -0,0 +1,34 @@
{ lib
, buildPythonPackage
, fetchPypi
, msrestazure
, azure-common
, azure-mgmt-datalake-nspkg
}:
buildPythonPackage rec {
pname = "azure-mgmt-datalake-analytics";
version = "0.6.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "0d64c4689a67d6138eb9ffbaff2eda2bace7d30b846401673183dcb42714de8f";
};
propagatedBuildInputs = [
msrestazure
azure-common
azure-mgmt-datalake-nspkg
];
# has no tests
doCheck = false;
meta = with lib; {
description = "This is the Microsoft Azure Data Lake Analytics Management Client Library";
homepage = https://github.com/Azure/sdk-for-python/tree/master/azure-mgmt-datalake-analytics;
license = licenses.mit;
maintainers = with maintainers; [ mwilsoninsight ];
};
}

View File

@ -0,0 +1,30 @@
{ lib
, buildPythonPackage
, fetchPypi
, azure-mgmt-nspkg
}:
buildPythonPackage rec {
pname = "azure-mgmt-datalake-nspkg";
version = "3.0.1";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "deb192ba422f8b3ec272ce4e88736796f216f28ea5b03f28331d784b7a3f4880";
};
propagatedBuildInputs = [
azure-mgmt-nspkg
];
# has no tests
doCheck = false;
meta = with lib; {
description = "This is the Microsoft Azure Data Lake Management namespace package";
homepage = https://github.com/Azure/sdk-for-python/tree/master/azure-mgmt-datalake-nspkg;
license = licenses.mit;
maintainers = with maintainers; [ mwilsoninsight ];
};
}

View File

@ -0,0 +1,34 @@
{ lib
, buildPythonPackage
, fetchPypi
, msrestazure
, azure-common
, azure-mgmt-datalake-nspkg
}:
buildPythonPackage rec {
pname = "azure-mgmt-datalake-store";
version = "0.5.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "9376d35495661d19f8acc5604f67b0bc59493b1835bbc480f9a1952f90017a4c";
};
propagatedBuildInputs = [
msrestazure
azure-common
azure-mgmt-datalake-nspkg
];
# has no tests
doCheck = false;
meta = with lib; {
description = "This is the Microsoft Azure Data Lake Store Management Client Library";
homepage = https://github.com/Azure/sdk-for-python/tree/master/azure-mgmt-datalake-store;
license = licenses.mit;
maintainers = with maintainers; [ mwilsoninsight ];
};
}

View File

@ -0,0 +1,38 @@
{ lib
, buildPythonPackage
, fetchPypi
, msrest
, msrestazure
, azure-common
, azure-mgmt-nspkg
, isPy3k
}:
buildPythonPackage rec {
pname = "azure-mgmt-datamigration";
version = "2.1.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "49e6e68093e2d647c1c54a4027dee5b1d57f7e7c21480ae386c55cb3d5fa14bc";
};
propagatedBuildInputs = [
msrest
msrestazure
azure-common
] ++ lib.optionals (!isPy3k) [
azure-mgmt-nspkg
];
# has no tests
doCheck = false;
meta = with lib; {
description = "This is the Microsoft Azure Data Migration Client Library";
homepage = https://github.com/Azure/sdk-for-python/tree/master/azure-mgmt-datamigration;
license = licenses.mit;
maintainers = with maintainers; [ mwilsoninsight ];
};
}

View File

@ -0,0 +1,34 @@
{ lib
, buildPythonPackage
, fetchPypi
, msrestazure
, azure-common
, azure-mgmt-nspkg
}:
buildPythonPackage rec {
pname = "azure-mgmt-devspaces";
version = "0.1.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "4710dd59fc219ebfa4272dbbad58bf62093b52ce22bfd32a5c0279d2149471b5";
};
propagatedBuildInputs = [
msrestazure
azure-common
azure-mgmt-nspkg
];
# has no tests
doCheck = false;
meta = with lib; {
description = "This is the Microsoft Azure Dev Spaces Client Library";
homepage = https://github.com/Azure/sdk-for-python/tree/master/azure-mgmt-devspaces;
license = licenses.mit;
maintainers = with maintainers; [ mwilsoninsight ];
};
}

View File

@ -0,0 +1,38 @@
{ lib
, buildPythonPackage
, fetchPypi
, msrest
, msrestazure
, azure-common
, azure-mgmt-nspkg
, isPy3k
}:
buildPythonPackage rec {
pname = "azure-mgmt-devtestlabs";
version = "3.0.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "b3d5b2919021bf45f0acdd34ab23dc9b0435d9d0a6b472e5008128fb8521e700";
};
propagatedBuildInputs = [
msrest
msrestazure
azure-common
] ++ lib.optionals (!isPy3k) [
azure-mgmt-nspkg
];
# has no tests
doCheck = false;
meta = with lib; {
description = "This is the Microsoft Azure DevTestLabs Management Client Library";
homepage = https://github.com/Azure/sdk-for-python/tree/master/azure-mgmt-devtestlabs;
license = licenses.mit;
maintainers = with maintainers; [ mwilsoninsight ];
};
}

View File

@ -0,0 +1,38 @@
{ lib
, buildPythonPackage
, fetchPypi
, msrest
, msrestazure
, azure-common
, azure-mgmt-nspkg
, python
, isPy3k
}:
buildPythonPackage rec {
pname = "azure-mgmt-dns";
version = "2.1.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "3730b1b3f545a5aa43c0fff07418b362a789eb7d81286e2bed90ffef88bfa5d0";
};
propagatedBuildInputs = [
msrest
msrestazure
azure-common
azure-mgmt-nspkg
];
# has no tests
doCheck = false;
meta = with lib; {
description = "This is the Microsoft Azure DNS Management Client Library";
homepage = https://docs.microsoft.com/en-us/python/api/overview/azure/dns?view=azure-python;
license = licenses.mit;
maintainers = with maintainers; [ mwilsoninsight ];
};
}

View File

@ -0,0 +1,38 @@
{ lib
, buildPythonPackage
, fetchPypi
, msrest
, msrestazure
, azure-common
, azure-mgmt-nspkg
, isPy3k
}:
buildPythonPackage rec {
pname = "azure-mgmt-eventgrid";
version = "2.0.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "9a1da1085d39163b13dee14215b02f18eab93ede10ffe83dc6030ecf2163d2f1";
};
propagatedBuildInputs = [
msrest
msrestazure
azure-common
] ++ lib.optionals (!isPy3k) [
azure-mgmt-nspkg
];
# has no tests
doCheck = false;
meta = with lib; {
description = "This is the Microsoft Azure EventGrid Management Client Library";
homepage = https://docs.microsoft.com/en-us/python/api/overview/azure/event-grid?view=azure-python;
license = licenses.mit;
maintainers = with maintainers; [ mwilsoninsight ];
};
}

View File

@ -0,0 +1,38 @@
{ lib
, buildPythonPackage
, fetchPypi
, msrest
, msrestazure
, azure-common
, azure-mgmt-nspkg
, isPy3k
}:
buildPythonPackage rec {
pname = "azure-mgmt-eventhub";
version = "2.6.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "1nnp2ki4iz4f4897psmwb0v5khrwh84fgxja7nl7g73g3ym20sz8";
};
propagatedBuildInputs = [
msrest
msrestazure
azure-common
] ++ lib.optionals (!isPy3k) [
azure-mgmt-nspkg
];
# has no tests
doCheck = false;
meta = with lib; {
description = "This is the Microsoft Azure EventHub Management Client Library";
homepage = https://docs.microsoft.com/en-us/python/api/overview/azure/event-hub?view=azure-python;
license = licenses.mit;
maintainers = with maintainers; [ mwilsoninsight ];
};
}

View File

@ -0,0 +1,38 @@
{ lib
, buildPythonPackage
, fetchPypi
, msrest
, msrestazure
, azure-common
, azure-mgmt-nspkg
, isPy3k
}:
buildPythonPackage rec {
pname = "azure-mgmt-hanaonazure";
version = "0.6.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "1spsy6g5z4nb1y1gfz0p1ykybi76qbig8j22zvmws59329b3br5h";
};
propagatedBuildInputs = [
msrest
msrestazure
azure-common
] ++ lib.optionals (!isPy3k) [
azure-mgmt-nspkg
];
# has no tests
doCheck = false;
meta = with lib; {
description = "This is the Microsoft Azure SAP Hana on Azure Management Client Library";
homepage = https://docs.microsoft.com/en-us/python/api/overview/azure/hanaonazure?view=azure-python;
license = licenses.mit;
maintainers = with maintainers; [ mwilsoninsight ];
};
}

View File

@ -0,0 +1,38 @@
{ lib
, buildPythonPackage
, fetchPypi
, msrest
, msrestazure
, azure-common
, azure-mgmt-nspkg
, isPy3k
}:
buildPythonPackage rec {
pname = "azure-mgmt-iotcentral";
version = "1.0.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "9aac88ed1f993965015f4e9986931fc08798e09d7b864928681a7cebff053de8";
};
propagatedBuildInputs = [
msrest
msrestazure
azure-common
] ++ lib.optionals (!isPy3k) [
azure-mgmt-nspkg
];
# has no tests
doCheck = false;
meta = with lib; {
description = "This is the Microsoft Azure IoTCentral Management Client Library";
homepage = https://docs.microsoft.com/en-us/python/api/overview/azure/iot?view=azure-python;
license = licenses.mit;
maintainers = with maintainers; [ mwilsoninsight ];
};
}

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