1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-19 12:28:51 +00:00
Commit graph

49 commits

Author SHA1 Message Date
Frederik Rietdijk 98640fd482 Merge master into staging-next 2019-08-27 16:36:47 +02:00
Michael Weiss d861196c61
sway: 1.1.1 -> 1.2 2019-08-27 11:32:15 +02:00
volth 46420bbaa3 treewide: name -> pname (easy cases) (#66585)
treewide replacement of

stdenv.mkDerivation rec {
  name = "*-${version}";
  version = "*";

to pname
2019-08-15 13:41:18 +01:00
worldofpeace b1bc0645ea gdk-pixbuf: rename from gdk_pixbuf 2019-07-22 18:50:57 -04:00
Michael Weiss 48067b5c97
swayidle: 1.4 -> 1.5 2019-07-11 22:23:16 +02:00
Michael Weiss 42559f1cf1
swayidle: 1.3 -> 1.4 2019-07-10 20:57:48 +02:00
Patrick Hilhorst e7be5691ba
sway: manually update version in meson.build
This wasn't done upstream. Adapted from:

5956e993dd/default.nix (L32-L34)

Co-Authored-By: Michael Weiss <dev.primeos@gmail.com>
2019-06-04 19:32:14 +02:00
Patrick Hilhorst 9ab064b8d9
sway: 1.0 -> 1.1.1 2019-06-04 16:12:42 +02:00
Michael Weiss 65f07c097d
swaybg: init at 1.0 2019-05-03 22:30:41 +02:00
Michael Weiss 1f1e075fb1
swayidle: 1.2 -> 1.3 2019-05-03 22:16:21 +02:00
Michael Weiss d43ea14abb
swaylock: 1.3 -> 1.4 2019-05-03 22:16:21 +02:00
Michael Weiss 15010f0436
sway: Read the configuration from /etc before /nix/store (#60319)
This change will load all configuration files from /etc, to make it easy
to override them, but fallback to /nix/store/.../etc/sway/config to make
Sway work out-of-the-box with the default configuration on non NixOS
systems.
2019-04-27 22:38:18 +02:00
Michael Weiss 578fe3f5a0
nixos/sway: Improve the module and adapt it to NixOS
This commit contains the following changes:
- nixos/sway: Remove the beta references
- sway: Drop buildDocs
- nixos/sway: Improve the documentation
- sway,nixos/sway: Adapt Sway to NixOS
  - Copy the default configuration file to /etc/sway/config (Sway will
    still load the identical file from the Nix store but this makes it
    easier to copy the default configuration file).
  - This will also remove all references to the Nix store from the
    default configuration file as they will eventually be garbage
    collected which is a problem if the user copies it.
  - I've also decided to drop the default wallpaper (alternatively we
    could copy it to a fixed location).
- nixos/sway: Drop the package option
2019-03-13 11:37:11 +01:00
Michael Weiss 45004c6f63
sway: Switch to 1.0
This is the result of executing:
git mv -f pkgs/applications/window-managers/sway/beta.nix pkgs/applications/window-managers/sway/default.nix
git mv -f nixos/modules/programs/sway-beta.nix nixos/modules/programs/sway.nix

And removing sway-beta from the following files:
pkgs/top-level/all-packages.nix
nixos/modules/module-list.nix
2019-03-12 22:29:39 +01:00
Michael Weiss 1240834176
sway-beta: Use the upstream patch to fix the build failure 2019-03-11 18:51:26 +01:00
Michael Weiss eb2a26f5c6
sway-beta: 1.0-rc5 -> 1.0 2019-03-11 17:02:25 +01:00
Michael Weiss 7bf4323082
sway-beta: 1.0-rc4 -> 1.0-rc5 2019-03-04 20:31:06 +01:00
Michael Weiss 0c89c444a2
sway-beta: 1.0-rc3 -> 1.0-rc4 2019-02-26 19:03:15 +01:00
Michael Weiss b790a74816
sway-beta: 1.0-rc2 -> 1.0-rc3 2019-02-18 22:26:16 +01:00
gnidorah e5a937bbdf
sway-beta: make man flag depend on parameter 2019-02-17 18:03:46 +01:00
Michael Weiss 1a88aa9e0c
sway-beta: 1.0-rc1 -> 1.0-rc2 2019-02-11 19:30:52 +01:00
Michael Weiss d2aa09f26d
swayidle: 1.1 -> 1.2 2019-02-05 23:34:22 +01:00
Michael Weiss 46503d069a
swaylock: 1.2 -> 1.3 2019-02-05 23:34:22 +01:00
Michael Weiss f73a8b22fb
sway-beta: 1.0-beta.2 -> 1.0-rc1 2019-02-03 15:35:07 +01:00
Michael Weiss 8d8ed93725
swaylock: init at 1.2 2019-01-15 13:34:18 +01:00
Michael Weiss 813164e0cd
swayidle: init at 1.1 2019-01-15 13:15:37 +01:00
Michael Weiss 9ac03eb811 sway-beta: 1.0-beta.1 -> 1.0-beta.2 2018-11-30 01:53:52 +01:00
Patrick Hilhorst d8d8a0ba14 sway-beta: init at 1.0-beta1 (#48829)
* sway-beta: init at 1.0-beta1

* sway, sway-beta: use https url
2018-10-23 20:34:59 +02:00
Matthew Bauer 76999cc40e treewide: remove aliases in nixpkgs
This makes the command ‘nix-env -qa -f. --arg config '{skipAliases =
true;}'’ work in Nixpkgs.

Misc...

- qtikz: use libsForQt5.callPackage

  This ensures we get the right poppler.

- rewrites:

  docbook5_xsl -> docbook_xsl_ns
  docbook_xml_xslt -> docbook_xsl

diffpdf: fixup
2018-07-18 23:25:20 -04:00
Vladyslav Mykhailichenko 8cd25c50c0 sway: 0.15.1 -> 0.15.2 2018-04-13 22:56:57 +03:00
dywedir f3949a2e8e sway: 0.15.0 -> 0.15.1 2017-12-28 14:25:34 +01:00
gnidorah b9851a975e Make less known wayland compositors usable (#32285)
* bemenu: init at 2017-02-14

* velox: 2015-11-03 -> 2017-07-04

* orbment, velox: don't expose subprojects

the development of orbment and velox got stuck
their subprojects (bemenu, dmenu-wayland, st-wayland) don't work correctly outside of parent projects
so hide them to not confuse people
swc and wld libraries are unpopular and unlike wlc are not used by anything except velox

* pythonPackages.pydbus: init at 0.6.0

* way-cooler: 0.5.2 -> 0.6.2

* nixos/way-cooler: add module

* dconf module: use for wayland

non-invasive approach for #31293
see discussion at #32210

* sway: embed LD_LIBRARY_PATH for #32755

* way-cooler: switch from buildRustPackage to buildRustCrate #31150
2017-12-21 16:16:19 +00:00
dywedir fe4907c9d0 sway: 0.14.0 -> 0.15.0 2017-11-07 23:16:50 +02:00
gnidorah 8cfbf2be5b sway: cleanup 2017-10-25 21:51:52 +03:00
Samuel Leathers 1dc92fe688 sway: 0.13.0 -> 0.14.0 2017-10-16 21:50:16 -04:00
Michael Weiss 2d640b9d6e wlc: Downgrade back to 0.0.9
Unfortunately wlc 0.0.10 seems to be the cause for segfaults on sway,
way-cooler and orbment.

This will also build wlc with all optional packages (i.e. zlib,
valgrind and doxygen).
2017-09-27 20:21:50 +02:00
Michael Weiss 676f5cb02c sway: Fix the build
While the last wlc upgrade (05d79c03ec)
makes it possible to build sway 0.14.0 it also breaks the current build
of sway 0.13.0.

Unfortunately sway 0.14.0 segfaults on launch and I couldn't fix it yet
(there are multiple upstream issues as well). I'll overwrite the wlc
version for sway in order to have a usable version in nixpkgs for the
meantime.
2017-09-26 18:48:21 +02:00
Chris Duncan cca84bc6c9 sway: 0.12.2 -> 0.13.0 2017-07-10 22:00:22 +01:00
Chris Duncan c27ebd41c5 sway: Add cmake version number flag 2017-07-10 21:56:36 +01:00
Chris Duncan 82ddeaba88 sway: Add pam, gdk_pixbuf build inputs 2017-07-10 21:54:03 +01:00
Tim Steinbach f911770acf
sway: Add xwayland build input 2017-04-05 08:17:49 -04:00
Tim Steinbach 7acd1e7f68
sway: 0.11 -> 0.12.2 2017-04-04 20:56:27 -04:00
Jaanus Torp 8978a9ee48 sway: 0.9 -> 0.11 (#22835) 2017-02-15 16:28:01 +01:00
Ignat Loskutov b577f2997e sway: 0.8 -> 0.9 2016-09-04 16:02:57 -04:00
Langston Barrett 6aa50f169b sway: 0.7 -> 0.8 (#17026) 2016-07-17 09:31:41 +02:00
Domen Kožar 8a63f7e067 sway: 2016-02-08 -> 0.7 2016-06-01 19:35:49 +01:00
Joachim Fasting 868082f616 sway: fix build
Building the manual requires docbook_xsl; in sandboxed environments,
the build would fail due to being unable to download missing docbook
resources.

Also include some minor improvements to the build recipe:
- use fetchFromGitHub
- move build-time dependencies to nativeBuildInputs

xref: https://github.com/NixOS/nixpkgs/pull/13900
2016-03-14 13:02:01 +01:00
tg(x) 877dc973ab wayland window managers: orbment, sway, velox -> latest git 2016-02-09 23:41:01 +01:00
tg(x) e1bcc74135 wayland window managers: orbment, sway, velox 2016-02-09 22:35:16 +01:00