From c87f48b70aa1b4049dfd9d385641869dd8693718 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 31 Jan 2021 18:04:05 +0100 Subject: [PATCH 1/5] python3Packages.GitPython: 3.1.11 -> 3.1.12 --- pkgs/development/python-modules/GitPython/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/GitPython/default.nix b/pkgs/development/python-modules/GitPython/default.nix index 2edb8c51e3a0..18f16d839397 100644 --- a/pkgs/development/python-modules/GitPython/default.nix +++ b/pkgs/development/python-modules/GitPython/default.nix @@ -1,13 +1,13 @@ { lib, buildPythonPackage, fetchPypi, isPy27, substituteAll, git, gitdb, mock, nose, ddt }: buildPythonPackage rec { - version = "3.1.11"; + version = "3.1.12"; pname = "GitPython"; disabled = isPy27; # no longer supported src = fetchPypi { inherit pname version; - sha256 = "befa4d101f91bad1b632df4308ec64555db684c360bd7d2130b4807d49ce86b8"; + sha256 = "sha256-Qtvv2NniV2xJbtAFnzED3O9xJbnOFvnV+cg0rtRKHaw="; }; patches = [ From ee0f592bb09af5f3d0e8e1e1f190c7a1782196c4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 31 Jan 2021 18:35:40 +0100 Subject: [PATCH 2/5] python3Packages.GitPython: add pythonImportsCheck --- .../python-modules/GitPython/default.nix | 20 +++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/GitPython/default.nix b/pkgs/development/python-modules/GitPython/default.nix index 18f16d839397..dad4a3de383d 100644 --- a/pkgs/development/python-modules/GitPython/default.nix +++ b/pkgs/development/python-modules/GitPython/default.nix @@ -1,8 +1,16 @@ -{ lib, buildPythonPackage, fetchPypi, isPy27, substituteAll, git, gitdb, mock, nose, ddt }: +{ lib +, buildPythonPackage +, fetchPypi +, isPy27 +, substituteAll +, git +, gitdb +, ddt +}: buildPythonPackage rec { - version = "3.1.12"; pname = "GitPython"; + version = "3.1.12"; disabled = isPy27; # no longer supported src = fetchPypi { @@ -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 ]; }; } From f5e4a32d4b2df4cabffce54caf2d5c7aeba34190 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Mon, 1 Feb 2021 18:58:44 -0300 Subject: [PATCH 3/5] waybox: init at unstable-2020-05-01 --- .../window-managers/waybox/default.nix | 45 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 47 insertions(+) create mode 100644 pkgs/applications/window-managers/waybox/default.nix diff --git a/pkgs/applications/window-managers/waybox/default.nix b/pkgs/applications/window-managers/waybox/default.nix new file mode 100644 index 000000000000..666b2406d5f4 --- /dev/null +++ b/pkgs/applications/window-managers/waybox/default.nix @@ -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; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b92a34f5f7b1..33e942fab61b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22767,6 +22767,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 { }; From b67341749300331f587ef72f8aacb1dba4380ef6 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 1 Feb 2021 20:23:03 -0500 Subject: [PATCH 4/5] Revert "zfs: 2.0.1 -> 2.0.2" This reverts commit e347e96601032ac64baf0bc7b482697ea9b5a119. --- pkgs/os-specific/linux/zfs/default.nix | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index d8729fbe1657..d61c0931e20b 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -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 ]; }; } From 13efa4feac9b42056d7e348f711741028f597d2c Mon Sep 17 00:00:00 2001 From: Bruno Bigras Date: Mon, 1 Feb 2021 20:23:03 -0500 Subject: [PATCH 5/5] tailscale: 1.4.1 -> 1.4.2 --- pkgs/servers/tailscale/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/tailscale/default.nix b/pkgs/servers/tailscale/default.nix index 201c08d813f7..66cb54f0feef 100644 --- a/pkgs/servers/tailscale/default.nix +++ b/pkgs/servers/tailscale/default.nix @@ -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 ];