mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-01 23:22:37 +00:00
Merge branch 'master.upstream' into staging.upstream
This commit is contained in:
William A. Kennington III
commit
bd5f2c9638
@ -217,7 +217,7 @@ in
|
||||
system.boot.loader.kernelFile = "bzImage";
|
||||
environment.systemPackages = [ pkgs.grub2 pkgs.grub2_efi pkgs.syslinux ];
|
||||
|
||||
boot.consoleLogLevel = 7;
|
||||
boot.consoleLogLevel = mkDefault 7;
|
||||
|
||||
# In stage 1 of the boot, mount the CD as the root FS by label so
|
||||
# that we don't need to know its device. We pass the label of the
|
||||
|
||||
@ -420,6 +420,16 @@ in
|
||||
'';
|
||||
};
|
||||
|
||||
networking.firewall.extraPackages = mkOption {
|
||||
default = [ ];
|
||||
example = [ pkgs.ipset ];
|
||||
description =
|
||||
''
|
||||
Additional packages to be included in the environment of the system
|
||||
as well as the path of networking.firewall.extraCommands.
|
||||
'';
|
||||
};
|
||||
|
||||
networking.firewall.extraStopCommands = mkOption {
|
||||
type = types.lines;
|
||||
default = "";
|
||||
@ -443,7 +453,7 @@ in
|
||||
|
||||
networking.firewall.trustedInterfaces = [ "lo" ];
|
||||
|
||||
environment.systemPackages = [ pkgs.iptables pkgs.ipset ];
|
||||
environment.systemPackages = [ pkgs.iptables ] ++ cfg.extraPackages;
|
||||
|
||||
boot.kernelModules = map (x: "nf_conntrack_${x}") cfg.connectionTrackingModules;
|
||||
boot.extraModprobeConfig = optionalString (!cfg.autoLoadConntrackHelpers) ''
|
||||
@ -462,7 +472,7 @@ in
|
||||
before = [ "network-pre.target" ];
|
||||
after = [ "systemd-modules-load.service" ];
|
||||
|
||||
path = [ pkgs.iptables pkgs.ipset ];
|
||||
path = [ pkgs.iptables ] ++ cfg.extraPackages;
|
||||
|
||||
# FIXME: this module may also try to load kernel modules, but
|
||||
# containers don't have CAP_SYS_MODULE. So the host system had
|
||||
|
||||
@ -47,6 +47,13 @@ in {
|
||||
type = types.str;
|
||||
};
|
||||
};
|
||||
|
||||
services.redshift.extraOptions = mkOption {
|
||||
type = types.listOf types.str;
|
||||
default = [];
|
||||
example = [ "-v" "-m randr" ];
|
||||
description = "Additional command-line arguments to pass to the redshift(1) command";
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
@ -59,7 +66,8 @@ in {
|
||||
${pkgs.redshift}/bin/redshift \
|
||||
-l ${cfg.latitude}:${cfg.longitude} \
|
||||
-t ${toString cfg.temperature.day}:${toString cfg.temperature.night} \
|
||||
-b ${toString cfg.brightness.day}:${toString cfg.brightness.night}
|
||||
-b ${toString cfg.brightness.day}:${toString cfg.brightness.night} \
|
||||
${cfg.extraOptions}
|
||||
'';
|
||||
environment = { DISPLAY = ":0"; };
|
||||
serviceConfig.Restart = "always";
|
||||
|
||||
@ -3,29 +3,16 @@
|
||||
with lib;
|
||||
|
||||
let
|
||||
|
||||
cfg = config.services.xserver.windowManager.icewm;
|
||||
|
||||
in
|
||||
|
||||
{
|
||||
|
||||
###### interface
|
||||
|
||||
options = {
|
||||
|
||||
services.xserver.windowManager.icewm.enable = mkOption {
|
||||
default = false;
|
||||
description = "Enable the IceWM window manager.";
|
||||
};
|
||||
|
||||
services.xserver.windowManager.icewm.enable = mkEnableOption "oroborus";
|
||||
};
|
||||
|
||||
|
||||
###### implementation
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
|
||||
services.xserver.windowManager.session = singleton
|
||||
{ name = "icewm";
|
||||
start =
|
||||
@ -36,7 +23,5 @@ in
|
||||
};
|
||||
|
||||
environment.systemPackages = [ pkgs.icewm ];
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
25
nixos/modules/services/x11/window-managers/oroborus.nix
Normal file
25
nixos/modules/services/x11/window-managers/oroborus.nix
Normal file
@ -0,0 +1,25 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
cfg = config.services.xserver.windowManager.oroborus;
|
||||
in
|
||||
{
|
||||
###### interface
|
||||
options = {
|
||||
services.xserver.windowManager.oroborus.enable = mkEnableOption "oroborus";
|
||||
};
|
||||
|
||||
###### implementation
|
||||
config = mkIf cfg.enable {
|
||||
services.xserver.windowManager.session = singleton {
|
||||
name = "oroborus";
|
||||
start = ''
|
||||
${pkgs.oroborus}/bin/oroborus &
|
||||
waitPID=$!
|
||||
'';
|
||||
};
|
||||
environment.systemPackages = [ pkgs.oroborus ];
|
||||
};
|
||||
}
|
||||
@ -237,6 +237,7 @@ else {
|
||||
$conf .= "
|
||||
" . $grubStore->search;
|
||||
}
|
||||
# FIXME: should use grub-mkconfig.
|
||||
$conf .= "
|
||||
" . $grubBoot->search . "
|
||||
if [ -s \$prefix/grubenv ]; then
|
||||
@ -245,14 +246,12 @@ else {
|
||||
|
||||
# ‘grub-reboot’ sets a one-time saved entry, which we process here and
|
||||
# then delete.
|
||||
if [ \"\${saved_entry}\" ]; then
|
||||
# The next line *has* to look exactly like this, otherwise KDM's
|
||||
# reboot feature won't work properly with GRUB 2.
|
||||
if [ \"\${next_entry}\" ]; then
|
||||
# FIXME: KDM expects the next line to be present.
|
||||
set default=\"\${saved_entry}\"
|
||||
set saved_entry=
|
||||
set prev_saved_entry=
|
||||
save_env saved_entry
|
||||
save_env prev_saved_entry
|
||||
set default=\"\${next_entry}\"
|
||||
set next_entry=
|
||||
save_env next_entry
|
||||
set timeout=1
|
||||
else
|
||||
set default=$defaultEntry
|
||||
|
||||
@ -1,11 +1,6 @@
|
||||
{ stdenv, fetchurl, pkgconfig, libtool
|
||||
, libcl ? null, perl ? null, jemalloc ? null, bzip2 ? null, zlib ? null
|
||||
, libX11 ? null, libXext ? null, libXt ? null, dejavu_fonts ? null, fftw ? null
|
||||
, libfpx ? null, djvulibre ? null, fontconfig ? null, freetype ? null
|
||||
, ghostscript ? null, graphviz ? null, jbigkit ? null, libjpeg ? null
|
||||
, lcms2 ? null, openjpeg ? null, liblqr1 ? null, xz ? null, openexr ? null
|
||||
, pango ? null, libpng ? null, librsvg ? null, libtiff ? null, libwebp ? null
|
||||
, libxml2 ? null
|
||||
{ lib, stdenv, fetchurl, pkgconfig, libtool
|
||||
, bzip2, zlib, libX11, libXext, libXt, fontconfig, freetype, ghostscript, libjpeg
|
||||
, lcms2, openexr, libpng, librsvg, libtiff, libxml2
|
||||
}:
|
||||
|
||||
let
|
||||
@ -17,15 +12,8 @@ let
|
||||
else if stdenv.system == "x86_64-linux" || stdenv.system == "x86_64-darwin" then "x86-64"
|
||||
else throw "ImageMagick is not supported on this platform.";
|
||||
|
||||
mkFlag = trueStr: falseStr: cond: val: "--${if cond then trueStr else falseStr}-${val}";
|
||||
mkWith = mkFlag "with" "without";
|
||||
mkEnable = mkFlag "enable" "disable";
|
||||
|
||||
hasX11 = libX11 != null && libXext != null && libXt != null;
|
||||
|
||||
in
|
||||
|
||||
with stdenv.lib;
|
||||
stdenv.mkDerivation rec {
|
||||
name = "imagemagick-${version}";
|
||||
|
||||
@ -34,62 +22,26 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "03lvj6rxv16xk0dpsbzvm2gq5bggkwff9wqbpkq0znihzijpax1j";
|
||||
};
|
||||
|
||||
outputs = [ "out" "doc" ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
configureFlags = [
|
||||
(mkEnable (libcl != null) "opencl")
|
||||
(mkWith true "modules")
|
||||
(mkWith true "gcc-arch=${arch}")
|
||||
#(mkEnable true "hdri") This breaks some dependencies
|
||||
(mkWith (perl != null) "perl")
|
||||
(mkWith (jemalloc != null) "jemalloc")
|
||||
(mkWith true "frozenpaths")
|
||||
(mkWith (bzip2 != null) "bzlib")
|
||||
(mkWith hasX11 "x")
|
||||
(mkWith (zlib != null) "zlib")
|
||||
(mkWith false "dps")
|
||||
(mkWith (fftw != null) "fftw")
|
||||
(mkWith (libfpx != null) "fpx")
|
||||
(mkWith (djvulibre != null) "djvu")
|
||||
(mkWith (fontconfig != null) "fontconfig")
|
||||
(mkWith (freetype != null) "freetype")
|
||||
(mkWith (ghostscript != null) "gslib")
|
||||
(mkWith (graphviz != null) "gvc")
|
||||
(mkWith (jbigkit != null) "jbig")
|
||||
(mkWith (libjpeg != null) "jpeg")
|
||||
(mkWith (lcms2 != null) "lcms2")
|
||||
(mkWith false "lcms")
|
||||
(mkWith (openjpeg != null) "openjp2")
|
||||
(mkWith (liblqr1 != null) "lqr")
|
||||
(mkWith (xz != null) "lzma")
|
||||
(mkWith (openexr != null) "openexr")
|
||||
(mkWith (pango != null) "pango")
|
||||
(mkWith (libpng != null) "png")
|
||||
(mkWith (librsvg != null) "rsvg")
|
||||
(mkWith (libtiff != null) "tiff")
|
||||
(mkWith (libwebp != null) "webp")
|
||||
(mkWith (libxml2 != null) "xml")
|
||||
] ++ optional (dejavu_fonts != null) "--with-dejavu-font-dir=${dejavu_fonts}/share/fonts/truetype/"
|
||||
++ optional (ghostscript != null) "--with-gs-font-dir=${ghostscript}/share/ghostscript/fonts/";
|
||||
configureFlags =
|
||||
[ "--with-frozenpaths" ]
|
||||
++ [ "--with-gcc-arch=${arch}" ]
|
||||
++ lib.optional (librsvg != null) "--with-rsvg"
|
||||
++ lib.optionals (ghostscript != null)
|
||||
[ "--with-gs-font-dir=${ghostscript}/share/ghostscript/fonts"
|
||||
"--with-gslib"
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
pkgconfig libtool libcl perl jemalloc bzip2 zlib libX11 libXext libXt fftw
|
||||
libfpx djvulibre fontconfig freetype ghostscript graphviz jbigkit libjpeg
|
||||
lcms2 openjpeg liblqr1 xz openexr pango libpng librsvg libtiff libwebp
|
||||
libxml2
|
||||
];
|
||||
buildInputs =
|
||||
[ pkgconfig libtool zlib fontconfig freetype ghostscript libjpeg
|
||||
openexr libpng librsvg libtiff libxml2
|
||||
];
|
||||
|
||||
propagatedBuildInputs = []
|
||||
++ (stdenv.lib.optional (lcms2 != null) lcms2)
|
||||
++ (stdenv.lib.optional (liblqr1 != null) liblqr1)
|
||||
++ (stdenv.lib.optional (fftw != null) fftw)
|
||||
++ (stdenv.lib.optional (libtool != null) libtool)
|
||||
++ (stdenv.lib.optional (jemalloc != null) jemalloc)
|
||||
++ (stdenv.lib.optional (libXext != null) libXext)
|
||||
++ (stdenv.lib.optional (libX11 != null) libX11)
|
||||
++ (stdenv.lib.optional (libXt != null) libXt)
|
||||
++ (stdenv.lib.optional (bzip2 != null) bzip2)
|
||||
;
|
||||
propagatedBuildInputs =
|
||||
[ bzip2 freetype libjpeg libX11 libXext libXt lcms2 ];
|
||||
|
||||
postInstall = ''(cd "$out/include" && ln -s ImageMagick* ImageMagick)'';
|
||||
|
||||
|
||||
@ -1,22 +1,21 @@
|
||||
{ stdenv, fetchurl, pkgconfig, autoconf, automake, gtk, libpng, exiv2
|
||||
, lcms, intltool, gettext, fbida
|
||||
{ stdenv, fetchurl, pkgconfig, gtk, libpng, exiv2
|
||||
, lcms, intltool, gettext, libchamplain, fbida
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "geeqie-${version}";
|
||||
version = "1.2";
|
||||
version = "1.1"; # Don't upgrade to 1.2; see fee59b1235e658954b207ff6679264654c4708d2.
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://debian/pool/main/g/geeqie/geeqie_${version}.orig.tar.gz";
|
||||
sha256 = "0wkcpyh3f6ig36x1q6h9iqgq225w37visip48m72j8rpghmv1rn3";
|
||||
url = "mirror://sourceforge/geeqie/${name}.tar.gz";
|
||||
sha256 = "1kzy39z9505xkayyx7rjj2wda76xy3ch1s5z35zn8yli54ffhi2m";
|
||||
};
|
||||
|
||||
preConfigure = "./autogen.sh";
|
||||
|
||||
configureFlags = [ "--enable-gps" ];
|
||||
|
||||
buildInputs = [
|
||||
pkgconfig autoconf automake gtk libpng exiv2 lcms intltool gettext
|
||||
pkgconfig gtk libpng exiv2 lcms intltool gettext
|
||||
#libchamplain
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
|
||||
@ -1,18 +1,24 @@
|
||||
{ stdenv, fetchurl, python, pythonPackages, gettext, pygtksourceview, sqlite }:
|
||||
|
||||
with stdenv.lib;
|
||||
stdenv.mkDerivation rec {
|
||||
name = "cherrytree-0.35.8";
|
||||
|
||||
name = "cherrytree-${version}";
|
||||
version = "0.35.9";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.giuspen.com/software/${name}.tar.xz";
|
||||
sha256 = "0vqc1idzd73f4q5f4zwwypj4jiivwnb4y0r3041h2pm08y1wgsd8";
|
||||
sha256 = "14yahp0y13z3xkpwvprm7q9x3rj6jbzi0bryqlsn3bbafdq7wnac";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ pythonPackages.sqlite3 ];
|
||||
propagatedBuildInputs = with pythonPackages;
|
||||
[ sqlite3 ];
|
||||
|
||||
buildInputs = with pythonPackages; [ python gettext wrapPython pygtk dbus pygtksourceview ];
|
||||
buildInputs = with pythonPackages;
|
||||
[ python gettext wrapPython pygtk dbus pygtksourceview ];
|
||||
|
||||
pythonPath = with pythonPackages; [ pygtk dbus pygtksourceview ];
|
||||
pythonPath = with pythonPackages;
|
||||
[ pygtk dbus pygtksourceview ];
|
||||
|
||||
patches = [ ./subprocess.patch ];
|
||||
|
||||
@ -27,10 +33,21 @@ stdenv.mkDerivation rec {
|
||||
|
||||
doCheck = false;
|
||||
|
||||
meta = {
|
||||
description = "A hierarchical note taking application, featuring rich text and syntax highlighting, storing data in a single xml or sqlite file";
|
||||
meta = {
|
||||
description = "An hierarchical note taking application";
|
||||
longDescription = ''
|
||||
Cherrytree is an hierarchical note taking application,
|
||||
featuring rich text, syntax highlighting and powerful search
|
||||
capabilities. It organizes all information in units called
|
||||
"nodes", as in a tree, and can be very useful to store any piece
|
||||
of information, from tables and links to pictures and even entire
|
||||
documents. All those little bits of information you have scattered
|
||||
around your hard drive can be conveniently placed into a
|
||||
Cherrytree document where you can easily find it.
|
||||
'';
|
||||
homepage = http://www.giuspen.com/cherrytree;
|
||||
license = stdenv.lib.licenses.gpl3;
|
||||
platforms = with stdenv.lib.platforms; linux;
|
||||
};
|
||||
license = licenses.gpl3;
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.AndersonTorres ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
name = "electrum-${version}";
|
||||
version = "2.3.2";
|
||||
version = "2.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.electrum.org/Electrum-${version}.tar.gz";
|
||||
sha256 = "0idqm77d5rbwpw14wqg4ysvbjyqjw7zlqfcdxniy74i2qwz163bi";
|
||||
sha256 = "0z5ksr1wlywl4bpvxjmmqnsk7jh1jfjdz9lsjkhf2j391jx0wz9q";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with pythonPackages; [
|
||||
@ -16,6 +16,7 @@ buildPythonPackage rec {
|
||||
protobuf
|
||||
pyasn1
|
||||
pyasn1-modules
|
||||
pycrypto
|
||||
pyqt4
|
||||
qrcode
|
||||
requests
|
||||
|
||||
@ -1,7 +1,16 @@
|
||||
{ fetchurl, stdenv, gettext, geoclue, intltool, makeWrapper
|
||||
, pkgconfig , python, pygobject3, pyxdg }:
|
||||
{ fetchurl, stdenv, gettext, intltool, pkgconfig, makeWrapper
|
||||
, geoclue, python, pygobject3, pyxdg
|
||||
, libdrm, libX11, libxcb, libXxf86vm
|
||||
, guiSupport ? true
|
||||
, drmSupport ? true
|
||||
, randrSupport ? true
|
||||
, vidModeSupport ? true
|
||||
}:
|
||||
|
||||
let version = "1.10"; in
|
||||
let
|
||||
version = "1.10";
|
||||
mkFlag = flag: name: if flag then "--enable-${name}" else "--disable-${name}";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
name = "redshift-${version}";
|
||||
src = fetchurl {
|
||||
@ -9,19 +18,29 @@ stdenv.mkDerivation {
|
||||
url = "https://github.com/jonls/redshift/releases/download/v${version}/redshift-${version}.tar.xz";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
gettext intltool makeWrapper pkgconfig python pygobject3 pyxdg
|
||||
buildInputs = [ geoclue ]
|
||||
++ stdenv.lib.optional guiSupport [ python pygobject3 pyxdg ]
|
||||
++ stdenv.lib.optional drmSupport [ libdrm ]
|
||||
++ stdenv.lib.optional randrSupport [ libxcb ]
|
||||
++ stdenv.lib.optional vidModeSupport [ libX11 libXxf86vm ];
|
||||
nativeBuildInputs = [ gettext intltool makeWrapper pkgconfig ];
|
||||
|
||||
configureFlags = [
|
||||
(mkFlag guiSupport "gui")
|
||||
(mkFlag drmSupport "drm")
|
||||
(mkFlag randrSupport "randr")
|
||||
(mkFlag vidModeSupport "vidmode")
|
||||
];
|
||||
|
||||
preInstall = ''
|
||||
preInstall = stdenv.lib.optionalString guiSupport ''
|
||||
substituteInPlace src/redshift-gtk/redshift-gtk python \
|
||||
--replace "/usr/bin/env python3" "${python}/bin/${python.executable}"
|
||||
'';
|
||||
/*
|
||||
postInstall = ''
|
||||
wrapProgram "$out/bin/redshift-gtk" --prefix PYTHONPATH : $PYTHONPATH
|
||||
|
||||
postInstall = stdenv.lib.optionalString guiSupport ''
|
||||
wrapProgram "$out/bin/redshift-gtk" --prefix PYTHONPATH : "$PYTHONPATH"
|
||||
'';
|
||||
*/
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
inherit version;
|
||||
description = "Gradually change screen color temperature";
|
||||
|
||||
@ -1,10 +1,10 @@
|
||||
# This file is autogenerated from update.sh in the parent directory.
|
||||
{
|
||||
dev = {
|
||||
version = "45.0.2454.7";
|
||||
sha256 = "19xjdp0zxr96r2fx9wf30wldalrh393p2dhqwp2n1m751vizbj5s";
|
||||
sha256bin32 = "1id1z3m0pc2lxh4lp9r6babh098gfyz4dda931yjkxhzb9rw1v0d";
|
||||
sha256bin64 = "1sksf651z1sqgh9pwdm5dksqnb0lzhwabxj3myg4w5kxi8s4pi8l";
|
||||
version = "45.0.2454.15";
|
||||
sha256 = "1zg562cpn9ddai92jdjg3frhmvbhbkf71ysprwqa3rgbg6w8ipzj";
|
||||
sha256bin32 = "1fcwzwb6zq7ld7fs0iws0d9jmxhjhdax4y744dx4d7bc77357x3m";
|
||||
sha256bin64 = "0273dy5b1r9s9g8ixrafnxm8jnn4ha36r3b3ckdabm9y4pqwx54s";
|
||||
};
|
||||
beta = {
|
||||
version = "44.0.2403.89";
|
||||
@ -13,9 +13,9 @@
|
||||
sha256bin64 = "0kvrpqy3fpfzchly65nrh8z2z2i49xpa3pm2k7k18sn0x4bycji0";
|
||||
};
|
||||
stable = {
|
||||
version = "44.0.2403.89";
|
||||
sha256 = "161shml5w2i0crl57hkfnizgmii6d70lxxg4rjxmays8g6lrmpds";
|
||||
sha256bin32 = "09a1k0xxmp6v1nfnngfkhv9vilnwvqlbgfsisbhwdnkk86pnv7r4";
|
||||
sha256bin64 = "1i7ylif5vd0yj0gddl2kv87gh3vgzvzmz91rrrs9za2bkf2gkf0p";
|
||||
version = "44.0.2403.107";
|
||||
sha256 = "0w9xk2jrpp98fgszswr5jc0g5ggpm8rfxqzxa8402n7iwkxlyqyh";
|
||||
sha256bin32 = "0x4j5ggb2dh56lz5fg2h79lvp92rgsk59gi5h3ml678vcghzyfvn";
|
||||
sha256bin64 = "0nhm9783b314dmicqky3424ak4z6xhb6rjia12pq2ajddz9qj9rj";
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,20 +1,20 @@
|
||||
{ stdenv, fetchurl, ncurses, gtk, pkgconfig, autoconf, automake, perl, halibut, libtool }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.64";
|
||||
version = "0.65";
|
||||
name = "putty-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://the.earth.li/~sgtatham/putty/latest/${name}.tar.gz";
|
||||
sha256 = "089qbzd7w51sc9grm2x3lcbj61jdqsnakb4j4gnf6i2131xcjiia";
|
||||
sha256 = "180ccrsyh775hdmxqdnbclfbvsfdp2zk3gsadpa53sj497yw2hym";
|
||||
};
|
||||
|
||||
preConfigure = ''
|
||||
perl mkfiles.pl
|
||||
( cd doc ; make );
|
||||
sed '/AM_PATH_GTK(/d' -i unix/configure.ac
|
||||
sed '/AC_OUTPUT/iAM_PROG_CC_C_O' -i unix/configure.ac
|
||||
sed '/AC_OUTPUT/iAM_PROG_AR' -i unix/configure.ac
|
||||
sed -e '/AM_PATH_GTK(/d' \
|
||||
-e '/AC_OUTPUT/iAM_PROG_CC_C_O' \
|
||||
-e '/AC_OUTPUT/iAM_PROG_AR' -i configure.ac
|
||||
./mkauto.sh
|
||||
cd unix
|
||||
'';
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
{stdenv, fetchurl, gmp}:
|
||||
{ stdenv, fetchurl, gmp, m4 }:
|
||||
|
||||
let
|
||||
pname = "ecm";
|
||||
version = "6.2.3";
|
||||
version = "6.4.4";
|
||||
name = "${pname}-${version}";
|
||||
in
|
||||
|
||||
@ -10,11 +10,11 @@ stdenv.mkDerivation {
|
||||
inherit name;
|
||||
|
||||
src = fetchurl {
|
||||
url = https://gforge.inria.fr/frs/download.php/22124/ecm-6.2.3.tar.gz;
|
||||
sha256 = "1iwwhbz5vwl7j6dyh292hahc8yy16pq9mmm7mxy49zhxd81vy08p";
|
||||
url = http://gforge.inria.fr/frs/download.php/file/32159/ecm-6.4.4.tar.gz;
|
||||
sha256 = "0v5h2nicz9yx78c2d72plbhi30iq4nxbvphja1s9501db4aah4y8";
|
||||
};
|
||||
|
||||
buildInputs = [ gmp ];
|
||||
buildInputs = [ m4 gmp ];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
@ -23,5 +23,6 @@ stdenv.mkDerivation {
|
||||
license = stdenv.lib.licenses.gpl2Plus;
|
||||
homepage = http://ecm.gforge.inria.fr/;
|
||||
maintainers = [ stdenv.lib.maintainers.roconnor ];
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
};
|
||||
}
|
||||
|
||||
28
pkgs/applications/version-management/peru/default.nix
Normal file
28
pkgs/applications/version-management/peru/default.nix
Normal file
@ -0,0 +1,28 @@
|
||||
{ stdenv, fetchFromGitHub, python3Packages }:
|
||||
|
||||
let
|
||||
version = "0.2.3";
|
||||
in
|
||||
|
||||
python3Packages.buildPythonPackage rec {
|
||||
|
||||
# Do not prefix name with python specific version identifier.
|
||||
namePrefix = "";
|
||||
|
||||
name = "peru-${version}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "buildinspace";
|
||||
repo = "peru";
|
||||
rev = "${version}";
|
||||
sha256 = "04bnaly50qmzkj0shdag94n8vr3ggarlqdny5zdb8nh31fqgln8b";
|
||||
};
|
||||
|
||||
pythonPath = with python3Packages; [ pyyaml docopt ];
|
||||
|
||||
meta = {
|
||||
homepage = https://github.com/buildinspace/peru;
|
||||
description = "A tool for including other people's code in your projects";
|
||||
license = stdenv.lib.licenses.mit;
|
||||
};
|
||||
}
|
||||
@ -12,7 +12,7 @@
|
||||
, bluraySupport ? true, libbluray ? null
|
||||
, speexSupport ? true, speex ? null
|
||||
, theoraSupport ? true, libtheora ? null
|
||||
, jackaudioSupport ? true, libjack2 ? null
|
||||
, jackaudioSupport ? false, libjack2 ? null
|
||||
, pulseSupport ? true, libpulseaudio ? null
|
||||
, bs2bSupport ? true, libbs2b ? null
|
||||
# For screenshots
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
, docbook_xml_dtd_45, docbook_xsl
|
||||
, sdlSupport ? true, SDL2 ? null
|
||||
, termSupport ? true , ncurses ? null
|
||||
, wxSupport ? false, wxGTK ? null # Warning! Broken
|
||||
, wxSupport ? true, wxGTK ? null
|
||||
# Optional, undocumented dependencies
|
||||
, wgetSupport ? false, wget ? null
|
||||
, curlSupport ? false, curl ? null
|
||||
@ -19,11 +19,11 @@ assert curlSupport -> (curl != null);
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
name = "bochs-${version}";
|
||||
version = "2.6.7";
|
||||
version = "2.6.8";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://downloads.sourceforge.net/project/bochs/bochs/${version}/${name}.tar.gz";
|
||||
sha256 = "10l2pgzwnmng0rd44kqv7y46nwpcc18j53h3kf3dlqlnd7mlwdd4";
|
||||
sha256 = "1kl5cmbz6qgg33j5vv9898nzdppp1rqgy24r5pv762aaj7q0ww3r";
|
||||
};
|
||||
|
||||
# The huge list of configurable options
|
||||
|
||||
@ -1,35 +1,39 @@
|
||||
{ stdenv, fetchurl, gettext, libjpeg, libtiff, libungif, libpng, freetype
|
||||
, fontconfig, xlibs, automake, pkgconfig, gdk_pixbuf }:
|
||||
{ stdenv, fetchurl, cmake, gettext
|
||||
, libjpeg, libtiff, libungif, libpng, imlib, expat
|
||||
, freetype, fontconfig, pkgconfig, gdk_pixbuf
|
||||
, mkfontdir, libX11, libXft, libXext, libXinerama
|
||||
, libXrandr, libICE, libSM, libXpm, libXdmcp, libxcb
|
||||
, libpthreadstubs }:
|
||||
|
||||
with stdenv.lib;
|
||||
stdenv.mkDerivation rec {
|
||||
name = "icewm-1.3.8";
|
||||
name = "icewm-${version}";
|
||||
version = "1.3.10";
|
||||
|
||||
buildInputs =
|
||||
[ gettext libjpeg libtiff libungif libpng
|
||||
xlibs.libX11 xlibs.libXft xlibs.libXext xlibs.libXinerama xlibs.libXrandr
|
||||
xlibs.libICE xlibs.libSM freetype fontconfig
|
||||
pkgconfig gdk_pixbuf
|
||||
];
|
||||
[ cmake gettext libjpeg libtiff libungif libpng imlib expat
|
||||
freetype fontconfig pkgconfig gdk_pixbuf mkfontdir libX11
|
||||
libXft libXext libXinerama libXrandr libICE libSM libXpm
|
||||
libXdmcp libxcb libpthreadstubs ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/icewm/${name}.tar.gz";
|
||||
sha256 = "066d1mw0vm9ygxnyxksfi6k4vzclvnlkvj04pj3kbcmv1fg8sn0p";
|
||||
url = "https://github.com/bbidulock/icewm/archive/${version}.tar.gz";
|
||||
sha256 = "01i7a21gf810spmzjx32dxsmx4527qivs744rhvhaw4gr00amrns";
|
||||
};
|
||||
|
||||
NIX_LDFLAGS = "-lfontconfig";
|
||||
|
||||
# The fuloong2f is not supported by 1.3.6 still
|
||||
#
|
||||
# Don't know whether 1.3.7 supports fuloong2f and don't know how to test it
|
||||
# on x86_64 hardware. So I left this 'cp' -- urkud
|
||||
|
||||
preConfigure = ''
|
||||
cp -v ${automake}/share/automake*/config.{sub,guess} .
|
||||
export cmakeFlags="-DPREFIX=$out"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "A window manager for the X Window System";
|
||||
description = "A simple, lightweight X window manager";
|
||||
longDescription = ''
|
||||
IceWM is a window manager for the X Window System. The goal of
|
||||
IceWM is speed, simplicity, and not getting in the user's way.
|
||||
'';
|
||||
homepage = http://www.icewm.org/;
|
||||
platforms = stdenv.lib.platforms.unix;
|
||||
license = licenses.lgpl2;
|
||||
maintainers = [ maintainers.AndersonTorres ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
27
pkgs/applications/window-managers/oroborus/default.nix
Normal file
27
pkgs/applications/window-managers/oroborus/default.nix
Normal file
@ -0,0 +1,27 @@
|
||||
{ stdenv, fetchurl, pkgconfig
|
||||
, freetype, fribidi
|
||||
, libSM, libICE, libXt, libXaw, libXmu
|
||||
, libXext, libXft, libXpm, libXrandr
|
||||
, libXrender, xextproto, libXinerama }:
|
||||
|
||||
with stdenv.lib;
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
name = "oroborus-${version}";
|
||||
version = "2.0.20";
|
||||
|
||||
buildInputs = [ pkgconfig freetype fribidi libSM libICE libXt libXaw libXmu libXext libXft libXpm libXrandr libXrender xextproto libXinerama ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://ftp.debian.org/debian/pool/main/o/oroborus/oroborus_${version}.tar.gz";
|
||||
sha256 = "12bvk8x8rfnymbfbwmdcrd9g8m1zxbcq7rgvfdkjr0gnpi0aa82j";
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "A really minimalistic X window manager";
|
||||
homepage = http://www.oroborus.org/;
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = [ maintainers.AndersonTorres ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
@ -13,7 +13,7 @@ kde {
|
||||
xorg.libxkbfile xorg.libXcomposite xorg.libXtst
|
||||
xorg.libXdamage xorg.libXft
|
||||
|
||||
python boost qjson lm_sensors gpsd libraw1394 pciutils udev
|
||||
python boost qjson lm_sensors /* gpsd */ libraw1394 pciutils udev
|
||||
akonadi pam libusb1 libqalculate kdepimlibs prison
|
||||
kactivities
|
||||
];
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
{ fetchurl, stdenv, autoreconfHook, zlib, lzo, libtasn1, nettle, pkgconfig, lzip
|
||||
, guileBindings, guile, perl, gmp, libidn, p11_kit, unbound, trousers
|
||||
{ lib, fetchurl, stdenv, autoreconfHook, zlib, lzo, libtasn1, nettle, pkgconfig, lzip
|
||||
, guileBindings, guile, perl, gmp, libidn, p11_kit, unbound
|
||||
, tpmSupport ? false, trousers
|
||||
|
||||
# Version dependent args
|
||||
, version, src, patches ? []
|
||||
@ -7,9 +8,6 @@
|
||||
|
||||
assert guileBindings -> guile != null;
|
||||
|
||||
let
|
||||
inherit (stdenv.lib) optional optionals optionalString;
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gnutls-${version}";
|
||||
|
||||
@ -19,11 +17,11 @@ stdenv.mkDerivation rec {
|
||||
|
||||
configureFlags =
|
||||
# FIXME: perhaps use $SSL_CERT_FILE instead
|
||||
optional stdenv.isLinux "--with-default-trust-store-file=/etc/ssl/certs/ca-certificates.crt"
|
||||
lib.optional stdenv.isLinux "--with-default-trust-store-file=/etc/ssl/certs/ca-certificates.crt"
|
||||
++ [
|
||||
"--disable-dependency-tracking"
|
||||
"--enable-fast-install"
|
||||
] ++ optionals guileBindings
|
||||
] ++ lib.optional guileBindings
|
||||
[ "--enable-guile" "--with-guile-site-dir=\${out}/share/guile/site" ];
|
||||
|
||||
# Build of the Guile bindings is not parallel-safe. See
|
||||
@ -32,9 +30,9 @@ stdenv.mkDerivation rec {
|
||||
enableParallelBuilding = !guileBindings;
|
||||
|
||||
buildInputs = [ lzo lzip nettle libtasn1 libidn p11_kit zlib gmp ]
|
||||
++ optional stdenv.isLinux trousers
|
||||
++ lib.optional (tpmSupport && stdenv.isLinux) trousers
|
||||
++ [ unbound ]
|
||||
++ optional guileBindings guile;
|
||||
++ lib.optional guileBindings guile;
|
||||
|
||||
nativeBuildInputs = [ perl pkgconfig autoreconfHook ];
|
||||
|
||||
@ -43,14 +41,14 @@ stdenv.mkDerivation rec {
|
||||
doCheck = (!stdenv.isFreeBSD && !stdenv.isDarwin);
|
||||
|
||||
# Fixup broken libtool and pkgconfig files
|
||||
preFixup = optionalString (!stdenv.isDarwin) ''
|
||||
sed -e 's,-ltspi,-L${trousers}/lib -ltspi,' \
|
||||
preFixup = lib.optionalString (!stdenv.isDarwin) ''
|
||||
sed ${lib.optionalString tpmSupport "-e 's,-ltspi,-L${trousers}/lib -ltspi,'"} \
|
||||
-e 's,-lz,-L${zlib}/lib -lz,' \
|
||||
-e 's,-lgmp,-L${gmp}/lib -lgmp,' \
|
||||
-i $out/lib/libgnutls.la $out/lib/pkgconfig/gnutls.pc
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
meta = with lib; {
|
||||
description = "The GNU Transport Layer Security Library";
|
||||
|
||||
longDescription = ''
|
||||
|
||||
@ -8,6 +8,8 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "0mbrc021dk0ayyglk4qyf9328cayrlz2q94lh8sh9l9r6g79fvcs";
|
||||
};
|
||||
|
||||
outputs = [ "out" "doc" ];
|
||||
|
||||
buildInputs = [ intltool pkgconfig ];
|
||||
propagatedBuildInputs = [ cln libxml2 glib ];
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{ stdenv, fetchurl, glib, libxml2, pkgconfig
|
||||
, gnomeSupport ? true, libgnome_keyring, sqlite, glib_networking, gobjectIntrospection
|
||||
, gnomeSupport ? false, libgnome_keyring, sqlite, glib_networking, gobjectIntrospection
|
||||
, libintlOrEmpty
|
||||
, intltool, python }:
|
||||
let
|
||||
@ -32,6 +32,8 @@ stdenv.mkDerivation {
|
||||
|
||||
NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-lintl";
|
||||
|
||||
postInstall = "rm -rf $out/share/gtk-doc";
|
||||
|
||||
meta = {
|
||||
inherit (glib.meta) maintainers platforms;
|
||||
};
|
||||
|
||||
@ -8,6 +8,8 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "0ca2j526n4wlamrxb85y2jrgcv0gf21b3a19rr0gh4rjqkv1581n";
|
||||
};
|
||||
|
||||
outputs = [ "out" "doc" ];
|
||||
|
||||
preConfigure = ''
|
||||
./bootstrap
|
||||
'';
|
||||
|
||||
@ -9,9 +9,11 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "0grd2s6gf8yzqwdaa50g57j9d81mxkrrpkyldm2shgyizdc8gx33";
|
||||
};
|
||||
|
||||
outputs = [ "out" "doc" ];
|
||||
|
||||
buildInputs = [ libuuid zlib ];
|
||||
|
||||
meta = {
|
||||
meta = {
|
||||
description = "Search engine library";
|
||||
homepage = http://xapian.org/;
|
||||
license = stdenv.lib.licenses.gpl2Plus;
|
||||
|
||||
@ -1,13 +1,13 @@
|
||||
{ stdenv, fetchFromGitHub, ocaml, libelf }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.1.0";
|
||||
version = "0.13.1";
|
||||
name = "flow-${version}";
|
||||
src = fetchFromGitHub {
|
||||
owner = "facebook";
|
||||
repo = "flow";
|
||||
rev = "v${version}";
|
||||
sha256 = "1f33zmajd6agb36gp8bwj0yqihjhxnkpig9x3a4ggn369x6ixhn3";
|
||||
sha256 = "1p7rzhvmz9y7ii2z05mfdb49i45f82kx8c9ywciwqma06zycvd80";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, pkgconfig, zlib, libjpeg, libpng, libtiff, pam, openssl
|
||||
{ stdenv, fetchurl, pkgconfig, zlib, libjpeg, libpng, libtiff, pam
|
||||
, dbus, acl, gmp, xdg_utils
|
||||
, libusb ? null, gnutls ? null, avahi ? null, libpaper ? null
|
||||
}:
|
||||
@ -19,7 +19,7 @@ stdenv.mkDerivation {
|
||||
buildInputs = [ pkgconfig zlib libjpeg libpng libtiff libusb gnutls avahi libpaper ]
|
||||
++ optionals stdenv.isLinux [ pam dbus.libs acl xdg_utils ] ;
|
||||
|
||||
propagatedBuildInputs = [ openssl gmp ];
|
||||
propagatedBuildInputs = [ gmp ];
|
||||
|
||||
configureFlags = [
|
||||
"--localstatedir=/var"
|
||||
|
||||
@ -4,15 +4,14 @@ with stdenv.lib;
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
name = "stella-${version}";
|
||||
version = "4.6";
|
||||
version = "4.6.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://downloads.sourceforge.net/project/stella/stella/${version}/${name}-src.tar.gz";
|
||||
sha256 = "03vg8cxr0hn99vrr2dcwhv610xi9vhlw08ypazpm0nny522a9j4d";
|
||||
sha256 = "126jph21b70jlxapzmll8pq36i53lb304hbsiap25160vdqid4n1";
|
||||
};
|
||||
|
||||
buildInputs = with stdenv.lib;
|
||||
[ pkgconfig SDL2 ];
|
||||
buildInputs = [ pkgconfig SDL2 ];
|
||||
|
||||
meta = {
|
||||
description = "An open-source Atari 2600 VCS emulator";
|
||||
|
||||
@ -85,6 +85,8 @@ stdenv.mkDerivation rec {
|
||||
mv "$out/share/ghostscript/${version}"/{doc,examples} "$doc/share/ghostscript/${version}/"
|
||||
|
||||
ln -s "${fonts}" "$out/share/ghostscript/fonts"
|
||||
|
||||
rm -r $out/lib/cups/filter/{gstopxl,gstoraster}
|
||||
'';
|
||||
|
||||
meta = {
|
||||
|
||||
33
pkgs/misc/themes/vertex/default.nix
Normal file
33
pkgs/misc/themes/vertex/default.nix
Normal file
@ -0,0 +1,33 @@
|
||||
{ stdenv, fetchFromGitHub, autoreconfHook, gtk3, pkgconfig }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "theme-vertex-${version}";
|
||||
version = "20150718";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "horst3180";
|
||||
repo = "Vertex-theme";
|
||||
rev = version;
|
||||
sha256 = "19mmybfkx3mrbm9vr78c7xiyazmyzji1n6669466svjr3jy87546";
|
||||
};
|
||||
|
||||
buildInputs = [ autoreconfHook gtk3 pkgconfig ];
|
||||
|
||||
configureFlags = "--disable-unity";
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/share/doc/theme-vertex
|
||||
cp AUTHORS COPYING README.md $out/share/doc/theme-vertex/
|
||||
|
||||
mkdir -p $out/share/doc/theme-vertex/extra
|
||||
cp -r extra/{Chrome,Firefox} $out/share/doc/theme-vertex/extra
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
inherit (src.meta) homepage;
|
||||
description = "Theme for GTK 3, GTK 2, Gnome-Shell, and Cinnamon";
|
||||
license = licenses.gpl3;
|
||||
maintainer = [ maintainers.rycee ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
@ -47,8 +47,10 @@ installPhase() {
|
||||
|
||||
# Install the kernel module.
|
||||
mkdir -p $out/lib/modules/$kernelVersion/misc
|
||||
cp kernel/nvidia.ko $out/lib/modules/$kernelVersion/misc
|
||||
cp kernel/uvm/nvidia-uvm.ko $out/lib/modules/$kernelVersion/misc
|
||||
for i in kernel/nvidia.ko kernel/uvm/nvidia-uvm.ko; do
|
||||
nuke-refs $i
|
||||
cp $i $out/lib/modules/$kernelVersion/misc/
|
||||
done
|
||||
fi
|
||||
|
||||
# All libs except GUI-only are in $out now, so fixup them.
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{ stdenv, fetchurl, kernel ? null, xlibs, zlib, perl
|
||||
, gtk, atk, pango, glib, gdk_pixbuf, cairo
|
||||
, gtk, atk, pango, glib, gdk_pixbuf, cairo, nukeReferences
|
||||
, # Whether to build the libraries only (i.e. not the kernel module or
|
||||
# nvidia-settings). Used to support 32-bit binaries on 64-bit
|
||||
# Linux.
|
||||
@ -52,7 +52,9 @@ stdenv.mkDerivation {
|
||||
[ gtk atk pango glib gdk_pixbuf cairo ] );
|
||||
programPath = makeLibraryPath [ xlibs.libXv ];
|
||||
|
||||
buildInputs = [ perl ];
|
||||
buildInputs = [ perl nukeReferences ];
|
||||
|
||||
disallowedReferences = if libsOnly then [] else [ kernel.dev ];
|
||||
|
||||
meta = with stdenv.lib.meta; {
|
||||
homepage = http://www.nvidia.com/object/unix.html;
|
||||
|
||||
@ -104,6 +104,9 @@ stdenv.mkDerivation rec {
|
||||
# Make sure to propagate lib for compatability
|
||||
mkdir -p $out/nix-support
|
||||
echo "$lib" > $out/nix-support/propagated-native-build-inputs
|
||||
|
||||
# Don't install static libraries.
|
||||
rm $lib/lib/libmysqlclient.a $lib/lib/libmysqld.a
|
||||
'';
|
||||
|
||||
passthru.mysqlVersion = "5.6";
|
||||
|
||||
@ -10,6 +10,8 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "19gq6axjhvlr5zlrzwnll1fbrvai4xh0nb1jki6gmmschl6v5m4l";
|
||||
};
|
||||
|
||||
outputs = [ "out" "doc" ];
|
||||
|
||||
buildInputs = [ zlib readline openssl ];
|
||||
|
||||
LC_ALL = "C";
|
||||
|
||||
@ -10,6 +10,8 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "1a44hmcvfaa8j169ladsibmvjakw6maaxqkzz1ab8139cqkda9i7";
|
||||
};
|
||||
|
||||
outputs = [ "out" "doc" ];
|
||||
|
||||
buildInputs = [ zlib readline openssl ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
@ -10,6 +10,8 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "0i3avdr8mnvn6ldkx0hc4jmclhisb2338hzs0j2m03wck8hddjsx";
|
||||
};
|
||||
|
||||
outputs = [ "out" "doc" ];
|
||||
|
||||
buildInputs = [ zlib readline openssl ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
@ -12,6 +12,8 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "0j85j69rf54cwz5yhrhk4ca22b82990j5sqb8cr1fl9843nd0fzp";
|
||||
};
|
||||
|
||||
outputs = [ "out" "doc" ];
|
||||
|
||||
buildInputs = [ zlib readline openssl ]
|
||||
++ optionals (!stdenv.isDarwin) [ libossp_uuid ];
|
||||
|
||||
|
||||
@ -12,6 +12,8 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "04q07g209y99xzjh88y52qpvz225rxwifv8nzp3bxzfni2bdk3jk";
|
||||
};
|
||||
|
||||
outputs = [ "out" "doc" ];
|
||||
|
||||
buildInputs = [ zlib readline openssl ]
|
||||
++ optionals (!stdenv.isDarwin) [ libossp_uuid ];
|
||||
|
||||
|
||||
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
|
||||
substituteInPlace $item --replace "sed " "${gnused}/bin/sed "
|
||||
substituteInPlace $item --replace "egrep " "${gnugrep}/bin/egrep "
|
||||
sed -i $item -re "s#([^e])grep #\1${gnugrep}/bin/grep #g" # Don't replace 'egrep'
|
||||
substituteInPlace $item --replace "which " "${which}/bin/which "
|
||||
substituteInPlace $item --replace "which " "type -P "
|
||||
substituteInPlace $item --replace "/usr/bin/file" "${file}/bin/file"
|
||||
done
|
||||
'';
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
{ stdenv, fetchFromGitHub, autoreconfHook }:
|
||||
|
||||
let version = "3.0.9"; in
|
||||
let version = "3.0.10"; in
|
||||
stdenv.mkDerivation rec {
|
||||
name = "xdelta-${version}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
sha256 = "1pd7dyq44dbggmwkrr8251anqsf2an67zbvrk4vfnc92jkmjp17i";
|
||||
sha256 = "0wwxdr01var3f90iwi1lgjpsa4y549g850hyyix5cm0qk67ck4rg";
|
||||
rev = "v${version}";
|
||||
repo = "xdelta-devel";
|
||||
owner = "jmacd";
|
||||
|
||||
@ -12,6 +12,8 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "8a47cd7c35dfa628a4acfaef387e7451013c61d250bbcf1f38067a7c73f9f3e1";
|
||||
};
|
||||
|
||||
outputs = [ "out" "doc" ];
|
||||
|
||||
nativeBuildInputs = [ perl pkgconfig ];
|
||||
|
||||
buildInputs = [ curl openssl sqlite ] ++ lib.optional stdenv.isLinux libsodium;
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
{ stdenv, fetchurl, perl /*, xmlto */}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "colordiff-1.0.13";
|
||||
name = "colordiff-1.0.15";
|
||||
|
||||
src = fetchurl {
|
||||
url = http://www.colordiff.org/colordiff-1.0.13.tar.gz;
|
||||
sha256 = "0akcz1p3klsjnhwcqdfq4grs6paljc5c0jzr3mqla5f862hhaa6f";
|
||||
url = http://www.colordiff.org/colordiff-1.0.15.tar.gz;
|
||||
sha256 = "0icx4v2h1gy08vhh3qqi2qfyfjp37vgj27hq1fnjz83bg7ly8pjr";
|
||||
};
|
||||
|
||||
buildInputs = [ perl /* xmlto */ ];
|
||||
@ -19,5 +19,6 @@ stdenv.mkDerivation {
|
||||
homepage = http://www.colordiff.org/;
|
||||
license = licenses.gpl3;
|
||||
platforms = platforms.linux;
|
||||
maintainer = with maintainers; [ nckx ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -8,6 +8,8 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "1998v2kcs288d3y7kfxpvl369nqi06zbbvjzafyvyl3pr7bajj1s";
|
||||
};
|
||||
|
||||
outputs = [ "out" "doc" ];
|
||||
|
||||
enableParallelBuilding = false;
|
||||
|
||||
buildInputs = [ ghostscript ];
|
||||
|
||||
@ -6402,18 +6402,16 @@ let
|
||||
|
||||
gnutls = gnutls34;
|
||||
|
||||
gnutls33 = callPackage ../development/libraries/gnutls/3.3.nix {
|
||||
gnutls33 = import ../development/libraries/gnutls/3.3.nix {
|
||||
inherit callPackage fetchurl;
|
||||
guileBindings = config.gnutls.guile or false;
|
||||
};
|
||||
|
||||
gnutls34 = callPackage ../development/libraries/gnutls/3.4.nix {
|
||||
gnutls34 = import ../development/libraries/gnutls/3.4.nix {
|
||||
inherit callPackage fetchurl;
|
||||
guileBindings = config.gnutls.guile or false;
|
||||
};
|
||||
|
||||
gnutls33_with_guile = lowPrio (gnutls33.override { guileBindings = true; });
|
||||
|
||||
gnutls34_with_guile = lowPrio (gnutls34.override { guileBindings = true; });
|
||||
|
||||
gpac = callPackage ../applications/video/gpac { };
|
||||
|
||||
gpgme = callPackage ../development/libraries/gpgme {
|
||||
@ -9098,7 +9096,7 @@ let
|
||||
libmemcached = null; # Detection is broken upstream
|
||||
};
|
||||
|
||||
postgresql = postgresql92;
|
||||
postgresql = postgresql94;
|
||||
|
||||
postgresql90 = callPackage ../servers/sql/postgresql/9.0.x.nix { };
|
||||
|
||||
@ -11662,7 +11660,10 @@ let
|
||||
|
||||
i810switch = callPackage ../os-specific/linux/i810switch { };
|
||||
|
||||
icewm = callPackage ../applications/window-managers/icewm { };
|
||||
icewm = callPackage ../applications/window-managers/icewm {
|
||||
inherit (xlibs) libX11 libXft libXext libXinerama
|
||||
libXrandr libICE libSM;
|
||||
};
|
||||
|
||||
id3v2 = callPackage ../applications/audio/id3v2 { };
|
||||
|
||||
@ -11680,40 +11681,25 @@ let
|
||||
};
|
||||
|
||||
imagemagick_light = imagemagick.override {
|
||||
libcl = null;
|
||||
perl = null;
|
||||
jemalloc = null;
|
||||
bzip2 = null;
|
||||
zlib = null;
|
||||
libX11 = null;
|
||||
libXext = null;
|
||||
libXt = null;
|
||||
dejavu_fonts = null;
|
||||
fftw = null;
|
||||
libfpx = null;
|
||||
djvulibre = null;
|
||||
fontconfig = null;
|
||||
freetype = null;
|
||||
ghostscript = null;
|
||||
graphviz = null;
|
||||
jbigkit = null;
|
||||
libjpeg = null;
|
||||
lcms2 = null;
|
||||
openjpeg = null;
|
||||
liblqr1 = null;
|
||||
xz = null;
|
||||
openexr = null;
|
||||
pango = null;
|
||||
libpng = null;
|
||||
librsvg = null;
|
||||
libtiff = null;
|
||||
libwebp = null;
|
||||
libxml2 = null;
|
||||
};
|
||||
|
||||
imagemagick = callPackage ../applications/graphics/ImageMagick {
|
||||
ghostscript = if stdenv.isDarwin then null else ghostscript;
|
||||
perl = null; # Currently Broken
|
||||
ghostscript = null;
|
||||
};
|
||||
|
||||
imagemagickBig = imagemagick;
|
||||
@ -12132,6 +12118,10 @@ let
|
||||
|
||||
openshift = callPackage ../applications/networking/cluster/openshift { };
|
||||
|
||||
oroborus = callPackage ../applications/window-managers/oroborus {
|
||||
inherit (xlibs) libSM libICE libXt libXaw libXmu libXext libXft libXpm libXrandr libXrender xextproto libXinerama;
|
||||
};
|
||||
|
||||
panamax_api = callPackage ../applications/networking/cluster/panamax/api {
|
||||
ruby = ruby_2_1;
|
||||
};
|
||||
@ -12654,6 +12644,8 @@ let
|
||||
|
||||
cura = callPackage ../applications/misc/cura { };
|
||||
|
||||
peru = callPackage ../applications/version-management/peru {};
|
||||
|
||||
printrun = callPackage ../applications/misc/printrun { };
|
||||
|
||||
sddm = callPackage ../applications/display-managers/sddm { };
|
||||
@ -14122,6 +14114,8 @@ let
|
||||
|
||||
kde5 = kf5_stable // plasma5_stable // kdeApps_stable;
|
||||
|
||||
theme-vertex = callPackage ../misc/themes/vertex { };
|
||||
|
||||
xfce = xfce4-12;
|
||||
xfce4-12 = recurseIntoAttrs (import ../desktops/xfce { inherit config pkgs newScope; });
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user