Commit Graph
100 Commits
Author SHA1 Message Date
Charles Strahan 71f92bc8a3 nixos: provide default console_cmd for slim
This provides a default console_cmd for the slim display-manager.

When the user enters "console" as the user name, slim will run this
command.

Having a default is rather important; the virtual terminals don't work
with some display drivers, so having a broken X session can leave you
locked out of your machine.
2017-01-21 18:59:28 -05:00
Charles Strahan e965e42dc5 go: fix build on Darwin
The go tests get tripped up due to error messages along the lines of:

    ld: warning: /System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation, ignoring unexpected dylib file

Which is due to us passing that along via $NIX_LDFLAGS in the `clang` wrapper.
To keep `go` from getting confused, I create a small `clang` wrapper that
filters out that warning.

Also, the strip.patch is no longer necessary, and only causes problems when
testing DWARF support:

    --- FAIL: TestDwarfAranges (0.59s)
        runtime-lldb_test.go:218: Missing aranges section
    FAIL
    FAIL    runtime 17.123s

Also, I disable the misc/cgo/errors test, as I suspect it is also due to similar
problems regarding `ld`:

    ##### ../misc/cgo/errors
    misc/cgo/errors/test.bash: BUG: expected error output to contain "err1.go:11:" but saw:
    # command-line-arguments
    cannot parse gcc output $WORK/command-line-arguments/_obj//_cgo_.o as ELF, Mach-O, PE object
    2016/05/07 02:07:58 Failed: exit status 1

Closes #14208
2016-05-06 22:34:16 -04:00
Charles Strahan ec1c8071b1 macvim: fix build 2016-05-06 22:32:23 -04:00
Charles Strahan d8faa585b0 dbus-map: init 2015-05-28 2016-04-25 17:52:24 -04:00
Charles Strahan 3226bb7dbf Merge pull request #14904 from chris-martin/manual-go2nix-link
nixpkgs manual: fix link to go2nix
2016-04-22 22:22:07 -04:00
Charles Strahan 99fd109a85 Merge pull request #14786 from manveru/gemset-groups
bundlerEnv: filter gemset groups
2016-04-18 02:02:57 -04:00
Charles Strahan 1659a4ead5 Merge pull request #14566 from cstrahan/ubuntu-fan-update
fan-networking: updated patches from Ubuntu
2016-04-10 16:26:03 -04:00
Charles Strahan 2802785675 Merge pull request #13975 from aespinosa/proper-script-gempaths
buildRubyGem: use Gem.use_paths to load gems
2016-03-19 16:15:50 -04:00
Charles Strahan d53d5048d8 goPackages: add ide-like packages
This adds the following packages:

 * errcheck
 * gotool
 * gometalinter
 * motion
 * shlex
