3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

92 commits

Author SHA1 Message Date
Graham Christensen ed59b2c892 Revert "i3: add configFile to enable cutom configuration locations" 2017-07-02 08:48:41 -04:00
Benno Fünfstück 13c8c847f4 Merge pull request #27007 from jfrankenau/update-i3lock
i3lock: 2.8 -> 2.9.1
2017-07-01 19:59:18 +02:00
Johannes Frankenau 36021ddaaf i3lock: 2.8 -> 2.9.1 2017-07-01 09:28:23 +02:00
Maximilian Bosch dd4c1e2b01
i3: add configFile to enable cutom configuration locations
i3 loads its configuration from `~/.config/i3`, but in nix-based systems
you might want to build the config in `~/.nix-profile` using a nix
derivation, so `i3` needs to know where to look for the configuration
file.
2017-07-01 08:20:56 +02:00
Jörg Thalheim f56d83761c Merge pull request #26254 from boomshroom/fix/i3block-scripts
i3blocks: add optional dependencies for scripts
2017-06-10 11:05:48 +01:00
Ismaïl Senhaji 9caa9220a7 i3lock-color: 2.7-2017-04-01 -> 2.9.1-c 2017-06-05 00:09:46 +02:00
Angelo Bulfone 4642e8d1cf i3blocks: add optional dependencies for scripts 2017-05-30 11:31:06 -07:00
Eric Sagnes 92bb3e8b9b i3: fix runtime dependencies
Fixes #25633.
2017-05-10 02:42:44 +02:00
Sean Haugh 30b6561982 i3: add separateDebugInfo 2017-04-07 15:24:08 -05:00
ndowens daab7c193f i3lock-color: 2.7-2016-09-17 -> 2.8; Closes #24450
i3lock-color: Corrected software src

Fixed version
2017-04-01 08:27:46 -05:00
Yorick van Pelt c91aa18070 i3status: 2.10 -> 2.11 2017-01-24 20:35:29 +01:00
Franz Pletz 9b92a07843
treewide: use lib.maintainers for meta.maintainers 2017-01-20 15:44:28 +01:00
Michael Raskin bc2e81f610 i3blocks: fix platforms 2017-01-13 19:09:28 +01:00
Birger J. Nordølum 32f991f094
i3blocks: specify supported platforms 2017-01-13 17:09:42 +01:00
Kier Davis 90b3648f9c
i3blocks: search for config in correct system directory
The SYSCONFDIR variable used in the Makefile servers two purposes:

1) During buildPhase, it is hardcoded into the executable as one of
   the locations that will be searched for the i3blocks.conf config
   file. We want this set to "/etc", so that "/etc/i3blocks.conf"
   will be automatically loaded if it exists, as specified in the
   manpage.

2) During installPhase, it specifies the location that the sample
   i3blocks.conf should be installed to. We want this to be "$out/etc".

Case 2 was already handled correctly, but case 1 was not. This resulted
in i3blocks instead searching for i3blocks.conf in the default value of
SYSCONFDIR, which is "/usr/local/etc", a directory which generally does
not exist on NixOS. This commit remedies this problem by setting
SYSCONFDIR=/etc during buildPhase.

A minor stylistic fix (correcting a usage of "makeFlags" to "buildFlags"
in the expression) has also been applied in this commit.
2017-01-12 20:15:15 +00:00
Vladimír Čunát dc451ad3ea
i3-gaps: enableParallelBuilding = false;
http://hydra.nixos.org/build/44530327
2016-12-04 16:59:13 +01:00
Franz Thoma 092d7e9705 i3-gaps: 4.12 -> 4.13 2016-11-11 14:03:33 +01:00
Franz Pletz 2673604708
i3: 4.12 -> 4.13
Fixes #20296.
2016-11-10 02:45:53 +01:00
Tim Steinbach 5e1c84e475
i3lock-fancy: 2016-05-05 -> 2016-10-13 2016-10-15 07:28:14 -04:00
Yorick van Pelt dccb882e45 i3lock-color: 2.7_rev63a4c23 -> 2.7-2016-09-17 2016-09-19 19:42:40 +02:00
Miguel Madrid 8a96c52f63 i3pystatus: 3.34 -> 3.35 (#18268) 2016-09-04 00:23:21 +02:00
Matthew Bauer ae75531b3c i3-block-gaps: disable darwin 2016-08-16 19:25:42 +00:00
Rail Aliiev d6d4cf185e i3lock-fancy: use absolute paths (#17569)
When it's used from command line or as a i3 shortcut, i3lock-fancy works
without any issues. If you try to pass it as an argument to xss-lock or
xautolock running as a systemd user service, getopt and fc-match are not in
PATH and locking doesn't work as expected. This patch replaces non absolute
paths with stable ones and should fix the issue.
2016-08-07 03:42:43 +02:00
Carl Sverre 51d9312e44 i3blocks-gaps: init at 1.4
Fork of i3blocks which supports adding borders to work with i3-gaps
2016-07-21 23:39:48 -07:00
mimadrid bab3d4c3e0
i3lock: 2.7 -> 2.8 2016-07-12 11:15:51 +02:00
Franz Thoma b60b7eeaab i3-gaps: init at 4.12 2016-06-16 14:25:46 +01:00
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