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

Merge branch 'master' into staging

Browse Source
This commit is contained in:
Luca Bruno 2015-06-15 09:56:29 +02:00
commit aa800fa0fe
66 changed files with 933 additions and 397 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
nixos/lib/make-channel.nix Normal file
View File

@ -0,0 +1,31 @@
{ pkgs, nixpkgs, version, versionSuffix }:
pkgs.releaseTools.makeSourceTarball {
name = "nixos-channel";
src = nixpkgs;
officialRelease = false; # FIXME: fix this in makeSourceTarball
inherit version versionSuffix;
buildInputs = [ pkgs.nixUnstable ];
expr = builtins.readFile ./channel-expr.nix;
distPhase = ''
rm -rf .git
echo -n $VERSION_SUFFIX > .version-suffix
echo -n ${nixpkgs.rev or nixpkgs.shortRev} > .git-revision
releaseName=nixos-$VERSION$VERSION_SUFFIX
mkdir -p $out/tarballs
mkdir ../$releaseName
cp -prd . ../$releaseName/nixpkgs
chmod -R u+w ../$releaseName
ln -s nixpkgs/nixos ../$releaseName/nixos
echo "$expr" > ../$releaseName/default.nix
NIX_STATE_DIR=$TMPDIR nix-env -f ../$releaseName/default.nix -qaP --meta --xml \* > /dev/null
cd ..
chmod -R u+w $releaseName
tar cfJ $out/tarballs/$releaseName.tar.xz $releaseName
'';
}

2
nixos/modules/services/audio/mpd.nix
View File

@ -118,7 +118,7 @@ in {
preStart = "mkdir -p ${cfg.dataDir} && chown -R ${cfg.user}:${cfg.group} ${cfg.dataDir}";
script = "exec mpd --no-daemon ${mpdConf}";
serviceConfig = {
User = "mpd";
User = "${cfg.user}";
PermissionsStartOnly = true;
};
};

9
nixos/modules/services/misc/mediatomb.nix
View File

