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

Merge branch 'master' into staging

Browse Source
This commit is contained in:
Shea Levy 2015-03-06 19:02:36 +00:00
commit 6b53021205
65 changed files with 1443 additions and 603 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/misc/ids.nix
View File

@ -180,6 +180,7 @@
panamax = 170;
marathon = 171;
exim = 172;
sddm = 175;
# When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!
@ -322,6 +323,7 @@
exim = 172;
fleet = 173;
input = 174;
sddm = 175;
# When adding a gid, make sure it doesn't match an existing
# uid. Users and groups with the same name should have equal

1
nixos/modules/module-list.nix
View File

@ -359,6 +359,7 @@
./services/x11/display-managers/gdm.nix
./services/x11/display-managers/kdm.nix
./services/x11/display-managers/lightdm.nix
./services/x11/display-managers/sddm.nix
./services/x11/display-managers/slim.nix
./services/x11/hardware/multitouch.nix
./services/x11/hardware/synaptics.nix

4
nixos/modules/programs/uim.nix
View File

@ -7,14 +7,16 @@ let
in
{
options = {
uim = {
enable = mkOption {
type = types.bool;
default = false;
example = true;
description = "enable UIM input method";
description = "Enable UIM input method";
};
};
};
config = mkIf cfg.enable {

2
nixos/modules/services/hardware/udev.nix
View File

@ -236,6 +236,8 @@ in
system.activationScripts.udevd =
''
echo "" > /proc/sys/kernel/hotplug
# Regenerate the hardware database /var/lib/udev/hwdb.bin
# whenever systemd changes.
if [ ! -e /var/lib/udev/prev-systemd -o "$(readlink /var/lib/udev/prev-systemd)" != ${config.systemd.package} ]; then

2
nixos/modules/services/x11/display-managers/lightdm.nix
View File

@ -97,7 +97,7 @@ in
# lightdm relaunches itself via just `lightdm`, so needs to be on the PATH
execCmd = ''
export PATH=${lightdm}/sbin:$PATH
${lightdm}/sbin/lightdm --log-dir=/var/log --run-dir=/run --config=${lightdmConf}
exec ${lightdm}/sbin/lightdm --log-dir=/var/log --run-dir=/run --config=${lightdmConf}
'';
};

108
nixos/modules/services/x11/display-managers/sddm.nix Normal file
View File

@ -0,0 +1,108 @@
{ config, lib, pkgs, ... }:
with lib;
let
xcfg = config.services.xserver;
dmcfg = xcfg.displayManager;
cfg = dmcfg.sddm;
xEnv = config.systemd.services."display-manager".environment;
xserverWrapper = pkgs.writeScript "xserver-wrapper" ''
#!/bin/sh
${concatMapStrings (n: "export ${n}=\"${getAttr n xEnv}\"\n") (attrNames xEnv)}
exec ${dmcfg.xserverBin} ${dmcfg.xserverArgs} "$@"
'';
cfgFile = pkgs.writeText "sddm.conf" ''
[General]
HaltCommand=${pkgs.systemd}/bin/systemctl poweroff
RebootCommand=${pkgs.systemd}/bin/systemctl reboot
[Theme]
Current=${cfg.theme}
[Users]
MaximumUid=${toString config.ids.uids.nixbld}
[XDisplay]
MinimumVT=${toString xcfg.tty}
ServerPath=${xserverWrapper}
XephyrPath=${pkgs.xorg.xorgserver}/bin/Xephyr
SessionCommand=${dmcfg.session.script}
SessionDir=${dmcfg.session.desktops}
XauthPath=${pkgs.xorg.xauth}/bin/xauth
'';
in
{
options = {
services.xserver.displayManager.sddm = {
enable = mkOption {
type = types.bool;
default = false;
description = ''
Whether to enable sddm as the display manager.
'';
};
theme = mkOption {
type = types.str;
default = "maui";
description = ''
Greeter theme to use.
'';
};
};
};
config = mkIf cfg.enable {
services.xserver.displayManager.slim.enable = false;
services.xserver.displayManager.job = {
logsXsession = true;
#execCmd = "${pkgs.sddm}/bin/sddm";
execCmd = "exec ${pkgs.sddm}/bin/sddm";
};
security.pam.services = {
sddm = {
allowNullPassword = true;
startSession = true;
};
sddm-greeter.text = ''
auth required pam_succeed_if.so audit quiet_success user = sddm
auth optional pam_permit.so
account required pam_succeed_if.so audit quiet_success user = sddm
account sufficient pam_unix.so
password required pam_deny.so
session required pam_succeed_if.so audit quiet_success user = sddm
session required pam_env.so envfile=${config.system.build.pamEnvironment}
session optional ${pkgs.systemd}/lib/security/pam_systemd.so
session optional pam_keyinit.so force revoke
session optional pam_permit.so
'';
};
users.extraUsers.sddm = {
createHome = true;
home = "/var/lib/sddm";
group = "sddm";
uid = config.ids.uids.sddm;
};
environment.etc."sddm.conf".source = cfgFile;
users.extraGroups.sddm.gid = config.ids.gids.sddm;
};
}

5
nixos/modules/virtualisation/xen-dom0.nix
View File

@ -59,12 +59,11 @@ in
virtualisation.xen.stored =
mkOption {
default = null;
type = types.path;
description =
''
Xen Store daemon to use. Defaults to oxenstored of the xen package.
'';
apply = x: if x == null then "${xen}/bin/oxenstored" else x;
};
virtualisation.xen.trace =
@ -89,6 +88,8 @@ in
message = "Xen currently does not support EFI boot";
} ];
virtualisation.xen.stored = mkDefault "${xen}/bin/oxenstored";
environment.systemPackages = [ xen ];
# Make sure Domain 0 gets the required configuration

55
pkgs/applications/display-managers/sddm/cmake_paths.patch Normal file
View File

