Commit Graph

622 Commits

Author SHA1 Message Date
volth
7b8fb5c06c treewide: remove redundant quotes 2019-09-08 23:38:31 +00:00
Jan Tojnar
cdf426488b
Merge branch 'master' into staging-next
Fixed trivial conflicts caused by removing rec.
2019-09-06 03:20:09 +02:00
Jan Tojnar
ed54a5b51d
Merge branch 'gtk-no-plus' 2019-09-06 02:57:51 +02:00
Jan Tojnar
72e7d569a7
tree-wide: s/GTK+/GTK/g
GTK was renamed.
2019-09-06 02:54:53 +02:00
Marcial Gaißert
d64cdba5b4
caffeine-ng: move setuptools_scm dependency to buildInputs
setuptools_scm is only needed during build, not whilst using the package.
2019-09-05 17:44:55 +02:00
Marcial Gaißert
cdf8247b68
caffeine-ng: remove unneeded dependencies setuptools, wheel 2019-09-04 16:10:01 +02:00
Marcial Gaißert
85c084d88d
caffeine-ng: use python3
Using python3 is recommended by upstream.
2019-09-01 21:08:33 +02:00
Marcial Gaißert
fc78d8e0a7
caffeine-ng: do not run tests
There are no tests anyway. Not finding the tests results in build
failures if using Python 3.
2019-09-01 20:28:08 +02:00
volth
7bb6b373ab treewide: name -> pname (#67513) 2019-08-31 07:41:22 -04:00
volth
08f68313a4 treewide: remove redundant rec 2019-08-28 11:07:32 +00:00
Vladimír Čunát
985d1ac425
Merge branch 'master' into staging-next
There were several more conflicts from name -> pname+version;
all auto-solved by kdiff3, hopefully OK.

Hydra nixpkgs: ?compare=1538611
2019-08-25 14:57:11 +02:00
Jan Tojnar
d90aa7dc62
Merge pull request #67389 from jtojnar/xdg-user-dirs
Allow changing xdg-user-dirs with environment.etc
2019-08-24 19:22:45 +02:00
adisbladis
83d179fc09
xpra: 2.5 -> 2.5.3
Also fix build by using opencv4
2019-08-24 14:15:17 +01:00
Jan Tojnar
865293c508
xdg-user-dirs: deprioritize shipped configs
XDG_CONFIG_DIRS should contain directories ordered by priority
so if we want users to be able to customize the defaults, we
need to move the shipped values to the end.
2019-08-24 14:39:02 +02:00
Vladimír Čunát
2e6bf42a22
Merge branch 'master' into staging-next
There ver very many conflicts, basically all due to
name -> pname+version.  Fortunately, almost everything was auto-resolved
by kdiff3, and for now I just fixed up a couple evaluation problems,
as verified by the tarball job.  There might be some fallback to these
conflicts, but I believe it should be minimal.

Hydra nixpkgs: ?compare=1538299
2019-08-24 08:55:37 +02:00
Marek Mahut
c62a561f70
Merge pull request #67165 from r-ryantm/auto-update/xkb-switch
xkb-switch: 1.5.0 -> 1.6.0
2019-08-21 21:17:06 +02:00
Marek Mahut
9d54c9eff1
Merge pull request #67173 from r-ryantm/auto-update/wpgtk
wpgtk: 6.0.8 -> 6.0.9
2019-08-21 21:13:33 +02:00
R. RyanTM
436e3c5ef1 wpgtk: 6.0.8 -> 6.0.9
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/wpgtk/versions
2019-08-20 22:54:05 -07:00
R. RyanTM
226bda8e59 xkb-switch: 1.5.0 -> 1.6.0
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/xkb-switch/versions
2019-08-20 22:12:05 -07:00
Marek Mahut
e04a39d550
Merge pull request #66989 from r-ryantm/auto-update/nx-libs
nx-libs: 3.5.99.20 -> 3.5.99.21
2019-08-20 19:37:36 +02:00
Rickard Nilsson
225e412edb Remove myself as maintainer of some packages. 2019-08-20 15:24:01 +02:00
R. RyanTM
a19bfedcd9 nx-libs: 3.5.99.20 -> 3.5.99.21
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/nx-libs/versions
2019-08-19 14:45:10 -07:00
Frederik Rietdijk
f65aa21bb2 Merge master into staging-next 2019-08-18 12:53:44 +02:00
R. RyanTM
e6b1baef15 ckbcomp: 1.192 -> 1.193
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/ckbcomp/versions
2019-08-17 13:18:51 -07:00
volth
c814d72b51 treewide: name -> pname 2019-08-17 10:54:38 +00:00
Frederik Rietdijk
fe9a3e3e63 Merge staging-next into staging 2019-08-17 09:39:23 +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
aszlig
16ecd0d5ca
xkbvalidate: Rename output binary to xkbvalidate
So far, the output binary has been just "validate", which is quite a
very generic name and doesn't match the package name.

Even though I highly doubt that this program will ever be used outside
of NixOS modules, it's nevertheless less confusing to have a consistent
naming.

Signed-off-by: aszlig <aszlig@nix.build>
2019-08-15 01:11:32 +02:00
aszlig
1964b0c1b1
xkbvalidate: Don't rely on GNU extensions
The only reason why I was using _GNU_SOURCE was because of vasprintf(),
so getting rid of that extension should make the source way more
portable.

When using vsnprintf() with a null pointer for the output buffer and a
size of 0, I wasn't quite sure whether this would be undefined
behaviour, so I looked it up in the C11 standard.

In section 7.21.6.5, it explicitly mentions this case, so we're lucky:

  If n is zero, nothing is written, and s may be a null pointer.

Additionally, section 7.21.6.12 writes the following about vsnprintf():

  The vsnprintf function does not invoke the va_end macro.

So to be sure to avoid undefined behaviour I subsequently added the
corresponding va_end() calls.

With this, the platforms attribute is now "unix", because the program
should now even run on OS X, even though it usually wouldn't be needed.

Signed-off-by: aszlig <aszlig@nix.build>
2019-08-15 00:59:58 +02:00
aszlig
77e8a12755
xkbvalidate: Use $CC instead of hardcoded gcc
I initially didn't use $CC because I thought this would be GCC specific,
but it turns out that Clang actually accepts -std=gnu11.

So using $CC here might not work on compilers other than Clang or GCC,
but at the moment those are the compilers we typically use in nixpkgs,
so even if we'd use some other compiler it *might* even work there.

I've tested this by compiling against clangStdenv with both $CC and
clang hardcoded and it works.

This was reported by @dkudriavtsev on IRC.

Signed-off-by: aszlig <aszlig@nix.build>
2019-08-14 23:57:20 +02:00
Frederik Rietdijk
cca5ee9c07 Merge staging-next into staging 2019-07-28 09:10:03 +02:00
Markus Hauck
cd903247b8 dragon-drop: git-2014-08-14 -> 1.1.0 2019-07-27 09:54:31 +02:00
worldofpeace
b1bc0645ea gdk-pixbuf: rename from gdk_pixbuf 2019-07-22 18:50:57 -04:00
Nikolay Amiantov
b1fc8e24a2 primus: fix for libglvnd
Fixes #48795.
2019-07-17 11:44:21 +03:00
R. RyanTM
9d6fabd905 wpgtk: 6.0.7 -> 6.0.8
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/wpgtk/versions
2019-07-17 09:32:43 +02:00
Michael Raskin
be03f0a2b5
Merge pull request #64805 from peterhoeg/u/xcape
xcape: 1.2 -> 20180301
2019-07-16 05:42:08 +00:00
Kirill Boltaev
979710b4a0 libstrangle: init at 2017-02-22 2019-07-15 22:49:32 +03:00
R. RyanTM
f62c79c758 ckbcomp: 1.191 -> 1.192
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/ckbcomp/versions
2019-07-15 15:56:05 +02:00
Peter Hoeg
4384bacbf3 xcape: 1.2 -> 20180301
1.2 only allows running in the foreground if debug mode is enabled which
generates lots of noise for journald.

The changes from the most recent release is only a few minor fixes plus support
for running in the foreground with the `-f` flag.
2019-07-15 20:29:39 +08:00
Frederik Rietdijk
d843e16cb8 Merge master into staging-next 2019-06-26 13:22:30 +02:00
Guillaume Maudoux
9472a2ea45 xtrace: 1.3.1 -> 1.4.0 2019-06-25 12:26:35 -04:00
Frederik Rietdijk
72d647f3d8 Merge master into staging-next 2019-06-21 08:20:26 +02:00
R. RyanTM
d134096b3d xsecurelock: 1.3.1 -> 1.4.0
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/xsecurelock/versions
2019-06-18 11:45:30 -07:00
Frederik Rietdijk
f120248daf Merge staging-next into staging 2019-06-18 11:07:56 +02:00
Matthew Bauer
4d6f65b81f
Merge pull request #62167 from matthewbauer/alias-libgl
Add libGL* aliases
2019-06-17 15:18:29 -04:00
Matthew Bauer
263f5891b6 treewide: mesa_noglu, mesa_drivers, libGL_driver -> mesa
Just use mesa for these to be more clear. Move these to aliases.nix
2019-06-17 14:43:18 -04:00
volth
f3282c8d1e treewide: remove unused variables (#63177)
* treewide: remove unused variables

* making ofborg happy
2019-06-16 19:59:05 +00:00
Will Dietz
0a59b4d3b4
Merge pull request #58151 from dtzWill/update/xpra-2.5
xpra: 2.3.4 -> 2.5, unbreak?
2019-06-09 22:01:22 -05:00
Will Dietz
5f8d1b9d6a
wpgtk: 6.0.5 -> 6.0.7 2019-06-06 21:51:32 -05:00
Nikolay Amiantov
8762641199 virtualglLib: 2.5.2 -> 2.6.2 2019-06-04 01:36:27 +03:00