Commit Graph

6523 Commits

Author SHA1 Message Date
Peter Simons
fd0f9e6fc1 Re-write the Haskell Platform out of haskell-defaults.nix.
1) Packages formerly called haskell-haskell-platform-ghcXYZ-VVVV.X.Y.Z are
    now called haskell-platform-VVVV.X.Y.Z. The latest version can be
    installed by running "nix-env -i haskell-platform".

 2) The attributes haskellPackages_ghcXYZ.haskellPlatform no longer exist.
    Instead, we have attributes like haskellPlatformPackages."2012_4_0_0".
    (The last numeric bit must be quoted when used in a Nix file, but not on
    the command line to nix-env, nix-build, etc.) The latest Platform has a
    top-level alias called simply haskellPlatform.

 3) The haskellPackages_ghcXYZ package sets offer the latest version of every
    library that GHC x.y.z can compile. For example, if 2.7 is the latest
    version of QuickCheck and if GHC 7.0.4 can compile that version, then
    haskellPackages_ghc704.QuickCheck refers to version 2.7.

 4) All intermediate GHC releases were dropped from all-packages.nix to
    simplify our configuration. What remains is a haskellPackages_ghcXYZ set
    for the latest version of every major release branch, i.e. GHC 6.10.4,
    6.12.3, 7.0.4, 7.2.2, 7.4.2, 7.6.3, 7.8.2, and 7.9.x (HEAD snapshot).

 5) The ghcXYZPrefs functions in haskell-defaults.nix now inherit overrides
    from newer to older compilers, i.e. an override configured for GHC 7.0.4
    will automatically apply to GHC 6.12.3 and 6.10.4, too. This change has
    reduced the redundancy in those configuration functions. The downside is
    that overriding an attribute for only one particular GHC version has become
    more difficult. In practice, this case doesn't occur much, though.

 6) The 'cabal' builder has a brand-new argument called 'extension'. That
    function is "self : super : {}" by default and users can override it to
    mess with the attribute set passed to cabal.mkDerivation. An example use
    would be the definition of darcs in all-packages.nix:

    | darcs = haskellPackages.darcs.override {
    |   cabal = haskellPackages.cabal.override {
    |     extension = self : super : {
    |       isLibrary = false;
    |       configureFlags = "-f-library " + super.configureFlags or "";
    |     };
    |   };
    | };

    In this case, extension disables building the library part of the package
    to give us an executable-only version that has no dependencies on GHC or
    any other Haskell packages.

    The 'self' argument refers to the final version of the attribute set and
    'super' refers to the original attribute set.

Note that ...

 - Haskell Platform packages always provide the Haddock binary that came with
   the compiler.

 - Haskell Platform 2009.2.0.2 is broken because of build failures in cgi and
   cabal-install.

 - Haskell Platform 2010.1.0.0 is broken becasue of build failures in cgi.
