Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 3a393eecafb3
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: f830fe04bd4f
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Nov 25, 2018

  1. ckbcomp: 1.133 -> 1.187

    @c0bw3b
    c0bw3b committed Nov 25, 2018
    Copy the full SHA
    aed83ac View commit details

  2. Merge pull request #51003 from c0bw3b/pkg/ckbcomp 

    ckbcomp: 1.133 -> 1.187
    @c0bw3b
    c0bw3b authored Nov 25, 2018
    Copy the full SHA
    f830fe0 View commit details
Showing with 11 additions and 11 deletions.
  1. +11 −11 pkgs/tools/X11/ckbcomp/default.nix
22 changes: 11 additions & 11 deletions pkgs/tools/X11/ckbcomp/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
{ stdenv, fetchgit, perl, xkeyboard_config }:
{ stdenv, fetchFromGitLab, perl, xkeyboard_config }:

stdenv.mkDerivation rec {
name = "ckbcomp-${version}";
version = "1.133";
version = "1.187";

src = fetchgit {
url = "git://anonscm.debian.org/d-i/console-setup.git";
rev = "refs/tags/${version}";
sha256 = "1whli40ik5izyfs0m8d08gq8zcsdjscnxbsvxyxvdnkrvzw4izdz";
src = fetchFromGitLab {
domain = "salsa.debian.org";
owner = "installer-team";
repo = "console-setup";
rev = version;
sha256 = "1dcsgdai5lm1r0bhlcfwh01s9k11iwgnd0111gpgbv568rs5isqh";
};

buildInputs = [ perl ];
@@ -20,15 +22,13 @@ stdenv.mkDerivation rec {
dontBuild = true;

installPhase = ''
mkdir -p "$out"/bin
cp Keyboard/ckbcomp "$out"/bin/
mkdir -p "$out"/share/man/man1
cp man/ckbcomp.1 "$out"/share/man/man1
install -Dm0555 -t $out/bin Keyboard/ckbcomp
install -Dm0444 -t $out/share/man/man1 man/ckbcomp.1
'';

meta = with stdenv.lib; {
description = "Compiles a XKB keyboard description to a keymap suitable for loadkeys";
homepage = http://anonscm.debian.org/cgit/d-i/console-setup.git;
homepage = https://salsa.debian.org/installer-team/console-setup;
license = licenses.gpl2Plus;
maintainers = with stdenv.lib.maintainers; [ dezgeg ];
platforms = platforms.unix;