3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

7 commits

Author SHA1 Message Date
Michael Reilly 84cf00f980
treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01: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
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
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
wedens 88a82a4dc9 xkb-switch: 1.3.1 -> 1.5.0, rename from xkb_switch 2019-01-02 21:59:41 -05:00
Kirill Elagin 75e211b102 xkb-switch: Update 2015-01-04 02:48:05 +03:00
Sergey Mironov c27b556673 xkb_switch: command line tool to switch X keyboard layouts 2012-12-27 17:45:08 +04:00