Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: a1ebd8217644
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 873e114cf49c
Choose a head ref
  • 3 commits
  • 2 files changed
  • 3 contributors

Commits on May 17, 2020

  1. ksuperkey: git-2015-07-21 -> 0.4

    @IvarWithoutBones
    IvarWithoutBones committed May 17, 2020
    Copy the full SHA
    a57176c View commit details

  2. Merge pull request #87995 from IvarWithoutBones/ksuperkey 

    ksuperkey: git-2015-07-21 -> 0.4
    @marsam
    marsam authored May 17, 2020

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    d7c0d31 View commit details

  3. ocamlPackages.ocurl: 0.9.0 → 0.9.1

    @vbgl
    vbgl committed May 17, 2020
    Copy the full SHA
    873e114 View commit details
Showing with 20 additions and 21 deletions.
  1. +2 −2 pkgs/development/ocaml-modules/ocurl/default.nix
  2. +18 −19 pkgs/tools/X11/ksuperkey/default.nix
4 changes: 2 additions & 2 deletions pkgs/development/ocaml-modules/ocurl/default.nix
View file
Original file line number Diff line number Diff line change
@@ -5,10 +5,10 @@ then throw "ocurl is not available for OCaml ${ocaml.version}"
else

stdenv.mkDerivation rec {
name = "ocurl-0.9.0";
name = "ocurl-0.9.1";
src = fetchurl {
url = "http://ygrek.org.ua/p/release/ocurl/${name}.tar.gz";
sha256 = "0v5qzfazaynjv1xy3ds2z5iz0np5mz8g831l91l1mrqz6fr1ah0f";
sha256 = "0n621cxb9012pj280c7821qqsdhypj8qy9qgrah79dkh6a8h2py6";
};

buildInputs = [ pkgconfig ocaml findlib ncurses ];
37 changes: 18 additions & 19 deletions pkgs/tools/X11/ksuperkey/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,27 +1,26 @@
{ stdenv, fetchgit, libX11, libXtst, pkgconfig, xorgproto, libXi }:
{ stdenv, fetchFromGitHub, libX11, libXtst, pkgconfig, xorgproto, libXi }:

stdenv.mkDerivation {
name = "ksuperkey-git-2015-07-21";
stdenv.mkDerivation rec {
pname = "ksuperkey";
version = "0.4";

nativeBuildInputs = [ pkgconfig ];
buildInputs = [
libX11 libXtst xorgproto libXi
];

src = fetchgit {
url = "https://github.com/hanschen/ksuperkey";
rev = "e75a31a0e3e80b14341e92799a7ce3232ac37639";
sha256 = "0y4wkak9dvcm14g54ll1ln9aks2az63hx8fv7b8d3nscxjbkxl6g";
src = fetchFromGitHub {
owner = "hanschen";
repo = "ksuperkey";
rev = "v${version}";
sha256 = "1dvgf356fihfav8pjzww1q6vgd96c5h18dh8vpv022g9iipiwq8a";
};

preConfigure = ''
makeFlags="$makeFlags PREFIX=$out"
'';
makeFlags = [ "PREFIX=${placeholder "out"}" ];

nativeBuildInputs = [ pkgconfig ];
buildInputs = [ libX11 libXtst xorgproto libXi ];

meta = {
meta = with stdenv.lib; {
description = "A tool to be able to bind the super key as a key rather than a modifier";
license = stdenv.lib.licenses.gpl3;
maintainers = [ stdenv.lib.maintainers.vozz ];
platforms = stdenv.lib.platforms.linux;
homepage = "https://github.com/hanschen/ksuperkey";
license = licenses.gpl3;
maintainers = [ maintainers.vozz ];
platforms = platforms.linux;
};
}