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.nixwip/yesman
Vladimír Čunát
11 years ago
commit
e740b565cf
@ -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"; |
||||
}; |
||||
} |
||||
@ -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"; |
||||
}; |
||||
}; |
||||
|
||||
} |
||||
@ -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"; |
||||
|
||||
meta = { |
||||
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 ]; |
||||
}; |
||||
|
||||
inherit buildInputs; |
||||
configureFlags = ["--enable-gtk3"]; |
||||
src = fetchurl { |
||||
url = "${meta.homepage}/downloads/midori_0.5.6_all_.tar.bz2"; |
||||
sha256 = "0jpj8cw0dzamzylzslayamjhv0is0xd99dyaql4nyxrkk5fipgn5"; |
||||
}; |
||||
|
||||
/* doConfigure should be specified separately */ |
||||
phaseNames = ["doUnpack" "setVars" "shebangsHere" "doConfigure" |
||||
"doMakeInstall" "shebangsInstalled" "wrapWK" |
||||
]; |
||||
buildInputs = [ |
||||
cmake pkgconfig intltool vala makeWrapper |
||||
webkitgtk librsvg libnotify |
||||
]; |
||||
|
||||
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" |
||||
''); |
||||
cmakeFlags = '' |
||||
-DHALF_BRO_INCOM_WEBKIT2=ON |
||||
-DUSE_ZEITGEIST=OFF |
||||
''; |
||||
|
||||
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; |
||||
}; |
||||
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,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 ]; |
||||
}; |
||||
} |
||||
|
||||
@ -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,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:
|
||||
@ -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; |
||||
}; |
||||
} |
||||
@ -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
|
||||
@ -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 ]; |
||||
}; |
||||
} |
||||
|
||||
@ -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 ]; |
||||
}; |
||||
} |
||||
|
||||
@ -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 ]; |
||||
}; |
||||
} |
||||
@ -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);
|
||||
|
||||
@ -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,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,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 ]; |
||||
} |
||||
@ -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; |
||||
} |
||||
@ -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; }; |
||||
} |
||||
@ -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 { }; |
||||
|
||||
}; |
||||
} |
||||
|
||||
@ -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; |
||||
}; |
||||
} |
||||
@ -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 new issue