public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
60,597 Commits 1 Branch 0 Tags
d33d53a3a3d2fd4e52f76e684ebc0b3a7bc46fbf
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Shea Levy f1e2b02cd3 Add Net::SMTP::TLS::ButMaintained perl package 2015-04-01 08:53:00 -04:00
Shea Levy df50903da8 Merge branch 'submit/enable-syncthing-osx' of git://github.com/ctheune/nixpkgs 
Enable syncthing for Mac OS X.
 2015-03-30 16:17:53 -04:00
Shea Levy b77aec818a Merge branch 'master' of git://github.com/ctheune/nixpkgs 
bump syncthing version to 0.10.30
 2015-03-30 16:03:04 -04:00
Shea Levy 6e3c9d5ce4 Fix fallout of recent cc-wrapper changes 
Fixes tarball except for 56e21d05e8
 2015-03-24 22:13:43 -04:00
Shea Levy f80e342e83 ccache-links is wrapped, so it needs a gcc attribute 2015-03-24 08:59:34 -04:00
Shea Levy 19cd9f16a0 Merge branch 'staging' 2015-03-20 09:53:34 -04:00
Shea Levy e729dfbd3f gcc-4.9: Set isGNU 
Fixes #6787
 2015-03-13 12:47:17 -04:00
Shea Levy 3177d37652 Fix import using module args 2015-03-12 23:42:57 +01:00
Shea Levy 772b8869d2 Add comment about limitation on __internal.check 2015-03-12 23:42:57 +01:00
Shea Levy f69ce50529 Move most extra args out of eval-config.nix 2015-03-12 23:42:57 +01:00
Shea Levy 0a0a29fd0b Add comments about the module system interface 
Ideally the module system could be configured pretty much completely by
the contents of the modules themselves, so add comments about avoiding
complicating it further and possibly removing now-redundant
configurability from the existing interface.
 2015-03-12 23:42:57 +01:00
Shea Levy e3eff53037 evalModules: Add internal option for the check argument 2015-03-12 23:42:57 +01:00
Shea Levy e4a06f35b1 nixos: Don't evaluate twice to get the value of config.nixpkgs 2015-03-12 23:42:57 +01:00
Shea Levy 1d62ad4746 modules.nix: Generate the extra argument set from the configuration 
This allows for module arguments to be handled modularly, in particular
allowing the nixpkgs module to handle the nixpkgs import internally.
This creates the __internal option namespace, which should only be added
to by the module system itself.
 2015-03-12 23:42:57 +01:00
Shea Levy 4f5c6330c9 types.loaOf: Update check function 
This symplifies typechecking and allows properties to be used inside the
function body. It also makes possible checking the type of the result.
 2015-03-12 23:42:57 +01:00
Shea Levy 8737d1783f types.attrsOf: Use mergeDefinitions to handle each element 
This simplifes typechecking and allows properties to be used inside of
the attribute sets.

This fixes the empty synergy-client and synergy-server services
previously generated on systems with synergy disabled.
 2015-03-12 23:42:57 +01:00
Shea Levy e4bc2592f3 types.listOf: Use mergeDefinitions to handle each element 
This simplifies typechecking and allows properties to be used inside the lists
 2015-03-12 23:42:57 +01:00
Shea Levy 9255c48a06 Move property processing, type checking, and merge code into a function 
This makes the relationship between property types clearer, and more
importantly will let option types parameterized by other option types
reuse the code for delegated type checking and merging.
 2015-03-12 23:42:57 +01:00
Shea Levy de892761cf dragonegg: Pull from llvm 3.5 
If someone uses it, we can add the 3.6 version of course
 2015-03-09 23:01:59 +00:00
Shea Levy e57e44f867 llvm-3.6 packages: Build everything (except clang and llvm) with clang 2015-03-07 13:08:34 +00:00
Shea Levy b37fd11351 llvm-3.6 packages: Rearrange directory structure 2015-03-07 12:51:06 +00:00
Shea Levy 3ed077a69b lldb-3.5 is broken, bug in the cmake 
lldb-3.6 is working (just waiting on a staging fix to merge), so let's just
mark this broken until we decide to nuke 3.5 all together.

Fixes #6636 refs #6668
 2015-03-06 16:16:20 -05:00
Shea Levy c62b5456f5 Merge branch 'llvm-3.6' of git://github.com/Ralith/nixpkgs into llvm-3.6-merge 
LLVM, clang, and lldb 3.6iLLVM, clang, and lldb 3.6