@ -0,0 +1,55 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4d6e0a9..df4ad28 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -77,7 +77,9 @@ find_package(Qt5LinguistTools REQUIRED)
# find qt5 imports dir
get_target_property(QMAKE_EXECUTABLE Qt5::qmake LOCATION)
-exec_program(${QMAKE_EXECUTABLE} ARGS "-query QT_INSTALL_QML" RETURN_VALUE return_code OUTPUT_VARIABLE QT_IMPORTS_DIR)
+if(NOT QT_IMPORTS_DIR)
+ exec_program(${QMAKE_EXECUTABLE} ARGS "-query QT_INSTALL_QML" RETURN_VALUE return_code OUTPUT_VARIABLE QT_IMPORTS_DIR)
+endif()
# Set components version
set(COMPONENTS_VERSION 2.0)
diff --git a/data/man/sddm.conf.rst.in b/data/man/sddm.conf.rst.in
index 6a28224..798bc5c 100644
--- a/data/man/sddm.conf.rst.in
+++ b/data/man/sddm.conf.rst.in
@@ -65,6 +65,10 @@ OPTIONS
Path of the X server.
Default value is "/usr/bin/X".
+`XephyrPath=`
+ Path of the Xephyr.
+ Default value is "/usr/bin/Xephyr".
+
`XauthPath=`
Path of the Xauth.
Default value is "/usr/bin/xauth".
diff --git a/src/common/Configuration.h b/src/common/Configuration.h
index 72aa6f4..854cc22 100644
--- a/src/common/Configuration.h
+++ b/src/common/Configuration.h
@@ -54,6 +54,7 @@ namespace SDDM {
// TODO: Not absolutely sure if everything belongs here. Xsessions, VT and probably some more seem universal
Section(XDisplay,
Entry(ServerPath, QString, _S("/usr/bin/X"), _S("X server path"));
+ Entry(XephyrPath, QString, _S("/usr/bin/Xephyr"), _S("Xephyr path"));
Entry(XauthPath, QString, _S("/usr/bin/xauth"), _S("Xauth path"));
Entry(SessionDir, QString, _S("/usr/share/xsessions"), _S("Session description directory"));
Entry(SessionCommand, QString, _S(SESSION_COMMAND), _S("Xsession script path\n"
diff --git a/src/daemon/XorgDisplayServer.cpp b/src/daemon/XorgDisplayServer.cpp
index f10ad82..cb9de3f 100644
--- a/src/daemon/XorgDisplayServer.cpp
+++ b/src/daemon/XorgDisplayServer.cpp
@@ -136,7 +136,7 @@ namespace SDDM {
if (daemonApp->testing()) {
QStringList args;
args << m_display << "-ac" << "-br" << "-noreset" << "-screen" << "800x600";
- process->start("/usr/bin/Xephyr", args);
+ process->start(mainConfig.XDisplay.XephyrPath.get(), args);
} else {
// set process environment
QProcessEnvironment env = QProcessEnvironment::systemEnvironment();

47
pkgs/applications/display-managers/sddm/default.nix Normal file
View File

@ -0,0 +1,47 @@
{ stdenv, fetchpatch, makeWrapper, fetchFromGitHub, cmake, pkgconfig, libxcb, libpthreadstubs
, libXdmcp, libXau, qt5, pam, systemd }:
let
version = "0.11.0";
in
stdenv.mkDerivation rec {
name = "sddm-${version}";
src = fetchFromGitHub {
owner = "sddm";
repo = "sddm";
rev = "v${version}";
sha256 = "1s1gm0xvgwzrpxgni3ngdj8phzg21gkk1jyiv2l2i5ayl0jdm7ig";
};
nativeBuildInputs = [ cmake pkgconfig qt5.tools makeWrapper ];
buildInputs = [ libxcb libpthreadstubs libXdmcp libXau qt5.base pam systemd ];
patches = [ (fetchpatch {
url = "https://github.com/sddm/sddm/commit/9bc21ee7da5de6b2531d47d1af4d7b0a169990b9.patch";
sha256 = "1pda0wf4xljdadja7iyh5c48h0347imadg9ya1dw5slgb7w1d94l";
})
./cmake_paths.patch
];
cmakeFlags = [ "-DCONFIG_FILE=/etc/sddm.conf" ];
preConfigure = ''
export cmakeFlags="$cmakeFlags -DQT_IMPORTS_DIR=$out/lib/qt5/qml -DCMAKE_INSTALL_SYSCONFDIR=$out/etc -DSYSTEMD_SYSTEM_UNIT_DIR=$out/lib/systemd/system"
'';
postInstall = ''
wrapProgram $out/bin/sddm-greeter \
--set QML2_IMPORT_PATH "${qt5.declarative}/lib/qt5/qml/"
'';
enableParallelBuilding = true;
meta = with stdenv.lib; {
description = "QML based X11 display manager";
homepage = http://launchpad.net/lightdm;
platforms = platforms.linux;
maintainers = with maintainers; [ abbradar ];
};
}

31
pkgs/applications/editors/emacs-modes/nyan-mode/default.nix Normal file
View File

@ -0,0 +1,31 @@
{trivialBuild, fetchFromGitHub}:
trivialBuild rec {
pname = "nyan-mode";
version = "20150128";
src = fetchFromGitHub {
owner = "TeMPOraL";
repo = pname;
rev = "41faa2c809da7b2cb3e6f8fadefae3f338ced3f2";
sha256 = "1idaac7sjc8hhbf5zif61ncg1pvg28c0qfihavdx61albww0ll7f";
};
patches = [ ./directory.patch ];
preBuild = ''
substituteInPlace nyan-mode.el \
--replace "@OUT@" "$out/"
'';
postInstall = ''
cp -r img $out
cp -r mus $out
'';
meta = {
description = "An analog indicator of the position in the buffer";
homepage = https://github.com/TeMPOraL/nyan-mode/;
license = "GPLv3+";
};
}

13
pkgs/applications/editors/emacs-modes/nyan-mode/directory.patch Normal file
View File

@ -0,0 +1,13 @@
diff --git a/nyan-mode.el b/nyan-mode.el
index 939a25a..3d0b983 100644
--- a/nyan-mode.el
+++ b/nyan-mode.el
@@ -106,7 +106,7 @@ This can be t or nil."
:group 'nyan)
-(defconst +nyan-directory+ (file-name-directory (or load-file-name buffer-file-name)))
+(defconst +nyan-directory+ "@OUT@")
(defconst +nyan-cat-size+ 3)

42
pkgs/applications/misc/scim/default.nix Normal file
View File

@ -0,0 +1,42 @@
{ stdenv, fetchurl, yacc, ncurses, libxml2 }:
let
version = "0.1.8";
in
stdenv.mkDerivation rec {
name = "scim-${version}";
src = fetchurl {
url = "https://github.com/andmarti1424/scim/archive/v${version}.tar.gz";
sha256 = "0qjixb1hzbdrypbmzwb2iaw5wp57kn7fmm1zpjp4gzjyanrhazs2";
};
buildInputs = [ yacc ncurses libxml2 ];
buildPhase = ''
cd src
sed "s,prefix=/usr,prefix=$out," Makefile
sed "s,-I/usr/include/libxml2,-I$libxml2," Makefile
make
export DESTDIR=$out
'';
installPhase = ''
make install prefix=
'';
meta = {
homepage = "https://github.com/andmarti1424/scim";
description = "SCIM - Spreadsheet Calculator Improvised - SC fork";
license = {
fullName = "SCIM License";
url = "https://github.com/andmarti1424/scim/raw/master/LICENSE";
};
maintainers = [ stdenv.lib.maintainers.matthiasbeyer ];
platforms = with stdenv.lib.platforms; linux; # Cannot test others
};
}

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

@ -15,14 +15,14 @@
assert stdenv.cc ? libc && stdenv.cc.libc != null;
let version = "36.0"; in
let version = "36.0.1"; in
stdenv.mkDerivation rec {
name = "firefox-${version}";
src = fetchurl {
url = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${version}/source/firefox-${version}.source.tar.bz2";
sha1 = "bcbfe0e4aa3236582c3b5c49619641224cf942df";
sha1 = "cde80f5aee704827da43b9ca94a138a6c8a6c553";
};
buildInputs =

10
pkgs/applications/networking/browsers/opera/default.nix
View File

@ -13,18 +13,18 @@ let
in
stdenv.mkDerivation rec {
name = "opera-12.12-1707";
name = "opera-12.16-1860";
src =
if stdenv.system == "i686-linux" then
fetchurl {
url = "${mirror}/linux/1212/${name}.i386.linux.tar.xz";
sha256 = "1jkrhxjxa5kz4bhyma0zlnsszdn84sq4pks3x8bfcayn12m6yxkz";
url = "${mirror}/linux/1216/${name}.i386.linux.tar.xz";
sha256 = "df640656a52b7c714faf25de92d84992116ce8f82b7a67afc1121eb3c428489d";
}
else if stdenv.system == "x86_64-linux" then
fetchurl {
url = "${mirror}/linux/1212/${name}.x86_64.linux.tar.xz";
sha256 = "0acizxgyqblcvl91dwmvi937fi1kw6whz5qgxyl1fkygbayji90v";
url = "${mirror}/linux/1216/${name}.x86_64.linux.tar.xz";
sha256 = "b3b5cada3829d2b3b0e2da25e9444ce9dff73dc6692586ce72cfd4f6431e639e";
}
else throw "Opera is not supported on ${stdenv.system} (only i686-linux and x86_64 linux are supported)";

37
pkgs/applications/networking/remote/x2goclient/default.nix Normal file
View File

@ -0,0 +1,37 @@
{ stdenv, fetchurl, cups, libssh, libXpm, nxproxy, openldap, makeWrapper, qt4 }:
let version = "4.0.3.2"; in
stdenv.mkDerivation rec {
name = "x2goclient-${version}";
src = fetchurl {
url = "http://code.x2go.org/releases/source/x2goclient/${name}.tar.gz";
sha256 = "0vqcz9kmnbvlj8kns68zl60019fdz97rydz4wsgnsgdf7r370npn";
};
meta = with stdenv.lib; {
description = "Graphical NoMachine NX3 remote desktop client";
homepage = http://x2go.org/;
license = with licenses; gpl2;
platforms = with platforms; linux;
maintainers = with maintainers; [ nckx ];
};
buildInputs = [ cups libssh libXpm nxproxy openldap makeWrapper qt4 ];
patchPhase = ''
substituteInPlace Makefile \
--replace "lrelease-qt4" "${qt4}/bin/lrelease" \
--replace "qmake-qt4" "${qt4}/bin/qmake" \
--replace "-o root -g root" ""
'';
makeFlags = [ "PREFIX=$(out)" "ETCDIR=$(out)/etc" ];
enableParallelBuilding = true;
installTargets = [ "install_client" "install_man" ];
postInstall = ''
wrapProgram "$out/bin/x2goclient" --suffix PATH : "${nxproxy}/bin";
'';
}

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

@ -4,11 +4,11 @@ with stdenv;
mkDerivation rec {
version = "8";
version = "9";
name = "zdfmediathk";
src = fetchurl {
url = "http://downloads.sourceforge.net/project/zdfmediathk/Mediathek/Mediathek%208/MediathekView_${version}.zip";
sha256 = "1sglzk8zh6cyijyw82k49yqzjv0ywglp03w09s7wr4mzk48mfjj9";
url = "http://downloads.sourceforge.net/project/zdfmediathk/Mediathek/Mediathek%209/MediathekView_${version}.zip";
sha256 = "1wff0igr33z9p1mjw7yvb6658smdwnp22dv8klz0y8qg116wx7a4";
};
buildInputs = [ unzip ];

41
pkgs/build-support/emacs/generic.nix Normal file
View File

@ -0,0 +1,41 @@
# generic builder for Emacs packages
{ lib, stdenv, emacs, texinfo }:
with lib;
{ pname
, version ? null
, buildInputs ? []
, packageRequires ? []
, meta ? {}
, ...
}@args:
let
defaultMeta = {
broken = false;
platforms = emacs.meta.platforms;
};
in
stdenv.mkDerivation ({
name = "emacs-${pname}${optionalString (version != null) "-${version}"}";
buildInputs = [emacs texinfo] ++ packageRequires ++ buildInputs;
propagatedBuildInputs = packageRequires;
propagatedUserEnvPkgs = packageRequires;
setupHook = ./setup-hook.sh;
doCheck = false;
meta = defaultMeta // meta;
}
// removeAttrs args [ "buildInputs" "packageRequires"
"meta"
])

67
pkgs/build-support/emacs/melpa.nix Normal file
View File

@ -0,0 +1,67 @@
# builder for Emacs packages built for packages.el
# using MELPA package-build.el
{ lib, stdenv, fetchurl, emacs, texinfo }:
with lib;
{ pname
, version
, files ? null
, fileSpecs ? [ "*.el" "*.el.in" "dir"
"*.info" "*.texi" "*.texinfo"
"doc/dir" "doc/*.info" "doc/*.texi" "doc/*.texinfo"
]
, meta ? {}
, ...
}@args:
let
packageBuild = fetchurl {
url = https://raw.githubusercontent.com/milkypostman/melpa/12a862e5c5c62ce627dab83d7cf2cca6e8b56c47/package-build.el;
sha256 = "1nviyyprypz7nmam9rwli4yv3kxh170glfbznryrp4czxkrjjdhk";
};
fname = "${pname}-${version}";
targets = concatStringsSep " " (if files == null then fileSpecs else files);
defaultMeta = {
homepage = "http://melpa.org/#/${pname}";
};
in
import ./generic.nix { inherit lib stdenv emacs texinfo; } ({
inherit packageBuild;
buildPhase = ''
runHook preBuild
emacs --batch -Q -l $packageBuild -l ${./melpa2nix.el} \
-f melpa2nix-build-package \
${pname} ${version} ${targets}
runHook postBuild
'';
installPhase = ''
runHook preInstall
emacs --batch -Q -l $packageBuild -l ${./melpa2nix.el} \
-f melpa2nix-install-package \
${fname}.* $out/share/emacs/site-lisp/elpa
runHook postInstall
'';
meta = defaultMeta // meta;
}
// removeAttrs args [ "files" "fileSpecs"
"meta"
])

0
pkgs/build-support/melpa/melpa2nix.el → pkgs/build-support/emacs/melpa2nix.el
View File

0
pkgs/build-support/melpa/setup-hook.sh → pkgs/build-support/emacs/setup-hook.sh
View File

34
pkgs/build-support/emacs/trivial.nix Normal file
View File

@ -0,0 +1,34 @@
# trivial builder for Emacs packages
{ lib, ... }@envargs:
with lib;
args:
import ./generic.nix envargs ({
#preConfigure = ''
# export LISPDIR=$out/share/emacs/site-lisp
# export VERSION_SPECIFIC_LISPDIR=$out/share/emacs/site-lisp
#'';
buildPhase = ''
eval "$preBuild"
emacs -L . --batch -f batch-byte-compile *.el
eval "$postBuild"
'';
installPhase = ''
eval "$preInstall"
LISPDIR=$out/share/emacs/site-lisp
install -d $LISPDIR
install *.el *.elc $LISPDIR
eval "$postInstall"
'';
}
// args)

104
pkgs/build-support/melpa/default.nix
View File

@ -1,104 +0,0 @@
# generic builder for Emacs packages
{ stdenv, fetchurl, emacs, texinfo
, extension ? (self : super : {})
}:
{ pname
, version
, src
, packageRequires ? []
, extraBuildInputs ? []
, files ? null
, fileSpecs ? [ "*.el" "*.el.in" "dir"
"*.info" "*.texi" "*.texinfo"
"doc/dir" "doc/*.info" "doc/*.texi" "doc/*.texinfo"
]
, meta ? {}
, preUnpack ? "", postUnpack ? ""
, patches ? [], patchPhase ? "", prePatch ? "", postPatch ? ""
, configureFlags ? [], preConfigure ? "", postConfigure ? ""
, buildPhase ? "", preBuild ? "", postBuild ? ""
, preInstall ? "", postInstall ? ""
, doCheck ? false, checkPhase ? "", preCheck ? "", postCheck ? ""
, preFixup ? "", postFixup ? ""
}:
let
inherit (stdenv.lib) concatStringsSep optionalAttrs;
packageBuild = fetchurl {
url = https://raw.githubusercontent.com/milkypostman/melpa/12a862e5c5c62ce627dab83d7cf2cca6e8b56c47/package-build.el;
sha256 = "1nviyyprypz7nmam9rwli4yv3kxh170glfbznryrp4czxkrjjdhk";
};
fname = "${pname}-${version}";
targets = concatStringsSep " " (if files == null then fileSpecs else files);
defaultMeta = {
broken = false;
homepage = "http://melpa.org/#/${pname}";
platforms = emacs.meta.platforms;
};
in
stdenv.mkDerivation ({
name = "emacs-${fname}";
inherit src packageBuild;
buildInputs = [emacs texinfo] ++ packageRequires ++ extraBuildInputs;
propagatedBuildInputs = packageRequires;
propagatedUserEnvPkgs = packageRequires;
setupHook = ./setup-hook.sh;
buildPhase = ''
runHook preBuild
emacs --batch -Q -l $packageBuild -l ${./melpa2nix.el} \
-f melpa2nix-build-package \
${pname} ${version} ${targets}
runHook postBuild
'';
installPhase = ''
runHook preInstall
emacs --batch -Q -l $packageBuild -l ${./melpa2nix.el} \
-f melpa2nix-install-package \
${fname}.* $out/share/emacs/site-lisp/elpa
runHook postInstall
'';
meta = defaultMeta // meta;
}
// optionalAttrs (preUnpack != "") { inherit preUnpack; }
// optionalAttrs (postUnpack != "") { inherit postUnpack; }
// optionalAttrs (configureFlags != []) { inherit configureFlags; }
// optionalAttrs (patches != []) { inherit patches; }
// optionalAttrs (patchPhase != "") { inherit patchPhase; }
// optionalAttrs (prePatch != "") { inherit prePatch; }
// optionalAttrs (postPatch != "") { inherit postPatch; }
// optionalAttrs (preConfigure != "") { inherit preConfigure; }
// optionalAttrs (postConfigure != "") { inherit postConfigure; }
// optionalAttrs (buildPhase != "") { inherit buildPhase; }
// optionalAttrs (preBuild != "") { inherit preBuild; }
// optionalAttrs (postBuild != "") { inherit postBuild; }
// optionalAttrs (doCheck) { inherit doCheck; }
// optionalAttrs (checkPhase != "") { inherit checkPhase; }
// optionalAttrs (preCheck != "") { inherit preCheck; }
// optionalAttrs (postCheck != "") { inherit postCheck; }
// optionalAttrs (preInstall != "") { inherit preInstall; }
// optionalAttrs (postInstall != "") { inherit postInstall; }
// optionalAttrs (preFixup != "") { inherit preFixup; }
// optionalAttrs (postFixup != "") { inherit postFixup; }
)

4
pkgs/desktops/e19/econnman.nix
View File

@ -8,9 +8,9 @@ stdenv.mkDerivation rec {
};
buildInputs = [ makeWrapper pkgconfig e19.efl python27 dbus ];
propagatedBuildInputs = [ python27Packages.pythonefl_1_12 python27Packages.dbus e19.elementary ];
propagatedBuildInputs = [ python27Packages.pythonefl_1_13 python27Packages.dbus e19.elementary ];
postInstall = ''
wrapProgram $out/bin/econnman-bin --prefix PYTHONPATH : ${python27Packages.dbus}/lib/python2.7/site-packages:${python27Packages.pythonefl_1_12}/lib/python2.7/site-packages
wrapProgram $out/bin/econnman-bin --prefix PYTHONPATH : ${python27Packages.dbus}/lib/python2.7/site-packages:${python27Packages.pythonefl_1_13}/lib/python2.7/site-packages
'';
meta = {

9
pkgs/desktops/e19/efl.nix
View File

@ -1,12 +1,12 @@
{ stdenv, fetchurl, pkgconfig, openssl, libjpeg, zlib, freetype, fontconfig, fribidi, SDL2, SDL, mesa, giflib, libpng, libtiff, glib, gst_all_1, pulseaudio, libsndfile, xlibs, libdrm, libxkbcommon, udev, utillinuxCurses, dbus, bullet, luajit, python27Packages, openjpeg, doxygen, expat, lua5_2, harfbuzz, jbig2dec, librsvg, dbus_libs, alsaLib, poppler, libraw, libspectre, xineLib, vlc, libwebp, curl }:
{ stdenv, fetchurl, pkgconfig, openssl, libjpeg, zlib, freetype, fontconfig, fribidi, SDL2, SDL, mesa, giflib, libpng, libtiff, glib, gst_all_1, pulseaudio, libsndfile, xlibs, libdrm, libxkbcommon, udev, utillinuxCurses, dbus, bullet, luajit, python27Packages, openjpeg, doxygen, expat, lua5_2, harfbuzz, jbig2dec, librsvg, dbus_libs, alsaLib, poppler, libraw, libspectre, xineLib, vlc, libwebp, curl, libinput }:
stdenv.mkDerivation rec {
name = "efl-${version}";
version = "1.12.3";
version = "1.13.1";
src = fetchurl {
url = "http://download.enlightenment.org/rel/libs/efl/${name}.tar.gz";
sha256 = "1xvcym11j4vs8djx7v70alzyhir1gw2zsm1nl5kv1pfz1kgqc8fv";
sha256 = "0wjy2n2ggjd9mzv9y0ra21wfjdbw927hdh6pz537p820bnghcivy";
};
buildInputs = [ pkgconfig openssl zlib freetype fontconfig fribidi SDL2 SDL mesa
@ -18,7 +18,8 @@ stdenv.mkDerivation rec {
xlibs.libXdamage xlibs.libXinerama xlibs.libXp xlibs.libXtst xlibs.libXi xlibs.libXext
bullet xlibs.libXScrnSaver xlibs.libXrender xlibs.libXfixes xlibs.libXrandr
xlibs.libxkbfile xlibs.libxcb xlibs.xcbutilkeysyms openjpeg doxygen expat lua5_2
harfbuzz jbig2dec librsvg dbus_libs alsaLib poppler libraw libspectre xineLib vlc libwebp curl libdrm ];
harfbuzz jbig2dec librsvg dbus_libs alsaLib poppler libraw libspectre xineLib vlc libwebp curl libdrm
libinput ];
# ac_ct_CXX must be set to random value, because then it skips some magic which does alternative searching for g++
configureFlags = [ "--with-tests=none" "--enable-sdl" "--enable-drm" "--with-opengl=full"

4
pkgs/desktops/e19/elementary.nix
View File

@ -1,10 +1,10 @@
{ stdenv, fetchurl, pkgconfig, e19, libcap, gdbm }:
stdenv.mkDerivation rec {
name = "elementary-${version}";
version = "1.12.3";
version = "1.13.1";
src = fetchurl {
url = "http://download.enlightenment.org/rel/libs/elementary/${name}.tar.gz";
sha256 = "0ajljrr72rdz9hniqvsigw7p6dmpqnf0nijrxd2x91gx2cfrwksm";
sha256 = "0jfbw48krpzcj944rvyy1rmq7cykad6cwhjh54fhp52lh7c5savk";
};
buildInputs = [ pkgconfig e19.efl gdbm ] ++ stdenv.lib.optionals stdenv.isLinux [ libcap ];
preConfigure = ''

4
pkgs/desktops/e19/emotion.nix
View File

@ -1,10 +1,10 @@
{ stdenv, fetchurl, pkgconfig, e19, vlc }:
stdenv.mkDerivation rec {
name = "emotion_generic_players-${version}";
version = "1.12.0";
version = "1.13.0";
src = fetchurl {
url = "http://download.enlightenment.org/rel/libs/emotion_generic_players/${name}.tar.gz";
sha256 = "1nm0qbdkhrpgvmj5qn7l4jj5l1g4zz77bda0ddy67fqkn5h3qarg";
sha256 = "0gin3cjhfj75v0gjsvv7harbj4fs4r7r1sfi74ncxzna71nrd8r3";
};
buildInputs = [ pkgconfig e19.efl vlc ];
preConfigure = ''

6
pkgs/desktops/e19/enlightenment.nix
View File

@ -3,16 +3,16 @@
stdenv.mkDerivation rec {
name = "enlightenment-${version}";
version = "0.19.3";
version = "0.19.4";
src = fetchurl {
url = "http://download.enlightenment.org/rel/apps/enlightenment/${name}.tar.xz";
sha256 = "1myv463agfzgva7fv0y74lk5sxfpf6mxykkc37cb7dyn3cxchdan";
sha256 = "0r3bad700cfx5sq8y61dbz3hxdx9n3nf5hzx40ryqld75yxzwxz7";
};
buildInputs = [ pkgconfig e19.efl e19.elementary xlibs.libXdmcp xlibs.libxcb
xlibs.xcbutilkeysyms xlibs.libXrandr libffi pam alsaLib luajit bzip2
libpthreadstubs gdbm ] ++ stdenv.lib.optionals stdenv.isLinux [ libcap ];
preConfigure = ''
export NIX_CFLAGS_COMPILE="-I${e19.efl}/include/eo-1 -I${e19.efl}/include/ecore-imf-1 -I${e19.efl}/include/ethumb-client-1 -I${e19.efl}/include/ethumb-1 $NIX_CFLAGS_COMPILE"
export NIX_CFLAGS_COMPILE="-I${e19.efl}/include/eo-1 -I${e19.efl}/include/ecore-imf-1 -I${e19.efl}/include/ethumb-client-1 -I${e19.efl}/include/elocation-1 -I${e19.efl}/include/ethumb-1 $NIX_CFLAGS_COMPILE"
export USER_SESSION_DIR=$prefix/lib/systemd/user
substituteInPlace src/modules/xkbswitch/e_mod_parse.c \

4
pkgs/desktops/e19/evas.nix
View File

@ -1,10 +1,10 @@
{ stdenv, fetchurl, pkgconfig, e19, zlib, libspectre, gstreamer, gst_plugins_base, gst_ffmpeg, gst_plugins_good, poppler, librsvg, libraw }:
stdenv.mkDerivation rec {
name = "evas_generic_loaders-${version}";
version = "1.12.0";
version = "1.13.0";
src = fetchurl {
url = "http://download.enlightenment.org/rel/libs/evas_generic_loaders/${name}.tar.gz";
sha256 = "0viph73wv83xw9g6rgjhhiav9n896m0ixnz2m27cnmmn8llchcf5";
sha256 = "16yzjk58bxsd0rlnpzrr8as9fxjjiq01swzhpadsgkmq33abgg63";
};
buildInputs = [ pkgconfig e19.efl zlib libspectre gstreamer gst_plugins_base gst_ffmpeg gst_plugins_good poppler librsvg libraw ];
meta = {

1
pkgs/desktops/e19/terminology.nix
View File

@ -12,6 +12,7 @@ stdenv.mkDerivation rec {
export NIX_CFLAGS_COMPILE="-I${e19.efl}/include/ecore-con-1 $NIX_CFLAGS_COMPILE"
export NIX_CFLAGS_COMPILE="-I${e19.efl}/include/eldbus-1 $NIX_CFLAGS_COMPILE"
export NIX_CFLAGS_COMPILE="-I${e19.efl}/include/ethumb-1 $NIX_CFLAGS_COMPILE"
export NIX_CFLAGS_COMPILE="-I${e19.efl}/include/elocation-1 $NIX_CFLAGS_COMPILE"
'';
meta = {
description = "The best terminal emulator written with the EFL";

4
pkgs/development/compilers/ats2/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "ats2-${version}";
version = "0.1.4";
version = "0.1.9";
src = fetchurl {
url = "mirror://sourceforge/ats2-lang/ATS2-Postiats-${version}.tgz";
sha256 = "174kxdvdgp2rlb0qq7d854n6m9gzy0g8annk3bmbqb23m36n2g39";
sha256 = "0zcki97zj9r1dvlfriwfckp9b9z7iavw09q21v6i5ld90hw9588q";
};
buildInputs = [ gmp ];

11
pkgs/development/compilers/llvm/3.5/clang.nix
View File

@ -1,6 +1,7 @@
{ stdenv, fetch, cmake, libxml2, libedit, llvm, version, clang-tools-extra_src }:
stdenv.mkDerivation {
let
gcc = if stdenv.cc.cc.isGNU or false then stdenv.cc.cc else stdenv.cc.cc.gcc;
in stdenv.mkDerivation {
name = "clang-${version}";
unpackPhase = ''
@ -17,6 +18,8 @@ stdenv.mkDerivation {
"-DCMAKE_BUILD_TYPE=Release"
"-DCMAKE_CXX_FLAGS=-std=c++11"
] ++
# Maybe with compiler-rt this won't be needed?
(stdenv.lib.optional stdenv.isLinux "-DGCC_INSTALL_PREFIX=${gcc}") ++
(stdenv.lib.optional (stdenv.cc.libc != null) "-DC_INCLUDE_DIRS=${stdenv.cc.libc}/include");
patches = [ ./clang-purity.patch ];
@ -36,6 +39,10 @@ stdenv.mkDerivation {
enableParallelBuilding = true;
passthru = stdenv.lib.optionalAttrs stdenv.isLinux {
inherit gcc;
};
meta = {
description = "A c, c++, objective-c, and objective-c++ frontend for the llvm compiler";
homepage = http://llvm.org/;

39
pkgs/development/compilers/openjdk/nonreparenting-wm.patch
View File

@ -1,39 +0,0 @@
--- a/jdk/src/solaris/classes/sun/awt/X11/XWM.java 2014-09-06 18:41:39.018530981 -0400
+++ b/jdk/src/solaris/classes/sun/awt/X11/XWM.java 2014-09-06 18:46:43.098540372 -0400
@@ -104,7 +104,8 @@
COMPIZ_WM = 12,
LG3D_WM = 13,
CWM_WM = 14,
- MUTTER_WM = 15;
+ MUTTER_WM = 15,
+ OTHER_NONREPARENTING_WM = 16;
public String toString() {
switch (WMID) {
case NO_WM:
@@ -596,7 +597,7 @@
}
static boolean isNonReparentingWM() {
- return (XWM.getWMID() == XWM.COMPIZ_WM || XWM.getWMID() == XWM.LG3D_WM || XWM.getWMID() == XWM.CWM_WM);
+ return (XWM.getWMID() == XWM.COMPIZ_WM || XWM.getWMID() == XWM.LG3D_WM || XWM.getWMID() == XWM.CWM_WM || XWM.getWMID() == XWM.OTHER_NONREPARENTING_WM);
}
/*
@@ -786,6 +787,9 @@
} else if (doIsIceWM && isIceWM()) {
awt_wmgr = XWM.ICE_WM;
}
+ else if (XToolkit.getEnv("_JAVA_AWT_WM_NONREPARENTING") != null) {
+ awt_wmgr = XWM.OTHER_NONREPARENTING_WM;
+ }
/*
* We don't check for legacy WM when we already know that WM
* supports WIN or _NET wm spec.
@@ -1332,6 +1336,7 @@
res = new Insets(28, 6, 6, 6);
break;
case NO_WM:
+ case OTHER_NONREPARENTING_WM:
case LG3D_WM:
res = zeroInsets;
break;

25
pkgs/development/compilers/openjdk/openjdk8.nix
View File

@ -1,41 +1,41 @@
{ stdenv, fetchurl, cpio, file, which, unzip, zip, xorg, cups, freetype, alsaLib, openjdk, cacert, perl } :
let
update = "31";
build = "13";
baseurl = "http://hg.openjdk.java.net/jdk8u/jdk8u";
update = "40";
build = "25";
baseurl = "http://hg.openjdk.java.net/jdk8u/jdk8u40";
repover = "jdk8u${update}-b${build}";
paxflags = if stdenv.isi686 then "msp" else "m";
jdk8 = fetchurl {
url = "${baseurl}/archive/${repover}.tar.gz";
sha256 = "824b28c554ce32edbdaa77cc4f21f8ed57542c74c8748b89cd06be43a1537b34";
sha256 = "05s5j0rq45n8piymv9c1n0hxr4bk3j8lz6fw2wbp0m8kam6zzpza";
};
langtools = fetchurl {
url = "${baseurl}/langtools/archive/${repover}.tar.gz";
sha256 = "3e09a644d2fb38970acf78c72bc201c031d43574b5a3f7e00bec1b11bffec9c4";
sha256 = "0p1z38szm63cf5f83697awbqwpf7b8q1ymrqc0v6r9hb5yf0p22r";
};
hotspot = fetchurl {
url = "${baseurl}/hotspot/archive/${repover}.tar.gz";
sha256 = "485b1a88b4b44b468e96211de238a5eed80f7472f91977fc27e2f443a8ab8ed3";
sha256 = "0sl0ima3zlbd1ai7qrg4msy5ibg64qpwdrv7z4l8cpalwby26y6p";
};
corba = fetchurl {
url = "${baseurl}/corba/archive/${repover}.tar.gz";
sha256 = "47b07945d3f534e6b87dc273676b8bcb493292e8769667493bb5febfb5c9f347";
sha256 = "1ahvhap8av519813yf20v3hbvg82j9bq3gnqlayng1qggfivsb5s";
};
jdk = fetchurl {
url = "${baseurl}/jdk/archive/${repover}.tar.gz";
sha256 = "b3801935199973cc02df02ac2f2587ff0f1989f98af5bf6fe46520a8108c8d6a";
sha256 = "0n86fcy1z4z22jcgfnn9agzfi949709hn2x6s8wyhwwa055rjd1a";
};
jaxws = fetchurl {
url = "${baseurl}/jaxws/archive/${repover}.tar.gz";
sha256 = "04bb35fd8b071f65014fa1d3b9816886b88e06548eeda27181993b80efb6a0bf";
sha256 = "0hp19hq0dw3j8zz4mxd6bjk9zqlyr56fhwzgjwmm56b6pwkcmsn7";
};
jaxp = fetchurl {
url = "${baseurl}/jaxp/archive/${repover}.tar.gz";
sha256 = "74bb7a376fa706e4283e235caebbcf9736974a6a4cf97b8c8335d389581965e2";
sha256 = "037za0hjiwvzvbzsckfxnrrbak1vbd52pmrnd855vxkik08jxp8c";
};
nashorn = fetchurl {
url = "${baseurl}/nashorn/archive/${repover}.tar.gz";
sha256 = "2fbdcb016506de4e86db5813c78b28382df5b601f0e73ffd5465c12519b75fd3";
sha256 = "1np8hkg2fmj5s6ipd1vb8x0z6xy00kbi2ipqca9pxzib58caj6b2";
};
in
stdenv.mkDerivation {
@ -47,7 +47,7 @@ stdenv.mkDerivation {
xorg.libXi xorg.libXinerama xorg.libXcursor xorg.lndir
cups freetype alsaLib openjdk perl ];
setSourceRoot = ''
sourceRoot="jdk8u-jdk8u${update}-b${build}";
sourceRoot="jdk8u${update}-jdk8u${update}-b${build}";
'';
prePatch = ''
# despite --with-override-jdk the build still searchs here
@ -58,7 +58,6 @@ stdenv.mkDerivation {
./fix-java-home.patch
./read-truststore-from-env-jdk8.patch
./currency-date-range-jdk8.patch
./nonreparenting-wm.patch
];
preConfigure = ''
chmod +x configure

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

@ -117,6 +117,7 @@ self: super: {
hxt = dontHaddock super.hxt; # https://github.com/UweSchmidt/hxt/issues/38
markdown-unlit = dontHaddock super.markdown-unlit;
network-conduit = dontHaddock super.network-conduit;
shakespeare-js = dontHaddock super.shakespeare-js;
shakespeare-text = dontHaddock super.shakespeare-text;
types-compat = dontHaddock super.types-compat; # https://github.com/philopon/apiary/issues/15
wai-test = dontHaddock super.wai-test;
@ -225,6 +226,8 @@ self: super: {
Hclip = dontCheck super.Hclip;
HList = dontCheck super.HList;
memcached-binary = dontCheck super.memcached-binary;
persistent-zookeeper = dontCheck super.persistent-zookeeper;
pocket-dns = dontCheck super.pocket-dns;
postgresql-simple = dontCheck super.postgresql-simple;
postgrest = dontCheck super.postgrest;
snowball = dontCheck super.snowball;
@ -325,6 +328,7 @@ self: super: {
hedn = dontCheck super.hedn;
hgdbmi = dontCheck super.hgdbmi;
hi = dontCheck super.hi;
hierarchical-clustering = dontCheck super.hierarchical-clustering;
hmatrix-tests = dontCheck super.hmatrix-tests;
hPDB-examples = dontCheck super.hPDB-examples;
hquery = dontCheck super.hquery;
@ -339,7 +343,6 @@ self: super: {
http-client-openssl = dontCheck super.http-client-openssl;
http-client-tls = dontCheck super.http-client-tls;
ihaskell = dontCheck super.ihaskell;
influxdb = dontCheck super.influxdb;
itanium-abi = dontCheck super.itanium-abi;
katt = dontCheck super.katt;
language-slice = dontCheck super.language-slice;
@ -504,9 +507,6 @@ self: super: {
# https://github.com/NixOS/nixpkgs/issues/6350
paypal-adaptive-hoops = overrideCabal super.paypal-adaptive-hoops (drv: { testTarget = "local"; });
# https://github.com/anton-k/temporal-csound/issues/2
temporal-csound = markBrokenVersion "0.4.1" super.temporal-csound;
# https://github.com/seanparsons/wiring/issues/1
wiring = markBrokenVersion super.wiring;
@ -608,8 +608,26 @@ self: super: {
# Broken by GLUT update.
Monadius = markBroken super.Monadius;
# https://github.com/ddssff/cabal-debian/issues/35
cabal-debian = markBroken super.cabal-debian;
# https://github.com/maoe/influxdb-haskell/issues/24
influxdb = markBroken super.influxdb;
snaplet-influxdb = markBroken super.snaplet-influxdb;
# We don't have the groonga package these libraries bind to.
haroonga = markBroken super.haroonga;
haroonga-httpd = markBroken super.haroonga-httpd;
# Cannot find pkg-config data for "webkit-1.0".
webkit = markBroken super.webkit;
websnap = markBroken super.websnap;
# https://github.com/victoredwardocallaghan/hlibBladeRF/issues/4
hlibBladeRF = dontCheck super.hlibBladeRF;
# https://github.com/frasertweedale/hs-persona-idp/issues/1
persona-idp = markBroken super.persona-idp;
# Build is broken and no contact info available.
hopenpgp-tools = markBroken super.hopenpgp-tools;
} // {

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

@ -78,17 +78,17 @@ self: super: {
hosc = dontDistribute super.hosc;
tidal-midi = dontDistribute super.tidal-midi;
# Needs mtl 2.2.x due to "plailude".
clac = dontDistribute super.clac;
# These packages need mtl 2.2.x directly or indirectly via dependencies.
apiary-purescript = markBroken super.apiary-purescript;
clac = dontDistribute super.clac;
highlighter2 = markBroken super.highlighter2;
hypher = markBroken super.hypher;
miniforth = markBroken super.miniforth;
purescript = markBroken super.purescript;
xhb-atom-cache = markBroken super.xhb-atom-cache;
xhb-ewmh = markBroken super.xhb-ewmh;
yesod-purescript = markBroken super.yesod-purescript;
yabi-muno = markBroken super.yabi-muno;
yet-another-logger = markBroken super.yet-another-logger;
# https://github.com/frosch03/arrowVHDL/issues/2
@ -135,7 +135,8 @@ self: super: {
amazonka-ecs = super.amazonka-ecs.overrideScope amazonkaEnv;
amazonka-glacier = super.amazonka-glacier.overrideScope amazonkaEnv;
amazonka-kms = super.amazonka-kms.overrideScope amazonkaEnv;
amazonka-ssm = super.amazonka-ssm.overrideScope amazonkaEnv;
in {
inherit amazonkaEnv;
inherit amazonka amazonka-cloudwatch amazonka-core amazonka-ecs amazonka-kms amazonka-glacier;
inherit amazonka amazonka-cloudwatch amazonka-core amazonka-ecs amazonka-kms amazonka-glacier amazonka-ssm;
})

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

File diff suppressed because it is too large Load Diff

4
pkgs/development/interpreters/spidermonkey/17.0.nix
View File

@ -31,6 +31,10 @@ stdenv.mkDerivation rec {
preCheck = ''
rm jit-test/tests/sunspider/check-date-format-tofte.js # https://bugzil.la/600522
# Test broken on ARM. Fedora disables it.
# https://lists.fedoraproject.org/pipermail/scm-commits/Week-of-Mon-20130617/1041155.html
echo -e '#!${stdenv.shell}\nexit 0' > config/find_vanilla_new_calls
paxmark m shell/js17
paxmark mr jsapi-tests/jsapi-tests
'';

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

@ -79,10 +79,10 @@ let
outputs = [ "out" "tools" ];
# move avplay to get rid of the SDL dependency in the main output
postInstall = ''
mkdir -p "$tools/bin"
mv "$out/bin/avplay" "$tools/bin"
cp -s "$out"/bin/* "$tools/bin/"
'';
doInstallCheck = false; # fails randomly

36
pkgs/development/libraries/libxcomp/default.nix Normal file
View File

@ -0,0 +1,36 @@
{ stdenv, fetchgit, autoconf, libjpeg, libpng12, libX11, zlib }:
let version = "3.5.0-2015-02-18"; in
stdenv.mkDerivation {
name = "libxcomp-${version}";
src = fetchgit {
url = git://code.x2go.org/nx-libs.git;
rev = "2b2a02f93f552a38de8f72a971fa3f3ff42b3298";
sha256 = "11n7dv1cn9icjgyxmsbac115vmbaar47cmp8k76vd516f2x41dw9";
};
meta = with stdenv.lib; {
description = "NX compression library";
homepage = "http://code.x2go.org/gitweb?p=nx-libs.git;a=summary";
license = with licenses; gpl2;
platforms = with platforms; linux;
maintainers = with maintainers; [ nckx ];
};
buildInputs = [ autoconf libjpeg libpng12 libX11 zlib ];
preConfigure = ''
cd nxcomp/
autoconf
'';
enableParallelBuilding = true;
postInstall = ''
mkdir $out/lib
cp libXcomp.so* $out/lib
mkdir $out/include
cp NX.h $out/include
'';
}

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

@ -12,8 +12,8 @@ stdenv.mkDerivation rec {
buildInputs = [ cmake pkgconfig ];
meta = with stdenv.lib; {
description = "a wrapper for the user, group and hosts NSS API";
homepage = https://git.samba.org/?p=nss_wrapper.git;a=summary;
description = "A wrapper for the user, group and hosts NSS API";
homepage = "https://git.samba.org/?p=nss_wrapper.git;a=summary";
license = licenses.bsd3;
maintainers = with maintainers; [ wkennington ];
platforms = platforms.all;

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

@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "a library passing all socket communications through unix sockets";
homepage = https://git.samba.org/?p=socket_wrapper.git;a=summary;
homepage = "https://git.samba.org/?p=socket_wrapper.git;a=summary";
license = licenses.bsd3;
maintainers = with maintainers; [ wkennington ];
platforms = platforms.all;

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

@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "a wrapper for the user, group and hosts NSS API";
homepage = https://git.samba.org/?p=uid_wrapper.git;a=summary;
homepage = "https://git.samba.org/?p=uid_wrapper.git;a=summary";
license = licenses.bsd3;
maintainers = with maintainers; [ wkennington ];
platforms = platforms.all;

210
pkgs/development/r-modules/default.nix
View File

@ -198,131 +198,132 @@ let
# tweaks for the individual packages and "in self" follow
packagesWithRDepends = {
# sort -t '=' -k 2
FactoMineR = [ self.car ];
};
packagesWithNativeBuildInputs = {
# sort -t '=' -k 2
graphscan = [ pkgs.gsl ];
RAppArmor = [ pkgs.apparmor ];
BNSP = [ pkgs.gsl ];
SOD = [ pkgs.cudatoolkit ]; # requres CL/cl.h
curl = [ pkgs.curl pkgs.openldap ];
Rssa = [ pkgs.fftw ];
fftw = [ pkgs.fftw ];
fftwtools = [ pkgs.fftw ];
kza = [ pkgs.fftw ];
mwaved = [ pkgs.fftw ];
spate = [ pkgs.fftw ];
chebpol = [ pkgs.fftw ];
seewave = [ pkgs.fftw pkgs.libsndfile ];
rgeos = [ pkgs.geos ];
Rglpk = [ pkgs.glpk ];
RCA = [ pkgs.gmp ];
gmp = [ pkgs.gmp ];
rcdd = [ pkgs.gmp ];
Rlibeemd = [ pkgs.gsl ];
igraph = [ pkgs.gmp ];
glpkAPI = [ pkgs.gmp pkgs.glpk ];
sdcTable = [ pkgs.gmp pkgs.glpk ];
Rmpfr = [ pkgs.gmp pkgs.mpfr ];
Formula = [ pkgs.gmp ];
abn = [ pkgs.gsl ];
adimpro = [ pkgs.imagemagick ];
audio = [ pkgs.portaudio ];
BayesSAE = [ pkgs.gsl ];
BayesVarSel = [ pkgs.gsl ];
HiCseg = [ pkgs.gsl ];
KFKSDS = [ pkgs.gsl ];
R2GUESS = [ pkgs.gsl ];
RcppZiggurat = [ pkgs.gsl ];
SemiCompRisks = [ pkgs.gsl ];
VBLPCM = [ pkgs.gsl ];
abn = [ pkgs.gsl ];
BayesXsrc = [ pkgs.readline pkgs.ncurses ];
bigGP = [ pkgs.openmpi ];
bnpmr = [ pkgs.gsl ];
BNSP = [ pkgs.gsl ];
cairoDevice = [ pkgs.gtk2 ];
Cairo = [ pkgs.libtiff pkgs.libjpeg pkgs.cairo ];
CARramps = [ pkgs.linuxPackages.nvidia_x11 pkgs.liblapack ];
chebpol = [ pkgs.fftw ];
cit = [ pkgs.gsl ];
curl = [ pkgs.curl pkgs.openldap ];
devEMF = [ pkgs.xlibs.libXft ];
diversitree = [ pkgs.gsl pkgs.fftw ];
EMCluster = [ pkgs.liblapack ];
fftw = [ pkgs.fftw ];
fftwtools = [ pkgs.fftw ];
Formula = [ pkgs.gmp ];
geoCount = [ pkgs.gsl ];
git2r = [ pkgs.zlib ];
glpkAPI = [ pkgs.gmp pkgs.glpk ];
gmp = [ pkgs.gmp ];
graphscan = [ pkgs.gsl ];
gsl = [ pkgs.gsl ];
HiCseg = [ pkgs.gsl ];
igraph = [ pkgs.gmp ];
JavaGD = [ pkgs.jdk ];
jpeg = [ pkgs.libjpeg ];
KFKSDS = [ pkgs.gsl ];
kza = [ pkgs.fftw ];
libamtrack = [ pkgs.gsl ];
mixcat = [ pkgs.gsl ];
outbreaker = [ pkgs.gsl ];
ridge = [ pkgs.gsl ];
simplexreg = [ pkgs.gsl ];
stsm = [ pkgs.gsl ];
survSNP = [ pkgs.gsl ];
topicmodels = [ pkgs.gsl ];
RcppGSL = [ pkgs.gsl ];
bnpmr = [ pkgs.gsl ];
V8 = [ pkgs.v8 ];
geoCount = [ pkgs.gsl ];
devEMF = [ pkgs.xlibs.libXft ];
gsl = [ pkgs.gsl ];
mvabund = [ pkgs.gsl ];
diversitree = [ pkgs.gsl pkgs.fftw ];
TKF = [ pkgs.gsl ];
VBmix = [ pkgs.gsl pkgs.fftw pkgs.qt4 ];
RGtk2 = [ pkgs.gtk2 ];
cairoDevice = [ pkgs.gtk2 ];
adimpro = [ pkgs.imagemagick ];
rjags = [ pkgs.jags ];
runjags = [ pkgs.jags ];
JavaGD = [ pkgs.jdk ];
RODBC = [ pkgs.libiodbc ];
RODBCext = [ pkgs.libiodbc ];
jpeg = [ pkgs.libjpeg ];
EMCluster = [ pkgs.liblapack ];
png = [ pkgs.libpng ];
pbdMPI = [ pkgs.openmpi ];
bigGP = [ pkgs.openmpi ];
rtiff = [ pkgs.libtiff ];
tiff = [ pkgs.libtiff ];
Cairo = [ pkgs.libtiff pkgs.libjpeg pkgs.cairo ];
XML = [ pkgs.libtool pkgs.libxml2 pkgs.xmlsec pkgs.libxslt ];
rpud = [ pkgs.linuxPackages.nvidia_x11 ];
CARramps = [ pkgs.linuxPackages.nvidia_x11 pkgs.liblapack ];
rgl = [ pkgs.mesa pkgs.x11 ];
ncdf = [ pkgs.netcdf ];
mwaved = [ pkgs.fftw ];
ncdf4 = [ pkgs.netcdf ];
pbdNCDF4 = [ pkgs.netcdf ];
RNetCDF = [ pkgs.netcdf pkgs.udunits ];
ncdf = [ pkgs.netcdf ];
nloptr = [ pkgs.nlopt ];
npRmpi = [ pkgs.openmpi ];
pbdPROF = [ pkgs.openmpi ];
sprint = [ pkgs.openmpi ];
Rmpi = [ pkgs.openmpi ];
openssl = [ pkgs.openssl ];
outbreaker = [ pkgs.gsl ];
pbdMPI = [ pkgs.openmpi ];
pbdNCDF4 = [ pkgs.netcdf ];
pbdPROF = [ pkgs.openmpi ];
PKI = [ pkgs.openssl ];
png = [ pkgs.libpng ];
PopGenome = [ pkgs.zlib ];
proj4 = [ pkgs.proj ];
qtbase = [ pkgs.qt4 ];
qtpaint = [ pkgs.qt4 ];
R2GUESS = [ pkgs.gsl ];
R2SWF = [ pkgs.zlib pkgs.libpng pkgs.freetype ];
RAppArmor = [ pkgs.apparmor ];
rbamtools = [ pkgs.zlib ];
RCA = [ pkgs.gmp ];
rcdd = [ pkgs.gmp ];
RcppCNPy = [ pkgs.zlib ];
RcppGSL = [ pkgs.gsl ];
RcppOctave = [ pkgs.zlib pkgs.bzip2 pkgs.icu pkgs.lzma pkgs.pcre pkgs.octave ];
RcppZiggurat = [ pkgs.gsl ];
rgdal = [ pkgs.proj pkgs.gdal ];
rgeos = [ pkgs.geos ];
rgl = [ pkgs.mesa pkgs.x11 ];
Rglpk = [ pkgs.glpk ];
RGtk2 = [ pkgs.gtk2 ];
Rhpc = [ pkgs.zlib pkgs.bzip2 pkgs.icu pkgs.lzma pkgs.openmpi pkgs.pcre ];
ridge = [ pkgs.gsl ];
RJaCGH = [ pkgs.zlib ];
rjags = [ pkgs.jags ];
rJava = [ pkgs.zlib pkgs.bzip2 pkgs.icu pkgs.lzma pkgs.pcre pkgs.jdk pkgs.libzip ];
Rlibeemd = [ pkgs.gsl ];
rmatio = [ pkgs.zlib ];
Rmpfr = [ pkgs.gmp pkgs.mpfr ];
Rmpi = [ pkgs.openmpi ];
RMySQL = [ pkgs.zlib pkgs.mysql ];
RNetCDF = [ pkgs.netcdf pkgs.udunits ];
RODBCext = [ pkgs.libiodbc ];
RODBC = [ pkgs.libiodbc ];
rpg = [ pkgs.postgresql ];
rphast = [ pkgs.pcre pkgs.zlib pkgs.bzip2 pkgs.gzip pkgs.readline ];
Rpoppler = [ pkgs.poppler ];
RPostgreSQL = [ pkgs.postgresql ];
RProtoBuf = [ pkgs.protobuf ];
rpud = [ pkgs.linuxPackages.nvidia_x11 ];
rPython = [ pkgs.python ];
RSclient = [ pkgs.openssl ];
Rserve = [ pkgs.openssl ];
Rpoppler = [ pkgs.poppler ];
audio = [ pkgs.portaudio ];
rpg = [ pkgs.postgresql ];
RPostgreSQL = [ pkgs.postgresql ];
ssanv = [ pkgs.proj ];
proj4 = [ pkgs.proj ];
rgdal = [ pkgs.proj pkgs.gdal ];
RProtoBuf = [ pkgs.protobuf ];
rPython = [ pkgs.python ];
qtpaint = [ pkgs.qt4 ];
qtbase = [ pkgs.qt4 ];
BayesXsrc = [ pkgs.readline pkgs.ncurses ];
udunits2 = [ pkgs.udunits pkgs.expat ];
tkrplot = [ pkgs.xlibs.libX11 ];
rzmq = [ pkgs.zeromq3 ];
PopGenome = [ pkgs.zlib ];
RJaCGH = [ pkgs.zlib ];
RcppCNPy = [ pkgs.zlib ];
rbamtools = [ pkgs.zlib ];
rmatio = [ pkgs.zlib ];
RVowpalWabbit = [ pkgs.zlib pkgs.boost ];
seqminer = [ pkgs.zlib pkgs.bzip2 ];
seqinr = [ pkgs.zlib ];
rphast = [ pkgs.pcre pkgs.zlib pkgs.bzip2 pkgs.gzip pkgs.readline ];
Rssa = [ pkgs.fftw ];
rtfbs = [ pkgs.zlib pkgs.pcre pkgs.bzip2 pkgs.gzip pkgs.readline ];
Rhpc = [ pkgs.zlib pkgs.bzip2 pkgs.icu pkgs.lzma pkgs.openmpi pkgs.pcre ];
rtiff = [ pkgs.libtiff ];
runjags = [ pkgs.jags ];
RVowpalWabbit = [ pkgs.zlib pkgs.boost ];
rzmq = [ pkgs.zeromq3 ];
SAVE = [ pkgs.zlib pkgs.bzip2 pkgs.icu pkgs.lzma pkgs.pcre ];
RcppOctave = [ pkgs.zlib pkgs.bzip2 pkgs.icu pkgs.lzma pkgs.pcre pkgs.octave ];
rJava = [ pkgs.zlib pkgs.bzip2 pkgs.icu pkgs.lzma pkgs.pcre pkgs.jdk pkgs.libzip ];
R2SWF = [ pkgs.zlib pkgs.libpng pkgs.freetype ];
sysfonts = [ pkgs.zlib pkgs.libpng pkgs.freetype ];
sdcTable = [ pkgs.gmp pkgs.glpk ];
seewave = [ pkgs.fftw pkgs.libsndfile ];
SemiCompRisks = [ pkgs.gsl ];
seqinr = [ pkgs.zlib ];
seqminer = [ pkgs.zlib pkgs.bzip2 ];
showtext = [ pkgs.zlib pkgs.libpng pkgs.icu pkgs.freetype ];
simplexreg = [ pkgs.gsl ];
SOD = [ pkgs.cudatoolkit ]; # requres CL/cl.h
spate = [ pkgs.fftw ];
sprint = [ pkgs.openmpi ];
ssanv = [ pkgs.proj ];
stsm = [ pkgs.gsl ];
survSNP = [ pkgs.gsl ];
sysfonts = [ pkgs.zlib pkgs.libpng pkgs.freetype ];
TAQMNGR = [ pkgs.zlib ];
tiff = [ pkgs.libtiff ];
TKF = [ pkgs.gsl ];
tkrplot = [ pkgs.xlibs.libX11 ];
topicmodels = [ pkgs.gsl ];
udunits2 = [ pkgs.udunits pkgs.expat ];
V8 = [ pkgs.v8 ];
VBLPCM = [ pkgs.gsl ];
VBmix = [ pkgs.gsl pkgs.fftw pkgs.qt4 ];
WhopGenome = [ pkgs.zlib ];
XBRL = [ pkgs.zlib pkgs.libxml2 ];
RMySQL = [ pkgs.zlib pkgs.mysql ];
XML = [ pkgs.libtool pkgs.libxml2 pkgs.xmlsec pkgs.libxslt ];
};
packagesWithBuildInputs = {
@ -847,6 +848,7 @@ let
"RAM" # requires Heatplus
"RAPIDR" # requires Biostrings, Rsamtools, and GenomicRanges
"RbioRXN" # requires fmcsR, and KEGGREST
"RcppAPT" # configure script depends on /bin/sh
"Rcell" # requires EBImage
"RcmdrPlugin_seeg" # requires seeg
"Rcplex" # requires cplexAPI

4
pkgs/development/tools/selenium/chromedriver/default.nix
View File

@ -10,8 +10,8 @@ stdenv.mkDerivation rec {
name = "chromedriver_linux64";
src = fetchurl {
url = "http://chromedriver.storage.googleapis.com/2.10/${name}.zip";
sha256 = "1949lhrv4hrmgapvypsgwzyr75w7vpy7nkkkwjkjxn61dkwmx4jw";
url = "http://chromedriver.storage.googleapis.com/2.14/${name}.zip";
sha256 = "18kpky1v5pc3fv6kv9i2mf4wr4qicmfhf27h9zqy18gh16rlwrin";
};
buildInputs = [ unzip makeWrapper ];

5
pkgs/misc/cups/drivers/samsung/default.nix
View File

@ -27,9 +27,10 @@ stdenv.mkDerivation rec {
builder = ./builder.sh;
meta = {
meta = with stdenv.lib; {
description = "Samsung's Linux drivers; includes binaries without source code";
homepage = "http://www.samsung.com/";
license = "samsung"; # Binary-only
license = licenses.unfree;
platforms = platforms.linux;
};
}

3
pkgs/os-specific/linux/kernel/common-config.nix
View File

@ -269,9 +269,6 @@ with stdenv.lib;
SLIP_COMPRESSED y # CSLIP compressed headers
SLIP_SMART y
THERMAL_HWMON y # Hardware monitoring support
${optionalString (versionAtLeast version "3.15") ''
UEVENT_HELPER n
''}
USB_DEBUG? n
USB_EHCI_ROOT_HUB_TT y # Root Hub Transaction Translators
USB_EHCI_TT_NEWSCHED y # Improved transaction translator scheduling

8
pkgs/os-specific/linux/kernel/linux-rpi-3.6.nix → pkgs/os-specific/linux/kernel/linux-rpi.nix
View File

@ -2,15 +2,17 @@
let
rev = "7849605f5a";
rev = "fe4a83540ec73dfc298f16f027277355470ea9a0";
in import ./generic.nix (args // rec {
version = "3.6.y-${rev}";
version = "3.18.y-${rev}";
modDirVersion = "3.18.7-v7";
src = fetchurl {
url = "https://api.github.com/repos/raspberrypi/linux/tarball/${rev}";
name = "linux-raspberrypi-${version}.tar.gz";
sha256 = "1diwc5p6az6ipcldwmkq7hb5f15nvdgwzmypixc2vmzmc4ylarxl";
sha256 = "05gq40f038hxjqd3sdb1914g2bzw533dyxy59sgdpybs8801x2vb";
};
features.iwlwifi = true;

11
pkgs/os-specific/linux/kernel/manual-config.nix
View File

@ -118,9 +118,12 @@ let
# Some image types need special install targets (e.g. uImage is installed with make uinstall)
installTargets = [ (if platform.kernelTarget == "uImage" then "uinstall" else "install") ];
postInstall = optionalString installsFirmware ''
postInstall = (optionalString installsFirmware ''
mkdir -p $out/lib/firmware
'' + (if isModular then ''
'') + (if (platform ? kernelDTB && platform.kernelDTB) then ''
make $makeFlags "''${makeFlagsArray[@]}" dtbs
cp $buildRoot/arch/$karch/boot/dts/*dtb $out
'' else "") + (if isModular then ''
make modules_install $makeFlags "''${makeFlagsArray[@]}" \
$installFlags "''${installFlagsArray[@]}"
unlink $out/lib/modules/${modDirVersion}/build
@ -222,6 +225,8 @@ stdenv.mkDerivation ((drvAttrs config stdenv.platform (kernelPatches ++ nativeKe
"ARCH=${stdenv.platform.kernelArch}"
];
karch = stdenv.platform.kernelArch;
crossAttrs = let cp = stdenv.cross.platform; in
(drvAttrs crossConfig cp (kernelPatches ++ crossKernelPatches) crossConfigfile) // {
makeFlags = commonMakeFlags ++ [
@ -229,6 +234,8 @@ stdenv.mkDerivation ((drvAttrs config stdenv.platform (kernelPatches ++ nativeKe
"CROSS_COMPILE=$(crossConfig)-"
];
karch = cp.kernelArch;
# !!! uboot has messed up cross-compiling, nativeDrv builds arm tools on x86,
# crossDrv builds x86 tools on x86 (but arm uboot). If this is fixed, uboot
# can just go into buildInputs (but not nativeBuildInputs since cp.uboot

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

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "pax-utils-${version}";
version = "1.0";
version = "1.0.1";
src = fetchurl {
url = "http://dev.gentoo.org/~vapier/dist/${name}.tar.xz";
sha256 = "04p356j46symayh2d14i51xv9qic3iz9gnc7fr906skw3hccr7y3";
sha256 = "0v14dvkg19yabh0ijy8fbrvapxvc36dwhvp90py3baq7qb44wrc7";
};
makeFlags = [

4
pkgs/servers/samba/4.x.nix
View File

@ -90,7 +90,7 @@ stdenv.mkDerivation rec {
"--localstatedir=/var"
# buildtools/wafsamba/wscript options
"--bundled-libraries=${if kerberos.implementation == "heimdal" then "NONE" else "com_err"}"
"--bundled-libraries=${if kerberos != null && kerberos.implementation == "heimdal" then "NONE" else "com_err"}"
"--private-libraries=NONE"
"--builtin-libraries=replace"
] ++ (if libiconv != null then [ "--with-libiconv=${libiconv}" ] else [ ])
@ -101,7 +101,7 @@ stdenv.mkDerivation rec {
then [ "--enable-gnutls" ] else [ "--disable-gnutls" ]) ++ [
# wscript options
] ++ stdenv.lib.optional (kerberos.implementation == "krb5") "--with-system-mitkrb5"
] ++ stdenv.lib.optional (kerberos != null && kerberos.implementation == "krb5") "--with-system-mitkrb5"
++ stdenv.lib.optional (kerberos == null) "--without-ad-dc" ++ [
# ctdb/wscript

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

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "fish-${version}";
version = "2.1.1";
version = "2.1.2";
src = fetchurl {
url = "http://fishshell.com/files/${version}/${name}.tar.gz";
sha256 = "b7e4d3c3d55fc3859edcb20462fcf0d14ab26e920eddcd503072e8105284d924";
sha256 = "1pgnz5lapm4qk48a13k9698jaswybzlbz2nyc621d852ldf0vhn6";
};
buildInputs = [ ncurses libiconv ];

8
pkgs/stdenv/linux/default.nix
View File

@ -288,8 +288,6 @@ rec {
];
overrides = pkgs: {
inherit cc;
gcc = cc;
inherit (stage4.pkgs)
@ -298,8 +296,8 @@ rec {
attr acl paxctl zlib pcre;
};
};
testBootstrapTools = let
defaultPkgs = allPackages { inherit system platform; };
in derivation {
@ -310,7 +308,7 @@ rec {
buildCommand = ''
export PATH=${bootstrapTools}/bin
ls -l
mkdir $out
mkdir $out/bin

29
pkgs/tools/admin/nxproxy/default.nix Normal file
View File

@ -0,0 +1,29 @@
{ stdenv, fetchgit, autoconf, libxcomp }:
let version = "3.5.0-2015-02-18"; in
stdenv.mkDerivation {
name = "nxproxy-${version}";
src = fetchgit {
url = git://code.x2go.org/nx-libs.git;
rev = "2b2a02f93f552a38de8f72a971fa3f3ff42b3298";
sha256 = "11n7dv1cn9icjgyxmsbac115vmbaar47cmp8k76vd516f2x41dw9";
};
meta = with stdenv.lib; {
description = "NX compression proxy";
homepage = "http://code.x2go.org/gitweb?p=nx-libs.git;a=summary";
license = with licenses; gpl2;
platforms = with platforms; linux;
maintainers = with maintainers; [ nckx ];
};
buildInputs = [ autoconf libxcomp ];
preConfigure = ''
cd nxproxy/
autoconf
'';
installTargets = [ "install.bin" ];
}

2
pkgs/tools/inputmethods/uim/default.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, intltool, pkgconfig, qt4, gtk2, gtk3, kdelibs, cmake, anthy, ... }:
{stdenv, fetchurl, intltool, pkgconfig, qt4, gtk2, gtk3, kdelibs, cmake, anthy}:
stdenv.mkDerivation rec {
version = "1.8.6";

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

@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, udev }:
stdenv.mkDerivation rec {
name = "dhcpcd-6.6.6";
name = "dhcpcd-6.6.7";
src = fetchurl {
url = "mirror://roy/dhcpcd/${name}.tar.bz2";
sha256 = "0893gixhz68ngqa1vcshmvkwy58kmlj3f1qvd877sgrir06bpg96";
sha256 = "1aydp26xsn9y6acg5zmcz6pp6parywnmhcvp9ipf54vbac53mya3";
};
patches = [ /* ./lxc_ro_promote_secondaries.patch */ ];

6
pkgs/tools/package-management/disnix/DisnixWebService/default.nix
View File

@ -1,10 +1,10 @@
{stdenv, fetchurl, apacheAnt, jdk, axis2, dbus_java}:
stdenv.mkDerivation {
name = "DisnixWebService-0.2";
name = "DisnixWebService-0.3";
src = fetchurl {
url = http://hydra.nixos.org/build/20103911/download/4/DisnixWebService-0.2.tar.bz2;
sha256 = "0sxyv93lc9zp8sk37dmpik1vchi5qa5djd5k90xg0n6920dl4snw";
url = http://hydra.nixos.org/build/20173679/download/4/DisnixWebService-0.3.tar.bz2;
sha256 = "0gm8a4ijhydlij9byz2jvb925xzg8a7wbr9cnlf3b7r7zibi0sfy";
};
buildInputs = [ apacheAnt jdk ];
PREFIX = ''''${env.out}'';

6
pkgs/tools/package-management/disnix/default.nix
View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, dbus_glib, libxml2, libxslt, getopt, nixUnstable, dysnomia, libintlOrEmpty, libiconv }:
stdenv.mkDerivation {
name = "disnix-0.3pre9d3acde83aa4283cb6fc26874c524a98f39a5bc6";
name = "disnix-0.3precd3288b47c8e7205268d6afb066e21b9d114f797";
src = fetchurl {
url = http://hydra.nixos.org/build/20103891/download/4/disnix-0.3pre9d3acde83aa4283cb6fc26874c524a98f39a5bc6.tar.gz;
sha256 = "04ryf4qlw5jv0xjn6pqy5lkxqlynycsgdjin3ivfhq3pm6i0v65l";
url = http://hydra.nixos.org/build/20137290/download/4/disnix-0.3precd3288b47c8e7205268d6afb066e21b9d114f797.tar.gz;
sha256 = "1n1m4kr9xp60kkrcx92npc6hh3gi36njzxmds7nw9mz0pccqbci1";
};
buildInputs = [ pkgconfig dbus_glib libxml2 libxslt getopt nixUnstable libintlOrEmpty libiconv dysnomia ];

6
pkgs/tools/package-management/disnix/disnixos/default.nix
View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl, disnix, socat, pkgconfig, getopt }:
stdenv.mkDerivation {
name = "disnixos-0.2pre7bbac66b0ed3b637c6ebcfdd8f12055cc330093c";
name = "disnixos-0.2preead7dea88dedeb844450afc1f78bb58bd16ac909";
src = fetchurl {
url = http://hydra.nixos.org/build/20062333/download/3/disnixos-0.2pre7bbac66b0ed3b637c6ebcfdd8f12055cc330093c.tar.gz;
sha256 = "0d5ql8n93l8xa949cwk7v55lpfcp8j0x8wigqwfh6gim5f21niyb";
url = http://hydra.nixos.org/build/20173386/download/3/disnixos-0.2preead7dea88dedeb844450afc1f78bb58bd16ac909.tar.gz;
sha256 = "08bkr9lpbfkz0irp4x4v2rgpn6jmm1i6vb29sbnrjdv755yh8q81";
};
buildInputs = [ socat pkgconfig disnix getopt ];

26
pkgs/tools/package-management/disnix/dysnomia/default.nix
View File

@ -9,6 +9,7 @@
, enableTomcatWebApplication ? false
, enableMongoDatabase ? false
, catalinaBaseDir ? "/var/tomcat"
, jobTemplate ? "systemd"
, getopt
}:
@ -19,24 +20,25 @@ assert enableEjabberdDump -> ejabberd != null;
assert enableMongoDatabase -> mongodb != null;
stdenv.mkDerivation {
name = "dysnomia-0.3pre92a89d735776366633fdea301fdc6dc537009bba";
name = "dysnomia-0.3pre87657a43630ffcb9396261d3874b8fd1a89f4c9f";
src = fetchurl {
url = http://hydra.nixos.org/build/20062629/download/1/dysnomia-0.3pre92a89d735776366633fdea301fdc6dc537009bba.tar.gz;
url = http://hydra.nixos.org/build/20131278/download/1/dysnomia-0.3pre87657a43630ffcb9396261d3874b8fd1a89f4c9f.tar.gz;
sha256 = "0dv7ivph2v5j4g5fqdrllxyzmp1hwnsd22n1s61qpkzb6qxaywjj";
};
preConfigure = if enableEjabberdDump then "export PATH=$PATH:${ejabberd}/sbin" else "";
configureFlags = ''
${if enableApacheWebApplication then "--with-apache" else "--without-apache"}
${if enableAxis2WebService then "--with-axis2" else "--without-axis2"}
${if enableEjabberdDump then "--with-ejabberd" else "--without-ejabberd"}
${if enableMySQLDatabase then "--with-mysql" else "--without-mysql"}
${if enablePostgreSQLDatabase then "--with-postgresql" else "--without-postgresql"}
${if enableSubversionRepository then "--with-subversion" else "--without-subversion"}
${if enableTomcatWebApplication then "--with-tomcat=${catalinaBaseDir}" else "--without-tomcat"}
${if enableMongoDatabase then "--with-mongodb" else "--without-mongodb"}
'';
configureFlags = [
(if enableApacheWebApplication then "--with-apache" else "--without-apache")
(if enableAxis2WebService then "--with-axis2" else "--without-axis2")
(if enableEjabberdDump then "--with-ejabberd" else "--without-ejabberd")
(if enableMySQLDatabase then "--with-mysql" else "--without-mysql")
(if enablePostgreSQLDatabase then "--with-postgresql" else "--without-postgresql")
(if enableSubversionRepository then "--with-subversion" else "--without-subversion")
(if enableTomcatWebApplication then "--with-tomcat=${catalinaBaseDir}" else "--without-tomcat")
(if enableMongoDatabase then "--with-mongodb" else "--without-mongodb")
"--with-job-template=${jobTemplate}"
];
buildInputs = [ getopt ]
++ stdenv.lib.optional enableEjabberdDump ejabberd

4
pkgs/tools/security/gnupg/1.nix
View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl, readline, bzip2 }:
stdenv.mkDerivation rec {
name = "gnupg-1.4.18";
name = "gnupg-1.4.19";
src = fetchurl {
url = "mirror://gnupg/gnupg/${name}.tar.bz2";
sha256 = "1233bppjvdpbbl425ii6l7xvgy0879ghhnmwrph5b6c4g3dgvddp";
sha256 = "7f09319d044b0f6ee71fe3587bb873be701723ac0952cff5069046a78de8fd86";
};
buildInputs = [ readline bzip2 ];

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

@ -1782,6 +1782,8 @@ let
libibverbs = callPackage ../development/libraries/libibverbs { };
libxcomp = callPackage ../development/libraries/libxcomp { };
librdmacm = callPackage ../development/libraries/librdmacm { };
limesurvey = callPackage ../servers/limesurvey { };
@ -2088,6 +2090,8 @@ let
nylon = callPackage ../tools/networking/nylon { };
nxproxy = callPackage ../tools/admin/nxproxy { };
nzbget = callPackage ../tools/networking/nzbget { };
oathToolkit = callPackage ../tools/security/oath-toolkit { };
@ -7063,7 +7067,7 @@ let
poker-eval = callPackage ../development/libraries/poker-eval { };
polkit = callPackage ../development/libraries/polkit {
spidermonkey = spidermonkey_185;
spidermonkey = spidermonkey_17;
};
polkit_qt4 = callPackage ../development/libraries/polkit-qt-1 {
@ -8764,7 +8768,7 @@ let
];
};
linux_3_6_rpi = makeOverridable (import ../os-specific/linux/kernel/linux-rpi-3.6.nix) {
linux_rpi = makeOverridable (import ../os-specific/linux/kernel/linux-rpi.nix) {
inherit fetchurl stdenv perl buildLinux;
kernelPatches = [ kernelPatches.bridge_stp_helper ];
};
@ -8984,7 +8988,7 @@ let
# Build the kernel modules for the some of the kernels.
linuxPackages_3_2 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_2 linuxPackages_3_2);
linuxPackages_3_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_4 linuxPackages_3_4);
linuxPackages_3_6_rpi = linuxPackagesFor pkgs.linux_3_6_rpi linuxPackages_3_6_rpi;
linuxPackages_rpi = linuxPackagesFor pkgs.linux_rpi linuxPackages_rpi;
linuxPackages_3_10 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_10 linuxPackages_3_10);
linuxPackages_3_10_tuxonice = linuxPackagesFor pkgs.linux_3_10_tuxonice linuxPackages_3_10_tuxonice;
linuxPackages_3_12 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_12 linuxPackages_3_12);
@ -9999,6 +10003,9 @@ let
elvis = callPackage ../applications/editors/elvis { };
emacs = emacs24;
emacsPackages = emacs24Packages;
emacsPackagesNg = emacs24PackagesNg;
emacsMelpa = emacs24PackagesNg; # for backward compatibility
emacs24 = callPackage ../applications/editors/emacs-24 {
# use override to enable additional features
@ -10021,14 +10028,7 @@ let
});
emacs24Macport = self.emacs24Macport_24_4;
emacsMelpa = import ./emacs-melpa-packages.nix {
inherit stdenv pkgs fetchurl fetchgit fetchFromGitHub emacs texinfo;
external = {
inherit (haskellngPackages) ghc-mod structured-haskell-mode;
};
};
emacsPackages = emacs: self: let callPackage = newScope self; in rec {
emacsPackagesGen = emacs: self: let callPackage = newScope self; in rec {
inherit emacs;
autoComplete = callPackage ../applications/editors/emacs-modes/auto-complete { };
@ -10183,7 +10183,27 @@ let
cask = callPackage ../applications/editors/emacs-modes/cask { };
};
emacs24Packages = recurseIntoAttrs (emacsPackages emacs24 pkgs.emacs24Packages);
emacs24Packages = recurseIntoAttrs (emacsPackagesGen emacs24 pkgs.emacs24Packages);
emacsPackagesNgGen = emacs: import ./emacs-packages.nix {
overrides = (config.emacsPackageOverrides or (p: {})) pkgs;
inherit lib stdenv fetchurl fetchgit fetchFromGitHub emacs;
trivialBuild = import ../build-support/emacs/trivial.nix {
inherit lib stdenv emacs texinfo;
};
melpaBuild = import ../build-support/emacs/melpa.nix {
inherit lib stdenv fetchurl emacs texinfo;
};
external = {
inherit (haskellngPackages) ghc-mod structured-haskell-mode Agda;
};
};
emacs24PackagesNg = emacsPackagesNgGen emacs24;
inherit (gnome3) empathy;
@ -11367,6 +11387,8 @@ let
boost = boost155;
};
scim = callPackage ../applications/misc/scim { };
scite = callPackage ../applications/editors/scite { };
scribus = callPackage ../applications/office/scribus {
@ -11451,11 +11473,14 @@ let
printrun = callPackage ../applications/misc/printrun { };
sddm = callPackage ../applications/display-managers/sddm {
qt5 = qt54;
};
slim = callPackage ../applications/display-managers/slim {
libpng = libpng12;
};
smartgithg = callPackage ../applications/version-management/smartgithg { };
slimThemes = recurseIntoAttrs (import ../applications/display-managers/slim/themes.nix {
@ -11989,6 +12014,8 @@ let
x11vnc = callPackage ../tools/X11/x11vnc { };
x2goclient = callPackage ../applications/networking/remote/x2goclient { };
x2vnc = callPackage ../tools/X11/x2vnc { };
xaos = builderDefsPackage (import ../applications/graphics/xaos) {

244
pkgs/top-level/emacs-melpa-packages.nix → pkgs/top-level/emacs-packages.nix
View File

@ -1,27 +1,37 @@
{ pkgs, stdenv, fetchurl, fetchFromGitHub, fetchgit
, emacs, texinfo
# non-emacs packages
, external
}:
# package.el-based emacs packages
## init.el
#
## add this at the start your init.el:
# (require 'package)
# (setq package-archives nil
# package-user-dir "~/.nix-profile/share/emacs/site-lisp/elpa")
#
# ;; optional. makes unpure packages archives unavailable
# (setq package-archives nil)
#
# (add-to-list 'package-directory-list "/run/current-system/sw/share/emacs/site-lisp/elpa")
#
# ;; optional. use this if you install emacs packages to user profiles (with nix-env)
# (add-to-list 'package-directory-list "~/.nix-profile/share/emacs/site-lisp/elpa")
#
# (package-initialize)
with stdenv.lib.licences;
{ overrides
let
melpaBuild = import ../build-support/melpa {
inherit stdenv fetchurl emacs texinfo;
};
in
, lib, stdenv, fetchurl, fetchgit, fetchFromGitHub
, emacs
, trivialBuild
, melpaBuild
, external
}@args:
with lib.licences;
let self = _self // overrides;
callPackage = lib.callPackageWith (self // removeAttrs args ["overrides" "external"]);
_self = with self; {
## START HERE
rec {
ac-haskell-process = melpaBuild rec {
pname = "ac-haskell-process";
version = "0.5";
@ -44,7 +54,10 @@ rec {
rev = "8351e2df4fbbeb2a4003f2fb39f46d33803f3dac";
sha256 = "17axrgd99glnl6ma4ls3k01ysdqmiqr581wnrbsn3s4gp53mm2x6";
};
meta = { licence = gpl3Plus; };
meta = {
description = "Advanced cursor movements mode for Emacs";
licence = gpl3Plus;
};
};
ag = melpaBuild rec {
@ -60,6 +73,73 @@ rec {
meta = { licence = gpl3Plus; };
};
agda2-mode = with external; trivialBuild {
pname = "agda-mode";
version = Agda.version;
phases = [ "buildPhase" "installPhase" ];
# already byte-compiled by Agda builder
buildPhase = ''
agda=`${Agda}/bin/agda-mode locate`
cp `dirname $agda`/*.el* .
'';
meta = {
description = "Agda2-mode for Emacs extracted from Agda package";
longDescription = ''
Wrapper packages that liberates init.el from `agda-mode locate` magic.
Simply add this to user profile or systemPackages and do `(require 'agda2)` in init.el.
'';
homepage = Agda.meta.homepage;
license = Agda.meta.license;
};
};
anzu = melpaBuild rec {
pname = "anzu";
version = "0.52";
src = fetchFromGitHub {
owner = "syohex";
repo = "emacs-anzu";
rev = "f41db6225d8fb983324765aa42c94d3ee379a49f";
sha256 = "1mn20swasrl8kr557r1850vr1q0gcnwlxxafnc6lq5g01kjfcdxd";
};
meta = {
description = "Show number of matches in Emacs mode-line while searching";
longDescription = ''
anzu.el is an Emacs port of anzu.vim. anzu.el provides a minor
mode which displays current match and total matches information
in the mode-line in various search mode.
'';
homepage = https://github.com/syohex/emacs-anzu/;
license = gpl3Plus;
};
};
apel = melpaBuild rec {
pname = "apel";
version = "10.8";
src = fetchFromGitHub {
owner = "wanderlust";
repo = pname;
rev = "8402e59eadb580f59969114557b331b4d9364f95";
sha256 = "0sdxnf4b8rqs1cbjxh23wvxmj7ll3zddv8yfdgif6zmgyy8xhc9m";
};
files = [
"alist.el" "apel-ver.el" "broken.el" "calist.el"
"emu.el" "filename.el" "install.el" "inv-23.el" "invisible.el"
"mcharset.el" "mcs-20.el" "mcs-e20.el" "mule-caesar.el"
"path-util.el" "pccl-20.el" "pccl.el" "pces-20.el" "pces-e20.el"
"pces.el" "pcustom.el" "poe.el" "poem-e20.el" "poem-e20_3.el"
"poem.el" "product.el" "pym.el" "richtext.el" "static.el"
];
meta = {
description = "A Portable Emacs Library";
license = gpl3Plus; # probably
};
};
async = melpaBuild rec {
pname = "async";
version = "1.2";
@ -95,12 +175,11 @@ rec {
sha256 = "050lb8qjq7ra35mqp6j6qkwbvq5zj3yhz73aym5kf1vjd42rmjcw";
};
packageRequires = [ popup ];
meta = {
description = "Auto-complete extension for Emacs";
homepage = http://cx4a.org/software/auto-complete/;
license = gpl3Plus;
platforms = stdenv.lib.platforms.all;
platforms = lib.platforms.all;
};
};
@ -117,6 +196,22 @@ rec {
meta = { licence = gpl3Plus; };
};
browse-kill-ring = melpaBuild rec {
pname = "browse-kill-ring";
version = "20140104";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "f81ca5f14479fa9e938f89bf8f6baa3c4bdfb755";
sha256 = "149g4qs5dqy6yzdj5smb39id5f72bz64qfv5bjf3ssvhwl2rfba8";
};
meta = {
description = "Interactively insert items from Emacs kill-ring";
homepage = https://github.com/browse-kill-ring/browse-kill-ring/;
license = gpl2Plus;
};
};
change-inner = melpaBuild rec {
pname = "change-inner";
version = "20130208";
@ -215,7 +310,10 @@ rec {
sha256 = "0wrmlmgr4mwxlmmh8blplddri2lpk4g8k3l1vpb5c6a975420qvn";
};
packageRequires = [ evil ];
meta = { licence = gpl3Plus; };
meta = {
description = "surround.vim emulation for Emacs evil mode";
licence = gpl3Plus;
};
};
evil = melpaBuild {
@ -227,7 +325,10 @@ rec {
sha256 = "0yiqpzsm5sr7xdkixdvfg312dk9vsdcmj69gizk744d334yn8rsz";
};
packageRequires = [ goto-chg undo-tree ];
meta = { licence = gpl3Plus; };
meta = {
description = "Extensible vi layer for Emacs";
licence = gpl3Plus;
};
};
exec-path-from-shell = melpaBuild rec {
@ -251,7 +352,26 @@ rec {
rev = "fa413e07c97997d950c92d6012f5442b5c3cee78";
sha256 = "04k0518wfy72wpzsswmncnhd372fxa0r8nbfhmbyfmns8n7sr045";
};
meta = { licence = gpl3Plus; };
meta = {
description = "Increases the selected region by semantic units in Emacs";
licence = gpl3Plus;
};
};
flim = melpaBuild rec {
pname = "flim";
version = "1.14.9"; # 20141216
src = fetchFromGitHub {
owner = "wanderlust";
repo = pname;
rev = "488a4d70fb4ae57bdd30dc75c2d75579894e28a2";
sha256 = "178fhpbyffksr4v3m8jmx4rx2vqyz23qhbyvic5afabxi6lahjfs";
};
packageRequires = [ apel ];
meta = {
description = "Email message encoding library for Emacs";
license = gpl3Plus; # probably
};
};
flycheck-pos-tip = melpaBuild rec {
@ -442,6 +562,22 @@ rec {
meta = { licence = gpl3Plus; };
};
ido-ubiquitous = melpaBuild rec {
pname = "ido-ubiquitous";
version = "2.17";
src = fetchFromGitHub {
owner = "DarwinAwardWinner";
repo = pname;
rev = "323e4cddc05d5a4546c1b64132b2b1e9f8896452";
sha256 = "0wdjz3cqzrxhrk68g5gyvc9j2rb6f4yw00xbjgw9ldwlhmkwy5ja";
};
meta = {
description = "Does what you expected ido-everywhere to do in Emacs";
homepage = https://github.com/DarwinAwardWinner/ido-ubiquitous/;
license = gpl3Plus;
};
};
idris-mode = melpaBuild rec {
pname = "idris-mode";
version = "0.9.15";
@ -507,6 +643,8 @@ rec {
meta = { licence = gpl3Plus; };
};
nyan-mode = callPackage ../applications/editors/emacs-modes/nyan-mode {};
org-plus-contrib = melpaBuild rec {
pname = "org-plus-contrib";
version = "20141020";
@ -583,6 +721,22 @@ rec {
meta = { licence = gpl3Plus; };
};
semi = melpaBuild rec {
pname = "semi";
version = "1.14.7"; # 20150203
src = fetchFromGitHub {
owner = "wanderlust";
repo = pname;
rev = "9976269556c5bcc021e4edf1b0e1accd39929528";
sha256 = "1g1xg57pz4msd3f998af5gq28qhmvi410faygzspra6y6ygaka68";
};
packageRequires = [ apel flim ];
meta = {
description = "MIME library for Emacs";
license = gpl3Plus; # probably
};
};
shorten = melpaBuild rec {
pname = "shorten";
version = "1.5";
@ -622,6 +776,22 @@ rec {
meta = { licence = gpl3Plus; };
};
smex = melpaBuild rec {
pname = "smex";
version = "20141210";
src = fetchFromGitHub {
owner = "nonsequitur";
repo = pname;
rev = "aff8d4485139ac28f1c7e62912c0d0d480995831";
sha256 = "0017f1ji7rxad2n49dhn5g0pmw6lmw80cqk6dynszizj46xpbqfp";
};
meta = {
description = "M-x enhancement for Emacs build on top of Ido";
homepage = https://github.com/nonsequitur/smex/;
license = emacs.meta.license; # should be "same as Emacs"
};
};
structured-haskell-mode = melpaBuild rec {
pname = "shm";
version = external.structured-haskell-mode.version;
@ -700,6 +870,27 @@ rec {
meta = { licence = gpl3Plus; };
};
wanderlust = melpaBuild rec {
pname = "wanderlust";
version = "2.15.9"; # 20150301
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "13fb4f6519490d4ac7138f3bcf76707654348071";
sha256 = "1l48xfcwkm205prspa1rns6lqfizik5gpdwmlfgyb5mabm9x53zn";
};
packageRequires = [ apel flim semi ];
fileSpecs = [
"doc/wl.texi" "doc/wl-ja.texi"
"elmo/*.el" "wl/*.el"
"etc/icons"
];
meta = {
description = "E-Mail client for Emacs";
license = gpl3Plus; # probably
};
};
weechat = melpaBuild rec {
pname = "weechat.el";
version = "20141016";
@ -709,7 +900,7 @@ rec {
rev = "4cb2ced1eda5167ce774e04657d2cd077b63c706";
sha256 = "003sihp7irm0qqba778dx0gf8xhkxd1xk7ig5kgkryvl2jyirk28";
};
postPatch = stdenv.lib.optionalString (!stdenv.isLinux) ''
postPatch = lib.optionalString (!stdenv.isLinux) ''
rm weechat-sauron.el weechat-secrets.el
'';
packageRequires = [ s ];
@ -727,4 +918,5 @@ rec {
};
meta = { licence = gpl3Plus; };
};
}
}; in self

2
pkgs/top-level/make-tarball.nix
View File

@ -50,7 +50,7 @@ releaseTools.sourceTarball rec {
fi
# Check that all-packages.nix evaluates on a number of platforms.
for platform in i686-linux x86_64-linux x86_64-darwin i686-freebsd x86_64-freebsd; do
for platform in i686-linux x86_64-linux x86_64-darwin; do
header "checking pkgs/top-level/all-packages.nix on $platform"
NIXPKGS_ALLOW_BROKEN=1 nix-env -f pkgs/top-level/all-packages.nix \
--show-trace --argstr system "$platform" \

92
pkgs/top-level/platforms.nix
View File

@ -212,6 +212,98 @@ rec {
};
};
raspberrypi2 = {
name = "raspberrypi2";
kernelMajor = "3.14";
kernelHeadersBaseConfig = "kirkwood_defconfig";
kernelBaseConfig = "bcm2709_defconfig";
kernelArch = "arm";
kernelDTB = true;
kernelAutoModules = false;
kernelExtraConfig =
''
BLK_DEV_RAM y
BLK_DEV_INITRD y
BLK_DEV_CRYPTOLOOP m
BLK_DEV_DM m
DM_CRYPT m
MD y
REISERFS_FS m
BTRFS_FS y
XFS_FS m
JFS_FS y
EXT4_FS y
IP_PNP y
IP_PNP_DHCP y
NFS_FS y
ROOT_NFS y
TUN m
NFS_V4 y
NFS_V4_1 y
NFS_FSCACHE y
NFSD m
NFSD_V2_ACL y
NFSD_V3 y
NFSD_V3_ACL y
NFSD_V4 y
NETFILTER y
IP_NF_IPTABLES y
IP_NF_FILTER y
IP_NF_MATCH_ADDRTYPE y
IP_NF_TARGET_LOG y
IP_NF_MANGLE y
IPV6 m
VLAN_8021Q m
CIFS y
CIFS_XATTR y
CIFS_POSIX y
CIFS_FSCACHE y
CIFS_ACL y
ZRAM m
# Fail to build
DRM n
SCSI_ADVANSYS n
USB_ISP1362_HCD n
SND_SOC n
SND_ALI5451 n
FB_SAVAGE n
SCSI_NSP32 n
ATA_SFF n
SUNGEM n
IRDA n
ATM_HE n
SCSI_ACARD n
BLK_DEV_CMD640_ENHANCED n
FUSE_FS m
# nixos mounts some cgroup
CGROUPS y
# Latencytop
LATENCYTOP y
# Disable the common config Xen, it doesn't build on ARM
XEN? n
'';
kernelTarget = "zImage";
uboot = null;
gcc = {
# For gcc 4.8, the best for rpi2 would be:
# cpu = "cortex-a7";
# fpu = "neon-vfpv4";
# But we prefer compatibility with the beaglebone, so both
# can run the same built store paths.
arch = "armv7-a";
fpu = "vfpv3-d16";
float = "hard";
};
};
guruplug = sheevaplug // {
# Define `CONFIG_MACH_GURUPLUG' (see
# <http://kerneltrap.org/mailarchive/git-commits-head/2010/5/19/33618>)

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

@ -7444,10 +7444,10 @@ let
pgcli = buildPythonPackage rec {
name = "pgcli-${version}";
version = "0.16.0";
version = "0.16.1";
src = pkgs.fetchFromGitHub {
sha256 = "05xqv3z47xk8v4pbhkavbw49wxq4i3zg49v4g074spqgvcs4jy1n";
sha256 = "1sysx67inf0fcfa4qhqcii97y59zpg98f4kcvz15rlbnsi357css";
rev = "v${version}";
repo = "pgcli";
owner = "amjith";
@ -13394,12 +13394,12 @@ let
};
};
pythonefl_1_12 = buildPythonPackage rec {
pythonefl_1_13 = buildPythonPackage rec {
name = "python-efl-${version}";
version = "1.12.0";
version = "1.13.0";
src = pkgs.fetchurl {
url = "http://download.enlightenment.org/rel/bindings/python/${name}.tar.gz";
sha256 = "0rxv5nrqg5c2l93ns2k6gjil1y7qq6amfh5slkarm3kv8fzk17xv";
url = "http://download.enlightenment.org/rel/bindings/python/${name}.tar.bz2";
sha256 = "0yy4v0f04dgdz21wd2c09x9w6lzsbq6g12s8895laln44l5aqd82";
};
preConfigure = ''
export NIX_CFLAGS_COMPILE="-I${pkgs.e19.efl}/include/eo-1 -I${pkgs.e19.efl}/include/eina-1 -I${pkgs.e19.efl}/include/eina-1/eina -I${pkgs.e19.efl}/include/evas-1 -I${self.dbus}/include/dbus-1.0 -I${pkgs.e19.efl}/include/efl-1 -I${pkgs.e19.efl}/include/eet-1 -I${pkgs.e19.efl}/include/ecore-1 -I${pkgs.e19.efl}/include/ecore-evas-1 -I${pkgs.e19.efl}/include/ecore-file-1 -I${pkgs.e19.efl}/include/ecore-input-1 -I${pkgs.e19.efl}/include/ecore-imf-1 -I${pkgs.e19.efl}/include/ecore-con-1 -I${pkgs.e19.efl}/include/edje-1 -I${pkgs.e19.efl}/include/eldbus-1 -I${pkgs.e19.efl}/include/efreet-1 -I${pkgs.e19.efl}/include/ethumb-client-1 -I${pkgs.e19.efl}/include/ethumb-1 -I${pkgs.e19.efl}/include/ecore-x-1 $NIX_CFLAGS_COMPILE"
@ -13408,7 +13408,7 @@ let
meta = {
description = "Python bindings for EFL and Elementary.";
homepage = http://enlightenment.org/;
maintainers = [ stdenv.lib.maintainers.matejc ];
maintainers = [ stdenv.lib.maintainers.matejc stdenv.lib.maintainers.tstrobel ];
platforms = stdenv.lib.platforms.linux;
license = stdenv.lib.licenses.gpl3;
};