From a4a65127de84442017852c4c88093f91a436ed11 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 2 Mar 2022 17:43:54 -0800 Subject: [PATCH 1/8] hcl2json: init at 0.3.4 --- pkgs/applications/misc/hcl2json/default.nix | 27 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/applications/misc/hcl2json/default.nix diff --git a/pkgs/applications/misc/hcl2json/default.nix b/pkgs/applications/misc/hcl2json/default.nix new file mode 100644 index 000000000000..236af7c446d9 --- /dev/null +++ b/pkgs/applications/misc/hcl2json/default.nix @@ -0,0 +1,27 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "hcl2json"; + version = "0.3.4"; + + src = fetchFromGitHub { + owner = "tmccombs"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-Xr94Bq3w2j+hUoGy1mSLy3WCQiwrfS/5IL6i6CwKiPs="; + }; + + vendorSha256 = "sha256-Mz97GBxx/7oFjW6u5DG6JhvPRzn+hqtfqHdYv47L898="; + + subPackages = [ "." ]; + + meta = with lib; { + description = "Convert hcl2 to json"; + homepage = "https://github.com/tmccombs/hcl2json"; + license = licenses.asl20; + maintainers = with maintainers; [ jonringer ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0bc874b8c879..e91f190aff76 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6435,6 +6435,8 @@ with pkgs; hardinfo = callPackage ../tools/system/hardinfo { }; + hcl2json = callPackage ../applications/misc/hcl2json { }; + hcxtools = callPackage ../tools/security/hcxtools { }; hcxdumptool = callPackage ../tools/security/hcxdumptool { }; From d50924f33b55f74ee13ba0d4f218c38099ad84fa Mon Sep 17 00:00:00 2001 From: Artturin Date: Thu, 3 Mar 2022 18:00:14 +0200 Subject: [PATCH 2/8] discord-canary: 0.0.133 -> 0.0.134 --- .../networking/instant-messengers/discord/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 9becd7504e02..d3416ef58801 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -4,7 +4,7 @@ let versions = if stdenv.isLinux then { stable = "0.0.17"; ptb = "0.0.29"; - canary = "0.0.133"; + canary = "0.0.134"; } else { stable = "0.0.264"; ptb = "0.0.59"; @@ -31,7 +31,7 @@ let canary = fetchurl { url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; - sha256 = "0wx8wkgkzvw9094baa3dni834l0n4p6ih024bj1851sgwwnidb0a"; + sha256 = "sha256-HyJa6lGcKMPKWffO/pnNcn8fDTJj6O4J8Y5RA23a1kM="; }; }; x86_64-darwin = { From ad267cc9cf3d5a6ae63940df31eb31382d6356e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 25 Feb 2022 20:21:38 +0000 Subject: [PATCH 3/8] python3Packages.isbnlib: 3.10.9 -> 3.10.10 --- pkgs/development/python-modules/isbnlib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/isbnlib/default.nix b/pkgs/development/python-modules/isbnlib/default.nix index e43db60fb11d..50e171feb6a2 100644 --- a/pkgs/development/python-modules/isbnlib/default.nix +++ b/pkgs/development/python-modules/isbnlib/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "isbnlib"; - version = "3.10.9"; + version = "3.10.10"; src = fetchPypi { inherit pname version; - sha256 = "sha256-P4GH6462+gJ9Jv8HdfKr1CDinOMyeUv1Uqhqa9ukcLg="; + sha256 = "c9e6c1dcaa9dff195429373cf2beb3117f30b3fca43d7db5aec5a2d1f6f59784"; }; checkInputs = [ From 801f6c4be9ec220cdb566e4c42861215f12b960f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 3 Mar 2022 21:08:51 +0100 Subject: [PATCH 4/8] gopls: 0.7.5 -> 0.8.0 --- pkgs/development/tools/gopls/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/gopls/default.nix b/pkgs/development/tools/gopls/default.nix index ae813c0f6ee9..0f57be390f2e 100644 --- a/pkgs/development/tools/gopls/default.nix +++ b/pkgs/development/tools/gopls/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "gopls"; - version = "0.7.5"; + version = "0.8.0"; src = fetchFromGitHub { owner = "golang"; repo = "tools"; rev = "gopls/v${version}"; - sha256 = "sha256-2+tbwFkT3Z2dfYCs1Fd/9IqD39VuTMGHQ43b7gBBktM="; + sha256 = "sha256-VBan3IKqf3AFrPoryT/U7lGabFHSXMhaBpnNw3LRH/I="; }; modRoot = "gopls"; - vendorSha256 = "sha256-8osb5C5G58x9KWCxqiepmN6J0jp+q6aR+As/pJeeTKM="; + vendorSha256 = "sha256-pW4G89fYFwVM2EkIqTCsl2lhN677LIMFpKPvLVV2boY="; doCheck = false; From 05aa1711fd50a5fec1eb8397b7616f1cad622e15 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 3 Mar 2022 22:29:48 +0100 Subject: [PATCH 5/8] chromiumBeta: 99.0.4844.51 -> 100.0.4896.20 --- .../browsers/chromium/upstream-info.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index efea023118f4..a5141ce49be2 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -1,6 +1,6 @@ { "stable": { - "version": "99.0.4844.51", + "version": "99.0.4844.52", "sha256": "1qxsn8zvvvsnn0k7nn606rhaial8ikrlfh175msqpp50xibjxicp", "sha256bin64": "04kqfppa88g2q54vp53avyyhqzrxljz49p4wqk76kq7fz2rm94x1", "deps": { @@ -19,15 +19,15 @@ } }, "beta": { - "version": "99.0.4844.51", - "sha256": "1qxsn8zvvvsnn0k7nn606rhaial8ikrlfh175msqpp50xibjxicp", - "sha256bin64": "1bayx03xf94ra0wid1jn10vysa6src4hmrdzdxf566rx9wcg29pk", + "version": "100.0.4896.20", + "sha256": "0g16xzimp39vk5b27bj12rh14520wihj4m4mwxf387rv0yp03cnr", + "sha256bin64": "1qkz32xvgbnd7xck0hm2mcrgdawn6xilldjgfckaaavvj4zinnk9", "deps": { "gn": { - "version": "2022-01-10", + "version": "2022-01-21", "url": "https://gn.googlesource.com/gn", - "rev": "80a40b07305373617eba2d5878d353532af77da3", - "sha256": "1103lf38h7412949j6nrk48m2vv2rrxacn42sjg33lg88nyv7skv" + "rev": "0725d7827575b239594fbc8fd5192873a1d62f44", + "sha256": "1dzdvcn2r5c9giknvasf3y5y4901kav7igivjvrpww66ywsj8fzr" } } }, From 691919bf0003817a02fa0c4bb3210a6aa633f03a Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 3 Mar 2022 22:29:48 +0100 Subject: [PATCH 6/8] chromiumDev: 100.0.4896.12 -> 100.0.4896.20 --- .../networking/browsers/chromium/upstream-info.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index efea023118f4..6b6233bc9710 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -32,9 +32,9 @@ } }, "dev": { - "version": "100.0.4896.12", - "sha256": "07jd3d5jhs659wwxnbxk6h93pz8zaynrw72b0y9l6l824lip6hl2", - "sha256bin64": "0fnxq0vjn00zai94p8jgx69bag30zzlfl2vzn0zb65pr10fpac87", + "version": "100.0.4896.20", + "sha256": "0g16xzimp39vk5b27bj12rh14520wihj4m4mwxf387rv0yp03cnr", + "sha256bin64": "1hyqsqpmhxdja6jzvmq0cwwcg4nq72w0zdpa0xh24n5g4cd9xz04", "deps": { "gn": { "version": "2022-01-21", From 38cf6fea696adec20ea36b12af0792a2b488d3a2 Mon Sep 17 00:00:00 2001 From: Matthias Treydte Date: Wed, 2 Mar 2022 11:00:10 +0100 Subject: [PATCH 7/8] qemu: fix qemu.ga including qemu in it's closure The qemu-ga binary is already moved to a separate output but still depends on qemu, adding about 600MiB to it's closure. The command "strings qemu-ga" reveals that something like /nix/store/bqgpvv5qrpb741swczqk3lrdm5gzaqx2-qemu-host-cpu-only-6.2.0/bin is contained, causing this false positive. So use remove-references-to to reduce the closure to about 600KiB. --- pkgs/applications/virtualization/qemu/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index ee923f4e0cd0..2c220c7d3637 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, fetchpatch, python3, python3Packages, zlib, pkg-config, glib, buildPackages , perl, pixman, vde2, alsa-lib, texinfo, flex , bison, lzo, snappy, libaio, libtasn1, gnutls, nettle, curl, ninja, meson, sigtool -, makeWrapper, runtimeShell +, makeWrapper, runtimeShell, removeReferencesTo , attr, libcap, libcap_ng, socat , CoreServices, Cocoa, Hypervisor, rez, setfile , numaSupport ? stdenv.isLinux && !stdenv.isAarch32, numactl @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = [ makeWrapper pkg-config flex bison meson ninja perl python3 python3Packages.sphinx python3Packages.sphinx_rtd_theme ] + nativeBuildInputs = [ makeWrapper removeReferencesTo pkg-config flex bison meson ninja perl python3 python3Packages.sphinx python3Packages.sphinx_rtd_theme ] ++ lib.optionals gtkSupport [ wrapGAppsHook ] ++ lib.optionals stdenv.isDarwin [ sigtool ]; @@ -175,6 +175,7 @@ stdenv.mkDerivation rec { # copy qemu-ga (guest agent) to separate output mkdir -p $ga/bin cp $out/bin/qemu-ga $ga/bin/ + remove-references-to -t $out $ga/bin/qemu-ga '' + lib.optionalString gtkSupport '' # wrap GTK Binaries for f in $out/bin/qemu-system-*; do From 6eed87d4490ce045dda1091999d1e38605afb8ea Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Thu, 3 Mar 2022 16:06:39 -0500 Subject: [PATCH 8/8] go_1_16: 1.16.14 -> 1.16.15 --- pkgs/development/compilers/go/1.16.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/go/1.16.nix b/pkgs/development/compilers/go/1.16.nix index 46591d2369dc..c30abc44fe20 100644 --- a/pkgs/development/compilers/go/1.16.nix +++ b/pkgs/development/compilers/go/1.16.nix @@ -54,11 +54,11 @@ in stdenv.mkDerivation rec { pname = "go"; - version = "1.16.14"; + version = "1.16.15"; src = fetchurl { url = "https://dl.google.com/go/go${version}.src.tar.gz"; - sha256 = "sha256-RniYzTohbeVNy5AU9UHv536beacVTbwf0t13iwxj+1Y="; + sha256 = "sha256-kKCMaJJ54184ZbpRCZjDOmMlXDYImz7CBskS/AVow9M="; }; # perl is used for testing go vet