1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-02 02:24:27 +00:00
Commit graph

402 commits

Author SHA1 Message Date
Parnell Springmeyer e92b8402b0
Addressing PR feedback 2017-01-28 20:48:03 -08:00
Parnell Springmeyer a26a796d5c
Merging against master - updating smokingpig, rebase was going to be messy 2017-01-26 02:00:04 -08:00
Franz Pletz e02b96590d
xchainkeys: fix source and homepage url 2017-01-26 03:52:50 +01:00
Parnell Springmeyer bae00e8aa8
setcap-wrapper: Merging with upstream master and resolving conflicts 2017-01-25 11:08:05 -08:00
volth 69ed58d88f xorg.xserver: configure --with-xkb-path= (#21653) 2017-01-18 02:57:15 +03:00
Joris Guyonvarch 1603526000 xrectsel: init at 0.3.2 (#21153) 2017-01-09 06:07:25 +01:00
Michael Raskin a486850992 xdg_utils: mimiSupport: update to the latest master 2017-01-04 15:01:46 +01:00
Joris Guyonvarch 4d2406c7d5 ffcast: init at 2.5.0 (#21141) 2016-12-14 14:22:00 +00:00
Jaka Hudoklin 7fd8dfc621 xpra: do not preset FONTCONFIG_FILE and XPRA_LOG_DIR env variables 2016-12-04 22:27:30 +01:00
Jaka Hudoklin adabb646bd xpra: add pam support 2016-12-04 22:26:43 +01:00
Vladimír Čunát 925b335607
Merge branch 'master' into staging 2016-11-26 11:27:09 +01:00
Joachim F 00597a07bb Merge pull request #20644 from romildo/upd.xcape
xcape: git-2015-03-01 -> 1.2
2016-11-25 13:19:56 +01:00
Frederik Rietdijk 7dd7b9e218 arandr: use python2 2016-11-24 22:28:02 +01:00
Nikolay Amiantov a44cfd6e0d virtualglLib: 2.5 -> 2.5.1 2016-11-24 01:17:58 +03:00
romildo b4077f3210 xcape: git-2015-03-01 -> 1.2 2016-11-23 07:30:00 -02:00
Vladimír Čunát b69f568f4c
Merge branch 'staging'
Hydra rebuild looks fine; only a few Darwin jobs is queued:
http://hydra.nixos.org/eval/1304891?compare=1304807
2016-11-19 04:35:51 +01:00
romildo 1a486c47af nitrogen: 1.5.2 -> 1.6.0 2016-11-18 09:49:27 -02:00
Vladimír Čunát b5e89fe9bf
Merge branch 'master' into staging 2016-11-15 00:20:19 +01:00
Frederik Rietdijk 1f501a2ced xpra: use python2 2016-11-08 22:48:55 +01:00
Joachim F 54f057266d Merge pull request #20244 from womfoo/bump/xdotool-3.20160805.1
xdotool: 3.20150503.1 -> 3.20160805.1
2016-11-08 00:58:51 +01:00
Kranium Gikos Mendoza f17e13a0d5 xdotool: 3.20150503.1 -> 3.20160805.1 2016-11-08 05:24:06 +08:00
Nikolay Amiantov ab21519858 bumblebee: use fetchpatch for GitHub patches 2016-11-07 11:02:46 +03:00
Nikolay Amiantov 1e8384a20b Merge pull request #20003 from gnidorah/master
bumblebee: backport critical libkmod.patch
2016-11-07 10:58:29 +03:00
Michael Raskin 20fe51661d xlaunch: remove; it was fine-tuned to an old NixOS state and such functionality is forbidden by systemd 2016-11-06 11:42:45 +01:00
Alex Ivanov f8a17768cd bumblebee: remove long time obsolete substitution 2016-10-31 09:49:34 +03:00
Alex Ivanov 1cb54a7dd0 bumblebee: backport critical libkmod.patch 2016-10-30 20:47:13 +03:00
Bjørn Forsman 5c1fd6763f xpra: 0.17.5 -> 0.17.6
Many fixes.
2016-10-30 01:01:26 +02:00
Jaka Hudoklin 7956b2d65e xpra: add audio streaming support 2016-10-23 20:11:45 +02:00
José Romildo Malaquias 8b7e3c3537 oblogout: init at 2009-11-18 2016-10-23 11:45:30 +02:00
Alexander Ried e7ded267bd xserver: replace XKB_BINDIR with compile time option
---

Using the configure option relieves us of the patch and passing the path
via the env var in many places. Also the env var may not be inherited
when components like gdm spawn new sessions.
2016-10-03 15:03:02 +02:00
Frederik Rietdijk 3ba16c8234 Do not use top-level buildPythonPackage or buildPythonApplication
but instead use the one in pythonPackages.
2016-09-26 11:10:51 +02:00
Kamil Chmielewski 914e0e594c buildGoPackage: deps.json -> deps.nix in NIXON
https://github.com/NixOS/nixpkgs/pull/17254#issuecomment-245295541

* update docs to describe `deps.nix`
* include goDeps in nix-shell GOPATH
* NixOS 16.09 rel notes about replacing goPackages
2016-09-16 00:04:55 +01:00
Kirill Boltaev bccd75094f treewide: explicitly specify gtk and related package versions 2016-09-12 18:26:06 +03:00
Jaka Hudoklin 85e2b60b77 xpra: 0.17.4 -> 0.17.5 2016-09-04 16:57:23 +02:00
Parnell Springmeyer 98c058a1ee Adapting everything for the merged permissions wrappers work. 2016-09-01 19:21:06 -05:00
obadz 78b7529ee3 Merge branch 'master' into staging 2016-08-24 11:57:44 +01:00
Daniel Peebles 3f337a2b23 Merge pull request #17685 from matthewbauer/darwin-misc2
Darwin misc. fixes
2016-08-24 11:52:27 +02:00
obadz 0e8d2725dc Merge branch 'master' into staging 2016-08-23 18:50:06 +01:00
Tuomas Tynkkynen 74a3a2cd7e treewide: Use makeBinPath 2016-08-23 01:18:10 +03:00
obadz 24a9183f90 Merge branch 'hardened-stdenv' into staging
Closes #12895

Amazing work by @globin & @fpletz getting hardened compiler flags by
enabled default on the whole package set
2016-08-22 01:19:35 +01:00
Frederik Rietdijk 5a501bd828 Remove top-level dbus_python and pythonDBus.
See #11567.

Furthermore, it renames pythonPackages.dbus to pythonPackages.dbus-
python as that's the name upstream uses.

There is a small rebuild but I couldn't figure out the actual cause.
2016-08-16 22:52:37 +02:00
Matthew Bauer 62ca3dd4b6 setroot: fix darwin build 2016-08-16 19:25:45 +00:00
Matthew Bauer 0528b8c94e runningx: fix darwin build 2016-08-16 19:25:45 +00:00
Robin Gloster 33e1c78ae3 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-08-16 07:54:01 +00:00
Nikolay Amiantov 6086328b2d primusLib: fix version, quote homepage for better clickability 2016-08-14 22:37:10 +03:00
Nikolay Amiantov c60deb0266 quote homepages for better clickability
Done while I was traversing packages which I maintain to save extra clicks on
urxvt (it captures semicolon as a part of URL).
2016-08-14 22:37:10 +03:00
Frederik Rietdijk 7986b718f3 Remove pycairo from top-level
See #11567.
2016-08-14 13:52:42 +02:00
Frederik Rietdijk 11d1fdfd8b Remove top-level cython and cython3
See #11567.
2016-08-14 12:01:09 +02:00
Franz Pletz bd4490e277 Merge branch 'master' into hardened-stdenv 2016-08-13 16:59:55 +02:00
Kamil Chmielewski da3ddd48e4 buildGoPackage: remove Go deps file libs.json
After #16017 there were a lot
of comments saying that `nix` would be better than `JSON`
for Go packages dependency sets.
As said in https://github.com/NixOS/nixpkgs/pull/16017#issuecomment-229624046

    > Because of the content-addressable store, if two programs have the
    > same dependency it will already result in the same derivation in
    > the
    > store. Git also has compression in the pack files so it won't make
    > much difference to duplicate the dependencies on disk. And finally
    > most users will just use the binary builds so it won't make any
    > differences to them.

This PR removes `libs.json` file and puts all package dependencies in
theirs `deps.json`.
2016-08-11 23:07:09 +02:00
Robin Gloster 19f5e2a1cf x2vnc: disable format hardening 2016-08-05 18:09:35 +00:00
Franz Pletz 1f06067b01 x2x: disable format hardening 2016-08-04 11:05:29 +02:00
Robin Gloster 1b979d8384 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-08-03 13:34:44 +00:00
Tuomas Tynkkynen 21f17d69f6 treewide: Add lots of meta.platforms
Build-tested on x86_64 Linux & Mac.
2016-08-02 21:42:43 +03:00
Tuomas Tynkkynen 2258b21e4b treewide: Add lots of platforms to packages with no meta
Build-tested on x86_64 Linux and on Darwin.
2016-08-02 21:17:44 +03:00
Robin Gloster 63c7b4f9a7 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-31 20:51:34 +00:00
wmapp 62ba6b07f2 sct: Updated sha256 in default.nix (#17163) 2016-07-28 09:21:21 +02:00
Robin Gloster f222d98746 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-25 12:47:13 +00:00
Andrew Miloradovsky 9dbf90d047 xmagnify: init at 0.1.0 (#17222) (#17222)
Tiny screen magnifier for X11
2016-07-25 06:00:27 +02:00
Robin Gloster 5185bc1773 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-15 14:41:01 +00:00
Bjørn Forsman c5b7a9ffeb xpra: 0.17.3 -> 0.17.4 (important fixes) 2016-06-30 14:48:05 +02:00
Bjørn Forsman 6d48539fdb xpra: fix some runtime issues
* Add missing modules (fixes warnings and errors).
* Step 1 to unbreak starting Xvfb by making xpra invoke it with
  valid log dir ($HOME/.xpra). Without this fix, it is invoked with
  ~/.xpra, which Xvfb doesn't know how to interpret and uses it
  literally (fail). Step 2 will be fixing an Xvfb permission issue:
  "xf86OpenConsole: Cannot open virtual console 1 (Permission denied)".
* Use XPRA_INSTALL_PREFIX to make it find its icons.
2016-06-30 14:42:16 +02:00
Bjørn Forsman ce8c1ab5e0 xpra: 0.17.0 -> 0.17.3 2016-06-23 19:17:20 +02:00
Bjørn Forsman 34363d77b0 xpra: add missing python 'rencode' module
Fixes this:

  $ xpra [...]
  2016-06-23 17:40:03,407 Warning: rencode import failed:
  2016-06-23 17:40:03,407  No module named rencode
  [...]
2016-06-23 19:17:20 +02:00
Bjørn Forsman bd01fad0ed Captialize meta.description of all packages
In line with the Nixpkgs manual.

A mechanical change, done with this command:

  find pkgs -name "*.nix" | \
      while read f; do \
          sed -e 's/description\s*=\s*"\([a-z]\)/description = "\u\1/' -i "$f"; \
      done

I manually skipped some:

* Descriptions starting with an abbreviation, a user name or package name
* Frequently generated expressions (haskell-packages.nix)
2016-06-20 13:55:52 +02:00
Robin Gloster 8031cba2ab Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-06-10 09:27:04 +00:00
Kamil Chmielewski 7eb671ebcd no more goPackages 2016-06-09 13:08:00 +02:00
Kamil Chmielewski e2e3d8802f go-sct: extracted from goPackages 2016-06-09 11:21:30 +02:00
obadz ca067ff248 xgeometry-select: remove license field. license is unknown. 2016-06-07 17:56:01 +01:00
obadz d39d085adf xgeometry-select: init at 7e7361e 2016-06-07 14:44:55 +01:00
Tuomas Tynkkynen bac26e08db Fix lots of fetchgit hashes (fallout from #15469) 2016-06-03 17:17:08 +03:00
Franz Pletz 90e8e00097 screen-message: 0.23 -> 0.24 2016-05-31 20:10:26 +02:00
José Romildo Malaquias 93a371ede7 runningx: init at 1.0 2016-05-31 09:55:55 -03:00
Robin Gloster 2d382f3d98 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-05-30 19:39:34 +00:00
Nikolay Amiantov 522b4b4b4d primusLib: move to fetchFromGitHub (and fix strange checksum error) 2016-05-20 13:05:17 +03:00
Franz Pletz f8d481754c
Merge remote-tracking branch 'origin/master' into hardened-stdenv 2016-05-18 17:10:02 +02:00
Domen Kožar b49bf121b8 rename iElectric to domenkozar to match GitHub 2016-05-17 13:00:47 +01:00
Franz Pletz bc233fa54e arandr: 0.1.8 -> 0.1.9 2016-05-03 16:15:20 +02:00
Robin Gloster c92bca56f8 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-05-02 22:58:02 +00:00
Nikolay Amiantov ac3ce1c26a bumblebee: fix outputs 2016-05-01 03:27:27 +03:00
David Guibert 8601f69072 xpra: 0.16.2 -> 0.17.0 2016-04-24 21:51:39 +02:00
Nathan Zadoks ed6943ecbc virtualgl: fix libturbojpeg library path
Without this, it tries to link to the dev output of libjpeg_turbo, which
breaks the build.
2016-04-24 13:25:57 -04:00
Tuomas Tynkkynen bd18cc3cdc Merge pull request #14888 from dezgeg/pr-kill-module-init-tools
Delete all usages of module_init_tools and remove the package
2016-04-23 14:29:41 +03:00
Tuomas Tynkkynen 01854a850a treewide: Replace module_init_tools -> kmod
The former is deprecated and doesn't handle compressed kernel modules,
so all current usages of it are broken.
2016-04-22 10:40:57 +03:00
Hurshal Patel 9023722e77
xbanish: init at 1.4 👻 2016-04-19 23:33:38 -07:00
Robin Gloster d020caa5b2 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-04-18 13:49:22 +00:00
Nikolay Amiantov 8b7ebaffeb replace makeSearchPath tree-wise to take care of possible multiple outputs 2016-04-13 22:09:41 +03:00
Vladimír Čunát 30f14243c3 Merge branch 'master' into closure-size
Comparison to master evaluations on Hydra:
  - 1255515 for nixos
  - 1255502 for nixpkgs
2016-04-10 11:17:52 +02:00
Robin Gloster 696d85a62d Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-04-03 11:01:57 +00:00
Vladimír Čunát ab15a62c68 Merge branch 'master' into closure-size
Beware that stdenv doesn't build. It seems something more will be needed
than just resolution of merge conflicts.
2016-04-01 10:06:01 +02:00
Nikolay Amiantov 9b7edbeb2f primus: propagate stdenv to primusLibs 2016-03-31 19:52:33 +03:00
Robin Gloster f60c9df0ba Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-03-28 15:16:29 +00:00
zimbatm 621ed35991 xdg_utils: fixes #14060 2016-03-20 00:52:10 +00:00
zimbatm af1e32acd3 xdg_utils: 1.1.0-rc3p46 -> 1.1.1 2016-03-20 00:52:09 +00:00
Robin Gloster 3f45f0948d Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-03-15 01:44:24 +00:00
Vladimír Čunát 1df2a6431f xdg-utils: replace commands more precisely
Fix #13904, close #13908.
Previously many messages got clobbered. Now it should be better.

The solution is still relatively hacky, but I don't see how to improve
it without doing lots of work.
2016-03-14 11:00:05 +01:00
Domen Kožar 4471f144df Merge pull request #13810 from ts468/upstream.xpra
xpra: 0.14.19/0.15.3 -> 0.16.2
2016-03-10 12:35:04 +00:00
Thomas Strobel 83b15e2fc4 xpra: 0.14.19/0.15.3 -> 0.16.2 2016-03-10 12:06:55 +01:00
Vladimír Čunát 09af15654f Merge master into closure-size
The kde-5 stuff still didn't merge well.
I hand-fixed what I saw, but there may be more problems.
2016-03-08 09:58:19 +01:00
Franz Pletz cb3d27df93 Merge remote-tracking branch 'origin/master' into hardened-stdenv 2016-03-05 18:55:30 +01:00