2014-05-14 14:59:52 +02:00
Austin Seipp
21cb0c9bbb Merge pull request #2621 from CodeBlock/fldigi
Package hamlib and fldigi; Bump perlPackages.ExtUtilsMakeMaker
2014-05-13 19:45:34 -05:00
Austin Seipp
738622282b Merge pull request #2622 from CodeBlock/minimodem
Add minimodem package
2014-05-13 19:43:52 -05:00
William A. Kennington III
10773e1917 notbit: Bump to git-faf0930 2014-05-13 16:38:12 -05:00
Vladimír Čunát
93e65a4d53 codeblocks: fix eval on non-linux, minor refactoring 2014-05-13 20:07:13 +02:00
Linquize
977248ba15 codeblocks: new package 13.12 (close #2533)
@vcunat: minor refactoring.
2014-05-13 12:59:19 +02:00
AndersonTorres
64948222ba Aegisub: update to 3.1.3 (close #2550)
New dependencies: icu, intltool, boost (default = 1.55), wxGTK 3.0
Fixes a bug on Boost detection
@vcunat: minor refactoring.
2014-05-13 12:28:47 +02:00
Rickard Nilsson
dd592d7ef3 spotify: Fix missing src url for qt. Add missing dependencies. 2014-05-13 12:04:45 +02:00
lethalman
e4361dfa02 Merge pull request #2624 from lethalman/uzbl
uzbl: Add gsettings_desktop_schemas as build input. Closes #2332
2014-05-13 12:03:26 +02:00
Russell O'Connor
5bbcebf2db Bump coq version to 8.4pl4. 2014-05-12 22:17:00 -04:00
Luca Bruno
f63b1038e9 uzbl: Add gsettings_desktop_schemas as build input. Closes #2332 2014-05-12 10:32:46 +02:00
Ricky Elrod
6e2fe51190 Add minimodem package
Signed-off-by: Ricky Elrod <ricky@elrod.me>
2014-05-11 18:44:38 -04:00
Ricky Elrod
0c45c81812 Use name and pname to follow conventions
Signed-off-by: Ricky Elrod <ricky@elrod.me>
2014-05-11 18:17:12 -04:00
Ricky Elrod
913e340c9a Add fldigi package
Signed-off-by: Ricky Elrod <ricky@elrod.me>
2014-05-11 18:03:33 -04:00
Thomas Tuegel
b4c8981064 sane: add mkSaneConfig 2014-05-11 14:01:07 -05:00
cillianderoiste
885a2d9c53 Merge pull request #2410 from pSub/potrace
Add potrace-1.11, a tool for tracing bitmaps
2014-05-11 14:46:12 +02:00
Cillian de Róiste
68325d8eae setbfree: build the GUI 2014-05-11 12:51:29 +02:00
cillianderoiste
7adc00b8bc Merge pull request #2484 from chexxor/feature/bump-docker-0.10.0
Bump docker version to 0.10.0
2014-05-11 10:33:43 +02:00
cillianderoiste
ca5e65c4bd Merge pull request #2371 from iyzsong/herbstluftwm
herbstluftwm: update to 0.6.2
2014-05-11 10:31:14 +02:00
Bjørn Forsman
cb7c920e24 virt-manager: add missing gsettings schema
Without this it'll complain and abort when clicking "Take Screenshot" or
"Browse Local" when creating a new VM and looking for an CD-ROM image to boot
from:

GLib-GIO-ERROR **: Settings schema 'org.gtk.Settings.FileChooser' is not installed
2014-05-11 01:03:27 +02:00
Mathijs Kwik
06c8438bd8 conkeror: upgrade to latest snapshot 2014-05-10 12:23:45 +02:00
Rob Vermaas
c7b8dd8581 Merge pull request #2506 from ikervagyok/mutt
Updated to mutt-1.5.23
2014-05-09 15:15:02 +02:00
Pascal Wittmann
8b0d0e3601 Add potrace-1.11, a tool for tracing bitmaps 2014-05-09 14:23:00 +02:00
Emery Hemingway
265c489391 rsyncd: default read/write permissions should be nobody:nogroup 2014-05-09 13:31:52 +02:00
Mateusz Kowalczyk
a9f85aa4e9 cantata: create version 1.3.4 2014-05-09 03:22:45 +02:00
Vladimír Čunát
08834b061c pidgin-sipe: fix build by updating
Also add platforms (linux).
2014-05-08 23:59:42 +02:00
Benjamin Podszun
0008a4b6c4 sylpheed: 3.2 (2012) -> 3.4.1 (2014) (close #2558)
vcunat fixed eval and tested it runs.
2014-05-08 23:35:51 +02:00
Benjamin Podszun
07a5187063 taskwarrior: bump to 2.3.0 (close #2567)
vcunat fixed the evaluation
2014-05-08 23:17:08 +02:00
Benjamin Podszun
ae6a65e811 nixpkgs: Bump filezilla to 3.8.0 (close #2578) 2014-05-08 22:46:32 +02:00
Thomas Tuegel
3a9917bf18 zotero: version bump 4.0.19 -> 4.0.20 (close #2581) 2014-05-08 22:31:56 +02:00
Vladimír Čunát
84031981a5 dropbox-cli: use stable URL, version 1.6.2
Thanks to @darklajid for reporting and testing on IRC.
2014-05-08 17:00:16 +02:00
Eelco Dolstra
46b77d3bb4 fetchurl_gnome -> fetchurlGnome 2014-05-08 15:30:17 +02:00
Benjamin Podszun
313900d819 nixpkgs: Bump feh to 2.11 2014-05-08 13:15:09 +02:00
Peter Simons
c61d607340 tkgate: rewrite expressions to get along without the broken 'libiconvOrLibc' attribute 2014-05-07 23:11:51 +02:00
Rob Vermaas
31428612c2 Upgrade rtmpdump and get_iplayer 2014-05-07 20:56:37 +02:00
宋文武
a819e8f4ef midori: fix build (close #2542) 2014-05-06 22:07:33 +02:00
Cillian de Róiste
7c2c5987d1 Add setBfree a DSP tonewheel organ emulator 2014-05-05 22:57:48 +02:00
Bjørn Forsman
d2587a014f eclipse: add Eclipse IDE for C/C++ Developers 4.3.2 2014-05-05 22:39:37 +02:00
Edward Tjörnhammar
ec2d52fca8 idea 13.1.1 -> 13.1.2 2014-05-05 21:30:25 +02:00
aszlig
3de5e16627
chromium: Fix userns sandbox patch for version 36.
This fixes build for version 36, which i accidentally broke in commit
f6e31fadd8.

The reason this happened, was that my Hydra didn't pick up the latest
commit and I actually tested and built the parent commit instead of the
update commit.

So, this commit is the real "builds fine, tested" for all channels.

Also, the sandbox client initalization has moved into
setuid_sandbox_client.cc, so we need to move the lookup of the
CHROMIUM_SANDBOX_BINARY_PATH environment variable there.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-05-05 20:45:54 +02:00
aszlig
4f3085d5f8
chromium/source: Propagate system attribute.
The system attribute was already there in the function head of the
shared update helper but it actually wasn't used and thus later the
import of <nixpkgs> was done using builtins.currentSystem instead of the
system attribute inherited from the source derivation.

Now we correctly propagate the attribute, so that even when running a
64bit kernel you can run a 32bit Chromium with binary plugins.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-05-05 20:45:53 +02:00
Peter Simons
409de114d2 Merge pull request #2511 from AndersonTorres/aegisub-update
Aegisub: update to version 3.1.3
2014-05-05 10:52:45 +02:00
John Wiegley
0a6b317071 Make Coq buildable on any Unix 2014-05-05 00:58:23 -05:00
AndersonTorres
14152efc5f Aegisub: update to version 3.1.3 2014-05-04 23:53:56 -03:00
Lengyel Balázs
fed4f39c73 Updated to mutt-1.5.23 2014-05-05 00:21:31 +02:00
Peter Simons
ef05fad51a R: don't restrict meta.platforms to Linux; other architectures should build fine 2014-05-04 22:04:44 +02:00
Peter Simons
a9258080b1 R: don't install the "recommended packages"
These packages come with R, but if we install them as part of this build, then
we cannot update them without re-building R as well. Instead, we add those
packages to the R environment through the r-wrapper. This means that
recommended packages can be updated in cran-packgaes.nix, and those updates
have an effect on the installation without re-building R itself.
2014-05-04 21:12:34 +02:00
Domen Kožar
a9a3cbfae3 xbmc: 12.3 -> 13.0
- add support for vaapi, bluray
- depend on gnutls
- by default enable pulseaudio
2014-05-04 18:04:22 +02:00
aszlig
f6e31fadd8
chromium: Update all channels to latest versions.
With this commit, the following new upstream versions are introduced:

stable: 34.0.1847.116 -> 34.0.1847.132 (builds fine, tested)
beta:   35.0.1916.47  -> 35.0.1916.86  (builds fine, tested)
dev:    36.0.1941.0   -> 36.0.1964.2   (builds fine, tested)

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-05-04 14:50:07 +02:00
aszlig
17807c8b6c
chromium: Link against pulse instead of dlopen().
This fixes the issue of Chromium not being able to load the pulseaudio
librarp

We could also propagate the build inputs, but it would end up being the
same as just directoly linking against the library.

Thanks to @aristidb for noticing this in #2421:

https://github.com/NixOS/nixpkgs/pull/2421#issuecomment-42113656

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-05-04 14:50:07 +02:00
cillianderoiste
c1181af456 Merge pull request #2397 from Fuuzetsu/mpv-0.3.8
Bump mpv to 0.3.8
2014-05-04 13:07:24 +02:00
Wout Mertens
d93b1f80c0 Add Handbrake 0.9.9: DVD ripper
This packaging splices off the unfree faac library and forces handbrake
to use the (more recent/patched) versions of libraries in Nixpkgs.
Produces the CLI HandbrakeCLI and optionally the GTK+ version ghb.
2014-05-04 01:56:49 +02:00
Peter Simons
f9f19ee938 haskell-xmonad-contrib: update to version 0.11.3 2014-05-03 20:03:30 +02:00
Alex Berg
47090c9bdc Bump docker version to 0.10.0. 2014-05-03 17:03:33 +02:00
Cillian de Róiste
849f6788ac darktable: update from 1.4.1 to 1.4.2 2014-05-03 15:16:12 +02:00
Vladimír Čunát
8c918bdc2c rsync: fix CVE-2014-2855 by upstream patch 2014-05-03 11:31:28 +02:00
Peter Simons
2b11ec44e8 haskell-hledger-irr: update to version 0.1.1.4 2014-05-03 10:53:21 +02:00
Michael Raskin
4c55ae8588 Update TPTP and make URL set robust to moving old versions to archive 2014-05-03 00:53:46 +04:00
Michael Raskin
87304674a6 Update JWM to an easily available version 2014-05-03 00:42:12 +04:00
Michael Raskin
6548fbfb28 Use the working source for GNU ARch 2014-05-03 00:20:08 +04:00
宋文武
cccaf8c091 midori: update from 0.5.7 to 0.5.8 2014-05-02 21:31:05 +02:00
taku0
af0139d7d4 Update thunderbird-bin to version 24.5.0 2014-05-02 21:21:29 +02:00
Austin Seipp
7d58646b08 z3/verifast: update license
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-05-01 19:09:24 -05:00
Peter Simons
a77e380454 xmonad-contrib: patch to fix build with GHC 7.8.2 2014-05-01 22:28:13 +02:00
Peter Simons
4700996bc7 haskell-sloane: update to version 1.7.1 2014-05-01 21:57:03 +02:00
Emery Hemingway
3b1a171c05 qtbitcointrader: initial expression 2014-05-01 15:50:57 +02:00
Vladimír Čunát
d4e1bd4aa6 libreoffice: fix build after mesa update
This is because it uses vanilla pkgconfig,
so it needs Reqires.private deps from mesa during configuration.
2014-05-01 13:08:05 +02:00
Peter Simons
0293dc9fbd Merge pull request #2357 from Chaddai/texstudio
Texstudio : advanced editor for LaTeX
2014-05-01 13:06:06 +02:00
Peter Simons
b9921ab08a ledger-3.0.nix: cosmetic fix of syntax highlighting in Emacs 2014-05-01 12:58:30 +02:00
Peter Simons
c10a424bdd ledger-2.6.3: rename the derivation to "ledger2" to allow installing
this version instead of ledger 3.x (which doesn't support reading
GNUCash files)

Discussed in <https://github.com/NixOS/nixpkgs/pull/2305>.
2014-05-01 12:56:45 +02:00
Austin Seipp
6d52463bd3 nixpkgs: add alt-ergo 0.95.2
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-05-01 02:42:31 -05:00
Austin Seipp
4ee4f76176 nixpkgs: add why3 0.83
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-05-01 02:30:39 -05:00
Austin Seipp
d1a32414cd nixpkgs: add ltl2ba 1.1
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-05-01 02:30:34 -05:00
Moritz Ulrich
444538ca8f syncthing: Bump to 0.8.2.
Tested this in two containers running 0.7.1 before. Upgraded fine and
kept working without configuration changes.
2014-04-30 23:52:54 +02:00
Eelco Dolstra
8f5ebe495c chatzilla: Update to 0.9.90.1
Also, make it work with recent Firefoxes.
2014-04-30 17:02:12 +02:00
Eelco Dolstra
0ac20f0726 flashplayer: Update to 11.2.202.356
CVE-2014-0515
2014-04-30 15:52:43 +02:00
Thomas Tuegel
7896a84849 qvim: add lua support 2014-04-29 22:19:58 +02:00
Eelco Dolstra
fe4bc3cc80 Fix evaluation error
http://hydra.nixos.org/build/10697257
2014-04-29 20:40:28 +02:00
Eelco Dolstra
1235f693ee firefox: Update to 29.0 2014-04-29 18:46:06 +02:00
Austin Seipp
c8f82b4ee8 spark: 0.9.0 -> 0.9.1
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-04-29 10:34:28 -05:00
Chaddaï Fouché
600bd22f27 Adding myself as maintainer of texstudio 2014-04-29 16:49:21 +02:00
Chaddaï Fouché
ce82a2d6d9 Cleaning up the description and fixing qt to qt4 2014-04-29 16:49:20 +02:00
Chaddaï Fouché
ed3a809a3d Add the necessary preConfigure so that TeXstudio compile (find poppler-qt4.h) 2014-04-29 16:48:22 +02:00
Chaddaï Fouché
89595fbcea Creation of a new package for texstudio, an editor for LaTeX documents 2014-04-29 16:48:22 +02:00
Peter Simons
551cae1aa0 haskell-git-annex: update to version 5.20140421 2014-04-29 01:35:45 +02:00
Peter Simons
6c5d7a63ac haskell-sloane: update to version 1.7 2014-04-29 01:35:45 +02:00
Peter Simons
3f23727e09 haskell-arbtt: update to version 0.8 2014-04-29 01:35:45 +02:00
Peter Simons
1d7f7ad92f Merge pull request #2353 from jwiegley/sage
Add expression for sage
2014-04-28 22:46:27 +02:00
Peter Simons
3445df42a4 Merge pull request #2368 from Chaddai/texmaker
TeXmaker
2014-04-28 22:42:47 +02:00
Austin Seipp
aaa0304a45 nixpkgs: verifast 13.11.14
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-04-28 13:46:27 -05:00
Eelco Dolstra
39faed1f2f qemu: Apply patch for CVE-2014-0150, CVE-2014-2894 2014-04-28 14:37:46 +02:00
Eelco Dolstra
0af5d11a6f qemu-image: Remove (obsolete) 2014-04-28 14:34:34 +02:00
James Cook
c372dc74c2 gnunet: add libgnurl and GnuTLS as dependencies
libgnurl is essential for bootstrapping (needed to download a hostlist).
GnuTLS is needed by gnunet-gns-proxy.

Also sort dependencies alphabetically.
2014-04-27 22:50:59 -07:00
Austin Seipp
0f1f2115e9 hol_light: fix script, upgrade to r189
This also tweaks the version number to just use the SVN revision (rather
than date), since it's unambiguous and increasing anyway.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-04-27 13:31:36 -05:00
Austin Seipp
da0c8f33ef nixpkgs: yices 2.2.1
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-04-27 13:05:40 -05:00
aszlig
d8f8f31726
chromium: Fix desktop icon and duplicate entry.
This should fix the desktop icon location for both desktop entries (the
one from the Chromium derivation itself and the wrapper) and renames the
name of the file so that it gets overridden by the wrappers desktop item
so we don't end up having two of them.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-04-27 18:52:28 +02:00
Austin Seipp
9ef104cbad cryptol-mode: 0.1.0
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-04-26 12:51:08 -05:00
Peter Simons
06f59807e6 qfsm: update meta.platforms settings for the new logic 2014-04-26 15:54:52 +02:00
Peter Simons
34a1db9202 tkgate: update meta.platforms settings for the new logic 2014-04-26 15:54:40 +02:00
Austin Seipp
4e15dbe34c btsync: 1.3.87 -> 1.3.93
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-04-26 00:13:36 -05:00
Thomas Tuegel
2eeba3a300 rxvt-unicode: add 256-color resources patch 2014-04-25 18:48:04 -05:00
Mateusz Kowalczyk
6fa0f4f904 Bump mpv to 0.3.8 2014-04-25 18:59:50 +00:00
Peter Simons
83df08830f qfsm: mark 'broken' because of build errors
Upstream seems to have abandoned the package.
2014-04-25 10:04:58 +02:00
Peter Simons
964f1e0e20 tkgate-2.x: mark 'broken' because the application segfaults after startup 2014-04-25 10:04:30 +02:00
Eelco Dolstra
d304b277bd Silence some Hydra evaluation warnings 2014-04-24 15:40:55 +02:00
宋文武
af72c7dddd herbstluftwm: update to 0.6.2 2014-04-24 21:30:03 +08:00
Chaddaï Fouché
31b58dccfe Added TeXmaker package : an advanced editor for latex 2014-04-24 10:59:29 +02:00
Domen Kožar
7eabca3409 Merge pull request #2315 from lethalman/gnome3
gedit, libmediaart, fix xdg-user-dirs, enable GI in grilo, prioritize nautilus mimetype, seahorse, gnome-music, glade, gnome-documents
2014-04-24 01:16:54 +02:00
Eelco Dolstra
dbd332d147 Fix meta.maintainer -> meta.maintainers 2014-04-23 14:26:32 +02:00
Peter Simons
c2516c30e3 haskell-git-annex: update to version 5.20140412 2014-04-23 11:17:07 +02:00
Luca Bruno
422c4d92b5 transmission-remote-gtk: delete hicolor icon cache 2014-04-22 22:17:20 +02:00
Bjørn Forsman
a70197a653 wireshark: add patch to lookup "dumpcap" in PATH
What this allows us to do is define a "dumpcap" setuid wrapper in NixOS
and have wireshark use that instead of the non-setuid dumpcap binary
that it normally uses.

As far as I can tell, the code that is changed to do lookup in PATH is
only used by wireshark/tshark to find dumpcap. dumpcap, the thing that's
typically setuid, is not affected by this patch. wireshark and tshark
should *not* be installed setuid, so the fact that they now do lookup in
PATH is not a security concern.

With this commit, and the following config, only "root" and users in the
"wireshark" group will have access to capturing network traffic with
wireshark/dumpcap:

  environment.systemPackages = [ pkgs.wireshark ];
  security.setuidOwners = [
    { program = "dumpcap";
      owner = "root";
      group = "wireshark";
      setuid = true;
      setgid = false;
      permissions = "u+rx,g+x";
    }
  ];
  users.extraGroups.wireshark.gid = 500;

(This wouldn't have worked before, because then wireshark would not use
our setuid dumpcap binary.)
2014-04-22 21:33:11 +02:00
Bjørn Forsman
cbd4650a1a wireshark: add myself (bjornfor) as maintainer 2014-04-22 21:33:11 +02:00
Bjørn Forsman
27477f1fac wireshark: build with libcap (POSIX capabilities)
This makes running wireshark (or more specifically, dumpcap) as root a
bit more secure. From <wireshark-1.11.2>/doc/README.packaging:

  The "--with-libcap" option is only useful when dumpcap is installed
  setuid. If it is enabled dumpcap will try to drop any setuid privileges
  it may have while retaining the CAP_NET_ADMIN and CAP_NET_RAW
  capabilities. It is enabled by default, if the Linux capabilities
  library (on which it depends) is found.
2014-04-22 21:33:11 +02:00
John Wiegley
7ce39b067a Add expression for sage 2014-04-22 14:10:36 -05:00
Eelco Dolstra
a96b1eb745 firefox: Update to 28.0 2014-04-22 14:45:27 +02:00
Vladimír Čunát
662b92e608 liferea: bugfix update
Looks good after some basic testing.
2014-04-22 13:22:14 +02:00
aszlig
396da20739
miro: Fix desktop schema GSettings path.
The real path of the schemas is:

$out/share/gsettings-schemas/gsettings-desktop-schemas-3.10.1/glib-2.0/schemas

While the previous approach was to load schemas from:

$out/share/glib-2.0/schemas

So, we're now relying on the setup hook of glib to find the right schema
path.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-04-22 10:32:54 +02:00
aszlig
f122e0e229
dmenu: Patch in store path to dmenu_run.
If dmenu isn't installed in the user environment, dmenu_run will fail
because it searches $PATH for its own binaries.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-04-22 07:22:00 +02:00
aszlig
65fcb8d503
miro: Fix parsing of youtube feeds.
Youtube feeds now don't append a "sig" query string argument anymore, so
all those feeds would fail without this patch. For the latter, a pull
request already exists on upstream at pculture/miro#428, so I guess we
can drop our patch upon release of the next new upstream bugfix release.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-04-22 06:14:01 +02:00
Jaka Hudoklin
b12b180fc2 meshlab: fix build
Patches are from the Arch Linux package.
2014-04-21 11:24:26 +02:00
aszlig
cdd1c9caa5
Merge branch 'chromium-refactor', closes #1798.
This implements some longstanding work of getting the Chromium
derivation more modular. Unfortunately, I didn't manage to decrease the
compile time, which was one of the primary goal for doing the refactor.
A main reason this didn't work out well was the fact that most bundled
libraries are so heavily patched that it's not possible within a limited
time frame to decouple it from the main derivation.

However, it should now be easier to build other derivations that build
upon Chromium, like libcef. Also, it finally adds support for the
non-free PepperAPI Flash and PDF plugins and support for fetching the
corresponding versions through the updater.
2014-04-21 09:50:50 +02:00
AndersonTorres
31a94915d2 mpv: minor updates and cleanup
E.g. parameterize lua.
2014-04-20 19:46:21 +02:00
AndersonTorres
193dd39d8c mpv: update to stable version 0.3.7
Also:
* minor waf update (reflecting bootstrap.py)
* lua5_sockets inclusion (not detected yet)
2014-04-20 19:46:21 +02:00
aszlig
18234b6768
chromium: Fix package name for browser derivation.
The packageName attribute defines the output path and binary name of the
product that's going to be created, so we really want to have "chromium"
instead of "chromium-browser" here, especially for the resulting binary.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-04-20 17:46:18 +02:00
aszlig
35944168e4
Merge pull request #1970 from @ambrop72.
We already have a desktop icon from the browser wrapper, so this is only
for people who do not use the wrapper (for example if you don't want to
use Mozilla plugins).

Also, we someday might want to propagate the desktop item to the browser
wrapper as well.

Conflicts:
	pkgs/applications/networking/browsers/chromium/default.nix
2014-04-20 17:46:18 +02:00
aszlig
0517041a2f
chromium: Drop conditionals for version 33.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-04-20 17:45:25 +02:00
aszlig
11b84078c5
chromium/common: Wrap lines to 80 characters.
Yes, it's just a comment and yes, it's so insignificant that everyone
would make a "O_o" face. But I'm getting annoyed by things like this.

Obviously that means no feature changes :-)

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-04-20 17:45:25 +02:00
aszlig
ad770bea67
chromium: Move update.sh back into the main path.
This is to ensure that nothing unexpected will be after the merge of the
refactoring branch, and also my own autoupdate machinery is expecting
this location, so there really is no reason to change it now.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-04-20 17:45:25 +02:00
aszlig
c537fa6da0
chromium: Update beta and dev to latest versions.
beta: 34.0.1847.60 -> 35.0.1916.47 (builds fine, tested)
dev:  35.0.1883.0  -> 36.0.1941.0  (builds fine, tested)

For the new version 36, we needed to rebase our user namespaces sandbox
patch, because http://crbug.com/312380 is preparing for an upstream
implementation of the same functionality.

Also, we need to add ply and jinja2 to the depends on version 36. This
is done unconditionally, because I want to avoid cluttering up the
expressions with various versionOlder checks.

The sandbox binary had to be fixed as well and we no longer use system
zlib, as - who might have guessed it - it's a fast moving target at
Chromium as well.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-04-20 17:45:24 +02:00
Luca Bruno
adc65e998d uzbl: fix gsettings schemas, fix uzbl-tabbed. Closes #2332 2014-04-20 17:40:19 +02:00
ambrop7@gmail.com
3bab2f2fc4 FreeCAD: Fix build. 2014-04-20 16:45:00 +02:00
Arseniy Seroka
5ed0347063 dwb: update 2014-04-20 10:51:21 +01:00
aszlig
3378679ff9
chromium: Don't use v8 from <nixpkgs> anymore.
The version of v8 to use for Chromium is heavily tied to the specific
version of Chromium and thus it doesn't really make sense to use v8 from
<nixpkgs>, as we would need to have 3 different versions of v8, one for
each Chromium channel.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-04-19 14:18:25 +02:00
James Cook
ee79d43e40 ImageMagick: update to 6.8.9-0 2014-04-19 11:25:01 +01:00
AndersonTorres
cf8459fecf Dillo: new package
Dillo is a lightweight, fast web browser.
2014-04-19 11:08:39 +01:00
aszlig
d072234282
chromium: Prefer local build on source derivation.
It doesn't make sense to do the splitting of the source code on a remote
machine, so don't try to do it.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-04-19 08:06:36 +02:00
aszlig
111caaad53
chromium: Factor out common build attributes.
This results in a new function called mkChromiumDerivation, which can be
used to easily build packages that are based on the Chromium source
tree.

We pass through this function as mkDerivation in the chromium wrappre,
so in the end if you want to create such a package, something like:

chromium.mkDerivation (base: {
  name = "your-shiny-package-based-on-chromium";
  ...
})

will suffice.

Of course, this is only the first step towards this functionality,
because right now I'm not even sure the Chromium browser itself will
build.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-04-19 03:58:46 +02:00
aszlig
cad411f61d
chromium/plugins: Use Debian package from sources.
This now uses the Debian package from the sources derivation instead of
hardcoding it, so we finally should have proper PepperAPI plugin support
without crashing plugins and whatnot.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-04-19 03:58:45 +02:00
aszlig
6184ee89fe
chromium/update: Update Debian binaries as well.
This cases the Debian binaries to be fetched from Google's official APT
repository. If we aren't able to find a package from the APT repository,
it's very likely that it already got deleted upstream and we need to
fallback to mirrors instead.

Unfortunately, we can't use mirrors for updating, because Google doesn't
sign the Debian packages themselves and only the release files.

We're going to hook it into a Chromium updater soon, making the sha256
hashes publicly available, so if it is missing, we can still put the
sha256 manually into sources.nix, without risking anything by blindly
fetching from one of the provided mirrors.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-04-19 03:58:45 +02:00
aszlig
2741523926
chromium: Remove URL in sources.nix and updater.
The updater is now splitted between a shellscript and a Nix expression
file which contains helpers and lookup functions to reconstruct all
information needed in order to fetch the source tarballs.

This means, that the sources.nix now doesn't contain URLs and only
versions and the corresponding SHA256 hashes. Of course, right now this
sounds like it's unnecessary, but we're going to fetch binaries soon so
it's a good idea to not unnecessarily clutter up sources.nix.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-04-19 03:58:45 +02:00
aszlig
8bc8b51375
chromium: Move source package into own subdir.
Next, we're going to refactor update.sh and the first step is to ensure
that we keep everything related to sources into its own subdirectory to
not clutter up the main directory too much.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-04-19 03:58:44 +02:00
aszlig
202755ca2f
chromium: Properly pass packageName and version.
We don't want ta have the source derivation in the runtime dependencies
of the browser itself. Also, we've broken the Firefox wrapper, because
we've no longer exposed the packageName attribute.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-04-19 03:58:44 +02:00
aszlig
eadbf855b0
chromium: Revert back to copying bundled sources.
I'm giving up on this after several attempts to correctly unbundle the
largest part, namely Google's WebKit fork Blink. Right now it's so much
tied into the Chromium source it's going to be fairly hard to do if
you're not working full time on it.

Also, the intermediate steps needed to do this properly would introduce
uneccesary complexity on our side, so we really need to finish this
without leaving it in the "messy" state in order to not make Chromium
even more difficult to maintain than it is already.

However, anyone who wants to proceed on this messy step is free to
revert this commit and continue doing so. In my case I'm going to try
again once https://crbug.com/239107 and https://crbug.com/239181 are
fixed in _stable_ (I don't want to introduce *lots* of conditionals on
the version either).

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-04-19 03:58:43 +02:00
aszlig
c6fa73b26c
chromium: Propagate browser's meta to the wrapper.
We obviously don't want the Hydra job of nixpkgs to fail, so we need to
make sure that we have a proper meta attribute on the outermost
derivation.

For builds based on the Chromium source tree (like for example libcef),
we can still move the wrapper elsewhere when we need it.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-04-19 03:58:43 +02:00
aszlig
cce984b324
chromium: Correct tools path in blink_idl_parser.
This is because of our symlink mess, as Chromium's build support scripts
are trying to resolve everything based on absolute paths and we split
off the bundled sources from the main derivation.

Yes, I'm refering to this as a mess, because in the end, we're going to
patch up the gyp files and use references someday.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-04-19 03:58:43 +02:00
aszlig
d8ba5b3eff
chromium: Add bundled dependencies for dev/beta.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-04-19 03:58:42 +02:00
aszlig
5021717099
chromium: Split off sandbox from the browser.
Now, we no longer tie the sandbox directly to the browser derivation but
wrap everything together into one derivation at the entry point at
default.nix.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-04-19 03:58:42 +02:00
aszlig
c86d376c82
chromium: Selectively link bundled libraries.
So far we just copied everything from source.* into the build directory
during the prePatch. This somewhat defeated the purpose of the source
splitup because it involved more I/O than just unpacking the entire
source tree.

Now, we're selectively *symlinking* the bundled sources into the build
directory. Even that isn't perfect because in the end we'd just
reference foreign derivations and we're done. But for now, this gets us
at least prepared for a massive reduction of compile time.

Unfortunately, gyp's behaviour when it comes to symlinks is quite
painful to come by, so we need to fix a few references to use absolute
paths.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-04-19 03:58:42 +02:00
aszlig
16af058ff9
chromium: Move plugins into its own Nix file.
We now no longer pass enablePepperFlash and enablePepperPDF to the
browser package itself and only use plugins.flagsEnabled from there.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-04-19 03:58:42 +02:00