Conflicts:
	pkgs/top-level/all-packages.nix
 2015-03-06 19:10:10 +00:00
Shea Levy f91dea4c0b cc-wrapper: Set default system include flags for non-gcc c++ on Linux 
Without this, clang can't find libstdc++. This needs to happen in the wrapper
so that the libc++ setup hook can still override it
 2015-03-06 19:04:43 +00:00
Shea Levy 6b53021205 Merge branch 'master' into staging 2015-03-06 19:02:36 +00:00
Shea Levy 55cf015142 clang-3.6: provide path to gcc on Linux 
gcc contains core runtime bits that aren't available elsewhere for Linux.

Refs #6449
 2015-03-06 13:49:49 +00:00
Shea Levy 494ae5fbeb clang: provide path to gcc on Linux 
gcc contains core runtime bits that aren't available elsewhere for Linux.

Fixes #6449 refs #6668
 2015-03-06 08:36:42 -05:00
Shea Levy c08a0d240c ats2: bump 2015-03-05 18:21:56 -05:00
Shea Levy 830c76d6ba Merge branch 'xen_kernel' of git://github.com/ts468/nixpkgs 
Add kernel config form dom0 of Xen
 2015-02-20 07:49:46 -05:00
Shea Levy 2fe3a3c203 Merge branch 'grub' of git://github.com/ts468/nixpkgs 
Fix grubTarget on nodev installs
 2015-02-20 07:47:06 -05:00
Shea Levy 3e44f99055 Fix grub 1 install 2015-02-19 19:33:17 -05:00
Shea Levy 2f061ff16b Merge remote-tracking branch 'origin/staging' 
Darwin and haskell fixes.
 2015-02-17 13:52:37 -05:00
Shea Levy df0016a8ce Fix pass on darwin 2015-02-15 16:14:13 +00:00
Shea Levy 7a1d132db9 Merge branch 'cc-wrapper-improvements' of git://github.com/copumpkin/nixpkgs into staging 2015-02-11 19:37:59 -05:00
Shea Levy 127efcd6f6 Merge branch 'kill-libiconv' of git://github.com/gridaphobe/nixpkgs into staging 
Took "ours" for the conflict and changed libiconvOrEmpty to libiconv

Conflicts:
	pkgs/applications/audio/ncmpcpp/default.nix
 2015-02-11 19:37:22 -05:00
Shea Levy 52879c9050 pass: fix completion installation 2015-02-11 15:29:34 +00:00
Shea Levy 794edf60cd Merge branch 'nixos-master-test' of git://github.com/copumpkin/nixpkgs 2015-02-08 22:37:46 -05:00
Shea Levy 24c0844cfb Fix grub on nodev installs 2015-02-08 22:31:14 -05:00
Shea Levy 0d80ab2dd9 Fix grub1 support 2015-02-08 22:28:42 -05:00
Shea Levy a7dad535e4 Merge branch 'openjdk8' of git://github.com/cocreature/nixpkgs 
Update to openjdk8u31b13
 2015-02-05 14:22:12 -05:00
Shea Levy e14d39b97b Merge branch 'osx-i3-urxvt' of git://github.com/cresh/nixpkgs 2015-02-04 22:14:52 +00:00
Shea Levy b45aa294d4 Merge branch 'llvm-bump' 
Bump default llvm on non-darwin too
 2015-02-04 11:48:50 -05:00
Shea Levy c1aefe5d7e Merge branch 'master' of git://github.com/gridaphobe/nixpkgs 
make wget build on darwin
 2015-02-04 16:41:15 +00:00
Shea Levy 0e225c0e37 llvm-3.5: Don't try to use libc++ on linux 2015-02-04 11:30:25 -05:00
Shea Levy 92962f049b Merge branch 'less-tradcpp' of git://github.com/active-group/nixpkgs 
Shorten tradcpp patch by re-running autoconf
 2015-02-04 15:56:49 +00:00
Shea Levy df430ab2ea Fix imake on darwin. 
Taken from joelteon/nixpkgs@6b3f7e6fb0

Original author Mike Sperber <sperber@deinprogramm.de>
 2015-02-04 10:00:50 +00:00
Shea Levy a1f1d0d442 Switch default llvm to 3.5 2015-02-03 20:01:39 -05:00
Shea Levy 5ac0318332 Merge branch 'new-darwin-stdenv' of git://github.com/gridaphobe/nixpkgs 
refs #6122
 2015-02-03 18:19:22 -05:00