2016-03-18 03:14:44 -04:00
Charles Strahan 7475728593 mbpfan: 1.9.0 -> 1.9.1 2016-03-17 02:02:21 -04:00
Charles Strahan 610e2234dd go-sct: init at 2016-01-11
Color temperature setting library and CLI that operates in a similar way
to f.lux and Redshift
2016-03-17 01:50:39 -04:00
Charles Strahan 8aaf60f2aa Merge pull request #13818 from aespinosa/cleanup-macvim-output
macvim: remove extra MacVim.app
2016-03-10 21:49:12 -05:00
Charles Strahan ee3b2951f1 Merge pull request #13701 from cstrahan/go-package-updates
make automatic go package maintenance possible
2016-03-08 23:49:38 -05:00
Charles Strahan 1371084ae1 goPackages: make it easier to automate updates
This moves all of the revision and sha256 data to separate JSON file.
2016-03-08 23:45:46 -05:00
Charles Strahan 53ea7dee75 emacs: fix priority for ctags
This fixes the previous attempt (in commit 46d1dd5) to make ctags' ctags
override emacs' ctags. The higher the value of the priority attribute,
the higher the priority (see the definition of `buildEnv`).
2016-02-26 12:27:04 -05:00
Charles Strahan ce7aa71880 vte-ng: 0.42.1.a -> 0.42.4.a 2016-02-26 00:48:39 -05:00
Charles Strahan e08dd09c25 emacs: add optional support for 24-bit color ttys 2016-02-26 00:33:56 -05:00
Charles Strahan d2e0b6cf6f Merge pull request #13433 from ryantrinkle/ghcjs-boot-overridable
ghcjs: Make ghcjs-boot source code overridable
2016-02-24 16:57:05 -05:00
Charles Strahan 9482be59e7 Merge pull request #13131 from Ericson2314/haskell-cross-rebase
Generalize some GHCJS stuff for other cross compilers
2016-02-21 13:19:03 -05:00
Charles Strahan 64f145a3e7 Merge pull request #12920 from osener/patch-1
closurecompiler: 20151015 -> 20160208
2016-02-20 21:01:30 -05:00
Charles Strahan 11bf7888fb Merge pull request #13041 from Baughn/mprime
mprime: Init at 28.7
2016-02-20 20:45:56 -05:00
Charles Strahan eb905c2d76 Merge pull request #13084 from nathan7/go-1.6
go: add 1.6 compiler and packages
2016-02-20 20:41:44 -05:00
Charles Strahan 123a9104e4 Merge pull request #13109 from zimbatm/ruby-fixes
Ruby fixes
2016-02-20 20:29:25 -05:00
Charles Strahan 412dd80149 Merge pull request #13093 from cstrahan/ghcjs-fix-rebase
Fix GHCJS for cabal-install-1.22.8.0
2016-02-18 19:24:01 -05:00
Charles Strahan c374ce26b0 ghcjs-shims: 2016/01/07 -> 2016/02/10
Bump revisions: 45f44f5f027 -> 4df1808d031
2016-02-18 19:15:02 -05:00
Charles Strahan 516057ffa9 ghcjs: replace integer-simple with integer-gmp
GHCJS uses integer-gmp, but cabal2nix generates a dependency list that
includes integer-simple instead. This tweaks the stage2 generator to
replace any instance of integer-simple with integer-gmp.

Things currently still work without this change (assuming
integer-simple is defined as null), as ghcjs includes integer-gmp in
its stage1 packages - so it's always available.

However, this change makes things a bit more explicit, rather than
leaving things to chance. If at any point the stage1 packages are also
split up into separate derivations, the integer-gmp package will need to
be passed along to the packages that depend on it. This change should
prevent some confusion going forward.
2016-02-18 18:32:58 -05:00
Charles Strahan e6e9970891 ghcjs: don't propagate Cabal to all packages
Previously, we were compiling Setup.hs with ghcjs (instead of  ghc),
and that required that Cabal be available, otherwise the Setup.hs would
fail to compile.

Now that we are compiling Setup.hs with ghc, it's no longer necessary
to add Cabal as a dependency to all ghcjs packages.
2016-02-18 15:00:34 -05:00
Charles Strahan 97d9071b95 ghcjs: use native ghc to build Setup.hs 2016-02-18 03:15:59 -05:00
Charles Strahan bbce88302a ghcjs: fix building with cabal-install-1.22.8.0 2016-02-18 03:15:59 -05:00
Charles Strahan 8b94aaf081 Merge pull request #12572 from kevincox/mesos-upgrade
mesos: 0.23.0 -> 0.26.0
2016-02-14 20:04:01 -05:00
Charles Strahan 4faeca0cbd nq: init at 0.1
Unix command line queue utility.
2016-02-08 17:28:24 -05:00
Charles Strahan 5691a2a498 xe: init at 0.5
Simple xargs and apply replacement.
2016-02-08 17:27:44 -05:00
Charles Strahan 2f105acba2 cipherscan: fix license
Fixes broken evaluation due to 4c57b932a.
2016-02-03 13:10:34 -05:00
Charles Strahan 4c57b932ab cipherscan: init at rev 18b0d1b (Dec 17, 2015)
CipherScan is a simple way to find out which SSL ciphersuites are
supported by a target.

