mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-25 07:00:43 +00:00
Code Issues Wiki Activity
51462 commits 234 branches 124 tags 7.1 GiB
Commit graph

44059 commits

Author SHA1 Message Date
Aristid Breitkreuz 608aeede89 Merge pull request #4597 from ehmry/cjdns 
Cjdns
 2014-10-22 20:49:20 +02:00
Aristid Breitkreuz 69989eea1b Merge pull request #4615 from abbradar/rpmextract 
rpmextract: accept multiple input files
 2014-10-22 20:48:14 +02:00
Aristid Breitkreuz 3e707fe5db update oracle jdk 7 2014-10-22 20:46:44 +02:00
Aristid Breitkreuz 68ea5c3178 Merge pull request #4565 from edwtjo/tsocks-fix 
tsocks: fixes
 2014-10-22 20:41:13 +02:00
Aristid Breitkreuz 17f3ca48a0 Merge pull request #4570 from pmahoney/notmuch-darwin 
Notmuch: fix build on darwin
 2014-10-22 20:39:15 +02:00
Aristid Breitkreuz 1292ab04d8 Merge pull request #4618 from valeriangalliat/patch-1 
Add the Unlicense
 2014-10-22 20:38:23 +02:00
Valérian Galliat 1f4456fb5a Add youtube-dl license 2014-10-22 20:35:42 +02:00
Pascal Wittmann 773e804274 Merge pull request #4619 from aronasorman/update_elixir 
update elixir to v1.0.2
 2014-10-22 20:20:01 +02:00
Aron Fyodor Asor 758b937120 update elixir to v1.0.2 2014-10-22 10:55:43 -07:00
Mateusz Kowalczyk 7f7233b61d sxiv: use giflib 5.0 
https://github.com/muennich/sxiv/issues/180
 2014-10-22 18:42:35 +01:00
Mateusz Kowalczyk a07b54ec38 Merge pull request #4610 from MP2E/chocolate_doom_update 
update chocolateDoom to v2.1.0, chocolateDoomMaster removed
 2014-10-22 17:33:42 +01:00
aszlig eea4fce4a5
btrfsprogs: Revert update to version 3.17. 
This reverts commit 249e417677.

Breaks snapper:

http://hydra.nixos.org/build/16420291

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2014-10-22 18:12:12 +02:00
Julian K. Arni b48fe7f566 Add hspec-checkers. 2014-10-22 18:09:06 +02:00
Mathijs Kwik 98015ee5ba conkeror: upgrade to 141017 and use firefox for xulrunner 2014-10-22 18:08:46 +02:00
Sander van der Burg cddc7382ef nodejs: disable usage of http-parser library on darwin, because it breaks the build 2014-10-22 17:51:24 +02:00
Domen Kožar 9a48f6f9ef Revert "chromium: update dev, beta, stable channels" 
This reverts commit 32df2a0838.

See
32df2a0838 (commitcomment-8260774)
 2014-10-22 17:42:29 +02:00
Sander van der Burg c419b193a2 Updated nodejs packages 2014-10-22 17:03:21 +02:00
Ricardo M. Correia f59afe3994 pax-utils: Update from 0.8.1 -> 0.9.1 2014-10-22 16:47:09 +02:00
Ricardo M. Correia 2838c2a7bc flashplayer: Update from 11.2.202.406 -> 11.2.202.411 2014-10-22 16:46:43 +02:00
Ricardo M. Correia cb95ac1352 Merge pull request #4609 from alexanderkjeldaas/updated-grsec 
Updated grsec.
 2014-10-22 16:37:21 +02:00
Mathijs Kwik 6af6bd9b51 xulrunner: fix for building on i686 2014-10-22 16:20:43 +02:00
Mathijs Kwik 2140adf11f Revert "Revert "xulrunner: stick to firefox's src attribute"" 
This reverts commit f13b383449.
 2014-10-22 16:20:43 +02:00
Eelco Dolstra bb8500393b Disable Darwin builds until we get the Darwin machine back 2014-10-22 16:08:42 +02:00
Bjørn Forsman 34ec068a46 quilt: set meta.platforms = all 
We'll reduce it if/when Hydra reports some broken platforms.
 2014-10-22 16:07:37 +02:00