Shea Levy aea1254f96 cc-wrapper merge fixes 2015-02-02 21:30:05 -05:00
Shea Levy c45372f038 Merge commit 'cfb29ab882323d379aba20a95020c7c24f883eae' 
Partial staging merge, including cc-wrapper fixes

Conflicts:
	pkgs/applications/audio/spotify/default.nix
	pkgs/build-support/cc-wrapper/default.nix
	pkgs/development/compilers/cryptol/1.8.x.nix
 2015-02-02 21:14:28 -05:00
Shea Levy 52d4b9d982 Merge branch 'tlsdate' of git://github.com/4z3/nixpkgs 2015-01-30 01:07:59 -05:00
Shea Levy cfb29ab882 Merge branch 'gridaphobe' into staging 
fix cc-wrapper for cross-compilation
 2015-01-28 13:47:47 -05:00
Shea Levy 9bccb95a82 cc-wrapper: Fix for cross-compiling 
Fixes #5949

Suggested by @ambrop72
 2015-01-25 23:29:06 -05:00
Shea Levy 3dbebb27be Merge branch 'openjdk8' of git://github.com/cocreature/nixpkgs 2015-01-20 10:17:58 -05:00
Shea Levy f326b7995c Remove libc++ stuff from cc-wrapper 
This is now part of the libc++ setup hook
 2015-01-16 11:30:51 -05:00
Shea Levy 7dc57a389e cc-wrapper: Set CC/CXX more specifically if possible 2015-01-16 10:50:53 -05:00
Shea Levy 16fe4be790 Add isGNU attribute to gccs 2015-01-14 20:26:57 -08:00
Shea Levy 2ba3653ef6 Update hackage-packages 
Includes NixOS/cabal2nix#127
 2015-01-13 08:55:02 -05:00
Shea Levy 8921a8f53b Revert "Revert "mkOverridable: Use functors to allow overridable functions"" 
Original commit was reverted due to using features from a newer nix than
hydra had, hydra has since been updated

This reverts commit 07e726c85c.
 2015-01-13 08:39:54 -05:00
Shea Levy 9e114ccd26 haskellng: Make amazonka env externally visible 2015-01-12 18:13:40 -05:00
Shea Levy 3dc5be9ec5 More amazonka packages on 7.8 2015-01-12 20:58:57 +00:00
Shea Levy 67460ea19f haskellng: Fix amazonka-core on 7.8 
Required adding a flag to the generic builder to build Setup.hs with
core packages even if there is an override in buildInputs, to break
circular dependencies.
 2015-01-12 15:41:03 -05:00
Shea Levy d30e9082bb D'oh 2015-01-12 12:20:42 -05:00
Shea Levy 3f714f32ac overrideCabal: Preserve overrideScope attr 2015-01-12 12:18:46 -05:00
Shea Levy e0b270efc9 Fix http-date build on ghc 7.10 2015-01-12 09:58:56 -05:00
Shea Levy baa634cf18 Fix retry build on ghc 7.10 2015-01-12 09:46:35 -05:00
Shea Levy 2f5cd9ec85 haskell-chell: Fix for 7.10.1 2015-01-12 09:37:20 -05:00
Shea Levy c972ea1e8c haskell-options: Fix for 7.10.1 2015-01-12 09:14:50 -05:00
Shea Levy 1476240ba6 Merge remote-tracking branch 'shlevy/overridable-functions' 2015-01-12 07:30:37 -05:00
Shea Levy e4c9a521ef haskellng: remove amazonka patches. 
New amazonka was released.

@peti Long-term, is there a way to have hackage2nix warn about patched
packages?
 2015-01-10 11:35:25 -05:00
Shea Levy 6e008f05ab haskellng: Get amazonka family building 
amazonka-0.0.7 is broken, so I also updated hackage-packages after
applying NixOS/cabal2nix#119.
 2015-01-09 19:03:27 -05:00
Shea Levy 60fec84379 Disable split testsuite on 7.10 2015-01-09 17:02:42 -05:00
Shea Levy dd558e0baa Disable old-locale for aeson on 7.10 
@peti why does hackage2nix enable that flag anyway?
 2015-01-09 16:24:38 -05:00
Shea Levy 69f5738668 attoparsec: Fix build for 7.10 2015-01-09 16:18:16 -05:00
Shea Levy 4d325bcede haskellng: bump text-icu 
Taken from d2566a190e
 2015-01-09 15:55:22 -05:00
