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

Merge remote-tracking branch 'upstream/master' into staging

Browse Source
This commit is contained in:
John Ericson 2018-05-21 20:20:29 -04:00
commit db4d77779c
83 changed files with 798 additions and 265 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
maintainers/maintainer-list.nix
View File

@ -1236,6 +1236,11 @@
github = "ElvishJerricco";
name = "Will Fancher";
};
emmanuelrosa = {
email = "emmanuel_rosa@aol.com";
github = "emmanuelrosa";
name = "Emmanuel Rosa";
};
endgame = {
email = "jack@jackkelly.name";
github = "endgame";

69
nixos/modules/services/misc/gitea.nix
View File

@ -4,6 +4,7 @@ with lib;
let
cfg = config.services.gitea;
gitea = cfg.package;
pg = config.services.postgresql;
usePostgresql = cfg.database.type == "postgres";
configFile = pkgs.writeText "app.ini" ''
@ -57,6 +58,13 @@ in
description = "Enable Gitea Service.";
};
package = mkOption {
default = pkgs.gitea;
type = types.package;
defaultText = "pkgs.gitea";
description = "gitea derivation to use";
};
useWizard = mkOption {
default = false;
type = types.bool;
@ -156,6 +164,30 @@ in
};
};
dump = {
enable = mkOption {
type = types.bool;
default = false;
description = ''
Enable a timer that runs gitea dump to generate backup-files of the
current gitea database and repositories.
'';
};
interval = mkOption {
type = types.str;
default = "04:31";
example = "hourly";
description = ''
Run a gitea dump at this interval. Runs by default at 04:31 every day.
The format is described in
<citerefentry><refentrytitle>systemd.time</refentrytitle>
<manvolnum>7</manvolnum></citerefentry>.
'';
};
};
appName = mkOption {
type = types.str;
default = "gitea: Gitea Service";
@ -203,7 +235,7 @@ in
staticRootPath = mkOption {
type = types.str;
default = "${pkgs.gitea.data}";
default = "${gitea.data}";
example = "/var/lib/gitea/data";
description = "Upper level of template and static files path.";
};
@ -223,7 +255,7 @@ in
description = "gitea";
after = [ "network.target" "postgresql.service" ];
wantedBy = [ "multi-user.target" ];
path = [ pkgs.gitea.bin ];
path = [ gitea.bin ];
preStart = let
runConfig = "${cfg.stateDir}/custom/conf/app.ini";
@ -253,7 +285,7 @@ in
HOOKS=$(find ${cfg.repositoryRoot} -mindepth 4 -maxdepth 4 -type f -wholename "*git/hooks/*")
if [ "$HOOKS" ]
then
sed -ri 's,/nix/store/[a-z0-9.-]+/bin/gitea,${pkgs.gitea.bin}/bin/gitea,g' $HOOKS
sed -ri 's,/nix/store/[a-z0-9.-]+/bin/gitea,${gitea.bin}/bin/gitea,g' $HOOKS
sed -ri 's,/nix/store/[a-z0-9.-]+/bin/env,${pkgs.coreutils}/bin/env,g' $HOOKS
sed -ri 's,/nix/store/[a-z0-9.-]+/bin/bash,${pkgs.bash}/bin/bash,g' $HOOKS
sed -ri 's,/nix/store/[a-z0-9.-]+/bin/perl,${pkgs.perl}/bin/perl,g' $HOOKS
@ -261,7 +293,7 @@ in
if [ ! -d ${cfg.stateDir}/conf/locale ]
then
mkdir -p ${cfg.stateDir}/conf
cp -r ${pkgs.gitea.out}/locale ${cfg.stateDir}/conf/locale
cp -r ${gitea.out}/locale ${cfg.stateDir}/conf/locale
fi
'' + optionalString (usePostgresql && cfg.database.createDatabase) ''
if ! test -e "${cfg.stateDir}/db-created"; then
@ -288,7 +320,7 @@ in
User = cfg.user;
WorkingDirectory = cfg.stateDir;
PermissionsStartOnly = true;
ExecStart = "${pkgs.gitea.bin}/bin/gitea web";
ExecStart = "${gitea.bin}/bin/gitea web";
Restart = "always";
};
@ -318,5 +350,32 @@ in
name = "gitea-database-password";
text = cfg.database.password;
})));
systemd.services.gitea-dump = {
description = "gitea dump";
after = [ "gitea.service" ];
wantedBy = [ "default.target" ];
path = [ gitea.bin ];
environment = {
USER = cfg.user;
HOME = cfg.stateDir;
GITEA_WORK_DIR = cfg.stateDir;
};
serviceConfig = {
Type = "oneshot";
User = cfg.user;
ExecStart = "${gitea.bin}/bin/gitea dump";
WorkingDirectory = cfg.stateDir;
};
};
systemd.timers.gitea-dump = {
description = "Update timer for gitea-dump";
partOf = [ "gitea-dump.service" ];
wantedBy = [ "timers.target" ];
timerConfig.OnCalendar = cfg.dump.interval;
};
};
}

11
nixos/tests/mysql-replication.nix
View File

@ -57,18 +57,25 @@ in
$master->start;
$master->waitForUnit("mysql");
$master->waitForOpenPort(3306);
# Wait for testdb to be fully populated (5 rows).
$master->waitUntilSucceeds("mysql -u root -D testdb -N -B -e 'select count(id) from tests' | grep -q 5");
$slave1->start;
$slave2->start;
$slave1->waitForUnit("mysql");
$slave1->waitForOpenPort(3306);
$slave2->waitForUnit("mysql");
$slave2->waitForOpenPort(3306);
$slave2->succeed("echo 'use testdb; select * from tests' | mysql -u root -N | grep 4");
# wait for replications to finish
$slave1->waitUntilSucceeds("mysql -u root -D testdb -N -B -e 'select count(id) from tests' | grep -q 5");
$slave2->waitUntilSucceeds("mysql -u root -D testdb -N -B -e 'select count(id) from tests' | grep -q 5");
$slave2->succeed("systemctl stop mysql");
$master->succeed("echo 'insert into testdb.tests values (123, 456);' | mysql -u root -N");
$slave2->succeed("systemctl start mysql");
$slave2->waitForUnit("mysql");
$slave2->waitForOpenPort(3306);
$slave2->succeed("echo 'select * from testdb.tests where Id = 123;' | mysql -u root -N | grep 456");
$slave2->waitUntilSucceeds("echo 'select * from testdb.tests where Id = 123;' | mysql -u root -N | grep 456");
'';
})

2
nixos/tests/xss-lock.nix
View File

@ -20,6 +20,6 @@ with lib;
$machine->fail("pgrep xlock");
$machine->succeed("su -l alice -c 'xset dpms force standby'");
$machine->succeed("pgrep xlock");
$machine->waitUntilSucceeds("pgrep xlock");
'';
})

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

@ -14,7 +14,7 @@
stdenv.mkDerivation rec {
name = "csound-${version}";
version = "6.10.0";
version = "6.11.0";
enableParallelBuilding = true;
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
owner = "csound";
repo = "csound";
rev = version;
sha256 = "1mak183y8bn097z9q3k7f1kwvawkngkc4ch9hv6gqhgfy1cjln8n";
sha256 = "1nnfl8dqvc5b3f94zbvdg6bxr2wlp7as78hb31awxmvfwwihpv18";
};
cmakeFlags = [ "-DBUILD_CSOUND_AC=0" ] # fails to find Score.hpp

46
pkgs/applications/audio/musescore/default.nix
View File

