ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-28 14:22:50 +03:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into HEAD

Browse Source
This commit is contained in:
Frederik Rietdijk 2017-10-07 12:57:50 +02:00
commit 2c9c04fe47
2 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
pkgs/applications/window-managers/sxhkd/default.nix
View File

@ -1,22 +1,27 @@
{ stdenv, fetchurl, asciidoc, libxcb, xcbutil, xcbutilkeysyms, xcbutilwm }:
{ stdenv, fetchFromGitHub, asciidoc, libxcb, xcbutil, xcbutilkeysyms
, xcbutilwm
}:
stdenv.mkDerivation rec {
name = "sxhkd-${version}";
version = "0.5.6";
version = "0.5.8";
src = fetchurl {
url = "https://github.com/baskerville/sxhkd/archive/${version}.tar.gz";
sha256 = "15grmzpxz5fqlbfg2slj7gb7r6nzkvjmflmbkqx7mlby9pm6wdkj";
src = fetchFromGitHub {
owner = "baskerville";
repo = "sxhkd";
rev = version;
sha256 = "0vnm0d2ckijsp8kc2v8jz4raamb487vg62v58v01a3rb9gzzgl06";
};
buildInputs = [ asciidoc libxcb xcbutil xcbutilkeysyms xcbutilwm ];
makeFlags = ''PREFIX=$(out)'';
makeFlags = [ "PREFIX=$(out)" ];
meta = {
meta = with stdenv.lib; {
description = "Simple X hotkey daemon";
homepage = https://github.com/baskerville/sxhkd/;
license = stdenv.lib.licenses.bsd2;
platforms = stdenv.lib.platforms.linux;
homepage = "https://github.com/baskerville/sxhkd";
license = licenses.bsd2;
maintainers = with maintainers; [ vyp ];
platforms = platforms.linux;
};
}

2
pkgs/development/python-modules/bootstrapped-pip/default.nix
View File

@ -18,7 +18,7 @@ let
# https://github.com/NixOS/nixpkgs/issues/26392
# https://github.com/pypa/setuptools/issues/885
pkg_resources = fetchurl {
url = "https://raw.githubusercontent.com/pypa/setuptools/v36.4.0/pkg_resources/__init__.py";
url = "https://raw.githubusercontent.com/pypa/setuptools/v36.0.1/pkg_resources/__init__.py";
sha256 = "1wdnq3mammk75mifkdmmjx7yhnpydvnvi804na8ym4mj934l2jkv";
};