Shea Levy 473b0d9535 Revert "hackage-packages.nix: Update to 2015/01/09-20:00 UTC" 
For some reason this set a lot of native dependencies to null. I'll just
take the text-icu bump by itself for now.

@peti how am I meant to use hackage2nix?

This reverts commit d2566a190e.
 2015-01-09 15:53:35 -05:00
Shea Levy d2566a190e hackage-packages.nix: Update to 2015/01/09-20:00 UTC 
Needed text-icu bump
 2015-01-09 15:03:42 -05:00
Shea Levy b1c3c3276d Miscellaneous ghcHEAD fixes 2015-01-09 14:57:39 -05:00
Shea Levy 93b75f6284 ghc-ng-7.10: More doctest fixes 2015-01-09 14:07:36 -05:00
Shea Levy ad632cc9c8 utf8-string has too string base upper bound 2015-01-09 13:38:34 -05:00
Shea Levy 119f5baa22 Fix transformers-compat on 7.10-ng 2015-01-09 13:33:10 -05:00
Shea Levy 4ee556cfe9 mkOverridable: Use functors to allow overridable functions 2015-01-09 13:26:34 -05:00
Shea Levy 5cb62016a5 Revert "Add amazonka, amazonka-core, amazonka-cloudwatch haskell packages" 
Unnecessary change to the haskell packages infrastructure, will move
this to haskellng packages.

This reverts commit 0f04707953.
 2015-01-08 09:38:47 -05:00
Shea Levy cca8bae86e Merge branch 'rngd-fix' of git://github.com/abbradar/nixpkgs 2015-01-08 09:36:29 -05:00
Shea Levy 0f04707953 Add amazonka, amazonka-core, amazonka-cloudwatch haskell packages 
Required adding a deep override mechanism to haskell packages
 2015-01-06 14:42:37 -05:00
Shea Levy 3e1fdb7a35 gcc-wrapper is used for clang too 2015-01-05 14:39:22 -05:00
Shea Levy 77a448e96f restore pkgs.gcc = stdenv.cc 2015-01-03 09:54:02 -05:00
Shea Levy 664d0fbbba proot: Don't hard-code git-export 2015-01-01 10:04:13 -05:00
Shea Levy a8603605aa fetchgit: give output a nicer name 
Instead of git-export, we get the basename of the repo, plus the
shortrev if the commit-ish is a rev.
 2015-01-01 10:03:45 -05:00
Shea Levy 4ce7f05ba4 gummiboot-builder.py: run nix with no build-users-group 
During install, the bootloader script gets run inside a chroot after the
/etc/group bind-mount is unmounted. Since we're not doing any building,
this should be safe, but really nix should just not care if the group
does not exist when no build is needed.

Fixes #5494
 2015-01-01 15:45:31 +01:00
Shea Levy 9245516b46 gummiboot-builder.py: run nix with no build-users-group 
During install, the bootloader script gets run inside a chroot after the
/etc/group bind-mount is unmounted. Since we're not doing any building,
this should be safe, but really nix should just not care if the group
does not exist when no build is needed.

Fixes #5494
 2014-12-29 07:09:10 -05:00
Shea Levy bbd2be6075 Restore accidentally-dropped stdenv adapter 2014-12-26 12:38:18 -05:00
Shea Levy 7e0a5c38f3 More gcc->cc refs 2014-12-26 12:33:16 -05:00
Shea Levy 05edd656f6 Missed gcc refs 2014-12-26 12:28:15 -05:00
Shea Levy 4e558732e7 Add newrelic-sysmond 2014-12-22 15:13:08 -05:00
Shea Levy e3825b47ec systemd: read units from /etc/systemd-mutable 
This allows for persistent units managed outside of configuration.nix
 2014-12-18 17:08:04 -05:00
Shea Levy 321e8227f0 Merge branch 'mysql-mirrors' of https://github.com/fmapfmapfmap/nixpkgs 2014-12-17 11:12:58 -05:00
Shea Levy 3cf0677087 Add rubyLibs.redis 2014-12-16 13:10:35 -05:00
Shea Levy 487325a68c Add rubyLibs.rabbitmq_manager 2014-12-16 13:09:46 -05:00
Shea Levy a1e0944263 Add rubyLibs.newrelic_plugin 2014-12-16 13:07:03 -05:00