@ -230,6 +230,13 @@ in {
'';
};
interface = mkOption {
default = "";
description = ''
A specific interface to bind to.
'';
};
uuid = mkOption {
default = "fdfc8a4e-a3ad-4c1d-b43d-a2eedb03a687";
description = ''
@ -256,7 +263,7 @@ in {
after = [ "local-fs.target" "network.target" ];
wantedBy = [ "multi-user.target" ];
path = [ pkgs.mediatomb ];
serviceConfig.ExecStart = "${pkgs.mediatomb}/bin/mediatomb -p ${toString cfg.port} ${if cfg.customCfg then "" else "-c ${mtConf}"} -m ${cfg.dataDir}";
serviceConfig.ExecStart = "${pkgs.mediatomb}/bin/mediatomb -p ${toString cfg.port} ${if cfg.interface!="" then "-e ${cfg.interface}" else ""} ${if cfg.customCfg then "" else "-c ${mtConf}"} -m ${cfg.dataDir}";
serviceConfig.User = "${cfg.user}";
};

10
nixos/modules/system/boot/loader/grub/grub.nix
View File

@ -41,6 +41,7 @@ let
grubEfi = f grubEfi;
grubTargetEfi = if cfg.efiSupport && (cfg.version == 2) then f (grubEfi.grubTarget or "") else "";
bootPath = args.path;
storePath = config.boot.loader.grub.storePath;
bootloaderId = if args.efiBootloaderId == null then "NixOS${efiSysMountPoint'}" else args.efiBootloaderId;
inherit efiSysMountPoint;
inherit (args) devices;
@ -180,6 +181,15 @@ in
'';
};
storePath = mkOption {
default = "/nix/store";
type = types.str;
description = ''
Path to the Nix store when looking for kernels at boot.
Only makes sense when copyKernels is false.
'';
};
extraPrepareConfig = mkOption {
default = "";
type = types.lines;

3
nixos/modules/system/boot/loader/grub/install-grub.pl
View File

@ -55,6 +55,7 @@ my $fsIdentifier = get("fsIdentifier");
my $grubEfi = get("grubEfi");
my $grubTargetEfi = get("grubTargetEfi");
my $bootPath = get("bootPath");
my $storePath = get("storePath");
my $canTouchEfiVariables = get("canTouchEfiVariables");
my $efiSysMountPoint = get("efiSysMountPoint");
my $gfxmodeEfi = get("gfxmodeEfi");
@ -213,7 +214,7 @@ sub GrubFs {
my $grubBoot = GrubFs($bootPath);
my $grubStore;
if ($copyKernels == 0) {
$grubStore = GrubFs("/nix/store");
$grubStore = GrubFs($storePath);
}
# Generate the header.

2
nixos/modules/system/boot/modprobe.nix
View File

@ -101,7 +101,7 @@ with lib;
echo ${config.system.sbin.modprobe}/sbin/modprobe > /proc/sys/kernel/modprobe
'';
environment.variables.MODULE_DIR = "/run/current-system/kernel-modules/lib/modules";
environment.sessionVariables.MODULE_DIR = "/run/current-system/kernel-modules/lib/modules";
};

2
nixos/modules/system/boot/stage-1-init.sh
View File

@ -317,7 +317,7 @@ mountFS() {
# Try to find and mount the root device.
mkdir /mnt-root
mkdir -p $targetRoot
exec 3< @fsInfo@

2
nixos/modules/virtualisation/amazon-init.nix
View File

@ -8,7 +8,7 @@ let
echo "attempting to fetch configuration from user-data..."
export PATH=${pkgs.nix}/bin:${pkgs.wget}/bin:${pkgs.systemd}/bin:${pkgs.gnugrep}/bin:${pkgs.gnused}/bin:${config.system.build.nixos-rebuild}/bin:$PATH
export PATH=${config.nix.package}/bin:${pkgs.wget}/bin:${pkgs.systemd}/bin:${pkgs.gnugrep}/bin:${pkgs.gnused}/bin:${config.system.build.nixos-rebuild}/bin:$PATH
export NIX_PATH=/nix/var/nix/profiles/per-user/root/channels/nixos:nixos-config=/etc/nixos/configuration.nix:/nix/var/nix/profiles/per-user/root/channels
userData="$(mktemp)"

32
nixos/release.nix
View File

@ -93,37 +93,7 @@ let
in rec {
channel =
pkgs.releaseTools.makeSourceTarball {
name = "nixos-channel";
src = nixpkgs;
officialRelease = false; # FIXME: fix this in makeSourceTarball
inherit version versionSuffix;
buildInputs = [ pkgs.nixUnstable ];
expr = builtins.readFile lib/channel-expr.nix;
distPhase = ''
rm -rf .git
echo -n $VERSION_SUFFIX > .version-suffix
echo -n ${nixpkgs.rev or nixpkgs.shortRev} > .git-revision
releaseName=nixos-$VERSION$VERSION_SUFFIX
mkdir -p $out/tarballs
mkdir ../$releaseName
cp -prd . ../$releaseName/nixpkgs
chmod -R u+w ../$releaseName
ln -s nixpkgs/nixos ../$releaseName/nixos
echo "$expr" > ../$releaseName/default.nix
NIX_STATE_DIR=$TMPDIR nix-env -f ../$releaseName/default.nix -qaP --meta --xml \* > /dev/null
cd ..
chmod -R u+w $releaseName
tar cfJ $out/tarballs/$releaseName.tar.xz $releaseName
''; # */
};
channel = import lib/make-channel.nix { inherit pkgs nixpkgs version versionSuffix; };
manual = buildFromConfig ({ pkgs, ... }: { }) (config: config.system.build.manual.manual);
manualPDF = (buildFromConfig ({ pkgs, ... }: { }) (config: config.system.build.manual.manualPDF)).x86_64-linux;

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

@ -5,10 +5,10 @@ let
s = # Generated upstream information
rec {
baseName="qpdfview";
version = "0.4.14";
version = "0.4.15";
name="${baseName}-${version}";
url="https://launchpad.net/qpdfview/trunk/${version}/+download/qpdfview-${version}.tar.gz";
sha256 = "15d88xzqvrcp9szmz8d1lj65yrdx90j6fp78gia5c8kra2z8bik9";
sha256 = "0wgj02zpbyq4m2ix8rljiz312l2xk81gpy030vy424icq4xsip52";
};
buildInputs = [
qt4 poppler_qt4 pkgconfig djvulibre libspectre cups file ghostscript

46
pkgs/applications/networking/mailreaders/mailnag/default.nix Normal file
View File

@ -0,0 +1,46 @@
{ stdenv, buildPythonPackage, fetchurl, gettext, gtk3, pythonPackages
, gdk_pixbuf, libnotify, gst_all_1
, libgnome_keyring3 ? null, networkmanager ? null
}:
buildPythonPackage rec {
name = "mailnag-${version}";
version = "1.1.0";
src = fetchurl {
url = "https://github.com/pulb/mailnag/archive/v${version}.tar.gz";
sha256 = "0li4kvxjmbz3nqg6bysgn2wdazqrd7gm9fym3rd7148aiqqwa91r";
};
# Sometimes the generated output isn't identical. It seems like there's a
# race condtion while patching the Mailnag/commons/dist_cfg.py file. This is
# a small workaround to produce deterministic builds.
# For more information see https://github.com/NixOS/nixpkgs/pull/8279
setupPyBuildFlags = [ "--build-base=$PWD" ];
buildInputs = [
gettext gtk3 pythonPackages.pygobject3 pythonPackages.dbus
pythonPackages.pyxdg gdk_pixbuf libnotify gst_all_1.gstreamer
gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good
gst_all_1.gst-plugins-bad libgnome_keyring3 networkmanager
];
preFixup = ''
for script in mailnag mailnag-config; do
wrapProgram $out/bin/$script \
--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
--prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" \
--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share" \
--prefix PYTHONPATH : "$PYTHONPATH"
done
'';
meta = with stdenv.lib; {
description = "An extensible mail notification daemon";
homepage = https://github.com/pulb/mailnag;
license = licenses.gpl2;
platforms = platforms.linux;
maintainers = with maintainers; [ jgeerds ];
};
}

16
pkgs/applications/networking/remote/teamviewer/10.nix
View File

@ -1,5 +1,8 @@
{ stdenv, fetchurl, libX11, libXtst, libXext, libXdamage, libXfixes, wineUnstable, makeWrapper, libXau
, bash, patchelf, config }:
{ stdenv, fetchurl, libX11, libXtst, libXext, libXdamage, libXfixes,
wineUnstable, makeWrapper, libXau , bash, patchelf, config,
acceptLicense ? false }:
with stdenv.lib;
let
topath = "${wineUnstable}/bin";
@ -37,11 +40,18 @@ stdenv.mkDerivation {
patchelf --set-rpath "${stdenv.cc.cc}/lib64:${stdenv.cc.cc}/lib:${libX11}/lib:${libXext}/lib:${libXau}/lib:${libXdamage}/lib:${libXfixes}/lib" $out/share/teamviewer/tv_bin/teamviewerd
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/share/teamviewer/tv_bin/teamviewerd
ln -s $out/share/teamviewer/tv_bin/teamviewerd $out/bin/
${optionalString acceptLicense "
cat > $out/share/teamviewer/config/global.conf << EOF
[int32] EulaAccepted = 1
[int32] EulaAcceptedRevision = 6
EOF
"}
'';
meta = {
homepage = "http://www.teamviewer.com";
license = stdenv.lib.licenses.unfree;
license = licenses.unfree;
description = "Desktop sharing application, providing remote support and online meetings";
maintainers = with maintainers; [ jagajaga ];
};
}

8
pkgs/applications/science/logic/abc/default.nix
View File

@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
name = "abc-verifier-${version}";
version = "20150406";
version = "20150614";
src = fetchhg {
url = "https://bitbucket.org/alanmi/abc";
rev = "7d9c50a17d8676ad0c9792bb87102d7cb4b10667";
sha256 = "1gg5jjfjjnv0fl7jsz37hzd9dpv58r8p0q8qvms0r289fcdxalcx";
rev = "38661894bc1287cad9bd35978bd252dbfe3e6c56";
sha256 = "04v0hkvj501r10pj3yrqrk2463d1d7lhl8dzfjwkmlbmlmpjlvvv";
};
buildInputs = [ readline ];
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
'';
meta = {
description = "Sequential Logic Synthesis and Formal Verification";
description = "A tool for squential logic synthesis and ormal verification";
homepage = "www.eecs.berkeley.edu/~alanmi/abc/abc.htm";
license = stdenv.lib.licenses.mit;
platforms = stdenv.lib.platforms.unix;

24
pkgs/applications/science/logic/cvc4/default.nix
View File

@ -1,23 +1,23 @@
{stdenv, fetchurl, gmp, libantlr3c, boost}:
{ stdenv, fetchurl, gmp, libantlr3c, boost, autoreconfHook }:
stdenv.mkDerivation rec {
name = "cvc4-${version}";
version = "1.4";
stdenv.mkDerivation {
name = "cvc4-1.4";
src = fetchurl {
url = http://cvc4.cs.nyu.edu/builds/src/cvc4-1.4.tar.gz;
url = "http://cvc4.cs.nyu.edu/builds/src/cvc4-${version}.tar.gz";
sha256 = "093h7zgv4z4ad503j30dpn8k2pz9m90pvd7gi5axdmwsxgwlzzkn";
};
buildInputs = [ gmp libantlr3c boost ];
buildInputs = [ gmp libantlr3c boost autoreconfHook ];
preConfigure = "patchShebangs ./src/";
doChecks = true;
meta = with stdenv.lib; {
description = "An efficient open-source automatic theorem prover for satisfiability modulo theories (SMT) problems";
homepage = http://cvc4.cs.nyu.edu/web/;
license = licenses.bsd3;
platforms = platforms.unix;
maintainers = with maintainers; [ vbgl ];
description = "A high-performance theorem prover and SMT solver";
homepage = http://cvc4.cs.nyu.edu/web/;
license = licenses.bsd3;
platforms = platforms.unix;
maintainers = with maintainers; [ vbgl thoughtpolice ];
};
}

32
pkgs/applications/science/logic/picosat/default.nix
View File

@ -1,41 +1,33 @@
{stdenv, fetchurl }:
let
version = "936";
pname = "picosat";
in
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "${pname}-${version}";
name = "picosat-${version}";
version = "960";
src = fetchurl {
url = "http://fmv.jku.at/picosat/${name}.tar.gz";
sha256 = "02hq68fmfjs085216wsj13ff6i1rhc652yscl16w9jzpfqzly91n";
sha256 = "05z8cfjk84mkna5ryqlq2jiksjifg3jhlgbijaq36sbn0i51iczd";
};
dontAddPrefix = true;
# configureFlags = "--shared"; the ./configure file is broken and doesn't accept this parameter :(
patchPhase = ''
sed -e 's/^shared=no/shared=yes/' -i configure
'';
configureFlags = "--shared";
installPhase = ''
mkdir -p "$out"/bin
mkdir -p $out/bin $out/lib $out/include/picosat
cp picomus "$out"/bin
cp picosat "$out"/bin
mkdir -p "$out"/lib
cp libpicosat.a "$out"/lib
cp libpicosat.so "$out"/lib
mkdir -p "$out"/include/picosat
cp picosat.h "$out"/include/picosat
'';
meta = {
homepage = http://fmv.jku.at/picosat/;
description = "SAT solver with proof and core support";
license = stdenv.lib.licenses.mit;
maintainers = [ stdenv.lib.maintainers.roconnor ];
homepage = http://fmv.jku.at/picosat/;
license = stdenv.lib.licenses.mit;
platforms = stdenv.lib.platforms.unix;
maintainers = with stdenv.lib.maintainers; [ roconnor thoughtpolice ];
};
}

39
pkgs/applications/science/logic/yices/default.nix
View File

@ -1,36 +1,19 @@
{ stdenv, fetchurl }:
{ stdenv, fetchurl, gmp, gperf, autoreconfHook }:
assert stdenv.isLinux;
let
libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.libc ];
in
stdenv.mkDerivation rec {
name = "yices-${version}";
version = "2.2.1";
version = "2.3.1";
src =
if stdenv.system == "i686-linux"
then fetchurl {
url = "http://yices.csl.sri.com/cgi-bin/yices2-newdownload.cgi?file=yices-2.2.1-i686-pc-linux-gnu-static-gmp.tar.gz&accept=I+accept";
name = "yices-${version}-i686.tar.gz";
sha256 = "12jzk3kqlbqa5x6rl92cpzj7dch7gm7fnbj72wifvwgdj4zyhrra";
}
else fetchurl {
url = "http://yices.csl.sri.com/cgi-bin/yices2-newdownload.cgi?file=yices-2.2.1-x86_64-unknown-linux-gnu-static-gmp.tar.gz&accept=I+accept";
name = "yices-${version}-x86_64.tar.gz";
sha256 = "0fpmihf6ykcg4qbsimkamgcwp4sl1xyxmz7q28ily91rd905ijaj";
};
src = fetchurl {
url = "http://yices.csl.sri.com/cgi-bin/yices2-newnewdownload.cgi?file=yices-2.3.1-src.tar.gz&accept=I+Agree";
name = "yices-${version}-src.tar.gz";
sha256 = "1da70n0cah0dh3pk7fcrvjkszx9qmhc0csgl15jqa7bdh707k2zs";
};
buildPhase = false;
installPhase = ''
mkdir -p $out/bin $out/lib $out/include
cd bin && mv * $out/bin && cd ..
cd lib && mv * $out/lib && cd ..
cd include && mv * $out/include && cd ..
patchelf --set-rpath ${libPath} $out/lib/libyices.so.${version}
'';
configureFlags = [ "--with-static-gmp=${gmp}/lib/libgmp.a"
"--with-static-gmp-include-dir=${gmp}/include"
];
buildInputs = [ gmp gperf autoreconfHook ];
meta = {
description = "A high-performance theorem prover and SMT solver";

8
pkgs/applications/science/misc/golly/default.nix
View File

@ -3,11 +3,11 @@ let
s = # Generated upstream information
rec {
baseName="golly";
version="2.6";
version="2.7";
name="${baseName}-${version}";
hash="1n1k3yf23ymlwq4k6p4v2g04qd29pg2rabr4l7m9bj2b2j1zkqhz";
url="mirror://sourceforge/project/golly/golly/golly-2.6/golly-2.6-src.tar.gz";
sha256="1n1k3yf23ymlwq4k6p4v2g04qd29pg2rabr4l7m9bj2b2j1zkqhz";
hash="0wfr9dhdbwg2cbcl7g2s1h9pmsm1lkjncbs9m0df82bcw516xs2f";
url="mirror://sourceforge/project/golly/golly/golly-2.7/golly-2.7-src.tar.gz";
sha256="0wfr9dhdbwg2cbcl7g2s1h9pmsm1lkjncbs9m0df82bcw516xs2f";
};
buildInputs = [
wxGTK perl python zlib

4
pkgs/applications/version-management/mr/default.nix
View File

@ -1,12 +1,12 @@
{ stdenv, fetchurl, perl }:
stdenv.mkDerivation rec {
version = "1.20141024";
version = "1.20150503";
name = "mr-${version}";
src = fetchurl {
url = "https://github.com/joeyh/myrepos/archive/${version}.tar.gz";
sha256 = "7b68183476867d15d6f111fc9678335b94824dcfa09f07c761a72d64cdf5ad4a";
sha256 = "12cf8kmn13446rszmah5wws5p2k2gjp6y4505sy1r14qnahf4qbf";
};
buildInputs = [ perl ];

6
pkgs/applications/video/makemkv/default.nix
View File

@ -4,17 +4,17 @@
stdenv.mkDerivation rec {
name = "makemkv-${ver}";
ver = "1.9.2";
ver = "1.9.4";
builder = ./builder.sh;
src_bin = fetchurl {
url = "http://www.makemkv.com/download/makemkv-bin-${ver}.tar.gz";
sha256 = "0hjby7imja9sg2h68al81n4zl72mc3y3fqmf61sf1sad4njs9bkj";
sha256 = "0xr5bfbpzd1s9fyxbwj0crpgi57hm4wrm1dybx13lv4n6xdj2ww0";
};
src_oss = fetchurl {
url = "http://www.makemkv.com/download/makemkv-oss-${ver}.tar.gz";
sha256 = "074scfz835jynzmb28i8q44hc6ixvfg3crgirmy02bbpxakyp1v6";
sha256 = "0gpmyp2g44piaj47a52ik5i3sk5flbs8kqlqmjxnqkv16s01vfra";
};
buildInputs = [openssl qt4 mesa zlib pkgconfig libav];

15
pkgs/desktops/gnome-2/platform/gtkglextmm/default.nix
View File

@ -1,4 +1,6 @@
{ stdenv, fetchurl, pkgconfig, gtkglext, gtkmm, gtk, mesa, gdk_pixbuf }:
{ stdenv, fetchurl, pkgconfig, gtkglext, gtkmm, gtk, mesa, gdk_pixbuf
, pangox_compat, libXmu
}:
stdenv.mkDerivation rec {
name = "gtkglextmm-${minVer}.0";
@ -9,7 +11,16 @@ stdenv.mkDerivation rec {
sha256 = "6cd4bd2a240e5eb1e3a24c5a3ebbf7ed905b522b888439778043fdeb58771fea";
};
patches = [ ./gdk.patch ];
patches = [
./gdk.patch
# From debian, fixes build with newer gtk "[...] by switching #includes
# around so that the G_DISABLE_DEPRECATED trick in glibmm still works".
# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=707356
./fix_ftbfs_gtk_2_36.patch
];
buildInputs = [ pangox_compat libXmu ];
nativeBuildInputs = [pkgconfig];

121
pkgs/desktops/gnome-2/platform/gtkglextmm/fix_ftbfs_gtk_2_36.patch Normal file
View File

@ -0,0 +1,121 @@
Index: gtkglextmm-1.2.0/gdkglext/gdkmm/gl/wrap_init.cc
===================================================================
--- gtkglextmm-1.2.0.orig/gdkglext/gdkmm/gl/wrap_init.cc 2013-05-16 23:40:48.363207736 +0200
+++ gtkglextmm-1.2.0/gdkglext/gdkmm/gl/wrap_init.cc 2013-05-16 23:42:40.193801834 +0200
@@ -1,15 +1,8 @@
-
-#include <glib.h>
-
// Disable the 'const' function attribute of the get_type() functions.
// GCC would optimize them out because we don't use the return value.
#undef G_GNUC_CONST
#define G_GNUC_CONST /* empty */
-#include <gdkmm/gl/wrap_init.h>
-#include <glibmm/error.h>
-#include <glibmm/object.h>
-
// #include the widget headers so that we can call the get_type() static methods:
#include "tokens.h"
@@ -19,6 +12,12 @@
#include "pixmap.h"
#include "window.h"
+#include <glib.h>
+
+#include <gdkmm/gl/wrap_init.h>
+#include <glibmm/error.h>
+#include <glibmm/object.h>
+
extern "C"
{
Index: gtkglextmm-1.2.0/gdkglext/gdkmm/gl/query.cc
===================================================================
--- gtkglextmm-1.2.0.orig/gdkglext/gdkmm/gl/query.cc 2013-05-16 23:40:48.363207736 +0200
+++ gtkglextmm-1.2.0/gdkglext/gdkmm/gl/query.cc 2013-05-16 23:42:40.193801834 +0200
@@ -17,10 +17,10 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-#include <gdk/gdkglquery.h>
-
#include "query.h"
+#include <gdk/gdkglquery.h>
+
namespace Gdk
{
namespace GL
Index: gtkglextmm-1.2.0/gdkglext/gdkmm/gl/pixmapext.cc
===================================================================
--- gtkglextmm-1.2.0.orig/gdkglext/gdkmm/gl/pixmapext.cc 2013-05-16 23:40:48.363207736 +0200
+++ gtkglextmm-1.2.0/gdkglext/gdkmm/gl/pixmapext.cc 2013-05-16 23:42:40.193801834 +0200
@@ -17,11 +17,11 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
+#include "pixmapext.h"
+
#include <gdk/gdkgldrawable.h>
#include <gdk/gdkglpixmap.h>
-#include "pixmapext.h"
-
namespace Gdk
{
namespace GL
Index: gtkglextmm-1.2.0/gdkglext/gdkmm/gl/windowext.cc
===================================================================
--- gtkglextmm-1.2.0.orig/gdkglext/gdkmm/gl/windowext.cc 2013-05-16 23:40:48.363207736 +0200
+++ gtkglextmm-1.2.0/gdkglext/gdkmm/gl/windowext.cc 2013-05-16 23:42:40.193801834 +0200
@@ -17,11 +17,11 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
+#include "windowext.h"
+
#include <gdk/gdkgldrawable.h>
#include <gdk/gdkglwindow.h>
-#include "windowext.h"
-
namespace Gdk
{
namespace GL
Index: gtkglextmm-1.2.0/gdkglext/gdkmm/gl/font.cc
===================================================================
--- gtkglextmm-1.2.0.orig/gdkglext/gdkmm/gl/font.cc 2004-05-18 08:01:49.000000000 +0200
+++ gtkglextmm-1.2.0/gdkglext/gdkmm/gl/font.cc 2013-05-16 23:43:07.637456821 +0200
@@ -17,10 +17,10 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-#include <gdk/gdkglfont.h>
-
#include "font.h"
+#include <gdk/gdkglfont.h>
+
namespace Gdk
{
namespace GL
Index: gtkglextmm-1.2.0/gdkglext/gdkmm/gl/init.cc
===================================================================
--- gtkglextmm-1.2.0.orig/gdkglext/gdkmm/gl/init.cc 2003-02-27 10:49:24.000000000 +0100
+++ gtkglextmm-1.2.0/gdkglext/gdkmm/gl/init.cc 2013-05-16 23:44:38.320316782 +0200
@@ -19,11 +19,11 @@
#include <cstdlib>
-#include <gdk/gdkglinit.h>
-
#include "wrap_init.h"
#include "init.h"
+#include <gdk/gdkglinit.h>
+
namespace Gdk
{
namespace GL

4
pkgs/desktops/gnome-3/3.16/core/dconf-editor/default.nix
View File

@ -13,12 +13,12 @@ stdenv.mkDerivation rec {
sha256 = "0vl5ygbh8blbk3710w34lmhxxl4g275vzpyhjsq0016c597isp88";
};
buildInputs = [ vala libxslt pkgconfig glib dbus_glib gnome3.gtk libxml2
buildInputs = [ vala libxslt pkgconfig glib dbus_glib gnome3.gtk libxml2 gnome3.defaultIconTheme
intltool docbook_xsl docbook_xsl_ns makeWrapper gnome3.dconf ];
preFixup = ''
wrapProgram "$out/bin/dconf-editor" \
--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
--prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
'';
meta = with stdenv.lib; {

11
pkgs/desktops/gnome-3/3.16/core/gnome-bluetooth/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, gnome3, pkgconfig, intltool, glib
, udev, itstool, libxml2 }:
, udev, itstool, libxml2, makeWrapper }:
stdenv.mkDerivation rec {
name = "gnome-bluetooth-${gnome3.version}.1";
@ -9,8 +9,13 @@ stdenv.mkDerivation rec {
sha256 = "12z0792j5ln238ajhgqx5jrm34wz2yqbbskhlp23p9c0cwnj1srz";
};
buildInputs = with gnome3; [ pkgconfig intltool glib gtk3 udev libxml2
gsettings_desktop_schemas itstool ];
buildInputs = with gnome3; [ pkgconfig intltool glib gtk3 udev libxml2 gnome3.defaultIconTheme
makeWrapper gsettings_desktop_schemas itstool ];
preFixup = ''
wrapProgram "$out/bin/bluetooth-sendto" \
--prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
'';
meta = with stdenv.lib; {
homepage = https://help.gnome.org/users/gnome-bluetooth/stable/index.html.en;

22
pkgs/desktops/plasma-5.3/default.nix
View File

@ -12,7 +12,7 @@
# make a copy of this directory first. After copying, be sure to delete ./tmp
# if it exists. Then follow the minor update instructions.
{ autonix, kf5, pkgs, qt5, stdenv, debug ? false }:
{ autonix, kf5, kdeApps, pkgs, qt5, stdenv, debug ? false }:
with stdenv.lib; with autonix;
@ -143,19 +143,19 @@ let
};
plasma-workspace = with pkgs; super.plasma-workspace // {
patches = [
(substituteAll {
src = ./plasma-workspace/0001-startkde-NixOS-patches.patch;
inherit (pkgs) bash gnused gnugrep socat;
inherit (kf5) kconfig kinit kservice;
inherit (pkgs.xorg) mkfontdir xmessage xprop xrdb xset xsetroot;
qt5tools = qt5.tools;
dbus_tools = pkgs.dbus.tools;
})
];
patches = [ ./plasma-workspace/0001-startkde-NixOS-patches.patch ];
buildInputs = with xlibs;
super.plasma-workspace.buildInputs ++ [ libSM libXcursor pam ];
inherit (pkgs) bash gnused gnugrep socat;
inherit (kf5) kconfig kinit kservice;
inherit (pkgs.xorg) mkfontdir xmessage xprop xrdb xset xsetroot;
kde_workspace = kdeApps.kde-workspace;
qt5tools = qt5.tools;
dbus_tools = pkgs.dbus.tools;
postPatch = ''
substituteAllInPlace startkde/startkde.cmake
substituteInPlace startkde/kstartupconfig/kstartupconfig.cpp \
--replace kdostartupconfig5 $out/bin/kdostartupconfig5
'';

26
pkgs/desktops/plasma-5.3/plasma-workspace/0001-startkde-NixOS-patches.patch
View File

@ -1,14 +1,14 @@
From 37abdee4e25f6aff55da838864d1a67a7be758ad Mon Sep 17 00:00:00 2001
From ff61c8ba856328a60e29938466b69d0bb38a357f Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Tue, 2 Jun 2015 11:21:43 -0500
Subject: [PATCH] startkde: NixOS patches
---
startkde/startkde.cmake | 214 ++++++++++++++++++++----------------------------
1 file changed, 87 insertions(+), 127 deletions(-)
startkde/startkde.cmake | 218 ++++++++++++++++++++----------------------------
1 file changed, 89 insertions(+), 129 deletions(-)
diff --git a/startkde/startkde.cmake b/startkde/startkde.cmake
index 24e5c1b..787d719 100644
index 24e5c1b..e7bdd32 100644
--- a/startkde/startkde.cmake
+++ b/startkde/startkde.cmake
@@ -1,8 +1,31 @@
@ -93,7 +93,7 @@ index 24e5c1b..787d719 100644
#This is basically setting defaults so we can use them with kstartupconfig5
cat >$configDir/startupconfigkeys <<EOF
@@ -106,53 +111,19 @@ toolBarFont=Oxygen-Sans,9,-1,5,50,0,0,0,0,0
@@ -106,55 +111,21 @@ toolBarFont=Oxygen-Sans,9,-1,5,50,0,0,0,0,0
EOF
}
@ -148,9 +148,12 @@ index 24e5c1b..787d719 100644
if test -n "$kcminputrc_mouse_cursortheme" -o -n "$kcminputrc_mouse_cursorsize" ; then
- @EXPORT_XCURSOR_PATH@
kapplymousetheme "$kcminputrc_mouse_cursortheme" "$kcminputrc_mouse_cursorsize"
- kapplymousetheme "$kcminputrc_mouse_cursortheme" "$kcminputrc_mouse_cursorsize"
+ @kde_workspace@/bin/kapplymousetheme "$kcminputrc_mouse_cursortheme" "$kcminputrc_mouse_cursorsize"
if test $? -eq 10; then
@@ -168,15 +139,33 @@ if test -n "$kcminputrc_mouse_cursortheme" -o -n "$kcminputrc_mouse_cursorsize"
XCURSOR_THEME=breeze_cursors
export XCURSOR_THEME
@@ -168,21 +139,39 @@ if test -n "$kcminputrc_mouse_cursortheme" -o -n "$kcminputrc_mouse_cursorsize"
fi
fi
@ -175,7 +178,7 @@ index 24e5c1b..787d719 100644
+# Make sure that D-Bus is running
+# D-Bus autolaunch is broken
+if test -z "$DBUS_SESSION_BUS_ADDRESS" ; then
+ eval `@dbus_tools@/dbus-launch --sh-syntax --exit-with-session`
+ eval `@dbus_tools@/bin/dbus-launch --sh-syntax --exit-with-session`
+fi
+if @qt5tools@/bin/qdbus >/dev/null 2>/dev/null; then
+ : # ok
@ -189,6 +192,13 @@ index 24e5c1b..787d719 100644
ksplash_pid=
if test -z "$dl"; then
# the splashscreen and progress indicator
case "$ksplashrc_ksplash_engine" in
KSplashQML)
- ksplash_pid=`ksplashqml "${ksplashrc_ksplash_theme}" --pid`
+ ksplash_pid=`@out@/bin/ksplashqml "${ksplashrc_ksplash_theme}" --pid`
;;
None)
;;
@@ -205,8 +194,7 @@ fi
# For anything else (that doesn't set env vars, or that needs a window manager),
# better use the Autostart folder.

4
pkgs/development/compilers/julia/0.3.nix
View File

@ -127,10 +127,6 @@ stdenv.mkDerivation rec {
"-lz"
];
preConfigure = ''
export PATH="$PATH:${stdenv.cc.libc}/sbin"
'';
dontStrip = true;
dontPatchELF = true;

1
pkgs/development/haskell-modules/configuration-common.nix
View File

@ -166,6 +166,7 @@ self: super: {
types-compat = dontHaddock super.types-compat; # https://github.com/philopon/apiary/issues/15
wai-test = dontHaddock super.wai-test;
zlib-conduit = dontHaddock super.zlib-conduit;
record = dontHaddock super.record; # https://github.com/nikita-volkov/record/issues/22
# Jailbreak doesn't get the job done because the Cabal file uses conditionals a lot.
darcs = (overrideCabal super.darcs (drv: {

1
pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
View File

@ -225,7 +225,6 @@ self: super: {
cabal-install_1_18_1_0 = markBroken super.cabal-install_1_18_1_0;
containers_0_4_2_1 = markBroken super.containers_0_4_2_1;
control-monad-free_0_5_3 = markBroken super.control-monad-free_0_5_3;
equivalence_0_2_5 = markBroken super.equivalence_0_2_5;
haddock-api_2_15_0_2 = markBroken super.haddock-api_2_15_0_2;
optparse-applicative_0_10_0 = markBroken super.optparse-applicative_0_10_0;
QuickCheck_1_2_0_1 = markBroken super.QuickCheck_1_2_0_1;

1
pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
View File

@ -59,7 +59,6 @@ self: super: {
# Newer versions require mtl 2.2.x.
mtl-prelude = self.mtl-prelude_1_0_3;
equivalence = super.equivalence_0_2_5; # required by Agda
# purescript requires mtl 2.2.x.
purescript = overrideCabal (super.purescript.overrideScope (self: super: {

430
pkgs/development/haskell-modules/hackage-packages.nix
View File

@ -19370,8 +19370,8 @@ self: {
}:
mkDerivation {
pname = "angel";
version = "0.5.2";
sha256 = "0h2nyxv56cshkxlbq5j54220w7x2y0m1aaqzqz6dhipff29pmr39";
version = "0.6.0";
sha256 = "0625r8jy9v6x5v5y5vrz2z7bqag9hwjnxr7ir35bq18xd5fpr9kf";
isLibrary = false;
isExecutable = true;
buildDepends = [
@ -28020,8 +28020,8 @@ self: {
}:
mkDerivation {
pname = "cabal-bounds";
version = "0.9.3";
sha256 = "0r8ayxsfx7z4hivknshj2sybssn3hjwprxpyqw4yv3w26gv7d82j";
version = "0.9.4";
sha256 = "1l1nqf8878kmmdc5ssrpn52cszn9w0ym70pjjbaprpa1c7mdbziy";
isLibrary = true;
isExecutable = true;
buildDepends = [
@ -35752,21 +35752,6 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"cpphs_1_18_9" = callPackage
({ mkDerivation, base, directory, old-locale, old-time, polyparse
}:
mkDerivation {
pname = "cpphs";
version = "1.18.9";
sha256 = "0bf9p5izkag6iqlpf59znsv8107hg1xghgas4crw2gxai1z7bfq6";
isLibrary = true;
isExecutable = true;
buildDepends = [ base directory old-locale old-time polyparse ];
homepage = "http://projects.haskell.org/cpphs/";
description = "A liberalised re-implementation of cpp, the C pre-processor";
license = "LGPL";
}) {};
"cpphs" = callPackage
({ mkDerivation, base, directory, old-locale, old-time, polyparse
}:
@ -36413,17 +36398,19 @@ self: {
"cron" = callPackage
({ mkDerivation, attoparsec, base, derive, hspec
, hspec-expectations, mtl, old-locale, QuickCheck, text, time
, transformers
, hspec-expectations, mtl, mtl-compat, old-locale, QuickCheck, text
, time, transformers-compat
}:
mkDerivation {
pname = "cron";
version = "0.2.6";
sha256 = "1klxhk12c08ig7n8n8drnvqmggfghr8i9j5bfhakj58bk1x8xfvg";
buildDepends = [ attoparsec base mtl old-locale text time ];
version = "0.3.0";
sha256 = "18yadf94bzyhm5nab6lc8zagp39yv5k8cjjakhaxncgipcm30s9k";
buildDepends = [
attoparsec base mtl mtl-compat old-locale text time
];
testDepends = [
attoparsec base derive hspec hspec-expectations QuickCheck text
time transformers
time transformers-compat
];
homepage = "http://github.com/michaelxavier/cron";
description = "Cron datatypes and Attoparsec parser";
@ -43249,6 +43236,24 @@ self: {
license = stdenv.lib.licenses.gpl3;
}) {};
"dozens" = callPackage
({ mkDerivation, aeson, base, bytestring, data-default-class
, http-client, http-types, reflection, scientific, text
, transformers
}:
mkDerivation {
pname = "dozens";
version = "0.1.1";
sha256 = "1hvsdc69ag4x8rp2pzr3cxjfbl4fh9bdj4bwlkfvpr755qdi45ky";
buildDepends = [
aeson base bytestring data-default-class http-client http-types
reflection scientific text transformers
];
homepage = "https://github.com/philopon/apiary";
description = "dozens api library";
license = stdenv.lib.licenses.mit;
}) {};
"dph-base" = callPackage
({ mkDerivation, array, base, ghc-prim, pretty, random, vector }:
mkDerivation {
@ -46041,24 +46046,6 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"equivalence_0_2_5" = callPackage
({ mkDerivation, base, containers, mtl, QuickCheck, STMonadTrans
, template-haskell, test-framework, test-framework-quickcheck2
}:
mkDerivation {
pname = "equivalence";
version = "0.2.5";
sha256 = "014r9v81r7nj5pynfk3wa4lm4hk04123fgxkhb9a945wi6d9m5h3";
buildDepends = [ base containers mtl STMonadTrans ];
testDepends = [
base containers mtl QuickCheck STMonadTrans template-haskell
test-framework test-framework-quickcheck2
];
homepage = "https://bitbucket.org/paba/equivalence/";
description = "Maintaining an equivalence relation implemented as union-find using STT";
license = stdenv.lib.licenses.bsd3;
}) {};
"equivalence" = callPackage
({ mkDerivation, base, containers, mtl, QuickCheck, STMonadTrans
, template-haskell, test-framework, test-framework-quickcheck2
@ -48255,17 +48242,25 @@ self: {
}) {};
"feldspar-signal" = callPackage
({ mkDerivation, base }:
({ mkDerivation, base, base-compat, feldspar-compiler
, feldspar-compiler-shim, feldspar-language, imperative-edsl
, mainland-pretty, monadic-edsl-priv
}:
mkDerivation {
pname = "feldspar-signal";
version = "0.0.0.1";
sha256 = "16brcdnbk4ykribgw5jix7k6qca2rxqms1hnljmirs0b8ldyflgx";
buildDepends = [ base ];
version = "0.0.1.0";
sha256 = "147y0fy5pzagk8pm8way8qnxv42mn5qh8kmzjf02laydzxrwvpxd";
buildDepends = [
base base-compat feldspar-compiler feldspar-compiler-shim
feldspar-language imperative-edsl mainland-pretty monadic-edsl-priv
];
jailbreak = true;
homepage = "https://github.com/markus-git/feldspar-signal";
description = "Signal Processing extension for Feldspar";
license = stdenv.lib.licenses.bsd3;
}) {};
broken = true;
}) { feldspar-compiler-shim = null; imperative-edsl = null;
monadic-edsl-priv = null;};
"fen2s" = callPackage
({ mkDerivation, api-opentheory-unicode, base, opentheory-unicode
@ -48341,19 +48336,19 @@ self: {
}) {};
"fficxx" = callPackage
({ mkDerivation, base, bytestring, Cabal, containers, directory
, either, errors, filepath, hashable, HStringTemplate, lens, mtl
, process, pureMD5, split, template-haskell, transformers
, unordered-containers
({ mkDerivation, base, bytestring, Cabal, containers, data-default
, directory, either, errors, filepath, hashable, HStringTemplate
, lens, mtl, process, pureMD5, split, template-haskell
, transformers, unordered-containers
}:
mkDerivation {
pname = "fficxx";
version = "0.2";
sha256 = "0512v9xhli6qdz46gvn8lj15rp30919pf982fjcgklw22qmci69q";
version = "0.2.1";
sha256 = "1vjkwp0krs2762ww7vkl1g0dpaw6ifba7acjndmqbnvm3yl0ha0d";
buildDepends = [
base bytestring Cabal containers directory either errors filepath
hashable HStringTemplate lens mtl process pureMD5 split
template-haskell transformers unordered-containers
base bytestring Cabal containers data-default directory either
errors filepath hashable HStringTemplate lens mtl process pureMD5
split template-haskell transformers unordered-containers
];
description = "automatic C++ binding generation";
license = stdenv.lib.licenses.bsd3;
@ -48364,8 +48359,8 @@ self: {
({ mkDerivation, base }:
mkDerivation {
pname = "fficxx-runtime";
version = "0.2";
sha256 = "0czh7in30369c8c4ls3m3r61w6zb1p0p0jy2yi5j9521f61q588a";
version = "0.2.1";
sha256 = "0hcpc0db4mh3yx8yzbkllq9b04dd1qvr63ppz2qa9nq5zydb5pxk";
buildDepends = [ base ];
description = "Runtime for fficxx-generated library";
license = stdenv.lib.licenses.bsd3;
@ -52312,11 +52307,10 @@ self: {
({ mkDerivation, base, ieee754, QuickCheck }:
mkDerivation {
pname = "geom2d";
version = "0.1.2.1";
sha256 = "0235p0gjwsklxynr84ak6zirbxirhwm9f2z7d6b31y5hc9pnrznj";
version = "0.1.3.1";
sha256 = "1kz0cdxfc27412vzqv7vcywg9pba177ds6mpwknxlh049vcfrvh5";
buildDepends = [ base ieee754 QuickCheck ];
testDepends = [ base ieee754 QuickCheck ];
jailbreak = true;
description = "package for geometry in euklidean 2d space";
license = stdenv.lib.licenses.gpl3;
hydraPlatforms = stdenv.lib.platforms.none;
@ -53294,7 +53288,7 @@ self: {
, clientsession, conduit, conduit-extra, containers, crypto-api
, cryptohash, curl, data-default, DAV, dbus, directory, dlist, dns
, edit-distance, esqueleto, exceptions, fdo-notify, feed, filepath
, git, gnupg1, gnutls, hamlet, hinotify, hslogger, http-client
, git, gnupg, gnutls, hamlet, hinotify, hslogger, http-client
, http-conduit, http-types, IfElse, json, lsof, MissingH
, monad-control, monad-logger, mtl, network, network-info
, network-multicast, network-protocol-xmpp, network-uri, openssh
@ -53330,7 +53324,7 @@ self: {
yesod-static
];
buildTools = [
bup curl git gnupg1 lsof openssh perl rsync wget which
bup curl git gnupg lsof openssh perl rsync wget which
];
configureFlags = [ "-fassistant" "-fproduction" ];
preConfigure = "export HOME=$TEMPDIR";
@ -53342,7 +53336,7 @@ self: {
description = "manage files with git, without checking their contents into git";
license = stdenv.lib.licenses.gpl3;
}) { inherit (pkgs) bup; inherit (pkgs) curl; inherit (pkgs) git;
inherit (pkgs) gnupg1; inherit (pkgs) lsof;
inherit (pkgs) gnupg; inherit (pkgs) lsof;
inherit (pkgs) openssh; inherit (pkgs) perl;
inherit (pkgs) rsync; inherit (pkgs) wget;
inherit (pkgs) which;};
@ -67451,8 +67445,8 @@ self: {
}:
mkDerivation {
pname = "hpack";
version = "0.3.0";
sha256 = "0hvnb3svs7rh8c6afsp5rs6wdld2pllr5fvjhmlc143p40akck25";
version = "0.3.1";
sha256 = "178pdk9rhqiyzjpdvkfvjs4gfc27k1limi7qpnpqyxzlcrcsplvb";
isLibrary = false;
isExecutable = true;
buildDepends = [
@ -71698,9 +71692,9 @@ self: {
mkDerivation {
pname = "http-encodings";
version = "0.9.3";
revision = "1";
revision = "2";
sha256 = "0b29zqa2ybja73jip83qn1xhiinn1k64b6dmc39ccp48ip1xdnvn";
editedCabalFile = "b9e6dd65c8dd4119887c084f1bd14570ab0540e723afb845212f041e871210d7";
editedCabalFile = "0370852e7250c2c2bb1575155286442cbfcdd03a7e494dcaa73305d4e84a6c76";
buildDepends = [
base bytestring HTTP iconv mime mtl parsec text utf8-string zlib
];
@ -71916,8 +71910,8 @@ self: {
}:
mkDerivation {
pname = "http-streams";
version = "0.8.3.2";
sha256 = "1hyg3fyhysxfbqks3y7rkbzx8j0hxkxlqdcbx77cihvz9j3ddzyk";
version = "0.8.3.3";
sha256 = "0cp2jdalg0vzikl6v4yhyflllv7yqskph5gp5ahirawhcj9rfi9z";
buildDepends = [
aeson attoparsec base base64-bytestring blaze-builder bytestring
case-insensitive directory HsOpenSSL http-common io-streams mtl
@ -76998,19 +76992,19 @@ self: {
({ mkDerivation, arrows, base, bytestring, cmdargs
, data-default-class, data-default-instances-base, Diff, directory
, filepath, HTTP, http-encodings, hxt, hxt-tagsoup
, language-ecmascript, network, random, tasty, tasty-golden
, transformers
, language-ecmascript, network, network-uri, random, tasty
, tasty-golden, transformers
}:
mkDerivation {
pname = "jespresso";
version = "1.0.1";
sha256 = "0rl4k1vn5q23rjylpyya6dmp6pwdbdvrlxgkczxwy84j9xm665zg";
version = "1.0.1.1";
sha256 = "0lxkn0zd4y7b36y42hxpfan5jcy910ksl044yvmrk634p7s3996h";
isLibrary = true;
isExecutable = true;
buildDepends = [
arrows base bytestring cmdargs data-default-class
data-default-instances-base HTTP http-encodings hxt hxt-tagsoup
language-ecmascript network random
language-ecmascript network network-uri random
];
testDepends = [
arrows base Diff directory filepath hxt tasty tasty-golden
@ -80459,8 +80453,8 @@ self: {
({ mkDerivation, base, mtl, parsers, text, trifecta }:
mkDerivation {
pname = "language-thrift";
version = "0.1.0.1";
sha256 = "11z8lkny9bhbbgchpy3jz1nn867ygqi4rq5vffxqpbj6qq2a8bxk";
version = "0.2.0.0";
sha256 = "01wvpm4aa222ic8z6wg0wdjyfnkd8gh2kqsda7qfckcyxs9679qw";
buildDepends = [ base mtl parsers text trifecta ];
homepage = "https://github.com/abhinav/language-thrift";
description = "Parser for the Thrift IDL format";
@ -81198,14 +81192,31 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
"lens-regex" = callPackage
({ mkDerivation, array, base, directory, doctest, filepath, lens
, regex-base, regex-posix, template-haskell
}:
mkDerivation {
pname = "lens-regex";
version = "0.1.0";
sha256 = "0hjizjmvdngxn63gs7x87qidh71aqhvyigrnqlbfjqan76pb6m29";
isLibrary = true;
isExecutable = true;
buildDepends = [ array base lens regex-base template-haskell ];
testDepends = [ base directory doctest filepath regex-posix ];
homepage = "https://github.com/himura/lens-regex";
description = "Lens powered regular expression";
license = stdenv.lib.licenses.bsd3;
}) {};
"lens-simple" = callPackage
({ mkDerivation, base, lens-family, lens-family-core
, lens-family-th, transformers
}:
mkDerivation {
pname = "lens-simple";
version = "0.1.0.4";
sha256 = "0cr1jghg8dnyclih21zlm9190j2dyl6mwc0gw216l5yj67c5aly3";
version = "0.1.0.5";
sha256 = "1hn2g9xswfn94m5hxi39jpmdaxm51l231cvqn2a62pr8j6b34839";
buildDepends = [
base lens-family lens-family-core lens-family-th transformers
];
@ -81283,10 +81294,8 @@ self: {
}:
mkDerivation {
pname = "lentil";
version = "0.1.0.2";
revision = "2";
sha256 = "104f1hyd9fp0b0ibqr292bpx8zgmw8gi7m3br2zv8m19rrnwgn4v";
editedCabalFile = "fb144e396ba79b4418a347b981356f5d15a1c33179bc8c7c154de7c5cb0d3d4c";
version = "0.1.1.2";
sha256 = "06k0vvxp8vd43bbslm78lmmmc89q3b9ghwfj0chvaw32m0hd8l0z";
isLibrary = false;
isExecutable = true;
buildDepends = [
@ -82405,7 +82414,9 @@ self: {
mkDerivation {
pname = "linear";
version = "1.18.1.1";
revision = "2";
sha256 = "1qgpv6c3q4ljqc3223iyj49piqs9xx58zmnpvg76wkaygsnnzq9p";
editedCabalFile = "8c57bd840e0c9ab84b032d65a2a48ed6d20da4fb780f0d89d8c53adccc632ba4";
buildDepends = [
adjunctions base binary bytes cereal containers deepseq
distributive ghc-prim hashable lens reflection semigroupoids
@ -82455,13 +82466,13 @@ self: {
}) {};
"linear-grammar" = callPackage
({ mkDerivation, base, hspec, QuickCheck, quickcheck-instances }:
({ mkDerivation, base, hspec, QuickCheck }:
mkDerivation {
pname = "linear-grammar";
version = "0.0.0.5";
sha256 = "0cw0w1fz3m2kwnbff543h5as9zvl66y1ry1q3ppvy9lc409570ry";
buildDepends = [ base ];
testDepends = [ base hspec QuickCheck quickcheck-instances ];
version = "0.0.1.6";
sha256 = "05mzxv1ixdxirmm31jqwd8w749dpy113pyw1mfr6ck3ksva5g1ap";
buildDepends = [ base QuickCheck ];
testDepends = [ base hspec QuickCheck ];
description = "A simple grammar for building linear equations and inclusive inequalities";
license = stdenv.lib.licenses.bsd3;
}) {};
@ -87952,14 +87963,19 @@ self: {
}) {};
"mockery" = callPackage
({ mkDerivation, base, directory, hspec, logging-facade, temporary
({ mkDerivation, base, bytestring, directory, filepath, hspec
, logging-facade, temporary
}:
mkDerivation {
pname = "mockery";
version = "0.2.0";
sha256 = "18a9zz964crhjb1xdzv38pwg458lxajhvjpqd08klb1w7kh57hlj";
buildDepends = [ base directory logging-facade temporary ];
testDepends = [ base directory hspec logging-facade temporary ];
version = "0.3.0";
sha256 = "1k9ywdamdl1c8nvp4yrjmqpbis1nqj9p9cim5rh72n9w5h3qaa6x";
buildDepends = [
base bytestring directory filepath logging-facade temporary
];
testDepends = [
base bytestring directory filepath hspec logging-facade temporary
];
description = "Support functions for automated testing";
license = stdenv.lib.licenses.mit;
}) {};
@ -90102,13 +90118,16 @@ self: {
mkDerivation {
pname = "mueval";
version = "0.9.1.1";
revision = "2";
sha256 = "0p9qf8lb3c1y87qpl9b4n6v6bjrb9fw3yfg4p7niqdz31454d2pz";
editedCabalFile = "26147e2bbac6b9afea949ab81c6072fc89bbff6b7e6678f3ce57c77d26264832";
isLibrary = true;
isExecutable = true;
buildDepends = [
base Cabal containers directory extensible-exceptions filepath hint
mtl process show simple-reflect unix utf8-string
];
jailbreak = true;
homepage = "https://github.com/gwern/mueval";
description = "Safely evaluate pure Haskell expressions";
license = stdenv.lib.licenses.bsd3;
@ -90341,12 +90360,12 @@ self: {
}) {};
"multiset-comb" = callPackage
({ mkDerivation, base }:
({ mkDerivation, base, containers, transformers }:
mkDerivation {
pname = "multiset-comb";
version = "0.2.3";
sha256 = "0qkl6csnl1g6wbsyxirdq8hdbbbkp3dfsjix76yx242wdyh1j6pq";
buildDepends = [ base ];
version = "0.2.4";
sha256 = "0j7vxm67aws7dzlmdkvx2aja888jp22qdzz8hgmhvbpcr4p7lz99";
buildDepends = [ base containers transformers ];
description = "Combinatorial algorithms over multisets";
license = stdenv.lib.licenses.bsd3;
}) {};
@ -91174,6 +91193,23 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
"namelist" = callPackage
({ mkDerivation, base, case-insensitive, data-default-class, parsec
, QuickCheck, tasty, tasty-hunit, tasty-quickcheck
}:
mkDerivation {
pname = "namelist";
version = "0.1.0";
sha256 = "0sfiqd1dh3frzwnqz4fjh0wg8m55cprqw8ywvcaszrp5gq3mj74s";
buildDepends = [ base case-insensitive data-default-class parsec ];
testDepends = [
base case-insensitive QuickCheck tasty tasty-hunit tasty-quickcheck
];
homepage = "https://github.com/philopon/namelist-hs";
description = "fortran90 namelist parser/pretty printer";
license = stdenv.lib.licenses.mit;
}) {};
"names" = callPackage
({ mkDerivation, base, template-haskell }:
mkDerivation {
@ -94305,8 +94341,8 @@ self: {
({ mkDerivation, base }:
mkDerivation {
pname = "old-version";
version = "1.0.1";
sha256 = "1h5kln84658036sqap9fxxj464gmw8i6dqiba52577055apl62xv";
version = "1.1.0";
sha256 = "1vlh6wz9khcamlb5pv5gy5bss7bws7b92j8kkyqf6cp22x4dxdlc";
buildDepends = [ base ];
jailbreak = true;
description = "Basic versioning library";
@ -95846,6 +95882,22 @@ self: {
license = "unknown";
}) {};
"pagure-hook-receiver" = callPackage
({ mkDerivation, base, containers, scotty, shelly, text
, transformers, unix
}:
mkDerivation {
pname = "pagure-hook-receiver";
version = "0.1.0.0";
sha256 = "0qnnkxcad4843v6c1fqqkiip6cv82q5fckpn5v40sw2p9xk3lkcl";
buildDepends = [
base containers scotty shelly text transformers unix
];
homepage = "https://pagure.io/pagure-hook-receiver";
description = "Receive hooks from pagure and do things with them";
license = stdenv.lib.licenses.bsd2;
}) {};
"palette" = callPackage
({ mkDerivation, array, base, colour, containers }:
mkDerivation {
@ -103299,8 +103351,8 @@ self: {
}:
mkDerivation {
pname = "quantfin";
version = "0.1.0.2";
sha256 = "1m6208c8gxbm95a99kk0chh62bk2zb1fmwrdd7fwl7zpwzr8iany";
version = "0.2.0.0";
sha256 = "0s9wmkngz31wrllffk3i8y66f60liajwhapih7mnriyfvqqsb6ra";
isLibrary = true;
isExecutable = true;
buildDepends = [
@ -103613,6 +103665,17 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
"quickcheck-simple" = callPackage
({ mkDerivation, base, QuickCheck }:
mkDerivation {
pname = "quickcheck-simple";
version = "0.0.1.0";
sha256 = "04r5nqm7g5wp13k6d109yykky9i121f65bxlv5ji5sk35yp650c4";
buildDepends = [ base QuickCheck ];
description = "Test properties and default-mains for QuickCheck";
license = stdenv.lib.licenses.bsd3;
}) {};
"quickcheck-unicode" = callPackage
({ mkDerivation, base, QuickCheck }:
mkDerivation {
@ -104225,14 +104288,14 @@ self: {
}:
mkDerivation {
pname = "range";
version = "0.1.0.1";
sha256 = "04nzxjgjnql6bq30pkkmlxcj0cxmw3hlzb6y1fhb052rxmpaq8mk";
version = "0.1.1.0";
sha256 = "1cqy6lz7mr0n2zrrn9qxvgp8q7yj0drri1885m1crmvx4xd1dfp2";
buildDepends = [ base parsec ];
testDepends = [
base Cabal QuickCheck random test-framework
test-framework-quickcheck2
];
jailbreak = true;
homepage = "https://bitbucket.org/robertmassaioli/range";
description = "This has a bunch of code for specifying and managing ranges in your code";
license = stdenv.lib.licenses.mit;
hydraPlatforms = stdenv.lib.platforms.none;
@ -104942,20 +105005,15 @@ self: {
}) {};
"record" = callPackage
({ mkDerivation, attoparsec, base, base-prelude, directory, doctest
, filepath, template-haskell, text, transformers
({ mkDerivation, base, base-prelude, basic-lens, template-haskell
}:
mkDerivation {
pname = "record";
version = "0.3.1.2";
sha256 = "02kpi21l2kwysk8qgxgl10ngqnmc0mx50qxf9jq0fmi8rv3fm9xp";
buildDepends = [
attoparsec base base-prelude template-haskell text transformers
];
testDepends = [ base base-prelude directory doctest filepath ];
jailbreak = true;
version = "0.4.0.0";
sha256 = "0ml0rmqscdkp4zp430q206lrnah3j5d4bbra7ka526gagmrvpnmb";
buildDepends = [ base base-prelude basic-lens template-haskell ];
homepage = "https://github.com/nikita-volkov/record";
description = "First class records implemented with quasi-quotation";
description = "Anonymous records";
license = stdenv.lib.licenses.mit;
}) {};
@ -104998,6 +105056,46 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
"record-preprocessor" = callPackage
({ mkDerivation, base, base-prelude, conversion, conversion-text
, record-syntax, text
}:
mkDerivation {
pname = "record-preprocessor";
version = "0.1.0.0";
sha256 = "0ign3zvpnz4zrzfqglf34xbcrb21dq8hyzwkzlq9y26r9g3nmbd5";
isLibrary = false;
isExecutable = true;
buildDepends = [
base base-prelude conversion conversion-text record-syntax text
];
homepage = "https://github.com/nikita-volkov/record-preprocessor";
description = "Compiler preprocessor introducing a syntactic extension for anonymous records";
license = stdenv.lib.licenses.mit;
}) {};
"record-syntax" = callPackage
({ mkDerivation, base, base-prelude, conversion, conversion-text
, directory, doctest, filepath, haskell-src-exts, hspec, parsec
, record, template-haskell, text, transformers
}:
mkDerivation {
pname = "record-syntax";
version = "0.1.0.0";
sha256 = "115z96ific9n3612yzkfmj7hxnbjc8xjz5nmfiddklx9zjih7h40";
buildDepends = [
base base-prelude conversion conversion-text haskell-src-exts
parsec record template-haskell text transformers
];
testDepends = [
base base-prelude directory doctest filepath hspec record
];
jailbreak = true;
homepage = "https://github.com/nikita-volkov/record-syntax";
description = "A library for parsing and processing the Haskell syntax sprinkled with anonymous records";
license = stdenv.lib.licenses.mit;
}) {};
"records" = callPackage
({ mkDerivation, base, kinds, type-functions }:
mkDerivation {
@ -107630,6 +107728,30 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
"riemann" = callPackage
({ mkDerivation, base, cereal, containers, data-default, either
, errors, HUnit, lens, network, protobuf, QuickCheck
, test-framework, test-framework-hunit, test-framework-quickcheck2
, text, time, transformers
}:
mkDerivation {
pname = "riemann";
version = "0.1.0.1";
sha256 = "0d36ff839g7y1lm8dg5j5s1vdxr1hqbyjxh7gsfjca00a0cgy5xa";
buildDepends = [
base cereal containers data-default either errors lens network
protobuf text time transformers
];
testDepends = [
base either errors HUnit QuickCheck test-framework
test-framework-hunit test-framework-quickcheck2 transformers
];
jailbreak = true;
homepage = "https://github.com/telser/riemann-hs";
description = "A Riemann client for Haskell";
license = stdenv.lib.licenses.mit;
}) {};
"riff" = callPackage
({ mkDerivation, base, binary, bytestring, either, filepath
, transformers
@ -110562,8 +110684,8 @@ self: {
}:
mkDerivation {
pname = "second-transfer";
version = "0.5.3.1";
sha256 = "1ng3a384y3hsm6xgw8mhchkgz8xdgrk35b44lbifdfilcmmq7nrv";
version = "0.5.3.2";
sha256 = "0qc6xm7c37n2r9xnqc6njkm2d8lkwmripcr3q1q4m7q97qsvjbdl";
buildDepends = [
attoparsec base base16-bytestring binary bytestring conduit
containers exceptions hashable hashtables hslogger http2 lens
@ -112310,8 +112432,8 @@ self: {
({ mkDerivation, base, containers, text, unix }:
mkDerivation {
pname = "shell-monad";
version = "0.6.3";
sha256 = "0wfn1zwbqzwvbvh1x28rpgsvn8i2ff5r6v4i5kriiw025vdb5r2v";
version = "0.6.4";
sha256 = "1wmihv2x4pbz9bkrjyyh4hqwsdmlldmyi5jlgxx6ry6z3jyx9i13";
buildDepends = [ base containers text unix ];
description = "shell monad";
license = stdenv.lib.licenses.bsd3;
@ -113124,8 +113246,8 @@ self: {
}:
mkDerivation {
pname = "simple-sendfile";
version = "0.2.20";
sha256 = "0fzxlj3nmlj9nyzl4ygn6q2rgwvcgjpkypp6cpka64bhqfrgqyb3";
version = "0.2.21";
sha256 = "0xzxcz60gl22w3rxjvw0s6js0g5mi6as1n48gl37dv4lbrn9s8v1";
buildDepends = [ base bytestring network unix ];
testDepends = [
base bytestring conduit conduit-extra directory hspec HUnit network
@ -115141,8 +115263,8 @@ self: {
}:
mkDerivation {
pname = "snaplet-sass";
version = "0.1.0.0";
sha256 = "0wv9a7pa6r7nzgppbywasqy38zk79ann2ivwyyh2b9dny95mx5yd";
version = "0.1.1.0";
sha256 = "05vif2rz0dj2b3vm0yh0bwj234xjnjpiaf2fk8vlv00jirgrdr40";
buildDepends = [
base bytestring configurator directory filepath mtl process snap
snap-core transformers
@ -116234,8 +116356,8 @@ self: {
}:
mkDerivation {
pname = "species";
version = "0.3.2.4";
sha256 = "1ka5pd876iddaah9ay2ihcifhfh0f5rd19bn6yh42wlx6mdarfbq";
version = "0.3.3";
sha256 = "0cy6l4gvzydl9k2ijxkxhr6jqjbf85z71v6zrvbdajc3xip99w6i";
buildDepends = [
base containers multiset-comb np-extras numeric-prelude
template-haskell
@ -124752,8 +124874,8 @@ test/package-dump/ghc-7.10.txt";
}:
mkDerivation {
pname = "tip-lib";
version = "0.1.1";
sha256 = "0xvsr6hh7r6y82linkpvbby6jkxw744y3mh82kma4cbpwc84gxhi";
version = "0.1.2";
sha256 = "01x8hpijgx3fd0svp0di02470xnhq1gaa6k2fxjph9g5rzmx076b";
isLibrary = true;
isExecutable = true;
buildDepends = [
@ -125898,22 +126020,21 @@ test/package-dump/ghc-7.10.txt";
}) {};
"trurl" = callPackage
({ mkDerivation, aeson, base, bytestring, directory, hastache
, http-conduit, MissingH, scientific, tar, tasty, tasty-hunit, text
, unordered-containers
({ mkDerivation, aeson, base, bytestring, directory, filemanip
, hastache, http-conduit, MissingH, scientific, tar, tasty
, tasty-hunit, text, unordered-containers
}:
mkDerivation {
pname = "trurl";
version = "0.1.0.0";
sha256 = "0lq4x3vkif6sldcw07llmhwixgk1x2bfyzi0zq32jardp7ah0rc5";
version = "0.2.0.0";
sha256 = "167f7wrvrva7764z35l48rxbcnnajm343gqw2b67jh14d5kj6fz9";
isLibrary = true;
isExecutable = true;
buildDepends = [
aeson base bytestring directory hastache http-conduit MissingH
scientific tar text unordered-containers
aeson base bytestring directory filemanip hastache http-conduit
MissingH scientific tar text unordered-containers
];
testDepends = [ base hastache tasty tasty-hunit ];
jailbreak = true;
homepage = "http://github.com/dbushenko/trurl";
description = "Haskell template code generator";
license = stdenv.lib.licenses.bsd3;
@ -126062,12 +126183,12 @@ test/package-dump/ghc-7.10.txt";
}) {};
"tubes" = callPackage
({ mkDerivation, base, free, mtl, transformers }:
({ mkDerivation, base, comonad, free, mtl, transformers }:
mkDerivation {
pname = "tubes";
version = "0.1.0.0";
sha256 = "0xfpvffwp9nqkgc0j6qx6fkliaynhr8zvwzgg02y791hkjbn629k";
buildDepends = [ base free mtl transformers ];
version = "0.2.1.0";
sha256 = "1j1pzsmr4djjvhmix6ffsapm30lv4iim1jvcq454r1kxi0yid76z";
buildDepends = [ base comonad free mtl transformers ];
homepage = "https://github.com/gatlin/tubes";
description = "Effectful, iteratee-inspired stream processing based on a free monad";
license = stdenv.lib.licenses.gpl3;
@ -127573,7 +127694,9 @@ test/package-dump/ghc-7.10.txt";
mkDerivation {
pname = "uhc-light";
version = "1.1.9.0";
revision = "1";
sha256 = "0dqb0054nbl5qfxrg7g4yvmiawp9ladlws26cdf32jxrm31wgmkj";
editedCabalFile = "8847b4a41a2f6c9be09cf7b4835f53219522da9ef0ca26b918159fec747bd938";
isLibrary = true;
isExecutable = true;
buildDepends = [
@ -127581,7 +127704,6 @@ test/package-dump/ghc-7.10.txt";
hashable mtl network old-locale primitive process syb transformers
uhc-util uulib vector
];
jailbreak = true;
homepage = "https://github.com/UU-ComputerScience/uhc";
description = "Part of UHC packaged as cabal/hackage installable library";
license = stdenv.lib.licenses.bsd3;
@ -128827,8 +128949,8 @@ test/package-dump/ghc-7.10.txt";
}:
mkDerivation {
pname = "uri-bytestring";
version = "0.1.4";
sha256 = "19ryx71hyv1jg24yn19nfn6x1956a3a8bjhbdl4fnjnln3h7xkmv";
version = "0.1.5";
sha256 = "0pl00n40b1nc3rnvayk8jz9lgv0s1lp33czyg962jdbffwhqgszj";
buildDepends = [ attoparsec base blaze-builder bytestring ];
testDepends = [
attoparsec base blaze-builder bytestring derive HUnit lens
@ -131599,8 +131721,8 @@ test/package-dump/ghc-7.10.txt";
}:
mkDerivation {
pname = "wai-middleware-crowd";
version = "0.1.1.1";
sha256 = "1lkdjfp7aq61hzh9y13bqk9qgfr6s3m7n13ar73gjv5k2g97fizj";
version = "0.1.1.2";
sha256 = "039vqcy16ww7cigzppl0lnmjwbvxdv0z0zq3rnklh334lyh5jfay";
isLibrary = true;
isExecutable = true;
buildDepends = [
@ -131708,6 +131830,26 @@ test/package-dump/ghc-7.10.txt";
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"wai-middleware-metrics" = callPackage
({ mkDerivation, base, bytestring, ekg-core, http-types, QuickCheck
, scotty, tasty, tasty-hunit, tasty-quickcheck, time, transformers
, wai, wai-extra
}:
mkDerivation {
pname = "wai-middleware-metrics";
version = "0.2.0";
sha256 = "0vqpp7fqjmhknvmizvbzzay3ixk0a5jqq9y80al62hc2yb75pz0w";
buildDepends = [ base ekg-core http-types time wai ];
testDepends = [
base bytestring ekg-core http-types QuickCheck scotty tasty
tasty-hunit tasty-quickcheck time transformers wai wai-extra
];
jailbreak = true;
homepage = "https://github.com/Helkafen/wai-middleware-metrics";
description = "A WAI middleware to collect EKG request metrics";
license = stdenv.lib.licenses.bsd3;
}) {};
"wai-middleware-preprocessor" = callPackage
({ mkDerivation, base, Cabal, directory, mtl, split, text, wai
, wai-middleware-static, warp

2
pkgs/development/libraries/kde-frameworks-5.10/default.nix
View File

@ -178,7 +178,7 @@ let
+ " -I${ilmbase}/include/OpenEXR";
};
kinit = super.kinit // { patches = [ ./kinit/kinit-libpath.patch ]; };
kinit = super.kinit // { patches = [ ./kinit/0001-kinit-libpath.patch ]; };
kpackage = super.kpackage // { patches = [ ./kpackage/0001-allow-external-paths.patch ]; };

22
pkgs/development/libraries/kde-frameworks-5.10/kinit/kinit-libpath.patch → pkgs/development/libraries/kde-frameworks-5.10/kinit/0001-kinit-libpath.patch
View File

@ -1,8 +1,17 @@
From 723c9b1268a04127647a1c20eebe9804150566dd Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sat, 13 Jun 2015 08:57:55 -0500
Subject: [PATCH] kinit libpath
---
src/kdeinit/kinit.cpp | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
diff --git a/src/kdeinit/kinit.cpp b/src/kdeinit/kinit.cpp
index 3c3c913..f510620 100644
index 9e775b6..0ac5646 100644
--- a/src/kdeinit/kinit.cpp
+++ b/src/kdeinit/kinit.cpp
@@ -652,15 +652,17 @@ static pid_t launch(int argc, const char *_name, const char *args,
@@ -660,15 +660,17 @@ static pid_t launch(int argc, const char *_name, const char *args,
if (!libpath.isEmpty()) {
if (!l.load()) {
if (libpath_relative) {
@ -15,10 +24,10 @@ index 3c3c913..f510620 100644
- libpath = install_lib_dir + libpath;
- l.setFileName(libpath);
+ // Use QT_PLUGIN_PATH to find shared library directories
+ // For KF5, the plugin path is /lib/plugins, so the kdeinit5
+ // shared libraries should be in /lib/plugins/../
+ // For KF5, the plugin path is /lib/qt5/plugins/, so kdeinit5
+ // shared libraries should be in /lib/qt5/plugins/../../
+ const QRegExp pathSepRegExp(QString::fromLatin1("[:\b]"));
+ const QString up = QString::fromLocal8Bit("/../");
+ const QString up = QString::fromLocal8Bit("/../../");
+ const QStringList paths = QString::fromLocal8Bit(qgetenv("QT_PLUGIN_PATH")).split(pathSepRegExp, QString::KeepEmptyParts);
+ Q_FOREACH (const QString &path, paths) {
+ l.setFileName(path + up + libpath);
@ -28,3 +37,6 @@ index 3c3c913..f510620 100644
}
}
if (!l.isLoaded()) {
--
2.4.2

21
pkgs/development/libraries/libebur128/default.nix Normal file
View File

@ -0,0 +1,21 @@
{ stdenv, fetchFromGitHub, cmake, speexdsp, pkgconfig }:
stdenv.mkDerivation rec {
version = "1.0.2";
name = "libebur128-${version}";
src = fetchFromGitHub {
owner = "jiixyj";
repo = "libebur128";
rev = "v${version}";
sha256 = "19vy3ldbf931hjvn9jf9dvw1di3yx9ljxyk2yp5cnac1wqiza3jm";
};
buildInputs = [ cmake speexdsp pkgconfig ];
meta = with stdenv.lib; {
description = "Implementation of the EBU R128 loudness standard";
homepage = https://github.com/jiixyj/libebur128;
license = licenses.mit;
};
}

4
pkgs/development/pharo/vm/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
version = "2014.11.29-2";
version = "2015.04.30";
name = "pharo-vm-core-i386-${version}";
system = "x86_32-linux";
src = fetchurl {
url = "http://files.pharo.org/vm/src/vm-unix-sources/blessed/pharo-vm-${version}.tar.bz2";
md5 = "529cff4639cee313ddf55fd377bd6fb3";
sha256 = "0lg9ahqfrwbn3srxbbvr1vhjnx267chbs1la0nrc2ivpd55iwjgv";
};
sources10Zip = fetchurl {

33
pkgs/development/tools/analysis/infer/default.nix Normal file
View File

@ -0,0 +1,33 @@
{ stdenv, fetchurl, python }:
stdenv.mkDerivation rec {
name = "infer-${version}";
version = "0.1.0";
src = fetchurl {
url = "https://github.com/facebook/infer/releases/download/v${version}/infer-linux64-v${version}.tar.xz";
sha256 = "1kppiayzqwmm13aq8x1jxd3j4jywh3h37jxrgyipz8li1ddpdq3m";
};
buildInputs = [ python ];
buildPhase = "true";
installPhase = ''
mkdir -p $out/libexec $out/bin;
cp -R facebook-clang-plugin $out/libexec
cp -R infer $out/libexec
for x in `ls $out/libexec/infer/infer/bin`; do
ln -s $out/libexec/infer/infer/bin/$x $out/bin/$x;
done
'';
fixupPhase = ''
patchShebangs $out
'';
meta = {
description = "Scalable static analyzer for Java, C and Objective-C";
homepage = http://fbinfer.com;
license = stdenv.lib.licenses.bsd3;
maintainers = with stdenv.lib.maintainers; [ thoughtpolice ];
platforms = [ "x86_64-linux" ];
};
}

8
pkgs/development/tools/misc/cl-launch/default.nix
View File

@ -3,11 +3,11 @@ let
s = # Generated upstream information
rec {
baseName="cl-launch";
version="4.1.3.1";
version="4.1.3.3";
name="${baseName}-${version}";
hash="0l5iwffrzmaxbpfh2h5y8lz6yap3q8xi14z080lhl193p8f3rk0z";
url="http://common-lisp.net/project/xcvb/cl-launch/cl-launch-4.1.3.1.tar.gz";
sha256="0l5iwffrzmaxbpfh2h5y8lz6yap3q8xi14z080lhl193p8f3rk0z";
hash="1al7jrj4fy9w4lpgizgb1ppk4rhhlcrfkz1yxpjv3w0wij1h67zl";
url="http://common-lisp.net/project/xcvb/cl-launch/cl-launch-4.1.3.3.tar.gz";
sha256="1al7jrj4fy9w4lpgizgb1ppk4rhhlcrfkz1yxpjv3w0wij1h67zl";
};
buildInputs = [
];

37
pkgs/development/tools/misc/intel-gpu-tools/compile-fix.patch
View File

@ -1,37 +0,0 @@
From 233808a58db1f62d773b03f9dad599924170aca6 Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Wed, 18 Mar 2015 08:36:37 +0000
Subject: lib/batch: Trivial compile fix for 32-bit builds
intel_batchbuffer.c: In function 'fill_object':
intel_batchbuffer.c:589:20: error: cast from pointer to integer of different size [-Werror=pointer-to-int-cast]
obj->relocs_ptr = (uint64_t)relocs;
^
intel_batchbuffer.c: In function 'exec_blit':
intel_batchbuffer.c:598:21: error: cast from pointer to integer of different size [-Werror=pointer-to-int-cast]
exec.buffers_ptr = (uint64_t)objs;
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
diff --git a/lib/intel_batchbuffer.c b/lib/intel_batchbuffer.c
index 666c323..c1c27a6 100644
--- a/lib/intel_batchbuffer.c
+++ b/lib/intel_batchbuffer.c
@@ -548,7 +548,7 @@ fill_object(struct drm_i915_gem_exec_object2 *obj, uint32_t gem_handle,
memset(obj, 0, sizeof(*obj));
obj->handle = gem_handle;
obj->relocation_count = count;
- obj->relocs_ptr = (uint64_t)relocs;
+ obj->relocs_ptr = (uintptr_t)relocs;
}
static void exec_blit(int fd,
@@ -557,7 +557,7 @@ static void exec_blit(int fd,
{
struct drm_i915_gem_execbuffer2 exec;
- exec.buffers_ptr = (uint64_t)objs;
+ exec.buffers_ptr = (uintptr_t)objs;
exec.buffer_count = count;
exec.batch_start_offset = 0;
exec.batch_len = batch_len * 4;

12
pkgs/development/tools/misc/intel-gpu-tools/default.nix
View File

@ -1,16 +1,16 @@
{ stdenv, fetchurl, pkgconfig, libdrm, libpciaccess, cairo, dri2proto, udev, libX11, libXext, libXv, libXrandr, glib, bison }:
{ stdenv, fetchurl, pkgconfig, libdrm, libpciaccess, cairo, dri2proto, udev
, libX11, libXext, libXv, libXrandr, glib, bison, libunwind }:
stdenv.mkDerivation rec {
name = "intel-gpu-tools-1.10";
name = "intel-gpu-tools-1.11";
src = fetchurl {
url = "http://xorg.freedesktop.org/archive/individual/app/${name}.tar.bz2";
sha256 = "0x4q7gv14yaniycgdxym9nazlj6wzcvjjhg40bbm5lkw5pqvxwkd";
sha256 = "1r5dbp2gdxqryv1fhxy83k4d1kfp7rv8q370fhncamrb8m8390j8";
};
buildInputs = [ pkgconfig libdrm libpciaccess cairo dri2proto udev libX11 libXext libXv libXrandr glib bison ];
patches = [ ./compile-fix.patch ];
buildInputs = [ pkgconfig libdrm libpciaccess cairo dri2proto udev libX11
libXext libXv libXrandr glib bison libunwind ];
meta = with stdenv.lib; {
homepage = https://01.org/linuxgraphics/;

8
pkgs/development/tools/slimerjs/default.nix
View File

@ -3,11 +3,11 @@ let
s = # Generated upstream information
rec {
baseName="slimerjs";
version="0.9.5";
version="0.9.6";
name="${baseName}-${version}";
hash="05p7cwbr2jly6sd6h69j577y48yr05zm2nj7wgnxw0rhyrhkl22s";
url="http://download.slimerjs.org/releases/0.9.5/slimerjs-0.9.5.zip";
sha256="05p7cwbr2jly6sd6h69j577y48yr05zm2nj7wgnxw0rhyrhkl22s";
hash="0wry296iv63bmvm3qbkbgk42nbs80cbir0kv27v0ah5f6kvjc9cq";
url="http://download.slimerjs.org/releases/0.9.6/slimerjs-0.9.6.zip";
sha256="0wry296iv63bmvm3qbkbgk42nbs80cbir0kv27v0ah5f6kvjc9cq";
};
buildInputs = [
unzip zip

29
pkgs/games/tome4/default.nix Normal file
View File

@ -0,0 +1,29 @@
{stdenv, fetchurl, openal, libvorbis, mesa_glu, premake4, SDL2, SDL2_image, SDL2_ttf}:
stdenv.mkDerivation rec {
version = "1.3.1";
name = "tome4-${version}";
src = fetchurl {
url = "http://te4.org/dl/t-engine/t-engine4-src-1.3.1.tar.bz2";
sha256 = "9b6658e29ad3be9f8469a61e724350f4dfec676777e471f633d616443dfbc7e7";
};
buildInputs = [ mesa_glu openal libvorbis SDL2 SDL2_ttf SDL2_image premake4 ];
preConfigure = ''
sed -e "s@/opt/SDL-2.0/include/SDL2@${SDL2}/include/SDL2@g" -e "s@/usr/include/GL@/run/opengl-driver/include@g" -i premake4.lua
premake4 gmake
'';
makeFlags = [ "config=release" ];
installPhase = ''
install -Dm755 t-engine $out/opt/tome4/t-engine
echo "cd $out/opt/tome4" >> tome4
echo "./t-engine &" >> tome4
install -Dm755 tome4 $out/bin/tome4
cp -r bootstrap $out/opt/tome4
cp -r game $out/opt/tome4
'';
meta = {
homepage = "http://te4.org/";
description = "Tales of Maj'eyal (rogue-like game)";
license = stdenv.lib.licenses.gpl3;
};
}

6
pkgs/misc/drivers/hplip/default.nix
View File

@ -6,11 +6,11 @@
let
name = "hplip-3.15.4";
name = "hplip-3.15.6";
src = fetchurl {
url = "mirror://sourceforge/hplip/${name}.tar.gz";
sha256 = "0s1yiifp002n8qy0i4cv6j0hq9ikp4jabki5w3xzlaqgd4bjz1x3";
sha256 = "1jbnjw7vrn1qawrjfdv8j58w69q8ki1qkzvlh0nk8nxacpp17i9h";
};
hplip_state =
@ -31,7 +31,7 @@ let
plugin = fetchurl {
url = "http://www.openprinting.org/download/printdriver/auxfiles/HP/plugins/${name}-plugin.run";
sha256 = "00zhaq48m7p6nrxfy16086hzghf2pfr32s53sndbpp2514v2j392";
sha256 = "1rymxahz12s1s37rri5qyvka6q0yi0yai08kgspg24176ry3a3fx";
};
in

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

@ -3,10 +3,10 @@ let
s = # Generated upstream information
rec {
baseName="eudev";
version = "3.0";
version = "3.1.1";
name="${baseName}-${version}";
url="http://dev.gentoo.org/~blueness/eudev/eudev-${version}.tar.gz";
sha256 = "0afva1vh3lwhw9bryh41dxg82kfnxj1ifa91p3gjwffc2fpqmnvl";
sha256 = "1r1jbk1fwc4wl0ifm7xzkb2vjd8w1a39hx6mmy4pp4fl2gvcg86k";
};
buildInputs = [
glib pkgconfig gperf utillinux

3
pkgs/os-specific/linux/mdadm/default.nix
View File

@ -19,6 +19,9 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ groff ];
# Attempt removing if building with gcc5 when updating
NIX_CFLAGS_COMPILE = "-std=gnu89";
preConfigure = "sed -e 's@/lib/udev@\${out}/lib/udev@' -e 's@ -Werror @ @' -i Makefile";
# Force mdadm to use /var/run/mdadm.map for its map file (or

9
pkgs/os-specific/linux/sysdig/default.nix
View File

@ -1,15 +1,15 @@
{stdenv, fetchurl, cmake, luajit, kernel, zlib}:
{stdenv, fetchurl, cmake, luajit, kernel, zlib, ncurses}:
let
inherit (stdenv.lib) optional optionalString;
s = rec {
baseName="sysdig";
version = "0.1.99";
version = "0.1.101";
name="${baseName}-${version}";
url="https://github.com/draios/sysdig/archive/${version}.tar.gz";
sha256 = "02faw8s07i7jjydqzqfs0r9lc2qmny3sn26741bz0hmazs9h9w76";
sha256 = "1dlx1v7wr0i36sbybr4kj8sziyrfxs4pcn6bnl0ljlb5wndy75b9";
};
buildInputs = [
cmake zlib luajit
cmake zlib luajit ncurses
];
in
stdenv.mkDerivation {
@ -22,6 +22,7 @@ stdenv.mkDerivation {
cmakeFlags = [
"-DUSE_BUNDLED_LUAJIT=OFF"
"-DUSE_BUNDLED_ZLIB=OFF"
"-DUSE_BUNDLED_NCURSES=OFF"
] ++ optional (kernel == null) "-DBUILD_DRIVER=OFF";
preConfigure = ''
export INSTALL_MOD_PATH="$out"

4
pkgs/servers/http/nginx/unstable.nix
View File

@ -10,10 +10,10 @@
with stdenv.lib;
let
version = "1.9.0";
version = "1.9.1";
mainSrc = fetchurl {
url = "http://nginx.org/download/nginx-${version}.tar.gz";
sha256 = "0j7j4yfz39jl433ci9wgxnz3y70pr93vxixw1s4dxv81nzas2ap1";
sha256 = "1b8xikrr19p07n28xnar8p8l0vgm7795lmrb2x7r9h4lwvx5bx89";
};
rtmp-ext = fetchFromGitHub {

4
pkgs/servers/sql/postgresql/9.0.x.nix
View File

@ -1,13 +1,13 @@
{ stdenv, fetchurl, zlib, readline, openssl }:
let version = "9.0.20"; in
let version = "9.0.22"; in
stdenv.mkDerivation rec {
name = "postgresql-${version}";
src = fetchurl {
url = "mirror://postgresql/source/v${version}/${name}.tar.bz2";
sha256 = "0vxa90d1ghv6vg4c6kxvm2skypahvlq4sd968q7l9ff3dl145z02";
sha256 = "19gq6axjhvlr5zlrzwnll1fbrvai4xh0nb1jki6gmmschl6v5m4l";
};
buildInputs = [ zlib readline openssl ];

4
pkgs/servers/sql/postgresql/9.1.x.nix
View File

@ -1,13 +1,13 @@
{ stdenv, fetchurl, zlib, readline, openssl }:
let version = "9.1.16"; in
let version = "9.1.18"; in
stdenv.mkDerivation rec {
name = "postgresql-${version}";
src = fetchurl {
url = "mirror://postgresql/source/v${version}/${name}.tar.bz2";
sha256 = "0mllj1r1648iwm0qj3cj9qxizhlyhqmz94iydnwhf48psvvy4r9b";
sha256 = "1a44hmcvfaa8j169ladsibmvjakw6maaxqkzz1ab8139cqkda9i7";
};
buildInputs = [ zlib readline openssl ];

4
pkgs/servers/sql/postgresql/9.2.x.nix
View File

@ -1,13 +1,13 @@
{ stdenv, fetchurl, zlib, readline, openssl }:
let version = "9.2.11"; in
let version = "9.2.13"; in
stdenv.mkDerivation rec {
name = "postgresql-${version}";
src = fetchurl {
url = "mirror://postgresql/source/v${version}/${name}.tar.bz2";
sha256 = "1k5i73ninqyz76zzpi06ajj5qawf30zwr16x8wrgq6swzvsgbck5";
sha256 = "0i3avdr8mnvn6ldkx0hc4jmclhisb2338hzs0j2m03wck8hddjsx";
};
buildInputs = [ zlib readline openssl ];

4
pkgs/servers/sql/postgresql/9.3.x.nix
View File

@ -2,14 +2,14 @@
with stdenv.lib;
let version = "9.3.7"; in
let version = "9.3.9"; in
stdenv.mkDerivation rec {
name = "postgresql-${version}";
src = fetchurl {
url = "mirror://postgresql/source/v${version}/${name}.tar.bz2";
sha256 = "0ggz0i91znv053zx9qas7pjf93s5by3dk84z1jxbjkg8yyrnlx4b";
sha256 = "0j85j69rf54cwz5yhrhk4ca22b82990j5sqb8cr1fl9843nd0fzp";
};
buildInputs = [ zlib readline openssl ]

4
pkgs/servers/sql/postgresql/9.4.x.nix
View File

@ -2,14 +2,14 @@
with stdenv.lib;
let version = "9.4.2"; in
let version = "9.4.4"; in
stdenv.mkDerivation rec {
name = "postgresql-${version}";
src = fetchurl {
url = "mirror://postgresql/source/v${version}/${name}.tar.bz2";
sha256 = "04adpfg2f7ip96rh3jjygx5cpgasrrp1dl2wswjivfk5q68s3zc1";
sha256 = "04q07g209y99xzjh88y52qpvz225rxwifv8nzp3bxzfni2bdk3jk";
};
buildInputs = [ zlib readline openssl ]

35
pkgs/tools/X11/ratmen/default.nix Normal file
View File

@ -0,0 +1,35 @@
{stdenv, fetchurl, perl, xproto, libX11}:
let
s = # Generated upstream information
rec {
baseName="ratmen";
version="2.2.3";
name="${baseName}-${version}";
hash="0gnfqhnch9x8jhr87gvdjcp1wsqhchfjilpnqcwx5j0nlqyz6wi6";
url="http://www.update.uu.se/~zrajm/programs/ratmen/ratmen-2.2.3.tar.gz";
sha256="0gnfqhnch9x8jhr87gvdjcp1wsqhchfjilpnqcwx5j0nlqyz6wi6";
};
buildInputs = [
perl xproto libX11
];
in
stdenv.mkDerivation {
inherit (s) name version;
inherit buildInputs;
src = fetchurl {
inherit (s) url sha256;
};
makeFlags = [
"PREFIX=$(out)"
];
meta = {
inherit (s) version;
description = ''A minimalistic X11 menu creator'';
license = stdenv.lib.licenses.free ; # 9menu derivative with 9menu license
maintainers = [stdenv.lib.maintainers.raskin];
platforms = stdenv.lib.platforms.linux;
homepage = "http://www.update.uu.se/~zrajm/programs/";
downloadPage = "http://www.update.uu.se/~zrajm/programs/ratmen/";
updateWalker = true;
};
}

30
pkgs/tools/X11/skippy-xd/default.nix Normal file
View File

@ -0,0 +1,30 @@
{stdenv, fetchgit, xproto, libX11, libXft, libXcomposite, libXdamage
, libXext, xextproto, libXinerama, libjpeg, giflib, pkgconfig
}:
let
buildInputs = [
xproto libX11 libXft libXcomposite libXdamage libXext xextproto
libXinerama libjpeg giflib pkgconfig
];
in
stdenv.mkDerivation rec {
version = "git-2015-03-01";
name = "skippy-xd-${version}";
inherit buildInputs;
src = fetchgit {
url = "https://github.com/richardgv/skippy-xd/";
rev = "397216ca67";
sha256 = "19lvy5888j7rl52dsxv1wwxxijdlk8d7qn1zzzy0b8wvqknhxypm";
};
makeFlags = ["PREFIX=$(out)"];
preInstall = ''
sed -e "s@/etc/xdg@$out&@" -i Makefile
'';
meta = {
inherit version;
description = ''Expose-style compositing-based standalone window switcher'';
license = stdenv.lib.licenses.gpl2Plus ;
maintainers = [stdenv.lib.maintainers.raskin];
platforms = stdenv.lib.platforms.linux;
};
}

23
pkgs/tools/X11/xwinmosaic/default.nix Normal file
View File

@ -0,0 +1,23 @@
{stdenv, fetchgit, gtk2, cmake, pkgconfig}:
let
buildInputs = [
gtk2 cmake pkgconfig
];
in
stdenv.mkDerivation rec {
version = "0.4.2";
name = "xwinmosaic-${version}";
inherit buildInputs;
src = fetchgit {
url = "https://github.com/soulthreads/xwinmosaic/";
rev = "refs/tags/v0.4.2";
sha256 = "0ddriqx4idyp55v8js5xazmhl09jwkmnv5nlfzhs2cpvshcj56ri";
};
meta = {
inherit version;
description = ''X window switcher drawing a colourful grid'';
license = stdenv.lib.licenses.bsd2 ;
maintainers = [stdenv.lib.maintainers.raskin];
platforms = stdenv.lib.platforms.linux;
};
}

13
pkgs/tools/filesystems/glusterfs/default.nix
View File

@ -1,18 +1,21 @@
{stdenv, fetchurl, fuse, bison, flex_2_5_35, openssl, python, ncurses, readline,
autoconf, automake, libtool, pkgconfig, zlib, libaio, libxml2}:
autoconf, automake, libtool, pkgconfig, zlib, libaio, libxml2, acl, sqlite
, liburcu, attr
}:
let
s = # Generated upstream information
rec {
baseName="glusterfs";
version="3.6.3";
version="3.7.1";
name="${baseName}-${version}";
hash="084zkc1jd5ggkfl0f5d4s7lra5xgildnphyf6ywzxrb7g44vk0d4";
url="http://download.gluster.org/pub/gluster/glusterfs/3.6/3.6.3/glusterfs-3.6.3.tar.gz";
sha256="084zkc1jd5ggkfl0f5d4s7lra5xgildnphyf6ywzxrb7g44vk0d4";
hash="0d1bcijwvc3rhr24xsn7nnp0b5xwlwvybamb05jzja5m7hapydpw";
url="http://download.gluster.org/pub/gluster/glusterfs/3.7/3.7.1/glusterfs-3.7.1.tar.gz";
sha256="0d1bcijwvc3rhr24xsn7nnp0b5xwlwvybamb05jzja5m7hapydpw";
};
buildInputs = [
fuse bison flex_2_5_35 openssl python ncurses readline
autoconf automake libtool pkgconfig zlib libaio libxml2
acl sqlite liburcu attr
];
in
stdenv.mkDerivation

8
pkgs/tools/graphics/asymptote/default.nix
View File

@ -7,11 +7,11 @@ let
s = # Generated upstream information
rec {
baseName="asymptote";
version="2.32";
version="2.35";
name="${baseName}-${version}";
hash="19cgn5158p42igjbp8lf6xdbh3yjhlkdm22m5lqrhibp09g06d90";
url="mirror://sourceforge/project/asymptote/2.32/asymptote-2.32.src.tgz";
sha256="19cgn5158p42igjbp8lf6xdbh3yjhlkdm22m5lqrhibp09g06d90";
hash="11f28vxw0ybhvl7vxmqcdwvw7y6gz55ykw9ybgzb2px6lsvgag7z";
url="http://softlayer-ams.dl.sourceforge.net/project/asymptote/2.35/asymptote-2.35.src.tgz";
sha256="11f28vxw0ybhvl7vxmqcdwvw7y6gz55ykw9ybgzb2px6lsvgag7z";
};
buildInputs = [
freeglut ghostscriptX imagemagick fftw

3
pkgs/tools/misc/bmon/default.nix
View File

@ -12,6 +12,9 @@ stdenv.mkDerivation rec {
sha256 = "16qwazays2j448kmfckv6wvh4rhmhc9q4vp1s75hm9z02cmhvk8q";
};
# https://github.com/tgraf/bmon/pull/24#issuecomment-98068887
postPatch = "sed '1i#include <net/if.h>' -i src/in_netlink.c";
buildInputs = [ autoconf automake pkgconfig ncurses confuse libnl ];
preConfigure = "sh ./autogen.sh";

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

@ -1,13 +1,13 @@
{ stdenv, fetchurl, buildPythonPackage }:
buildPythonPackage rec {
version = "4.47.0";
version = "4.48.0";
name = "getmail-${version}";
namePrefix = "";
src = fetchurl {
url = "http://pyropus.ca/software/getmail/old-versions/${name}.tar.gz";
sha256 = "0h25irimigral9xspkvjmplzddqphyn51n5fq221m7nps39wqnjb";
sha256 = "0k5rm5kag14izng2ajcagvli9sns5mzvkyfa65ri4xymxs91wi29";
};
doCheck = false;

4
pkgs/tools/security/afl/default.nix
View File

@ -9,11 +9,11 @@ let
in
stdenv.mkDerivation rec {
name = "afl-${version}";
version = "1.80b";
version = "1.83b";
src = fetchurl {
url = "http://lcamtuf.coredump.cx/afl/releases/${name}.tgz";
sha256 = "008l2qirwlf40yhlrybcpglsil9nw8498qcjmvrnvvq31piwyhp0";
sha256 = "1zkf9vdhmm1h0flxl1ybmw41amgh9cyh4hyb18jp972lgd9q642v";
};
# Note: libcgroup isn't needed for building, just for the afl-cgroup

11
pkgs/tools/security/pinentry/default.nix
View File

@ -19,6 +19,12 @@ stdenv.mkDerivation rec {
buildInputs = [ libcap gtk2 ncurses qt4 ];
# configure cannot find moc on its own
preConfigure = stdenv.lib.optionalString (qt4 != null) ''
export QTDIR="${qt4}"
export MOC="${qt4}/bin/moc"
'';
configureFlags = [
(mkWith (libcap != null) "libcap")
(mkWith (hasX) "x")
@ -36,8 +42,9 @@ stdenv.mkDerivation rec {
license = stdenv.lib.licenses.gpl2Plus;
platforms = stdenv.lib.platforms.all;
longDescription = ''
Pinentry provides a console and a GTK+ GUI that allows users to
enter a passphrase when `gpg' or `gpg2' is run and needs it.
Pinentry provides a console and (optional) GTK+ and Qt GUIs allowing users
to enter a passphrase when `gpg' or `gpg2' is run and needs it.
'';
maintainers = [ stdenv.lib.maintainers.ttuegel ];
};
}

3
pkgs/tools/security/trousers/default.nix
View File

@ -15,7 +15,8 @@ stdenv.mkDerivation rec {
configureFlags = [ "--disable-usercheck" ];
NIX_CFLAGS_COMPILE = "-DALLOW_NON_TSS_CONFIG_FILE";
# Attempt to remove -std=gnu89 when updating if using gcc5
NIX_CFLAGS_COMPILE = "-std=gnu89 -DALLOW_NON_TSS_CONFIG_FILE";
NIX_LDFLAGS = "-lgcc_s";
# Fix broken libtool file

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

@ -1,12 +1,12 @@
{ stdenv, fetchurl, autoconf }:
stdenv.mkDerivation rec {
version = "1.46";
version = "1.98";
name = "dd_rescue-${version}";
src = fetchurl {
sha256 = "1fhs4jl5pkyn4aq75fxczrgnsj2m0kz9hfa7dhxy93vp7xcba2cy";
url="http://www.garloff.de/kurt/linux/ddrescue/${name}.tar.gz";
sha256 = "14lf2pv52sr16977qjq1rsr42rfd3ywsss2xw9svgaa14g49ss6b";
url="http://www.garloff.de/kurt/linux/ddrescue/${name}.tar.bz2";
};
dd_rhelp_src = fetchurl {

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

@ -1,12 +1,12 @@
{ fetchurl, stdenv, libgcrypt, readline }:
stdenv.mkDerivation rec {
version = "1.4.8";
version = "1.4.9";
name = "freeipmi-${version}";
src = fetchurl {
url = "mirror://gnu/freeipmi/${name}.tar.gz";
sha256 = "06smdsri1v5v2smrd3jxq3n135x7cx0npcimc37lb144gzgyk9wz";
sha256 = "0v2xfwik2mv6z8066raiypc4xymjvr8pb0mv3mc3g4ym4km132qp";
};
buildInputs = [ libgcrypt readline ];

4
pkgs/tools/system/stress-ng/default.nix
View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl, attr }:
let version = "0.04.05"; in
let version = "0.04.06"; in
stdenv.mkDerivation rec {
name = "stress-ng-${version}";
src = fetchurl {
sha256 = "1xj3rrcvpjl3sgvl22m0bdrkscxxnipzh4s1ivmrifw7lq2zq1kg";
sha256 = "1iwl16gzxl1gq7gkn6pwhk6ss641n11wgf37yd47jcdr5pac6z9s";
url = "http://kernel.ubuntu.com/~cking/tarballs/stress-ng/${name}.tar.gz";
};

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

@ -2061,6 +2061,8 @@ let
maildrop = callPackage ../tools/networking/maildrop { };
mailnag = callPackage ../applications/networking/mailreaders/mailnag { };
mailsend = callPackage ../tools/networking/mailsend { };
mailpile = callPackage ../applications/networking/mailreaders/mailpile { };
@ -2854,6 +2856,8 @@ let
simplescreenrecorder = callPackage ../applications/video/simplescreenrecorder { };
skippy-xd = callPackage ../tools/X11/skippy-xd {};
skydns = callPackage ../servers/dns/skydns { };
sleuthkit = callPackage ../tools/system/sleuthkit {};
@ -3410,6 +3414,8 @@ let
inherit (xlibs) libXt libXaw libXtst xextproto libXi libXpm gccmakedep;
};
xwinmosaic = callPackage ../tools/X11/xwinmosaic {};
# To expose more packages for Yi, override the extraPackages arg.
yi = callPackage ../applications/editors/yi/wrapper.nix { };
@ -5279,6 +5285,8 @@ let
csslint = callPackage ../development/web/csslint { };
infer = callPackage ../development/tools/analysis/infer { };
libcxx = llvmPackages.libcxx;
libcxxabi = llvmPackages.libcxxabi;
@ -6703,6 +6711,8 @@ let
libebml = callPackage ../development/libraries/libebml { };
libebur128 = callPackage ../development/libraries/libebur128 { };
libedit = callPackage ../development/libraries/libedit { };
libelf = callPackage ../development/libraries/libelf { };
@ -10698,7 +10708,10 @@ let
darcs = haskell.lib.overrideCabal haskellPackages.darcs (drv: {
configureFlags = (stdenv.lib.remove "-flibrary" drv.configureFlags or []) ++ ["-f-library"];
enableSharedExecutables = false;
enableSharedLibraries = false;
isLibrary = false;
doHaddock = false;
postFixup = "rm -rf $out/lib $out/nix-support $out/share";
});
darktable = callPackage ../applications/graphics/darktable {
@ -12211,6 +12224,8 @@ let
rapidsvn = callPackage ../applications/version-management/rapidsvn { };
ratmen = callPackage ../tools/X11/ratmen {};
ratox = callPackage ../applications/networking/instant-messengers/ratox { };
ratpoison = callPackage ../applications/window-managers/ratpoison { };
@ -13443,6 +13458,8 @@ let
tintin = callPackage ../games/tintin { };
tome4 = callPackage ../games/tome4 { };
tpm = callPackage ../games/thePenguinMachine { };
tremulous = callPackage ../games/tremulous { };
@ -13822,6 +13839,7 @@ let
plasma53 = recurseIntoAttrs (callPackage ../desktops/plasma-5.3 {
kf5 = kf510;
kdeApps = kdeApps_15_04;
});
plasma5_latest = plasma53;
plasma5_stable = plasma53;

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

@ -4815,6 +4815,26 @@ let
};
django_pipeline = buildPythonPackage rec {
name = "django-pipeline-${version}";
version = "1.5.1";
src = pkgs.fetchurl {
url = "http://pypi.python.org/packages/source/d/django-pipeline/${name}.tar.gz";
md5 = "dff8a4abb2895ee5df335c3fb2775a02";
sha256 = "1y49fa8jj7x9qjj5wzhns3zxwj0s73sggvkrv660cqw5qb7d8hha";
};
propagatedBuildInputs = with self; [ django futures ];
meta = with stdenv.lib; {
description = "Pipeline is an asset packaging library for Django.";
homepage = https://github.com/cyberdelia/django-pipeline;
license = stdenv.lib.licenses.mit;
};
};
djblets = buildPythonPackage rec {
name = "Djblets-0.6.28";

6
pkgs/top-level/rust-packages.nix
View File

@ -7,15 +7,15 @@
{ runCommand, fetchFromGitHub, git }:
let
version = "2015-05-19";
rev = "6280837d21e5a241d961daf968f5379e6e2e392f";
version = "2015-06-12";
rev = "020d1f3344ed8e7bd8fa740372bb7f03675fa708";
src = fetchFromGitHub {
inherit rev;
owner = "rust-lang";
repo = "crates.io-index";
sha256 = "1y5zhpd9l0zsknjnhk1ris45y5jka6d6fklzwwhss39h48vymf91";
sha256 = "0vkr0k1ga0jskvl8ss7m5m66b4wwi7ibjj5qw0x0khcg1b5skkq6";
};
in