@ -1,59 +1,37 @@
{ stdenv, fetchzip, cmake, pkgconfig
{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig
, alsaLib, freetype, libjack2, lame, libogg, libpulseaudio, libsndfile, libvorbis
, portaudio, qtbase, qtdeclarative, qtscript, qtsvg, qttools
, portaudio, portmidi, qtbase, qtdeclarative, qtscript, qtsvg, qttools
, qtwebkit, qtxmlpatterns
}:
stdenv.mkDerivation rec {
name = "musescore-${version}";
version = "2.1.0";
version = "2.2.1";
src = fetchzip {
url = "https://github.com/musescore/MuseScore/archive/v${version}.tar.gz";
sha256 = "1rlxz2nzilz7n6c0affnjk2wcxl4b8949qxs0xi555gxg01kybls";
src = fetchFromGitHub {
owner = "musescore";
repo = "MuseScore";
rev = "v${version}";
sha256 = "00lwcsnpyiq9l9x11nm24mzf67xmhzjhwi4c3iqry6ayi9c4p4qs";
};
hardeningDisable = [ "relro" "bindnow" ];
makeFlags = [
"PREFIX=$(out)"
];
cmakeFlags = [
"-DAEOLUS=OFF"
"-DZERBERUS=ON"
"-DOSC=ON=ON"
"-DOMR=OFF" # TODO: add OMR support, CLEF_G not declared error
"-DOCR=OFF" # Not necessary without OMR
"-DSOUNDFONT3=ON"
"-DHAS_AUDIOFILE=ON"
"-DBUILD_JACK=ON"
];
preBuild = ''
make lrelease
'';
postBuild = ''
make manpages
'';
] ++ lib.optional (lib.versionAtLeast freetype.version "2.5.2") "-DUSE_SYSTEM_FREETYPE=ON";
nativeBuildInputs = [ cmake pkgconfig ];
enableParallelBuilding = true;
buildInputs = [
alsaLib libjack2 freetype lame libogg libpulseaudio libsndfile libvorbis
portaudio qtbase qtdeclarative qtscript qtsvg qttools
qtwebkit qtxmlpatterns #tesseract
portaudio portmidi # tesseract
qtbase qtdeclarative qtscript qtsvg qttools qtwebkit qtxmlpatterns
];
meta = with stdenv.lib; {
description = "Music notation and composition software";
homepage = https://musescore.org/;
license = licenses.gpl2;
maintainers = with maintainers; [ vandenoever ];
platforms = platforms.linux;
maintainers = [ maintainers.vandenoever ];
repositories.git = https://github.com/musescore/MuseScore;
};
}

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

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "praat-${version}";
version = "6.0.38";
version = "6.0.40";
src = fetchurl {
url = "https://github.com/praat/praat/archive/v${version}.tar.gz";
sha256 = "1l01mdhd0kf6mnyrg8maydr56cpw4312gryk303kr0a4w0gwzhhc";
sha256 = "168qrrr59qxii265vba7pj6f61lzq5lk9c43zcda0wmmjp87bq1x";
};
configurePhase = ''

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

@ -6,11 +6,11 @@ with stdenv.lib;
stdenv.mkDerivation rec {
name = "feh-${version}";
version = "2.26.1";
version = "2.26.3";
src = fetchurl {
url = "https://feh.finalrewind.org/${name}.tar.bz2";
sha256 = "155clzkrzs7fh5nx924851di30hilcg16g192ldqqc12p5z5gikd";
sha256 = "08aagymgajcvciagwy2zdxhicvdfnjmd2xyx9bqjy7l1n16ydwrz";
};
outputs = [ "out" "man" "doc" ];

32
pkgs/applications/graphics/gimp/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, fetchpatch, autoreconfHook, pkgconfig, intltool, babl, gegl, gtk2, glib, gdk_pixbuf, isocodes
{ stdenv, fetchurl, autoreconfHook, pkgconfig, intltool, babl, gegl, gtk2, glib, gdk_pixbuf, isocodes
, pango, cairo, freetype, fontconfig, lcms, libpng, libjpeg, poppler, poppler_data, libtiff
, libmng, librsvg, libwmf, zlib, libzip, ghostscript, aalib, shared-mime-info
, python2Packages, libexif, gettext, xorg, glib-networking, libmypaint, gexiv2
@ -9,37 +9,13 @@ let
inherit (python2Packages) pygtk wrapPython python;
in stdenv.mkDerivation rec {
name = "gimp-${version}";
version = "2.10.0";
version = "2.10.2";
src = fetchurl {
url = "http://download.gimp.org/pub/gimp/v${stdenv.lib.versions.majorMinor version}/${name}.tar.bz2";
sha256 = "1qkxaigbfkx26xym5nzrgfrmn97cbnhn63v1saaha2nbi3xrdk3z";
sha256 = "1srkqd9cx1xmny7cyk3b6f14dknb3fd77whm38vlvr7grnpbmc0w";
};
patches = [
# fix rpath of python library https://bugzilla.gnome.org/show_bug.cgi?id=795620
(fetchurl {
url = https://bugzilla.gnome.org/attachment.cgi?id=371482;
sha256 = "18bysndh61pvlv255xapdrfpsl5ivm51wp1w7xgk9vky9z2y3llc";
})
# fix absolute paths stored in configuration
(fetchpatch {
url = https://git.gnome.org/browse/gimp/patch/?id=0fce8fdb3c056acead8322c976a96fb6fba793b6;
sha256 = "09845i3bdpdbf13razr04ksvwydxcvzhjwlb4dfgdv5q203g2ris";
})
(fetchpatch {
url = https://git.gnome.org/browse/gimp/patch/?id=f6b586237cb8c912c1503f8e6086edd17f07d4df;
sha256 = "0s68885ip2wgjvsl5vqi2f1xhxdjpzqprifzgdl1vnv6gqmfy3bh";
})
# fix pc file (needed e.g. for building plug-ins)
(fetchpatch {
url = https://git.gnome.org/browse/gimp/patch/?id=7e19906827d301eb70275dba089849a632a0eabe;
sha256 = "0cbjfbwvzg2hqihg3rpsga405v7z2qahj22dfqn2jrb2gbhrjcp1";
})
];
nativeBuildInputs = [ autoreconfHook pkgconfig intltool gettext wrapPython ];
propagatedBuildInputs = [ gegl ]; # needed by gimp-2.0.pc
buildInputs = [
@ -80,6 +56,8 @@ in stdenv.mkDerivation rec {
configureFlags = [
"--without-webkit" # old version is required
"--with-bug-report-url=https://github.com/NixOS/nixpkgs/issues/new"
"--with-icc-directory=/var/run/current-system/sw/share/color/icc"
];
doCheck = true;

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

@ -9,11 +9,11 @@
mkDerivation rec {
name = "krita-${version}";
version = "4.0.2";
version = "4.0.3";
src = fetchurl {
url = "https://download.kde.org/stable/krita/${version}/${name}.tar.gz";
sha256 = "136nia6z8l9czk3ls2c9dpk617cvfilfhx0s838g5nrqxh4kn0cf";
sha256 = "0zmn29dzqncc80pvy9ymgyzqw8x1ryq8b4x5mr4sz15iyj7xgspr";
};
nativeBuildInputs = [ cmake extra-cmake-modules ];

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

@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
name = "chirp-daily-${version}";
version = "20180512";
version = "20180519";
src = fetchurl {
url = "https://trac.chirp.danplanet.com/chirp_daily/daily-${version}/${name}.tar.gz";
sha256 = "111pijr0v36n3yg0p58mgvfxvz088axnxvgfhs8cblssi931mimm";
sha256 = "1sb4cw95lcj2cdfzzgnwjgmnpk2nqjys4am5qvj4pnh0x447sznv";
};
nativeBuildInputs = [ makeWrapper ];

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

@ -8,13 +8,13 @@ assert pulseaudioSupport -> libpulseaudio != null;
stdenv.mkDerivation rec {
name = "gqrx-${version}";
version = "2.11.4";
version = "2.11.5";
src = fetchFromGitHub {
owner = "csete";
repo = "gqrx";
rev = "v${version}";
sha256 = "0a5w9b3fi4f95j34cqsbzxks0d9hmrz4cznc8pi9b0pwvx13hqhm";
sha256 = "0q9i0dhd6blagxzk84pzqjq8n4ym3jc1mkkhygg8yncr4vq2saaf";
};
nativeBuildInputs = [ cmake ];

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

@ -6,13 +6,13 @@
let
pname = "krusader";
version = "2.6.0";
version = "2.7.0";
in mkDerivation rec {
name = "krusader-${version}";
src = fetchurl {
url = "mirror://kde/stable/${pname}/${version}/${name}.tar.xz";
sha256 = "0f9skfvp0hdml8qq6v22z9293ndijd8kwbpdj7wpvgd6mlya8qbh";
sha256 = "09ws3samxnjk0qi9pcfm2rmw0nr5mzn9pzpljgrdb5qj7cmm4hcb";
};
meta = with lib; {

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

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "worker-${version}";
version = "3.15.0";
version = "3.15.1";
src = fetchurl {
url = "http://www.boomerangsworld.de/cms/worker/downloads/${name}.tar.gz";
sha256 = "0baaxa10jnf4nralhjdi7525wd1wj0161z2ixz1j5pb0rl38brl8";
sha256 = "05h25dxqff4xhmrk7j9j11yxpqa4qm7m3xprv7yldryc1mbvnpwi";
};
buildInputs = [ libX11 ];

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

@ -10,14 +10,14 @@
stdenv.mkDerivation rec {
name = "palemoon-${version}";
version = "27.9.1";
version = "27.9.2";
src = fetchFromGitHub {
name = "palemoon-src";
owner = "MoonchildProductions";
repo = "Pale-Moon";
rev = version + "_Release";
sha256 = "1cjd0liy3x7iqx8g8mbwdrr0f2aiqjiaifzzkngcvx3vfmphj97k";
sha256 = "0v6vgkxac2s1hw1namvrjysj2k1kbkabwdxrpq6kyd8svr7n974r";
};
desktopItem = makeDesktopItem {

10
pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-facebook/default.nix
View File

@ -5,18 +5,18 @@ let
pidginHg = fetchhg {
url = "https://bitbucket.org/pidgin/main";
# take from VERSION file
rev = "c9b74a765767";
sha256 = "07bjz87jpslsb4gdqvcwp79mkahls2mfhlmpaa5w6n4xqhahw4j3";
rev = "9ff9acf9fa14";
sha256 = "06imlhsps4wrjgjb92zpaxprxfxl2pjb2x9pl859c8cryssrz2jv";
};
in stdenv.mkDerivation rec {
name = "purple-facebook-0.9.3";
name = "purple-facebook-0.9.5";
src = fetchFromGitHub {
owner = "dequis";
repo = "purple-facebook";
rev = "v0.9.3-c9b74a765767";
sha256 = "10ncvg0arcxnd3cpb0nxry1plbws0mw9vhzjrhb40sv2i563dywb";
rev = "v0.9.5-9ff9acf9fa14";
sha256 = "0a1860bkzrmyxahm9rlxi80z335w491wzdaqaw6j9ccavbymhwhs";
};
postPatch = ''

31
pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-lurch/default.nix Normal file
View File

@ -0,0 +1,31 @@
{ stdenv, fetchFromGitHub, cmake, pidgin, minixml, libxml2, sqlite, libgcrypt }:
stdenv.mkDerivation rec {
name = "purple-lurch-${version}";
version = "0.6.7";
src = fetchFromGitHub {
owner = "gkdr";
repo = "lurch";
rev = "v${version}";
sha256 = "029jjqinsfhpv0zgji3sv1cyk54fn9qp176fwy97d1clf0vflxrz";
fetchSubmodules = true;
};
nativeBuildInputs = [ cmake ];
buildInputs = [ pidgin minixml libxml2 sqlite libgcrypt ];
dontUseCmakeConfigure = true;
installPhase = ''
install -Dm755 -t $out/lib/purple-2 build/lurch.so
'';
meta = with stdenv.lib; {
homepage = https://github.com/gkdr/lurch;
description = "XEP-0384: OMEMO Encryption for libpurple";
license = licenses.gpl3;
platforms = platforms.linux;
maintainers = with maintainers; [ emmanuelrosa ];
};
}

4
pkgs/applications/networking/instant-messengers/pidgin/default.nix
View File

@ -15,11 +15,11 @@
let unwrapped = stdenv.mkDerivation rec {
name = "pidgin-${version}";
majorVersion = "2";
version = "${majorVersion}.12.0";
version = "${majorVersion}.13.0";
src = fetchurl {
url = "mirror://sourceforge/pidgin/${name}.tar.bz2";
sha256 = "1y5p2mq3bfw35b66jsafmbva0w5gg1k99y9z8fyp3jfksqv3agcc";
sha256 = "13vdqj70315p9rzgnbxjp9c51mdzf1l4jg1kvnylc4bidw61air7";
};
inherit nss ncurses;

48
pkgs/applications/networking/instant-messengers/swift-im/default.nix Normal file
View File

@ -0,0 +1,48 @@
{ stdenv, fetchurl, pkgconfig, qttools, scons
, GConf, avahi, boost, hunspell, libXScrnSaver, libedit, libidn, libnatpmp, libxml2
, lua, miniupnpc, openssl, qtbase, qtmultimedia, qtsvg, qtwebkit, qtx11extras, zlib
}:
let
_scons = "scons -j$NIX_BUILD_CORES";
in stdenv.mkDerivation rec {
name = "swift-im-${version}";
version = "4.0.2";
src = fetchurl {
url = "https://swift.im/downloads/releases/swift-${version}/swift-${version}.tar.gz";
sha256 = "0w0aiszjd58ynxpacwcgf052zpmbpcym4dhci64vbfgch6wryz0w";
};
patches = [ ./scons.patch ];
nativeBuildInputs = [ pkgconfig qttools scons ];
buildInputs = [
GConf avahi boost hunspell libXScrnSaver libedit libidn libnatpmp libxml2
lua miniupnpc openssl qtbase qtmultimedia qtsvg qtwebkit qtx11extras zlib
];
propagatedUserEnvPkgs = [ GConf ];
NIX_CFLAGS_COMPILE = [
"-I${libxml2.dev}/include/libxml2"
"-I${miniupnpc}/include/miniupnpc"
];
buildPhase = ''
${_scons} Swift
'';
installPhase = ''
${_scons} SWIFT_INSTALLDIR=$out $out
'';
meta = with stdenv.lib; {
homepage = https://swift.im/;
description = "Qt XMPP client";
license = licenses.gpl3;
maintainers = with maintainers; [ orivej ];
platforms = platforms.linux;
};
}

53
pkgs/applications/networking/instant-messengers/swift-im/scons.patch Normal file
View File

@ -0,0 +1,53 @@
diff --git a/BuildTools/SCons/SConscript.boot b/BuildTools/SCons/SConscript.boot
index 40f242513..53e1ff26a 100644
--- a/BuildTools/SCons/SConscript.boot
+++ b/BuildTools/SCons/SConscript.boot
@@ -508,6 +508,7 @@ if env.get("distcc", False) :
if var.startswith("DISTCC_") :
env["ENV"][var] = os.environ[var]
+env["ENV"] = os.environ
conf_env = env.Clone()
Export("env")
diff --git a/BuildTools/SCons/SConstruct b/BuildTools/SCons/SConstruct
index 70bffbcfe..fef281899 100644
--- a/BuildTools/SCons/SConstruct
+++ b/BuildTools/SCons/SConstruct
@@ -272,7 +272,7 @@ if env.get("try_gconf", True) and env["PLATFORM"] != "win32" and env["PLATFORM"]
gconf_env = conf_env.Clone()
conf = Configure(gconf_env, custom_tests = {"CheckPKG": CheckPKG})
if conf.CheckPKG("gconf-2.0") :
- gconf_bare_env = Environment()
+ gconf_bare_env = Environment(ENV = os.environ)
gconf_bare_env.ParseConfig('pkg-config --cflags gconf-2.0 gobject-2.0 --libs gconf-2.0 gobject-2.0')
if os.path.basename(env["CXX"]).startswith(("g++", "clang++")) :
gconf_bare_env["CCFLAGS"] = [("-isystem" + ccflag) for ccflag in gconf_bare_env["CPPPATH"]]
@@ -634,9 +634,9 @@ hunspell_env.MergeFlags(hunspell_flags)
env["HAVE_HUNSPELL"] = 0;
if env.get("hunspell_enable", False) :
hunspell_conf = Configure(hunspell_env)
- if hunspell_conf.CheckCXXHeader("hunspell/hunspell.hxx") and hunspell_conf.CheckLib("hunspell") :
+ if hunspell_conf.CheckCXXHeader("hunspell/hunspell.hxx") and hunspell_conf.CheckLib("hunspell-1.6") :
env["HAVE_HUNSPELL"] = 1
- hunspell_flags["LIBS"] = ["hunspell"]
+ hunspell_flags["LIBS"] = ["hunspell-1.6"]
env["HUNSPELL_FLAGS"] = hunspell_flags
hunspell_conf.Finish()
diff --git a/BuildTools/SCons/Tools/textfile.py b/BuildTools/SCons/Tools/textfile.py
index 89f8963dc..b8559f7a6 100644
--- a/BuildTools/SCons/Tools/textfile.py
+++ b/BuildTools/SCons/Tools/textfile.py
@@ -113,7 +113,10 @@ def _action(target, source, env):
lsep = None
for s in source:
if lsep: fd.write(lsep)
- fd.write(_do_subst(s, subs))
+ b = _do_subst(s, subs)
+ if isinstance(b, unicode):
+ b = b.encode('UTF-8')
+ fd.write(b)
lsep = linesep
fd.close()

2
pkgs/applications/networking/irc/communi/default.nix
View File

@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
"
'';
postInstall = ''
postInstall = stdenv.lib.optionalString stdenv.isLinux ''
substituteInPlace "$out/share/applications/communi.desktop" \
--replace "/usr/bin" "$out/bin"
'';

4
pkgs/applications/networking/mailreaders/mutt/default.nix
View File

@ -27,11 +27,11 @@ with stdenv.lib;
stdenv.mkDerivation rec {
name = "mutt-${version}";
version = "1.9.5";
version = "1.10.0";
src = fetchurl {
url = "http://ftp.mutt.org/pub/mutt/${name}.tar.gz";
sha256 = "0lsp72lm3cw490x7lhzia7h8f591bab2mr7qpscaj22fmrj7wqdz";
sha256 = "0nskymwr2cdapxlfv0ysz3bjwhb4kcvl5a3c39237k7r1vwva582";
};
patches = optional smimeSupport (fetchpatch {

12
pkgs/applications/networking/remote/x2goclient/default.nix
View File

@ -1,4 +1,5 @@
{ stdenv, fetchurl, cups, libssh, libXpm, nxproxy, openldap, openssh, makeWrapper, qt4 }:
{ stdenv, fetchurl, cups, libssh, libXpm, nxproxy, openldap, openssh,
makeWrapper, qtbase, qtsvg, qtx11extras, qttools, phonon }:
stdenv.mkDerivation rec {
name = "x2goclient-${version}";
@ -9,18 +10,19 @@ stdenv.mkDerivation rec {
sha256 = "0jzlwn0v8b123h5l7hrhs35x2z6mb98zg1s0shqb4yfp2g641yp3";
};
buildInputs = [ cups libssh libXpm nxproxy openldap openssh qt4 ];
buildInputs = [ cups libssh libXpm nxproxy openldap openssh
qtbase qtsvg qtx11extras qttools phonon ];
nativeBuildInputs = [ makeWrapper ];
patchPhase = ''
substituteInPlace Makefile \
--replace "SHELL=/bin/bash" "SHELL=$SHELL" \
--replace "lrelease-qt4" "${qt4}/bin/lrelease" \
--replace "qmake-qt4" "${qt4}/bin/qmake" \
--replace "lrelease-qt4" "${qttools.dev}/bin/lrelease" \
--replace "qmake-qt4" "${qtbase.dev}/bin/qmake" \
--replace "-o root -g root" ""
'';
makeFlags = [ "PREFIX=$(out)" "ETCDIR=$(out)/etc" ];
makeFlags = [ "PREFIX=$(out)" "ETCDIR=$(out)/etc" "build_client" "build_man" ];
enableParallelBuilding = true;

4
pkgs/applications/science/math/pari/default.nix
View File

@ -8,11 +8,11 @@ assert withThread -> libpthreadstubs != null;
stdenv.mkDerivation rec {
name = "pari-${version}";
version = "2.9.4";
version = "2.9.5";
src = fetchurl {
url = "http://pari.math.u-bordeaux.fr/pub/pari/unix/${name}.tar.gz";
sha256 = "0ir6m3a8r46md5x6zk4xf159qra7aqparby9zk03k81hjrrxr72g";
sha256 = "05z6y5iwdzcdggbrkic9cy9vy9wmk5qxc21cb4lqnbqxnhjihibb";
};
buildInputs = [

7
pkgs/applications/video/shotcut/default.nix
View File

@ -3,15 +3,18 @@
, qtgraphicaleffects, libmlt
, qmake, makeWrapper }:
assert stdenv.lib.versionAtLeast libmlt.version "6.8.0";
assert stdenv.lib.versionAtLeast mlt.version "6.8.0";
stdenv.mkDerivation rec {
name = "shotcut-${version}";
version = "18.03.06";
version = "18.05.08";
src = fetchFromGitHub {
owner = "mltframework";
repo = "shotcut";
rev = "v${version}";
sha256 = "1b8hfym89i1nmrx80y16z06zsff5qba7gpga8jydnw1lmcscdash";
sha256 = "1qm1ycsx93qpw2vga25m3cr82vzqla1qqardjiln3iqfa0m93qsk";
};
enableParallelBuilding = true;

4
pkgs/build-support/trivial-builders.nix
View File

@ -157,14 +157,14 @@ rec {
hash = if sha256 != null then sha256 else sha1;
name_ = if name == null then baseNameOf (toString url) else name;
in
stdenv.mkDerivation {
stdenvNoCC.mkDerivation {
name = name_;
outputHashMode = hashMode;
outputHashAlgo = hashAlgo;
outputHash = hash;
preferLocalBuild = true;
builder = writeScript "restrict-message" ''
source ${stdenv}/setup
source ${stdenvNoCC}/setup
cat <<_EOF_
***

4
pkgs/data/misc/osinfo-db/default.nix
View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl, osinfo-db-tools, intltool, libxml2 }:
stdenv.mkDerivation rec {
name = "osinfo-db-20180502";
name = "osinfo-db-20180514";
src = fetchurl {
url = "https://releases.pagure.org/libosinfo/${name}.tar.xz";
sha256 = "05036mpc5hapx616lfzc67xj157hw3mgyk0arv3brjcx0qmzaram";
sha256 = "1pyz89gwn3s9ha4chgfcfddi6dixm2dp4zsypfd38fwhqa9v0ij2";
};
nativeBuildInputs = [ osinfo-db-tools intltool libxml2 ];

47
pkgs/development/compilers/nim/default.nix
View File

@ -1,12 +1,14 @@
{ stdenv, lib, fetchurl, makeWrapper, nodejs, openssl, pcre, readline, sqlite }:
# based on https://github.com/nim-lang/Nim/blob/v0.18.0/.travis.yml
{ stdenv, lib, fetchurl, makeWrapper, nodejs-slim-8_x, openssl, pcre, readline, sqlite, boehmgc, sfml, tzdata, coreutils }:
stdenv.mkDerivation rec {
name = "nim-${version}";
version = "0.17.2";
version = "0.18.0";
src = fetchurl {
url = "https://nim-lang.org/download/${name}.tar.xz";
sha256 = "1gc2xk3ygmz9y4pm75pligssgw995a7gvnfpy445fjpw4d81pzxa";
sha256 = "45c74adb35f08dfa9add1112ae17330e5d902ebb4a36e7046caee8b79e6f3bd0";
};
doCheck = true;
@ -18,6 +20,7 @@ stdenv.mkDerivation rec {
"-lpcre"
"-lreadline"
"-lsqlite3"
"-lgc"
];
# 1. nodejs is only needed for tests
@ -25,12 +28,12 @@ stdenv.mkDerivation rec {
# used for bootstrapping, but koch insists on moving the nim compiler around
# as part of building it, so it cannot be read-only
buildInputs = [
makeWrapper nodejs
openssl pcre readline sqlite
buildInputs = [
makeWrapper nodejs-slim-8_x tzdata coreutils
openssl pcre readline sqlite boehmgc sfml
];
buildPhase = ''
buildPhase = ''
sh build.sh
./bin/nim c koch
./koch boot -d:release \
@ -48,7 +51,35 @@ stdenv.mkDerivation rec {
--suffix PATH : ${lib.makeBinPath [ stdenv.cc ]}
'';
checkPhase = "./koch tests";
postPatch =
let disableTest = ''sed -i '1i discard \"\"\"\n disabled: true\n\"\"\"\n\n' '';
disableCompile = ''sed -i -e 's/^/#/' '';
in ''
substituteInPlace ./tests/async/tioselectors.nim --replace "/bin/sleep" "sleep"
substituteInPlace ./tests/osproc/tworkingdir.nim --replace "/usr/bin" "${coreutils}/bin"
substituteInPlace ./tests/stdlib/ttimes.nim --replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo"
# disable supposedly broken tests
${disableTest} ./tests/errmsgs/tproper_stacktrace2.nim
${disableTest} ./tests/vm/trgba.nim
# disable tests requiring network access (not available in the build container)
${disableTest} ./tests/stdlib/thttpclient.nim
${disableTest} ./tests/cpp/tasync_cpp.nim
${disableTest} ./tests/niminaction/Chapter7/Tweeter/src/tweeter.nim
# disable tests requiring un-downloadable dependencies (using nimble, which isn't available in the fetch phase)
${disableCompile} ./tests/manyloc/keineschweine/keineschweine.nim
${disableTest} ./tests/manyloc/keineschweine/keineschweine.nim
${disableCompile} ./tests/manyloc/nake/nakefile.nim
${disableTest} ./tests/manyloc/nake/nakefile.nim
${disableCompile} ./tests/manyloc/named_argument_bug/main.nim
${disableTest} ./tests/manyloc/named_argument_bug/main.nim
'';
checkPhase = ''
./koch tests
'';
meta = with stdenv.lib; {
description = "Statically typed, imperative programming language";

3
pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
View File

@ -408,6 +408,9 @@ self: super: {
jailbreak = true;
});
# https://github.com/jcristovao/enclosed-exceptions/issues/12
enclosed-exceptions = dontCheck super.enclosed-exceptions;
# Older versions don't compile.
base-compat = self.base-compat_0_10_1;
brick = self.brick_0_37;

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

@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "babl-0.1.48";
name = "babl-0.1.50";
src = fetchurl {
url = "http://ftp.gtk.org/pub/babl/0.1/${name}.tar.bz2";
sha256 = "0596flzqzdlq4y6lsg34szh1ffgyccghp8y1k9h4d3jwymfd16xy";
sha256 = "0bavr2y4v88pip7vlca4kwmnksk2qxcvkkdp9jyfi6pzh701sb5m";
};
doCheck = true;

8
pkgs/development/libraries/libcommuni/default.nix
View File

@ -19,12 +19,16 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
dontUseQmakeConfigure = true;
configureFlags = "-config release";
configureFlags = [ "-config" "release" ];
preConfigure = ''
sed -i -e 's|/bin/pwd|pwd|g' configure
'';
doCheck = true;
# The tests fail on darwin because of install_name if they run
# before the frameworks are installed.
doInstallCheck = true;
installCheckTarget = "check";
# Hack to avoid TMPDIR in RPATHs.
preFixup = "rm -rf lib";

22
pkgs/development/libraries/libnatpmp/default.nix Normal file
View File

@ -0,0 +1,22 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "libnatpmp-${version}";
version = "20150609";
src = fetchurl {
name = "${name}.tar.gz";
url = "http://miniupnp.free.fr/files/download.php?file=${name}.tar.gz";
sha256 = "1c1n8n7mp0amsd6vkz32n8zj3vnsckv308bb7na0dg0r8969rap1";
};
makeFlags = [ "INSTALLPREFIX=$(out)" ];
meta = with stdenv.lib; {
homepage = http://miniupnp.free.fr/libnatpmp.html;
description = "NAT-PMP client";
license = licenses.bsd3;
maintainers = with maintainers; [ orivej ];
platforms = platforms.linux;
};
}

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

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "librealsense-${version}";
version = "2.11.0";
version = "2.11.1";
src = fetchFromGitHub {
owner = "IntelRealSense";
repo = "librealsense";
rev = "v${version}";
sha256 = "11vzs2m6jh9v1xbffr2k541pymmih6g4w641mp8rll8qzqfh89i0";
sha256 = "1r27pdisg4hl4x23lrmykqfdc5agrc4pi161mhvzd1vjfkjrxbid";
};
buildInputs = [

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

@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
pname = "simpleitk";
version = "1.0.0";
version = "1.1.0";
name = "${pname}-${version}";
src = fetchurl {
url = "https://sourceforge.net/projects/${pname}/files/SimpleITK/${version}/Source/SimpleITK-${version}.tar.gz";
sha256 = "0554j0zp314zhs8isfg31fi6gvsl7xq3xjyyxkx1b1mjkn5qx673";
sha256 = "01y8s73mw4yabqir2f8qp5zc1c0y6szi18rr4zwgsxz62g4drzgm";
};
nativeBuildInputs = [ cmake git swig ];

35
pkgs/development/libraries/spdk/default.nix Normal file
View File

@ -0,0 +1,35 @@
{ stdenv, fetchFromGitHub, python, cunit, dpdk, libaio, libuuid, numactl, openssl }:
stdenv.mkDerivation rec {
name = "spdk-${version}";
version = "18.04";
src = fetchFromGitHub {
owner = "spdk";
repo = "spdk";
rev = "v${version}";
sha256 = "07i13jkf63h5ld9djksxl445v1mj6m5cbq4xydix9y5qcxwlss3n";
};
nativeBuildInputs = [ python ];
buildInputs = [ cunit dpdk libaio libuuid numactl openssl ];
postPatch = ''
patchShebangs .
'';
configureFlags = [ "--with-dpdk=${dpdk}" ];
NIX_CFLAGS_COMPILE = [ "-mssse3" ]; # Necessary to compile.
enableParallelBuilding = true;
meta = with stdenv.lib; {
description = "Set of libraries for fast user-mode storage";
homepage = http://www.spdk.io;
license = licenses.bsd3;
platforms = [ "x86_64-linux" ];
maintainers = with maintainers; [ orivej ];
};
}

31
pkgs/development/python-modules/pypcap/default.nix
View File

@ -1,13 +1,12 @@
{ stdenv, lib, writeText, buildPythonPackage, fetchPypi, libpcap, dpkt }:
{ lib, writeText, buildPythonPackage, fetchPypi, libpcap, dpkt }:
buildPythonPackage rec {
pname = "pypcap";
version = "1.2.1";
name = "${pname}-${version}";
version = "1.2.2";
src = fetchPypi {
inherit pname version;
sha256 = "9ca9f79ca839fdc8fd37393509e2cb06be70f8db03f8cfe1857ca40cac1149f0";
sha256 = "07ww25z4xydp11hb38halh1940gmp5lca11hwfb63zv3bps248x3";
};
patches = [
@ -17,26 +16,24 @@ buildPythonPackage rec {
''
--- a/setup.py
+++ b/setup.py
@@ -27,7 +27,8 @@ def recursive_search(path, target_files):
@@ -28,6 +28,7 @@ def recursive_search(path, target_files):
def get_extension():
# A list of all the possible search directories
- dirs = ['/usr', sys.prefix] + glob.glob('/opt/libpcap*') + \
+ dirs = ['${libpcap}', '/usr', sys.prefix] + \
+ glob.glob('/opt/libpcap*') + \
glob.glob('../libpcap*') + glob.glob('../wpdpack*') + \
glob.glob('/Applications/Xcode.app/Contents/Developer/Platforms/' +
'MacOSX.platform/Developer/SDKs/*')
def find_prefix_and_pcap_h():
prefixes = chain.from_iterable((
+ '${libpcap}',
('/usr', sys.prefix),
glob.glob('/opt/libpcap*'),
glob.glob('../libpcap*'),
'')
];
buildInputs = [ libpcap ];
nativeBuildInputs = [ dpkt ];
checkInputs = [ dpkt ];
meta = {
meta = with lib; {
homepage = https://github.com/pynetwork/pypcap;
description = "Simplified object-oriented Python wrapper for libpcap";
license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [ geistesk ];
license = licenses.bsd3;
maintainers = with maintainers; [ geistesk ];
};
}

119
pkgs/development/python-modules/pysdl2/PySDL2-dll.patch Normal file
View File

@ -0,0 +1,119 @@
diff -ru PySDL2-0.9.6-old/sdl2/dll.py PySDL2-0.9.6/sdl2/dll.py
--- PySDL2-0.9.6-old/sdl2/dll.py 2018-03-08 10:18:37.583471745 +0100
+++ PySDL2-0.9.6/sdl2/dll.py 2018-03-08 10:20:06.705517520 +0100
@@ -45,29 +45,31 @@
"""Function wrapper around the different DLL functions. Do not use or
instantiate this one directly from your user code.
"""
- def __init__(self, libinfo, libnames, path=None):
- self._dll = None
- foundlibs = _findlib(libnames, path)
- dllmsg = "PYSDL2_DLL_PATH: %s" % (os.getenv("PYSDL2_DLL_PATH") or "unset")
- if len(foundlibs) == 0:
- raise RuntimeError("could not find any library for %s (%s)" %
- (libinfo, dllmsg))
- for libfile in foundlibs:
- try:
- self._dll = CDLL(libfile)
- self._libfile = libfile
- break
- except Exception as exc:
- # Could not load the DLL, move to the next, but inform the user
- # about something weird going on - this may become noisy, but
- # is better than confusing the users with the RuntimeError below
- warnings.warn(repr(exc), DLLWarning)
- if self._dll is None:
- raise RuntimeError("found %s, but it's not usable for the library %s" %
- (foundlibs, libinfo))
- if path is not None and sys.platform in ("win32",) and \
- path in self._libfile:
- os.environ["PATH"] = "%s;%s" % (path, os.environ["PATH"])
+ def __init__(self, libfile):
+ self._dll = CDLL(libfile)
+ self._libfile = libfile
+ # self._dll = None
+ # foundlibs = _findlib(libnames, path)
+ # dllmsg = "PYSDL2_DLL_PATH: %s" % (os.getenv("PYSDL2_DLL_PATH") or "unset")
+ # if len(foundlibs) == 0:
+ # raise RuntimeError("could not find any library for %s (%s)" %
+ # (libinfo, dllmsg))
+ # for libfile in foundlibs:
+ # try:
+ # self._dll = CDLL(libfile)
+ # self._libfile = libfile
+ # break
+ # except Exception as exc:
+ # # Could not load the DLL, move to the next, but inform the user
+ # # about something weird going on - this may become noisy, but
+ # # is better than confusing the users with the RuntimeError below
+ # warnings.warn(repr(exc), DLLWarning)
+ # if self._dll is None:
+ # raise RuntimeError("found %s, but it's not usable for the library %s" %
+ # (foundlibs, libinfo))
+ # if path is not None and sys.platform in ("win32",) and \
+ # path in self._libfile:
+ # os.environ["PATH"] = "%s;%s" % (path, os.environ["PATH"])
def bind_function(self, funcname, args=None, returns=None, optfunc=None):
"""Binds the passed argument and return value types to the specified
@@ -110,7 +112,7 @@
return
try:
- dll = DLL("SDL2", ["SDL2", "SDL2-2.0"], os.getenv("PYSDL2_DLL_PATH"))
+ dll = DLL("SDL2")
except RuntimeError as exc:
raise ImportError(exc)
diff -ru PySDL2-0.9.6-old/sdl2/sdlgfx.py PySDL2-0.9.6/sdl2/sdlgfx.py
--- PySDL2-0.9.6-old/sdl2/sdlgfx.py 2018-03-08 10:18:37.585471769 +0100
+++ PySDL2-0.9.6/sdl2/sdlgfx.py 2018-03-08 10:20:06.705517520 +0100
@@ -34,8 +34,7 @@
]
try:
- dll = DLL("SDL2_gfx", ["SDL2_gfx", "SDL2_gfx-1.0"],
- os.getenv("PYSDL2_DLL_PATH"))
+ dll = DLL("SDL2_gfx")
except RuntimeError as exc:
raise ImportError(exc)
diff -ru PySDL2-0.9.6-old/sdl2/sdlimage.py PySDL2-0.9.6/sdl2/sdlimage.py
--- PySDL2-0.9.6-old/sdl2/sdlimage.py 2018-03-08 10:18:37.585471769 +0100
+++ PySDL2-0.9.6/sdl2/sdlimage.py 2018-03-08 10:20:06.705517520 +0100
@@ -26,8 +26,7 @@
]
try:
- dll = DLL("SDL2_image", ["SDL2_image", "SDL2_image-2.0"],
- os.getenv("PYSDL2_DLL_PATH"))
+ dll = DLL("SDL2_image")
except RuntimeError as exc:
raise ImportError(exc)
diff -ru PySDL2-0.9.6-old/sdl2/sdlmixer.py PySDL2-0.9.6/sdl2/sdlmixer.py
--- PySDL2-0.9.6-old/sdl2/sdlmixer.py 2018-03-08 10:18:37.585471769 +0100
+++ PySDL2-0.9.6/sdl2/sdlmixer.py 2018-03-08 10:20:27.415758478 +0100
@@ -50,8 +50,7 @@
]
try:
- dll = DLL("SDL2_mixer", ["SDL2_mixer", "SDL2_mixer-2.0"],
- os.getenv("PYSDL2_DLL_PATH"))
+ dll = DLL("SDL2_mixer")
except RuntimeError as exc:
raise ImportError(exc)
diff -ru PySDL2-0.9.6-old/sdl2/sdlttf.py PySDL2-0.9.6/sdl2/sdlttf.py
--- PySDL2-0.9.6-old/sdl2/sdlttf.py 2018-03-08 10:18:37.585471769 +0100
+++ PySDL2-0.9.6/sdl2/sdlttf.py 2018-03-08 10:20:06.705517520 +0100
@@ -38,8 +38,7 @@
]
try:
- dll = DLL("SDL2_ttf", ["SDL2_ttf", "SDL2_ttf-2.0"],
- os.getenv("PYSDL2_DLL_PATH"))
+ dll = DLL("SDL2_ttf")
except RuntimeError as exc:
raise ImportError(exc)

41
pkgs/development/python-modules/pysdl2/default.nix Normal file
View File

@ -0,0 +1,41 @@
{ stdenv, lib, fetchPypi, buildPythonPackage, fetchurl, SDL2, SDL2_ttf, SDL2_image, SDL2_gfx, SDL2_mixer, pyopengl }:
buildPythonPackage rec {
pname = "PySDL2";
version = "0.9.6";
# The tests use OpenGL using find_library, which would have to be
# patched; also they seem to actually open X windows and test stuff
# like "screensaver disabling", which would have to be cleverly
# sandboxed. Disable for now.
doCheck = false;
src = fetchPypi {
inherit pname version;
sha256 = "08r1v9wdq8pzds4g3sng2xgh1hlzfs2z7qgy5a6b0xrs96swlamm";
};
# Deliberately not in propagated build inputs; users can decide
# which library they want to include.
buildInputs = [ SDL2_ttf SDL2_image SDL2_gfx SDL2_mixer ];
propagatedBuildInputs = [ SDL2 ];
patches = [ ./PySDL2-dll.patch ];
postPatch = ''
substituteInPlace sdl2/dll.py --replace \
"DLL(\"SDL2\")" "DLL('${SDL2}/lib/libSDL2${stdenv.hostPlatform.extensions.sharedLibrary}')"
substituteInPlace sdl2/sdlttf.py --replace \
"DLL(\"SDL2_ttf\")" "DLL('${SDL2_ttf}/lib/libSDL2_ttf${stdenv.hostPlatform.extensions.sharedLibrary}')"
substituteInPlace sdl2/sdlimage.py --replace \
"DLL(\"SDL2_image\")" "DLL('${SDL2_image}/lib/libSDL2_image${stdenv.hostPlatform.extensions.sharedLibrary}')"
substituteInPlace sdl2/sdlgfx.py --replace \
"DLL(\"SDL2_gfx\")" "DLL('${SDL2_gfx}/lib/libSDL2_gfx${stdenv.hostPlatform.extensions.sharedLibrary}')"
substituteInPlace sdl2/sdlmixer.py --replace \
"DLL(\"SDL2_mixer\")" "DLL('${SDL2_mixer}/lib/libSDL2_mixer${stdenv.hostPlatform.extensions.sharedLibrary}')"
'';
meta = {
description = "A wrapper around the SDL2 library and as such similar to the discontinued PySDL project";
homepage = https://github.com/marcusva/py-sdl2;
license = lib.licenses.publicDomain;
maintainers = with lib.maintainers; [ pmiddend ];
};
}

2
pkgs/development/tools/build-managers/gn/default.nix
View File

@ -69,7 +69,7 @@ in stdenv.mkDerivation {
patches = [
(fetchpatch {
url = "https://raw.githubusercontent.com/Eloston/ungoogled-chromium/master/resources/patches/ungoogled-chromium/macos/fix-gn-bootstrap.patch";
url = "https://raw.githubusercontent.com/Eloston/ungoogled-chromium/3375fbc7b865dafe1230431a1e3f9bffd27ec184/resources/patches/ungoogled-chromium/macos/fix-gn-bootstrap.patch";
sha256 = "1h8jgxznm7zrxlzb4wcfx4zx4lyvfrmpd0r7cd7h0s23wn8ibb3a";
})
];

4
pkgs/development/tools/misc/uncrustify/default.nix
View File

@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
name = "${product}-${version}";
product = "uncrustify";
version = "0.66.1";
version = "0.67";
src = fetchFromGitHub {
owner = product;
repo = product;
rev = name;
sha256 = "1y69b0g07ksynf1fwfh5qqwmscxfbvs1yi3n3lbdd4vplb9zakyx";
sha256 = "0hf8c93aj1hjg6cc77x6p7nf7ddp8mn4b6a9gpcrvmx8w81afpd3";
};
nativeBuildInputs = [ cmake ];

6
pkgs/development/tools/profiling/heaptrack/default.nix
View File

@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
name = "heaptrack-${version}";
version = "2018-01-28";
version = "1.1.0";
src = fetchFromGitHub {
owner = "KDE";
repo = "heaptrack";
rev = "a4534d52788ab9814efca1232d402b2eb319342c";
sha256 = "00xfv51kavvcmwgfmcixx0k5vhd06gkj5q0mm8rwxiw6215xp41a";
rev = "v${version}";
sha256 = "0vgwldl5n41r4y3pv8w29gmyln0k2w6m59zrfw9psm4hkxvivzlx";
};
nativeBuildInputs = [ cmake extra-cmake-modules ];

4
pkgs/development/tools/rust/bindgen/default.nix
View File

@ -4,13 +4,13 @@
rustPlatform.buildRustPackage rec {
name = "rust-bindgen-${version}";
version = "0.36.1";
version = "0.37.0";
src = fetchFromGitHub {
owner = "rust-lang-nursery";
repo = "rust-bindgen";
rev = "v${version}";
sha256 = "0y99dvkbkd4vhac26dmc3bwf6z2m85p2il7mndvv8liam012pkbz";
sha256 = "0cqjr7qspjrfgqcp4nqxljmhhbqyijb2jpw3lajgjj48y6wrnw93";
};
nativeBuildInputs = [ makeWrapper ];

33
pkgs/development/web/kcgi/default.nix Normal file
View File

@ -0,0 +1,33 @@
{ stdenv, pkgconfig, fetchFromGitHub, libbsd }:
stdenv.mkDerivation rec {
pname = "kcgi";
version = "0.10.5";
underscoreVersion = stdenv.lib.replaceChars ["."] ["_"] version;
name = "${pname}-${version}";
src = fetchFromGitHub {
owner = "kristapsdz";
repo = pname;
rev = "VERSION_${underscoreVersion}";
sha256 = "0ksdjqibkj7h1a99i84i6y0949c0vwx789q0sslzdkkgqvjnw3xw";
};
patchPhase = ''substituteInPlace configure \
--replace /usr/local /
'';
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ ] ++ stdenv.lib.optionals stdenv.isLinux [ libbsd ] ;
dontAddPrefix = true;
installFlags = [ "DESTDIR=$(out)" ];
meta = with stdenv.lib; {
homepage = https://kristaps.bsd.lv/kcgi;
description = "Minimal CGI and FastCGI library for C/C++";
license = licenses.isc;
platforms = platforms.all;
maintainers = [ maintainers.leenaars ];
};
}

6
pkgs/games/0ad/data.nix
View File

@ -1,12 +1,12 @@
{ stdenv, fetchurl }:
{ stdenv, fetchurl, zeroad-unwrapped }:
stdenv.mkDerivation rec {
name = "0ad-data-${version}";
version = "0.0.22";
inherit (zeroad-unwrapped) version;
src = fetchurl {
url = "http://releases.wildfiregames.com/0ad-${version}-alpha-unix-data.tar.xz";
sha256 = "0vknk9ay9h2p34r7mym2g066f3s3c5d5vmap0ckcs5b86h5cscjc";
sha256 = "1b6qcvd8yyyxavgdwpcs7asmln3xgnvjkglz6ggvwb956x37ggzx";
};
installPhase = ''

4
pkgs/games/0ad/default.nix
View File

@ -1,10 +1,10 @@
{ newScope }:
{ wxGTK, newScope }:
let
callPackage = newScope self;
self = {
zeroad-unwrapped = callPackage ./game.nix { };
zeroad-unwrapped = callPackage ./game.nix { inherit wxGTK; };
zeroad-data = callPackage ./data.nix { };

21
pkgs/games/0ad/game.nix
View File

@ -1,7 +1,7 @@
{ stdenv, lib, callPackage, perl, fetchurl, python2
, pkgconfig, spidermonkey_38, boost, icu, libxml2, libpng
, pkgconfig, spidermonkey_38, boost, icu, libxml2, libpng, libsodium
, libjpeg, zlib, curl, libogg, libvorbis, enet, miniupnpc
, openal, libGLU_combined, xproto, libX11, libXcursor, nspr, SDL, SDL2
, openal, libGLU_combined, xproto, libX11, libXcursor, nspr, SDL2
, gloox, nvidia-texture-tools
, withEditor ? true, wxGTK ? null
}:
@ -10,11 +10,11 @@ assert withEditor -> wxGTK != null;
stdenv.mkDerivation rec {
name = "0ad-${version}";
version = "0.0.22";
version = "0.0.23";
src = fetchurl {
url = "http://releases.wildfiregames.com/0ad-${version}-alpha-unix-build.tar.xz";
sha256 = "1cgmr4g5g9wv36v7ylbrvqhsjwgcsdgbqwc8zlqmnayk9zgkdpgx";
sha256 = "0qz1sg4n5y766qwgi63drrrx6k17kk0rcnn9a4a9crllk2vf78fg";
};
nativeBuildInputs = [ python2 perl pkgconfig ];
@ -23,14 +23,13 @@ stdenv.mkDerivation rec {
spidermonkey_38 boost icu libxml2 libpng libjpeg
zlib curl libogg libvorbis enet miniupnpc openal
libGLU_combined xproto libX11 libXcursor nspr SDL2 gloox
nvidia-texture-tools
nvidia-texture-tools libsodium
] ++ lib.optional withEditor wxGTK;
NIX_CFLAGS_COMPILE = [
"-I${xproto}/include/X11"
"-I${libX11.dev}/include/X11"
"-I${libXcursor.dev}/include/X11"
"-I${SDL.dev}/include/SDL"
"-I${SDL2}/include/SDL2"
];
@ -77,16 +76,14 @@ stdenv.mkDerivation rec {
''}
# Copy l10n data.
mkdir -p "$out"/share/0ad/data
cp -r binaries/data/l10n "$out"/share/0ad/data
install -Dm755 -t $out/share/0ad/data/l10n binaries/data/l10n/*
# Copy libraries.
mkdir -p "$out"/lib/0ad
cp binaries/system/*.so "$out"/lib/0ad/
install -Dm644 -t $out/lib/0ad binaries/system/*.so
# Copy icon.
install -D build/resources/0ad.png "$out"/share/icons/hicolor/128x128/0ad.png
install -D build/resources/0ad.desktop "$out"/share/applications/0ad.desktop
install -D build/resources/0ad.png $out/share/icons/hicolor/128x128/0ad.png
install -D build/resources/0ad.desktop $out/share/applications/0ad.desktop
'';
meta = with stdenv.lib; {

4
pkgs/games/trackballs/default.nix
View File

@ -4,13 +4,13 @@ with stdenv.lib;
stdenv.mkDerivation rec {
name = "trackballs-${version}";
version = "1.3.0";
version = "1.3.1";
src = fetchFromGitHub {
owner = "trackballs";
repo = "trackballs";
rev = "v${version}";
sha256 = "1rahqsydpbh8nmh41fxggzj5f6s3ldf7p5krik5fnhpy0civfsxd";
sha256 = "1yjzz50r57aahy7wcbsmhrd40abzyriq40j49225ya7m9g28vmgl";
};
buildInputs = [ cmake zlib SDL2 SDL2_ttf SDL2_mixer SDL2_image guile gettext libGLU_combined ];

4
pkgs/misc/themes/adapta/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "adapta-gtk-theme-${version}";
version = "3.93.1.14";
version = "3.93.1.16";
src = fetchFromGitHub {
owner = "adapta-project";
repo = "adapta-gtk-theme";
rev = version;
sha256 = "11iviw9gj4jwp6v32a3y1n6hq8m9pf14drfqxhp3dnygylvxxdr2";
sha256 = "11jjzhqvx74iq12682ymsnms99izwl5hys1anb9l0fl6jy0dh2xx";
};
preferLocalBuild = true;

55
pkgs/os-specific/linux/dpdk/default.nix
View File

@ -1,7 +1,13 @@
{ stdenv, kernel, fetchurl, pkgconfig, numactl }:
{ stdenv, lib, kernel, fetchurl, pkgconfig, numactl, shared ? false }:
stdenv.mkDerivation rec {
name = "dpdk-${version}-${kernel.version}";
let
kver = kernel.modDirVersion or null;
mod = kernel != null;
in stdenv.mkDerivation rec {
name = "dpdk-${version}" + lib.optionalString mod "-${kernel.version}";
version = "17.11.2";
src = fetchurl {
@ -9,35 +15,50 @@ stdenv.mkDerivation rec {
sha256 = "19m5l3jkrns8r1zbjb6ry18w50ff36kbl5b5g6pfcp9p57sfisd2";
};
nativeBuildInputs = [ pkgconfig ] ++ kernel.moduleBuildDependencies;
buildInputs = [ numactl ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ numactl ] ++ lib.optional mod kernel.moduleBuildDependencies;
RTE_KERNELDIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build";
RTE_KERNELDIR = if mod then "${kernel.dev}/lib/modules/${kver}/build" else "/var/empty";
RTE_TARGET = "x86_64-native-linuxapp-gcc";
# we need sse3 instructions to build
NIX_CFLAGS_COMPILE = [ "-msse3" ];
enableParallelBuilding = true;
outputs = [ "out" "kmod" ];
hardeningDisable = [ "pic" ];
postPatch = ''
cat >>config/defconfig_$RTE_TARGET <<EOF
# Build static or shared libraries.
CONFIG_RTE_BUILD_SHARED_LIB=${if shared then "y" else "n"}
EOF
'' + lib.optionalString (!mod) ''
cat >>config/defconfig_$RTE_TARGET <<EOF
# Do not build kernel modules.
CONFIG_RTE_EAL_IGB_UIO=n
CONFIG_RTE_KNI_KMOD=n
EOF
'';
configurePhase = ''
make T=${RTE_TARGET} config
'';
installPhase = ''
make install-runtime DESTDIR=$out prefix= includedir=/include datadir=/
make install-sdk DESTDIR=$out prefix= includedir=/include datadir=/
make install-kmod DESTDIR=$kmod
'';
installTargets = [ "install-runtime" "install-sdk" "install-kmod" ]; # skip install-doc
meta = with stdenv.lib; {
installFlags = [
"prefix=$(out)"
] ++ lib.optionals mod [
"kerneldir=$(kmod)/lib/modules/${kver}"
];
outputs = [ "out" ] ++ lib.optional mod "kmod";
enableParallelBuilding = true;
meta = with lib; {
description = "Set of libraries and drivers for fast packet processing";
homepage = http://dpdk.org/;
license = with licenses; [ lgpl21 gpl2 bsd2 ];
platforms = [ "x86_64-linux" ];
maintainers = [ maintainers.domenkozar ];
maintainers = with maintainers; [ domenkozar orivej ];
};
}

4
pkgs/os-specific/linux/irqbalance/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "irqbalance-${version}";
version = "1.3.0";
version = "1.4.0";
src = fetchFromGitHub {
owner = "irqbalance";
repo = "irqbalance";
rev = "v${version}";
sha256 = "009777p5v72x4r58skqgaf03qv3app9b8lkxkpxq0226l0x3j4qh";
sha256 = "05q3cdz2a5zp5s2bdz5a80y9vq7awqw9lbvyvh6vjs9a8vg80hwm";
};
nativeBuildInputs = [ autoreconfHook pkgconfig ];

4
pkgs/os-specific/linux/kernel/linux-4.14.nix
View File

@ -3,13 +3,13 @@
with stdenv.lib;
buildLinux (args // rec {
version = "4.14.41";
version = "4.14.42";
# branchVersion needs to be x.y
extraMeta.branch = concatStrings (intersperse "." (take 2 (splitString "." version)));
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "0vffv1iqcvrzvhs534czdjhj7702gr01pyn9idr8dj85kdx19wfc";
sha256 = "00wh8ydawy6j18as28albzid88cm2aanzr8vz367jjp2k5pi00rb";
};
} // (args.argsOverride or {}))

4
pkgs/os-specific/linux/kernel/linux-4.16.nix
View File

@ -3,7 +3,7 @@
with stdenv.lib;
buildLinux (args // rec {
version = "4.16.9";
version = "4.16.10";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0")));
@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "12lvdnfz06r7pj5f15x39c4glhbp3sv7bdbwj4yimbp6iqwvndv0";
sha256 = "1gnf16p4rmibcn3wn5zp4pl2zmhgk4dg6718gvdr8vcffd87ksc0";
};
} // (args.argsOverride or {}))

4
pkgs/os-specific/linux/kernel/linux-4.9.nix
View File

@ -1,11 +1,11 @@
{ stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
buildLinux (args // rec {
version = "4.9.100";
version = "4.9.101";
extraMeta.branch = "4.9";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "0z572csacfwn3kl3yaz4wpd7wkzabm42p2z4ysx5rq0kf4x6zfy5";
sha256 = "005awyjylyp7di8cy269923j7wsvv74s42k7955fq0790wmx15dg";
};
} // (args.argsOverride or {}))

4
pkgs/os-specific/linux/kernel/linux-copperhead-lts.nix
View File

@ -3,9 +3,9 @@
with stdenv.lib;
let
version = "4.14.41";
version = "4.14.42";
revision = "a";
sha256 = "16jwv1drs6xlwghzn8ps7v8x5xja61b5y6747c86g17idfaac1k3";
sha256 = "09j36qhxs1z2qcxlpscg8yrif4qvm5ipbh7n6gxg58150yg9sl05";
# modVersion needs to be x.y.z, will automatically add .0 if needed
modVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0")));

4
pkgs/os-specific/linux/kernel/linux-copperhead-stable.nix
View File

@ -3,9 +3,9 @@
with stdenv.lib;
let
version = "4.16.9";
version = "4.16.10";
revision = "a";
sha256 = "1g1924whb79cflh4wcqpyq9d7nfxdsvsjh2mv5ps85fsg2109kpl";
sha256 = "1dd9zislrlv24mnvzm2j9rfxnfp93lgf0pi48zpdglw5xpfwqm49";
# modVersion needs to be x.y.z, will automatically add .0 if needed
modVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0")));

6
pkgs/os-specific/linux/kernel/linux-testing.nix
View File

@ -1,13 +1,13 @@
{ stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, libelf, utillinux, ... } @ args:
buildLinux (args // rec {
version = "4.17-rc5";
modDirVersion = "4.17.0-rc5";
version = "4.17-rc6";
modDirVersion = "4.17.0-rc6";
extraMeta.branch = "4.17";
src = fetchurl {
url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz";
sha256 = "1khx3s8nb604h23hasamshcvcwll0j4vi5v6v274ls01ja9mg1xk";
sha256 = "16x8bwhaj35fqhl773qxwabs1rhl3ayapizjsqyzn92pggsgy6p8";
};
# Should the testing kernels ever be built on Hydra?

2
pkgs/os-specific/linux/kmscube/default.nix
View File

@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
name = "kmscube-2017-03-19";
src = fetchgit {
url = git://anongit.freedesktop.org/libGLU_combined/kmscube;
url = git://anongit.freedesktop.org/mesa/kmscube;
rev = "b88a44d95eceaeebc5b9c6972ffcbfe9eca00aea";
sha256 = "029ccslfavz6jllqv980sr6mj9bdbr0kx7bi21ra0q9yl2vh0yca";
};

2
pkgs/os-specific/linux/odp-dpdk/default.nix
View File

@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook pkgconfig ];
buildInputs = [ dpdk libconfig libpcap numactl openssl ];
RTE_SDK = dpdk;
RTE_SDK = "${dpdk}/share/dpdk";
RTE_TARGET = "x86_64-native-linuxapp-gcc";
dontDisableStatic = true;

2
pkgs/os-specific/linux/pktgen/default.nix
View File

@ -30,7 +30,7 @@ in stdenv.mkDerivation rec {
[ dpdk libpcap numactl ]
++ stdenv.lib.optionals withGtk [gtk2];
RTE_SDK = "${dpdk}";
RTE_SDK = "${dpdk}/share/dpdk";
RTE_TARGET = "x86_64-native-linuxapp-gcc";
GUI = stdenv.lib.optionalString withGtk "true";

4
pkgs/os-specific/linux/powerstat/default.nix
View File

@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
name = "powerstat-${version}";
version = "0.02.15";
version = "0.02.16";
src = fetchurl {
url = "http://kernel.ubuntu.com/~cking/tarballs/powerstat/powerstat-${version}.tar.gz";
sha256 = "0m8662qv77nzbwkdpydiz87kd75cjjajgp30j6mc5padyw65bxxx";
sha256 = "14sx37l40038sjygsnp95542fkbhhc911vd9k5rf85czmvndz29m";
};
installFlags = [ "DESTDIR=$(out)" ];
postInstall = ''

4
pkgs/servers/dns/bind/default.nix
View File

@ -6,14 +6,14 @@
assert enableSeccomp -> libseccomp != null;
assert enablePython -> python3 != null;
let version = "9.12.1"; in
let version = "9.12.1-P2"; in
stdenv.mkDerivation rec {
name = "bind-${version}";
src = fetchurl {
url = "http://ftp.isc.org/isc/bind9/${version}/${name}.tar.gz";
sha256 = "043mjcw405qa0ghm5dkhfsq35gsy279724fz3mjqpr1mbi14dr0n";
sha256 = "0a9dvyg1dk7vpqn9gz7p5jas3bz7z22bjd66b98g1qk16i2w7rqd";
};
outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ];

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

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "jackett-${version}";
version = "0.8.953";
version = "0.8.997";
src = fetchurl {
url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz";
sha256 = "0jc7c0z315wh73b75fxz1ad2qy1z5nsvpr7iml4998k15sl7w7mi";
sha256 = "0a0viv3aw33kvj9z2fmqacvk2prv8dbdnk85b3xa4knp8cvsva6w";
};
buildInputs = [ makeWrapper ];

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

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "metabase-${version}";
version = "0.29.2";
version = "0.29.3";
src = fetchurl {
url = "http://downloads.metabase.com/v${version}/metabase.jar";
sha256 = "02cba755mfim8q403gj02ggc0gg4ckcyalxkw09k0jqi5irdi4h1";
sha256 = "18yvjxlgdbg7h7ipj1wlic5m0gv5s2943c72shs44jvic6g42pzv";
};
nativeBuildInputs = [ makeWrapper ];

31
pkgs/servers/webmetro/default.nix Normal file
View File

@ -0,0 +1,31 @@
{ stdenv, fetchFromGitHub, rustPlatform }:
rustPlatform.buildRustPackage rec {
pname = "webmetro";
name = "${pname}-${version}";
version = "unstable-20180426";
src = fetchFromGitHub {
owner = "Tangent128";
repo = pname;
rev = "4f6cc00fe647bd311d00a8a4cb53ab08f20a04f9";
sha256 = "1n2c7ygs8qsd5zgii6fqqcwg427bsij082bg4ijnzkq5630dx651";
};
cargoSha256 = "0drf331qic1gf58j7izwp0q2l4w0dyrhr19rd2y5k43cw4m1nq59";
meta = with stdenv.lib; {
description = "Simple relay server for broadcasting a WebM stream";
longDescription = ''
Webmetro is a simple relay server for broadcasting a WebM stream
from one uploader to many downloaders, via HTTP.
The initialization segment is remembered, so that viewers can join
mid-stream. Cluster timestamps are rewritten to be monotonic, so multiple
(compatibly-encoded) webm files can be chained together without
clients needing to reconnect.
'';
license = with licenses; [ mit ];
maintainers = with maintainers; [ leenaars ];
platforms = platforms.all;
};
}

7
pkgs/servers/x11/xorg/default.nix
View File

@ -1839,9 +1839,9 @@ let
sha256 = "0z56ifw3xiq9dychv8chg1cny0hq4v3c1r9pqcybk5fp7nzw9jpq";
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ fontsproto libGL libdrm udev randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ];
buildInputs = [ fontsproto mesa_noglu libGL libdrm udev randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ];
meta.platforms = stdenv.lib.platforms.unix;
}) // {inherit fontsproto libGL libdrm udev randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;};
}) // {inherit fontsproto mesa_noglu libGL libdrm udev randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;};
xf86videoark = (mkDerivation "xf86videoark" {
name = "xf86-video-ark-0.7.5";
@ -2570,9 +2570,6 @@ let
url = mirror://xorg/individual/util/xorg-cf-files-1.0.6.tar.bz2;
sha256 = "0kckng0zs1viz0nr84rdl6dswgip7ndn4pnh5nfwnviwpsfmmksd";
};
postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
substituteInPlace $out/lib/X11/config/darwin.cf --replace "/usr/bin/" ""
'';
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ ];
meta.platforms = stdenv.lib.platforms.unix;

1
pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
View File

@ -35,6 +35,7 @@ $pcMap{"dbus-1"} = "dbus";
$pcMap{"uuid"} = "libuuid";
$pcMap{"libudev"} = "udev";
$pcMap{"gl"} = "libGL";
$pcMap{"gbm"} = "mesa_noglu";
$pcMap{"\$PIXMAN"} = "pixman";
$pcMap{"\$RENDERPROTO"} = "renderproto";
$pcMap{"\$DRI3PROTO"} = "dri3proto";

2
pkgs/servers/x11/xorg/old.list
View File

@ -3,7 +3,7 @@ mirror://xorg/individual/app/xclock-1.0.7.tar.bz2
mirror://xorg/individual/app/xdm-1.1.11.tar.bz2
mirror://xorg/individual/app/xeyes-1.1.1.tar.bz2
mirror://xorg/individual/app/xfs-1.1.4.tar.bz2
mirror://xorg/individual/app/xinit-1.3.4.tar.bz2
mirror://xorg/individual/app/xinit-1.4.0.tar.bz2
mirror://xorg/individual/app/xmessage-1.0.4.tar.bz2
mirror://xorg/individual/lib/libXp-1.0.3.tar.bz2
mirror://xorg/individual/lib/libXxf86misc-1.0.3.tar.bz2

6
pkgs/servers/x11/xorg/overrides.nix
View File

@ -661,6 +661,12 @@ in
];
};
xorgcffiles = attrs: attrs // {
postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
substituteInPlace $out/lib/X11/config/darwin.cf --replace "/usr/bin/" ""
'';
};
xwd = attrs: attrs // {
buildInputs = with xorg; attrs.buildInputs ++ [libXt libxkbfile];
};

8
pkgs/servers/x11/xorg/tarballs-7.7.list
View File

@ -68,7 +68,7 @@ mirror://xorg/individual/lib/libXcursor-1.1.15.tar.bz2
mirror://xorg/individual/lib/libXdamage-1.1.4.tar.bz2
mirror://xorg/individual/lib/libXdmcp-1.1.2.tar.bz2
mirror://xorg/individual/lib/libXext-1.3.3.tar.bz2
mirror://xorg/individual/lib/libXfixes-5.0.2.tar.bz2
mirror://xorg/individual/lib/libXfixes-5.0.3.tar.bz2
mirror://xorg/individual/lib/libXfont-1.5.4.tar.bz2
mirror://xorg/individual/lib/libXfont2-2.0.3.tar.bz2
mirror://xorg/individual/lib/libXft-2.3.2.tar.bz2
@ -101,7 +101,7 @@ mirror://xorg/individual/app/sessreg-1.1.1.tar.bz2
mirror://xorg/individual/app/setxkbmap-1.3.1.tar.bz2
mirror://xorg/individual/app/smproxy-1.0.6.tar.bz2
mirror://xorg/individual/app/twm-1.0.9.tar.bz2
mirror://xorg/individual/util/util-macros-1.19.1.tar.bz2
mirror://xorg/individual/util/util-macros-1.19.2.tar.bz2
mirror://xorg/individual/proto/videoproto-2.3.3.tar.bz2
mirror://xorg/X11R7.7/src/everything/windowswmproto-1.0.4.tar.bz2
mirror://xorg/individual/app/x11perf-1.6.0.tar.bz2
@ -131,7 +131,7 @@ mirror://xorg/individual/driver/xf86-input-void-1.4.1.tar.bz2
mirror://xorg/individual/driver/xf86-video-amdgpu-1.4.0.tar.bz2
mirror://xorg/individual/driver/xf86-video-ark-0.7.5.tar.bz2
mirror://xorg/individual/driver/xf86-video-ast-1.1.5.tar.bz2
mirror://xorg/individual/driver/xf86-video-ati-7.9.0.tar.bz2
mirror://xorg/individual/driver/xf86-video-ati-18.0.1.tar.bz2
mirror://xorg/individual/driver/xf86-video-nouveau-1.0.15.tar.bz2
mirror://xorg/individual/driver/xf86-video-chips-1.2.7.tar.bz2
mirror://xorg/individual/driver/xf86-video-cirrus-1.5.3.tar.bz2
@ -164,7 +164,7 @@ mirror://xorg/individual/driver/xf86-video-tdfx-1.4.7.tar.bz2
mirror://xorg/individual/driver/xf86-video-tga-1.2.2.tar.bz2
mirror://xorg/individual/driver/xf86-video-trident-1.3.8.tar.bz2
mirror://xorg/X11R7.7/src/everything/xf86-video-v4l-0.2.0.tar.bz2
mirror://xorg/individual/driver/xf86-video-vesa-2.3.4.tar.bz2
mirror://xorg/individual/driver/xf86-video-vesa-2.4.0.tar.bz2
mirror://xorg/individual/driver/xf86-video-vmware-13.2.1.tar.bz2
mirror://xorg/individual/driver/xf86-video-voodoo-1.2.5.tar.bz2
mirror://xorg/X11R7.7/src/everything/xf86-video-wsfb-0.4.0.tar.bz2

4
pkgs/shells/dash/default.nix
View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "dash-0.5.10.1";
name = "dash-0.5.10.2";
src = fetchurl {
url = "http://gondor.apana.org.au/~herbert/dash/files/${name}.tar.gz";
sha256 = "1bl4brz5vy07lrss54glp4vfca3q8d73hyc87sqdk99f76z95b6s";
sha256 = "0wb0bwmqc661hylqcfdp7l7x12myw3vpqk513ncyqrjwvhckjriw";
};
hardeningDisable = [ "format" ];

4
pkgs/shells/xonsh/default.nix
View File

@ -2,13 +2,13 @@
python3Packages.buildPythonApplication rec {
name = "xonsh-${version}";
version = "0.6.3";
version = "0.6.4";
src = fetchFromGitHub {
owner = "scopatz";
repo = "xonsh";
rev = version;
sha256= "1893kkxvalx8ycjl27gixkh979kkp4ra00zb7m6a8cdllx6yhsgi";
sha256= "16nfvfa9cklm5qb2lrr12z7k4wjb6pbb0y0ma15riqcda56ygmj7";
};
LC_ALL = "en_US.UTF-8";

8
pkgs/tools/backup/restic/default.nix
View File

@ -1,8 +1,8 @@
{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
{ lib, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
name = "restic-${version}";
version = "0.8.3";
version = "0.9.0";
goPackagePath = "github.com/restic/restic";
@ -10,7 +10,7 @@ buildGoPackage rec {
owner = "restic";
repo = "restic";
rev = "v${version}";
sha256 = "0vbwbxly3p1wj25ai1xak1bmhibh2ilxl55gsbnaaq7pcznc3ad9";
sha256 = "09520ggr98w7nn6kl3yx0nrx4f79q4vhg4q1hiv2nlwxd0jz1p6y";
};
buildPhase = ''
@ -31,7 +31,7 @@ buildGoPackage rec {
--man $bin/share/man/man1
'';
meta = with stdenv.lib; {
meta = with lib; {
homepage = https://restic.net;
description = "A backup program that is fast, efficient and secure";
platforms = platforms.linux ++ platforms.darwin;

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

@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
name = "ddcutil-${version}";
version = "0.8.6";
version = "0.9.0";
src = fetchFromGitHub {
owner = "rockowitz";
repo = "ddcutil";
rev = "v${version}";
sha256 = "1c4cl9cac90xf9rap6ss2d4yshcmhdq8pdfjz3g4cns789fs1vcf";
sha256 = "1lcn3jbhpcm6ixp24vsfnk1v0qi0fjkkf57f4grs1wg148s3jpvc";
};
nativeBuildInputs = [ autoreconfHook pkgconfig ];

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

@ -4,13 +4,13 @@
# There is also cdebootstrap now. Is that easier to maintain?
stdenv.mkDerivation rec {
name = "debootstrap-${version}";
version = "1.0.98";
version = "1.0.99";
src = fetchurl {
# git clone git://git.debian.org/d-i/debootstrap.git
# I'd like to use the source. However it's lacking the lanny script ? (still true?)
url = "mirror://debian/pool/main/d/debootstrap/debootstrap_${version}.tar.gz";
sha256 = "07wfvjhzc5schhpn1dkvhwbi115yn4f1q99g0g39m79bbyxm50d8";
sha256 = "1plw53zghiykddj77s5jk10ncx82cgrkk798p909yydhcghnvcsb";
};
buildInputs = [ dpkg gettext gawk perl ];

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

@ -2,13 +2,13 @@
buildGoPackage rec {
name = "lf-${version}";
version = "3";
version = "4";
src = fetchFromGitHub {
owner = "gokcehan";
repo = "lf";
rev = "r${version}";
sha256 = "1w4nly8g1p28ixq1vjg7qv07mb1vryys7cf6b7jdb523swra6a97";
sha256 = "0wvx5hhkj3l68xjcr0i5lk623zi3si79hhvwi6mw9s52i43irr31";
};
goPackagePath = "github.com/gokcehan/lf";

4
pkgs/tools/misc/lf/deps.nix generated
View File

@ -4,8 +4,8 @@
fetch = {
type = "git";
url = "https://github.com/nsf/termbox-go";
rev = "7cbfaac9e282b3ea0cefeddc67b2c3ed3aaf97bc"; # master
sha256 = "0pb5p8q2x31aqs307lla75mm1a01mr2qyqxsfqix1pgwg16xbad8";
rev = "21a4d435a86280a2927985fd6296de56cbce453e"; # master
sha256 = "0afbb0nr9rqzlpg5n7dg070w5scdvckyzyy525mhndp8phhzwpg7";
};
}
{

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

@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
name = "neofetch-${version}";
version = "4.0.0";
version = "4.0.2";
src = fetchFromGitHub {
owner = "dylanaraps";
repo = "neofetch";
rev = version;
sha256 = "1ijg6fmrqjgn87899q8cpbir93hqrq4070wzm62s9nmggdgzx6mn";
sha256 = "0c0x05ca8lp74928nix4pvd243l95lav35r21mpkbagf72z284d2";
};
dontBuild = true;

6
pkgs/tools/misc/powerline-rs/default.nix
View File

@ -1,4 +1,4 @@
{ lib, rustPlatform, fetchFromGitHub, pkgconfig, file, perl, cmake, openssl_1_1_0, libssh2, libgit2, libzip }:
{ stdenv, lib, rustPlatform, fetchFromGitHub, pkgconfig, file, perl, curl, cmake, openssl_1_1_0, libssh2, libgit2, libzip, Security }:
rustPlatform.buildRustPackage rec {
pname = "powerline-rs";
name = "${pname}-${version}";
@ -14,8 +14,8 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "184s432a6damzvl0lv6jar1iml9dq60r190aqjy44lcg938981zc";
nativeBuildInputs = [ pkgconfig file perl cmake ];
buildInputs = [ openssl_1_1_0 libssh2 libgit2 libzip ];
nativeBuildInputs = [ pkgconfig file perl cmake curl ];
buildInputs = [ openssl_1_1_0 libssh2 libgit2 libzip ] ++ lib.optional stdenv.isDarwin Security;
postInstall = ''
install -Dm 755 "${pname}.bash" "$out/etc/bash_completion.d/${pname}"

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

@ -16,11 +16,11 @@ with stdenv.lib;
buildPythonApplication rec {
pname = "youtube-dl";
version = "2018.05.09";
version = "2018.05.18";
src = fetchurl {
url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz";
sha256 = "0sl4bi2jls3417rd62awbqdq1b6wskkjbfwpnyw4a61qarfxid1d";
sha256 = "11r0hv6885w8k4m307kvf9545vr5a3ym9bf7szghvbcgmgc8lm5w";
};
nativeBuildInputs = [ makeWrapper ];

4
pkgs/tools/networking/urlwatch/default.nix
View File

@ -2,13 +2,13 @@
python3Packages.buildPythonApplication rec {
name = "urlwatch-${version}";
version = "2.9";
version = "2.11";
src = fetchFromGitHub {
owner = "thp";
repo = "urlwatch";
rev = version;
sha256 = "0biy02vyhdwghy9qjmjwlfd8hzaz9gfsssd53ng6zpww4wkkiydz";
sha256 = "0vp85d62zhca7d841vg82mwlqb8yihshyc8q2cvwm3rpn5vwf0pi";
};
propagatedBuildInputs = with python3Packages; [

4
pkgs/tools/networking/wireguard-tools/default.nix
View File

@ -6,11 +6,11 @@ in
stdenv.mkDerivation rec {
name = "wireguard-tools-${version}";
version = "0.0.20180514";
version = "0.0.20180519";
src = fetchzip {
url = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz";
sha256 = "15z0s1i8qyq1fpw8j6rky53ffrpp3f49zn1022jwdslk4g0ncaaj";
sha256 = "0pd04ia0wcm0f6di4gx5kflccc5j35d72j38l8jqpj8vinl6l070";
};
preConfigure = "cd src";

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

@ -1450,7 +1450,7 @@ with pkgs;
mcrypt = callPackage ../tools/misc/mcrypt { };
mongodb-compass = callPackage ../tools/misc/mongodb-compass { };
mongodb-tools = callPackage ../tools/misc/mongodb-tools { };
mozlz4a = callPackage ../tools/compression/mozlz4a {
@ -1466,7 +1466,7 @@ with pkgs;
};
antibody = callPackage ../shells/zsh/antibody { };
antigen = callPackage ../shells/zsh/antigen { };
apparix = callPackage ../tools/misc/apparix { };
@ -8056,6 +8056,8 @@ with pkgs;
gperf = gperf_3_0;
};
kcgi = callPackage ../development/web/kcgi { };
kcov = callPackage ../development/tools/analysis/kcov { };
kube-aws = callPackage ../development/tools/kube-aws { };
@ -10074,6 +10076,8 @@ with pkgs;
mysql = mysql57;
};
libnatpmp = callPackage ../development/libraries/libnatpmp { };
libnatspec = callPackage ../development/libraries/libnatspec { };
libndp = callPackage ../development/libraries/libndp { };
@ -11572,6 +11576,8 @@ with pkgs;
spatialite_tools = callPackage ../development/libraries/spatialite-tools { };
spdk = callPackage ../development/libraries/spdk { };
speechd = callPackage ../development/libraries/speechd { };
speech-tools = callPackage ../development/libraries/speech-tools {};
@ -12991,6 +12997,8 @@ with pkgs;
wallabag = callPackage ../servers/web-apps/wallabag { };
webmetro = callPackage ../servers/webmetro { };
winstone = callPackage ../servers/http/winstone { };
xinetd = callPackage ../servers/xinetd { };
@ -13498,6 +13506,9 @@ with pkgs;
inherit kernel;
inherit (kernel) stdenv; # in particular, use the same compiler by default
# Obsolete aliases (these packages do not depend on the kernel).
inherit (pkgs) odp-dpdk pktgen; # added 2018-05
acpi_call = callPackage ../os-specific/linux/acpi-call {};
amdgpu-pro = callPackage ../os-specific/linux/amdgpu-pro { };
@ -13524,14 +13535,8 @@ with pkgs;
evdi = callPackage ../os-specific/linux/evdi { };
pktgen = callPackage ../os-specific/linux/pktgen { };
hyperv-daemons = callPackage ../os-specific/linux/hyperv-daemons { };
odp-dpdk = callPackage ../os-specific/linux/odp-dpdk { };
ofp = callPackage ../os-specific/linux/ofp { };
e1000e = callPackage ../os-specific/linux/e1000e {};
ixgbevf = callPackage ../os-specific/linux/ixgbevf {};
@ -13727,6 +13732,10 @@ with pkgs;
buildLinux = attrs: callPackage ../os-specific/linux/kernel/generic.nix attrs;
dpdk = callPackage ../os-specific/linux/dpdk {
kernel = null; # dpdk modules are in linuxPackages.dpdk.kmod
};
keyutils = callPackage ../os-specific/linux/keyutils { };
libselinux = callPackage ../os-specific/linux/libselinux { };
@ -13865,8 +13874,12 @@ with pkgs;
nss_ldap = callPackage ../os-specific/linux/nss_ldap { };
odp-dpdk = callPackage ../os-specific/linux/odp-dpdk { };
odroid-xu3-bootloader = callPackage ../tools/misc/odroid-xu3-bootloader { };
ofp = callPackage ../os-specific/linux/ofp { };
openpam = callPackage ../development/libraries/openpam { };
openbsm = callPackage ../development/libraries/openbsm { };
@ -13912,6 +13925,8 @@ with pkgs;
pipework = callPackage ../os-specific/linux/pipework { };
pktgen = callPackage ../os-specific/linux/pktgen { };
plymouth = callPackage ../os-specific/linux/plymouth { };
pmount = callPackage ../os-specific/linux/pmount { };
@ -14522,7 +14537,9 @@ with pkgs;
powerline-go = callPackage ../tools/misc/powerline-go { };
powerline-rs = callPackage ../tools/misc/powerline-rs { };
powerline-rs = callPackage ../tools/misc/powerline-rs {
inherit (darwin.apple_sdk.frameworks) Security;
};
profont = callPackage ../data/fonts/profont { };
@ -16949,6 +16966,7 @@ with pkgs;
else null;
};
# TODO: we should probably merge these 2
musescore =
if stdenv.isDarwin then
callPackage ../applications/audio/musescore/darwin.nix { }
@ -17310,6 +17328,8 @@ with pkgs;
purple-hangouts = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-hangouts { };
purple-lurch = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-lurch { };
purple-matrix = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-matrix { };
purple-plugin-pack = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-plugin-pack { };
@ -17940,6 +17960,10 @@ with pkgs;
swh_lv2 = callPackage ../applications/audio/swh-lv2 { };
swift-im = libsForQt5.callPackage ../applications/networking/instant-messengers/swift-im {
inherit (gnome2) GConf;
};
sylpheed = callPackage ../applications/networking/mailreaders/sylpheed { };
symlinks = callPackage ../tools/system/symlinks { };
@ -18209,9 +18233,9 @@ with pkgs;
vim_configurable = vimUtils.makeCustomizable (callPackage ../applications/editors/vim/configurable.nix {
inherit (darwin.apple_sdk.frameworks) CoreServices Cocoa Foundation CoreData;
inherit (darwin) libobjc cf-private;
inherit lua;
features = "huge"; # one of tiny, small, normal, big or huge
lua = pkgs.lua5_1;
gui = config.vim.gui or "auto";
# optional features by flags
@ -18220,7 +18244,10 @@ with pkgs;
xxd = callPackage ../tools/misc/xxd { };
vimNox = lowPrio (vim_configurable.override { source = "vim-nox"; });
vimNox = lowPrio (vim_configurable.override {
source = "vim-nox";
lua = pkgs.lua5_1; # vimNox source is from 2012, requires older lua
});
qpdfview = libsForQt5.callPackage ../applications/misc/qpdfview {};
@ -18550,7 +18577,7 @@ with pkgs;
x11vnc = callPackage ../tools/X11/x11vnc { };
x2goclient = callPackage ../applications/networking/remote/x2goclient { };
x2goclient = libsForQt5.callPackage ../applications/networking/remote/x2goclient { };
x2vnc = callPackage ../tools/X11/x2vnc { };
@ -19587,7 +19614,9 @@ with pkgs;
keen4 = callPackage ../games/keen4 { };
zeroadPackages = callPackage ../games/0ad { };
zeroadPackages = callPackage ../games/0ad {
wxGTK = wxGTK30;
};
zeroad = zeroadPackages.zeroad;

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

@ -18181,6 +18181,8 @@ EOF
pyowm = callPackage ../development/python-modules/pyowm { };
prometheus_client = callPackage ../development/python-modules/prometheus_client { };
pysdl2 = callPackage ../development/python-modules/pysdl2 { };
});
in fix' (extends overrides packages)