dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot] 2020-12-07 18:15:25 +00:00 committed by GitHub
commit a1b2303710
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
54 changed files with 374 additions and 504 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
maintainers/maintainer-list.nix
View File

@ -6529,12 +6529,6 @@
githubId = 3359345;
name = "obadz";
};
ocharles = {
email = "ollie@ocharles.org.uk";
github = "ocharles";
githubId = 20878;
name = "Oliver Charles";
};
odi = {
email = "oliver.dunkl@gmail.com";
github = "odi";

94
pkgs/applications/audio/distrho/default.nix
View File

@ -1,55 +1,77 @@
{ stdenv, fetchFromGitHub, alsaLib, fftwSinglePrec, freetype, libjack2
, pkgconfig, ladspa-sdk, premake3
, libX11, libXcomposite, libXcursor, libXext, libXinerama, libXrender
{ stdenv
, alsaLib
, fetchFromGitHub
, freetype
, libGL
, libX11
, libXcursor
, libXext
, libXrender
, meson
, ninja
, pkg-config
}:
let
premakeos = if stdenv.hostPlatform.isDarwin then "osx"
else if stdenv.hostPlatform.isWindows then "mingw"
else "linux";
in stdenv.mkDerivation rec {
stdenv.mkDerivation rec {
pname = "distrho-ports";
version = "unstable-2019-10-09";
version = "2020-07-14";
src = fetchFromGitHub {
owner = "DISTRHO";
repo = "DISTRHO-Ports";
rev = "7e62235e809e59770d0d91d2c48c3f50ce7c027a";
sha256 = "10hpsjcmk0cgcsic9r1wxyja9x6q9wb8w8254dlrnzyswl54r1f8";
rev = version;
sha256 = "03ji41i6dpknws1vjwfxnl8c8bgisv2ng8xa4vqy2473k7wgdw4v";
};
configurePhase = ''
runHook preConfigure
nativeBuildInputs = [ pkg-config meson ninja ];
sh ./scripts/premake-update.sh ${premakeos}
runHook postConfigure
'';
postPatch = ''
sed -e "s#@./scripts#sh scripts#" -i Makefile
'';
nativeBuildInputs = [ pkgconfig premake3 ];
buildInputs = [
alsaLib fftwSinglePrec freetype libjack2
libX11 libXcomposite libXcursor libXext
libXinerama libXrender ladspa-sdk
alsaLib
freetype
libGL
libX11
libXcursor
libXext
libXrender
];
makeFlags = [ "PREFIX=$(out)" ];
meta = with stdenv.lib; {
homepage = "http://distrho.sourceforge.net";
description = "A collection of cross-platform audio effects and plugins";
homepage = "http://distrho.sourceforge.net/ports";
description = "Linux audio plugins and LV2 ports";
longDescription = ''
Includes:
Dexed drowaudio-distortion drowaudio-distortionshaper drowaudio-flanger
drowaudio-reverb drowaudio-tremolo drumsynth EasySSP eqinox HiReSam
JuceDemoPlugin KlangFalter LUFSMeter LUFSMeterMulti Luftikus Obxd
PitchedDelay ReFine StereoSourceSeparation TAL-Dub-3 TAL-Filter
TAL-Filter-2 TAL-NoiseMaker TAL-Reverb TAL-Reverb-2 TAL-Reverb-3
TAL-Vocoder-2 TheFunction ThePilgrim Vex Wolpertinger
arctican-function
arctican-pilgrim
dexed
drowaudio-distortion
drowaudio-distortionshaper
drowaudio-flanger
drowaudio-reverb
drowaudio-tremolo
drumsynth
easySSP
eqinox
HiReSam
juce-opl
klangfalter
LUFSMeter
LUFSMeter-Multi
luftikus
obxd
pitchedDelay
refine
stereosourceseparation
tal-dub-3
tal-filter
tal-filter-2
tal-noisemaker
tal-reverb
tal-reverb-2
tal-reverb-3
tal-vocoder-2
temper
vex
wolpertinger
'';
license = with licenses; [ gpl2 gpl3 gpl2Plus lgpl3 mit ];
maintainers = [ maintainers.goibhniu ];

28
pkgs/applications/audio/melmatcheq.lv2/default.nix Normal file
View File

@ -0,0 +1,28 @@
{ stdenv, fetchFromGitHub, xorg, xorgproto, cairo, lv2, pkg-config }:
stdenv.mkDerivation rec {
pname = "MelMatchEQ.lv2";
version = "0.1";
src = fetchFromGitHub {
owner = "brummer10";
repo = pname;
rev = "v${version}";
sha256 = "1s805jgb9msxfq9047s7pxrngizb00w8sm4z94iii80ba65rd20x";
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [
xorg.libX11 xorgproto cairo lv2
];
installFlags = [ "INSTALL_DIR=$(out)/lib/lv2" ];
meta = with stdenv.lib; {
homepage = "https://github.com/brummer10/MelMatchEQ.lv2";
description = "a profiling EQ using a 26 step Mel Frequency Band";
maintainers = with maintainers; [ magnetophon ];
license = licenses.gpl2Plus;
platforms = platforms.linux;
};
}

24
pkgs/applications/audio/quodlibet/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, python3, wrapGAppsHook, gettext, libsoup, gnome3, gtk3, gdk-pixbuf,
tag ? "", xvfb_run, dbus, glibcLocales, glib, glib-networking, gobject-introspection,
{ stdenv, fetchurl, python3, wrapGAppsHook, gettext, libsoup, gnome3, gtk3, gdk-pixbuf, librsvg,
tag ? "", xvfb_run, dbus, glibcLocales, glib, glib-networking, gobject-introspection, hicolor-icon-theme,
gst_all_1, withGstPlugins ? true,
xineBackend ? false, xineLib,
withDbusPython ? false, withPyInotify ? false, withMusicBrainzNgs ? false, withPahoMqtt ? false,
@ -9,16 +9,18 @@
let optionals = stdenv.lib.optionals; in
python3.pkgs.buildPythonApplication rec {
pname = "quodlibet${tag}";
version = "4.2.1";
version = "4.3.0";
src = fetchurl {
url = "https://github.com/quodlibet/quodlibet/releases/download/release-${version}/quodlibet-${version}.tar.gz";
sha256 = "0b1rvr4hqs2bjmhayms7vxxkn3d92k9v7p1269rjhf11hpk122l7";
sha256 = "1q17ckblfa4fcs7wsjwsq1dj7360ymrdyjkyqmj864wzlqkw1rd2";
};
patches = [ ./quodlibet-feedparser6.patch ];
nativeBuildInputs = [ wrapGAppsHook gettext ];
checkInputs = [ gdk-pixbuf ] ++ (with python3.pkgs; [ pytest pytest_xdist polib xvfb_run dbus.daemon glibcLocales ]);
checkInputs = [ gdk-pixbuf hicolor-icon-theme ] ++ (with python3.pkgs; [ pytest pytest_xdist polib xvfb_run dbus.daemon glibcLocales ]);
buildInputs = [ gnome3.adwaita-icon-theme libsoup glib glib-networking gtk3 webkitgtk gdk-pixbuf keybinder3 gtksourceview libmodplug libappindicator-gtk3 kakasi gobject-introspection ]
++ (if xineBackend then [ xineLib ] else with gst_all_1;
@ -36,6 +38,10 @@ python3.pkgs.buildPythonApplication rec {
pytestFlags = stdenv.lib.optionals (xineBackend || !withGstPlugins) [
"--ignore=tests/plugin/test_replaygain.py"
] ++ [
# requires networking
"--ignore=tests/test_browsers_iradio.py"
# the default theme doesn't have the required icons
"--ignore=tests/plugin/test_trayicon.py"
# upstream does actually not enforce source code linting
"--ignore=tests/quality"
# build failure on Arch Linux
@ -45,7 +51,13 @@ python3.pkgs.buildPythonApplication rec {
checkPhase = ''
runHook preCheck
# newer gettext spews some warnings which fail the tests
substituteInPlace tests/test_po.py --replace "strict=True" "strict=False"
# otherwise tests can't find the app icons; instead of creating index.theme from scratch
# I re-used the one from hicolor-icon-theme which seems to work
cp "${hicolor-icon-theme}/share/icons/hicolor/index.theme" quodlibet/images/hicolor
env XDG_DATA_DIRS="$out/share:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_ICON_DIRS:$XDG_DATA_DIRS" \
GDK_PIXBUF_MODULE_FILE=${librsvg}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache \
HOME=$(mktemp -d) \
xvfb-run -s '-screen 0 800x600x24' dbus-run-session \
--config-file=${dbus.daemon}/share/dbus-1/session.conf \
@ -73,7 +85,7 @@ python3.pkgs.buildPythonApplication rec {
& internet radio, and all major audio formats.
'';
maintainers = with maintainers; [ coroa sauyon ];
maintainers = with maintainers; [ coroa pbogdan ];
homepage = "https://quodlibet.readthedocs.io/en/latest/";
};
}

12
pkgs/applications/audio/quodlibet/quodlibet-feedparser6.patch Normal file
View File

@ -0,0 +1,12 @@
Support feedparser 6, based on https://github.com/quodlibet/quodlibet/pull/3464
--- a/quodlibet/browsers/audiofeeds.py
+++ b/quodlibet/browsers/audiofeeds.py
@@ -137,7 +137,4 @@ class Feed(list):
def parse(self):
try:
- if not self._check_feed():
- return False
-
doc = feedparser.parse(self.uri)
except Exception as e:

2
pkgs/applications/display-managers/lightdm/default.nix
View File

@ -140,6 +140,6 @@ stdenv.mkDerivation rec {
description = "A cross-desktop display manager";
platforms = platforms.linux;
license = licenses.gpl3;
maintainers = with maintainers; [ ocharles worldofpeace ];
maintainers = with maintainers; [ worldofpeace ];
};
}

2
pkgs/applications/display-managers/lightdm/gtk-greeter.nix
View File

@ -67,6 +67,6 @@ stdenv.mkDerivation rec {
homepage = "https://launchpad.net/lightdm-gtk-greeter";
platforms = platforms.linux;
license = licenses.gpl3;
maintainers = with maintainers; [ ocharles ];
maintainers = with maintainers; [ ];
};
}

4
pkgs/applications/graphics/fondo/default.nix
View File

@ -21,13 +21,13 @@
stdenv.mkDerivation rec {
pname = "fondo";
version = "1.4.0";
version = "1.5.0";
src = fetchFromGitHub {
owner = "calo001";
repo = pname;
rev = version;
sha256 = "0cdcn4qmdryk2x327f1z3pq8pg4cb0q1jr779gh8s6nqajyk8nqm";
sha256 = "1zmrpk0b5z6m956j923njn6dpqdm2p8653a325hgjjjq0sgwbhj2";
};
nativeBuildInputs = [

19
pkgs/applications/graphics/meme/default.nix
View File

@ -1,23 +1,22 @@
{ stdenv
, buildGoPackage
, unstableGitUpdater
, buildGoModule
, fetchFromGitHub
}:
buildGoPackage rec {
buildGoModule {
pname = "meme";
version = "unstable-2017-09-10";
owner = "nomad-software";
repo = "meme";
goPackagePath = "github.com/${owner}/${repo}";
version = "unstable-2020-05-28";
src = fetchFromGitHub {
inherit owner repo;
rev = "a6521f2eecb0aac22937b0013747ed9cb40b81ea";
sha256 = "1gbsv1d58ck6mj89q31s5b0ppw51ab76yqgz39jgwqnkidvzdfly";
owner = "nomad-software";
repo = "meme";
rev = "33a8b7d0de6996294a0464a605dacc17b26a6b02";
sha256 = "05h8d6pjszhr49xqg02nw94hm95kb7w1i7nw8jxi582fxxm2qbnm";
};
vendorSha256 = null;
passthru.updateScript = unstableGitUpdater { };
meta = with stdenv.lib; {

2
pkgs/applications/misc/calibre/default.nix
View File

@ -99,7 +99,7 @@ mkDerivation rec {
sip
# the following are distributed with calibre, but we use upstream instead
odfpy
]
] ++ lib.optional (unrarSupport) unrardll
);
installPhase = ''

2
pkgs/applications/misc/garmin-plugin/default.nix
View File

@ -20,7 +20,7 @@ stdenv.mkDerivation {
meta = {
homepage = "http://www.andreas-diesner.de/garminplugin";
license = stdenv.lib.licenses.gpl3;
maintainers = [ stdenv.lib.maintainers.ocharles ];
maintainers = [ ];
platforms = stdenv.lib.platforms.linux;
};
}

2
pkgs/applications/misc/golden-cheetah/default.nix
View File

@ -72,7 +72,7 @@ in mkDerivation rec {
meta = with stdenv.lib; {
description = "Performance software for cyclists, runners and triathletes";
platforms = platforms.linux;
maintainers = [ maintainers.ocharles ];
maintainers = [ ];
license = licenses.gpl3;
};
}

90
pkgs/applications/misc/octoprint/default.nix
View File

@ -25,13 +25,30 @@ let
[
# the following dependencies are non trivial to update since later versions introduce backwards incompatible
# changes that might affect plugins, or due to other observed problems
(mkOverride "markupsafe" "1.1.1" "29872e92839765e546828bb7754a68c418d927cd064fd4708fab9fe9c8bb116b")
(mkOverride "flask-babel" "1.0.0" "0gmb165vkwv5v7dxsxa2i3zhafns0fh938m2zdcrv4d8z5l099yn")
(mkOverride "rsa" "4.0" "1a836406405730121ae9823e19c6e806c62bbad73f890574fff50efa4122c487")
(mkOverride "markdown" "3.1.1" "2e50876bcdd74517e7b71f3e7a76102050edec255b3983403f1a63e7c8a41e7a")
(mkOverride "tornado" "5.1.1" "4e5158d97583502a7e2739951553cbd88a72076f152b4b11b64b9a10c4c49409")
(mkOverride "unidecode" "0.04.21" "280a6ab88e1f2eb5af79edff450021a0d3f0448952847cd79677e55e58bad051")
(mkOverride "sarge" "0.1.5.post0" "1c1ll7pys9vra5cfi8jxlgrgaql6c27l6inpy15aprgqhc4ck36s")
# Octoprint needs zeroconf >=0.24 <0.25. While this should be done in
# the mkOverride aboves, this package also has broken tests, so we need
# a proper override.
(
self: super: {
zeroconf = super.zeroconf.overrideAttrs (oldAttrs: rec {
version = "0.24.5";
src = oldAttrs.src.override {
inherit version;
sha256 = "0jpgd0rk91si93857mjrizan5gc42kj1q4fi4160qgk68la88fl9";
};
buildInputs = [ self.nose ];
checkPhase = "nosetests";
});
}
)
# Built-in dependency
(
self: super: {
@ -55,13 +72,13 @@ let
self: super: {
octoprint-firmwarecheck = self.buildPythonPackage rec {
pname = "OctoPrint-FirmwareCheck";
version = "2020.06.22";
version = "2020.09.23";
src = fetchFromGitHub {
owner = "OctoPrint";
repo = "OctoPrint-FirmwareCheck";
rev = version;
sha256 = "19y7hrgg9z8hl7cwqkvg8nc8bk0wwrsfvjd1wawy33wn60psqv1h";
sha256 = "1l1ajhnsc39prgk59mp93h90dgl9gh660cci00z5b5gj2h6dv1d1";
};
doCheck = false;
};
@ -72,53 +89,54 @@ let
self: super: {
octoprint = self.buildPythonPackage rec {
pname = "OctoPrint";
version = "1.4.2";
version = "1.5.1";
src = fetchFromGitHub {
owner = "OctoPrint";
repo = "OctoPrint";
rev = version;
sha256 = "1bblrjwkccy1ifw7lf55g3k9lq1sqzwd49vj8bfzj2w07a7qda62";
sha256 = "04x58cjivslsrld341ip11c50d50p2q01090nsyji0j255v986j9";
};
propagatedBuildInputs = with super; [
octoprint-firmwarecheck
octoprint-filecheck
markupsafe
tornado
markdown
rsa
regex
blinker
cachelib
click
emoji
feedparser
filetype
flask
jinja2
flask_login
flask-babel
flask_assets
werkzeug
itsdangerous
cachelib
pyyaml
pyserial
netaddr
watchdog
sarge
netifaces
pylru
pkginfo
requests
semantic-version
psutil
click
feedparser
future
websocket_client
wrapt
emoji
flask_login
frozendict
future
itsdangerous
jinja2
markdown
markupsafe
netaddr
netifaces
octoprint-filecheck
octoprint-firmwarecheck
pkginfo
psutil
pylru
pyserial
pyyaml
regex
requests
rsa
sarge
semantic-version
sentry-sdk
filetype
tornado
unidecode
blinker
watchdog
websocket_client
werkzeug
wrapt
zeroconf
] ++ lib.optionals stdenv.isDarwin [ py.pkgs.appdirs ];
checkInputs = with super; [ pytestCheckHook mock ddt ];

6
pkgs/applications/networking/cluster/octant/plugins/starboard-octant-plugin.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "starboard-octant-plugin";
version = "0.6.0";
version = "0.7.0";
src = fetchFromGitHub {
owner = "aquasecurity";
repo = pname;
rev = "v${version}";
sha256 = "1rgfk8l3yz7xwghr06vcgpi6zzjynxxvyg2r78fgp7wpw7bh3rmd";
sha256 = "140m7mnpqhfbp2qqpr3jjsc770xdph98mm5zpgwzg0jwgpsrcxsm";
};
vendorSha256 = "1f6x66zgrmm7x661d0d0qqharrpyb2bsi10swlgx68y5yz285296";
vendorSha256 = "0aphx2rpnvzmfyfs11hf8j5b7s5lgw4kcq4jpdrkjwx7zhl6qx2g";
meta = with lib; {
description = "Octant plugin for viewing Starboard security information";

4
pkgs/applications/networking/cluster/starboard/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "starboard";
version = "0.7.0";
version = "0.7.1";
src = fetchFromGitHub {
owner = "aquasecurity";
repo = pname;
rev = "v${version}";
sha256 = "1xj0fa52973h7cg3scxn85lav98q6fz82dwd5cls3p39ghnhzn5l";
sha256 = "0p0c459xih580ix3279fr45mm3q9w887rs7w1yrikh09xpcisdfr";
};
vendorSha256 = "07cz4p8k927ash5ncw1r56bcn592imgywbyzkvhnn50pap91m0q0";

2
pkgs/applications/networking/mailreaders/notmuch/muchsync.nix
View File

@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
description = "Synchronize maildirs and notmuch databases";
homepage = "http://www.muchsync.org/";
platforms = stdenv.lib.platforms.unix;
maintainers = with stdenv.lib.maintainers; [ ocharles ];
maintainers = with stdenv.lib.maintainers; [];
license = stdenv.lib.licenses.gpl2Plus;
};
}

4
pkgs/applications/science/logic/potassco/clingo.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "clingo";
version = "5.4.0";
version = "5.4.1";
src = fetchzip {
url = "https://github.com/potassco/clingo/archive/v${version}.tar.gz";
sha256 = "0gfqlgwg3qx042w6hdc9qpmr50n4vci3p0ddk28f3kqacf6q9q7m";
sha256 = "1f0q5f71s696ywxcjlfz7z134m1h7i39j9sfdv8hlw2w3g5nppc3";
};
nativeBuildInputs = [ cmake ];

26
pkgs/build-support/nix-gitignore/default.nix
View File

@ -20,14 +20,13 @@ let
in rec {
# [["good/relative/source/file" true] ["bad.tmpfile" false]] -> root -> path
filterPattern = patterns: root:
(name: _type:
let
relPath = lib.removePrefix ((toString root) + "/") name;
matches = pair: (match (head pair) relPath) != null;
matched = map (pair: [(matches pair) (last pair)]) patterns;
in
last (last ([[true true]] ++ (filter head matched)))
);
let
filters = map (pair: relPath: if match (head pair) relPath == null then true else last pair) patterns;
in
name: _type:
let
relPath = lib.removePrefix ((toString root) + "/") name;
in foldl' (acc: f: if acc == true then f relPath else acc) true filters;
# string -> [[regex bool]]
gitignoreToPatterns = gitignore:
@ -91,7 +90,9 @@ in rec {
(filter (l: !isList l && !isComment l)
(split "\n" gitignore));
gitignoreFilter = ign: root: filterPattern (gitignoreToPatterns ign) root;
gitignoreFilter = ign: let
patterns = gitignoreToPatterns ign;
in root: filterPattern patterns root;
# string|[string|file] (→ [string|file] → [string]) -> string
gitignoreCompileIgnore = file_str_patterns: root:
@ -100,9 +101,10 @@ in rec {
str_patterns = map (onPath readFile) (lib.toList file_str_patterns);
in concatStringsSep "\n" str_patterns;
gitignoreFilterPure = filter: patterns: root: name: type:
gitignoreFilter (gitignoreCompileIgnore patterns root) root name type
&& filter name type;
gitignoreFilterPure = filter: patterns: root: let
compiledFilter = gitignoreCompileIgnore patterns root;
filterFn = gitignoreFilter compiledFilter;
in name: type: filterFn root name type && filter name type;
# This is a very hacky way of programming this!
# A better way would be to reuse existing filtering by making multiple gitignore functions per each root.

4
pkgs/development/interpreters/erlang/R23.nix
View File

@ -3,8 +3,8 @@
# How to obtain `sha256`:
# nix-prefetch-url --unpack https://github.com/erlang/otp/archive/OTP-${version}.tar.gz
mkDerivation {
version = "23.1.2";
sha256 = "06dp2sw486khy2lc34cw5dca58ii5jvi26dpchiqxnmyvd6995z0";
version = "23.1.4";
sha256 = "16ssxmrgjgvzg06aa1l4wz9rrdjfy39k22amgabxwb5if1g8bg8z";
prePatch = ''
substituteInPlace make/configure.in --replace '`sw_vers -productVersion`' "''${MACOSX_DEPLOYMENT_TARGET:-10.12}"

2
pkgs/development/libraries/garmintools/default.nix
View File

@ -10,7 +10,7 @@ stdenv.mkDerivation {
description = "Provides the ability to communicate with the Garmin Forerunner 305 via the USB interface";
homepage = "https://code.google.com/archive/p/garmintools/"; # community clone at https://github.com/ianmartin/garmintools
license = stdenv.lib.licenses.gpl2;
maintainers = [ stdenv.lib.maintainers.ocharles ];
maintainers = [ ];
platforms = stdenv.lib.platforms.unix;
};
}

34
pkgs/development/libraries/genann/default.nix Normal file
View File

@ -0,0 +1,34 @@
{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
pname = "genann";
version = "1.0.0";
src = fetchFromGitHub {
owner = "codeplea";
repo = "genann";
rev = "v${version}";
sha256 = "0z45ndpd4a64i6jayr4yxfcr5h87bsmhm7lfgnbp35pnfywiclmq";
};
dontBuild = true;
doCheck = true;
# Nix doesn't seem to recognize this by default.
checkPhase = ''
make check
'';
installPhase = ''
mkdir -p $out/include
cp ./genann.{h,c} $out/include
'';
meta = with stdenv.lib; {
homepage = "https://github.com/codeplea/genann";
description = "Simple neural network library in ANSI C";
license = licenses.zlib;
maintainers = [ maintainers.ivar ];
platforms = platforms.all;
};
}

4
pkgs/development/python-modules/avro-python3/default.nix
View File

@ -2,12 +2,12 @@
buildPythonPackage rec {
pname = "avro-python3";
version = "1.10.0";
version = "1.10.1";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
sha256 = "a455c215540b1fceb1823e2a918e94959b54cb363307c97869aa46b5b55bde05";
sha256 = "9027abeab63dd9b66bd3c564fa0670c70f78027ecb1978d96c6af7ed415b626b";
};
buildInputs = [ pycodestyle isort ];

4
pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix
View File

@ -9,12 +9,12 @@
buildPythonPackage rec {
pname = "azure-mgmt-recoveryservicesbackup";
version = "0.8.0";
version = "0.9.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "a0ee89691b21945cc4b892a9194320f50c1cd242d98f00a82d7e3848c28517a5";
sha256 = "6b902eb7b9ccdf612e0a1738f42096f591dbf9c19d20b6d398a6361db278d4a7";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/chalice/default.nix
View File

@ -52,10 +52,8 @@ buildPythonPackage rec {
postPatch = ''
sed -i setup.py -e "/pip>=/c\'pip',"
substituteInPlace setup.py \
--replace 'pip>=9,<=19.4' 'pip' \
--replace 'typing==3.6.4' 'typing' \
--replace 'attrs==17.4.0' 'attrs' \
--replace 'click>=6.6,<7.0' 'click'
--replace 'attrs>=19.3.0,<20.3.0' 'attrs'
'';
checkPhase = ''

4
pkgs/development/python-modules/csvs-to-sqlite/default.nix
View File

@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "csvs-to-sqlite";
version = "1.1";
version = "1.2";
disabled = !isPy3k;
src = fetchFromGitHub {
owner = "simonw";
repo = pname;
rev = version;
sha256 = "1xi9d8l1sf9vixzvqpz8lvhl6yqmz9x5659nvpsxinl317qzmc8m";
sha256 = "0p99cg76d3s7jxvigh5ad04dzhmr6g62qzzh4i6h7x9aiyvdhvk4";
};
postPatch = ''

10
pkgs/development/python-modules/feedparser/default.nix
View File

@ -1,19 +1,25 @@
{ stdenv
, buildPythonPackage
, fetchPypi
, isPy27
, sgmllib3k
}:
buildPythonPackage rec {
pname = "feedparser";
version = "6.0.2";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
sha256 = "1b00a105425f492f3954fd346e5b524ca9cef3a4bbf95b8809470e9857aa1074";
};
# lots of networking failures
doCheck = false;
propagatedBuildInputs = [ sgmllib3k ];
checkPhase = ''
python -Wd tests/runtests.py
'';
meta = with stdenv.lib; {
homepage = "https://github.com/kurtmckee/feedparser";

4
pkgs/development/python-modules/fs/default.nix
View File

@ -47,6 +47,10 @@ buildPythonPackage rec {
"user_data_repr"
] ++ lib.optionals (stdenv.isDarwin) [ # remove if https://github.com/PyFilesystem/pyfilesystem2/issues/430#issue-707878112 resolved
"test_ftpfs"
] ++ lib.optionals (pythonAtLeast "3.9") [
# update friend version of this commit: https://github.com/PyFilesystem/pyfilesystem2/commit/3e02968ce7da7099dd19167815c5628293e00040
# merged into master, able to be removed after >2.4.1
"test_copy_sendfile"
];
__darwinAllowLocalNetworking = true;

2
pkgs/development/python-modules/gtimelog/default.nix
View File

@ -54,7 +54,7 @@ buildPythonPackage rec {
'';
homepage = "https://gtimelog.org/";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ ocharles oxzi ];
maintainers = with maintainers; [ oxzi ];
platforms = platforms.unix;
};
}

8
pkgs/development/python-modules/h5netcdf/default.nix
View File

@ -1,6 +1,7 @@
{ lib
, buildPythonPackage
, fetchPypi
, fetchpatch
, h5py
, pytestCheckHook
, netcdf4
@ -16,6 +17,13 @@ buildPythonPackage rec {
sha256 = "09bbnpsvwksb07wijn7flyyza56h5b2g2cw0hb3slmwxz6cgcjmr";
};
patches = [
(fetchpatch{
url = "https://patch-diff.githubusercontent.com/raw/h5netcdf/h5netcdf/pull/82.patch";
sha256 = "0x9bq9jl4kvw152adkpcyqslhpi7miv80hrnpl2w2y798mmbs0s4";
})
];
propagatedBuildInputs = [
h5py
];

4
pkgs/development/python-modules/netcdf4/default.nix
View File

@ -3,13 +3,13 @@
}:
buildPythonPackage rec {
pname = "netCDF4";
version = "1.5.4";
version = "1.5.5";
disabled = isPyPy;
src = fetchPypi {
inherit pname version;
sha256 = "941de6f3623b6474ecb4d043be5990690f7af4cf0d593b31be912627fe5aad03";
sha256 = "910b0c9d1ca7bef9c5796c45e2f5f30b91df70997ac655c51a58073eff2634f9";
};
checkInputs = [ pytest ];

6
pkgs/development/python-modules/pygmt/default.nix
View File

@ -1,4 +1,4 @@
{ lib
{ stdenv
, pythonOlder
, buildPythonPackage
, fetchFromGitHub
@ -36,10 +36,12 @@ buildPythonPackage rec {
pythonImportsCheck = [ "pygmt" ];
meta = with lib; {
meta = with stdenv.lib; {
description = "A Python interface for the Generic Mapping Tools";
homepage = "https://github.com/GenericMappingTools/pygmt";
license = licenses.bsd3;
# pygmt.exceptions.GMTCLibNotFoundError: Error loading the GMT shared library '/nix/store/r3xnnqgl89vrnq0kzxx0bmjwzks45mz8-gmt-6.1.1/lib/libgmt.dylib'
broken = stdenv.isDarwin;
maintainers = with maintainers; [ sikmir ];
};
}

4
pkgs/development/python-modules/pytest-html/default.nix
View File

@ -3,12 +3,12 @@
buildPythonPackage rec {
pname = "pytest-html";
version = "3.0.0";
version = "3.1.0";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "407adfe8c748a6bb7e68a430ebe3766ffe51e43fc5442f78b261229c03078be4";
sha256 = "8a7979e2411aac445870d8cad9a251ab3823bc14f77d065e9ce9a5dff86f697d";
};
nativeBuildInputs = [ setuptools_scm ];

5
pkgs/development/python-modules/sentry-sdk/default.nix
View File

@ -1,8 +1,11 @@
{ aiohttp
, blinker
, botocore
, bottle
, buildPythonPackage
, celery
, certifi
, chalice
, django
, falcon
, fetchPypi
@ -33,7 +36,7 @@ buildPythonPackage rec {
sha256 = "1052f0ed084e532f66cb3e4ba617960d820152aee8b93fc6c05bd53861768c1c";
};
checkInputs = [ django flask tornado bottle rq falcon sqlalchemy werkzeug trytond
checkInputs = [ blinker botocore chalice django flask tornado bottle rq falcon sqlalchemy werkzeug trytond
executing pure-eval asttokens ]
++ stdenv.lib.optionals isPy3k [ celery pyramid sanic aiohttp ];

27
pkgs/development/python-modules/sgmllib3k/default.nix Normal file
View File

@ -0,0 +1,27 @@
{ stdenv
, buildPythonPackage
, fetchFromGitHub
, isPy27
, lib
}:
buildPythonPackage rec {
pname = "sgmllib3k";
version = "1.0.0";
disabled = isPy27;
# fetchFromGitHub instead of fetchPypi to run tests.
src = fetchFromGitHub {
owner = "hsoft";
repo = "sgmllib";
rev = "799964676f35349ca2dd04503e34c2b3ad522c0d";
sha256 = "0bzf6pv85dzfxfysm6zbj8m40hp0xzr9h8qlk4hp3nmy88rznqvr";
};
meta = with lib; {
homepage = "https://pypi.org/project/sgmllib3k/";
description = "Python 3 port of sgmllib";
license = licenses.bsd2;
maintainers = with maintainers; [ lovesegfault ];
};
}

22
pkgs/development/python-modules/unrardll/default.nix Normal file
View File

@ -0,0 +1,22 @@
{ lib, buildPythonPackage, fetchPypi, unrar }:
buildPythonPackage rec {
pname = "unrardll";
version = "0.1.4";
src = fetchPypi {
inherit pname version;
sha256 = "4149c0729cf96a0bae80360e7d94dc40af1088c8da7f6eb8d10e09b8632e92ad";
};
buildInputs = [ unrar ];
pythonImportsCheck = [ "unrardll" ];
meta = with lib; {
description = "Wrap the Unrar DLL to enable unraring of files in python";
homepage = "https://github.com/kovidgoyal/unrardll";
license = licenses.bsd3;
maintainers = with maintainers; [ nyanloutre ];
};
}

4
pkgs/development/tools/ameba/default.nix
View File

@ -2,13 +2,13 @@
crystal.buildCrystalPackage rec {
pname = "ameba";
version = "0.13.2";
version = "0.13.3";
src = fetchFromGitHub {
owner = "crystal-ameba";
repo = "ameba";
rev = "v${version}";
sha256 = "0wyfx9nwda0s3arpdalz5zgh83v6wfz1a3l2k5v0jglpczq3m04m";
sha256 = "0yhb8vfrfzsm3a45h2jmcrn1n7jy3zn2hwims3dikgq8kaggws9y";
};
meta = with stdenv.lib; {

4
pkgs/development/tools/doctl/default.nix
View File

@ -2,7 +2,7 @@
buildGoModule rec {
pname = "doctl";
version = "1.53.0";
version = "1.54.0";
vendorSha256 = null;
@ -32,7 +32,7 @@ buildGoModule rec {
owner = "digitalocean";
repo = "doctl";
rev = "v${version}";
sha256 = "1zw6gdmy1jlwi7rrbdxg7pkiq54ha0h1gmzphn3mflfk7lmgyikm";
sha256 = "163n3d07vv9d4356ql6hbw2vg6n5c834axz7y4gk8gm9badbna82";
};
meta = with lib; {

4
pkgs/development/tools/misc/clojure-lsp/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "clojure-lsp";
version = "20201009T224414";
version = "20201205T230541";
src = fetchurl {
url = "https://github.com/snoe/clojure-lsp/releases/download/release-${version}/${pname}";
sha256 = "1az87b4cq6yyibs4knd0ywd0qfgmfzai4bqry4b7h2ycnfhfxdpa";
sha256 = "06sismbv7wrcwfgr0brw9gsdvl2plrryhxs1v08a2sd5rdf2qi3b";
};
dontUnpack = true;

4
pkgs/development/tools/open-policy-agent/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "open-policy-agent";
version = "0.25.0";
version = "0.25.1";
src = fetchFromGitHub {
owner = "open-policy-agent";
repo = "opa";
rev = "v${version}";
sha256 = "078ksgdl34yrr1w4l2p9r0zysxwzq7ml00mixhdr86rkmjii85zl";
sha256 = "1vwyp46lxjar7wl4qjj1mlii4c1vm65kwgmnf1kkwh8i4c202zkx";
};
vendorSha256 = null;

318
pkgs/development/tools/rust/cargo-geiger/cargo-lock.patch
View File

@ -1,318 +0,0 @@
diff --git a/Cargo.lock b/Cargo.lock
index b354f9b..5a17ec2 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -7,7 +7,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "aho-corasick"
-version = "0.7.6"
+version = "0.7.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"memchr 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -55,7 +55,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "backtrace"
-version = "0.3.42"
+version = "0.3.43"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"backtrace-sys 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -78,8 +78,8 @@ name = "better-panic"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "backtrace 0.3.42 (registry+https://github.com/rust-lang/crates.io-index)",
- "console 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "backtrace 0.3.43 (registry+https://github.com/rust-lang/crates.io-index)",
+ "console 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@@ -170,17 +170,17 @@ dependencies = [
[[package]]
name = "cargo-geiger"
-version = "0.9.0"
+version = "0.9.1"
dependencies = [
"assert_cmd 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
"better-panic 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"cargo 0.41.0 (registry+https://github.com/rust-lang/crates.io-index)",
"cargo-platform 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"colored 1.9.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "console 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "console 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)",
"env_logger 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
"geiger 0.4.3",
- "insta 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "insta 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)",
"petgraph 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
"pico-args 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"regex 1.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -262,7 +262,7 @@ dependencies = [
[[package]]
name = "console"
-version = "0.9.1"
+version = "0.9.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"clicolors-control 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -345,7 +345,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"commoncrypto 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "openssl 0.10.26 (registry+https://github.com/rust-lang/crates.io-index)",
+ "openssl 0.10.27 (registry+https://github.com/rust-lang/crates.io-index)",
"winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
]
@@ -357,7 +357,7 @@ dependencies = [
"curl-sys 0.4.25 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
"openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "openssl-sys 0.9.53 (registry+https://github.com/rust-lang/crates.io-index)",
+ "openssl-sys 0.9.54 (registry+https://github.com/rust-lang/crates.io-index)",
"schannel 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
"socket2 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)",
"winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -372,7 +372,7 @@ dependencies = [
"libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
"libnghttp2-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
"libz-sys 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)",
- "openssl-sys 0.9.53 (registry+https://github.com/rust-lang/crates.io-index)",
+ "openssl-sys 0.9.54 (registry+https://github.com/rust-lang/crates.io-index)",
"pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
"vcpkg 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
"winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -390,7 +390,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "dtoa"
-version = "0.4.4"
+version = "0.4.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
@@ -426,7 +426,7 @@ name = "failure"
version = "0.1.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "backtrace 0.3.42 (registry+https://github.com/rust-lang/crates.io-index)",
+ "backtrace 0.3.43 (registry+https://github.com/rust-lang/crates.io-index)",
"failure_derive 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
]
@@ -533,7 +533,7 @@ dependencies = [
"libgit2-sys 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
"openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "openssl-sys 0.9.53 (registry+https://github.com/rust-lang/crates.io-index)",
+ "openssl-sys 0.9.54 (registry+https://github.com/rust-lang/crates.io-index)",
"url 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
]
@@ -558,7 +558,7 @@ name = "globset"
version = "0.4.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "aho-corasick 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "aho-corasick 0.7.7 (registry+https://github.com/rust-lang/crates.io-index)",
"bstr 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
"fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -646,16 +646,15 @@ dependencies = [
[[package]]
name = "insta"
-version = "0.13.0"
+version = "0.13.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "console 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "console 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)",
"difference 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
"lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_json 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_yaml 0.8.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "uuid 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@@ -695,7 +694,7 @@ dependencies = [
"libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
"libssh2-sys 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)",
"libz-sys 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)",
- "openssl-sys 0.9.53 (registry+https://github.com/rust-lang/crates.io-index)",
+ "openssl-sys 0.9.54 (registry+https://github.com/rust-lang/crates.io-index)",
"pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
]
@@ -716,7 +715,7 @@ dependencies = [
"cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
"libz-sys 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)",
- "openssl-sys 0.9.53 (registry+https://github.com/rust-lang/crates.io-index)",
+ "openssl-sys 0.9.54 (registry+https://github.com/rust-lang/crates.io-index)",
"pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
"vcpkg 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
]
@@ -791,7 +790,7 @@ dependencies = [
[[package]]
name = "openssl"
-version = "0.10.26"
+version = "0.10.27"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -799,7 +798,7 @@ dependencies = [
"foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
"lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
- "openssl-sys 0.9.53 (registry+https://github.com/rust-lang/crates.io-index)",
+ "openssl-sys 0.9.54 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@@ -809,10 +808,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "openssl-sys"
-version = "0.9.53"
+version = "0.9.54"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
"cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
"pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -939,7 +938,7 @@ name = "regex"
version = "1.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "aho-corasick 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "aho-corasick 0.7.7 (registry+https://github.com/rust-lang/crates.io-index)",
"memchr 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
"regex-syntax 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
"thread_local 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1076,7 +1075,7 @@ name = "serde_yaml"
version = "0.8.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "dtoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "dtoa 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
"linked-hash-map 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
"yaml-rust 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1097,7 +1096,7 @@ dependencies = [
[[package]]
name = "smallvec"
-version = "1.1.0"
+version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
@@ -1231,7 +1230,7 @@ name = "unicode-normalization"
version = "0.1.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "smallvec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "smallvec 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@@ -1259,15 +1258,6 @@ name = "utf8parse"
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-[[package]]
-name = "uuid"
-version = "0.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
[[package]]
name = "vcpkg"
version = "0.2.8"
@@ -1338,13 +1328,13 @@ dependencies = [
[metadata]
"checksum adler32 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "5d2e7343e7fc9de883d1b0341e0b13970f764c14101234857d2ddafa1cb1cac2"
-"checksum aho-corasick 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)" = "58fb5e95d83b38284460a5fda7d6470aa0b8844d283a0b614b8535e880800d2d"
+"checksum aho-corasick 0.7.7 (registry+https://github.com/rust-lang/crates.io-index)" = "5f56c476256dc249def911d6f7580b5fc7e875895b5d7ee88f5d602208035744"
"checksum ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b"
"checksum assert_cmd 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6283bac8dd7226470d491bc4737816fea4ca1fba7a2847f2e9097fd6bfb4624c"
"checksum atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)" = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
"checksum autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2"
"checksum autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d"
-"checksum backtrace 0.3.42 (registry+https://github.com/rust-lang/crates.io-index)" = "b4b1549d804b6c73f4817df2ba073709e96e426f12987127c48e6745568c350b"
+"checksum backtrace 0.3.43 (registry+https://github.com/rust-lang/crates.io-index)" = "7f80256bc78f67e7df7e36d77366f636ed976895d91fe2ab9efa3973e8fe8c4f"
"checksum backtrace-sys 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)" = "5d6575f128516de27e3ce99689419835fce9643a9b215a14d2b5b685be018491"
"checksum better-panic 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3d12a680cc74d8c4a44ee08be4a00dedf671b089c2440b2e3fdaa776cd468476"
"checksum bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
@@ -1360,7 +1350,7 @@ dependencies = [
"checksum colored 1.9.2 (registry+https://github.com/rust-lang/crates.io-index)" = "8815e2ab78f3a59928fc32e141fbeece88320a240e43f47b2fd64ea3a88a5b3d"
"checksum commoncrypto 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d056a8586ba25a1e4d61cb090900e495952c7886786fc55f909ab2f819b69007"
"checksum commoncrypto-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1fed34f46747aa73dfaa578069fd8279d2818ade2b55f38f22a9401c7f4083e2"
-"checksum console 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f5d540c2d34ac9dd0deb5f3b5f54c36c79efa78f6b3ad19106a554d07a7b5d9f"
+"checksum console 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)" = "45e0f3986890b3acbc782009e2629dfe2baa430ac091519ce3be26164a2ae6c0"
"checksum core-foundation 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "25b9e03f145fd4f2bf705e07b900cd41fc636598fe5dc452fd0db1441c3f496d"
"checksum core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e7ca8a5221364ef15ce201e8ed2f609fc312682a8f4e0e3d4aa5879764e0fa3b"
"checksum crates-io 0.29.0 (registry+https://github.com/rust-lang/crates.io-index)" = "54a5db4b026e2d3bad49a9775b01722035ebc6976b95ec556716852d640f3ad5"
@@ -1373,7 +1363,7 @@ dependencies = [
"checksum curl-sys 0.4.25 (registry+https://github.com/rust-lang/crates.io-index)" = "0c38ca47d60b86d0cc9d42caa90a0885669c2abc9791f871c81f58cdf39e979b"
"checksum difference 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "524cbf6897b527295dff137cec09ecf3a05f4fddffd7dfcd1585403449e74198"
"checksum doc-comment 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "923dea538cea0aa3025e8685b20d6ee21ef99c4f77e954a30febbaac5ec73a97"
-"checksum dtoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "ea57b42383d091c85abcc2706240b94ab2a8fa1fc81c10ff23c4de06e2a90b5e"
+"checksum dtoa 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)" = "4358a9e11b9a09cf52383b451b49a169e8d797b68aa02301ff586d70d9661ea3"
"checksum encode_unicode 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f"
"checksum env_logger 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36"
"checksum escargot 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "74cf96bec282dcdb07099f7e31d9fed323bca9435a09aba7b6d99b7617bca96d"
@@ -1401,7 +1391,7 @@ dependencies = [
"checksum ignore 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)" = "522daefc3b69036f80c7d2990b28ff9e0471c683bad05ca258e0a01dd22c5a1e"
"checksum im-rc 13.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0a0197597d095c0d11107975d3175173f810ee572c2501ff4de64f4f3f119806"
"checksum indexmap 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0b54058f0a6ff80b6803da8faf8997cde53872b38f4023728f6830b06cd3c0dc"
-"checksum insta 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d07d2003a61f1eae49feeb2aea003d0da6c80587c20ac505d695805c744d4847"
+"checksum insta 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8df742abee84dbf27d20869c9adf77b0d8f7ea3eead13c2c9e3998d136a97058"
"checksum itoa 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)" = "b8b7a7c0c47db5545ed3fef7468ee7bb5b74691498139e4b3f6a20685dc6dd8e"
"checksum jobserver 0.1.19 (registry+https://github.com/rust-lang/crates.io-index)" = "67b06c1b455f1cf4269a8cfc320ab930a810e2375a42af5075eb8a8b36405ce0"
"checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
@@ -1419,9 +1409,9 @@ dependencies = [
"checksum miow 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "396aa0f2003d7df8395cb93e09871561ccc3e785f0acb369170e8cc74ddf9226"
"checksum num_cpus 1.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "46203554f085ff89c235cd12f7075f3233af9b11ed7c9e16dfe2560d03313ce6"
"checksum opener 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "13117407ca9d0caf3a0e74f97b490a7e64c0ae3aa90a8b7085544d0c37b6f3ae"
-"checksum openssl 0.10.26 (registry+https://github.com/rust-lang/crates.io-index)" = "3a3cc5799d98e1088141b8e01ff760112bbd9f19d850c124500566ca6901a585"
+"checksum openssl 0.10.27 (registry+https://github.com/rust-lang/crates.io-index)" = "e176a45fedd4c990e26580847a525e39e16ec32ac78957dbf62ded31b3abfd6f"
"checksum openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de"
-"checksum openssl-sys 0.9.53 (registry+https://github.com/rust-lang/crates.io-index)" = "465d16ae7fc0e313318f7de5cecf57b2fbe7511fd213978b457e1c96ff46736f"
+"checksum openssl-sys 0.9.54 (registry+https://github.com/rust-lang/crates.io-index)" = "1024c0a59774200a555087a6da3f253a9095a5f344e353b212ac4c8b8e450986"
"checksum percent-encoding 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e"
"checksum petgraph 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "29c127eea4a29ec6c85d153c59dc1213f33ec74cead30fe4730aecc88cc1fd92"
"checksum pico-args 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3ad1f1b834a05d42dae330066e9699a173b28185b3bdc3dbf14ca239585de8cc"
@@ -1458,7 +1448,7 @@ dependencies = [
"checksum serde_yaml 0.8.11 (registry+https://github.com/rust-lang/crates.io-index)" = "691b17f19fc1ec9d94ec0b5864859290dff279dbd7b03f017afda54eb36c3c35"
"checksum shell-escape 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "170a13e64f2a51b77a45702ba77287f5c6829375b04a69cf2222acd17d0cfab9"
"checksum sized-chunks 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f01db57d7ee89c8e053245deb77040a6cc8508311f381c88749c33d4b9b78785"
-"checksum smallvec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "44e59e0c9fa00817912ae6e4e6e3c4fe04455e75699d06eedc7d85917ed8e8f4"
+"checksum smallvec 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5c2fb2ec9bcd216a5b0d0ccf31ab17b5ed1d627960edff65bbe95d3ce221cefc"
"checksum socket2 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)" = "e8b74de517221a2cb01a53349cf54182acdc31a074727d3079068448c0676d85"
"checksum strip-ansi-escapes 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9d63676e2abafa709460982ddc02a3bb586b6d15a49b75c212e06edd3933acee"
"checksum strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
@@ -1479,7 +1469,6 @@ dependencies = [
"checksum unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c"
"checksum url 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "829d4a8476c35c9bf0bbce5a3b23f4106f79728039b726d292bb93bc106787cb"
"checksum utf8parse 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8772a4ccbb4e89959023bc5b7cb8623a795caa7092d99f3aa9501b9484d4557d"
-"checksum uuid 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9fde2f6a4bea1d6e007c4ad38c6839fa71cbb63b6dbf5b595aa38dc9b1093c11"
"checksum vcpkg 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "3fc439f2794e98976c88a2a2dafce96b930fe8010b0a256b3c2199a773933168"
"checksum vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a"
"checksum vte 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "4f42f536e22f7fcbb407639765c8fd78707a33109301f834a594758bedd6e8cf"

24
pkgs/development/tools/rust/cargo-geiger/default.nix
View File

@ -1,38 +1,26 @@
{ stdenv, lib, fetchFromGitHub
, rustPlatform, pkgconfig, openssl
# testing packages
, cargo-insta
# darwin dependencies
, Security, CoreFoundation, libiconv
}:
rustPlatform.buildRustPackage rec {
pname = "cargo-geiger";
version = "0.9.1";
version = "0.10.2";
src = fetchFromGitHub {
owner = "rust-secure-code";
repo = pname;
rev = "${pname}-${version}";
sha256 = "0kvmjahyx5dcjhry2hkvcshi0lbgipfj0as74a3h3bllfvdfkkg0";
sha256 = "1z920p8i3gkjadyd6bqjk4i5yr5ds3m3sbcnf7plcqr69dsjr4b8";
};
cargoSha256 = "0v50fkyf0a77l7whxalwnfqfi8lxy82z2gpd0fa0ib80qjla2n5z";
cargoPatches = [ ./cargo-lock.patch ];
cargoSha256 = "1zh6fjfynkn4kgk1chigzd0sh4x1bagizyn7x6qyxgzc57a49bp7";
# Multiple tests require internet connectivity, so they are disabled here.
# If we ever get cargo-insta (https://crates.io/crates/insta) in tree,
# we might be able to run these with something like
# `cargo insta review` in the `preCheck` phase.
checkPhase = ''
cd cargo-geiger/tests/snapshots
for file in *
do
mv $file r#$file
done
cd -
cargo test -- \
--skip test_package::case_2 \
--skip test_package::case_3 \
--skip test_package::case_6
${cargo-insta}/bin/cargo-insta test
'';
buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security libiconv ];

2
pkgs/development/web/xmlindent/default.nix
View File

@ -20,6 +20,6 @@ stdenv.mkDerivation rec {
homepage = "http://xmlindent.sourceforge.net/";
license = stdenv.lib.licenses.gpl3;
platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.ocharles ];
maintainers = [ ];
};
}

4
pkgs/servers/adminer/default.nix
View File

@ -1,13 +1,13 @@
{ stdenv, libbsd, fetchurl, phpPackages, php }:
stdenv.mkDerivation rec {
version = "4.7.7";
version = "4.7.8";
pname = "adminer";
# not using fetchFromGitHub as the git repo relies on submodules that are included in the tar file
src = fetchurl {
url = "https://github.com/vrana/adminer/releases/download/v${version}/adminer-${version}.tar.gz";
sha256 = "1rvvc7xml7ycpbpjgqbgkan8djplx67balrmfignk1b6h9cw3l4q";
sha256 = "0k794agvd8pa3mwl0076i7753fzxd41lhr23aih4l2lbdgnzi68z";
};
nativeBuildInputs = with phpPackages; [ php composer ];

2
pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix
View File

@ -20,7 +20,7 @@ buildGoPackage {
description = "Prometheus exporter for RabbitMQ";
homepage = "https://github.com/kbudde/rabbitmq_exporter";
license = licenses.mit;
maintainers = with maintainers; [ ocharles ];
maintainers = with maintainers; [ ];
platforms = platforms.unix;
};
}

4
pkgs/servers/sql/dolt/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "dolt";
version = "0.22.5";
version = "0.22.6";
src = fetchFromGitHub {
owner = "liquidata-inc";
repo = "dolt";
rev = "v${version}";
sha256 = "04lsmh80br1cr26dp11ai0f96lmjdkc9mjdwnmwkkc0d7igv7rc0";
sha256 = "1kd7kqiic6mm974cix7m3620yzdaxpdnnq4q53pyicfq2i4pk2ml";
};
modRoot = "./go";

2
pkgs/servers/sql/postgresql/default.nix
View File

@ -148,7 +148,7 @@ let
homepage = "https://www.postgresql.org";
description = "A powerful, open source object-relational database system";
license = licenses.postgresql;
maintainers = with maintainers; [ ocharles thoughtpolice danbst globin marsam ];
maintainers = with maintainers; [ thoughtpolice danbst globin marsam ];
platforms = platforms.unix;
knownVulnerabilities = optional (!atLeast "9.4")
"PostgreSQL versions older than 9.4 are not maintained anymore!";

2
pkgs/shells/fish/default.nix
View File

@ -203,7 +203,7 @@ let
homepage = "http://fishshell.com/";
license = licenses.gpl2;
platforms = platforms.unix;
maintainers = with maintainers; [ ocharles cole-h ];
maintainers = with maintainers; [ cole-h ];
};
passthru = {

2
pkgs/tools/backup/wal-g/default.nix
View File

@ -27,6 +27,6 @@ buildGoModule rec {
homepage = "https://github.com/wal-g/wal-g";
license = licenses.asl20;
description = "An archival restoration tool for PostgreSQL";
maintainers = with maintainers; [ ocharles marsam ];
maintainers = with maintainers; [ marsam ];
};
}

2
pkgs/tools/misc/opentsdb/default.nix
View File

@ -31,6 +31,6 @@ stdenv.mkDerivation rec {
homepage = "http://opentsdb.net";
license = licenses.lgpl21Plus;
platforms = stdenv.lib.platforms.linux;
maintainers = [ maintainers.ocharles ];
maintainers = [ ];
};
}

4
pkgs/tools/misc/youtube-dl/default.nix
View File

@ -18,11 +18,11 @@ buildPythonPackage rec {
# The websites youtube-dl deals with are a very moving target. That means that
# downloads break constantly. Because of that, updates should always be backported
# to the latest stable release.
version = "2020.12.05";
version = "2020.12.07";
src = fetchurl {
url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz";
sha256 = "065s45l8qz7wlkaxw9bj20gq9647zpwdj9vc6chhqjscl63z1aqm";
sha256 = "0sbrwak9c0pbacg15q2wj5fcsj5k5k1sx9jm7rcjwkjdhqcjqrsi";
};
nativeBuildInputs = [ installShellFiles makeWrapper ];

2
pkgs/tools/networking/siege/default.nix
View File

@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "HTTP load tester";
maintainers = with maintainers; [ ocharles raskin ];
maintainers = with maintainers; [ raskin ];
platforms = platforms.unix;
license = licenses.gpl2Plus;
};

6
pkgs/tools/system/thinkfan/default.nix
View File

@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "thinkfan";
version = "1.1";
version = "1.2.1";
src = fetchFromGitHub {
owner = "vmatare";
repo = "thinkfan";
rev = version;
sha256 = "1fxd1w3z65glw6y04myn7ihgswkx6sqnkky159mik4n96pfrsvr5";
sha256 = "18vgm5w5pjnpipa34j4x87q10695w2jnqwvc2f027afy7mnzw7kz";
};
cmakeFlags = [
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
install -Dm755 {.,$out/bin}/thinkfan
cd "$NIX_BUILD_TOP"; cd "$sourceRoot" # attempt to be a bit robust
install -Dm644 {.,$out/share/doc/thinkfan}/README
install -Dm644 {.,$out/share/doc/thinkfan}/README.md
cp -R examples $out/share/doc/thinkfan
install -Dm644 {src,$out/share/man/man1}/thinkfan.1

7
pkgs/top-level/all-packages.nix
View File

@ -1182,6 +1182,8 @@ in
fxlinuxprintutil = callPackage ../tools/misc/fxlinuxprintutil { };
genann = callPackage ../development/libraries/genann { };
genpass = callPackage ../tools/security/genpass {
inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
};
@ -18106,7 +18108,8 @@ in
iotop = callPackage ../os-specific/linux/iotop { };
iproute = callPackage ../os-specific/linux/iproute { };
iproute2 = callPackage ../os-specific/linux/iproute { };
iproute = iproute2; # Alias added 2020-11-15 (TODO: deprecate and move to pkgs/top-level/aliases.nix)
iproute_mptcp = callPackage ../os-specific/linux/iproute/mptcp.nix { };
@ -22569,6 +22572,8 @@ in
meli = callPackage ../applications/networking/mailreaders/meli { };
melmatcheq.lv2 = callPackage ../applications/audio/melmatcheq.lv2 { };
melonDS = callPackage ../misc/emulators/melonDS { };
meme = callPackage ../applications/graphics/meme { };

4
pkgs/top-level/python-packages.nix
View File

@ -6696,6 +6696,8 @@ in {
sfepy = callPackage ../development/python-modules/sfepy { };
sgmllib3k = callPackage ../development/python-modules/sgmllib3k { };
shamir-mnemonic = callPackage ../development/python-modules/shamir-mnemonic { };
shap = callPackage ../development/python-modules/shap { };
@ -7566,6 +7568,8 @@ in {
unpaddedbase64 = callPackage ../development/python-modules/unpaddedbase64 { };
unrardll = callPackage ../development/python-modules/unrardll { };
unrpa = callPackage ../development/python-modules/unrpa { };
untangle = callPackage ../development/python-modules/untangle { };