Balaji Sivaraman 93fa6d456b scala: Bump up version from 2.11.1 to 2.11.2 2014-10-22 19:27:54 +05:30
Rob Vermaas 6596dccfd9 zabbix.server: update from 1.8.20 to 1.8.21 2014-10-22 15:29:05 +02:00
Domen Kožar 32df2a0838 chromium: update dev, beta, stable channels 2014-10-22 15:06:05 +02:00
Domen Kožar c01af09401 squashfs: -lgcc_s 2014-10-22 15:06:05 +02:00
Peter Simons d1fd6c90f4 scala: Revert "update from 2.11.1 to 2.11.3". 
This reverts commit 4507aeb200.
Scala 2.11.3 is broken:

  https://groups.google.com/forum/#!msg/scala-internals/SSD9BNJaFbU/rACBkHrs2JEJ.
 2014-10-22 14:57:13 +02:00
Nikolay Amiantov b580be236c rpmextract: accept multiple input files 2014-10-22 16:53:32 +04:00
Domen Kožar b3a4c3c2d0 squashfs: 4.3 -> 4.4, hopefully fixes http://hydra.nixos.org/build/16422733 2014-10-22 14:36:56 +02:00
Peter Simons b31ac058cc magit: don't install lisp files into a "magit" sub-directory 
After this change, Emacs can load the magit-*.el files without further
configuration. Just add

    (require 'magit-autoloads)

to ~/.emacs, and run M-x magit-status or any other magit command.
 2014-10-22 13:06:43 +02:00
Bjørn Forsman 97e0f851d9 quilt: set meta.platforms 2014-10-22 12:02:54 +02:00
Peter Simons b0ea187001 ihaskell-wrapper: inherit the meta section from ihaskell 2014-10-22 11:47:08 +02:00
Peter Simons 1e5c45f18e haskell-network-simple: update to version 0.4.0.2 2014-10-22 11:47:08 +02:00
Peter Simons 433a2c56e5 haskell-mysql: update to version 0.1.1.7 2014-10-22 11:47:08 +02:00
Peter Simons 4d59d19143 haskell-focus: update to version 0.1.3 2014-10-22 11:47:07 +02:00
Peter Simons a4ce7ccef3 haskell-fast-logger: update to version 2.2.3 2014-10-22 11:47:07 +02:00
Peter Simons 2c8a694706 haskell-extra: update to version 0.3.2 2014-10-22 11:47:07 +02:00
Peter Simons 84ed71cb03 haskell-dynamic-cabal: update to version 0.3.3 2014-10-22 11:47:07 +02:00
Peter Simons 1a7da2b3fd haskell-HTF: update to version 0.12.2.2 2014-10-22 11:47:07 +02:00
Peter Simons eaf518c297 haskell-vty: update to version 5.2.4 (and remove obsolete version 4.x) 
This change breaks vty-ui, which appears to be unmaintained by upstream.

https://github.com/jtdaugherty/vty-ui/issues/55
 2014-10-22 11:47:07 +02:00
Peter Simons dba01b2e77 magit: update to the latest release from Melpa 2014-10-22 11:46:56 +02:00
Peter Simons 3b4a72c3d6 git-modes: add git-modes package version 0.15.0-8-g4e10851 for Emacs 
These files are required by the latest version of Magit.
 2014-10-22 11:46:56 +02:00
Peter Simons 807e834742 Merge pull request #4612 from balajisivaraman/scala-2.11.3 
scala: Bump up version from 2.11.1 to 2.11.3
 2014-10-22 11:39:59 +02:00
Balaji Sivaraman 4507aeb200 scala: update from 2.11.1 to 2.11.3 2014-10-22 14:45:59 +05:30
Sander van der Burg 37c94eae5a Merge pull request #4611 from doublec/fhs-mount-fix 
Fix build-fhs-chrootenv mount script
 2014-10-22 10:48:31 +02:00
Chris Double 40791a4ec5 Fix build-fhs-chrootenv mount script 2014-10-22 10:39:17 +02:00
aszlig 0c968c9a0e
ihaskell/wrapper: Fix eval by marking as broken. 
Introduced by 5e03d07621.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2014-10-22 09:21:53 +02:00
Cray Elliott 48e0a0a3c8 update chocolateDoom to v2.1.0, chocolateDoomMaster removed 2014-10-22 00:01:33 -07:00
aszlig 57aaf3d36e
Merge branch 'nixpart-1.0-preparations'. 
Partially and temporarily addresses NixOS/nixops#228.

We now have an up-to-date version of Blivet and a bunch of its dependen-
cies as well as the old nixpart 0.4 with all its old and crappy
dependencies, which should fix _simple_ partitioning layouts for NixOps.

Also, nixpart 1.0 is now marked as broken, because it is not yet
released and this branch is more of a preparation and "damage control"
in case I shouldn't manage to finish nixpart + nixos-assimilate in time
for the next NixOS release.
 2014-10-22 08:23:31 +02:00
aszlig 78ef5f9c14
nixpart: Move all 0.4 dependencies into one dir. 
Once nixpart 1.0 is released we then only need to delete one single
directory rather than searching for needles in a haystack, that is, all
of <nixpkgs>. Also, it keeps my sanity at an almost healthy level.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2014-10-22 08:22:59 +02:00
aszlig 7676ff5973
nixpart: Bring back requirements for version 0.4. 
Quite a mess but at least the mdraid tests succeed now. However, the
lvm2 tests are still failing, so we need to bring back a few more old
crap :-(

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2014-10-22 08:22:58 +02:00
aszlig cff26e2d38
nixos: Add VM test for blivet. 
I'm really not sure whether these tests are actually run upstream,
because there are quite a few oddities which either are my fault by just
missing something important or upstream really doesn't bother to run
those tests.

One example of this are testDiskChunk1 and testDiskChunk2, which create
two non-existing partitions and tries to allocate them. Now, in
allocatePartitions(), the partedPartition attributes are reset to None
and shortly afterwards a for loop is expecting it to be NOT None.

So, for now I'm disabling these tests and will see if we stumble on them
during work on nixpart 1.0, so we're really sure whether it's my fault
or a real bug in blivet.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2014-10-22 08:22:58 +02:00
aszlig 16371fce91
nixpart: Bump version to 1.0.0 and mark as broken. 
We don't want Hydra to even try and build this, because we're going to
fill in the right sha256 as soon as the the new nixpart version is
released.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2014-10-22 08:22:57 +02:00
aszlig cb2c34f1bb
blivet: Update to new upstream version 0.67. 
Put a copy of old version 0.17 expression into 0.17.nix and update the
pointers from nixpart0 accordingly.

This also means, that plain nixpart is now way more broken than
nixpart0 (we might want to temporarily fix 0.4 anyway).

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2014-10-22 08:22:57 +02:00
Peter Simons 8953fb5e7d haskell-ihaskell: set hydraPlatforms to none to avoid evaluation errors 2014-10-22 08:12:42 +02:00
Alexander Kjeldaas 005bb796e6 Updated grsec. 2014-10-22 02:18:41 +02:00
aszlig 7deadbb55f
nixpart: Copy package expression to 0.4.nix. 
Update the nixpart0 pointer to point to this version, because we're
going to update blivet as well and NixOps still points to nixpart0.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2014-10-22 01:54:48 +02:00
aszlig 34ae3b7f77
parted: Update to new upstream version 3.2. 
In order to properly run tests, we need to fix the unicode tests and
after some search, I have found that Ludo (who is also the <nixpkgs>
maintainer of parted) already reported this upstream and also provided a
solution:

http://lists.gnu.org/archive/html/bug-parted/2014-08/msg00003.html

I'm updating parted to 3.2, because the latest blivet implementation
relies on it for device geometry calculations.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2014-10-22 01:54:47 +02:00
aszlig 6553845afc
pyparted: Add patch to fix tests for parted 3.2. 
See this message for the patch and details:

https://www.redhat.com/archives/pyparted-devel/2014-April/msg00000.html

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2014-10-22 01:54:47 +02:00
Peter Simons bddf342631 Patch 7a20d76 failed when the Haskell expression lacked a meta attribute. This commit fixes that issue. 2014-10-22 00:23:12 +02:00
Peter Simons 7a20d76482 Disable all Haskell builds for Darwin on Hydra. 
Hydra generates a GHC closure for Darwin that for no apparent reason
contains an ancient, broken Haddock binary -- probably because of an
impurity in the build system. That bug makes those GHC binaries
unusable: <https://github.com/NixOS/nixpkgs/issues/2689>.
 2014-10-21 23:54:51 +02:00
Mateusz Kowalczyk 917c1638bf emacs-magit: fix URL (hopefully) 2014-10-21 22:40:28 +01:00
Pascal Wittmann 1a4523ba8d lessc: update from 1.4.2 to 1.7.5 2014-10-21 23:07:06 +02:00
Peter Simons 5e03d07621 ihaskell: broken by the recent classy-prelude update 
@edwtjo: http://hydra.cryp.to/build/208767/nixlog/1/raw
 2014-10-21 23:04:40 +02:00
Peter Simons 6b73aaed7f haskell-keter: update to version 1.3.5 2014-10-21 23:04:40 +02:00
Peter Simons 1c14aa4fc9 haskell-yesod-form: update to version 1.4.1 2014-10-21 23:04:40 +02:00
Peter Simons 661b9e7531 haskell-yesod-core: update to version 1.4.3 2014-10-21 23:04:40 +02:00
Peter Simons a85ffa1bf0 haskell-yesod-bin: update to version 1.4.0.4 2014-10-21 23:04:40 +02:00
Peter Simons 63fe24d523 haskell-wai-app-static: update to version 3.0.0.2 2014-10-21 23:04:40 +02:00
Peter Simons d24a592d81 haskell-tls: update to version 1.2.13 2014-10-21 23:04:40 +02:00
Peter Simons c296d406b1 haskell-th-lift-instances: update to version 0.1.4 2014-10-21 23:04:40 +02:00
Peter Simons fcd2231cb9 haskell-tasty-th: update to version 0.1.3 2014-10-21 23:04:40 +02:00
Peter Simons 9e61b64c31 haskell-hxt-regex-xmlschema: update to version 9.2.0 2014-10-21 23:04:40 +02:00
Peter Simons 2b2bfb7dc2 haskell-hspec2: update to version 0.5.1 2014-10-21 23:04:40 +02:00
Peter Simons 51f01e63b5 haskell-hspec: update to version 1.12.1 2014-10-21 23:04:40 +02:00
Peter Simons c15e0592eb haskell-hspec-meta: update to version 1.12.1 2014-10-21 23:04:39 +02:00
Peter Simons 94bc815c87 haskell-hcltest: update to version 0.3.6 2014-10-21 23:04:39 +02:00
Peter Simons 0c80f224fc haskell-haskell-generate: update to version 0.2.2 2014-10-21 23:04:39 +02:00
Peter Simons b866c4d36a haskell-fb: update to version 1.0.7 2014-10-21 23:04:39 +02:00
Peter Simons 575ddc19cb haskell-fay: update to version 0.21.0.2 2014-10-21 23:04:39 +02:00
Peter Simons eedf2610dd haskell-extra: update to version 0.3.1 2014-10-21 23:04:39 +02:00
Peter Simons f7c75a5063 haskell-ekg: update to version 0.4.0.4 2014-10-21 23:04:39 +02:00
Peter Simons 0beec5a972 haskell-classy-prelude: update to version 0.10.1 2014-10-21 23:04:39 +02:00
Peter Simons e4cdce1213 haskell-classy-prelude-conduit: update to version 0.10.1 2014-10-21 23:04:39 +02:00
Peter Simons c28b225a6a haskell-binary-conduit: update to version 1.2.3 2014-10-21 23:04:39 +02:00
Peter Simons 53f788b421 haskell-basic-prelude: update to version 0.3.10 2014-10-21 23:04:39 +02:00
Pascal Wittmann c5fd7f3b69 twitter-bootstrap: use fetchFromGitHub 2014-10-21 22:35:30 +02:00
Domen Kožar 3514fad7cd lttng-modules: disable on 3.12 kernel 2014-10-21 21:46:34 +02:00
Mateusz Kowalczyk b41f2cdeb8 structured-haskell-mode: actually fix 2014-10-21 20:32:04 +01:00
Domen Kožar f86ef02678 lttng-modules: update to 2.6.0-rc1 2014-10-21 21:24:02 +02:00
Mateusz Kowalczyk 2026054746 emacs-magit: update to 1.2.1 2014-10-21 20:21:11 +01:00
Mateusz Kowalczyk c9dd0b1a12 structured-haskell-mode: use haskell-src-exts 1.15 2014-10-21 20:19:03 +01:00
Georges Dubus 7eadfc01b3 Merge pull request #4607 from k0ral/safe-rm 
New package: safe-rm-0.11
 2014-10-21 20:57:18 +02:00
John Wiegley 0fdd8b312e emacs24Macport: 23.4-mac-4.8 -> 24.4-mac-5.0 2014-10-21 13:40:53 -05:00
koral 03ec2d9477 New package: safe-rm-0.11 2014-10-21 20:19:57 +02:00
Eelco Dolstra a5262a9000 firefox: Fix evaluation on non-Linux 
Actually we only support Firefox on Linux, but we hit the “attribute
‘gcc.override’ missing” error before the platform check.
 2014-10-21 19:49:35 +02:00
Emery Hemingway 70e0577886 update cjdns from 20140922 to 20140928 2014-10-21 13:08:54 -04:00
Domen Kožar 5c251eb3a0 python3Packages.{pagerduty,sipsimple}: disable 2014-10-21 18:55:39 +02:00