aboutsummaryrefslogtreecommitdiff
path: root/pkgs/tools/X11 (follow)
Commit message (Collapse)AuthorAgeFilesLines
* treewide: remove redundant quotesvolth2019-09-083-3/+3
|
* Merge branch 'master' into staging-nextJan Tojnar2019-09-062-7/+12
|\ | | | | | | Fixed trivial conflicts caused by removing rec.
| * Merge branch 'gtk-no-plus'Jan Tojnar2019-09-061-1/+1
| |\
| | * tree-wide: s/GTK+/GTK/gJan Tojnar2019-09-061-1/+1
| | | | | | | | | | | | GTK was renamed.
| * | caffeine-ng: move setuptools_scm dependency to buildInputsMarcial Gaißert2019-09-051-2/+5
| | | | | | | | | | | | setuptools_scm is only needed during build, not whilst using the package.
| * | caffeine-ng: remove unneeded dependencies setuptools, wheelMarcial Gaißert2019-09-041-1/+1
| | |
| * | caffeine-ng: use python3Marcial Gaißert2019-09-011-4/+4
| | | | | | | | | | | | Using python3 is recommended by upstream.
| * | caffeine-ng: do not run testsMarcial Gaißert2019-09-011-0/+2
| |/ | | | | | | | | There are no tests anyway. Not finding the tests results in build failures if using Python 3.
* | treewide: name -> pname (#67513)volth2019-08-311-1/+1
| |
* | treewide: remove redundant recvolth2019-08-2812-12/+12
|/
* Merge branch 'master' into staging-nextVladimír Čunát2019-08-253-17/+13
|\ | | | | | | | | | | | | There were several more conflicts from name -> pname+version; all auto-solved by kdiff3, hopefully OK. Hydra nixpkgs: ?compare=1538611
| * Merge pull request #67389 from jtojnar/xdg-user-dirsJan Tojnar2019-08-241-1/+2
| |\ | | | | | | Allow changing xdg-user-dirs with environment.etc
| | * xdg-user-dirs: deprioritize shipped configsJan Tojnar2019-08-241-1/+2
| | | | | | | | | | | | | | | | | | 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.
| * | xpra: 2.5 -> 2.5.3adisbladis2019-08-242-16/+11
| |/ | | | | | | Also fix build by using opencv4
* | Merge branch 'master' into staging-nextVladimír Čunát2019-08-244-7/+7
|\| | | | | | | | | | | | | | | | | | | 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
| * Merge pull request #67165 from r-ryantm/auto-update/xkb-switchMarek Mahut2019-08-211-2/+2
| |\ | | | | | | xkb-switch: 1.5.0 -> 1.6.0
| | * xkb-switch: 1.5.0 -> 1.6.0R. RyanTM2019-08-201-2/+2
| | | | | | | | | | | | | | | | | | | | | 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
| * | Merge pull request #67173 from r-ryantm/auto-update/wpgtkMarek Mahut2019-08-211-2/+2
| |\ \ | | | | | | | | wpgtk: 6.0.8 -> 6.0.9
| | * | wpgtk: 6.0.8 -> 6.0.9R. RyanTM2019-08-201-2/+2
| | |/ | | | | | | | | | | | | | | | | | | 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
| * | Merge pull request #66989 from r-ryantm/auto-update/nx-libsMarek Mahut2019-08-201-2/+2
| |\ \ | | | | | | | | nx-libs: 3.5.99.20 -> 3.5.99.21
| | * | nx-libs: 3.5.99.20 -> 3.5.99.21R. RyanTM2019-08-191-2/+2
| | |/ | | | | | | | | | | | | | | | | | | 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
| * / Remove myself as maintainer of some packages.Rickard Nilsson2019-08-201-1/+1
| |/
* | Merge master into staging-nextFrederik Rietdijk2019-08-181-2/+2
|\|
| * ckbcomp: 1.192 -> 1.193R. RyanTM2019-08-171-2/+2
| | | | | | | | | | | | | | 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
* | treewide: name -> pnamevolth2019-08-175-7/+12
| |
* | Merge staging-next into stagingFrederik Rietdijk2019-08-172-6/+21
|\|
| * xkbvalidate: Rename output binary to xkbvalidateaszlig2019-08-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | 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>
| * xkbvalidate: Don't rely on GNU extensionsaszlig2019-08-152-5/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * xkbvalidate: Use $CC instead of hardcoded gccaszlig2019-08-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | treewide: name -> pname (easy cases) (#66585)volth2019-08-1546-54/+49
|/ | | | | | | | | treewide replacement of stdenv.mkDerivation rec { name = "*-${version}"; version = "*"; to pname
* Merge staging-next into stagingFrederik Rietdijk2019-07-281-5/+4
|\
| * dragon-drop: git-2014-08-14 -> 1.1.0Markus Hauck2019-07-271-5/+4
| |
* | gdk-pixbuf: rename from gdk_pixbufworldofpeace2019-07-222-4/+4
|/
* primus: fix for libglvndNikolay Amiantov2019-07-171-0/+2
| | | | Fixes #48795.
* wpgtk: 6.0.7 -> 6.0.8R. RyanTM2019-07-171-2/+2
| | | | | | | 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
* Merge pull request #64805 from peterhoeg/u/xcapeMichael Raskin2019-07-161-15/+14
|\ | | | | xcape: 1.2 -> 20180301
| * xcape: 1.2 -> 20180301Peter Hoeg2019-07-151-15/+14
| | | | | | | | | | | | | | | | 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.
* | libstrangle: init at 2017-02-22Kirill Boltaev2019-07-152-0/+58
| |
* | ckbcomp: 1.191 -> 1.192R. RyanTM2019-07-151-2/+2
|/ | | | | | | 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
* Merge master into staging-nextFrederik Rietdijk2019-06-261-22/+21
|\
| * xtrace: 1.3.1 -> 1.4.0Guillaume Maudoux2019-06-251-22/+21
| |
* | Merge master into staging-nextFrederik Rietdijk2019-06-211-2/+2
|\|
| * xsecurelock: 1.3.1 -> 1.4.0R. RyanTM2019-06-181-2/+2
| | | | | | | | | | | | | | 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
* | Merge staging-next into stagingFrederik Rietdijk2019-06-184-5/+4
|\|
| * treewide: remove unused variables (#63177)volth2019-06-164-5/+4
| | | | | | | | | | | | * treewide: remove unused variables * making ofborg happy
* | Merge pull request #62167 from matthewbauer/alias-libglMatthew Bauer2019-06-171-2/+2
|\ \ | |/ |/| Add libGL* aliases
| * treewide: mesa_noglu, mesa_drivers, libGL_driver -> mesaMatthew Bauer2019-06-171-2/+2
| | | | | | | | Just use mesa for these to be more clear. Move these to aliases.nix
* | Merge pull request #58151 from dtzWill/update/xpra-2.5Will Dietz2019-06-092-24/+34
|\ \ | |/ |/| xpra: 2.3.4 -> 2.5, unbreak?
| * xpra: 2.3.4 -> 2.5, unbreakWill Dietz2019-03-222-24/+34
| |
* | wpgtk: 6.0.5 -> 6.0.7Will Dietz2019-06-061-2/+2
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-29 12:14:31 +0000