1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-25 07:00:43 +00:00
Commit graph

77675 commits

Author SHA1 Message Date
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
Michael Raskin 32e954db64 Reverting dependency src for revert 2016-02-26 16:28:08 +01:00
Nikolay Amiantov c88a06a860 cups service: set path for cups-genppdupdate 2016-02-26 18:27:41 +03:00
Nikolay Amiantov d9c10d6f56 gutenprint: fix cups and gimp paths
Also disable GIMP support by default to reduce closure
2016-02-26 18:27:41 +03:00
Michael Raskin 66febbdfa7 Temporarily revert LibreOffice update 2016-02-26 16:26:34 +01:00
Peter Simons 2bcec4272f Merge pull request #13480 from phile314/master
uhc: 1.1.9.2 -> 1.1.9.3
2016-02-26 13:18:13 +01:00
zimbatm 3833591d95 Merge pull request #13164 from romildo/fix/eclipse-plugin-cup
eclipse-plugins-cup: fix plugin file names
2016-02-26 11:23:28 +00:00
zimbatm 8d4c2340d3 Merge pull request #13396 from mayflower/pkg/gitlab
gitlab: 8.0.5 -> 8.5.1, service improvements
2016-02-26 11:19:28 +00:00
Domen Kožar a469681a51 Merge pull request #13365 from abbradar/cups-second-attempt
CUPS update (second attempt)
2016-02-26 11:13:30 +00:00
Philipp Hausmann fbd857ab72
uhc: 1.1.9.2 -> 1.1.9.3 2016-02-26 12:12:53 +01:00
Domen Kožar c99d589162 Merge pull request #13116 from kragniz/requests2-2.9.1
requests2: 2.8.1 -> 2.9.1
2016-02-26 11:11:36 +00:00
Domen Kožar fe9f5dbbbc Merge pull request #6600 from 4z3/tlsdate
tlsdate doesn't build on x86_64-darwin
2016-02-26 10:59:00 +00:00
zimbatm c86e10c115 Merge pull request #13469 from tg-x/acme-external
simp_le: external_pem.sh plugin is now called external.sh
2016-02-26 10:48:55 +00:00
zimbatm d8c3a83b5c Merge pull request #13477 from cstrahan/vte-ng
vte-ng: 0.42.1.a -> 0.42.4.a
2016-02-26 10:46:06 +00:00
vbgl d39595c54f Merge pull request #13404 from knedlsepp/fix-darwin-tcl-tk
Fix darwin tcl tk
2016-02-26 11:38:26 +01:00
Frederik Rietdijk 48085add39 Merge pull request #13461 from FRidh/kcalc
kde5.kcalc: init at 15.12
2016-02-26 11:33:42 +01:00
Franz Pletz 0bbe8e1884 Merge pull request #13454 from grahamc/xerces
xerces-c: 3.1.1 -> 3.1.3
2016-02-26 11:25:25 +01:00
zimbatm 6035c3a136 Merge pull request #9400 from Mathnerd314/package-overrides-fix
all-packages: Apply packageOverrides package-by-package
2016-02-26 10:17:53 +00:00
Franz Pletz ef0325e940 Merge pull request #13435 from tg-x/calc
calc: init at 2.12.5.3
2016-02-26 11:16:11 +01:00
Franz Pletz d5a2c4cb05 libinput: Add libwacom dependency
Fixes #13476 & #13147.
2016-02-26 11:03:28 +01:00
aszlig 716b79d3a5
chromium: Provide SHA256s for beta/dev plugins
As stated in the parent commit, the 32bit Chrome package is not
available upstream, so let's at least provide the SHA256 hash for the
64bit package.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-02-26 10:55:51 +01:00
aszlig 459642b8de
chromium/updater: Allow a single plugin arch
Until now, if we have a failure to fetch either the 32bit Debian package
or the 64bit Debian package, neither of these will be put into
sources.nix.

Unfortunately the beta/dev channels do not have a 32bit Debian package,
so even though there is a 64bit Debian package available we don't get
plugins *at* *all*.

