From bc6cfc2fc055852606c82272a7ae340399c2086c Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 9 Feb 2021 04:20:00 +0000 Subject: [PATCH 1/8] nodejs-10_x: 10.23.2 -> 10.23.3 https://github.com/nodejs/node/releases/tag/v10.23.3 --- pkgs/development/web/nodejs/v10.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/v10.nix b/pkgs/development/web/nodejs/v10.nix index cef9cd92877..495ac311b88 100644 --- a/pkgs/development/web/nodejs/v10.nix +++ b/pkgs/development/web/nodejs/v10.nix @@ -8,7 +8,7 @@ let in buildNodejs { inherit enableNpm; - version = "10.23.2"; - sha256 = "1iyvs56x5zvvqmpr6kkamgpfj70n2rj1fh7afc7q8hj3bq7f1985"; + version = "10.23.3"; + sha256 = "13za06bz17k71gcxyrx41l2j8al1kr3j627b8m7kqrf3l7rdfnsi"; patches = lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff; } From e25c04cf56bfab015da7dff62cfd30a3678358bc Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 9 Feb 2021 04:20:00 +0000 Subject: [PATCH 2/8] nodejs-14_x: 14.15.4 -> 14.15.5 https://github.com/nodejs/node/releases/tag/v14.15.5 --- pkgs/development/web/nodejs/v14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/v14.nix b/pkgs/development/web/nodejs/v14.nix index 410be6a2495..ee8ea72c05e 100644 --- a/pkgs/development/web/nodejs/v14.nix +++ b/pkgs/development/web/nodejs/v14.nix @@ -8,7 +8,7 @@ let in buildNodejs { inherit enableNpm; - version = "14.15.4"; - sha256 = "177cxp4fhmglyx035j8smiy1bp5fz6q2phlcl0a2mdbldkvfrdxd"; + version = "14.15.5"; + sha256 = "0nv576mlmnf8pfs6yn7vsvwyg0a0xvs7m9pm4k131zjqx501v6z1"; patches = lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff; } From 5a827051aadc3e50c4da9814ba5286a81d278681 Mon Sep 17 00:00:00 2001 From: Felix Dietze Date: Sat, 30 Jan 2021 12:13:39 -0100 Subject: [PATCH 3/8] herbstluftwm: Add option to specify package --- .../services/x11/window-managers/herbstluftwm.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/x11/window-managers/herbstluftwm.nix b/nixos/modules/services/x11/window-managers/herbstluftwm.nix index e3ea61cb9a6..548097a412d 100644 --- a/nixos/modules/services/x11/window-managers/herbstluftwm.nix +++ b/nixos/modules/services/x11/window-managers/herbstluftwm.nix @@ -11,6 +11,15 @@ in services.xserver.windowManager.herbstluftwm = { enable = mkEnableOption "herbstluftwm"; + package = mkOption { + type = types.package; + default = pkgs.herbstluftwm; + defaultText = "pkgs.herbstluftwm"; + description = '' + Herbstluftwm package to use. + ''; + }; + configFile = mkOption { default = null; type = with types; nullOr path; @@ -31,8 +40,8 @@ in (cfg.configFile != null) ''-c "${cfg.configFile}"'' ; - in "${pkgs.herbstluftwm}/bin/herbstluftwm ${configFileClause}"; + in "${cfg.package}/bin/herbstluftwm ${configFileClause}"; }; - environment.systemPackages = [ pkgs.herbstluftwm ]; + environment.systemPackages = [ cfg.package ]; }; } From 60ce5e1e23a4a9dc004b932a2fb1b4529841967e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 9 Feb 2021 18:47:24 +0000 Subject: [PATCH 4/8] wire: 0.4.0 -> 0.5.0 --- pkgs/development/tools/wire/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/wire/default.nix b/pkgs/development/tools/wire/default.nix index ff6d1e7ac5d..a51252f5669 100644 --- a/pkgs/development/tools/wire/default.nix +++ b/pkgs/development/tools/wire/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "wire"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "google"; repo = "wire"; rev = "v${version}"; - sha256 = "0fYXo/LnxKV/qoaP59XCyEtLLAysZm/WhRdm3RnLdvw="; + sha256 = "sha256-9xjymiyPFMKbysgZULmcBEMI26naUrLMgTA+d7Q+DA0="; }; - vendorSha256 = "ZFUX4LgPte6oAf94D82Man/P9VMpx+CDNCTMBwiy9Fc="; + vendorSha256 = "sha256-ZFUX4LgPte6oAf94D82Man/P9VMpx+CDNCTMBwiy9Fc="; subPackages = [ "cmd/wire" ]; From 2ed94d81cd011faaf147d2e7b8b23a2829634d76 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 10 Feb 2021 00:59:14 +0000 Subject: [PATCH 5/8] compsize: 1.4 -> 1.5 --- pkgs/os-specific/linux/compsize/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/compsize/default.nix b/pkgs/os-specific/linux/compsize/default.nix index b1c6f5a8f95..43f2c593272 100644 --- a/pkgs/os-specific/linux/compsize/default.nix +++ b/pkgs/os-specific/linux/compsize/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "compsize"; - version = "1.4"; + version = "1.5"; src = fetchFromGitHub { owner = "kilobyte"; repo = pname; rev = "v${version}"; - sha256 = "0gk2vibfl9fh7biznlbr3dwknrwbm5q5602q95jbjvk185g9z126"; + sha256 = "sha256-OX41ChtHX36lVRL7O2gH21Dfw6GPPEClD+yafR/PFm8="; }; buildInputs = [ btrfs-progs ]; From bc48e9499f3d1b8737b4b6c527e159614d731308 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Tue, 9 Feb 2021 22:47:13 -0300 Subject: [PATCH 6/8] dwl: init at 0.1 --- .../window-managers/dwl/default.nix | 79 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 81 insertions(+) create mode 100644 pkgs/applications/window-managers/dwl/default.nix diff --git a/pkgs/applications/window-managers/dwl/default.nix b/pkgs/applications/window-managers/dwl/default.nix new file mode 100644 index 00000000000..9a56f865c34 --- /dev/null +++ b/pkgs/applications/window-managers/dwl/default.nix @@ -0,0 +1,79 @@ +{ stdenv +, lib +, fetchFromGitHub +, pkg-config +, libxcb +, libxkbcommon +, wayland +, wayland-protocols +, wlroots +, enable-xwayland ? true, xwayland, libX11 +, patches ? [ ] +, conf ? null +, writeText +}: + +stdenv.mkDerivation rec { + pname = "dwl"; + version = "0.1"; + + src = fetchFromGitHub { + owner = "djpohly"; + repo = pname; + rev = "v${version}"; + sha256 = "QoKaeF5DbSX0xciwc/0VKpubn/001cJjoZ+UzVDX4qE="; + }; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ + libxcb + libxkbcommon + wayland + wayland-protocols + wlroots + ] ++ lib.optionals enable-xwayland [ xwayland libX11 ]; + + # Allow users to set their own list of patches + inherit patches; + + prePatch = lib.optionalString enable-xwayland '' + sed -i -e '$ s|^#||' config.mk + ''; + + # Allow users to set an alternative config.def.h + postPatch = let + configFile = if lib.isDerivation conf || builtins.isPath conf + then conf + else writeText "config.def.h" conf; + in lib.optionalString (conf != null) "cp ${configFile} config.def.h"; + + dontConfigure = true; + + installPhase = '' + runHook preInstall + install -d $out/bin + install -m755 dwl $out/bin + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://github.com/djpohly/dwl/"; + description = "Dynamic window manager for Wayland"; + longDescription = '' + dwl is a compact, hackable compositor for Wayland based on wlroots. It is + intended to fill the same space in the Wayland world that dwm does in X11, + primarily in terms of philosophy, and secondarily in terms of + functionality. Like dwm, dwl is: + + - Easy to understand, hack on, and extend with patches + - One C source file (or a very small number) configurable via config.h + - Limited to 2000 SLOC to promote hackability + - Tied to as few external dependencies as possible + ''; + license = licenses.gpl3Only; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = with platforms; linux; + }; +} +# TODO: custom patches from upstream website +# TODO: investigate the modifications in the upstream unstable version diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c08d3f328c1..b9dfb884c0e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21687,6 +21687,8 @@ in inherit (gnome2) libgnomeui; }; + dwl = callPackage ../applications/window-managers/dwl { }; + dwm = callPackage ../applications/window-managers/dwm { }; dwm-status = callPackage ../applications/window-managers/dwm/dwm-status.nix { }; From fc07db417a6ae1c7a1605d13e66b6d71c81bc30d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 9 Feb 2021 12:26:02 +0000 Subject: [PATCH 7/8] lucky-cli: 0.25.0 -> 0.26.0 --- pkgs/development/web/lucky-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/lucky-cli/default.nix b/pkgs/development/web/lucky-cli/default.nix index 5085346e3eb..df343f30785 100644 --- a/pkgs/development/web/lucky-cli/default.nix +++ b/pkgs/development/web/lucky-cli/default.nix @@ -2,13 +2,13 @@ crystal.buildCrystalPackage rec { pname = "lucky-cli"; - version = "0.25.0"; + version = "0.26.0"; src = fetchFromGitHub { owner = "luckyframework"; repo = "lucky_cli"; rev = "v${version}"; - sha256 = "sha256-/DKDg2lJO6PikF7+kbwRX8ClS8rflH8KdrZNx7AR36g="; + sha256 = "sha256-bZWyAZrAYG45fqmEQYXsk8YLKurpppaahOkALAQXGhY="; }; # the integration tests will try to clone a remote repos From 8d8c27fb6840187d8f261e9c7c74b51b4f3e8584 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 10 Feb 2021 03:49:56 +0100 Subject: [PATCH 8/8] compsize: update license to gpl2Plus --- pkgs/os-specific/linux/compsize/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/compsize/default.nix b/pkgs/os-specific/linux/compsize/default.nix index 43f2c593272..f835b9a9ec9 100644 --- a/pkgs/os-specific/linux/compsize/default.nix +++ b/pkgs/os-specific/linux/compsize/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "btrfs: Find compression type/ratio on a file or set of files"; homepage = "https://github.com/kilobyte/compsize"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ CrazedProgrammer ]; platforms = platforms.linux; };