forked from mirrors/nixpkgs
Merge master into stdenv-updates
Conflicts (easy): pkgs/development/compilers/llvm/default.nix pkgs/development/compilers/openjdk/default.nix pkgs/development/libraries/icu/default.nix pkgs/development/libraries/libssh/default.nix pkgs/development/libraries/libxslt/default.nix pkgs/development/tools/parsing/bison/3.x.nix
This commit is contained in:
Vladimír Čunát
commit
e740b565cf
19
lib/meta.nix
19
lib/meta.nix
|
|
@ -1,6 +1,9 @@
|
|||
/* Some functions for manipulating meta attributes, as well as the
|
||||
name attribute. */
|
||||
|
||||
let lib = import ./default.nix;
|
||||
in
|
||||
|
||||
rec {
|
||||
|
||||
|
||||
|
|
@ -35,14 +38,30 @@ rec {
|
|||
appendToName = suffix: updateName (name: "${name}-${suffix}");
|
||||
|
||||
|
||||
/* Apply a function to each derivation and only to derivations in an attrset
|
||||
*/
|
||||
mapDerivationAttrset = f: set: lib.mapAttrs (name: pkg: if lib.isDerivation pkg then (f pkg) else pkg) set;
|
||||
|
||||
|
||||
/* Decrease the nix-env priority of the package, i.e., other
|
||||
versions/variants of the package will be preferred.
|
||||
*/
|
||||
lowPrio = drv: addMetaAttrs { priority = "10"; } drv;
|
||||
|
||||
|
||||
/* Apply lowPrio to an attrset with derivations
|
||||
*/
|
||||
lowPrioSet = set: mapDerivationAttrset lowPrio set;
|
||||
|
||||
|
||||
/* Increase the nix-env priority of the package, i.e., this
|
||||
version/variant of the package will be preferred.
|
||||
*/
|
||||
hiPrio = drv: addMetaAttrs { priority = "-10"; } drv;
|
||||
|
||||
|
||||
/* Apply hiPrio to an attrset with derivations
|
||||
*/
|
||||
hiPrioSet = set: mapDerivationAttrset hiPrio set;
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -68,6 +68,8 @@ in
|
|||
|
||||
preStart =
|
||||
''
|
||||
PATH="$PATH:${pkgs.ejabberd}/sbin:${pkgs.ejabberd}/bin:${pkgs.coreutils}/bin:${pkgs.bash}/bin:${pkgs.gnused}/bin";
|
||||
|
||||
# Initialise state data
|
||||
mkdir -p ${cfg.logsDir}
|
||||
|
||||
|
|
|
|||
|
|
@ -55,11 +55,6 @@ in
|
|||
|
||||
config = mkIf cfg.enable {
|
||||
|
||||
# Running minidlna only makes sense for serving files to the
|
||||
# outside, so open up the required ports by default.
|
||||
networking.firewall.allowedTCPPorts = [ port ];
|
||||
networking.firewall.allowedUDPPorts = [ 1900 ]; # SSDP
|
||||
|
||||
services.minidlna.config =
|
||||
''
|
||||
port=${toString port}
|
||||
|
|
|
|||
|
|
@ -223,9 +223,6 @@ in
|
|||
</Policy>
|
||||
'';
|
||||
|
||||
# Allow CUPS to receive IPP printer announcements via UDP.
|
||||
networking.firewall.allowedUDPPorts = [ 631 ];
|
||||
|
||||
security.pam.services.cups = {};
|
||||
|
||||
};
|
||||
|
|
|
|||
|
|
@ -72,11 +72,11 @@ let
|
|||
|
||||
# Unpack Mediawiki and put the config file in its root directory.
|
||||
mediawikiRoot = pkgs.stdenv.mkDerivation rec {
|
||||
name= "mediawiki-1.20.7";
|
||||
name= "mediawiki-1.20.8";
|
||||
|
||||
src = pkgs.fetchurl {
|
||||
url = "http://download.wikimedia.org/mediawiki/1.20/${name}.tar.gz";
|
||||
sha256 = "0cdl2mq3nw1jymanlxn7pi3qbf5y5003q53kmc8dip73nvrwnfxm";
|
||||
sha256 = "0yfmh5vnfbgpvicfqh7nh4hwdk4qbc6gfniv02vchkg5al0nn7ag";
|
||||
};
|
||||
|
||||
skins = config.skins;
|
||||
|
|
|
|||
|
|
@ -72,7 +72,8 @@ in
|
|||
pkgs.xfce.thunar_volman
|
||||
pkgs.xfce.gvfs
|
||||
pkgs.xfce.xfce4_appfinder
|
||||
pkgs.xfce.tumbler
|
||||
pkgs.xfce.tumbler # found via dbus
|
||||
pkgs.xfce.xfce4notifyd # found via dbus
|
||||
]
|
||||
++ optional config.powerManagement.enable pkgs.xfce.xfce4_power_manager;
|
||||
|
||||
|
|
|
|||
|
|
@ -42,8 +42,6 @@ in
|
|||
Xaccess=${pkgs.writeText "Xaccess" "localhost"}
|
||||
'';
|
||||
|
||||
networking.firewall.allowedTCPPorts = [ 5900 ];
|
||||
|
||||
systemd.sockets.terminal-server =
|
||||
{ description = "Terminal Server Socket";
|
||||
wantedBy = [ "sockets.target" ];
|
||||
|
|
|
|||
|
|
@ -1,10 +1,14 @@
|
|||
{pkgs, config, ...}:
|
||||
|
||||
let
|
||||
inherit (pkgs.lib) mkOption mkIf;
|
||||
inherit (pkgs.lib) mkOption mkIf optionals literalExample;
|
||||
cfg = config.services.xserver.windowManager.xmonad;
|
||||
xmonadEnv = cfg.haskellPackages.ghcWithPackages(self: [
|
||||
self.xmonad
|
||||
] ++ optionals cfg.enableContribAndExtras [ self.xmonadContrib self.xmonadExtras]
|
||||
++ optionals (cfg.extraPackages != null) (cfg.extraPackages self));
|
||||
xmessage = pkgs.xlibs.xmessage;
|
||||
in
|
||||
|
||||
{
|
||||
options = {
|
||||
services.xserver.windowManager.xmonad = {
|
||||
|
|
@ -13,18 +17,53 @@ in
|
|||
example = true;
|
||||
description = "Enable the xmonad window manager.";
|
||||
};
|
||||
|
||||
haskellPackages = mkOption {
|
||||
default = pkgs.haskellPackages;
|
||||
defaultText = "pkgs.haskellPackages";
|
||||
example = literalExample "pkgs.haskellPackages_ghc701";
|
||||
description = ''
|
||||
haskellPackages used to build Xmonad and other packages.
|
||||
This can be used to change the GHC version used to build
|
||||
Xmonad and the packages listed in
|
||||
<varname>extraPackages</varname>.
|
||||
'';
|
||||
};
|
||||
|
||||
extraPackages = mkOption {
|
||||
default = null;
|
||||
example = literalExample ''
|
||||
haskellPackages: [
|
||||
haskellPackages.xmonadContrib
|
||||
haskellPackages.monadLogger
|
||||
]
|
||||
'';
|
||||
description = ''
|
||||
Extra packages available to ghc when rebuilding Xmonad. The
|
||||
value must be a function which receives the attrset defined
|
||||
in <varname>haskellpackages</varname> as the sole argument.
|
||||
'';
|
||||
};
|
||||
|
||||
enableContribAndExtras = mkOption {
|
||||
default = false;
|
||||
example = true;
|
||||
type = pkgs.lib.types.bool;
|
||||
description = "Enable xmonad-{contrib,extras} in Xmonad.";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
config = {
|
||||
config = mkIf cfg.enable {
|
||||
services.xserver.windowManager = {
|
||||
session = mkIf cfg.enable [{
|
||||
session = [{
|
||||
name = "xmonad";
|
||||
start = "
|
||||
${pkgs.haskellPackages.xmonad}/bin/xmonad &
|
||||
start = ''
|
||||
XMONAD_GHC=${xmonadEnv}/bin/ghc XMONAD_XMESSAGE=${xmessage}/bin/xmessage xmonad &
|
||||
waitPID=$!
|
||||
";
|
||||
'';
|
||||
}];
|
||||
};
|
||||
|
||||
environment.systemPackages = [ cfg.haskellPackages.xmonad ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -199,7 +199,7 @@ in
|
|||
"unix"
|
||||
|
||||
# Misc. stuff.
|
||||
"pcips2" "xtkbd"
|
||||
"pcips2" "atkbd"
|
||||
|
||||
# To wait for SCSI devices to appear.
|
||||
"scsi_wait_scan"
|
||||
|
|
|
|||
|
|
@ -12,13 +12,13 @@
|
|||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "csound-5.18.02";
|
||||
name = "csound-5.19.01";
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
src = fetchurl {
|
||||
url = mirror://sourceforge/csound/Csound5.18.02.tar.gz;
|
||||
sha256 = "4c461cf3bf60b83671224949dd33805379b7121bf2c0ad6af5e191e7f6f8adc8";
|
||||
url = mirror://sourceforge/csound/Csound5.19.01.tar.gz;
|
||||
sha256 = "078i69jwgadmxwa5ffn8h1py7cmd9asa8swnh38fyp56lzgzn669";
|
||||
};
|
||||
|
||||
buildInputs = [ cmake libsndfile flex bison alsaLib pulseaudio tcltk ];
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{ stdenv, fetchurl, libtool, intltool, pkgconfig, glib
|
||||
, gtk, curl, mpd_clientlib, libsoup, gob2, vala
|
||||
, gtk, curl, mpd_clientlib, libsoup, gob2, vala, libunique
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
@ -15,22 +15,6 @@ stdenv.mkDerivation rec {
|
|||
buildInputs = [ pkgconfig glib ];
|
||||
};
|
||||
|
||||
libunique = stdenv.mkDerivation {
|
||||
name = "libunique-1.1.6";
|
||||
src = fetchurl {
|
||||
url = http://ftp.gnome.org/pub/GNOME/sources/libunique/1.1/libunique-1.1.6.tar.gz;
|
||||
sha256 = "2cb918dde3554228a211925ba6165a661fd782394bd74dfe15e3853dc9c573ea";
|
||||
};
|
||||
buildInputs = [ pkgconfig glib gtk ];
|
||||
|
||||
patches = [
|
||||
(fetchurl {
|
||||
url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/remove_G_CONST_RETURN.patch?h=packages/libunique";
|
||||
sha256 = "0da2qi7cyyax4rr1p25drlhk360h8d3lapgypi5w95wj9k6bykhr";
|
||||
})
|
||||
];
|
||||
};
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://download.sarine.nl/Programs/gmpc/11.8/gmpc-11.8.16.tar.gz";
|
||||
sha256 = "0b3bnxf98i5lhjyljvgxgx9xmb6p46cn3a9cccrng14nagri9556";
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
{ stdenv, fetchurl, jackaudio, pkgconfig }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "jackmeter-0.3";
|
||||
name = "jackmeter-0.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.aelius.com/njh/jackmeter/${name}.tar.gz";
|
||||
sha256 = "03siznnq3f0nnqyighgw9qdq1y4bfrrxs0mk6394pza3sz4b6sgp";
|
||||
sha256 = "1cnvgx3jv0yvxlqy0l9k285zgvazmh5k8m4l7lxckjfm5bn6hm1r";
|
||||
};
|
||||
|
||||
buildInputs = [ jackaudio pkgconfig ];
|
||||
|
|
|
|||
|
|
@ -3,11 +3,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "mhwaveedit-${version}";
|
||||
version = "1.4.21";
|
||||
version = "1.4.23";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://download.gna.org/mhwaveedit/${name}.tar.bz2";
|
||||
sha256 = "0jl7gvhwsz4fcn5d146h4m6i3hlxdsw4mmj280cv9g70p6zqi1w7";
|
||||
sha256 = "010rk4mr631s440q9cfgdxx2avgzysr9aq52diwdlbq9cddifli3";
|
||||
};
|
||||
|
||||
buildInputs =
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
{stdenv, fetchurl, libogg, libao, pkgconfig, libopus}:
|
||||
{stdenv, fetchurl, libogg, libao, pkgconfig, libopus, flac}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "opus-tools-0.1.6";
|
||||
name = "opus-tools-0.1.8";
|
||||
src = fetchurl {
|
||||
url = "http://downloads.xiph.org/releases/opus/${name}.tar.gz";
|
||||
sha256 = "1hd2ych34y3qy4rj4hd5cp29ixy891afizlsxphsfvfplk1dp1nc";
|
||||
sha256 = "1xm2lhdz92n9zmk496lyagisyzja46kx8q340vay9i51krbqiqg4";
|
||||
};
|
||||
|
||||
buildInputs = [ libogg libao pkgconfig libopus ];
|
||||
buildInputs = [ libogg libao pkgconfig libopus flac ];
|
||||
|
||||
meta = {
|
||||
description = "Tools to work with opus encoded audio streams";
|
||||
|
|
|
|||
17
pkgs/applications/audio/opusfile/default.nix
Normal file
17
pkgs/applications/audio/opusfile/default.nix
Normal file
|
|
@ -0,0 +1,17 @@
|
|||
{stdenv, fetchurl, pkgconfig, openssl, libogg, libopus}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "opusfile-0.4";
|
||||
src = fetchurl {
|
||||
url = "http://downloads.xiph.org/releases/opus/${name}.tar.gz";
|
||||
sha256 = "0h4iwyqgid0cibqwzckz3r94qfp09099nk1cx5nz6i3cf08yldlq";
|
||||
};
|
||||
|
||||
buildInputs = [ pkgconfig openssl libogg libopus ];
|
||||
|
||||
meta = {
|
||||
description = "High-level API for decoding and seeking in .opus files";
|
||||
homepage = http://www.opus-codec.org/;
|
||||
license = "BSD";
|
||||
};
|
||||
}
|
||||
|
|
@ -1,14 +1,14 @@
|
|||
{ stdenv, fetchurl, qt4, alsaLib, jackaudio, dbus }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.3.9";
|
||||
version = "0.3.10";
|
||||
name = "qjackctl-${version}";
|
||||
|
||||
# some dependencies such as killall have to be installed additionally
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/qjackctl/${name}.tar.gz";
|
||||
sha256 = "0a4s7lwd5b67qbwv1yck8bw6zz8ffx1gza5fwflfqrfcfl3dds2y";
|
||||
sha256 = "0ch14y3p0x5ss28cpnqcxp42zb2w07d3l1n2sbrkgiz58iy97paw";
|
||||
};
|
||||
|
||||
buildInputs = [ qt4 alsaLib jackaudio dbus ];
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "samplv1-${version}";
|
||||
version = "0.3.2";
|
||||
version = "0.3.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/samplv1/${name}.tar.gz";
|
||||
sha256 = "1j6q3ywbdsyhskc60p7k8ph058ylrrmjmri3q1wr2d2akcaqvb7m";
|
||||
sha256 = "1q4ggcbbz9lfrjh0ybr3grgipjkq6w5fb9gz5k5cryzz92p7ihw9";
|
||||
};
|
||||
|
||||
buildInputs = [ jackaudio libsndfile lv2 qt4 ];
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
, pkgconfig, gtk, libXft, dbus, libpng, libjpeg, libungif
|
||||
, libtiff, librsvg, texinfo, gconf, libxml2, imagemagick, gnutls
|
||||
, alsaLib, cairo
|
||||
, withX ? true
|
||||
, withX ? !stdenv.isDarwin
|
||||
}:
|
||||
|
||||
assert (libXft != null) -> libpng != null; # probably a bug
|
||||
|
|
|
|||
|
|
@ -16,5 +16,6 @@ stdenv.mkDerivation rec {
|
|||
description = "Emacs Speaks Statistics";
|
||||
homepage = "http://ess.r-project.org/";
|
||||
license = stdenv.lib.licenses.gpl2Plus;
|
||||
hydraPlatforms = stdenv.lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
104
pkgs/applications/editors/idea/default.nix
Normal file
104
pkgs/applications/editors/idea/default.nix
Normal file
|
|
@ -0,0 +1,104 @@
|
|||
{ stdenv, fetchurl, makeDesktopItem, makeWrapper, patchelf, p7zip, jdk
|
||||
, coreutils, gnugrep, which, git
|
||||
}:
|
||||
|
||||
let
|
||||
|
||||
buildIdea =
|
||||
{ name, src, description, license }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
inherit name src license;
|
||||
ideaItem = makeDesktopItem {
|
||||
name = "IDEA";
|
||||
exec = "idea";
|
||||
comment = "Integrated Development Environment";
|
||||
desktopName = "IntelliJ IDEA";
|
||||
genericName = "Integrated Development Environment";
|
||||
categories = "Application;Development;";
|
||||
};
|
||||
|
||||
buildInputs = [ makeWrapper patchelf p7zip ];
|
||||
|
||||
buildCommand = ''
|
||||
tar xvzf $src
|
||||
mkdir -p $out
|
||||
cp -a $name $out
|
||||
|
||||
interpreter=$(echo ${stdenv.glibc}/lib/ld-linux*.so.2)
|
||||
|
||||
7z x $out/$name/lib/snappy-java-1.0.5.jar
|
||||
rm $out/$name/lib/snappy-java-1.0.5.jar
|
||||
if [ "${stdenv.system}" == "x86_64-linux" ];then
|
||||
patchelf --set-interpreter $interpreter $out/$name/bin/fsnotifier64
|
||||
patchelf --set-rpath ${stdenv.gcc.gcc}/lib64/ org/xerial/snappy/native/Linux/amd64/libsnappyjava.so
|
||||
else
|
||||
patchelf --set-interpreter $interpreter $out/$name/bin/fsnotifier
|
||||
patchelf --set-rpath ${stdenv.gcc.gcc}/lib/ org/xerial/snappy/native/Linux/i386/libsnappyjava.so
|
||||
fi
|
||||
7z a -tzip $out/$name/lib/snappy-java-1.0.5.jar .
|
||||
|
||||
mkdir -p $out/bin
|
||||
makeWrapper $out/$name/bin/idea.sh $out/bin/idea \
|
||||
--prefix PATH : ${jdk}/bin:${coreutils}/bin:${gnugrep}/bin:${which}/bin:${git}/bin \
|
||||
--prefix LD_RUN_PATH : ${stdenv.gcc.gcc}/lib/ \
|
||||
--prefix JDK_HOME : ${jdk} \
|
||||
--prefix IDEA_JDK : ${jdk}
|
||||
|
||||
mkdir -p $out/share/applications
|
||||
cp ${ideaItem}/share/applications/* $out/share/applications
|
||||
patchShebangs $out
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = http://www.jetbrains.com/idea/;
|
||||
inherit description;
|
||||
inherit license;
|
||||
maintainers = [ stdenv.lib.maintainers.edwtjo ];
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
};
|
||||
};
|
||||
|
||||
in {
|
||||
|
||||
idea_community_1301 = buildIdea {
|
||||
name = "idea-IC-133.331";
|
||||
description = "IntelliJ IDEA 13 Community Edition";
|
||||
license = stdenv.lib.licenses.asl20.shortName;
|
||||
src = fetchurl {
|
||||
url = http://download-ln.jetbrains.com/idea/ideaIC-13.0.1.tar.gz;
|
||||
sha256 = "6f268bb1dbe61ed0274fd2ea9b4b7403f50da11bdde208bcfc8c391d235d7c02";
|
||||
};
|
||||
};
|
||||
|
||||
idea_ultimate_1301 = buildIdea {
|
||||
name = "idea-IU-133.331";
|
||||
description = "IntelliJ IDEA 13 Ultimate Edition";
|
||||
license = stdenv.lib.licenses.unfree;
|
||||
src = fetchurl {
|
||||
url = http://download-ln.jetbrains.com/idea/ideaIU-13.0.1.tar.gz;
|
||||
sha256 = "d3638d97b719773459d5027ba096b52695325b241cbf5e31e535165a5f19849d";
|
||||
};
|
||||
};
|
||||
|
||||
idea_community_13 = buildIdea {
|
||||
name = "idea-IC-133.193";
|
||||
description = "IntelliJ IDEA 13 Community Edition";
|
||||
license = stdenv.lib.licenses.asl20.shortName;
|
||||
src = fetchurl {
|
||||
url = http://download-ln.jetbrains.com/idea/ideaIC-13.tar.gz;
|
||||
sha256 = "5cd88b8effc5e4e55d999df1cec6f54c53b5adf0b88e49400b3a185bef7db13a";
|
||||
};
|
||||
};
|
||||
|
||||
idea_ultimate_13 = buildIdea {
|
||||
name = "idea-IU-133.193";
|
||||
description = "IntelliJ IDEA 13 Ultimate Edition";
|
||||
license = stdenv.lib.licenses.unfree;
|
||||
src = fetchurl {
|
||||
url = http://download-ln.jetbrains.com/idea/ideaIU-13.tar.gz;
|
||||
sha256 = "211a782654d04f2fe5fce9084043edfb8355a7bc4dc41fee7dc79cfe604d4654";
|
||||
};
|
||||
};
|
||||
|
||||
}
|
||||
|
|
@ -18,14 +18,14 @@
|
|||
}:
|
||||
|
||||
let
|
||||
version = "6.8.7-5";
|
||||
version = "6.8.7-6";
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
name = "ImageMagick-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://imagemagick/${name}.tar.xz";
|
||||
sha256 = "1cn1kg7scs6r7r00qlqirhnmqjnmyczbidab3vgqarw9qszh2ri6";
|
||||
sha256 = "0cbfhk184kxdxz5czyyqxac29mbfiahygjji6k97z6hp8ngnqlvh";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
|
|
|||
|
|
@ -5,11 +5,11 @@
|
|||
mesa, libXext, libXpm, libXau, libXxf86vm, pixman, libpthreadstubs, fltk } :
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "cinepaint-1.0";
|
||||
name = "cinepaint-1.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/cinepaint/${name}.tgz";
|
||||
sha256 = "02mbpsykd7sfr9h6c6gxld6i3bdwnsgvm70b5yff01gwi69w2wi7";
|
||||
sha256 = "0b5g4bkq62yiz1cnb2vfij0a8fw5w5z202v5dm4dh89k7cj0yq4w";
|
||||
};
|
||||
|
||||
buildInputs = [ libpng gtk freetype fontconfig lcms flex libtiff libjpeg
|
||||
|
|
|
|||
|
|
@ -4,11 +4,11 @@
|
|||
, python, pygtk, libart_lgpl, libexif, gettext, xlibs }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gimp-2.8.8";
|
||||
name = "gimp-2.8.10";
|
||||
|
||||
src = fetchurl {
|
||||
url = "ftp://ftp.gimp.org/pub/gimp/v2.8/${name}.tar.bz2";
|
||||
md5 = "ef2547c3514a1096931637bd6250635a";
|
||||
sha256 = "1rha8yx0pplfjziqczjrxxp16vsvpmb5ziq3c218s4w9z4cqpzg7";
|
||||
};
|
||||
|
||||
buildInputs =
|
||||
|
|
|
|||
|
|
@ -8,10 +8,10 @@ stdenv.mkDerivation rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/OpenImageIO/oiio/archive/Release-${version}.zip";
|
||||
sha256 = "196iq15waa2yyryiwhf6ynlpqnpknm4cc4azakg01xs70yiphsfl";
|
||||
sha256 = "0v84xna2vp83njxbizlxnindcp2i67xd89kgl9nic1hz6ywlylz6";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
buildInputs = [
|
||||
boost cmake ilmbase libjpeg libpng libtiff opencolorio openexr unzip
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -6,11 +6,11 @@
|
|||
assert gimpSupport -> gimp_2_8 != null;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "xsane-0.998";
|
||||
name = "xsane-0.999";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.xsane.org/download/${name}.tar.gz";
|
||||
sha256 = "0vn2cj85ijgp2v2j2h9xpqmg2jwlbxmwyb88kxhjjakqay02ybm3";
|
||||
sha256 = "0jrb918sfb9jw3vmrz0z7np4q55hgsqqffpixs0ir5nwcwzd50jp";
|
||||
};
|
||||
|
||||
preConfigure = ''
|
||||
|
|
|
|||
|
|
@ -1,18 +1,18 @@
|
|||
{ fetchurl, stdenv, pkgconfig, gtk, gettext, bzip2, zlib
|
||||
, libjpeg, libtiff, cfitsio, exiv2, lcms, gtkimageview }:
|
||||
, libjpeg, libtiff, cfitsio, exiv2, lcms, gtkimageview, lensfun }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "ufraw-0.18";
|
||||
name = "ufraw-0.19.2";
|
||||
|
||||
src = fetchurl {
|
||||
# XXX: These guys appear to mutate uploaded tarballs!
|
||||
url = "mirror://sourceforge/ufraw/${name}.tar.gz";
|
||||
sha256 = "01cjdc748vamjpaw2sbm8a9kwmb2hry4f200j3hlvqg9c6f77zi4";
|
||||
sha256 = "1lxba7pb3vcsq94dwapg9bk9mb3ww6r3pvvcyb0ah5gh2sgzxgkk";
|
||||
};
|
||||
|
||||
buildInputs =
|
||||
[ pkgconfig gtk gtkimageview gettext bzip2 zlib
|
||||
libjpeg libtiff cfitsio exiv2 lcms
|
||||
libjpeg libtiff cfitsio exiv2 lcms lensfun
|
||||
];
|
||||
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -1,14 +1,14 @@
|
|||
{stdenv, fetchurl, cmake, sword, qt4, boost, cluceneCore}:
|
||||
{stdenv, fetchurl, cmake, sword, qt4, boost, clucene_core}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
version = "2.9.1";
|
||||
version = "2.9.2";
|
||||
|
||||
name = "bibletime-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/bibletime/${name}.tar.bz2";
|
||||
sha256 = "1d8kh213rpx4d63sxl5mk1s94xv363l5prrq2kh06cpnl7a8d2ih";
|
||||
sha256 = "1j4kc24qvhqlbqspczmkxvw09mnvgg9m4zs1y9f68505kd0pfg1r";
|
||||
};
|
||||
|
||||
prePatch = ''
|
||||
|
|
@ -16,11 +16,11 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
preConfigure = ''
|
||||
export CLUCENE_HOME=${cluceneCore};
|
||||
export CLUCENE_HOME=${clucene_core};
|
||||
export SWORD_HOME=${sword};
|
||||
'';
|
||||
|
||||
buildInputs = [ cmake sword qt4 boost cluceneCore ];
|
||||
buildInputs = [ cmake sword qt4 boost clucene_core ];
|
||||
|
||||
cmakeFlags = "-DUSE_QT_WEBKIT=ON -DCMAKE_BUILD_TYPE=Debug";
|
||||
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
{ fetchurl, stdenv, openssl, db4, boost, zlib, miniupnpc, qt4 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.8.5";
|
||||
version = "0.8.6";
|
||||
name = "bitcoin-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/bitcoin/${name}-linux.tar.gz";
|
||||
sha256 = "0qqzwx1lihlrj7r08alsyznjfqvwncfm0nnxi1pcx0jyvq83ym44";
|
||||
sha256 = "036xx06gyrfh65rpdapff3viz1f38vzkj7lnhil6fc0s7pjmsjbk";
|
||||
};
|
||||
|
||||
buildInputs = [ openssl db4 boost zlib miniupnpc qt4 ];
|
||||
|
|
|
|||
|
|
@ -4,11 +4,11 @@
|
|||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "calibre-1.14.0";
|
||||
name = "calibre-1.15.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/calibre/${name}.tar.xz";
|
||||
sha256 = "1nwrahh8rkllazwjgwv1a5fxcg0x221760ixm3707ikz33i0qvx6";
|
||||
sha256 = "0kisdrvsbdpfkirg0p8ifzcm7fjidx74xsw4bdb96gry2wmpjwf7";
|
||||
};
|
||||
|
||||
inherit python;
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
{ stdenv, fetchurl, db45, gtk, bzip2 }:
|
||||
{ stdenv, fetchurl, db4, gtk, bzip2 }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "jigdo-0.7.3";
|
||||
|
||||
# Debian sources
|
||||
# Debian sources
|
||||
src = fetchurl {
|
||||
url = http://ftp.de.debian.org/debian/pool/main/j/jigdo/jigdo_0.7.3.orig.tar.gz;
|
||||
sha256 = "1qvqzgzb0dzq82fa1ffs6hyij655rajnfwkljk1y0mnkygnha1xv";
|
||||
|
|
@ -13,12 +13,12 @@ stdenv.mkDerivation {
|
|||
url = http://ftp.de.debian.org/debian/pool/main/j/jigdo/jigdo_0.7.3-2.diff.gz;
|
||||
sha256 = "0jnlzm9m2hjlnw0zs2fv456ml5r2jj2q1lncqbrgg52lq18f6fa3";
|
||||
};
|
||||
|
||||
buildInputs = [ db45 gtk bzip2 ];
|
||||
|
||||
buildInputs = [ db4 gtk bzip2 ];
|
||||
|
||||
configureFlags = "--without-libdb";
|
||||
|
||||
meta = {
|
||||
meta = {
|
||||
description = "Download utility that can fetch files from several sources simultaneously";
|
||||
homepage = http://atterer.net/jigdo/;
|
||||
license = "GPLv2";
|
||||
|
|
|
|||
|
|
@ -1,17 +1,17 @@
|
|||
{ stdenv, fetchurl, pkgconfig, neon, libusb, openssl, udev, avahi, freeipmi
|
||||
, libtool }:
|
||||
, libtool, makeWrapper }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "nut-2.6.5";
|
||||
name = "nut-2.7.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.networkupstools.org/source/2.6/${name}.tar.gz";
|
||||
sha256 = "0gxrzsblx0jc4g9w0903ybwqbv1d79vq5hnks403fvnay4fgg3b1";
|
||||
url = "http://www.networkupstools.org/source/2.7/${name}.tar.gz";
|
||||
sha256 = "1667n9h8jcz7k6h24fn615khqahlq5z22zxs4s0q046rsqxdg9ki";
|
||||
};
|
||||
|
||||
buildInputs = [ neon libusb openssl udev avahi freeipmi libtool ];
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
nativeBuildInputs = [ pkgconfig makeWrapper ];
|
||||
|
||||
configureFlags =
|
||||
[ "--with-all"
|
||||
|
|
@ -21,10 +21,17 @@ stdenv.mkDerivation rec {
|
|||
"--without-cgi"
|
||||
"--without-hal"
|
||||
"--with-systemdsystemunitdir=$(out)/etc/systemd/systemd"
|
||||
"--with-udev-dir=$(out)/etc/udev"
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/nut-scanner --prefix LD_LIBRARY_PATH : \
|
||||
"$out/lib:${neon}/lib:${libusb}/lib:${avahi}/lib:${freeipmi}/lib"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Network UPS Tools";
|
||||
longDescription = ''
|
||||
|
|
@ -33,6 +40,7 @@ stdenv.mkDerivation rec {
|
|||
It uses a layered approach to connect all of the parts.
|
||||
'';
|
||||
homepage = http://www.networkupstools.org/;
|
||||
repositories.git = https://github.com/networkupstools/nut.git;
|
||||
platforms = with stdenv.lib.platforms; linux;
|
||||
maintainers = with stdenv.lib.maintainers; [ pierron ];
|
||||
priority = 10;
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
{stdenv, fetchurl, wxGTK, chmlib}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "xchm-1.18";
|
||||
name = "xchm-1.23";
|
||||
src = fetchurl {
|
||||
url = mirror://sourceforge/xchm/xchm-1.18.tar.gz;
|
||||
sha256 = "1wvvyzqbmj3c6i46x4vpxkawjwmmp276r84ifvlzaj5q4b52g5gw";
|
||||
url = mirror://sourceforge/xchm/xchm-1.23.tar.gz;
|
||||
sha256 = "0qn0fyxcrn30ndq2asx31k0qkx3grbm16fb1y580wd2gjmh5r3wg";
|
||||
};
|
||||
buildInputs = [wxGTK chmlib];
|
||||
|
||||
|
|
|
|||
|
|
@ -4,11 +4,11 @@
|
|||
|
||||
{stdenv, fetchurl, makeWrapper, libX11, pkgconfig, libXaw}:
|
||||
stdenv.mkDerivation rec {
|
||||
name = "xfontsel-1.0.2";
|
||||
name = "xfontsel-1.0.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://xorg/individual/app/${name}.tar.bz2";
|
||||
sha256 = "1a86a08sf0wjrki9ydh7hr5qf6hrixc4ljlxizakjzmx20wvlrks";
|
||||
sha256 = "1grir464hy52a71r3mpm9mzvkf7nwr3vk0b1vc27pd3gp588a38p";
|
||||
};
|
||||
|
||||
buildInputs = [libX11 makeWrapper pkgconfig libXaw];
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
{ stdenv, fetchurl, xorg, ncurses, freetype, fontconfig, pkgconfig }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "xterm-281";
|
||||
name = "xterm-300";
|
||||
|
||||
src = fetchurl {
|
||||
url = "ftp://invisible-island.net/xterm/${name}.tgz";
|
||||
sha256 = "1yrjjya7z5s3fi0iiaxgna35jh0ib2zx1yafyng35jma6qbwhxx7";
|
||||
sha256 = "1k8p7q4d1gpk6zikb8hys8b30yq2v001nlp3r9g40my31ij9al31";
|
||||
};
|
||||
|
||||
buildInputs =
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
{ stdenv, fetchgit, unzip, xulrunner, makeWrapper }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "conkeror-1.0pre-20130817-1";
|
||||
name = "conkeror-1.0pre-20131116-1";
|
||||
|
||||
src = fetchgit {
|
||||
url = git://repo.or.cz/conkeror.git;
|
||||
rev = "refs/tags/debian-1.0--pre+git130817-1";
|
||||
sha256 = "aef3c782ac98c031e7b99852f42538e225e151cd226cde3094823a5cae015fcf";
|
||||
rev = "refs/tags/debian-1.0--pre+git131116-1";
|
||||
sha256 = "6fe0f30487c5bb8f2183dc7c2e15cf29df7cc8b1950b5fc15c26510c74a1f7d3";
|
||||
};
|
||||
|
||||
buildInputs = [ unzip makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
, freetype, fontconfig, file, alsaLib, nspr, nss, libnotify
|
||||
, yasm, mesa, sqlite, unzip, makeWrapper, pysqlite
|
||||
, hunspell, libevent, libstartup_notification, libvpx
|
||||
, cairo, gstreamer, gst_plugins_base
|
||||
, cairo, gstreamer, gst_plugins_base, icu
|
||||
, debugBuild ? false
|
||||
, # If you want the resulting program to call itself "Firefox" instead
|
||||
# of "Shiretoko" or whatever, enable this option. However, those
|
||||
|
|
@ -33,11 +33,7 @@ rec {
|
|||
};
|
||||
|
||||
commonConfigureFlags =
|
||||
[ "--enable-optimize"
|
||||
#"--enable-profiling"
|
||||
(if debugBuild then "--enable-debug" else "--disable-debug")
|
||||
"--enable-strip"
|
||||
"--with-system-jpeg"
|
||||
[ "--with-system-jpeg"
|
||||
"--with-system-zlib"
|
||||
"--with-system-bz2"
|
||||
"--with-system-nspr"
|
||||
|
|
@ -45,18 +41,24 @@ rec {
|
|||
"--with-system-libevent"
|
||||
"--with-system-libvpx"
|
||||
"--with-system-png"
|
||||
"--enable-startup-notification"
|
||||
"--with-system-icu"
|
||||
"--enable-system-ffi"
|
||||
"--enable-system-hunspell"
|
||||
"--enable-system-pixman"
|
||||
"--enable-system-sqlite"
|
||||
"--enable-system-cairo"
|
||||
"--enable-gstreamer"
|
||||
"--enable-startup-notification"
|
||||
# "--enable-content-sandbox" # available since 26.0, but not much info available
|
||||
# "--enable-content-sandbox-reporter" # keeping disabled for now
|
||||
"--disable-crashreporter"
|
||||
"--disable-tests"
|
||||
"--disable-necko-wifi" # maybe we want to enable this at some point
|
||||
"--disable-installer"
|
||||
"--disable-updater"
|
||||
];
|
||||
] ++ (if debugBuild then [ "--enable-debug" "--enable-profiling"]
|
||||
else [ "--disable-debug" "--enable-release"
|
||||
"--enable-optimize" "--enable-strip" ]);
|
||||
|
||||
|
||||
xulrunner = stdenv.mkDerivation rec {
|
||||
|
|
@ -72,7 +74,7 @@ rec {
|
|||
xlibs.libXScrnSaver xlibs.scrnsaverproto pysqlite
|
||||
xlibs.libXext xlibs.xextproto sqlite unzip makeWrapper
|
||||
hunspell libevent libstartup_notification libvpx cairo
|
||||
gstreamer gst_plugins_base
|
||||
gstreamer gst_plugins_base icu
|
||||
];
|
||||
|
||||
configureFlags =
|
||||
|
|
@ -138,7 +140,7 @@ rec {
|
|||
dbus dbus_glib pango freetype fontconfig alsaLib nspr nss libnotify
|
||||
xlibs.pixman yasm mesa sqlite file unzip pysqlite
|
||||
hunspell libevent libstartup_notification libvpx cairo
|
||||
gstreamer gst_plugins_base
|
||||
gstreamer gst_plugins_base icu
|
||||
];
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -1,51 +1,37 @@
|
|||
args :
|
||||
let
|
||||
lib = args.lib;
|
||||
fetchurl = args.fetchurl;
|
||||
doPatchShebangs = args.doPatchShebangs;
|
||||
makeManyWrappers = args.makeManyWrappers;
|
||||
{ stdenv, fetchurl, cmake, pkgconfig, intltool, vala, makeWrapper
|
||||
, gtk3, webkitgtk, librsvg, libnotify
|
||||
, glib_networking, gsettings_desktop_schemas
|
||||
}:
|
||||
|
||||
version = "0.4";
|
||||
release = "4";
|
||||
buildInputs = with args; [
|
||||
intltool python imagemagick gtk3 glib webkit libxml2
|
||||
gtksourceview pkgconfig which gettext makeWrapper
|
||||
file libidn sqlite docutils libnotify libsoup vala
|
||||
kbproto xproto scrnsaverproto libXScrnSaver dbus_glib
|
||||
glib_networking
|
||||
];
|
||||
in
|
||||
rec {
|
||||
src = fetchurl {
|
||||
url = "http://archive.xfce.org/src/apps/midori/${version}/midori-${version}.${release}.tar.bz2";
|
||||
sha256 = "fadd43f76c1c9f6a16483e60a804e58fb6817c6a595b1acdd59bcbdd7b35bca2";
|
||||
};
|
||||
stdenv.mkDerivation rec {
|
||||
name = "midori-0.5.6";
|
||||
|
||||
inherit buildInputs;
|
||||
configureFlags = ["--enable-gtk3"];
|
||||
|
||||
/* doConfigure should be specified separately */
|
||||
phaseNames = ["doUnpack" "setVars" "shebangsHere" "doConfigure"
|
||||
"doMakeInstall" "shebangsInstalled" "wrapWK"
|
||||
];
|
||||
|
||||
setVars = args.fullDepEntry ''
|
||||
export NIX_LDFLAGS="$NIX_LDFLAGS -lnotify"
|
||||
'' [];
|
||||
|
||||
shebangsHere = (doPatchShebangs ".");
|
||||
shebangsInstalled = (doPatchShebangs "$out/bin");
|
||||
wrapWK = (makeManyWrappers "$out/bin/*"
|
||||
''
|
||||
--set WEBKIT_IGNORE_SSL_ERRORS 1 \
|
||||
--prefix GIO_EXTRA_MODULES : "${args.glib_networking}/lib/gio/modules"
|
||||
'');
|
||||
|
||||
name = "midori-${version}.${release}";
|
||||
meta = {
|
||||
description = "Light WebKit-based web browser with GTK GUI";
|
||||
maintainers = [args.lib.maintainers.raskin];
|
||||
platforms = with args.lib.platforms;
|
||||
linux;
|
||||
description = "Lightweight WebKitGTK+ web browser";
|
||||
homepage = "http://www.midori-browser.org";
|
||||
license = stdenv.lib.licenses.lgpl21Plus;
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
maintainers = with stdenv.lib.maintainers; [ raskin iyzsong ];
|
||||
};
|
||||
|
||||
src = fetchurl {
|
||||
url = "${meta.homepage}/downloads/midori_0.5.6_all_.tar.bz2";
|
||||
sha256 = "0jpj8cw0dzamzylzslayamjhv0is0xd99dyaql4nyxrkk5fipgn5";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
cmake pkgconfig intltool vala makeWrapper
|
||||
webkitgtk librsvg libnotify
|
||||
];
|
||||
|
||||
cmakeFlags = ''
|
||||
-DHALF_BRO_INCOM_WEBKIT2=ON
|
||||
-DUSE_ZEITGEIST=OFF
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/midori \
|
||||
--prefix GIO_EXTRA_MODULES : "${glib_networking}/lib/gio/modules" \
|
||||
--prefix XDG_DATA_DIRS : "${gtk3}/share:${gsettings_desktop_schemas}/share"
|
||||
'';
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchurl, pkgconfig, openssl, glib, libX11, gtk3, gettext, intltool }:
|
||||
{ stdenv, fetchurl, pkgconfig, openssl, glib, libX11, gtk2, gettext, intltool }:
|
||||
|
||||
let version = "1.0.2"; in
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "d7cd9adf04fedf50b266a5c14ddb427cbb263d3bc160ee0ade03aca9d5356e5c";
|
||||
};
|
||||
|
||||
buildInputs = [ pkgconfig openssl libX11 gtk3 glib gettext intltool ];
|
||||
buildInputs = [ pkgconfig openssl libX11 gtk2 glib gettext intltool ];
|
||||
patches = [
|
||||
./translation-xgettext-to-intltool.patch
|
||||
./plugin-linkfix.patch
|
||||
|
|
|
|||
|
|
@ -3,11 +3,11 @@
|
|||
assert builtins.compareVersions "4.8.3" kde4.release != 1; # https://bugs.kde.org/show_bug.cgi?id=306077
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "rekonq-1.70"; # >=1.80 need kde >=4.9.0
|
||||
name = "rekonq-1.80"; # >=1.80 need kde >=4.9.0
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/rekonq/${name}.tar.bz2";
|
||||
sha256 = "05zqm329vajsn32l5b5nlbw92gl3irdcx8kifr4y921i9bkzigad";
|
||||
sha256 = "1lzmg8psy1j1v8vrmsyw609jv9scgnigdivx97fb4spb7x6sxn4g";
|
||||
};
|
||||
|
||||
buildInputs = [ kde4.kdelibs qca2 qoauth ];
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
{ stdenv, fetchurl, pidgin} :
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "pidgin-msn-pecan-0.1.0";
|
||||
name = "pidgin-msn-pecan-0.1.4";
|
||||
src = fetchurl {
|
||||
url = http://msn-pecan.googlecode.com/files/msn-pecan-0.1.0.tar.bz2;
|
||||
sha256 = "06cgkdlv2brv2g5hpx8g8p6j296cnvd29l8fap30i1k0mznbjxf4";
|
||||
url = http://msn-pecan.googlecode.com/files/msn-pecan-0.1.4.tar.bz2;
|
||||
sha256 = "0d43z2ay9is1r2kkc9my8pz0fwdyzv7k19vdmbird18lg7rlbjd2";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "telepathy-haze";
|
||||
name = "${pname}-0.7.0";
|
||||
name = "${pname}-0.8.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://telepathy.freedesktop.org/releases/${pname}/${name}.tar.gz";
|
||||
sha256 = "1gaj8518ilm3gnzqf3lmiqgnwkay8wfbsqngcz15whzji8sl608b";
|
||||
sha256 = "1jgrp32p6rllj089ynbsk3n9xrvsvzmwzhf0ql05kkgj0nf08xiy";
|
||||
};
|
||||
|
||||
buildInputs = [ glib telepathy_glib dbus_glib pidgin ];
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
{ stdenv, fetchurl, pkgconfig, telepathy_glib, libxslt }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "${pname}-5.14.1";
|
||||
name = "${pname}-5.16.0";
|
||||
pname = "telepathy-mission-control";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://telepathy.freedesktop.org/releases/${pname}/${name}.tar.gz";
|
||||
sha256 = "1jqzby5sr09bprp3fyr8w65rcv9ljc045rp7lm9ik89wkhcw05jb";
|
||||
sha256 = "1l61w6j04mbrjsbcfrlc0safh9nlsjnj0z6lszal64r9bhkcghzd";
|
||||
};
|
||||
|
||||
buildInputs = [ telepathy_glib ];
|
||||
|
|
|
|||
|
|
@ -3,11 +3,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "telepathy-rakia";
|
||||
name = "${pname}-0.7.4";
|
||||
name = "${pname}-0.8.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "${meta.homepage}/releases/${pname}/${name}.tar.gz";
|
||||
sha256 = "11cmmdq31kivm6nsv61hxy3hxnnmbd8sj55xqwx9hyqzybh70dyf";
|
||||
sha256 = "18dxffa8hhjyvqkhhac05rrkx81vnncjrakg5ygikfp0j79vrbhv";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [pkgconfigUpstream libxslt python];
|
||||
|
|
|
|||
|
|
@ -3,11 +3,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "telepathy-salut";
|
||||
name = "${pname}-0.8.0";
|
||||
name = "${pname}-0.8.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://telepathy.freedesktop.org/releases/${pname}/${name}.tar.gz";
|
||||
sha256 = "1kmmpwjbfph37bjvpkfphff8dzhr896i55knf311f778fbsgl17m";
|
||||
sha256 = "13k112vrr3zghzr03pnbqc1id65qvpj0sn0virlbf4dmr2511fbh";
|
||||
};
|
||||
|
||||
buildInputs = [ glib libxml2 telepathy_glib avahi libsoup libuuid gnutls
|
||||
|
|
|
|||
|
|
@ -12,11 +12,11 @@ let
|
|||
buildInputs = map (n: builtins.getAttr n x)
|
||||
(builtins.attrNames (builtins.removeAttrs x helperArgNames));
|
||||
sourceInfo = rec {
|
||||
version="1.2.0";
|
||||
version="1.2.3";
|
||||
baseName="vacuum-im";
|
||||
name="${baseName}-${version}";
|
||||
url="http://vacuum-im.googlecode.com/files/vacuum-${version}.tar.xz";
|
||||
hash="55a2c27aaaf79c7a4de127c22d3845ede35970283d35ee57fd5ceca581b085fc";
|
||||
hash="037k2b2kkp2ywkrshqa0fj18mkd2jq60x4x62kzbrsvb85qcbbxh";
|
||||
};
|
||||
in
|
||||
rec {
|
||||
|
|
|
|||
|
|
@ -5,14 +5,14 @@
|
|||
, unrar, p7zip, par2cmdline, coreutils
|
||||
}:
|
||||
|
||||
let version = "0.8.1";
|
||||
let version = "0.8.4";
|
||||
name = "kwooty-${version}";
|
||||
in stdenv.mkDerivation {
|
||||
inherit name;
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/kwooty/${name}.tar.gz";
|
||||
sha256 = "746ed50ec3c067711932c89dc3ee5527c126f37c6922b3eda49535eb83c245e4";
|
||||
sha256 = "0i3zmh7y52n5k0yn3xc6zjpjz75f48nly40n394i6sxy89psgfc2";
|
||||
};
|
||||
|
||||
patches = [ ./searchPath.patch ];
|
||||
|
|
|
|||
|
|
@ -1,25 +1,21 @@
|
|||
{ stdenv, fetchurl, perl, pkgconfig, gtk, libpcap, flex, bison
|
||||
, gnutls, libgcrypt, glib, zlib, libxml2, libxslt, adns, geoip
|
||||
, heimdal, python, lynx, lua5
|
||||
, makeDesktopItem
|
||||
{ stdenv, fetchurl, pkgconfig, perl, flex, bison, libpcap, libnl, c-ares, gnutls, libgcrypt
|
||||
, geoip, heimdal, lua5, gtk, makeDesktopItem
|
||||
}:
|
||||
|
||||
let version = "1.8.11"; in
|
||||
let version = "1.10.3"; in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "wireshark-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/wireshark/wireshark-${version}.tar.bz2";
|
||||
sha256 = "1nwgizs9z1dalicpp2fd9pqafidy49j0v3d1rml0spfqrkbjpfpw";
|
||||
sha256 = "1329zph63z5mcij9lp111bh6b2w88z3d40gvjld2rjmhmqv1nr61";
|
||||
};
|
||||
|
||||
buildInputs =
|
||||
[ perl pkgconfig gtk libpcap flex bison gnutls libgcrypt
|
||||
glib zlib libxml2 libxslt adns geoip heimdal python lynx lua5
|
||||
];
|
||||
[ bison flex perl pkgconfig libpcap lua5 heimdal libgcrypt gnutls geoip libnl c-ares gtk ];
|
||||
|
||||
configureFlags = "--disable-usr-local --with-ssl --enable-threads --enable-packet-editor";
|
||||
configureFlags = "--disable-usr-local --enable-packet-editor --with-ssl";
|
||||
|
||||
desktopItem = makeDesktopItem {
|
||||
name = "Wireshark";
|
||||
|
|
|
|||
|
|
@ -1,26 +1,35 @@
|
|||
{ stdenv, fetchurl
|
||||
, bzip2, glib, goffice, gtk3, intltool, libglade, libgsf, libxml2
|
||||
, pango, pkgconfig, scrollkeeper, zlib
|
||||
{ stdenv, fetchurl, pkgconfig, intltool, perl, perlXMLParser
|
||||
, goffice, makeWrapper, gtk3, gnome_icon_theme
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gnumeric-1.12.0";
|
||||
name = "gnumeric-1.12.9";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnumeric/1.12/${name}.tar.xz";
|
||||
sha256 = "037b53d909e5d1454b2afda8c4fb1e7838e260343e36d4e36245f4a5d0e04111";
|
||||
sha256 = "1rv2ifw6rp0iza4fkf3bffvdkyi77dwvzdnvcbpqcyn2kxfsvlsc";
|
||||
};
|
||||
|
||||
preConfigure = ''sed -i 's/\(SUBDIRS.*\) doc/\1/' Makefile.in''; # fails when installing docs
|
||||
|
||||
configureFlags = "--disable-component";
|
||||
|
||||
# ToDo: optional libgda, python, introspection?
|
||||
buildInputs = [
|
||||
bzip2 glib goffice gtk3 intltool libglade libgsf libxml2
|
||||
pango pkgconfig scrollkeeper zlib
|
||||
pkgconfig intltool perl perlXMLParser
|
||||
goffice gtk3 makeWrapper
|
||||
];
|
||||
|
||||
meta = {
|
||||
postInstall = ''
|
||||
wrapProgram "$out"/bin/gnumeric-* \
|
||||
--prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome_icon_theme}/share"
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "The GNOME Office Spreadsheet";
|
||||
license = "GPLv2+";
|
||||
homepage = http://projects.gnome.org/gnumeric/;
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.vcunat ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
, xpdf, pil, pyopengl, pygame
|
||||
, setuptools, mesa, freeglut }:
|
||||
|
||||
let version = "0.10.2";
|
||||
let version = "0.10.3";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
# This project was formerly known as KeyJNote.
|
||||
|
|
@ -12,7 +12,7 @@ in
|
|||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/impressive/Impressive-${version}.tar.gz";
|
||||
sha256 = "1py36h9085ycxj3qnmqdps0dfghlr5qb2i62l0ynzngn55dgz950";
|
||||
sha256 = "0ppr9bckswpi3gav56dhrk91ibxvqbfhpxmm0zikzpxhdlvnaj5v";
|
||||
};
|
||||
|
||||
# Note: We need to have `setuptools' in the path to be able to use
|
||||
|
|
|
|||
|
|
@ -1,15 +1,15 @@
|
|||
{ stdenv, fetchgit, cmake, boost, gmp, mpfr, libedit, python, texinfo }:
|
||||
|
||||
let
|
||||
rev = "0e5867bc5c";
|
||||
rev = "8d38060968";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
name = "ledger3-2013.11.${rev}";
|
||||
name = "ledger3-2013.12.${rev}";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://github.com/ledger/ledger.git";
|
||||
inherit rev;
|
||||
sha256 = "16aa63z24rp5vin7al8b6nzdi4kqpawbzvh148wfr2wj60vdb1n5";
|
||||
sha256 = "e100f28d18e1804fc8aa8b0141cc33d6d95bbe329e803ba887622ac5f8d3d972";
|
||||
};
|
||||
|
||||
buildInputs = [ cmake boost gmp mpfr libedit python texinfo ];
|
||||
|
|
|
|||
|
|
@ -3,11 +3,11 @@
|
|||
, zlib, libpng, xorg, cairo, podofo, aspell, boostHeaders, cmake }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "scribus-1.4.1";
|
||||
name = "scribus-1.4.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/scribus/scribus/${name}.tar.xz";
|
||||
sha256 = "1n67z2bk5ca2sxvv43jvj7yygfr4d2x5yc69zk70v38prm0gqlv8";
|
||||
sha256 = "1zxgl2g299rllfy5ihs5skicpv7zcmz149ahraami69gqcag6bn7";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
|
|
|||
|
|
@ -1,16 +1,16 @@
|
|||
{ stdenv, fetchurl, cmake, qt4, zlib, eigen, openbabel, pkgconfig, mesa, libX11 }:
|
||||
{ stdenv, fetchurl, cmake, qt4, zlib, eigen, openbabel, pkgconfig, mesa, libX11, doxygen }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "avogadro-1.0.3";
|
||||
name = "avogadro-1.1.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/avogadro/${name}.tar.bz2";
|
||||
sha256 = "0s44r78vm7hf4cs13d2qki3gf178gjj1ihph6rs04g6s4figvdpg";
|
||||
sha256 = "050ag9p4vg7jg8hj1wqfv7lsm6ar2isxjw2vw85s49vsl7g7nvzy";
|
||||
};
|
||||
|
||||
buildInputs = [ qt4 eigen zlib openbabel mesa libX11 ];
|
||||
|
||||
nativeBuildInputs = [ cmake pkgconfig ];
|
||||
nativeBuildInputs = [ cmake pkgconfig doxygen ];
|
||||
|
||||
NIX_CFLAGS_COMPILE = "-include ${mesa}/include/GL/glu.h";
|
||||
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
{stdenv, fetchurl, gtk, gperf, pkgconfig, bzip2, tcl, tk, judy, xz}:
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gtkwave-3.3.39";
|
||||
name = "gtkwave-3.3.53";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/gtkwave/${name}.tar.gz";
|
||||
sha256 = "1va506anlbpbha7l6h94s44xjdy6ch22iv629swn4bh5m3qi33bg";
|
||||
sha256 = "1jmrk2p2azjca250h2bi4c8v0cp1gqd3c027dx18sxy3cgw1fsp1";
|
||||
};
|
||||
|
||||
buildInputs = [ gtk gperf pkgconfig bzip2 tcl tk judy xz ];
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
{stdenv, fetchurl, readline, bison, libX11, libICE, libXaw, libXext}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "ng-spice-rework-24";
|
||||
name = "ng-spice-rework-25";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/ngspice/ngspice-24.tar.gz";
|
||||
sha256 = "0rgh75hbqrsljz767whbj65wi6369yc286v0qk8jxnv2da7p9ll6";
|
||||
url = "mirror://sourceforge/ngspice/ngspice-25.tar.gz";
|
||||
sha256 = "03hlxwvl2j1wlb5yg4swvmph9gja37c2gqvwvzv6z16vg2wvn06h";
|
||||
};
|
||||
|
||||
buildInputs = [ readline libX11 bison libICE libXaw libXext ];
|
||||
|
|
|
|||
|
|
@ -12,10 +12,10 @@ let
|
|||
++ [(a.lib.overrideDerivation x.gmp (y: {dontDisableStatic=true;}))];
|
||||
sourceInfo = rec {
|
||||
baseName="cvc3";
|
||||
version="2.2";
|
||||
version="2.4.1";
|
||||
name="${baseName}-${version}";
|
||||
url="http://www.cs.nyu.edu/acsys/cvc3/releases/${version}/${name}.tar.gz";
|
||||
hash="1dw12d5vrixfr6l9j6j7026vrr22zb433xyl6n5yxx4hgfywi0ji";
|
||||
hash="1xxcwhz3y6djrycw8sm6xz83wb4hb12rd1n0skvc7fng0rh1snym";
|
||||
};
|
||||
in
|
||||
rec {
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
{stdenv, fetchurl, gfortran, liblapack, blas}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "JAGS-2.2.0";
|
||||
name = "JAGS-3.4.0";
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/mcmc-jags/${name}.tar.gz";
|
||||
sha256 = "016xml4k99lmdwwjiabxin95k9p3q2zh4pcci8wwcqwlq5y205b6";
|
||||
sha256 = "0ayqsz9kkmbss7mxlwr34ch2z1vsb65lryjzqpprab1ccyiaksib";
|
||||
};
|
||||
buildInputs = [gfortran liblapack blas];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
{ stdenv, fetchurl, gmp, readline }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "pari-2.5.4";
|
||||
name = "pari-2.5.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://pari.math.u-bordeaux.fr/pub/pari/unix/${name}.tar.gz";
|
||||
sha256 = "0gpsj5n8d1gyl7nq2y915sscs3d334ryrv8qgjdwqf3cr95f2dwz";
|
||||
sha256 = "058nw1fhggy7idii4f124ami521lv3izvngs9idfz964aks8cvvn";
|
||||
};
|
||||
|
||||
buildInputs = [gmp readline];
|
||||
|
|
|
|||
|
|
@ -6,11 +6,11 @@
|
|||
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "gromacs-4.5.5";
|
||||
name = "gromacs-4.6.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "ftp://ftp.gromacs.org/pub/gromacs/gromacs-4.5.5.tar.gz";
|
||||
md5 = "6a87e7cdfb25d81afa9fea073eb28468";
|
||||
url = "ftp://ftp.gromacs.org/pub/gromacs/gromacs-4.6.5.tar.gz";
|
||||
sha256 = "02ggrplh8fppqib86y3rfk4qm08yddlrb1yjgzl138b3b4qjy957";
|
||||
};
|
||||
|
||||
buildInputs = [cmake fftw];
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
args : with args;
|
||||
|
||||
rec {
|
||||
version = "2.2.0";
|
||||
version = "2.5";
|
||||
src = fetchurl {
|
||||
url = "http://launchpad.net/bzrtools/stable/${version}/+download/bzrtools-${version}.tar.gz";
|
||||
sha256 = "835e0dc2b3b798d3c88b960bf719fe3b4cec7ae241908aafeb6aafe4c83f591b";
|
||||
sha256 = "0gzh63vl9006cpklszwmsymrq5ddxxrnxwbv5bwi740jlvxzdkxw";
|
||||
};
|
||||
|
||||
buildInputs = [];
|
||||
|
|
|
|||
|
|
@ -14,8 +14,8 @@
|
|||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "git-annex";
|
||||
version = "5.20131213";
|
||||
sha256 = "0mwslkz0kklp4phlsf8hibh97sabdnigls7hr9725wb0ncfa85yn";
|
||||
version = "5.20131221";
|
||||
sha256 = "1gkb8fc0fjjn0rigajgliqy381pmkpx4ha1rx65dcw15rqnrawb3";
|
||||
isLibrary = false;
|
||||
isExecutable = true;
|
||||
buildDepends = [
|
||||
|
|
@ -42,11 +42,15 @@ cabal.mkDerivation (self: {
|
|||
-fDNS
|
||||
-fProduction
|
||||
-fTDFA";
|
||||
preConfigure = "patchShebangs .";
|
||||
installPhase = "./Setup install";
|
||||
checkPhase = ''
|
||||
doCheck = false;
|
||||
installPhase = ''
|
||||
export HOME="$NIX_BUILD_TOP/tmp"
|
||||
mkdir "$HOME"
|
||||
./Setup install
|
||||
'';
|
||||
checkPhase = ''
|
||||
cp dist/build/git-annex/git-annex git-annex
|
||||
./git-annex test
|
||||
'';
|
||||
meta = {
|
||||
homepage = "http://git-annex.branchable.com/";
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
let
|
||||
|
||||
version = "1.8.5.1";
|
||||
version = "1.8.5.2";
|
||||
|
||||
svn = subversionClient.override { perlBindings = true; };
|
||||
|
||||
|
|
@ -21,7 +21,7 @@ stdenv.mkDerivation {
|
|||
|
||||
src = fetchurl {
|
||||
url = "http://git-core.googlecode.com/files/git-${version}.tar.gz";
|
||||
sha256 = "0i7fz0b79f3algs68m15wg4bq99ayg1crpy66cqylxq3mzbw8n8m";
|
||||
sha256 = "12iyj6f89dmb1cn2pvym5lrf23g4m71mp9pwkbi1zscb9d998ih2";
|
||||
};
|
||||
|
||||
patches = [ ./docbook2texi.patch ./symlinks-in-bin.patch ];
|
||||
|
|
|
|||
23
pkgs/applications/version-management/git-repo/default.nix
Normal file
23
pkgs/applications/version-management/git-repo/default.nix
Normal file
|
|
@ -0,0 +1,23 @@
|
|||
{ stdenv, fetchurl, python }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "git-repo-1.20";
|
||||
src = fetchurl {
|
||||
# I could not find a versioned url for the 1.20 version. In case
|
||||
# the sha mismatches, check the homepage for new version and sha.
|
||||
url = "http://commondatastorage.googleapis.com/git-repo-downloads/repo";
|
||||
sha1 = "e197cb48ff4ddda4d11f23940d316e323b29671c";
|
||||
};
|
||||
|
||||
unpackPhase = "true";
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
sed -e 's,!/usr/bin/env python,!${python}/bin/python,' < $src > $out/bin/repo
|
||||
chmod +x $out/bin/repo
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "http://source.android.com/source/downloading.html";
|
||||
description = "Android's repo management tool";
|
||||
};
|
||||
}
|
||||
|
|
@ -1,20 +1,19 @@
|
|||
{ stdenv, fetchurl, gettext, apr, aprutil, subversion, db4, kdelibs, expat }:
|
||||
|
||||
# the homepage mentions this is the final release.
|
||||
# from now on, kdesvn will be part of the official kde software distribution
|
||||
stdenv.mkDerivation rec {
|
||||
name = "kdesvn-1.5.5";
|
||||
name = "kdesvn-1.6.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "${meta.homepage}/downloads/${name}.tar.bz2";
|
||||
sha256 = "02sb34p04dyd88ksxvpiffhxqwmhs3yv1wif9m8w0fly9hvy1zk7";
|
||||
src = fetchurl rec {
|
||||
url = "http://pkgs.fedoraproject.org/repo/pkgs/kdesvn/${name}.tar.bz2/${md5}/${name}.tar.bz2";
|
||||
md5 = "7e6adc98ff4777a06d5752d3f2b58fa3";
|
||||
};
|
||||
|
||||
prePatch = ''
|
||||
sed -i -e "s|/usr|${subversion}|g" src/svnqt/cmakemodules/FindSubversion.cmake
|
||||
'';
|
||||
|
||||
patches = [ ./docbook.patch ./virtual_inheritance.patch ];
|
||||
|
||||
|
||||
buildInputs = [ apr aprutil subversion db4 kdelibs expat ];
|
||||
|
||||
nativeBuildInputs = [ gettext ];
|
||||
|
|
|
|||
|
|
@ -1,13 +0,0 @@
|
|||
The name of the dtd changed in kdelibs 4.5, so we need to increase it.
|
||||
|
||||
diff --git a/doc/nl/index.docbook b/doc/nl/index.docbook
|
||||
index 8747869..a9676aa 100644
|
||||
--- a/doc/nl/index.docbook
|
||||
+++ b/doc/nl/index.docbook
|
||||
@@ -1,5 +1,5 @@
|
||||
<?xml version="1.0" ?>
|
||||
-<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
|
||||
+<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
|
||||
<!ENTITY kdesvn "<application>kdesvn</application>">
|
||||
<!ENTITY kappname "&kdesvn;"><!-- Do *not* replace kappname-->
|
||||
<!ENTITY package "kde-module"><!-- kdebase, kdeadmin, etc -->
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
--- kdesvn-1.5.5.orig/src/svnfrontend/graphtree/revgraphview.h
|
||||
+++ kdesvn-1.5.5/src/svnfrontend/graphtree/revgraphview.h
|
||||
@@ -49,7 +49,7 @@ typedef svn::SharedPointer<KTemporaryFil
|
||||
/**
|
||||
@author Rajko Albrecht <ral@alwins-world.de>
|
||||
*/
|
||||
-class RevGraphView : virtual public QGraphicsView
|
||||
+class RevGraphView : public QGraphicsView
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
59
pkgs/applications/video/aegisub/default.nix
Normal file
59
pkgs/applications/video/aegisub/default.nix
Normal file
|
|
@ -0,0 +1,59 @@
|
|||
{ stdenv, fetchurl
|
||||
, libX11, gettext, wxGTK
|
||||
, libiconv, fontconfig, freetype
|
||||
, mesa
|
||||
, libass, fftw, ffms
|
||||
, ffmpeg, pkgconfig, zlib # Undocumented (?) dependencies
|
||||
, spellChecking ? true, hunspell ? null
|
||||
, automationSupport ? true, lua ? null
|
||||
, openalSupport ? false, openal ? null
|
||||
, alsaSupport ? true, alsaLib ? null
|
||||
, pulseaudioSupport ? true, pulseaudio ? null
|
||||
, portaudioSupport ? false, portaudio ? null
|
||||
}:
|
||||
|
||||
assert spellChecking -> (hunspell != null);
|
||||
assert automationSupport -> (lua != null);
|
||||
assert openalSupport -> (openal != null);
|
||||
assert alsaSupport -> (alsaLib != null);
|
||||
assert pulseaudioSupport -> (pulseaudio != null);
|
||||
assert portaudioSupport -> (portaudio != null);
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "aegisub-${version}";
|
||||
version = "3.0.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://ftp.aegisub.org/pub/releases/${name}.tar.xz";
|
||||
md5 = "0f22d63ed4c502f3801795fa623a4f41";
|
||||
};
|
||||
|
||||
buildInputs = with stdenv.lib;
|
||||
[ libX11 gettext wxGTK libiconv fontconfig freetype mesa libass fftw ffms ffmpeg pkgconfig zlib ]
|
||||
++ optional spellChecking hunspell
|
||||
++ optional automationSupport lua
|
||||
++ optional openalSupport openal
|
||||
++ optional alsaSupport alsaLib
|
||||
++ optional pulseaudioSupport pulseaudio
|
||||
++ optional portaudioSupport portaudio
|
||||
;
|
||||
|
||||
NIX_LDFLAGS = "-liconv -lavutil -lavformat -lavcodec -lswscale -lz -lm";
|
||||
|
||||
preConfigure = "cd aegisub";
|
||||
|
||||
postInstall = "ln -s $out/bin/aegisub-3.0 $out/bin/aegisub";
|
||||
|
||||
meta = {
|
||||
description = "An advanced subtitle editor";
|
||||
longDescription = ''
|
||||
Aegisub is a free, cross-platform open source tool for creating and
|
||||
modifying subtitles. Aegisub makes it quick and easy to time subtitles to
|
||||
audio, and features many powerful tools for styling them, including a
|
||||
built-in real-time video preview.
|
||||
'';
|
||||
homepage = http://www.aegisub.org/;
|
||||
license = "BSD"; # The Aegisub sources are itself BSD/ISC, but they are linked against GPL'd softwares
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
@ -66,12 +66,12 @@ let
|
|||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "mplayer2-20130130";
|
||||
name = "mplayer2-20130428";
|
||||
|
||||
src = fetchgit {
|
||||
url = "git://git.mplayer2.org/mplayer2.git";
|
||||
rev = "d3c580156c0b8777ff082426ebd61bb7ffe0c225";
|
||||
sha256 = "1akf2mb2zklz609ks555vjvcs1gw8nwg5kbb9jwra8c4v1dfyhys";
|
||||
rev = "6c87a981baa4972fd71c25dfddea017b5a972e89";
|
||||
sha256 = "b09c1331141dd0939dfa424ae14dc0bdf82c8a72bb32c78e3ad15e3ee1d2c851";
|
||||
};
|
||||
|
||||
prePatch = ''
|
||||
|
|
|
|||
|
|
@ -55,11 +55,12 @@ let
|
|||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "mpv-20130812";
|
||||
name = "mpv-20131222";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://github.com/mpv-player/mpv.git";
|
||||
rev = "62925a5c15a76568c155259bafa1361ec139c66b";
|
||||
rev = "e6bea0ec5a";
|
||||
sha256 = "984c7d19b1916b7e5befc370ffb7f6c31e560c64c47090b924a115d00c35a1a8";
|
||||
};
|
||||
|
||||
buildInputs = with stdenv.lib;
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
{ stdenv, fetchurl, qt4 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "smplayer-0.8.5";
|
||||
name = "smplayer-0.8.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/smplayer/${name}.tar.bz2";
|
||||
sha256 = "0vbfvaqg5c25vabq1mf9xg6kzgvxnpd0i172y1gjznnlpcw2fxrw";
|
||||
sha256 = "1p70929j8prc4mgqxvsbcjxy8zwp4r9jk0mp0iddxl7vfyck74g0";
|
||||
};
|
||||
|
||||
buildInputs = [ qt4 ];
|
||||
|
|
|
|||
|
|
@ -2,30 +2,31 @@
|
|||
, cairo, libxcb, libXcursor, x11, udev, libdrm, mtdev
|
||||
, libjpeg, pam, autoconf, automake, libtool }:
|
||||
|
||||
let version = "1.0.5"; in
|
||||
let version = "1.3.1"; in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "weston-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://wayland.freedesktop.org/releases/${name}.tar.xz";
|
||||
sha256 = "0g2k82pnlxl8b70ykazj7kn8xffjfsmgcgx427qdrm4083z2hgm0";
|
||||
sha256 = "1isvh66irrz707r69495767n5yxp07dvy0xx6mj1mbj1n4s1657p";
|
||||
};
|
||||
|
||||
buildInputs = [ pkgconfig wayland mesa libxkbcommon
|
||||
cairo libxcb libXcursor x11 udev libdrm mtdev
|
||||
libjpeg pam autoconf automake libtool ];
|
||||
buildInputs = [
|
||||
pkgconfig wayland mesa libxkbcommon
|
||||
cairo libxcb libXcursor x11 udev libdrm mtdev libjpeg pam
|
||||
];
|
||||
|
||||
preConfigure = "autoreconf -vfi";
|
||||
NIX_CFLAGS_COMPILE = "-I${libdrm}/include/libdrm";
|
||||
|
||||
# prevent install target to chown root weston-launch, which fails
|
||||
configureFlags = ''
|
||||
--disable-setuid-install
|
||||
'';
|
||||
configureFlags = [
|
||||
"--disable-setuid-install" # prevent install target to chown root weston-launch, which fails
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Reference implementation of a Wayland compositor";
|
||||
homepage = http://wayland.freedesktop.org/;
|
||||
license = stdenv.lib.licenses.mit;
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -13,6 +13,12 @@ cabal.mkDerivation (self: {
|
|||
mkdir -p $out/share/man/man1
|
||||
mv $out/share/xmonad-*/man/*.1 $out/share/man/man1/
|
||||
'';
|
||||
|
||||
patches = [
|
||||
# Patch to make xmonad use XMONAD_{GHC,XMESSAGE} (if available).
|
||||
./xmonad_ghc_var_0.11.patch
|
||||
];
|
||||
|
||||
meta = {
|
||||
homepage = "http://xmonad.org";
|
||||
description = "A tiling window manager";
|
||||
|
|
|
|||
|
|
@ -0,0 +1,44 @@
|
|||
--- xmonad-0.11/XMonad/Core.hs 2013-01-01 01:31:47.000000000 +0000
|
||||
+++ new-xmonad/XMonad/Core.hs 2013-12-23 17:36:40.862146910 +0000
|
||||
@@ -47,6 +47,7 @@
|
||||
import System.Process
|
||||
import System.Directory
|
||||
import System.Exit
|
||||
+import System.Environment (lookupEnv)
|
||||
import Graphics.X11.Xlib
|
||||
import Graphics.X11.Xlib.Extras (Event)
|
||||
import Data.Typeable
|
||||
@@ -452,6 +453,7 @@
|
||||
err = base ++ ".errors"
|
||||
src = base ++ ".hs"
|
||||
lib = dir </> "lib"
|
||||
+ ghc <- fromMaybe "ghc" <$> liftIO (lookupEnv "XMONAD_GHC")
|
||||
libTs <- mapM getModTime . Prelude.filter isSource =<< allFiles lib
|
||||
srcT <- getModTime src
|
||||
binT <- getModTime bin
|
||||
@@ -460,7 +462,7 @@
|
||||
-- temporarily disable SIGCHLD ignoring:
|
||||
uninstallSignalHandlers
|
||||
status <- bracket (openFile err WriteMode) hClose $ \h ->
|
||||
- waitForProcess =<< runProcess "ghc" ["--make", "xmonad.hs", "-i", "-ilib", "-fforce-recomp", "-v0", "-o",binn] (Just dir)
|
||||
+ waitForProcess =<< runProcess ghc ["--make", "xmonad.hs", "-i", "-ilib", "-fforce-recomp", "-v0", "-o",binn] (Just dir)
|
||||
Nothing Nothing Nothing (Just h)
|
||||
|
||||
-- re-enable SIGCHLD:
|
||||
@@ -469,6 +471,7 @@
|
||||
-- now, if it fails, run xmessage to let the user know:
|
||||
when (status /= ExitSuccess) $ do
|
||||
ghcErr <- readFile err
|
||||
+ xmessage <- fromMaybe "xmessage" <$> liftIO (lookupEnv "XMONAD_XMESSAGE")
|
||||
let msg = unlines $
|
||||
["Error detected while loading xmonad configuration file: " ++ src]
|
||||
++ lines (if null ghcErr then show status else ghcErr)
|
||||
@@ -476,7 +479,7 @@
|
||||
-- nb, the ordering of printing, then forking, is crucial due to
|
||||
-- lazy evaluation
|
||||
hPutStrLn stderr msg
|
||||
- forkProcess $ executeFile "xmessage" True ["-default", "okay", msg] Nothing
|
||||
+ forkProcess $ executeFile xmessage True ["-default", "okay", msg] Nothing
|
||||
return ()
|
||||
return (status == ExitSuccess)
|
||||
else return True
|
||||
|
|
@ -1,11 +1,11 @@
|
|||
{ stdenv, fetchurl }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "lmodern-2.004.1";
|
||||
name = "lmodern-2.004.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = mirror://debian/pool/main/l/lmodern/lmodern_2.004.1.orig.tar.gz;
|
||||
sha256 = "1bvlf8p39667q58pvyfzy3yl0mylf0ak96flwp8vj01vqbi3rfaz";
|
||||
url = mirror://debian/pool/main/l/lmodern/lmodern_2.004.4.orig.tar.gz;
|
||||
sha256 = "1g1fmi9asw6x9arm5sy3r4jwz7zrrbcw6q4waj3iqs0iq525i1rw";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
{ stdenv, fetchurl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "hicolor-icon-theme-0.12";
|
||||
name = "hicolor-icon-theme-0.13";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://icon-theme.freedesktop.org/releases/${name}.tar.gz";
|
||||
sha256 = "0wzc7g4ldb2l8zc0x2785ck808c03i857jji942ikakyc68adp4y";
|
||||
sha256 = "01ilkizzal3wq2naaj84rqmd850aari1ahiw9vfis3a82n4h72x3";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
{ stdenv, fetchurl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "cacert-20121229";
|
||||
name = "cacert-20131205";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://tarballs.nixos.org/${name}.pem.bz2";
|
||||
sha256 = "031s86pqvn620zkj6w97hqgjvkp6vsvlymzz7rwvkv25zvrjsgif";
|
||||
sha256 = "049cm3nrhawkh9xpfjhgis6w58zji5ppi4d9yyjzrr7mpw0a34df";
|
||||
};
|
||||
|
||||
unpackPhase = "true";
|
||||
|
|
|
|||
45
pkgs/desktops/cinnamon/cinnamon-desktop.nix
Normal file
45
pkgs/desktops/cinnamon/cinnamon-desktop.nix
Normal file
|
|
@ -0,0 +1,45 @@
|
|||
{ stdenv, fetchurl, pkgconfig, autoreconfHook, intltool
|
||||
, glib, gobjectIntrospection, gdk_pixbuf, gtk3, gnome_common
|
||||
, xorg, xkeyboard_config
|
||||
}:
|
||||
|
||||
let
|
||||
version = "2.0.4";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
name = "cinnamon-desktop-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://github.com/linuxmint/cinnamon-desktop/archive/${version}.tar.gz";
|
||||
sha256 = "1cywin712558pv58c0cr73m25hfcv5x8pv5frvqjr9gwr2gpi6h3";
|
||||
};
|
||||
|
||||
NIX_CFLAGS_COMPILE = "-I${glib}/include/gio-unix-2.0";
|
||||
|
||||
buildInputs = with xorg; [
|
||||
pkgconfig autoreconfHook intltool
|
||||
glib gobjectIntrospection gdk_pixbuf gtk3 gnome_common
|
||||
xkeyboard_config libxkbfile libX11 libXrandr libXext
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
${glib}/bin/glib-compile-schemas $out/share/glib-2.0/schemas/
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "http://cinnamon.linuxmint.com";
|
||||
description = "Library and data for various Cinnamon modules";
|
||||
|
||||
longDescription = ''
|
||||
The libcinnamon-desktop library provides API shared by several applications
|
||||
on the desktop, but that cannot live in the platform for various
|
||||
reasons. There is no API or ABI guarantee, although we are doing our
|
||||
best to provide stability. Documentation for the API is available with
|
||||
gtk-doc.
|
||||
'';
|
||||
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
maintainers = [ stdenv.lib.maintainers.roelof ];
|
||||
};
|
||||
}
|
||||
|
||||
48
pkgs/desktops/cinnamon/cinnamon-session.nix
Normal file
48
pkgs/desktops/cinnamon/cinnamon-session.nix
Normal file
|
|
@ -0,0 +1,48 @@
|
|||
{ stdenv, fetchurl, pkgconfig, autoreconfHook, glib, gettext, gnome_common, gtk3, dbus_glib
|
||||
, upower, json_glib,intltool, systemd, hicolor_icon_theme, xorg, makeWrapper, cinnamon-desktop }:
|
||||
|
||||
let
|
||||
version = "2.0.6";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
name = "cinnamon-session-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://github.com/linuxmint/cinnamon-session/archive/${version}.tar.gz";
|
||||
sha256 = "0rs5w7npj3wf3gkk3sfb83awks2h7vjd6cz8mvfgbh6m3grn66l3";
|
||||
};
|
||||
|
||||
|
||||
configureFlags = "--disable-schemas-compile --enable-systemd --disable-gconf" ;
|
||||
|
||||
patches = [ ./remove-sessionmigration.patch ./timeout.patch];
|
||||
|
||||
buildInputs = [
|
||||
pkgconfig autoreconfHook
|
||||
glib gettext gnome_common
|
||||
gtk3 dbus_glib upower json_glib
|
||||
intltool systemd xorg.xtrans
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
preBuild = "patchShebangs ./scripts";
|
||||
|
||||
|
||||
postInstall = ''
|
||||
${glib}/bin/glib-compile-schemas $out/share/glib-2.0/schemas/
|
||||
rm $out/share/icons/hicolor/icon-theme.cache
|
||||
|
||||
for f in "$out"/bin/*; do
|
||||
wrapProgram "$f" --prefix XDG_DATA_DIRS : "$out/share:${cinnamon-desktop}/share"
|
||||
done
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "http://cinnamon.linuxmint.com";
|
||||
description = "The cinnamon session files" ;
|
||||
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
maintainers = [ stdenv.lib.maintainers.roelof ];
|
||||
};
|
||||
}
|
||||
|
||||
|
|
@ -1,19 +1,19 @@
|
|||
{ stdenv, fetchurl}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "cinnamon-translations";
|
||||
version="2.0.3";
|
||||
{ stdenv, fetchurl }:
|
||||
let
|
||||
version = "2.0.3";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
name = "cinnamon-translations-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://github.com/linuxmint/cinnamon-translations/archive/${version}.tar.gz";
|
||||
sha256 = "07w3v118xrfp8r4dkbdiyd1vr9ah7f3bm2zw9wag9s8l8x0zfxgc";
|
||||
};
|
||||
|
||||
|
||||
installPhase =
|
||||
''
|
||||
mkdir -pv $out/usr/share/cinnamon/locale
|
||||
cp -av mo-export/* $out/usr/share/cinnamon/locale/
|
||||
mkdir -pv $out/share/cinnamon/locale
|
||||
cp -av mo-export/* $out/share/cinnamon/locale/
|
||||
'';
|
||||
|
||||
meta = {
|
||||
|
|
@ -25,5 +25,3 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
40
pkgs/desktops/cinnamon/cjs.nix
Normal file
40
pkgs/desktops/cinnamon/cjs.nix
Normal file
|
|
@ -0,0 +1,40 @@
|
|||
{ stdenv, fetchurl, pkgconfig, autoreconfHook, python
|
||||
, dbus_glib, cairo, spidermonkey_185, gobjectIntrospection
|
||||
}:
|
||||
|
||||
let
|
||||
version="2.0.0";
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
name = "cjs-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://github.com/linuxmint/cjs/archive/${version}.tar.gz";
|
||||
sha256 = "16iazd5h2z27v9jxs4a8imwls5c1c690wk7i05r5ds3c3r4nrsig";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
pkgconfig autoreconfHook python
|
||||
dbus_glib cairo spidermonkey_185
|
||||
gobjectIntrospection
|
||||
];
|
||||
|
||||
preBuild = "patchShebangs ./scripts";
|
||||
|
||||
meta = {
|
||||
homepage = "http://cinnamon.linuxmint.com";
|
||||
description = "JavaScript bindings for Cinnamon" ;
|
||||
|
||||
longDescription = ''
|
||||
This module contains JavaScript bindings based on gobject-introspection.
|
||||
|
||||
Because JavaScript is pretty free-form, consistent coding style and unit tests
|
||||
are critical to give it some structure and keep it readable.
|
||||
We propose that all GNOME usage of JavaScript conform to the style guide
|
||||
in doc/Style_Guide.txt to help keep things sane.
|
||||
'';
|
||||
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
maintainers = [ stdenv.lib.maintainers.roelof ];
|
||||
};
|
||||
}
|
||||
19
pkgs/desktops/cinnamon/remove-sessionmigration.patch
Normal file
19
pkgs/desktops/cinnamon/remove-sessionmigration.patch
Normal file
|
|
@ -0,0 +1,19 @@
|
|||
--- a/cinnamon-session/csm-session-fill.c
|
||||
+++ b/cinnamon-session/csm-session-fill.c
|
||||
@@ -228,15 +228,6 @@
|
||||
load_standard_apps (CsmManager *manager,
|
||||
GKeyFile *keyfile)
|
||||
{
|
||||
- GError *error;
|
||||
-
|
||||
- g_debug ("fill: *** Executing user migration");
|
||||
- error = NULL;
|
||||
- if(!g_spawn_command_line_sync ("session-migration", NULL, NULL, NULL, &error)) {
|
||||
- g_warning ("Error while executing session-migration: %s", error->message);
|
||||
- g_error_free (error);
|
||||
- }
|
||||
-
|
||||
g_debug ("fill: *** Adding required components");
|
||||
handle_required_components (keyfile, !csm_manager_get_failsafe (manager),
|
||||
append_required_components_helper, manager);
|
||||
|
||||
26
pkgs/desktops/cinnamon/timeout.patch
Normal file
26
pkgs/desktops/cinnamon/timeout.patch
Normal file
|
|
@ -0,0 +1,26 @@
|
|||
diff -u -r cinnamon-session-3.4.2/cinnamon-session/csm-session-fill.c cinnamon-session-3.4.2-timeout/cinnamon-session/csm-session-fill.c
|
||||
--- cinnamon-session-3.4.2/cinnamon-session/csm-session-fill.c 2012-02-02 15:33:01.000000000 +0100
|
||||
+++ cinnamon-session-3.4.2-timeout/cinnamon-session/csm-session-fill.c 2012-06-10 02:39:46.184348462 +0200
|
||||
@@ -36,7 +36,7 @@
|
||||
#define CSM_KEYFILE_DEFAULT_PROVIDER_PREFIX "DefaultProvider"
|
||||
|
||||
/* See https://bugzilla.gnome.org/show_bug.cgi?id=641992 for discussion */
|
||||
-#define CSM_RUNNABLE_HELPER_TIMEOUT 3000 /* ms */
|
||||
+#define CSM_RUNNABLE_HELPER_TIMEOUT 10000 /* ms */
|
||||
|
||||
typedef void (*GsmFillHandleProvider) (const char *provides,
|
||||
const char *default_provider,
|
||||
diff -u -r cinnamon-session-3.4.2/tools/cinnamon-session-check-accelerated.c
|
||||
cinnamon-session-3.4.2-timeout/tools/cinnamon-session-check-accelerated.c
|
||||
--- cinnamon-session-3.4.2/tools/cinnamon-session-check-accelerated.c 2011-03-22 21:31:43.000000000 +0100
|
||||
+++ cinnamon-session-3.4.2-timeout/tools/cinnamon-session-check-accelerated.c 2012-06-10 02:42:08.013218006 +0200
|
||||
@@ -30,7 +30,7 @@
|
||||
#include <X11/Xatom.h>
|
||||
|
||||
/* Wait up to this long for a running check to finish */
|
||||
-#define PROPERTY_CHANGE_TIMEOUT 5000
|
||||
+#define PROPERTY_CHANGE_TIMEOUT 12000
|
||||
|
||||
/* Values used for the _GNOME_SESSION_ACCELERATED root window property */
|
||||
#define NO_ACCEL 0
|
||||
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
{ callPackage, self, stdenv, gettext, overrides ? {} }:
|
||||
{ callPackage, self, stdenv, gettext, gvfs, libunique, overrides ? {} }:
|
||||
{
|
||||
__overrides = overrides;
|
||||
|
||||
|
|
@ -67,7 +67,7 @@
|
|||
startup_notification = callPackage ./platform/startup-notification { };
|
||||
|
||||
# Required for nautilus
|
||||
libunique = callPackage ./platform/libunique { };
|
||||
inherit (libunique);
|
||||
|
||||
gtkglext = callPackage ./platform/gtkglext { };
|
||||
|
||||
|
|
@ -79,7 +79,7 @@
|
|||
|
||||
libgweather = callPackage ./desktop/libgweather { };
|
||||
|
||||
gvfs = callPackage ./desktop/gvfs { };
|
||||
gvfs = gvfs.override { gnome = self; };
|
||||
|
||||
libgnomekbd = callPackage ./desktop/libgnomekbd { };
|
||||
|
||||
|
|
|
|||
|
|
@ -1,21 +0,0 @@
|
|||
{ stdenv, fetchurl, pkgconfig, dbus_libs, samba, libarchive, fuse, libgphoto2
|
||||
, libcdio, libxml2, libtool, glib, intltool, GConf, libgnome_keyring, libsoup
|
||||
, udev, avahi, libxslt, docbook_xsl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gvfs-1.14.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gvfs/1.14/${name}.tar.xz";
|
||||
sha256 = "1g4ghyf45jg2ajdkv2d972hbckyjh3d9jdrppai85pl9pk2dmfy3";
|
||||
};
|
||||
|
||||
buildInputs =
|
||||
[ glib dbus_libs udev samba libarchive fuse libgphoto2 libcdio libxml2 GConf
|
||||
libgnome_keyring libsoup avahi libtool libxslt docbook_xsl
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ pkgconfig intltool ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
}
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchurl_gnome }:
|
||||
{ stdenv, fetchurl, fetchurl_gnome, which }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = src.pkgname;
|
||||
|
|
@ -8,4 +8,11 @@ stdenv.mkDerivation rec {
|
|||
major = "2"; minor = "34"; patchlevel = "0";
|
||||
sha256 = "1pz13mpp09q5s3bikm8ml92s1g0scihsm4iipqv1ql3mp6d4z73s";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ which ]; # autogen.sh which is using gnome_common tends to require which
|
||||
|
||||
patches = [(fetchurl {
|
||||
url = "https://bug697543.bugzilla-attachments.gnome.org/attachment.cgi?id=240935";
|
||||
sha256 = "17abp7czfzirjm7qsn2czd03hdv9kbyhk3lkjxg2xsf5fky7z7jl";
|
||||
})];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
{stdenv, fetchurl, pkgconfig, gtk, gettext, intltool, libgnomecanvas, libgnomeprint, gnomeicontheme}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "libgnomeprintui-2.18.4";
|
||||
name = "libgnomeprintui-2.18.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = mirror://gnome/sources/libgnomeprintui/2.18/libgnomeprintui-2.18.4.tar.bz2;
|
||||
sha256 = "19d2aa95c9cb85f1ddd13464500217a76e2abce59281ec5d210e139c14dd7490";
|
||||
url = mirror://gnome/sources/libgnomeprintui/2.18/libgnomeprintui-2.18.6.tar.bz2;
|
||||
sha256 = "0spl8vinb5n6n1krnfnr61dwaxidg67h8j94z9p59k2xdsvfashm";
|
||||
};
|
||||
|
||||
buildInputs = [ pkgconfig gtk gettext intltool libgnomecanvas libgnomeprint gnomeicontheme];
|
||||
|
|
|
|||
|
|
@ -1,14 +0,0 @@
|
|||
{stdenv, fetchurl_gnome, pkgconfig, gtk}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = src.pkgname;
|
||||
|
||||
src = fetchurl_gnome {
|
||||
project = "libunique";
|
||||
major = "1"; minor = "1"; patchlevel = "6";
|
||||
sha256 = "1fsgvmncd9caw552lyfg8swmsd6bh4ijjsph69bwacwfxwf09j75";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
buildInputs = [ gtk ];
|
||||
}
|
||||
|
|
@ -2,14 +2,14 @@
|
|||
, intltool, dbus_glib, at_spi2_core, libSM }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
versionMajor = "2.8";
|
||||
versionMinor = "1";
|
||||
versionMajor = "2.10";
|
||||
versionMinor = "2";
|
||||
moduleName = "at-spi2-atk";
|
||||
name = "${moduleName}-${versionMajor}.${versionMinor}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz";
|
||||
sha256 = "01pxfnksixrjj27ivllpla54r6nkwsjj34acb0phmp76zna9nrgb";
|
||||
sha256 = "1xfh89lydl8d18dhnzwvzcsyyybr5q3ik001qgq520l3qh8shj73";
|
||||
};
|
||||
|
||||
buildInputs = [ python pkgconfig popt atk libX11 libICE xlibs.libXtst libXi
|
||||
|
|
|
|||
|
|
@ -1,16 +1,15 @@
|
|||
{ stdenv, fetchurl, python, pkgconfig, popt, intltool, dbus_glib
|
||||
, libX11, xextproto, libSM, libICE, libXtst, libXi }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
versionMajor = "2.8";
|
||||
versionMinor = "0";
|
||||
stdenv.mkDerivation (rec {
|
||||
versionMajor = "2.10";
|
||||
versionMinor = "2";
|
||||
moduleName = "at-spi2-core";
|
||||
name = "${moduleName}-${versionMajor}.${versionMinor}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz";
|
||||
sha256 = "0n64h6j10sn90ds9y70d9wlvvsbwnrym9fm0cyjxb0zmqw7s6q8q";
|
||||
sha256 = "1qfxlbmbaihgmqgkxnywnji9wkbvn8pvbv20x5glv3jc9zw5innk";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
@ -21,3 +20,8 @@ stdenv.mkDerivation rec {
|
|||
# ToDo: on non-NixOS we create a symlink from there?
|
||||
configureFlags = "--with-dbus-daemondir=/run/current-system/sw/bin/";
|
||||
}
|
||||
// stdenv.lib.optionalAttrs stdenv.isDarwin {
|
||||
NIX_LDFLAGS = "-lintl";
|
||||
}
|
||||
)
|
||||
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
, gtk3, intltool, gconf, libgnome_keyring, pango, gcr, gdk_pixbuf, atk, p11_kit }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gnome-keyring-3.6.2";
|
||||
name = "gnome-keyring-3.6.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-keyring/3.6/${name}.tar.xz";
|
||||
sha256 = "1mhc2c0qswfjqi2spdvh19b7npfkjf1k40q6v7fja4qpc26maq5f";
|
||||
sha256 = "0la107v75vh8v165lk391xg820h8hxa209766wr98pm22qzkl5g0";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,21 +0,0 @@
|
|||
{ stdenv, fetchurl, pkgconfig, dbus_libs, samba, libarchive, fuse, libgphoto2
|
||||
, libcdio, libxml2, libtool, glib, intltool, gconf, libgnome_keyring, libsoup
|
||||
, udev, avahi, libxslt, docbook_xsl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gvfs-1.14.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gvfs/1.14/${name}.tar.xz";
|
||||
sha256 = "1g4ghyf45jg2ajdkv2d972hbckyjh3d9jdrppai85pl9pk2dmfy3";
|
||||
};
|
||||
|
||||
buildInputs =
|
||||
[ glib dbus_libs udev samba libarchive fuse libgphoto2 libcdio libxml2 gconf
|
||||
libgnome_keyring libsoup avahi libtool libxslt docbook_xsl
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ pkgconfig intltool ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
}
|
||||
|
|
@ -1,11 +1,11 @@
|
|||
{ stdenv, fetchurl, pkgconfig, libxml2, glib }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libcroco-0.6.6"; # 3.6.2 release
|
||||
name = "libcroco-0.6.8";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/libcroco/0.6/${name}.tar.xz";
|
||||
sha256 = "1nbb12420v1zacn6jwa1x4ixikkcqw66sg4j5dgs45nhygiarv3j";
|
||||
sha256 = "0w453f3nnkbkrly7spx5lx5pf6mwynzmd5qhszprq8amij2invpa";
|
||||
};
|
||||
|
||||
configureFlags = stdenv.lib.optional stdenv.isDarwin "--disable-Bsymbolic";
|
||||
|
|
|
|||
|
|
@ -1,14 +1,16 @@
|
|||
{ callPackage, lib, self, stdenv, gettext, overrides ? {}, pkgs }:
|
||||
{ callPackage, self, pkgs }:
|
||||
|
||||
rec {
|
||||
inherit (pkgs) fetchurl_gnome glib gtk3 atk pango;
|
||||
gtk = gtk3;
|
||||
inherit (pkgs) glib gtk2 gtk3 gnome2;
|
||||
gtk = gtk3; # just to be sure
|
||||
inherit (pkgs.gnome2) gnome_common ORBit2;
|
||||
orbit = ORBit2;
|
||||
|
||||
inherit (lib) lowPrio hiPrio appendToName makeOverridable;
|
||||
|
||||
__overrides = overrides;
|
||||
#### Overrides of libraries
|
||||
|
||||
librsvg = pkgs.librsvg.override { inherit gtk2; }; # gtk2 mysteriously needed in librsvg for goffice (commented in Gentoo)
|
||||
|
||||
|
||||
#### Core (http://ftp.acc.umu.se/pub/GNOME/core/)
|
||||
|
||||
|
|
@ -31,9 +33,9 @@ rec {
|
|||
|
||||
gnome_terminal = callPackage ./core/gnome-terminal { };
|
||||
|
||||
gsettings_desktop_schemas = lib.lowPrio (callPackage ./core/gsettings-desktop-schemas { });
|
||||
gsettings_desktop_schemas = callPackage ./core/gsettings-desktop-schemas { };
|
||||
|
||||
gvfs = callPackage ./core/gvfs { };
|
||||
gvfs = pkgs.gvfs.override { gnome = pkgs.gnome3; };
|
||||
|
||||
libcroco = callPackage ./core/libcroco {};
|
||||
|
||||
|
|
@ -43,16 +45,23 @@ rec {
|
|||
|
||||
zenity = callPackage ./core/zenity { };
|
||||
|
||||
|
||||
#### Apps (http://ftp.acc.umu.se/pub/GNOME/apps/)
|
||||
|
||||
gnome_dictionary = callPackage ./desktop/gnome-dictionary { };
|
||||
|
||||
gnome_desktop = callPackage ./desktop/gnome-desktop { };
|
||||
|
||||
|
||||
# Removed from recent GNOME releases, but still required
|
||||
scrollkeeper = callPackage ./desktop/scrollkeeper { };
|
||||
|
||||
# scrollkeeper replacement
|
||||
rarian = callPackage ./desktop/rarian { };
|
||||
|
||||
|
||||
#### Misc -- other packages on http://ftp.gnome.org/pub/GNOME/sources/
|
||||
|
||||
goffice = callPackage ./misc/goffice { };
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ fetchurl, stdenv, pkgconfig, glib, gtk, libglade, bzip2
|
||||
, pango, libgsf, libxml2, libart, intltool, gettext
|
||||
, cairo, gconf, libgnomeui, pcre }:
|
||||
, cairo, gconf, libgnomeui, pcre, gnome3/*just meta*/ }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "goffice-0.8.17";
|
||||
|
|
@ -31,18 +31,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
doCheck = true;
|
||||
|
||||
meta = {
|
||||
description = "GOffice, a Glib/GTK+ set of document centric objects and utilities";
|
||||
|
||||
longDescription = ''
|
||||
There are common operations for document centric applications that are
|
||||
conceptually simple, but complex to implement fully: plugins, load/save
|
||||
documents, undo/redo.
|
||||
'';
|
||||
|
||||
license = "GPLv2";
|
||||
|
||||
meta = gnome3.goffice.meta // {
|
||||
maintainers = [ ];
|
||||
platforms = stdenv.lib.platforms.gnu;
|
||||
};
|
||||
}
|
||||
33
pkgs/desktops/gnome-3/misc/goffice/default.nix
Normal file
33
pkgs/desktops/gnome-3/misc/goffice/default.nix
Normal file
|
|
@ -0,0 +1,33 @@
|
|||
{ fetchurl, stdenv, pkgconfig, intltool, bzip2, glib, gdk_pixbuf, gtk3
|
||||
, libgsf, libxml2, cairo, pango, librsvg, libspectre }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "goffice-0.10.9";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/goffice/0.10/${name}.tar.xz";
|
||||
sha256 = "0xc82hymhkdglnksd3r7405p39d5ym826rwaa7dfkps5crjwq8cg";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ # ToDo lasem library for MathML, opt. introspection?
|
||||
pkgconfig intltool bzip2 glib gdk_pixbuf gtk3
|
||||
libgsf libxml2 cairo pango librsvg libspectre
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
meta = {
|
||||
description = "A Glib/GTK+ set of document centric objects and utilities";
|
||||
|
||||
longDescription = ''
|
||||
There are common operations for document centric applications that are
|
||||
conceptually simple, but complex to implement fully: plugins, load/save
|
||||
documents, undo/redo.
|
||||
'';
|
||||
|
||||
license = "GPLv2+";
|
||||
|
||||
platforms = stdenv.lib.platforms.gnu;
|
||||
};
|
||||
passthru = { inherit meta; };
|
||||
}
|
||||
|
|
@ -5,11 +5,11 @@
|
|||
stdenv.mkDerivation rec {
|
||||
p_name = "xfce4-terminal";
|
||||
ver_maj = "0.6";
|
||||
ver_min = "2";
|
||||
ver_min = "3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://xfce/src/apps/${p_name}/${ver_maj}/${name}.tar.bz2";
|
||||
sha256 = "0d9vbkvbxxhv022mwyihrabmj8y9097bp57n1a412qyji0i454ix";
|
||||
sha256 = "023y0lkfijifh05yz8grimxadqpi98mrivr00sl18nirq8b4fbwi";
|
||||
};
|
||||
name = "${p_name}-${ver_maj}.${ver_min}";
|
||||
|
||||
|
|
|
|||
|
|
@ -4,11 +4,11 @@
|
|||
stdenv.mkDerivation rec {
|
||||
p_name = "xfce4-notifyd";
|
||||
ver_maj = "0.2";
|
||||
ver_min = "3";
|
||||
ver_min = "4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://xfce/src/apps/${p_name}/${ver_maj}/${name}.tar.bz2";
|
||||
sha256 = "0fx6z89rxs6ypb8bb6l1pg8fdbxn995fgs413sbhnaxjkm6gch6x";
|
||||
sha256 = "1l6fpfk0fkizdx7vwbyjdyzzj5i2ng8pf7r8j49nv0cnjhpxczlc";
|
||||
};
|
||||
name = "${p_name}-${ver_maj}.${ver_min}";
|
||||
|
||||
|
|
|
|||
|
|
@ -1,76 +0,0 @@
|
|||
{ pkgs, newScope, xfce_self }: rec {
|
||||
|
||||
callPackage = newScope (deps // xfce_self);
|
||||
|
||||
deps = rec { # xfce-global dependency overrides should be here
|
||||
inherit (pkgs.gnome) libglade libwnck vte gtksourceview;
|
||||
inherit (pkgs.perlPackages) URI;
|
||||
|
||||
# The useful bits from ‘gnome-disk-utility’.
|
||||
libgdu = callPackage ./support/libgdu.nix { };
|
||||
|
||||
# Gvfs is required by Thunar for the trash feature and for volume
|
||||
# mounting. Should use the one from Gnome, but I don't want to mess
|
||||
# with the Gnome packages (or pull in a zillion Gnome dependencies).
|
||||
gvfs = callPackage ./support/gvfs.nix { };
|
||||
|
||||
# intelligent fetcher for Xfce
|
||||
fetchXfce = rec {
|
||||
generic = prepend : name : hash :
|
||||
let lib = pkgs.lib;
|
||||
p = builtins.parseDrvName name;
|
||||
versions = lib.splitString "." p.version;
|
||||
ver_maj = lib.concatStrings (lib.intersperse "." (lib.take 2 versions));
|
||||
name_low = lib.toLower p.name;
|
||||
in pkgs.fetchurl {
|
||||
url = "mirror://xfce/src/${prepend}/${name_low}/${ver_maj}/${name}.tar.bz2";
|
||||
sha256 = hash;
|
||||
};
|
||||
core = generic "xfce";
|
||||
app = generic "apps";
|
||||
art = generic "art";
|
||||
};
|
||||
};
|
||||
|
||||
xfce_common = rec {
|
||||
|
||||
inherit (deps) gvfs; # used by NixOS
|
||||
|
||||
#### CORE
|
||||
|
||||
garcon = callPackage ./core/garcon.nix { v= "0.2.0"; h= "0v7pkvxcayi86z4f173z5l7w270f3g369sa88z59w0y0p7ns7ph2"; };
|
||||
|
||||
# not used anymore TODO: really? Update to 2.99.2?
|
||||
gtk_xfce_engine = callPackage ./core/gtk-xfce-engine.nix { };
|
||||
|
||||
# ToDo: segfaults after some work
|
||||
tumbler = callPackage ./core/tumbler.nix { v= "0.1.27"; h= "0s9qj99b81asmlqa823nzykq8g6p9azcp2niak67y9bp52wv6q2c"; };
|
||||
|
||||
xfce4_power_manager = callPackage ./core/xfce4-power-manager.nix { v= "1.0.10"; h= "1w120k1sl4s459ijaxkqkba6g1p2sqrf9paljv05wj0wz12bpr40"; };
|
||||
|
||||
|
||||
#### APPLICATIONS
|
||||
#TODO: correct links; more stuff
|
||||
|
||||
xfce4notifyd = callPackage ./applications/xfce4-notifyd.nix { v= "0.2.2"; h= "0s4ilc36sl5k5mg5727rmqims1l3dy5pwg6dk93wyjqnqbgnhvmn"; };
|
||||
gigolo = callPackage ./applications/gigolo.nix { v= "0.4.1"; h= "1y8p9bbv1a4qgbxl4vn6zbag3gb7gl8qj75cmhgrrw9zrvqbbww2"; };
|
||||
xfce4taskmanager = callPackage ./applications/xfce4-taskmanager.nix { v= "1.0.0"; h= "1vm9gw7j4ngjlpdhnwdf7ifx6xrrn21011almx2vwidhk2f9zvy0"; };
|
||||
mousepad = callPackage ./applications/mousepad.nix { v= "0.3.0"; h= "0v84zwhjv2xynvisn5vmp7dbxfj4l4258m82ks7hn3adk437bwhh"; };
|
||||
thunar_volman = callPackage ./core/thunar-volman.nix { };
|
||||
thunar_archive_plugin = callPackage ./core/thunar-archive-plugin.nix { };
|
||||
|
||||
|
||||
#### ART
|
||||
|
||||
xfce4icontheme = callPackage ./art/xfce4-icon-theme.nix { v= "4.4.3"; h= "1yk6rx3zr9grm4jwpjvqdkl13pisy7qn1wm5cqzmd2kbsn96cy6l"; };
|
||||
|
||||
#### PANEL PLUGINS
|
||||
|
||||
xfce4_systemload_plugin = callPackage ./panel-plugins/xfce4-systemload-plugin.nix { };
|
||||
xfce4_cpufreq_plugin = callPackage ./panel-plugins/xfce4-cpufreq-plugin.nix { };
|
||||
xfce4_xkb_plugin = callPackage ./panel-plugins/xfce4-xkb-plugin.nix { };
|
||||
xfce4_datetime_plugin = callPackage ./panel-plugins/xfce4-datetime-plugin.nix { };
|
||||
|
||||
};
|
||||
}
|
||||
|
||||
85
pkgs/development/compilers/go/1.2.nix
Normal file
85
pkgs/development/compilers/go/1.2.nix
Normal file
|
|
@ -0,0 +1,85 @@
|
|||
{ stdenv, fetchurl, bison, glibc, bash, coreutils, makeWrapper, tzdata, iana_etc }:
|
||||
|
||||
let
|
||||
loader386 = "${glibc}/lib/ld-linux.so.2";
|
||||
loaderAmd64 = "${glibc}/lib/ld-linux-x86-64.so.2";
|
||||
loaderArm = "${glibc}/lib/ld-linux.so.3";
|
||||
in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "go-1.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = http://go.googlecode.com/files/go1.2.src.tar.gz;
|
||||
sha1 = "7dd2408d40471aeb30a9e0b502c6717b5bf383a5";
|
||||
};
|
||||
|
||||
buildInputs = [ bison glibc bash makeWrapper ];
|
||||
|
||||
# I'm not sure what go wants from its 'src', but the go installation manual
|
||||
# describes an installation keeping the src.
|
||||
preUnpack = ''
|
||||
mkdir -p $out/share
|
||||
cd $out/share
|
||||
'';
|
||||
|
||||
prePatch = ''
|
||||
cd ..
|
||||
if [ ! -d go ]; then
|
||||
mv * go
|
||||
fi
|
||||
cd go
|
||||
|
||||
patchShebangs ./ # replace /bin/bash
|
||||
# !!! substituteInPlace does not seems to be effective.
|
||||
sed -i 's,/lib/ld-linux.so.2,${loader386},' src/cmd/8l/asm.c
|
||||
sed -i 's,/lib64/ld-linux-x86-64.so.2,${loaderAmd64},' src/cmd/6l/asm.c
|
||||
sed -i 's,/lib64/ld-linux-x86-64.so.3,${loaderArm},' src/cmd/5l/asm.c
|
||||
sed -i 's,/usr/share/zoneinfo/,${tzdata}/share/zoneinfo/,' src/pkg/time/zoneinfo_unix.go
|
||||
sed -i 's,/etc/protocols,${iana_etc}/etc/protocols,' src/pkg/net/lookup_unix.go
|
||||
|
||||
#sed -i -e 's,/bin/cat,${coreutils}/bin/cat,' \
|
||||
# -e 's,/bin/echo,${coreutils}/bin/echo,' \
|
||||
# src/pkg/exec/exec_test.go
|
||||
|
||||
# Disabling the 'os/http/net' tests (they want files not available in
|
||||
# chroot builds)
|
||||
rm src/pkg/net/{multicast_test.go,parse_test.go,port_test.go}
|
||||
# The os test wants to read files in an existing path. Just it don't be /usr/bin.
|
||||
sed -i 's,/usr/bin,'"`pwd`", src/pkg/os/os_test.go
|
||||
sed -i 's,/bin/pwd,'"`type -P pwd`", src/pkg/os/os_test.go
|
||||
# Disable the hostname test
|
||||
sed -i '/TestHostname/areturn' src/pkg/os/os_test.go
|
||||
'';
|
||||
|
||||
patches = [ ./cacert-1.2.patch ];
|
||||
|
||||
GOOS = "linux";
|
||||
GOARCH = if stdenv.system == "i686-linux" then "386"
|
||||
else if stdenv.system == "x86_64-linux" then "amd64"
|
||||
else if stdenv.system == "armv5tel-linux" then "arm"
|
||||
else throw "Unsupported system";
|
||||
GOARM = stdenv.lib.optionalString (stdenv.system == "armv5tel-linux") "5";
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p "$out/bin"
|
||||
export GOROOT="$(pwd)/"
|
||||
export GOBIN="$out/bin"
|
||||
export PATH="$GOBIN:$PATH"
|
||||
cd ./src
|
||||
./all.bash
|
||||
cd -
|
||||
|
||||
# Copy the emacs configuration for Go files.
|
||||
mkdir -p "$out/share/emacs/site-lisp"
|
||||
cp ./misc/emacs/* $out/share/emacs/site-lisp/
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = http://golang.org/;
|
||||
description = "The Go Programming language";
|
||||
license = "BSD";
|
||||
maintainers = with stdenv.lib.maintainers; [ pierron viric ];
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
15
pkgs/development/compilers/go/cacert-1.2.patch
Normal file
15
pkgs/development/compilers/go/cacert-1.2.patch
Normal file
|
|
@ -0,0 +1,15 @@
|
|||
Go comes with hardcoded cacert. We add the usual in NixOS,
|
||||
for easier NixOS life.
|
||||
|
||||
diff --git a/src/pkg/crypto/x509/root_unix.go b/src/pkg/crypto/x509/root_unix.go
|
||||
index 76e79f4..6ef1dd3 100644
|
||||
--- a/src/pkg/crypto/x509/root_unix.go
|
||||
+++ b/src/pkg/crypto/x509/root_unix.go
|
||||
@@ -15,6 +15,7 @@ var certFiles = []string{
|
||||
"/etc/ssl/ca-bundle.pem", // OpenSUSE
|
||||
"/etc/ssl/cert.pem", // OpenBSD
|
||||
"/usr/local/share/certs/ca-root-nss.crt", // FreeBSD/DragonFly
|
||||
+ "/etc/ssl/certs/ca-bundle.crt", // NixOS
|
||||
}
|
||||
|
||||
func (c *Certificate) systemVerify(opts *VerifyOptions) (chains [][]*Certificate, err error) {
|
||||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue