3
0
Fork 0
forked from mirrors/nixpkgs

Merge master into staging-next

This commit is contained in:
Frederik Rietdijk 2019-01-03 20:07:35 +01:00
commit 2da31b80bb
82 changed files with 403 additions and 294 deletions

View file

@ -408,16 +408,6 @@
from nixpkgs due to the lack of maintainers.
</para>
</listitem>
<listitem>
<para>
The <option>powerManagement.cpuFreqGovernor</option> option has been
aliased to <option>powerManagement.cpufreq.governor</option>. On laptops,
<option>powerManagement.cpuFreqGovernor</option> is sometimes set in
<literal>/etc/nixos/hardware-configuration.nix</literal>, so you can
rename it to the new name, or run
<literal>nixos-generate-config</literal> again.
</para>
</listitem>
</itemizedlist>
</section>
</section>

View file

@ -104,7 +104,7 @@ if (-e "/sys/devices/system/cpu/cpu0/cpufreq/scaling_available_governors") {
foreach $e (@desired_governors) {
if (index($governors, $e) != -1) {
last if (push @attrs, "powerManagement.cpufreq.governor = lib.mkDefault \"$e\";");
last if (push @attrs, "powerManagement.cpuFreqGovernor = lib.mkDefault \"$e\";");
}
}
}

View file

@ -286,9 +286,6 @@ with lib;
(mkRenamedOptionModule [ "hardware" "ckb" "enable" ] [ "hardware" "ckb-next" "enable" ])
(mkRenamedOptionModule [ "hardware" "ckb" "package" ] [ "hardware" "ckb-next" "package" ])
# cpufeq
(mkAliasOptionModule [ "powerManagement" "cpuFreqGovernor" ] [ "powerManagement" "cpufreq" "governor" ])
] ++ (flip map [ "blackboxExporter" "collectdExporter" "fritzboxExporter"
"jsonExporter" "minioExporter" "nginxExporter" "nodeExporter"
"snmpExporter" "unifiExporter" "varnishExporter" ]

View file

@ -55,7 +55,7 @@ in
config = mkIf cfg.enable {
powerManagement.scsiLinkPolicy = null;
powerManagement.cpufreq.governor = null;
powerManagement.cpuFreqGovernor = null;
powerManagement.cpufreq.max = null;
powerManagement.cpufreq.min = null;

View file

@ -191,7 +191,9 @@ let
'') names}
${concatMapStrings (pkg: ''
${xorg.lndir}/bin/lndir ${pkg}/share/xsessions $out/share/xsessions
if test -d ${pkg}/share/xsessions; then
${xorg.lndir}/bin/lndir ${pkg}/share/xsessions $out/share/xsessions
fi
'') cfg.displayManager.extraSessionFilePackages}

View file

