diff options
author | Vladimír Čunát <v@cunat.cz> | 2019-08-24 08:19:05 +0200 |
---|---|---|
committer | Vladimír Čunát <v@cunat.cz> | 2019-08-24 08:55:37 +0200 |
commit | 2e6bf42a2207d5ecfe6e67de2def6e004a0eb1f1 (patch) | |
tree | 36de0660dc2c9f3731bd8b60ec852ca0c452efce /pkgs/tools/X11/xkb-switch | |
parent | 84a91208a948be5eca97ea182c4256d9d6ecf171 (diff) | |
parent | 8943fb5f24b9e1aa1d577be4e214d166643269fd (diff) | |
download | nixpkgs-2e6bf42a2207d5ecfe6e67de2def6e004a0eb1f1.tar nixpkgs-2e6bf42a2207d5ecfe6e67de2def6e004a0eb1f1.tar.gz nixpkgs-2e6bf42a2207d5ecfe6e67de2def6e004a0eb1f1.tar.bz2 nixpkgs-2e6bf42a2207d5ecfe6e67de2def6e004a0eb1f1.tar.lz nixpkgs-2e6bf42a2207d5ecfe6e67de2def6e004a0eb1f1.tar.xz nixpkgs-2e6bf42a2207d5ecfe6e67de2def6e004a0eb1f1.tar.zst nixpkgs-2e6bf42a2207d5ecfe6e67de2def6e004a0eb1f1.zip |
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
Diffstat (limited to 'pkgs/tools/X11/xkb-switch')
-rw-r--r-- | pkgs/tools/X11/xkb-switch/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/tools/X11/xkb-switch/default.nix b/pkgs/tools/X11/xkb-switch/default.nix index c22715d6181..a837e73983f 100644 --- a/pkgs/tools/X11/xkb-switch/default.nix +++ b/pkgs/tools/X11/xkb-switch/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "xkb-switch"; - version = "1.5.0"; + version = "1.6.0"; src = fetchFromGitHub { owner = "ierton"; repo = "xkb-switch"; rev = version; - sha256 = "03wk2gg3py97kx0kjzbjrikld1sa55i6mgi398jbcbiyx2gjna78"; + sha256 = "11yn0y1kx04rqxh0d81b5q7kbyz58pi48bl7hyhlv7p8yndkfg4b"; }; nativeBuildInputs = [ cmake ]; |