From eb9751c6d65cbe10e697499d943bd3bec692d4da Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 12 Dec 2020 04:20:00 +0000 Subject: [PATCH 1/6] emacsWithPackages: fix application wrapper on darwin --- pkgs/build-support/emacs/wrapper.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/build-support/emacs/wrapper.nix b/pkgs/build-support/emacs/wrapper.nix index a3ab30afc63..0afd0f831fe 100644 --- a/pkgs/build-support/emacs/wrapper.nix +++ b/pkgs/build-support/emacs/wrapper.nix @@ -175,9 +175,9 @@ runCommand substitute ${./wrapper.sh} $out/Applications/Emacs.app/Contents/MacOS/Emacs \ --subst-var-by bash ${emacs.stdenv.shell} \ - --subst-var-by wrapperSiteLisp "$emacs/Applications/Emacs.app/Contents/MacOS/Emacs" \ - --subst-var prog - chmod +x $out/bin/$progname + --subst-var-by wrapperSiteLisp "$deps/share/emacs/site-lisp" \ + --subst-var-by prog "$emacs/Applications/Emacs.app/Contents/MacOS/Emacs" + chmod +x $out/Applications/Emacs.app/Contents/MacOS/Emacs fi mkdir -p $out/share From 76977c494774085c81cfc206b63d2b045cfaa016 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 14 Dec 2020 07:44:51 +0000 Subject: [PATCH 2/6] python37Packages.azure-mgmt-datafactory: 0.14.0 -> 0.15.0 --- .../python-modules/azure-mgmt-datafactory/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix b/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix index 92597b3b910..a186017a4d3 100644 --- a/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-datafactory"; - version = "0.14.0"; + version = "0.15.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "47bb23fa6cc28f3f15dd7a404b7f9d7af469adf78f79a11eb01ff75ca10a75ba"; + sha256 = "750a891005c86977c0978cd7231449aad12106d76897075fcdc95ef2e6258b00"; }; propagatedBuildInputs = [ From 9cd91a1f7e857ddc2d01ccb444eb35dc5d329959 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 14 Dec 2020 09:01:52 +0000 Subject: [PATCH 3/6] python37Packages.google_cloud_container: 2.2.0 -> 2.3.0 --- .../python-modules/google_cloud_container/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google_cloud_container/default.nix b/pkgs/development/python-modules/google_cloud_container/default.nix index 4d170d1c8b5..c5415b84ba1 100644 --- a/pkgs/development/python-modules/google_cloud_container/default.nix +++ b/pkgs/development/python-modules/google_cloud_container/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "google-cloud-container"; - version = "2.2.0"; + version = "2.3.0"; src = fetchPypi { inherit pname version; - sha256 = "ce641b3ffaef407d5fe9b798955c6c6f2d1bfb58d6e11b4f87eb6fbb745a2711"; + sha256 = "0dcd8084dd55c0439ff065d3fb206e2e5c695d3a25effd774b74f8ce43afc911"; }; disabled = pythonOlder "3.6"; From e01e056423dc75a96029bb66075fcb0a5fc42391 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 14 Dec 2020 18:59:28 +0000 Subject: [PATCH 4/6] python37Packages.pytest-html: 3.1.0 -> 3.1.1 --- pkgs/development/python-modules/pytest-html/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-html/default.nix b/pkgs/development/python-modules/pytest-html/default.nix index 23f50347c42..e6e17adc92e 100644 --- a/pkgs/development/python-modules/pytest-html/default.nix +++ b/pkgs/development/python-modules/pytest-html/default.nix @@ -3,12 +3,12 @@ buildPythonPackage rec { pname = "pytest-html"; - version = "3.1.0"; + version = "3.1.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "8a7979e2411aac445870d8cad9a251ab3823bc14f77d065e9ce9a5dff86f697d"; + sha256 = "3ee1cf319c913d19fe53aeb0bc400e7b0bc2dbeb477553733db1dad12eb75ee3"; }; nativeBuildInputs = [ setuptools_scm ]; From 3d3c07026e365658b59d6215ebcb1b5e61757d0a Mon Sep 17 00:00:00 2001 From: Justin Humm Date: Sat, 12 Dec 2020 19:56:39 +0100 Subject: [PATCH 5/6] scribusUnstable: build with libsForQt5 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8d833be6196..8d861c49469 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23860,7 +23860,7 @@ in inherit (gnome2) libart_lgpl; }; - scribusUnstable = libsForQt514.callPackage ../applications/office/scribus/unstable.nix { }; + scribusUnstable = libsForQt5.callPackage ../applications/office/scribus/unstable.nix { }; seafile-client = libsForQt514.callPackage ../applications/networking/seafile-client { }; From 6612d859a2c39ae0afb8e07b0a951534adc6dbcd Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Mon, 14 Dec 2020 18:34:43 -0800 Subject: [PATCH 6/6] tailscale: 1.2.8 -> 1.2.10 --- 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 a32f8115e27..18803636a0d 100644 --- a/pkgs/servers/tailscale/default.nix +++ b/pkgs/servers/tailscale/default.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "tailscale"; - version = "1.2.8"; - tagHash = "37adb62a35d818f4af638924d3fc1526bdeaf215"; # from `git rev-parse v1.2.7` + version = "1.2.10"; + tagHash = "4b3581abed6c2db79b61eb1b53e29645df12a833"; # from `git rev-parse v1.2.10` src = fetchFromGitHub { owner = "tailscale"; repo = "tailscale"; rev = "v${version}"; - sha256 = "0305n5gwp2w36z3yh0w8x3ma8a074zr913cx3y73szln56jz88hg"; + sha256 = "09m4xhnjpnkic9jy5dwnmpl40r92xa8fcx4xhpadv6hjpx9k4xx5"; }; nativeBuildInputs = [ makeWrapper ];