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

Merge master into staging-next

This commit is contained in:
Frederik Rietdijk 2019-11-03 14:01:03 +01:00
parent 0caf36def0 51dc44f91a
commit 6ae60c48b0
36 changed files with 522 additions and 546 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/services/x11/hardware/libinput.nix
View File

@ -122,7 +122,7 @@ in {
description =
''
Specify the scrolling method: <literal>twofinger</literal>, <literal>edge</literal>,
or <literal>none</literal>
<literal>button</literal>, or <literal>none</literal>
'';
};

4
pkgs/applications/audio/samplv1/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "samplv1";
version = "0.9.10";
version = "0.9.11";
src = fetchurl {
url = "mirror://sourceforge/samplv1/${pname}-${version}.tar.gz";
sha256 = "04p5jkighmc8rf7fzzy8ch6knqbxv03vhjzdfh9dva2mlzw9rvjj";
sha256 = "17zs8kvvwqv00bm4lxpn09a5hxjlbz7k5mkl3k7jspw7rqn3djf2";
};
buildInputs = [ libjack2 alsaLib liblo libsndfile lv2 qt5.qtbase qt5.qttools];

4
pkgs/applications/editors/quilter/default.nix
View File

@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "quilter";
version = "2.0.0";
version = "2.0.2";
src = fetchFromGitHub {
owner = "lainsce";
repo = pname;
rev = version;
sha256 = "1jmgnmpalnl3261wifk0mqa9viag6yvlrycgzqalmnrm1b20pyg4";
sha256 = "0qd8qssqzds06l08f4yf39i3bjl1ljyr85wgc3yn6mn698ynx30g";
};
nativeBuildInputs = [

4
pkgs/applications/misc/pytrainer/default.nix
View File

@ -26,13 +26,13 @@ in
python3.pkgs.buildPythonApplication rec {
pname = "pytrainer";
version = "2.0.0";
version = "2.0.1";
src = fetchFromGitHub {
owner = "pytrainer";
repo = "pytrainer";
rev = "v${version}";
sha256 = "1w5z1xwb2g6j2izm89b7lv9n92r1zhsr8bglxcn7jc5gwbvwysvd";
sha256 = "0m2sy3f5pyc4wv1ns31r7vlafqkzp0a2jasaskwrkl6273agbbk9";
};
patches = [

27
pkgs/applications/misc/veracrypt/default.nix
View File

@ -1,21 +1,36 @@
{ stdenv, fetchurl, pkgconfig, makeself, yasm, fuse, unzip, wxGTK, lvm2 }:
{ stdenv, fetchurl, fetchpatch, pkgconfig, makeself, yasm, fuse, wxGTK, lvm2 }:
with stdenv.lib;
stdenv.mkDerivation rec {
pname = "veracrypt";
version = "1.23";
minorVersion = "-Hotfix-2";
version = "1.24-Hotfix1";
src = fetchurl {
url = "https://launchpad.net/${pname}/trunk/${version}/+download/VeraCrypt_${version}${minorVersion}_Source.zip";
sha256 = "229de81b2478cfa5fa73e74e60798a298cd616e9852b9f47b484c80bc2a2c259";
url = "https://launchpad.net/${pname}/trunk/${toLower version}/+download/VeraCrypt_${version}_Source.tar.bz2";
sha256 = "8b40ece805b216843d7a71b1a30069c4057931341b030bf65caace59263c5c8c";
};
patches = [
# https://github.com/veracrypt/VeraCrypt/issues/529 - fix build on non-x86
(fetchpatch {
url = "https://github.com/veracrypt/VeraCrypt/commit/afe6b2f45b15393026a1159e5f3d165ac7d0b94a.patch";
sha256 = "1xm9cl6zinlr0vah5xr9bvh0y9gw4331zl7d2n5xvqrcdxw3ww1y";
stripLen = 1;
})
# https://github.com/veracrypt/VeraCrypt/issues/529 - fix build on non-x86
(fetchpatch {
url = "https://github.com/veracrypt/VeraCrypt/commit/3fa636d477119fff6e372074568edb42d038f508.patch";
sha256 = "0qsccilip0ksnlzxina38a052gb533r4s422lxhrj3wv9zgpp7l3";
stripLen = 1;
})
];
sourceRoot = "src";
nativeBuildInputs = [ makeself pkgconfig yasm ];
buildInputs = [ fuse lvm2 unzip wxGTK ];
buildInputs = [ fuse lvm2 wxGTK ];
enableParallelBuilding = true;

776
pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
View File

File diff suppressed because it is too large Load Diff

4
pkgs/applications/networking/browsers/palemoon/default.nix
View File

@ -13,13 +13,13 @@ let
in stdenv.mkDerivation rec {
pname = "palemoon";
version = "28.7.0";
version = "28.7.2";
src = fetchFromGitHub {
owner = "MoonchildProductions";
repo = "UXP";
rev = "PM${version}_Release";
sha256 = "0i6fy1mvjy6vpqnvhh516mxbv4d2z73yghk3frln4ql8zavba7qq";
sha256 = "08w90269mwcqsdhx4vvp18c5iccvzqhaaw6aw7w0nppf2f2k8lri";
};
desktopItem = makeDesktopItem {

4
pkgs/applications/networking/feedreaders/rss2email/default.nix
View File

@ -4,13 +4,13 @@ with pythonPackages;
buildPythonApplication rec {
pname = "rss2email";
version = "3.10";
version = "3.11";
propagatedBuildInputs = [ feedparser beautifulsoup4 html2text ];
src = fetchurl {
url = "mirror://pypi/r/rss2email/${pname}-${version}.tar.gz";
sha256 = "1yjgbgpq9jjmpywwk6n4lzb2k7mqgdgfgm4jckv4zy0fn595pih1";
sha256 = "1vk5slp2mhmc1qj30igqkyq3z5h2bl1ayhafqrjapa6cg6rbvhrn";
};
outputs = [ "out" "man" "doc" ];

4
pkgs/applications/science/biology/star/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "star";
version = "2.7.2b";
version = "2.7.3a";
src = fetchFromGitHub {
repo = "STAR";
owner = "alexdobin";
rev = version;
sha256 = "1fb63n3jm1l8k60wdjbq9asv4l1kf7algxxs1aqzvvidx3a8fvzq";
sha256 = "1hgiqw5qhs0pc1xazzihcfd92na02xyq2kb469z04y1v51kpvvjq";
};
sourceRoot = "source/source";

4
pkgs/applications/version-management/git-and-tools/stgit/default.nix
View File

@ -2,7 +2,7 @@
let
name = "stgit-${version}";
version = "0.20";
version = "0.21";
in
stdenv.mkDerivation {
inherit name;
@ -11,7 +11,7 @@ stdenv.mkDerivation {
owner = "ctmarinas";
repo = "stgit";
rev = "v${version}";
sha256 = "0zfrs9f6a84z5gr3k6y81h8jyar7h3q3z9p13cbrq9slljg5r6iw";
sha256 = "16gwdad18rc9bivyzrjccp83iccmqr45fp2zawycmrfp2ancffc7";
};
buildInputs = [ python2 git ];

6
pkgs/misc/themes/jade1/default.nix → pkgs/data/themes/jade1/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "theme-jade1";
version = "3.3";
version = "1.5";
src = fetchFromGitHub {
owner = "madmaxms";
repo = "theme-jade-1";
rev = "v${version}";
sha256 = "06w06dvzs1llmzpyz3c5yycsw3gslsgikalfcq5l92d72z4kzfw7";
sha256 = "1m3150iyk8421mkwj4x2pv29wjzqdcnvvnp3bsg11k5kszsm27a8";
};
propagatedUserEnvPkgs = [ gtk-engine-murrine ];
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
'';
meta = with stdenv.lib; {
description = "A fork of the original Linux Mint theme with dark menus, more intensive green and some other modifications";
description = "Fork of the original Linux Mint theme with dark menus, more intensive green and some other modifications";
homepage = https://github.com/madmaxms/theme-jade-1;
license = with licenses; [ gpl3 ];
platforms = platforms.linux;

4
pkgs/desktops/gnome-3/games/swell-foop/default.nix
View File

@ -3,13 +3,13 @@
let
pname = "swell-foop";
version = "3.34.0";
version = "3.34.1";
in stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "1vbclb1jcn2s9rb7whk02v6hfr6fnwx2ppa55bsa7595f3ki79v5";
sha256 = "1032psxm59nissi268bh3j964m4a0n0ah4dy1pf0ph27j3zvdik1";
};
passthru = {

4
pkgs/development/interpreters/python/default.nix
View File

@ -65,10 +65,10 @@ in {
sourceVersion = {
major = "3";
minor = "5";
patch = "8";
patch = "9";
suffix = "";
};
sha256 = "0hgzn8l4ps93f3h4b47vczsbhy2kihvzdisjjx6mrn85rndk3c8v";
sha256 = "0jdh9pvx6m6lfz2liwvvhn7vks7qrysqgwn517fkpxb77b33fjn2";
inherit (darwin) CF configd;
inherit passthruFun;
};

4
pkgs/development/libraries/alembic/default.nix
View File

@ -3,13 +3,13 @@
stdenv.mkDerivation rec
{
pname = "alembic";
version = "1.7.11";
version = "1.7.12";
src = fetchFromGitHub {
owner = "alembic";
repo = "alembic";
rev = version;
sha256 = "1lalbqn4cwf0vp4hiq72gwpd7kq501j21rnjb380mv26pk7r2ivz";
sha256 = "0a9icrv6pwh2b73lywq1aj7i19pmzpg59iy3ngal8vq4zdciylqc";
};
outputs = [ "bin" "dev" "out" "lib" ];

4
pkgs/development/libraries/serialdv/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "serialdv";
version ="1.1.2";
version ="1.1.4";
src = fetchFromGitHub {
owner = "f4exb";
repo = "serialdv";
rev = "v${version}";
sha256 = "0d2lnvfzf31i3f2klm46s87gby3yz3hc46cap0yqifzml0ff1qbm";
sha256 = "0d88h2wjhf79nisiv96bq522hkbknzm88wsv0q9k33mzmrwnrx93";
};
nativeBuildInputs = [ cmake ];

4
pkgs/development/libraries/simpleitk/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "simpleitk";
version = "1.2.2";
version = "1.2.3";
src = fetchFromGitHub {
owner = "SimpleITK";
repo = "SimpleITK";
rev = "v${version}";
sha256 = "1cgq9cxxplv6bkm2zfvcc0lgyh5zw1hbry30k1429n9737wnadaw";
sha256 = "0nmsq0qx4jmrrhrc6bfm11wwvyszvfgl45xizw69yra3cv9pgmm6";
};
nativeBuildInputs = [ cmake git swig ];

4
pkgs/development/libraries/template-glib/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, meson, ninja, pkgconfig, glib, gobject-introspection, flex, bison, vala, gettext, gnome3, gtk-doc, docbook_xsl, docbook_xml_dtd_43 }:
let
version = "3.32.0";
version = "3.34.0";
pname = "template-glib";
in
stdenv.mkDerivation {
@ -10,7 +10,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1g0zx0sxpw8kqp7p3sgl9kngaqrg9xl6cir24nrahks0vgsk98rr";
sha256 = "1z9xkin5fyfh071ma9y045jcw83hgx33dfbjraw6cxk0qdmfysr1";
};
buildInputs = [ meson ninja pkgconfig gettext flex bison vala glib gtk-doc docbook_xsl docbook_xml_dtd_43 ];

2
pkgs/development/libraries/v8/3.14.nix
View File

@ -80,7 +80,7 @@ stdenv.mkDerivation {
meta = with stdenv.lib; {
description = "Google's open source JavaScript engine";
platforms = platforms.linux;
platforms = [ "x86_64-linux" "i686-linux" ];
license = licenses.bsd3;
};
}

81
pkgs/development/libraries/v8/3.16.14.nix
View File

@ -1,81 +0,0 @@
{ stdenv, lib, fetchurl, gyp, readline, python, which, icu, utillinux, cctools }:
assert readline != null;
let
arch = if stdenv.isAarch32
then (if stdenv.is64bit then "arm64" else "arm")
else (if stdenv.is64bit then "x64" else "ia32");
armHardFloat = stdenv.isAarch32 && (stdenv.hostPlatform.platform.gcc.float or null) == "hard";
in
stdenv.mkDerivation rec {
pname = "v8";
version = "3.16.14.11";
src = fetchurl {
url = "https://commondatastorage.googleapis.com/chromium-browser-official/"
+ "${pname}-${version}.tar.bz2";
sha256 = "1gpf2xvhxfs5ll3m2jlslsx9jfjbmrbz55iq362plflrvf8mbxhj";
};
postPatch = ''
sed -i 's/-Werror//' build/standalone.gypi build/common.gypi
'';
configurePhase = stdenv.lib.optionalString stdenv.isDarwin ''
export GYP_DEFINES="mac_deployment_target=$MACOSX_DEPLOYMENT_TARGET"
'' + ''
PYTHONPATH="tools/generate_shim_headers:$PYTHONPATH" \
${gyp}/bin/gyp \
-f make \
--generator-output="out" \
-Dflock_index=0 \
-Dv8_enable_i18n_support=1 \
-Duse_system_icu=1 \
-Dconsole=readline \
-Dcomponent=shared_library \
-Dv8_target_arch=${arch} \
${lib.optionalString armHardFloat "-Dv8_use_arm_eabi_hardfloat=true"} \
--depth=. -Ibuild/standalone.gypi \
build/all.gyp
'' + stdenv.lib.optionalString stdenv.isDarwin ''
sed -i 's@/usr/bin/env python@${python}/bin/python@g' out/gyp-mac-tool
'';
nativeBuildInputs = [ which ];
buildInputs = [ readline python icu ]
++ lib.optional stdenv.isLinux utillinux
++ lib.optional stdenv.isDarwin cctools;
NIX_CFLAGS_COMPILE = "-Wno-error -w";
buildFlags = [
"-C out"
"builddir=$(CURDIR)/Release"
"BUILDTYPE=Release"
];
enableParallelBuilding = true;
installPhase = ''
install -vD out/Release/d8 "$out/bin/d8"
${if stdenv.isDarwin then ''
install -vD out/Release/libv8.dylib "$out/lib/libv8.dylib"
'' else ''
install -vD out/Release/lib.target/libv8.so "$out/lib/libv8.so"
''}
cp -vr include "$out/"
'';
postFixup = if stdenv.isDarwin then ''
install_name_tool -change /usr/local/lib/libv8.dylib $out/lib/libv8.dylib $out/bin/d8
install_name_tool -id $out/lib/libv8.dylib $out/lib/libv8.dylib
'' else null;
meta = with stdenv.lib; {
description = "V8 is Google's open source JavaScript engine";
platforms = platforms.linux ++ platforms.darwin;
license = licenses.bsd3;
};
}

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

@ -3,13 +3,13 @@
buildPythonPackage rec {
pname = "twilio";
version = "6.29.3";
version = "6.32.0";
# tests not included in PyPi, so fetch from github instead
src = fetchFromGitHub {
owner = "twilio";
repo = "twilio-python";
rev = version;
sha256 = "0xc0lw6js8icshjh65rvgbnxrscqsd7ls3h0ni4xqg0kin9wyz42";
sha256 = "0by2qjzxv13k4lvy4mas0hf468xf98qbc2arc8fcy6aj7h8jaam8";
};
buildInputs = [ nose mock ];

4
pkgs/development/python-modules/wxPython/4.0.nix
View File

@ -28,11 +28,11 @@
buildPythonPackage rec {
pname = "wxPython";
version = "4.0.6";
version = "4.0.7";
src = fetchPypi {
inherit pname version;
sha256 = "35cc8ae9dd5246e2c9861bb796026bbcb9fb083e4d49650f776622171ecdab37";
sha256 = "0cq2iyqm08ihazh5xzdsha5h22mba0w4a0y7iikn6c6yvszhiriv";
};
doCheck = false;

12
pkgs/development/ruby-modules/gem-config/default.nix
View File

@ -18,7 +18,7 @@
# (to make gems behave if necessary).
{ lib, fetchurl, writeScript, ruby, kerberos, libxml2, libxslt, python, stdenv, which
, libiconv, postgresql, v8_3_16_14, clang, sqlite, zlib, imagemagick
, libiconv, postgresql, v8, clang, sqlite, zlib, imagemagick
, pkgconfig , ncurses, xapian, gpgme, utillinux, tzdata, icu, libffi
, cmake, libssh2, openssl, libmysqlclient, darwin, git, perl, pcre, gecode_3, curl
, msgpack, qt59, libsodium, snappy, libossp_uuid, lxc, libpcap, xorg, gtk2, buildRubyGem
@ -29,8 +29,6 @@
}@args:
let
v8 = v8_3_16_14;
rainbow_rake = buildRubyGem {
pname = "rake";
gemName = "rake";
@ -567,14 +565,6 @@ in
buildInputs = [ freetds ];
};
therubyracer = attrs: {
buildFlags = [
"--with-v8-dir=${v8}"
"--with-v8-include=${v8}/include"
"--with-v8-lib=${v8}/lib"
];
};
typhoeus = attrs: {
buildInputs = [ curl ];
};

1
pkgs/development/ruby-modules/with-packages/Gemfile
View File

@ -144,7 +144,6 @@ source 'https://rubygems.org' do
gem 'snappy'
gem 'sqlite3'
gem 'taglib-ruby'
gem 'therubyracer'
gem 'thrift'
gem 'tilt'
gem 'tiny_tds'

4
pkgs/development/tools/analysis/checkstyle/default.nix
View File

@ -1,12 +1,12 @@
{ stdenv, fetchurl, makeWrapper, jre }:
stdenv.mkDerivation rec {
version = "8.25";
version = "8.26";
pname = "checkstyle";
src = fetchurl {
url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${version}/checkstyle-${version}-all.jar";
sha256 = "04asn3cqh0f78c4b0968ic2fxgijf47paw3zgh9dh96x1165yhkf";
sha256 = "0q0jb0ip78vai2qcig51lgp9pbb4bsg9wlwjxq0gm61icbxw6vy3";
};
nativeBuildInputs = [ makeWrapper ];

32
pkgs/development/tools/cmake-format/default.nix Normal file
View File

@ -0,0 +1,32 @@
{ lib
, buildPythonApplication
, fetchPypi
, autopep8
, flake8
, jinja2
, pylint
, pyyaml
}:
buildPythonApplication rec {
pname = "cmake-format";
version = "0.6.0";
src = fetchPypi {
inherit version;
pname = "cmake_format";
sha256 = "0sip832bxsvnm7fhqhx49d53g2s7swdk3fhyhlglm2shgj89b5zw";
};
propagatedBuildInputs = [ autopep8 flake8 jinja2 pylint pyyaml ];
doCheck = false;
meta = with lib; {
description = "Source code formatter for cmake listfiles";
homepage = "https://github.com/cheshirekow/cmake_format";
license = licenses.gpl3;
maintainers = [ maintainers.tobim ];
platforms = platforms.all;
};
}

6
pkgs/development/tools/just/default.nix
View File

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "just";
version = "0.4.4";
version = "0.4.5";
src = fetchFromGitHub {
owner = "casey";
repo = pname;
rev = "v${version}";
sha256 = "06k1pl2qmmr9q0ffw6l0dzqqfgpckmrdzjpzn9cw23shhihv99a8";
sha256 = "0a4bml9nxvyh110a60l4lc11yr2ds5r8d3iplslccrkq1ka96av9";
};
cargoSha256 = "1blsdl9dsq24vhm8cg1ja9m4b3h343lndibq6wz2kcwdq4i8jhd0";
cargoSha256 = "0dbgjc21q0zaadsjvq3s6y6f4dmsybxb6g2sg8w2d3phkm9j921z";
checkInputs = [ coreutils bash dash ];

4
pkgs/development/tools/profiling/sysprof/default.nix
View File

@ -19,13 +19,13 @@
stdenv.mkDerivation rec {
pname = "sysprof";
version = "3.34.0";
version = "3.34.1";
outputs = [ "out" "lib" "dev" ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0b7rpwvs5wckiy418vs0d4i62wafpcx1zlspw39ag50d1sjcbv58";
sha256 = "1l4kr1av7933vb4zql9c5lgzivlw64hyky4nr8xin1v5if6vnjw4";
};
nativeBuildInputs = [

9
pkgs/os-specific/bsd/netbsd/default.nix
View File

@ -127,6 +127,11 @@ let
nativeBuildInputs = [ makeMinimal ];
buildInputs = [ zlib ];
# the build system re-runs `./configure` with `HOST_CC` (which is their
# name for Build CC) as a compiler to make `defs.mk`, which is installed
depsBuildBuild = [ buildPackages.stdenv.cc ] ++ buildInputs;
HOST_CC = "${buildPackages.stdenv.cc.targetPrefix}cc";
# temporarily use gnuinstall for bootstrapping
# bsdinstall will be built later
makeFlags = [
@ -218,9 +223,9 @@ let
];
skipIncludesPhase = true;
buildPhase = ''
cc -c -Iinclude -Ilib/libc/include lib/libc/gen/fts.c \
"$CC" -c -Iinclude -Ilib/libc/include lib/libc/gen/fts.c \
-o lib/libc/gen/fts.o
ar -rsc libfts.a lib/libc/gen/fts.o
"$AR" -rsc libfts.a lib/libc/gen/fts.o
'';
installPhase = ''
runHook preInstall

4
pkgs/servers/shairport-sync/default.nix
View File

@ -2,11 +2,11 @@
, libdaemon, popt, pkgconfig, libconfig, libpulseaudio, soxr }:
stdenv.mkDerivation rec {
version = "3.3.2";
version = "3.3.4";
pname = "shairport-sync";
src = fetchFromGitHub {
sha256 = "14f09sj2rxmixd5yjmwp82j49rxn1fvcxkvh7qjif893xgk98a3w";
sha256 = "07rxf1la93g5y7yq49fglhxji8vizzr268p1ccf8ws8j025vbl7n";
rev = version;
repo = "shairport-sync";
owner = "mikebrady";

4
pkgs/tools/archivers/unrar/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "unrar";
version = "5.8.2";
version = "5.8.3";
src = fetchurl {
url = "https://www.rarlab.com/rar/unrarsrc-${version}.tar.gz";
sha256 = "1nixncpx4psfc5xx1dh332gfcmxld5m4mpwjcasm7c9zzlincf1k";
sha256 = "19lizlsbblkcdyc81jycp5k8kf5d8h2hlgfy16zb1g2vixf6i49m";
};
postPatch = ''

4
pkgs/tools/backup/s3ql/default.nix
View File

@ -2,13 +2,13 @@
python3Packages.buildPythonApplication rec {
pname = "s3ql";
version = "3.3";
version = "3.3.2";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "release-${version}";
sha256 = "1rb1y1hl6qgwpkfc85ivkk0l0f5dh8skpfaipnvndn73mlya96mk";
sha256 = "1x0xj8clfs8fdczn8skc2wag5i4z47bsvlczn22iaf20hll1bb2w";
};
checkInputs = [ which ] ++ (with python3Packages; [ cython pytest ]);

4
pkgs/tools/misc/parallel/default.nix
View File

@ -1,11 +1,11 @@
{ fetchurl, stdenv, perl, makeWrapper, procps }:
stdenv.mkDerivation rec {
name = "parallel-20190922";
name = "parallel-20191022";
src = fetchurl {
url = "mirror://gnu/parallel/${name}.tar.bz2";
sha256 = "0qrw34rpp8g5knb2nhs8z1hz9i42nxjn6i12m4rblm0anhnfwbr8";
sha256 = "1a89x5ix9kls1abj8zkgxdf3g3s5phzb83xcd4cwpz4szfjfw6v4";
};
nativeBuildInputs = [ makeWrapper ];

4
pkgs/tools/system/ps_mem/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, pythonPackages, fetchFromGitHub }:
let
version = "3.12";
version = "3.13";
pname = "ps_mem";
in pythonPackages.buildPythonApplication {
name = "${pname}-${version}";
@ -10,7 +10,7 @@ in pythonPackages.buildPythonApplication {
owner = "pixelb";
repo = pname;
rev = "v${version}";
sha256 = "0kcxlmfisbwf24p2k72njfyfp22fjr9p9zalg9b4w0yhnlzk24ph";
sha256 = "0pgi9hvwfbkzvwicqlkwx4rwal1ikza018yxbwpnf7c80zw0zaw9";
};
meta = with stdenv.lib; {

3
pkgs/top-level/aliases.nix
View File

@ -392,8 +392,9 @@ mapAliases ({
ultrastardx-beta = ultrastardx; # added 2017-08-12
usb_modeswitch = usb-modeswitch; # added 2016-05-10
usbguard-nox = usbguard; # added 2019-09-04
valadoc = throw "deprecated 2019-10-10: valadoc was merged into vala 0.38";
v4l_utils = v4l-utils; # added 2019-08-07
v8_3_16_14 = throw "removed 2019-11-01: no longer referenced by other packages";
valadoc = throw "deprecated 2019-10-10: valadoc was merged into vala 0.38";
vimbWrapper = vimb; # added 2015-01
vimprobable2Wrapper = vimprobable2; # added 2015-01
virtviewer = virt-viewer; # added 2015-12-24

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

@ -9540,6 +9540,8 @@ in
cmakeWithGui = cmakeCurses.override { withQt5 = true; };
cmakeWithQt4Gui = cmakeCurses.override { useQt4 = true; };
cmake-format = python3Packages.callPackage ../development/tools/cmake-format { };
# Does not actually depend on Qt 5
inherit (kdeFrameworks) extra-cmake-modules kapidox kdoctools;
@ -14170,12 +14172,6 @@ in
stdenv = gcc5Stdenv;
};
v8_3_16_14 = callPackage ../development/libraries/v8/3.16.14.nix {
inherit (python2Packages) python gyp;
cctools = darwin.cctools;
stdenv = if stdenv.isDarwin then stdenv else gcc5Stdenv;
};
v8_5_x = callPackage ../development/libraries/v8/5_x.nix ({
inherit (python2Packages) python gyp;
icu = icu58; # v8-5.4.232 fails against icu4c-59.1
@ -17471,6 +17467,8 @@ in
gtk = res.gtk2;
};
theme-jade1 = callPackage ../data/themes/jade1 { };
theme-obsidian2 = callPackage ../data/themes/obsidian2 { };
themes = name: callPackage (../data/misc/themes + ("/" + name + ".nix")) {};
@ -23155,8 +23153,6 @@ in
onestepback = callPackage ../misc/themes/onestepback { };
theme-jade1 = callPackage ../misc/themes/jade1 { };
theme-vertex = callPackage ../misc/themes/vertex { };
rox-filer = callPackage ../desktops/rox/rox-filer {

11
pkgs/top-level/ruby-packages.nix
View File

@ -2466,17 +2466,6 @@
};
version = "1.8.0";
};
therubyracer = {
dependencies = ["libv8" "ref"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1g95bzs2axjglyjyj6xvsywqgr80bnzlkw7mddxx1fdrak5wni2q";
type = "gem";
};
version = "0.12.3";
};
thor = {
groups = ["default"];
platforms = [];