Merge master into staging-next
This commit is contained in:
commit
7b5879cbd5
pkgs
applications/window-managers/waybox
development/python-modules/GitPython
os-specific/linux/zfs
servers/tailscale
top-level
45
pkgs/applications/window-managers/waybox/default.nix
Normal file
45
pkgs/applications/window-managers/waybox/default.nix
Normal file
@ -0,0 +1,45 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, pkg-config
|
||||
, meson
|
||||
, ninja
|
||||
, libxkbcommon
|
||||
, wayland
|
||||
, wayland-protocols
|
||||
, wlroots
|
||||
, pixman
|
||||
, udev
|
||||
, libGL
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "waybox";
|
||||
version = "unstable-2020-05-01";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wizbright";
|
||||
repo = pname;
|
||||
rev = "93811898f0eea3035145f593938d49d5af759b46";
|
||||
sha256 = "IOdKOqAQD87Rs3td8NVEgMnRF6kQSuQ64UVqeVqMBSM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config meson ninja ];
|
||||
buildInputs = [
|
||||
libxkbcommon
|
||||
wayland
|
||||
wayland-protocols
|
||||
wlroots
|
||||
pixman
|
||||
udev
|
||||
libGL
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/wizbright/waybox";
|
||||
description = "An openbox clone on Wayland";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ AndersonTorres ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
@ -1,13 +1,21 @@
|
||||
{ lib, buildPythonPackage, fetchPypi, isPy27, substituteAll, git, gitdb, mock, nose, ddt }:
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, isPy27
|
||||
, substituteAll
|
||||
, git
|
||||
, gitdb
|
||||
, ddt
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "3.1.11";
|
||||
pname = "GitPython";
|
||||
version = "3.1.12";
|
||||
disabled = isPy27; # no longer supported
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "befa4d101f91bad1b632df4308ec64555db684c360bd7d2130b4807d49ce86b8";
|
||||
sha256 = "sha256-Qtvv2NniV2xJbtAFnzED3O9xJbnOFvnV+cg0rtRKHaw=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@ -17,16 +25,16 @@ buildPythonPackage rec {
|
||||
})
|
||||
];
|
||||
|
||||
checkInputs = [ nose ] ++ lib.optional isPy27 mock;
|
||||
propagatedBuildInputs = [ gitdb ddt ];
|
||||
|
||||
# Tests require a git repo
|
||||
doCheck = false;
|
||||
pythonImportsCheck = [ "git" ];
|
||||
|
||||
meta = {
|
||||
meta = with lib; {
|
||||
description = "Python Git Library";
|
||||
maintainers = [ ];
|
||||
homepage = "https://github.com/gitpython-developers/GitPython";
|
||||
license = lib.licenses.bsd3;
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
|
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchFromGitHub
|
||||
{ lib, stdenv, fetchFromGitHub, fetchpatch
|
||||
, autoreconfHook269, util-linux, nukeReferences, coreutils
|
||||
, perl, buildPackages
|
||||
, configFile ? "all"
|
||||
@ -21,6 +21,12 @@ let
|
||||
buildKernel = any (n: n == configFile) [ "kernel" "all" ];
|
||||
buildUser = any (n: n == configFile) [ "user" "all" ];
|
||||
|
||||
# remove this patch at the next ZFS release (> 2.0.1)
|
||||
reapplyPathSanitizerPatch = fetchpatch {
|
||||
url = "https://github.com/openzfs/zfs/commit/03f036cbccdd8699f5fe8540ef317595a35bceb8.patch";
|
||||
sha256 = "c157bbb6551a4e720c3faba005e1b72e4692d304c6ff5e0e685691bd47197dca";
|
||||
};
|
||||
|
||||
common = { version
|
||||
, sha256
|
||||
, extraPatches ? []
|
||||
@ -186,9 +192,11 @@ in {
|
||||
# incompatibleKernelVersion = "4.20";
|
||||
|
||||
# this package should point to the latest release.
|
||||
version = "2.0.2";
|
||||
version = "2.0.1";
|
||||
|
||||
sha256 = "sha256-KzrRQwfQRvIQkHG5mj6cGBdcv2VEhC5y7bi09DaKqhY=";
|
||||
sha256 = "0wmw823ildwm9rcfyk22pvzg100yhps3y9hfjlrpspfd1hhkbp0d";
|
||||
|
||||
extraPatches = [ reapplyPathSanitizerPatch ];
|
||||
};
|
||||
|
||||
zfsUnstable = common {
|
||||
@ -196,8 +204,10 @@ in {
|
||||
# incompatibleKernelVersion = "4.19";
|
||||
|
||||
# this package should point to a version / git revision compatible with the latest kernel release
|
||||
version = "2.0.2";
|
||||
version = "2.0.1";
|
||||
|
||||
sha256 = "sha256-KzrRQwfQRvIQkHG5mj6cGBdcv2VEhC5y7bi09DaKqhY=";
|
||||
sha256 = "0wmw823ildwm9rcfyk22pvzg100yhps3y9hfjlrpspfd1hhkbp0d";
|
||||
|
||||
extraPatches = [ reapplyPathSanitizerPatch ];
|
||||
};
|
||||
}
|
||||
|
@ -2,14 +2,14 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "tailscale";
|
||||
version = "1.4.1";
|
||||
tagHash = "6e7df630dec919ce41099ea12ab5f5d05354d303"; # from `git rev-parse v1.4.1`
|
||||
version = "1.4.2";
|
||||
tagHash = "f40ccb086c4c3f09b3cc67b7c559bd2c5d3cf953"; # from `git rev-parse v1.4.2`
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tailscale";
|
||||
repo = "tailscale";
|
||||
rev = "v${version}";
|
||||
sha256 = "1sfvsp9zf45rwfgia1jdymkanyys7x6wlnkq64w98jml8zsnn8yj";
|
||||
sha256 = "0jc7z6ml59a1xs3c3mskj9s34gw7hmixn8dbz3bi81qv0yi9pvnx";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
@ -22771,6 +22771,8 @@ in
|
||||
|
||||
i3-wk-switch = callPackage ../applications/window-managers/i3/wk-switch.nix { };
|
||||
|
||||
waybox = callPackage ../applications/window-managers/waybox { };
|
||||
|
||||
windowchef = callPackage ../applications/window-managers/windowchef/default.nix { };
|
||||
|
||||
wmfocus = callPackage ../applications/window-managers/i3/wmfocus.nix { };
|
||||
|
Loading…
Reference in New Issue
Block a user