It can take advantage of the extra features in Peter Mosmans' openssl
fork (which is also included in this commit).
2016-02-03 12:01:24 -05:00
Charles Strahan fdd54a9434 ghcjs-ffiqq: init at rev da31b1858 (Oct 12, 2015) 2016-02-01 02:13:45 -05:00
Charles Strahan 142b417284 ghcWithHoogle: fix haddocks for GHCJS builtin libs 2016-02-01 00:10:45 -05:00
Charles Strahan 1a2d7c679a ghcWithHoogle: add support for ghcjs 2016-01-31 23:00:43 -05:00
Charles Strahan 05b2afed33 ghcjs: build hoogle docs for base libraries 2016-01-31 20:45:28 -05:00
Charles Strahan c01eb06954 ghcjs: build with GHC 7.10.3 2016-01-31 20:44:49 -05:00
Charles Strahan ec1e4d5495 ghcjs-boot: 3529c6ab61d5f786b -> 97dea5c4145bf80a1 2016-01-31 20:07:12 -05:00
Charles Strahan 5583ecf361 mongodb: 3.0.7 -> 3.2.1
Fixes #12639
2016-01-28 14:15:59 -05:00
Charles Strahan 7b8cd1dce9 watchman: 4.1.0 -> 4.3.0
* improved handling of case insensitive filenames
* improved reliability of symlink change detection on osx
2016-01-28 11:58:33 -05:00
Charles Strahan cb6beb1eb3 ghcjs: build haddock documentation
From building reflex-dom (which has quite a few dependencies), it would
appear that building the documentation no longer fails.
2016-01-25 20:16:12 -05:00
Charles Strahan 95d892ec26 ghcjs: update and fix ghcjs/reflex libs
Set dontStrip when building ghcjs libs, which fixes the ghcjs-dom lib
and also makes the logs cleaner.
2016-01-24 17:13:45 -05:00
Charles Strahan 4fd985b9ae haskell-packages: properly set postPatch
The existing code overrode the postPatch, instead of combining the
jailbreak commands with the user supplied postPatch.
2016-01-24 13:32:56 -05:00
Charles Strahan 700e4aebdc ghcjs: fix the build 2016-01-24 13:28:24 -05:00
Charles Strahan b6c06e216b ruby: new bundler infrastructure
This improves our Bundler integration (i.e. `bundlerEnv`).

Before describing the implementation differences, I'd like to point a
breaking change: buildRubyGem now expects `gemName` and `version` as
arguments, rather than a `name` attribute in the form of
"<gem-name>-<version>".

Now for the differences in implementation.

The previous implementation installed all gems at once in a single
derivation. This was made possible by using a set of monkey-patches to
prevent Bundler from downloading gems impurely, and to help Bundler
find and activate all required gems prior to installation. This had
several downsides:

* The patches were really hard to understand, and required subtle
  interaction with the rest of the build environment.
* A single install failure would cause the entire derivation to fail.

The new implementation takes a different approach: we install gems into
separate derivations, and then present Bundler with a symlink forest
thereof. This has a couple benefits over the existing approach:

* Fewer patches are required, with less interplay with the rest of the
  build environment.
* Changes to one gem no longer cause a rebuild of the entire dependency
  graph.
* Builds take 20% less time (using gitlab as a reference).

It's unfortunate that we still have to muck with Bundler's internals,
though it's unavoidable with the way that Bundler is currently designed.
There are a number improvements that could be made in Bundler that would
simplify our packaging story:

* Bundler requires all installed gems reside within the same prefix
  (GEM_HOME), unlike RubyGems which allows for multiple prefixes to
  be specified through GEM_PATH. It would be ideal if Bundler allowed
  for packages to be installed and sourced from multiple prefixes.