@ -4,44 +4,49 @@ with lib;
let
cpupower = config.boot.kernelPackages.cpupower;
cfg = config.powerManagement.cpufreq;
cfg = config.powerManagement;
in
{
###### interface
options.powerManagement.cpufreq = {
options.powerManagement = {
governor = mkOption {
# TODO: This should be aliased to powerManagement.cpufreq.governor.
# https://github.com/NixOS/nixpkgs/pull/53041#commitcomment-31825338
cpuFreqGovernor = mkOption {
type = types.nullOr types.str;
default = null;
example = "ondemand";
description = ''
Configure the governor used to regulate the frequence of the
available CPUs. By default, the kernel configures the
performance governor, although this may be overwriten in your
performance governor, although this may be overwritten in your
hardware-configuration.nix file.
Often used values: "ondemand", "powersave", "performance"
'';
};
max = mkOption {
type = types.nullOr types.ints.unsigned;
default = null;
example = 2200000;
description = ''
The maximum frequency the CPU will use. Defaults to the maximum possible.
'';
};
cpufreq = {
min = mkOption {
type = types.nullOr types.ints.unsigned;
default = null;
example = 800000;
description = ''
The minimum frequency the CPU will use.
'';
max = mkOption {
type = types.nullOr types.ints.unsigned;
default = null;
example = 2200000;
description = ''
The maximum frequency the CPU will use. Defaults to the maximum possible.
'';
};
min = mkOption {
type = types.nullOr types.ints.unsigned;
default = null;
example = 800000;
description = ''
The minimum frequency the CPU will use.
'';
};
};
};
@ -51,16 +56,16 @@ in
config =
let
governorEnable = cfg.governor != null;
maxEnable = cfg.max != null;
minEnable = cfg.min != null;
governorEnable = cfg.cpuFreqGovernor != null;
maxEnable = cfg.cpufreq.max != null;
minEnable = cfg.cpufreq.min != null;
enable =
!config.boot.isContainer &&
(governorEnable || maxEnable || minEnable);
in
mkIf enable {
boot.kernelModules = optional governorEnable "cpufreq_${cfg.governor}";
boot.kernelModules = optional governorEnable "cpufreq_${cfg.cpuFreqGovernor}";
environment.systemPackages = [ cpupower ];
@ -74,9 +79,9 @@ in
Type = "oneshot";
RemainAfterExit = "yes";
ExecStart = "${cpupower}/bin/cpupower frequency-set " +
optionalString governorEnable "--governor ${cfg.governor} " +
optionalString maxEnable "--max ${toString cfg.max} " +
optionalString minEnable "--min ${toString cfg.min} ";
optionalString governorEnable "--governor ${cfg.cpuFreqGovernor} " +
optionalString maxEnable "--max ${toString cfg.cpufreq.max} " +
optionalString minEnable "--min ${toString cfg.cpufreq.min} ";
SuccessExitStatus = "0 237";
};
};

View file

@ -24,6 +24,7 @@
, libsndfile
, libebur128
, boost
, dbus
, fftwFloat
, calf
, zita-convolver
@ -43,14 +44,14 @@ let
zam-plugins # maximizer
];
in stdenv.mkDerivation rec {
name = "pulseeffects-${version}";
version = "4.4.1";
pname = "pulseeffects";
version = "4.4.4";
src = fetchFromGitHub {
owner = "wwmm";
repo = "pulseeffects";
rev = "v${version}";
sha256 = "0hb575h9hdknhwvhn5lak89ddavn4v5c0nipnv8dsfnmjhfli5qm";
sha256 = "02h237c3l55ky7gl0mmd6qqp5zagbrqa39rii33s5pspvxi9rj3s";
};
nativeBuildInputs = [
@ -80,6 +81,7 @@ in stdenv.mkDerivation rec {
libsamplerate
libsndfile
boost
dbus
fftwFloat
zita-convolver
hicolor-icon-theme
@ -91,8 +93,6 @@ in stdenv.mkDerivation rec {
'';
preFixup = ''
addToSearchPath GST_PLUGIN_SYSTEM_PATH_1_0 $out/lib/gstreamer-1.0
gappsWrapperArgs+=(
--set LV2_PATH "${stdenv.lib.makeSearchPath "lib/lv2" lv2Plugins}"
--set LADSPA_PATH "${stdenv.lib.makeSearchPath "lib/ladspa" ladspaPlugins}"

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, python3, wrapGAppsHook, gettext, intltool, libsoup, gnome3, gtk3, gdk_pixbuf,
{ stdenv, fetchurl, python3, wrapGAppsHook, gettext, libsoup, gnome3, gtk3, gdk_pixbuf,
tag ? "", xvfb_run, dbus, glibcLocales, glib, glib-networking, gobject-introspection,
gst_all_1, withGstPlugins ? true,
xineBackend ? false, xineLib,
@ -9,18 +9,14 @@
let optionals = stdenv.lib.optionals; in
python3.pkgs.buildPythonApplication rec {
pname = "quodlibet${tag}";
version = "4.2.0";
# XXX, tests fail
# https://github.com/quodlibet/quodlibet/issues/2820
doCheck = false;
version = "4.2.1";
src = fetchurl {
url = "https://github.com/quodlibet/quodlibet/releases/download/release-${version}/quodlibet-${version}.tar.gz";
sha256 = "0w64i999ipzgjb4c4lzw7jp792amd6km46wahx7m3bpzly55r3f6";
sha256 = "0b1rvr4hqs2bjmhayms7vxxkn3d92k9v7p1269rjhf11hpk122l7";
};
nativeBuildInputs = [ wrapGAppsHook gettext intltool ];
nativeBuildInputs = [ wrapGAppsHook gettext ];
checkInputs = with python3.pkgs; [ pytest pytest_xdist pyflakes pycodestyle polib xvfb_run dbus.daemon glibcLocales ];
@ -39,13 +35,11 @@ python3.pkgs.buildPythonApplication rec {
checkPhase = ''
runHook preCheck
checkHomeDir=$(mktemp -d)
mkdir -p $checkHomeDir/.cache/thumbnails/normal # Required by TThumb.test_recreate_broken_cache_file
env XDG_DATA_DIRS="$out/share:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS" \
HOME=$checkHomeDir \
HOME=$(mktemp -d) \
xvfb-run -s '-screen 0 800x600x24' dbus-run-session \
--config-file=${dbus.daemon}/share/dbus-1/session.conf \
py.test
py.test${stdenv.lib.optionalString (xineBackend || !withGstPlugins) " --ignore=tests/plugin/test_replaygain.py"}
runHook postCheck
'';

View file

@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
name = "okteta-${version}";
version = "0.25.4";
version = "0.25.5";
src = fetchurl {
url = "mirror://kde/stable/okteta/${version}/src/${name}.tar.xz";
sha256 = "0liar1xbns6mr6j320nyxqfii82i4ysp62hf3j6jg1112v874amf";
sha256 = "1680hx4n36msz86gyjsdr5v7nf8rpybvzrvfw8y98l95hfq3l6g9";
};
nativeBuildInputs = [ qtscript extra-cmake-modules kdoctools ];

View file

@ -4,7 +4,7 @@
stdenv.mkDerivation rec {
name = "OpenOrienteering-Mapper-${version}";
version = "0.8.3";
version = "0.8.4";
buildInputs = [ gdal qtbase qttools qtlocation qtimageformats
qtsensors clipper zlib proj doxygen cups];
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
owner = "OpenOrienteering";
repo = "mapper";
rev = "v${version}";
sha256 = "0pnqwvmg97mgc2ci3abmx07l0njxcrbljh75w8ym31g0jq76pgr9";
sha256 = "0rw34kp2vd1la97vnk9plwvis6lvyib2bvs7lgkhpnm4p5l7dp1g";
};
cmakeFlags =

View file

@ -1,35 +1,36 @@
{ stdenv, fetchurl, perl, libX11, libjpeg, libpng, libtiff, pkgconfig,
librsvg, glib, gtk2, libXext, libXxf86vm, poppler, xineLib }:
{ stdenv, fetchurl, perl, libX11, libXinerama, libjpeg, libpng, libtiff, pkgconfig,
librsvg, glib, gtk2, libXext, libXxf86vm, poppler, xineLib, ghostscript, makeWrapper }:
stdenv.mkDerivation rec {
name = "eaglemode-0.86.0";
name = "eaglemode-${version}";
version = "0.94.0";
src = fetchurl {
url = "mirror://sourceforge/eaglemode/${name}.tar.bz2";
sha256 = "1a2hzyck95g740qg4p4wd4fjwsmlknh75i9sbx5r5v9pyr4i3m4f";
sha256 = "1sr3bd9y9j2svqvdwhrak29yy9cxf92w9vq2cim7a8hzwi9qfy9k";
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ perl libX11 libjpeg libpng libtiff
librsvg glib gtk2 libXxf86vm libXext poppler xineLib ];
buildInputs = [ perl libX11 libXinerama libjpeg libpng libtiff
librsvg glib gtk2 libXxf86vm libXext poppler xineLib ghostscript makeWrapper ];
# The program tries to dlopen both Xxf86vm and Xext, so we use the
# The program tries to dlopen Xxf86vm, Xext and Xinerama, so we use the
# trick on NIX_LDFLAGS and dontPatchELF to make it find them.
# I use 'yes y' to skip a build error linking with xineLib,
# because xine stopped exporting "_x_vo_new_port"
# https://sourceforge.net/projects/eaglemode/forums/forum/808824/topic/5115261
buildPhase = ''
export NIX_LDFLAGS="$NIX_LDFLAGS -lXxf86vm -lXext"
export NIX_LDFLAGS="$NIX_LDFLAGS -lXxf86vm -lXext -lXinerama"
perl make.pl build
'';
dontPatchELF = true;
# eaglemode expects doc to be in the root directory
forceShare = [ "man" "info" ];
installPhase = ''
perl make.pl install dir=$out
# I don't like this... but it seems the way they plan to run it by now.
# Run 'eaglemode.sh', not 'eaglemode'.
ln -s $out/eaglemode.sh $out/bin/eaglemode.sh
wrapProgram $out/bin/eaglemode --set EM_DIR "$out" --prefix LD_LIBRARY_PATH : "$out/lib" --prefix PATH : "${ghostscript}/bin"
'';
meta = with stdenv.lib; {
@ -38,6 +39,5 @@ stdenv.mkDerivation rec {
license = licenses.gpl3;
maintainers = with maintainers; [ ];
platforms = platforms.linux;
broken = true;
};
}

View file

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

View file

@ -17,13 +17,13 @@ let
};
in with python.pkgs; buildPythonApplication rec {
version = "0.12.2";
version = "0.13.0";
name = "khard-${version}";
namePrefix = "";
src = fetchurl {
url = "https://github.com/scheibler/khard/archive/v${version}.tar.gz";
sha256 = "0lxcvzmafpvqcifgq2xjh1ca07z0vhihn5jnw8zrpmsqdc9p6b4j";
sha256 = "06b9xcdg1na6mxa2pnlh0wfsk02k2h6hlki089aaikbg8k8ykj8f";
};
# setup.py reads the UTF-8 encoded readme.

View file

@ -3,12 +3,12 @@
mkDerivation rec {
pname = "latte-dock";
version = "0.8.3";
version = "0.8.4";
name = "${pname}-${version}";
src = fetchurl {
url = "https://download.kde.org/stable/${pname}/${name}.tar.xz";
sha256 = "1jgg1ag8sxrkif1bqgz5pizn1xmiljas00rqcskszx10j0595mnk";
sha256 = "0zm2xckyaymd53a38mf1bh9in4bh2bshbr3z8z9gn6mp7c60jay3";
name = "${name}.tar.xz";
};

View file

@ -1,11 +1,11 @@
{ stdenv, fetchurl, autoreconfHook, pkgconfig, libzen, libmediainfo, zlib }:
stdenv.mkDerivation rec {
version = "18.08.1";
version = "18.12";
name = "mediainfo-${version}";
src = fetchurl {
url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz";
sha256 = "0rq2dczjq26g5i0ac8px7xmxjvqq4h0rzd97fy5824yb2c5ksxs9";
sha256 = "01pk57ff297lifm3g2hrbmfmchgyy5rir8103n2j3l0dkn2i0g3d";
};
nativeBuildInputs = [ autoreconfHook pkgconfig ];

View file

@ -4,13 +4,13 @@ with stdenv.lib;
stdenv.mkDerivation rec {
name = "nnn-${version}";
version = "2.1";
version = "2.2";
src = fetchFromGitHub {
owner = "jarun";
repo = "nnn";
rev = "v${version}";
sha256 = "1vkrhsdwgacln335rjywdf7nj7fg1x55szmm8xrvwda8y2qjqhc4";
sha256 = "01y2vkw1wakpnpzhzia3d44iir060i8vma3b3ww5wgwg7bfpzs4b";
};
configFile = optionalString (conf!=null) (builtins.toFile "nnn.h" conf);

View file

@ -3,7 +3,7 @@
stdenv.mkDerivation rec {
pname = "notejot";
version = "1.5.2";
version = "1.5.3";
name = "${pname}-${version}";
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
owner = "lainsce";
repo = pname;
rev = version;
sha256 = "17rqyckq7z5cxj3mbfrar1zzgwbzhrx87ps7mm6bf798hwflm9qk";
sha256 = "1n41sg9a38p9qp8pz3lx9rnb8kc069vkbwf963zzpzs2745h6s9v";
};
nativeBuildInputs = [

View file

@ -22,7 +22,7 @@
}:
let
version = "4.3.3";
version = "4.3.4";
binpath = stdenv.lib.makeBinPath
[ cabextract
@ -55,7 +55,7 @@ in stdenv.mkDerivation {
src = fetchurl {
url = "https://www.playonlinux.com/script_files/PlayOnLinux/${version}/PlayOnLinux_${version}.tar.gz";
sha256 = "117xivwa87i2w66klplmwd5q7pfxcbrj2rjm11wl8iy5h3xpqkak";
sha256 = "019dvb55zqrhlbx73p6913807ql866rm0j011ix5mkk2g79dzhqp";
};
nativeBuildInputs = [ makeWrapper ];

View file

@ -1,10 +1,10 @@
{ stdenv, fetchFromGitHub
, meson, ninja, pkgconfig, vala, gobject-introspection, gettext, wrapGAppsHook, python3, desktop-file-utils
, gtk3, glib, granite, libgee, libgda, gtksourceview, libxml2, libsecret }:
, gtk3, glib, granite, libgee, libgda, gtksourceview, libxml2, libsecret, libfixposix, libssh2 }:
let
version = "0.6.5";
version = "0.6.7";
sqlGda = libgda.override {
mysqlSupport = true;
postgresSupport = true;
@ -17,16 +17,16 @@ in stdenv.mkDerivation rec {
owner = "Alecaddd";
repo = "sequeler";
rev = "v${version}";
sha256 = "18d0dwrsn69fx1lwm6ihhk2r4996pxiy4hfv608gc1kl4s4f4sqp";
sha256 = "0sxmky27pl0aqnh857xb54rnfg1kbr2smdzyrzw67cbv00f6d30p";
};
nativeBuildInputs = [ meson ninja pkgconfig vala gobject-introspection gettext wrapGAppsHook python3 desktop-file-utils ];
buildInputs = [ gtk3 glib granite libgee sqlGda gtksourceview libxml2 libsecret ];
buildInputs = [ gtk3 glib granite libgee sqlGda gtksourceview libxml2 libsecret libfixposix libssh2 ];
postPatch = ''
chmod +x meson/post_install.py
patchShebangs meson/post_install.py
chmod +x build-aux/meson_post_install.py
patchShebangs build-aux/meson_post_install.py
'';
meta = with stdenv.lib; {

View file

@ -3,13 +3,13 @@
python3Packages.buildPythonApplication rec {
name = "urh-${version}";
version = "2.5.1";
version = "2.5.3";
src = fetchFromGitHub {
owner = "jopohl";
repo = "urh";
rev = "v${version}";
sha256 = "01n4swm2q2i10qvhfw1q04wxf48xwqlddfg7842ff98i2d9yxy13";
sha256 = "050c7vhxxwvmkahdhwdk371qhfnmass5bs9zxr8yj4mqfnihcmi8";
};
buildInputs = [ hackrf rtl-sdr airspy limesuite ];

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "xkbmon-${version}";
version = "0.1";
version = "0.2";
src = fetchFromGitHub {
owner = "xkbmon";
repo = "xkbmon";
rev = version;
sha256 = "1smyqsd9cpbzqaplm221a8mq0nham6rg6hjsm9g5gph94xmk6d67";
sha256 = "1x2xwak0yp0xkl63jzz3k1pf074mh9yxgppwwm96ms3zaslq44yp";
};
buildInputs = [ libX11 ];
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
homepage = https://github.com/xkbmon/xkbmon;
description = "Command-line keyboard layout monitor for X11";
license = licenses.gpl3;
license = licenses.mit;
platforms = platforms.linux;
maintainers = [ maintainers.romildo ];
};

View file

@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
name = "xpad-${version}";
version = "5.2.0";
version = "5.3.0";
src = fetchurl {
url = "https://launchpad.net/xpad/trunk/${version}/+download/xpad-${version}.tar.bz2";
sha256 = "1ab33vg3fz57lz19jjwa3vp3vnln4pnh60hwlkq59la53s8lyijk";
sha256 = "0gv9indihr2kbv9iqdqq4mfj6l6qgzwc06jm08gmg10f262sni34";
};
nativeBuildInputs = [ autoreconfHook pkgconfig wrapGAppsHook ];

View file

@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
'';
meta = with stdenv.lib; {
homepage = http://davmail.sourceforce.net/;
homepage = http://davmail.sourceforge.net/;
description = "A Java application which presents a Microsoft Exchange server as local CALDAV, IMAP and SMTP servers";
maintainers = [ maintainers.hinton ];
platforms = platforms.all;

View file

@ -0,0 +1,24 @@
{ stdenv, buildGoPackage, fetchgit }:
buildGoPackage rec {
name = "websocketd-${version}";
version = "0.3.0";
rev = "729c67f052f8f16a0a0aa032816a57649c0ebed3";
goPackagePath = "github.com/joewalnes/websocketd";
src = fetchgit {
inherit rev;
url = "https://github.com/joewalnes/websocketd";
sha256 = "1n4fag75lpfxg1pm1pr5v0p44dijrxj59s6dn4aqxirhxkq91lzb";
};
goDeps = ./deps.nix;
meta = with stdenv.lib; {
description = "Turn any program that uses STDIN/STDOUT into a WebSocket server";
homepage = "http://websocketd.com/";
maintainers = [ maintainers.bjornfor ];
license = licenses.bsd2;
};
}

View file

@ -0,0 +1,12 @@
# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
[
{
goPackagePath = "github.com/gorilla/websocket";
fetch = {
type = "git";
url = "https://github.com/gorilla/websocket";
rev = "95ba29eb981bbb27d92e1f70bf8a1949452d926b";
sha256 = "08lvc9l0qagyhyrjj6jkhpq3zapa5gqr966bm33nb4bc0pd38f48";
};
}
]

View file

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

View file

@ -8,11 +8,11 @@
stdenv.mkDerivation {
name = "gromacs-2018.4";
name = "gromacs-2019";
src = fetchurl {
url = "ftp://ftp.gromacs.org/pub/gromacs/gromacs-2018.4.tar.gz";
sha256 = "14d8mbck1lrmz97vvy322irk557wxh0zdd6n962lm69hqxcf8bkg";
url = "ftp://ftp.gromacs.org/pub/gromacs/gromacs-2019.tar.gz";
sha256 = "02qd27pgc5kwkk68m8hwarkbb1b9z5rdrm67yjqyxd5my2jq3cn5";
};
buildInputs = [cmake fftw]

View file

@ -14,9 +14,13 @@ stdenv.mkDerivation {
buildCommand = ''
mkdir -p $out/bin
mkdir -p $out/share/man/man1
mkdir -p $out/share/zsh/site-functions
mkdir -p $out/share/bash-completion/completions
sed -e 's:/bin/bash:/usr/bin/env bash:' $src/yadm > $out/bin/yadm
chmod 755 $out/bin/yadm
install -m 644 $src/yadm.1 $out/share/man/man1/yadm.1
install -m644 $src/completion/yadm.zsh_completion $out/share/zsh/site-functions/_yadm
install -m644 $src/completion/yadm.bash_completion $out/share/bash-completion/completions/yadm.bash
'';
meta = {

View file

@ -1,12 +1,14 @@
{ stdenv, fetchgit, pkgconfig, dbus-glib, autoreconfHook, xorg }:
{ stdenv, fetchFromGitHub, pkgconfig, dbus-glib, autoreconfHook, xorg }:
stdenv.mkDerivation rec {
name = "kbdd";
pname = "kbdd";
version = "unstable-2017-01-29";
src = fetchgit {
url = https://github.com/qnikst/kbdd;
rev = "47dee0232f157cd865e43d92005a2ba107f6fd75";
sha256 = "1ys9w1lncsfg266g9sfnm95an2add3g51mryg0hnrzcqa4knz809";
src = fetchFromGitHub {
owner = "qnikst";
repo = "kbdd";
rev = "0e1056f066ab6e3c74fd0db0c9710a9a2b2538c3";
sha256 = "068iqkqxh7928xlmz2pvnykszn9bcq2qgkkiwf37k1vm8fdmgzlj";
};
nativeBuildInputs = [ autoreconfHook pkgconfig ];

View file

@ -1,26 +1,24 @@
{ stdenv, fetchurl, python3, bdftopcf, mkfontdir, mkfontscale }:
stdenv.mkDerivation rec {
name = "terminus-font-4.46";
pname = "terminus-font";
version = "4.47";
name = "${pname}-${version}"; # set here for use in URL below
src = fetchurl {
url = "mirror://sourceforge/project/terminus-font/${name}/${name}.tar.gz";
sha256 = "1kavqw38aarz0vpwz4b7l6l8xkyc5096zaf9ypqnvdwraqz46aaf";
url = "mirror://sourceforge/project/${pname}/${name}/${name}.tar.gz";
sha256 = "15qjcpalcxjiwsjgjg5k88vkwp56cs2nnx4ghya6mqp4i1c206qg";
};
buildInputs = [ python3 bdftopcf mkfontdir mkfontscale ];
nativeBuildInputs = [ python3 bdftopcf mkfontdir mkfontscale ];
patchPhase = ''
substituteInPlace Makefile --replace 'fc-cache' '#fc-cache'
'';
configurePhase = ''
sh ./configure --prefix=$out
'';
enableParallelBuilding = true;
installPhase = ''
make install fontdir
'';
installTargets = [ "install" "fontdir" ];
meta = with stdenv.lib; {
description = "A clean fixed width font";
@ -36,7 +34,7 @@ stdenv.mkDerivation rec {
16x32. The styles are normal and bold (except for 6x12), plus
EGA/VGA-bold for 8x14 and 8x16.
'';
homepage = http://www.is-vn.bg/hamster/;
homepage = http://terminus-font.sourceforge.net/;
license = licenses.gpl2Plus;
maintainers = with maintainers; [ astsmtl ];
platforms = platforms.linux;

View file

@ -0,0 +1,31 @@
{ stdenv, fetchFromGitHub, gtk_engines, gtk-engine-murrine }:
stdenv.mkDerivation rec {
pname = "mojave-gtk-theme";
version = "2019-01-02";
src = fetchFromGitHub {
owner = "vinceliuice";
repo = pname;
rev = version;
sha256 = "053bfc5pslwpqhn05dzznh236g1z4cnn2dzwvb914f6m855fbxfg";
};
buildInputs = [ gtk_engines ];
propagatedUserEnvPkgs = [ gtk-engine-murrine ];
installPhase = ''
patchShebangs .
mkdir -p $out/share/themes
name= ./install.sh -d $out/share/themes
'';
meta = with stdenv.lib; {
description = "Mac OSX Mojave like theme for GTK based desktop environments";
homepage = https://github.com/vinceliuice/Mojave-gtk-theme;
license = licenses.gpl3;
platforms = platforms.unix;
maintainers = [ maintainers.romildo ];
};
}

View file

@ -3,9 +3,9 @@
mkXfceDerivation rec {
category = "xfce";
pname = "xfce4-panel";
version = "4.13.3";
version = "4.13.4";
sha256 = "00b2b16wqwzdbh1vsnpl2kasa7f9i1hr1wkkjmvzmy2v7bmkygr0";
sha256 = "13hnzh31d2b1331lnsbfaxg4fqhqa7hmdwkiqsl9hyr8pqimjb2g";
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ exo garcon gtk2 gtk3 libxfce4ui libxfce4util libwnck3 xfconf ];

View file

@ -112,6 +112,10 @@ let
# Set compiler for NVCC.
wrapProgram $out/bin/nvcc \
--prefix PATH : ${gcc}/bin
# nvprof do not find any program to profile if LD_LIBRARY_PATH is not set
wrapProgram $out/bin/nvprof \
--prefix LD_LIBRARY_PATH : $out/lib
'' + lib.optionalString (lib.versionOlder version "8.0") ''
# Hack to fix building against recent Glibc/GCC.
echo "NIX_CFLAGS_COMPILE+=' -D_FORCE_INLINES'" >> $out/nix-support/setup-hook

View file

@ -1,6 +1,6 @@
import ./shared.nix {
majorVersion = "1";
minorVersion = "0";
maintenanceVersion = "1";
src_sha256 = "0bqb5c63c7jnb753nplqj5v4k9pvh792k8y4b1n5pq8jiibr86i0";
maintenanceVersion = "3";
src_sha256 = "0666chsc19wx02k5m1yilf6wbc9bw27ay8p1d00jkh8m0jkrpf7l";
}

View file

@ -1,26 +1,24 @@
{ stdenv, fetchurl, autoreconfHook, docbook_xml_dtd_412, docbook_xml_dtd_42, docbook_xml_dtd_43, docbook_xsl, which, libxml2
, gobject-introspection, gtk-doc, intltool, libxslt, pkgconfig, xmlto, appstream-glib, substituteAll, glibcLocales, yacc, xdg-dbus-proxy, p11-kit
, bubblewrap, bzip2, dbus, glib, gpgme, json-glib, libarchive, libcap, libseccomp, coreutils, python2, hicolor-icon-theme
, libsoup, lzma, ostree, polkit, python3, systemd, xorg, valgrind, glib-networking, makeWrapper, gnome3 }:
, bubblewrap, bzip2, dbus, glib, gpgme, json-glib, libarchive, libcap, libseccomp, coreutils, gettext, python2, hicolor-icon-theme
, libsoup, lzma, ostree, polkit, python3, systemd, xorg, valgrind, glib-networking, wrapGAppsHook, gnome3 }:
let
version = "1.0.5";
desktop_schemas = gnome3.gsettings-desktop-schemas;
in stdenv.mkDerivation rec {
name = "flatpak-${version}";
stdenv.mkDerivation rec {
pname = "flatpak";
version = "1.1.2";
# TODO: split out lib once we figure out what to do with triggerdir
outputs = [ "out" "man" "doc" "installedTests" ];
src = fetchurl {
url = "https://github.com/flatpak/flatpak/releases/download/${version}/${name}.tar.xz";
sha256 = "1wj88lp23bzz0c5n1i84nr2xff572i5cc10fqd9xh7qhj3ivk1w0";
url = "https://github.com/flatpak/flatpak/releases/download/${version}/${pname}-${version}.tar.xz";
sha256 = "01z7ybskxh6r58yh1m98z0z36fba4ljaxpqmh4y6kkaw8pyhhs6i";
};
patches = [
(substituteAll {
src = ./fix-test-paths.patch;
inherit coreutils glibcLocales;
inherit coreutils gettext glibcLocales;
hicolorIconTheme = hicolor-icon-theme;
})
(substituteAll {
@ -34,12 +32,13 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [
autoreconfHook libxml2 docbook_xml_dtd_412 docbook_xml_dtd_42 docbook_xml_dtd_43 docbook_xsl which gobject-introspection
gtk-doc intltool libxslt pkgconfig xmlto appstream-glib yacc makeWrapper
gtk-doc intltool libxslt pkgconfig xmlto appstream-glib yacc wrapGAppsHook
];
buildInputs = [
bubblewrap bzip2 dbus glib gpgme json-glib libarchive libcap libseccomp
libsoup lzma ostree polkit python3 systemd xorg.libXau
gnome3.gsettings-desktop-schemas glib-networking
];
checkInputs = [ valgrind ];
@ -65,12 +64,6 @@ in stdenv.mkDerivation rec {
patchShebangs tests
'';
postFixup = ''
wrapProgram $out/bin/flatpak \
--prefix GIO_EXTRA_MODULES : "${glib-networking.out}/lib/gio/modules" \
--prefix XDG_DATA_DIRS : "${desktop_schemas}/share/gsettings-schemas/${desktop_schemas.name}"
'';
meta = with stdenv.lib; {
description = "Linux application sandboxing and distribution framework";
homepage = https://flatpak.org/;

View file

@ -1,14 +1,14 @@
--- a/tests/libtest.sh
+++ b/tests/libtest.sh
@@ -296,7 +296,7 @@
# running installed-tests: assume we know what we're doing
:
elif ! "$FLATPAK_BWRAP" --unshare-ipc --unshare-net --unshare-pid \
- --ro-bind / / /bin/true > bwrap-result 2>&1; then
+ --ro-bind / / @coreutils@/bin/true > bwrap-result 2>&1; then
sed -e 's/^/# /' < bwrap-result
echo "1..0 # SKIP Cannot run bwrap"
exit 0
@@ -328,7 +328,7 @@
# running installed-tests: assume we know what we're doing
_flatpak_bwrap_works=true
elif ! "$FLATPAK_BWRAP" --unshare-ipc --unshare-net --unshare-pid \
- --ro-bind / / /bin/true > bwrap-result 2>&1; then
+ --ro-bind / / @coreutils@/bin/true > bwrap-result 2>&1; then
_flatpak_bwrap_works=false
else
_flatpak_bwrap_works=true
@@ -309,12 +309,12 @@
export DBUS_SESSION_BUS_ADDRESS="$(cat dbus-session-bus-address)"
DBUS_SESSION_BUS_PID="$(cat dbus-session-bus-pid)"
@ -24,6 +24,24 @@
gpg-connect-agent --homedir "${FL_GPG_HOMEDIR}" killagent /bye || true
fusermount -u $XDG_RUNTIME_DIR/doc || :
if test -n "${TEST_SKIP_CLEANUP:-}"; then
--- a/tests/make-test-app.sh
+++ b/tests/make-test-app.sh
@@ -114,13 +114,13 @@ msgid "Hello world"
msgstr "Hallo Welt"
EOF
mkdir -p ${DIR}/files/de/share/de/LC_MESSAGES
-msgfmt --output-file ${DIR}/files/de/share/de/LC_MESSAGES/helloworld.mo de.po
+@gettext@/bin/msgfmt --output-file ${DIR}/files/de/share/de/LC_MESSAGES/helloworld.mo de.po
cat > fr.po <<EOF
msgid "Hello world"
msgstr "Bonjour le monde"
EOF
mkdir -p ${DIR}/files/fr/share/fr/LC_MESSAGES
-msgfmt --output-file ${DIR}/files/fr/share/fr/LC_MESSAGES/helloworld.mo fr.po
+@gettext@/bin/msgfmt --output-file ${DIR}/files/fr/share/fr/LC_MESSAGES/helloworld.mo fr.po
flatpak build-finish ${DIR}
mkdir -p repos
--- a/tests/make-test-runtime.sh
+++ b/tests/make-test-runtime.sh
@@ -26,6 +26,7 @@
@ -61,7 +79,7 @@
- fi
-}
-
for i in $@; do
for i in $@ bash ls cat echo readlink; do
- I=`which $i`
- add_bin $I
-done

View file

@ -3,14 +3,14 @@
# Based on https://projects.archlinux.org/svntogit/packages.git/tree/trunk/PKGBUILD
stdenv.mkDerivation rec {
name = "live555-${version}";
version = "2018.11.26";
version = "2018.12.14";
src = fetchurl { # the upstream doesn't provide a stable URL
urls = [
"mirror://sourceforge/slackbuildsdirectlinks/live.${version}.tar.gz"
"https://download.videolan.org/contrib/live555/live.${version}.tar.gz"
];
sha256 = "0izvy50xmyycrl7aj43kj1w9k8lcsmdqwwqk1cdizmc4wmj56f5k";
sha256 = "0irafygp23m2xmjv06qgs1sccymbwqvn51wggk0c60lnj1v1zhwd";
};
postPatch = ''

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, SDL2, libpng }:
{ stdenv, fetchurl, pkgconfig, SDL2, libpng, libiconv }:
stdenv.mkDerivation rec {
pname = "qrencode";
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ SDL2 libpng ];
buildInputs = [ SDL2 libpng ] ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv ];
configureFlags = [
"--with-tests"

View file

@ -1,6 +1,6 @@
{ stdenv, fetchzip, cmake, libX11, freetype, libjpeg, openal, flac, libvorbis
, glew, libXrandr, libXrender, udev, xcbutilimage
, IOKit, Foundation, AppKit, OpenAL
, cf-private, IOKit, Foundation, AppKit, OpenAL
}:
let
@ -16,10 +16,13 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ cmake ];
buildInputs = [ libX11 freetype libjpeg openal flac libvorbis glew
libXrandr libXrender xcbutilimage
] ++ stdenv.lib.optional stdenv.isLinux udev
++ stdenv.lib.optionals stdenv.isDarwin [ IOKit Foundation AppKit OpenAL ];
buildInputs = [ freetype libjpeg openal flac libvorbis glew ]
++ stdenv.lib.optional stdenv.isLinux udev
++ stdenv.lib.optionals (!stdenv.isDarwin) [ libX11 libXrandr libXrender xcbutilimage ]
++ stdenv.lib.optionals stdenv.isDarwin [ IOKit Foundation AppKit OpenAL
# Needed for _NSDefaultRunLoopMode, _OBJC_CLASS_$_NSArray, _OBJC_CLASS_$_NSDate
cf-private
];
cmakeFlags = [ "-DSFML_INSTALL_PKGCONFIG_FILES=yes"
"-DSFML_MISC_INSTALL_PREFIX=share/SFML"

View file

@ -1,19 +1,18 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libxml2, xdg-desktop-portal, gtk3, glib }:
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libxml2, xdg-desktop-portal, gtk3, glib, wrapGAppsHook, gnome3 }:
let
version = "1.0.2";
in stdenv.mkDerivation rec {
name = "xdg-desktop-portal-gtk-${version}";
stdenv.mkDerivation rec {
pname = "xdg-desktop-portal-gtk";
version = "1.1.0";
src = fetchFromGitHub {
owner = "flatpak";
repo = "xdg-desktop-portal-gtk";
repo = pname;
rev = version;
sha256 = "06dzh3vzq5nw3r89kb1qi3r2z8wjh9zmzc0hfnva4vnx7mwgm7ax";
sha256 = "1djgsp3n10w6lamwwjn64p9722lvxpalj26h19zscbspnhfldb4f";
};
nativeBuildInputs = [ autoreconfHook pkgconfig libxml2 xdg-desktop-portal ];
buildInputs = [ glib gtk3 ];
nativeBuildInputs = [ autoreconfHook pkgconfig libxml2 xdg-desktop-portal wrapGAppsHook ];
buildInputs = [ glib gtk3 gnome3.gsettings-desktop-schemas ];
meta = with stdenv.lib; {
description = "Desktop integration portals for sandboxed apps";

View file

@ -1,30 +1,35 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libxml2, glib, pipewire, fuse }:
{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, pkgconfig, libxml2, glib, pipewire, fontconfig, flatpak, acl, dbus, fuse, wrapGAppsHook, gnome3 }:
let
version = "1.0.3";
in stdenv.mkDerivation rec {
name = "xdg-desktop-portal-${version}";
stdenv.mkDerivation rec {
pname = "xdg-desktop-portal";
version = "1.1.0";
outputs = [ "out" "installedTests" ];
src = fetchFromGitHub {
owner = "flatpak";
repo = "xdg-desktop-portal";
repo = pname;
rev = version;
sha256 = "113k5sr4l58rm8sgp4qbjrhyjg37c5ad54i58njsm98knb5r2ppv";
sha256 = "10dv628gci6vcs0rbyp4wb6yvigw2i1jj9x7ii6ckxjir5rff5dx";
};
patches = [
./respect-path-env-var.patch
# https://github.com/flatpak/xdg-desktop-portal/pull/263
(fetchpatch {
url = https://github.com/flatpak/xdg-desktop-portal/commit/5e5993b64ea43f7ba77335f98e3d6c5bf99a51b9.patch;
sha256 = "1i753q35dgihj6vp3961i0hn2sxy2pyfx0dbqa385z0y6wz8k9xq";
})
];
nativeBuildInputs = [ autoreconfHook pkgconfig libxml2 ];
buildInputs = [ glib pipewire fuse ];
nativeBuildInputs = [ autoreconfHook pkgconfig libxml2 wrapGAppsHook ];
buildInputs = [ glib pipewire fontconfig flatpak acl dbus fuse gnome3.gsettings-desktop-schemas ];
doCheck = true;
doCheck = true; # XXX: investigate!
configureFlags = [
"--enable-installed-tests"
"--disable-geoclue" # Requires 2.5.2, not released yet
];
makeFlags = [

View file

@ -10,13 +10,13 @@
buildPythonPackage rec {
pname = "astroquery";
version = "0.3.8";
version = "0.3.9";
doCheck = false; # Tests require the pytest-astropy package
src = fetchPypi {
inherit pname version;
sha256 = "800d9730c9e2bd299f14c29b4d709d1605c82833223a2e4f784fea7ad805c168";
sha256 = "0zw3xp2rfc6h2v569iqsyvzhfnzp7bfjb7jrj61is1hrqw1cqjrb";
};
propagatedBuildInputs = [ astropy requests keyring beautifulsoup4 html5lib ];

View file

@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "av";
version = "6.0.0";
version = "6.1.0";
src = fetchPypi {
inherit pname version;
sha256 = "9037d73d7a812c3dc75d9cc27d03215483c9e782eae63a07142c0725c6bd2df0";
sha256 = "0h5d6yy6mjaflzh9z8fv3j1rjwijmzqfrpz88zxk0qfmbprdc91z";
};
buildInputs = [ nose pillow numpy ffmpeg_4 git pkgconfig ];

View file

@ -33,11 +33,11 @@
buildPythonPackage rec {
pname = "bokeh";
version = "1.0.1";
version = "1.0.2";
src = fetchPypi {
inherit pname version;
sha256 = "43aa8b867f2db99c0cf3178149d2533e9e954a8355d6161381d0b8765c90db5e";
sha256 = "07rczl2xkkqzpm45m0rlb2hki48b6w1k912gmwacf5aisnc0a0rw";
};
disabled = isPyPy;

View file

@ -0,0 +1,23 @@
{ stdenv, buildPythonPackage, fetchPypi, requests }:
buildPythonPackage rec {
pname = "casttube";
version = "0.2.0";
src = fetchPypi {
inherit pname version;
sha256 = "0g7mksfl341vfsxqvw8h15ci2qwd1rczg41n4fb2hw7y9rikqnzj";
};
propagatedBuildInputs = [ requests ];
# no tests
doCheck = false;
meta = with stdenv.lib; {
description = "Interact with the Youtube Chromecast api";
homepage = http://github.com/ur1katz/casttube;
license = licenses.mit;
maintainers = with maintainers; [ fpletz ];
};
}

View file

@ -5,11 +5,11 @@
buildPythonPackage rec {
pname = "daemonize";
version = "2.4.7";
version = "2.5.0";
src = fetchPypi {
inherit pname version;
sha256 = "c0194e861826be456c7c69985825ac7b79632d8ac7ad4cde8e12fee7971468c8";
sha256 = "1hwbl3gf9fdds9sc14zgjyjisjvxidrvqc11xlbb0b6jz17nw0nx";
};
meta = with stdenv.lib; {

View file

@ -4,7 +4,7 @@
}:
buildPythonPackage rec {
pname = "daphne";
version = "2.2.3";
version = "2.2.4";
disabled = !isPy3k;
@ -12,7 +12,7 @@ buildPythonPackage rec {
owner = "django";
repo = pname;
rev = version;
sha256 = "0v3krlqdv39y021dcyf6fl9zys0z1dpw5mqfmkryna5ngxwzlkwd";
sha256 = "0mpn2xbpx2r67bj5crfvxfwlznxlp7rcfbb2xly6ad3d0c7djkdi";
};
nativeBuildInputs = [ pytestrunner ];

View file

@ -26,12 +26,12 @@
buildPythonPackage rec {
pname = "distributed";
version = "1.24.2";
version = "1.25.1";
# get full repository need conftest.py to run tests
src = fetchPypi {
inherit pname version;
sha256 = "8ab24f0ea634dab7b6667c32b18c98794141f3ef3b081293dfea1943498ce987";
sha256 = "1qay94amxs0k6lmwhy07bq54m5zms0rjmnp7a66fldipjla6w8lg";
};
checkInputs = [ pytest pytest-repeat pytest-faulthandler pytest-timeout mock joblib ];

View file

@ -3,11 +3,11 @@
buildPythonPackage rec {
pname = "dropbox";
version = "9.2.0";
version = "9.3.0";
src = fetchPypi {
inherit pname version;
sha256 = "121wn4l6f6r4vm7yq0y9d1xsn5y77l6a4vgakyy2yaz8wv6j9w7c";
sha256 = "1ckpbksdby70d70m58b904h8y8v7m82h12n3q3qk58r4yrqwvld5";
};
# Set DROPBOX_TOKEN environment variable to a valid token.

View file

@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "fido2";
version = "0.4.0";
version = "0.5.0";
src = fetchPypi {
inherit pname version;
sha256 = "12245b16czsgq4a251jqlk5qs3sldlcryfcganswzk2lbgplmn7q";
sha256 = "1pl8d2pr6jzqj4y9qiaddhjgnl92kikjxy0bgzm2jshkzzic8mp3";
};
# The pypi package does not include tests

View file

@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "Flask-API";
version = "1.0";
version = "1.1";
src = fetchPypi {
inherit pname version;
sha256 = "0dffcy2hdkajbvl2wkz9dam49v05x9d87cf2mh2cyvza2c5ah47w";
sha256 = "0r23pdlaz6ibz9vml3m7v6v3firvykbrsi1zzxkdhls0zi9jq560";
};
propagatedBuildInputs = [ flask markdown ];

View file

@ -5,11 +5,11 @@
buildPythonPackage rec {
pname = "gym";
version = "0.9.6";
version = "0.10.9";
src = fetchPypi {
inherit pname version;
sha256 = "0llbhn3zdlsz2crd5grd1yygg8zp2shsclc24iqix5gw5f65clx5";
sha256 = "1id2xyyypks8bjdayb19av809w0838ghymyngmyhdbbsk588q7q0";
};
propagatedBuildInputs = [

View file

@ -4,7 +4,7 @@
buildPythonPackage rec {
pname = "kubernetes";
version = "8.0.0";
version = "8.0.1";
prePatch = ''
sed -e 's/sphinx>=1.2.1,!=1.3b1,<1.4 # BSD/sphinx/' -i test-requirements.txt
@ -23,7 +23,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
sha256 = "54f8e7bb1dd9a55cf416dff76a63c4ae441764280942d9913f2243676f29d02c";
sha256 = "0y0aygnd7kpflwdm3zxrmsgws0frk4qwq3lnq92zsiyxcxh8r4i5";
};
checkInputs = [ isort coverage pytest mock sphinx autopep8 pep8 codecov recommonmark nose ];

View file

@ -1,12 +1,12 @@
{ stdenv, fetchPypi, buildPythonPackage, gssapi, pyasn1 }:
buildPythonPackage rec {
version = "2.5.1";
version = "2.5.2";
pname = "ldap3";
src = fetchPypi {
inherit pname version;
sha256 = "cc09951809678cfb693a13a6011dd2d48ada60a52bd80cb4bd7dcc55ee7c02fd";
sha256 = "063dacy01mphc3n7z2qc2avykjavqm1gllkbvy7xzw5ihlqwhrrz";
};
buildInputs = [ gssapi ];

View file

@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "pgspecial";
version = "1.11.3";
version = "1.11.5";
src = fetchPypi {
inherit pname version;
sha256 = "f183da55c37128f7a74fe5b28e997991156f19961e59a1ad0f400ffc9535faba";
sha256 = "0yvlxv9vy0hbfgf0xcwl7wh5hg6cl86arsv1ip3kvn9znn6x8kgl";
};
buildInputs = [ pytest psycopg2 ];

View file

@ -1,4 +1,4 @@
{ lib, fetchurl, buildPythonPackage, requests, six, zeroconf, protobuf }:
{ lib, fetchurl, buildPythonPackage, requests, six, zeroconf, protobuf, casttube }:
buildPythonPackage rec {
pname = "PyChromecast";
@ -10,7 +10,7 @@ buildPythonPackage rec {
sha256 = "f385168e34d2ef47f976c8e41bad2f58f5ca004634c0ccb1a12623d8beb2fa38";
};
propagatedBuildInputs = [ requests six zeroconf protobuf ];
propagatedBuildInputs = [ requests six zeroconf protobuf casttube ];
meta = with lib; {
description = "Library for Python 2 and 3 to communicate with the Google Chromecast";

View file

@ -1,12 +1,12 @@
{ buildPythonPackage, fetchPypi, stdenv, libmemcached, zlib, cyrus_sasl }:
buildPythonPackage rec {
version = "1.5.2";
version = "1.6.0";
pname = "pylibmc";
src = fetchPypi {
inherit pname version;
sha256 = "fc54e28a9f1b5b2ec0c030da29c7ad8a15c2755bd98aaa4142eaf419d5fabb33";
sha256 = "1n6nvvhl0g52gpzzwdj1my6049xljkfwyxxygnwda9smrbj7pyay";
};
buildInputs = [ libmemcached zlib cyrus_sasl ];

View file

@ -2,13 +2,13 @@
buildPythonPackage rec {
pname = "pymetar";
version = "1.0";
version = "1.1";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
sha256 = "1n4k5aic4sgp43ki6j3zdw9b21r3biqqws8ah57b77n44b8wzrap";
sha256 = "0y42l7mmp7jn4pzg66x3k57c6hqpxc22mgzgaqqpblkx2kzh42n9";
};
checkPhase = ''

View file

@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "PyMySQL";
version = "0.9.2";
version = "0.9.3";
src = fetchPypi {
inherit pname version;
sha256 = "0gvi63f1zq1bbd30x28kqyx351hal1yc323ckp0mihainb5n1iwy";
sha256 = "1ry8lxgdc1p3k7gbw20r405jqi5lvhi5wk83kxdbiv8xv3f5kh6q";
};
propagatedBuildInputs = [ cryptography ];

View file

@ -2,12 +2,12 @@
buildPythonPackage rec {
pname = "pyodbc";
version = "4.0.24";
version = "4.0.25";
disabled = isPyPy; # use pypypdbc instead
src = fetchPypi {
inherit pname version;
sha256 = "4326abb737dec36156998d52324921673d30f575e1e0998f0c5edd7de20e61d4";
sha256 = "1bbwrb812w5i0x56jfn0l86mxc2ck904hl8y87mziay96znwia0f";
};
buildInputs = [ unixODBC ];

View file

@ -25,6 +25,11 @@ buildPythonPackage rec {
py.test
'';
postPatch = ''
# File says it's utf-8 so instead of relying on the environment, fix the decoding when reading.
substituteInPlace setup.py --replace "open('README.md')" "open('README.md',encoding='utf-8')"
'';
propagatedBuildInputs = [ future six ecdsa rsa ];
meta = with stdenv.lib; {

View file

@ -6,14 +6,14 @@
buildPythonPackage rec {
pname = "rasterio";
version = "1.0.12";
version = "1.0.13";
# Pypi doesn't ship the tests, so we fetch directly from GitHub
src = fetchFromGitHub {
owner = "mapbox";
repo = "rasterio";
rev = version;
sha256 = "0mdm03yhlcsa9jwy1yzvqrzk4spmh1dzjaq9krsj958k7wkps672";
sha256 = "1l1ppclmcq4cmbqvplrpx9sscxfpjlba6w0114y1ma675w30bgfb";
};
checkInputs = [ boto3 pytest pytestcov packaging hypothesis ];

View file

@ -3,13 +3,13 @@
buildPythonPackage rec {
pname = "twilio";
version = "6.21.0";
version = "6.22.0";
# tests not included in PyPi, so fetch from github instead
src = fetchFromGitHub {
owner = "twilio";
repo = "twilio-python";
rev = version;
sha256 = "1xinj2vyfasi1j3g7kk7xkmp6w8yawaqi3dz7mvibf9ywsi4dhc9";
sha256 = "1kh2hcjm1qyisqqjyjnilkyj3vv6l5flpjyqkq27pwxvc461aapp";
};
buildInputs = [ nose mock ];

View file

@ -3,11 +3,11 @@ stdenv.mkDerivation rec {
name = "omniorb-${version}";
version = "4.2.2";
version = "4.2.3";
src = fetchurl rec {
url = "mirror://sourceforge/project/omniorb/omniORB/omniORB-${version}/omniORB-${version}.tar.bz2";
sha256 = "1klf6ivhsisdnqxcbf161jxva0xzmfgmwypnxfzf4jq16770knfx";
sha256 = "1jlb0wps6311dmhnphn64gv46z0bl8grch4fd9dcx5dlib02lh96";
};
buildInputs = [ python2 ];

View file

@ -11,11 +11,11 @@ let
in
stdenv.mkDerivation rec {
name = "grails-${version}";
version = "3.3.8";
version = "3.3.9";
src = fetchurl {
url = "https://github.com/grails/grails-core/releases/download/v${version}/grails-${version}.zip";
sha256 = "1hfqlaiv29im6pyqi7irl28ws7nn2jc4g4718gysfmm1gvlprpn0";
sha256 = "0xnwi9m9l8rz4wdwjp2i3yfzsq1szz37z886nc6lbfxd5mj19hnn";
};
buildInputs = [ unzip ];

View file

@ -1,12 +1,12 @@
{ stdenv, lib, fetchurl }:
stdenv.mkDerivation rec {
name = "now-cli-${version}";
version = "12.1.12";
version = "12.1.14";
# TODO: switch to building from source, if possible
src = fetchurl {
url = "https://github.com/zeit/now-cli/releases/download/${version}/now-linux.gz";
sha256 = "019lbysfwax69mmgia6h6kbljd7adbh319g3ky2s8djy7n6js4dz";
sha256 = "1nmwhb75bqlw7166vr2mwv88mhs940a9lhgw257449d5kgxwqfd1";
};
sourceRoot = ".";

View file

@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
name = "ioquake3-git-${version}";
version = "2018-02-23";
version = "2018-12-14";
src = fetchFromGitHub {
owner = "ioquake";
repo = "ioq3";
rev = "0d6edd227a13f1447938da1d1b020303c2545eb2";
sha256 = "1nsagyzrai8cxhabcv2my8bbwmwckvri288j6x4qi5bmp78xl4hx";
rev = "b0d2b141e702aafc3dcf77a026e12757f00e45ed";
sha256 = "17qkqi22f2fyh6bnfcf1zz2lycgv08d6aw52sf0hqw7r3qq86d08";
};
nativeBuildInputs = [ which pkgconfig ];
@ -36,6 +36,6 @@ stdenv.mkDerivation rec {
description = "First person shooter engine based on the Quake 3: Arena and Quake 3: Team Arena";
license = licenses.gpl2;
platforms = platforms.linux;
maintainers = with maintainers; [ eelco abbradar ];
maintainers = with maintainers; [ rvolosatovs eelco abbradar ];
};
}

View file

@ -2,21 +2,15 @@
stdenv.mkDerivation rec {
name = "the-powder-toy-${version}";
version = "92.5";
version = "93.3";
src = fetchFromGitHub {
owner = "simtr";
owner = "ThePowderToy";
repo = "The-Powder-Toy";
rev = "v${version}";
sha256 = "1n15kgl4qnz55b32ddgmhrv64cl3awbds8arycn7mkf7akwdg1g6";
sha256 = "1bg1y13kpqxx4mpncxvmg8w02dyqyd9hl43rwnys3sqrjdm9k02j";
};
patches = [ ./fix-env.patch ];
postPatch = ''
sed -i 's,lua5.1,lua,g' SConscript
'';
nativeBuildInputs = [ scons pkgconfig ];
buildInputs = [ SDL lua fftwFloat zlib bzip2 ];

View file

@ -7,13 +7,13 @@
buildPythonApplication rec {
pname = "sc-controller";
version = "0.4.6";
version = "0.4.6.1";
src = fetchFromGitHub {
owner = "kozec";
repo = pname;
rev = "v${version}";
sha256 = "0527igjgc5jf60ldsrc4xv3k8gw2480pmqyp6nv5xcrm5j0ah4q5";
sha256 = "1kcqsnrlwl4s94j6ahgkz3w4sy9hsr95y624zab6g10w0fl5sqrc";
};
nativeBuildInputs = [ wrapGAppsHook ];

View file

@ -1,7 +1,7 @@
{ lib, stdenv
, python, cmake, vim, ruby
, which, fetchgit, llvmPackages, rustPlatform
, xkb_switch, fzf, skim
, xkb-switch, fzf, skim
, python3, boost, icu, ncurses
, ycmd, rake
, substituteAll
@ -308,9 +308,9 @@ self: super: {
vim-xkbswitch = super.vim-xkbswitch.overrideAttrs(old: {
patchPhase = ''
substituteInPlace plugin/xkbswitch.vim \
--replace /usr/local/lib/libxkbswitch.so ${xkb_switch}/lib/libxkbswitch.so
--replace /usr/local/lib/libxkbswitch.so ${xkb-switch}/lib/libxkbswitch.so
'';
buildInputs = [ xkb_switch ];
buildInputs = [ xkb-switch ];
});
vim-yapf = super.vim-yapf.overrideAttrs(old: {

View file

@ -152,15 +152,21 @@ vim_with_plugins can be installed like any other application within Nix.
let
inherit (stdenv) lib;
# make sure a plugin is a derivation. If plugin already is a derivation, this
# is a no-op. If it is a string, it is looked up in knownPlugins.
# make sure a plugin is a derivation and its dependencies are derivations. If
# plugin already is a derivation, this is a no-op. If it is a string, it is
# looked up in knownPlugins.
pluginToDrv = knownPlugins: plugin:
if builtins.isString plugin then
# make sure `pname` is set to that we are able to convert the derivation
# back to a string.
( knownPlugins.${plugin} // { pname = plugin; })
else
plugin;
let
drv =
if builtins.isString plugin then
# make sure `pname` is set to that we are able to convert the derivation
# back to a string.
( knownPlugins.${plugin} // { pname = plugin; })
else
plugin;
in
# make sure all the dependencies of the plugin are also derivations
drv // { dependencies = map (pluginToDrv knownPlugins) (drv.dependencies or []); };
# transitive closure of plugin dependencies (plugin needs to be a derivation)
transitiveClosure = plugin:
@ -170,14 +176,6 @@ let
findDependenciesRecursively = plugins: lib.concatMap transitiveClosure plugins;
attrnamesToPlugins = { knownPlugins, names }:
map (name: if builtins.isString name then knownPlugins.${name} else name) knownPlugins;
pluginToAttrname = plugin:
plugin.pname;
pluginsToAttrnames = plugins: map pluginToAttrname plugins;
vamDictToNames = x:
if builtins.isString x then [x]
else (lib.optional (x ? name) x.name)
@ -429,7 +427,7 @@ rec {
if vam != null && vam ? knownPlugins then vam.knownPlugins else
if pathogen != null && pathogen ? knownPlugins then pathogen.knownPlugins else
vimPlugins;
pathogenPlugins = findDependenciesRecursively ((map pluginToDrv knownPlugins) pathogen.pluginNames);
pathogenPlugins = findDependenciesRecursively (map (pluginToDrv knownPlugins) pathogen.pluginNames);
vamPlugins = findDependenciesRecursively (map (pluginToDrv knownPlugins) (lib.concatMap vamDictToNames vam.pluginDictionaries));
nonNativePlugins = (lib.optionals (pathogen != null) pathogenPlugins)
++ (lib.optionals (vam != null) vamPlugins)
@ -482,7 +480,8 @@ rec {
rev = "4c596548216b7c19971f8fc94e38ef1a2b55fee6";
sha256 = "0f1cpnp1nxb4i5hgymjn2yn3k1jwkqmlgw1g02sq270lavp2dzs9";
};
dependencies = [];
# make sure string dependencies are handled
dependencies = [ "vim-nix" ];
};
});
vimrcConfig.vam.pluginDictionaries = [ { names = [ "vim-trailing-whitespace" ]; } ];

View file

@ -1,11 +1,11 @@
{ stdenv, fetchurl, docutils, libev, openssl, pkgconfig }:
stdenv.mkDerivation rec {
version = "1.4.8";
version = "1.5.0";
name = "hitch-${version}";
src = fetchurl {
url = "https://hitch-tls.org/source/${name}.tar.gz";
sha256 = "1hqs5p69gr1lb3xldbrgq7d6d0vk4za0wpizlzybn98cv68acaym";
sha256 = "02sd2p3jsbnqmldsjwzk5qcjc45k9n1x4ygjkx0kxxwjj9lm9hhf";
};
nativeBuildInputs = [ pkgconfig ];

View file

@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
name = "mosquitto-${version}";
version = "1.5.4";
version = "1.5.5";
src = fetchFromGitHub {
owner = "eclipse";
repo = "mosquitto";
rev = "v${version}";
sha256 = "0pb38y6m682xqrkzhp41mj54x5ic43761xzschgnw055mzksbgk2";
sha256 = "1sfwmvrglfy5gqfk004kvbjldqr36dqz6xmppbgfhr47j5zs66xc";
};
postPatch = ''

View file

@ -2,8 +2,8 @@
{ fetchFromGitHub, lib } : fetchFromGitHub {
owner = "WordPress";
repo = "WordPress";
rev = "4.9.1";
sha256 = "0d931mv6wbgnc7f15nisnn5al0ffi19zya2iwdzw98s4klpaq955";
rev = "5.0.2";
sha256 = "1r8y62mdv6ji82hcn94gngi68mwilxh69gpx8r83k0cy08s99sln";
meta = {
homepage = https://wordpress.org;
description = "WordPress is open source software you can use to create a beautiful website, blog, or app.";

View file

@ -5,13 +5,13 @@ with lib;
stdenv.mkDerivation rec {
name = "grml-zsh-config-${version}";
version = "0.15.2";
version = "0.15.3";
src = fetchFromGitHub {
owner = "grml";
repo = "grml-etc-core";
rev = "v${version}";
sha256 = "15cr8pv1idshhq5d9sq4smgfl00iz55ji5mrxclsl3a35wg0djnw";
sha256 = "1g3hbn1ibrrafa9z26pzyn4lb8mfc5zipr1i1j3w2av872zh0y35";
};
buildInputs = [ zsh coreutils txt2tags procps ]

View file

@ -1,24 +1,24 @@
{ stdenv, fetchgit, cmake, libX11 }:
{ stdenv, fetchFromGitHub, cmake, libX11, libxkbfile }:
stdenv.mkDerivation rec {
name = "xkb-switch-${version}";
version = "1.3.1";
version = "1.5.0";
src = fetchgit {
url = https://github.com/ierton/xkb-switch.git;
rev = "351c84370ad0fa4aaaab9a32817859b1d5fb2a11";
sha256 = "0ilj3amwidi7imjvi8hr62y7j8zl809r5xhs7kv816773x32gpxq";
src = fetchFromGitHub {
owner = "ierton";
repo = "xkb-switch";
rev = version;
sha256 = "03wk2gg3py97kx0kjzbjrikld1sa55i6mgi398jbcbiyx2gjna78";
};
buildInputs = [ cmake libX11 ];
nativeBuildInputs = [ cmake ];
buildInputs = [ libX11 libxkbfile ];
meta = with stdenv.lib; {
description = "Switch your X keyboard layouts from the command line";
homepage = https://github.com/ierton/xkb-switch;
license = licenses.gpl2Plus;
maintainers = with maintainers; [ smironov ];
platforms = platforms.linux;
};
}

View file

@ -4,11 +4,11 @@
}:
stdenv.mkDerivation rec {
name = "gparted-0.32.0";
name = "gparted-0.33.0";
src = fetchurl {
url = "mirror://sourceforge/gparted/${name}.tar.gz";
sha256 = "1fjp4c8jc0kjbbih1x1vs9v40d9lncma642kflnmy0bixxnvh7df";
sha256 = "1ml1ky3s75lbxr91p608q3prsdh9x899mw7nbgk252pqhg4vh8sh";
};
configureFlags = [ "--disable-doc" ];

View file

@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
name = "mc-${version}";
version = "4.8.21";
version = "4.8.22";
src = fetchurl {
url = "http://www.midnight-commander.org/downloads/${name}.tar.xz";
sha256 = "130lzrcmazinznnnpf00lcizdlmjdhfiqfx00g1cjcbwmi3fadwg";
sha256 = "060kh3dmk8fmmsibn1l815qjazzfxzbhgqggrhncz604pbbnhy7f";
};
nativeBuildInputs = [ pkgconfig ];

View file

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

View file

@ -2,14 +2,14 @@
asciidoc, libxml2, libxslt, docbook_xsl }:
python2Packages.buildPythonApplication rec {
version = "7.2.1";
version = "7.2.2";
pname = "offlineimap";
src = fetchFromGitHub {
owner = "OfflineIMAP";
repo = "offlineimap";
rev = "v${version}";
sha256 = "1m5i74baazwazqp98ssma968rnwzfl1nywb7icf0swc8447ps97q";
sha256 = "11nj7y9fa7v6vcxk3wr8smfgm3mxxnmq3l8q69rrjxlfzcv7dl8m";
};
postPatch = ''

View file

@ -12496,6 +12496,7 @@ in
sfml = callPackage ../development/libraries/sfml {
inherit (darwin.apple_sdk.frameworks) IOKit Foundation AppKit OpenAL;
inherit (darwin) cf-private;
};
csfml = callPackage ../development/libraries/csfml { };
@ -15648,12 +15649,14 @@ in
mobile-broadband-provider-info = callPackage ../data/misc/mobile-broadband-provider-info { };
mojave-gtk-theme = callPackage ../data/themes/mojave { };
moka-icon-theme = callPackage ../data/icons/moka-icon-theme { };
monoid = callPackage ../data/fonts/monoid { };
mononoki = callPackage ../data/fonts/mononoki { };
moka-icon-theme = callPackage ../data/icons/moka-icon-theme { };
montserrat = callPackage ../data/fonts/montserrat { };
mph_2b_damase = callPackage ../data/fonts/mph-2b-damase { };
@ -20212,7 +20215,7 @@ in
xpointerbarrier = callPackage ../tools/X11/xpointerbarrier {};
xkb_switch = callPackage ../tools/X11/xkb-switch { };
xkb-switch = callPackage ../tools/X11/xkb-switch { };
xkblayout-state = callPackage ../applications/misc/xkblayout-state { };
@ -22921,6 +22924,8 @@ in
webfs = callPackage ../servers/http/webfs { };
websocketd = callPackage ../applications/networking/websocketd { };
wikicurses = callPackage ../applications/misc/wikicurses {
pythonPackages = python3Packages;
};

View file

@ -5151,6 +5151,8 @@ in {
pytado = callPackage ../development/python-modules/pytado { };
casttube = callPackage ../development/python-modules/casttube { };
});
in fix' (extends overrides packages)