This also introduces a nicer error message rather than just failing with
an assertion in fetchurl because we did not provide url/urls.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-02-26 10:55:51 +01:00
José Romildo Malaquias 0e94a1be40 eclipse-plugins-cup: add dependency on the zest plugin 2016-02-26 06:42:04 -03:00
José Romildo Malaquias 205398c427 eclipse-plugin-zest: init at 3.9.101
eclipse-plugins-cup: remove plugins.nix.orig that was wrongly added.
2016-02-26 06:42:04 -03:00
José Romildo Malaquias ef11f77c8f eclipse-plugins-cup: fix plugin file names 2016-02-26 06:42:04 -03:00
Eelco Dolstra 20682386ca Merge pull request #13472 from doshitan/fix-ec2-data
ec2-data: ensure providing a SSH host key is actually optional
2016-02-26 10:41:44 +01:00
Franz Pletz af17efd014 Merge pull request #13466 from benley/git-stree-0.4.5
git-stree: init at 0.4.5
2016-02-26 09:59:47 +01:00
Franz Pletz db2b0c8406 Merge pull request #13430 from nico202/yarp
yarp (+ libace): init at 2.3.64
2016-02-26 09:29:21 +01:00
Franz Pletz cd0f14f23e gitlab: Add documentation
Fixes #13303.
2016-02-26 08:56:39 +01:00
Franz Pletz e9393bd426 fixup! gitlab: 8.0.5 -> 8.5.0, service improvements
Make the gitlab packages and components overrideable.
2016-02-26 08:56:08 +01:00
Franz Pletz c2412bd700 fixup! gitlab: 8.0.5 -> 8.5.0, service improvements
8.5.0 -> 8.5.1
2016-02-26 08:31:21 +01:00
Franz Pletz 44a4592a1c fixup! gitlab: 8.0.5 -> 8.5.0, service improvements
gitlab-shell is now talking over the unix socket to gitlab, so the TCP
port isn't needed anymore.
2016-02-26 08:31:20 +01:00
Franz Pletz 3fd51a9ab2 fixup! gitlab: 8.0.5 -> 8.5.0, service improvements
Some debugging and development leftovers.
2016-02-26 07:08:31 +01:00
Franz Pletz bcfa59bf82 gitlab: 8.0.5 -> 8.5.0, service improvements
Updates gitlab to the current stable version and fixes a lot of features that
were broken, at least with the current version and our configuration.

Quite a lot of sweat and tears has gone into testing nearly all features and
reading/patching the Gitlab source as we're about to deploy gitlab for our
whole company.

Things to note:

 * The gitlab config is now written as a nix attribute set and will be
   converted to JSON. Gitlab uses YAML but JSON is a subset of YAML.
   The `extraConfig` opition is also an attribute set that will be merged
   with the default config. This way *all* Gitlab options are supported.

 * Some paths like uploads and configs are hardcoded in rails  (at least
   after my study of the Gitlab source). This is why they are linked from
   the Gitlab root to /run/gitlab and then linked to the  configurable
   `statePath`.

 * Backup & restore should work out of the box from another Gitlab instance.

 * gitlab-git-http-server has been replaced by gitlab-workhorse upstream.
   Push & pull over HTTPS works perfectly. Communication to gitlab is done
   over unix sockets. An HTTP server is required to proxy requests to
   gitlab-workhorse over another unix socket at
   `/run/gitlab/gitlab-workhorse.socket`.

 * The user & group running gitlab are now configurable. These can even be
   changed for live instances.

 * The initial email address & password of the root user can be configured.

Fixes #8598.
2016-02-26 07:08:31 +01: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
Tanner Doshier 4e5ef470a7 ec2-data: ensure providing a SSH host key is actually optional
2701665904 broke this.
2016-02-25 20:11:49 -06:00
zimbatm b9db67d8e2 Merge pull request #8393 from hrdinka/update/hugin
hugin: update 2013.0.0 -> 2015.0.0
2016-02-26 01:03:47 +00:00
zimbatm 69f151f577 Merge pull request #8547 from Ralith/boost-clang
Fix detection of clang toolset
2016-02-26 00:58:05 +00:00
zimbatm d2f3e250cf Merge pull request #8576 from obadz/nix-prefetch-zip
Add --ext option to nix-prefetch-zip
2016-02-26 00:57:30 +00:00
zimbatm b5407d402d Merge pull request #11812 from bnikolic/recoll-update
recoll: 1.20.6 -> 1.21.3
2016-02-26 00:41:47 +00:00
zimbatm 3110d60cf6 Merge pull request #10768 from rycee/refactor/nix-generate-from-cpan
nix-generate-from-cpan: large refactor
2016-02-26 00:40:15 +00:00
zimbatm b73c5ae291 Merge pull request #10546 from aszlig/nixops-issue-350
Fixes for NixOps issue #350
2016-02-26 00:33:49 +00:00
tg(x) 629a89343e simp_le: external_pem.sh plugin is now called external.sh 2016-02-26 01:31:58 +01:00
zimbatm 30891166be Merge pull request #11997 from benley/google-chrome-variants
google-chrome: add -beta and -unstable variants
2016-02-26 00:13:00 +00:00
zimbatm 428e12d23f Merge pull request #13154 from zimbatm/git-rebase-fix-v2
git: fixes references to gettext properly
2016-02-26 00:03:17 +00:00
zimbatm 853a213698 Merge pull request #13323 from rycee/ddclient/platform
ddclient: add meta.platforms
2016-02-26 00:02:06 +00:00
zimbatm d4e29d0e6d Merge pull request #12896 from rycee/bump/udiskie
udiskie: 1.1.2 -> 1.4.8
2016-02-26 00:01:34 +00:00
zimbatm 06a12136a5 Merge pull request #12824 from cransom/aws_shell
aws_shell: init at 0.1.0
2016-02-26 00:00:10 +00:00
zimbatm 1b0e81c41e Merge pull request #13453 from mayflower/pkgs_upstream/gti
gti: init at 2015-05-21 (edaac79)
2016-02-25 23:57:17 +00:00