3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

66 commits

Author SHA1 Message Date
Vladimír Čunát 81039713fa Merge branch 'master' into staging
... to get the systemd update (rebuilding ~7k jobs).
2016-05-26 16:50:22 +02:00
Rok Garbas b614d72f40 i3lock-fancy: fix patching of the script 2016-05-24 12:38:23 +02:00
Rok Garbas 9c20849da4 i3lock-color: renaming bin/i3lock binary to bin/i3lock-color
... that it doesn't conflict with i3lock
2016-05-24 12:37:04 +02:00
Vladimír Čunát 73f1f5eb39 imagemagick: split dev output to fix #9604
Also fixup references to imagemagick.
2016-05-22 13:41:15 +02:00
Domen Kožar b49bf121b8 rename iElectric to domenkozar to match GitHub 2016-05-17 13:00:47 +01:00
Rok Garbas e4e7ba281d i3lock-fancy: init at b7196aaff 2016-05-15 05:47:35 +02:00
Rok Garbas 3290b66e0e i3lock-color: init at 2.7 revision 63a4c23ec6f 2016-05-15 05:47:35 +02:00
Igor Sharonov 7237ccfabc i3pystatus: fix libpulseaudio 2016-05-14 14:28:20 +03:00
Frederik Rietdijk d5e6a4494a Python: use PyPI mirror (#15001)
* mirrors: add pypi

* Python: Use pypi mirror for all PyPI packages
2016-04-26 13:38:03 +01:00
Sheena Artrip 7fb57383fc i3: 4.11 -> 4.12 2016-03-23 01:17:16 -04:00
joachifm 02327d3a44 Merge pull request #13431 from igsha/i3pystatus
i3pystatus: 3.33 -> 3.34
2016-03-05 13:12:10 +00:00
zimbatm 17348dc094 Remove all dots at end of descriptions
Specially crafted for @JagaJaga

    find pkgs -name "*.nix" -exec \
      sed -e 's|\(description.*\)\.";|\1";|g' -i {} \;
2016-02-27 17:30:29 +00:00
Igor Sharonov 00d32bb99f i3pystatus: 3.33 -> 3.34 2016-02-25 21:30:37 +03:00
Domen Kožar 89fa4724f1 Merge pull request #12873 from ericsagnes/feat/i3
i3: move dependencies to runtime
2016-02-08 13:16:11 +00:00
Eric Sagnes 65beea69d7 i3status: 2.9 -> 2.10, fixes #12872 2016-02-08 05:58:20 +01:00
Eric Sagnes b2c658ca11 i3: dmenu and i3status as runtime dependencies 2016-02-08 13:29:42 +09:00
Birger J. Nordølum 1fe89386fd i3blocks: 1.4 (NEW) (WIP) 2015-12-11 08:55:14 +01:00
Anders Papitto 888a7358f5 i3: 4.10.4 -> 4.11 2015-10-17 21:14:39 -07:00
Matthias Beyer a3a1bcb40a i3: 4.10.3 -> 4.10.4 2015-09-11 12:19:46 +02:00
Domen Kožar a414391fd0 i3lock: 2.6 -> 2.7 2015-09-04 20:01:57 +02:00
Domen Kožar 950d9de3c9 i3: 4.10.2 -> 4.10.3 2015-09-04 18:47:40 +02:00
Anders Papitto 4ac7c02d8e Disable i3 tests due to unfixed errors 2015-06-19 12:14:10 -07:00
Joachim Fasting bf7ad2d84f meta.description fixups
Mostly scripted substitutions with a couple of subjective enhancements.
2015-04-30 18:17:42 +02:00
Arseniy Seroka 2c2467df72 Merge pull request #7416 from nmikhailov/i3update
i3: 4.10.1 -> 4.10.2
2015-04-16 20:03:57 +03:00
Nikita Mikhailov a01d3dd240 i3: 4.10.1 -> 4.10.2 2015-04-16 16:17:43 +00:00
Domen Kožar ee69867e98 Merge pull request #7320 from nslqqq/i3update
i3: fix testsuite
2015-04-11 10:18:27 -04:00
Nikita Mikhailov 5f2c1f7397 i3: fix testsuite 2015-04-11 14:10:39 +00:00
Rok Garbas bdcdc183a4 i3status: update to 2.9 2015-04-11 15:49:56 +02:00
Nikita Mikhailov 93f277f1d4 i3: 4.9.1 -> 4.10.1 2015-04-11 12:48:39 +02:00
Nikita Mikhailov 54290aaa35 i3: 4.9 -> 4.9.1 2015-03-10 16:18:50 +01:00
lethalman e5dd67fc1e Merge pull request #6619 from bobvanderlinden/i3-4.9
i3: upgrade to 4.9
2015-03-02 18:04:19 +01:00
Bob van der Linden 97079a044d i3: upgrade to 4.9 2015-03-01 22:56:51 +01:00
Anders Papitto ec437bff92 replace use of which with command -v in i3 scripts 2015-02-16 08:08:16 +00:00
Marcus Crestani 8e2fb7c816 i3: Set checkPhase only when on Linux. 2015-02-04 20:44:19 +01:00
Rok Garbas 21db3eaa60 i3lock: it's cleaner to use $out/share/man in the first place.
it is true that $out/man is automatically moved to $out/share/man, but using
"share" folder is cleaner solutions suggested by @edolstra here #6014
2015-01-28 19:56:13 +01:00
lethalman 136eea2c16 Merge pull request #6014 from malyn/fix-i3lock-man
i3lock: Make sure that man pages get installed
2015-01-28 10:25:06 +01:00
Michael Alyn Miller ed359e453c
i3: Make sure that man pages get installed 2015-01-28 08:00:30 +01:00
Michael Alyn Miller 264da9e509 i3lock: Make sure that man pages get installed 2015-01-27 20:49:09 -08:00
Jaka Hudoklin 6b2e5c3262 i3: make i3-save-workspace work 2014-11-30 18:40:03 +01:00
Rok Garbas 3bf7d7c42a i3lock: update to 2.6 2014-08-03 14:04:44 +02:00
aszlig 6aabd17d51
i3: Don't override patchPhase.
Makes easier to provide a patches attribute through packageOverrides.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-08-02 17:25:16 +02:00
aszlig 3d34dc39ac
i3: Only enable tests for x86_64-linux.
Right now, tests for i686-linux fail, see:

https://hydra.nixos.org/build/13024964

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-08-01 18:41:39 +02:00
aszlig 32d7c4c435
i3: Remove CarpAlways from buildInputs.
Oops, it was a leftover from debugging.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-08-01 11:19:06 +02:00
aszlig fb1f257189
i3: Don't run test cases in parallel.
Unfortunately, running them in parallel sometimes lead to tests not even
starting up. Probably lock contention is the issue here, but haven't
investigated further so I'm deactivating parallel testing.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-08-01 08:04:09 +02:00
aszlig 31e77f5096
i3: Abort build if test suite is failing.
The exit code of the i3 test runner is always 0, regardless of whether
tests were failing or not, so let's quickly grep for a "not ok" in the
test logfile and if it occurs, the whole build is failing now.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-08-01 05:49:14 +02:00
aszlig 2c1d04a563
i3: Enable running test suite by default.
Finally, after going through the journey of debugging and gathering
dependencies, we now have tests for i3, hooray!

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-08-01 05:49:14 +02:00
Nikita Mikhailov 724fbd81ff i3: 4.7.2 -> 4.8 2014-06-22 18:17:09 +07:00
Domen Kožar c4cb65187e i3: 4.6 -> 4.7.2 2014-01-24 14:33:40 +01:00
Nixpkgs Monitor baa1bba420 i3status: update from 2.7 to 2.8 2014-01-13 17:28:42 +01:00
modulistic cca6a6724c i3 window manager: version bump from 4.5.1 to 4.6 2013-08-23 14:05:36 +02:00