From 902aebf62c265b0dfb9b33f53b407f873706990d Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Mon, 25 Jul 2022 13:49:15 +0000 Subject: [PATCH 1/6] golangci-lint: 1.46.2 -> 1.47.2 --- pkgs/development/tools/golangci-lint/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/golangci-lint/default.nix b/pkgs/development/tools/golangci-lint/default.nix index 33fa43f03ddf..c57675efa9fd 100644 --- a/pkgs/development/tools/golangci-lint/default.nix +++ b/pkgs/development/tools/golangci-lint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "golangci-lint"; - version = "1.46.2"; + version = "1.47.2"; src = fetchFromGitHub { owner = "golangci"; repo = "golangci-lint"; rev = "v${version}"; - sha256 = "sha256-7sDAwWz+qoB/ngeH35tsJ5FZUfAQvQsU6kU9rUHIHMk="; + sha256 = "sha256-ttxRVmv1Z/NOjzVN7izBJm5xQWdSAm/jTzw0klFzyck="; }; - vendorSha256 = "sha256-w38OKN6HPoz37utG/2QSPMai55IRDXCIIymeMe6ogIU="; + vendorSha256 = "sha256-zIsvXtyC3wjfoKcOJ1MG/KSGApuVlvuHDYDmbmGEgTc="; doCheck = false; @@ -20,7 +20,11 @@ buildGoModule rec { nativeBuildInputs = [ installShellFiles ]; ldflags = [ - "-s" "-w" "-X main.version=${version}" "-X main.commit=v${version}" "-X main.date=19700101-00:00:00" + "-s" + "-w" + "-X main.version=${version}" + "-X main.commit=v${version}" + "-X main.date=19700101-00:00:00" ]; postInstall = '' From 5daf9994369508992edce9efdcb06847b725c422 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 26 Jul 2022 04:20:00 +0000 Subject: [PATCH 2/6] nodejs-18_x: 18.6.0 -> 18.7.0 https://github.com/nodejs/node/releases/tag/v18.7.0 --- pkgs/development/web/nodejs/v18.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/v18.nix b/pkgs/development/web/nodejs/v18.nix index 6d0cc289172c..ca85a18951a5 100644 --- a/pkgs/development/web/nodejs/v18.nix +++ b/pkgs/development/web/nodejs/v18.nix @@ -7,8 +7,8 @@ let in buildNodejs { inherit enableNpm; - version = "18.6.0"; - sha256 = "0k05phvlpwf467sbaxcvdzr4ncclm9fpldml8fbfrjigl4rhr2sz"; + version = "18.7.0"; + sha256 = "sha256-iDSjPJLf5rqJA+ZxXK6qJd/0ZX5wPFTNBuwRNJPiw8I="; patches = [ ./disable-darwin-v8-system-instrumentation.patch ]; From 7add8300394432f28d27f1b855b238d69024de6f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 26 Jul 2022 06:11:56 +0000 Subject: [PATCH 3/6] linode-cli: 5.21.0 -> 5.21.0 --- pkgs/tools/virtualization/linode-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/virtualization/linode-cli/default.nix b/pkgs/tools/virtualization/linode-cli/default.nix index d7a58779399b..506249454331 100644 --- a/pkgs/tools/virtualization/linode-cli/default.nix +++ b/pkgs/tools/virtualization/linode-cli/default.nix @@ -13,8 +13,8 @@ let sha256 = "1yglnmwspdncqmy5x0zc0g43bfm4597zfmwfvs7qkalv1pprf0s3"; # specVersion taken from: https://www.linode.com/docs/api/openapi.yaml at `info.version`. - specVersion = "4.130.0"; - specSha256 = "0qwydx6bsbi37135zmwm8vx1yzwa5gyi8bz1zsvkd64wjv79yra1"; + specVersion = "4.132.0"; + specSha256 = "0r0l23bvaj406xam7hglfx637cxja3g2vqdqx3x0ag7jfhg0s3k5"; spec = fetchurl { url = "https://raw.githubusercontent.com/linode/linode-api-docs/v${specVersion}/openapi.yaml"; sha256 = specSha256; From d3f89f5891d62c8afbdb9ada44104ce3caee7f77 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 26 Jul 2022 19:37:54 +0200 Subject: [PATCH 4/6] freeradius: 3.0.25 -> 3.2.0 https://freeradius.org/release_notes/?s=3.2.0 --- pkgs/servers/freeradius/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/freeradius/default.nix b/pkgs/servers/freeradius/default.nix index 2ac3f3ec98c1..9729c57769b3 100644 --- a/pkgs/servers/freeradius/default.nix +++ b/pkgs/servers/freeradius/default.nix @@ -24,11 +24,11 @@ assert withRest -> withJson; stdenv.mkDerivation rec { pname = "freeradius"; - version = "3.0.25"; + version = "3.2.0"; src = fetchurl { url = "ftp://ftp.freeradius.org/pub/freeradius/freeradius-server-${version}.tar.gz"; - hash = "sha256-SIOmi7PO5GAlNZqXwWkc5lXour/W3DwCHQDhCaL/TBA="; + hash = "sha256-QtGgoC7CrxRyjcdoySHUeAC8gwP0FyIetvMvBCNbBDE="; }; nativeBuildInputs = [ autoreconfHook ]; From 4e3f3235a7d4caf34d8cf6118d76202d70da72e4 Mon Sep 17 00:00:00 2001 From: Alexis Hildebrandt Date: Tue, 26 Jul 2022 21:36:00 +0200 Subject: [PATCH 5/6] got: enable building on darwin platforms --- pkgs/applications/version-management/got/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/got/default.nix b/pkgs/applications/version-management/got/default.nix index cc00794ba7ad..009b5833e596 100644 --- a/pkgs/applications/version-management/got/default.nix +++ b/pkgs/applications/version-management/got/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, openssl, libbsd, libuuid, libmd, zlib, ncurses }: +{ lib, stdenv, fetchurl, pkg-config, openssl, libbsd, libuuid, libossp_uuid, libmd, zlib, ncurses }: stdenv.mkDerivation rec { pname = "got"; @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl libbsd libuuid libmd zlib ncurses ]; + buildInputs = [ openssl libbsd libuuid libmd zlib ncurses ] + ++ lib.optionals stdenv.isDarwin [ libossp_uuid ]; doInstallCheck = true; @@ -34,7 +35,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://gameoftrees.org"; license = licenses.isc; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ abbe ]; }; } From 9da9722e432e40d877e07cdee44e896ae426f874 Mon Sep 17 00:00:00 2001 From: Luc Perkins Date: Tue, 26 Jul 2022 18:15:11 +0200 Subject: [PATCH 6/6] Add cargo-profiler package --- .../tools/rust/cargo-profiler/default.nix | 33 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 34 insertions(+) create mode 100644 pkgs/development/tools/rust/cargo-profiler/default.nix diff --git a/pkgs/development/tools/rust/cargo-profiler/default.nix b/pkgs/development/tools/rust/cargo-profiler/default.nix new file mode 100644 index 000000000000..88a04885a740 --- /dev/null +++ b/pkgs/development/tools/rust/cargo-profiler/default.nix @@ -0,0 +1,33 @@ +{ fetchFromGitHub +, lib +, rustPlatform }: + +let + # Constants + pname = "cargo-profiler"; + owner = "svenstaro"; + + # Version-specific variables + version = "0.2.0"; + rev = "0a8ab772fd5c0f1579e4847c5d05aa443ffa2bc8"; + sha256 = "sha256-ZRAbvSMrPtgaWy9RwlykQ3iiPxHCMh/tS5p67/4XqqA="; + cargoSha256 = "sha256-qt3S6ZcLEP9ZQoP5+kSQdmBlxdMgGUqLszdU7JkFNVI="; + + inherit (rustPlatform) buildRustPackage; +in buildRustPackage rec { + inherit pname version; + + src = fetchFromGitHub { + inherit owner rev sha256; + repo = pname; + }; + + inherit cargoSha256; + + meta = with lib; { + description = "Cargo subcommand for profiling Rust binaries"; + homepage = "https://github.com/svenstaro/cargo-profiler"; + license = licenses.mit; + maintainers = with maintainers; [ lucperkins ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f1865c8ea9e8..aaf2fe0d66c9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14231,6 +14231,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; cargo-play = callPackage ../development/tools/rust/cargo-play { }; + cargo-profiler = callPackage ../development/tools/rust/cargo-profiler {}; cargo-raze = callPackage ../development/tools/rust/cargo-raze { inherit (darwin.apple_sdk.frameworks) Security; };