* Bundler installs git sources very differently from how RubyGems
  installs gem packages, and, unlike RubyGems, it doesn't provide a
  public interface (CLI or programmatic) to guide the installation of a
  single gem. We are presented with the options of either
  reimplementing a considerable portion Bundler, or patch and use parts
  of its internals; I choose the latter. Ideally, there would be a way
  to install gems from git sources in a manner similar to how we drive
  `gem` to install gem packages.
* When a bundled program is executed (via `bundle exec` or a
  binstub that does `require 'bundler/setup'`), the setup process reads
  the Gemfile.lock, activates the dependencies, re-serializes the lock
  file it read earlier, and then attempts to overwrite the Gemfile.lock
  if the contents aren't bit-identical. I think the reasoning is that
  by merely running an application with a newer version of Bundler, you'll
  automatically keep the Gemfile.lock up-to-date with any changes in the
  format. Unfortunately, that doesn't play well with any form of
  packaging, because bundler will immediately cause the application to
  abort when it attempts to write to the read-only Gemfile.lock in the
  store. We work around this by normalizing the Gemfile.lock with the
  version of Bundler that we'll use at runtime before we copy it into
  the store. This feels fragile, but it's the best we can do without
  changes upstream, or resorting to more delicate hacks.

With all of the challenges in using Bundler, one might wonder why we
can't just cut Bundler out of the picture and use RubyGems. After all,
Nix provides most of the isolation that Bundler is used for anyway.

The problem, however, is that almost every Rails application calls
`Bundler::require` at startup (by way of the default project templates).
Because bundler will then, by default, `require` each gem listed in the
Gemfile, Rails applications are almost always written such that none of
the source files explicitly require their dependencies. That leaves us
with two options: support and use Bundler, or maintain massive patches
for every Rails application that we package.

Closes #8612
2015-12-29 09:30:21 -05:00
Charles Strahan 4867d6943f Merge pull request #11236 from cstrahan/w3m-patches
w3m: use Arch patches
2015-12-25 14:35:08 -06:00
Charles Strahan 9e34985430 w3m: use Arch patches
Fix the built-in help (perl.patch)
  https://bugs.archlinux.org/task/45608

Properly link w3mimgdisplay to x11
  https://bbs.archlinux.org/viewtopic.php?id=196093

Fix rendering bug in w3mimgdisplay (w3m_rgba.patch)
  https://github.com/hut/ranger/issues/86

Don't ignore input tags with invalid types (form_unkown.patch)
  http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=615843

Fix a segfault when using https (https.patch)
  https://bugzilla.redhat.com/show_bug.cgi?id=707994
2015-12-25 15:26:14 -05:00
Charles Strahan c5497a7608 Merge pull request #11072 from svend/terminal-notifier-args
terminal-notifier: Pass arguments in wrapper script
2015-12-23 21:29:56 -06:00
Charles Strahan 60df6fdd34 vanilla-dmz: init at 0.4.4, fixes #11102
Vanilla DMZ cursor theme
2015-12-22 02:28:08 +01:00
Charles Strahan defe78e553 licenses: add non-commercial Creative Commons 2015-12-22 02:25:43 +01:00
Charles Strahan b2409581f8 iosevka: init at 1.0-beta9
A slender monospace sans-serif and slab-serif typeface.
2015-11-23 19:52:52 -05:00
Charles Strahan 3b73b726d4 zkfuse: init 2015-11-19 19:55:44 -05:00
Charles Strahan 23e5ffa2e5 macvim: 7.4.648 -> 7.4.909 (and fix build) 2015-11-15 02:04:27 -05:00
Charles Strahan 4f07c88d46 v8-4.5.x: add support for ARM 2015-10-23 14:35:04 -04:00
Charles Strahan f8e426e6e3 pywatchman: init at 1.3.0 2015-10-23 14:25:13 -04:00
Charles Strahan a9c3950f2d watchman: 3.0.0 -> 4.1.0 2015-10-23 14:03:30 -04:00
Charles Strahan abf7301cc9 v8: add version 4.5.107 2015-10-22 20:00:38 -04:00
Charles Strahan b1edc7909a powertop: fix --auto-tune
See https://lists.01.org/pipermail/powertop/2014-December/001727.html
2015-10-15 14:27:09 -04:00
Charles Strahan cb38f10d12 nixos-generate-config: detect brcmfmac requirement
This makes the firmware available (or would, if someone switched off
enableAllFirmware). Corresponding kernel module should get auto-loaded.

See #9948. Close #9971.
2015-10-15 13:12:42 +02:00
Charles Strahan 597d191844 eventstat: init at 0.02.02 2015-09-29 15:45:09 -04:00
Charles Strahan 25e582c497 meteor: init at 1.2.0.1
closes #10064
2015-09-28 10:39:37 -04:00
Charles Strahan a36ab12727 Merge pull request #10067 from tailhook/unprivileged_overlayfs
Unprivileged overlayfs mounts kernel patch from ubuntu
2015-09-28 01:27:50 -05:00
Charles Strahan f08fb6e6c7 broadcom-sta: fix build on kernel >= 4.2 (close #9953)
Also cherry-pick a licensing fix from torvalds/linux@7d3e2eb178
necessary for building broadcom-sta on kernel 4.2.

For more details, see:
https://github.com/longsleep/bcmwl-ubuntu/issues/6

Fixes #9948.
2015-09-20 08:01:37 +02:00
Charles Strahan a99f8eed10 goobook: 1.6 -> 1.9 2015-09-02 16:47:22 -04:00
Charles Strahan 7408ede358 fanctl: fix state directory 2015-08-22 14:14:56 -04:00
Charles Strahan 648973d641 nixos: rename service 'ubuntu-fan' as 'fan' 2015-08-22 14:05:35 -04:00
Charles Strahan c1ee8fefd4 nixos: add support for Ubuntu Fan Networking
This provides support for Ubuntu Fan Networking [1].

This includes:

* The fanctl package, and a corresponding NixOS service.
* iproute patches.
* kernel patches.

closes #9188

1: https://wiki.ubuntu.com/FanNetworking
2015-08-13 14:27:14 -04:00
Charles Strahan 963e70a7e8 iproute: remove unused patch
In f18efaf26e, the "patches" attribute was erroneously renamed to
"patch". If you follow the original bug report[1], you'll see that this
has long since been fixed upstream (using a different patch).

1: https://bugs.gentoo.org/show_bug.cgi?id=331447
2015-08-11 17:47:53 -04:00
Charles Strahan 8b91812de6 pipework: init at 2015-07-30
Pipework lets you connect together containers in arbitrarily complex
scenarios. Pipework uses cgroups and namespace and works with "plain"
LXC containers (created with lxc-start), and with the awesome Docker.
2015-08-10 15:01:34 -04:00
Charles Strahan f178817aee xquartz: 1.14.6 -> 1.17.2
closes #9126
2015-08-05 13:57:02 -05:00
Charles Strahan 7c1a3da1c4 macvim: fix bad copy/paste in 6f08fdd26
In 6f08fdd26, I left in a typo after copying from my `~/.nixpkgs/config`.
I would normally test this out locally, but I'm fixing up my conf locally,
and, in the interest of not forgetting to push this change up, made the edit
through GitHub's UI.
Oops.
2015-08-04 17:46:45 -05:00
Charles Strahan 6f08fdd26a macvim: 7.4.479 -> 7.4.648
This updates macvim to 7.4.648. This also fixes the build, which was broken when I set the default Ruby version to 2.2.2 (one of the symbols was renamed).
2015-08-04 17:42:08 -05:00
Charles Strahan bc042fe0ff mesos: 0.22.1 -> 0.23.0 2015-08-04 06:11:32 -04:00
Charles Strahan 878e69c67c riak2: use sensible default paths
Make exporting the RIAK_{ETC,LOG,DATA}_DIR variables optional;
if they're not in the environment, we use the same default values as
NixOS.
2015-08-03 21:48:29 -04:00
Charles Strahan aa1355aa30 Merge pull request #7827 from cstrahan/riak2
riak-2.1.1: new package
2015-07-21 08:36:16 -05:00
Charles Strahan babb744b71 riak: new nixos service 2015-07-21 09:25:41 -04:00
Charles Strahan 342a815e66 Merge pull request #8919 from samuelrivas/fix-rainbowstream-for-pypy
Add sitePackages to pypy's passthru
2015-07-21 08:19:09 -05:00
Charles Strahan a3552280f8 riak-2.1.1: new package 2015-07-21 06:17:42 -04:00
Charles Strahan 617c5fcaf0 rainbowstream: purify (close #8791)
This obviates the need for `cc` to be available at run time.
2015-07-20 10:06:17 +02:00
Charles Strahan 75f53bc615 ruby: set the default to 2.2.2 2015-07-07 18:41:03 -04:00
Charles Strahan 357324df26 ruby: add 2.2.2, bump patch levels
* Adds Ruby 2.2.2
* 1.9.3-p547 -> 1.9.3-p551
* 2.0.0-p481 -> 2.0.0-p645
2015-07-07 17:45:33 -04:00
Charles Strahan 4ea88cc526 ruby: fix version 2.2.0 2015-07-07 17:43:49 -04:00
Charles Strahan e199d9e844 urxvt-perl: init at 2015-01-16
Includes two extensions for `urxvt`:

* fullscreen: Toggle fullscreen for terminal
* newterm:    Open a new terminal in your current working directory
2015-07-05 00:12:50 -04:00
Charles Strahan 737de61912 urxvt-font-size: init 2015-07-04 03:17:52 -04:00
Charles Strahan 44594e851c xsensors: init at 0.70 2015-07-03 22:55:10 -04:00
Charles Strahan 433a13d12a taffybar: init with-packages wrapper
This provides a wrapper around taffybar, in a fashion similar to how
package xmonad.
2015-06-30 11:11:43 -04:00
Charles Strahan d51a81690c libtsm: fix building with clang for darwin 2015-06-25 21:06:55 -05:00
Charles Strahan af21595eca ghcjs: fix/bump git refs 2015-06-16 21:26:11 -04:00
Charles Strahan 3859f7bdab haskell-ng: hoogleLocal support 2015-06-11 20:25:31 -04:00
Charles Strahan b94e4348ac remove nonexistent "hiew" package 2015-05-27 12:01:26 -04:00
Charles Strahan 069913e1b9 bviplus: new package
ncurses based hex editor with a vim-like interface
2015-05-27 11:48:05 -04:00
Charles Strahan 15b9fe1fab heme: new package
A portable and fast console hex editor for unix operating systems.
2015-05-27 11:48:05 -04:00
Charles Strahan 4976bcd218 hexcurse: new package
ncurses-based console hexeditor written in C
2015-05-27 11:48:05 -04:00
Charles Strahan a22cffa7bb ht: new package
HT is a file editor/viewer/analyzer for executables.
2015-05-27 11:48:05 -04:00
Charles Strahan 688e9ea04c ghcjs: bump ghcjs and ghcjs-boot
fixes #7881
2015-05-21 21:03:54 -04:00
Charles Strahan 7021988dd1 Merge pull request #7818 from cstrahan/nmtui2
networkmanager: enable nmtui, the curses interface
2015-05-13 00:46:04 -04:00
Charles Strahan ac4515958d ghcjs: bump ghcjs-boot
This updates the git reference of the aeson submodule; the old one
vanished.
2015-05-12 20:04:12 -04:00
Charles Strahan 1677b33162 networkmanager: enable nmtui, the curses interface 2015-05-11 20:54:17 -04:00