From cc5eb1d4d2701e5aaaf2ce52bc84a7bb5f82d8b3 Mon Sep 17 00:00:00 2001 From: Matt Moriarity Date: Tue, 10 Oct 2023 23:17:37 -0600 Subject: [PATCH 1/5] beeper: fix wrapper --- .../networking/instant-messengers/beeper/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/beeper/default.nix b/pkgs/applications/networking/instant-messengers/beeper/default.nix index 29e005bdf966..7de11d943101 100644 --- a/pkgs/applications/networking/instant-messengers/beeper/default.nix +++ b/pkgs/applications/networking/instant-messengers/beeper/default.nix @@ -1,6 +1,6 @@ { lib +, stdenvNoCC , fetchurl -, mkDerivation , appimageTools , libsecret , makeWrapper @@ -25,7 +25,7 @@ let inherit version pname src; }; in -mkDerivation rec { +stdenvNoCC.mkDerivation rec { inherit name pname version; src = appimage; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4f952c911392..53e6e0578d9d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -340,7 +340,7 @@ with pkgs; beebeep = libsForQt5.callPackage ../applications/office/beebeep { }; - beeper = qt5.callPackage ../applications/networking/instant-messengers/beeper { }; + beeper = callPackage ../applications/networking/instant-messengers/beeper { }; bakelite = callPackage ../tools/backup/bakelite { }; From f5f4e32078dac4a792bce0b7e21ee2341c3ac877 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 17 Oct 2023 14:26:14 +0000 Subject: [PATCH 2/5] nix-eval-jobs: 2.17.0 -> 2.17.1 --- pkgs/tools/package-management/nix-eval-jobs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/nix-eval-jobs/default.nix b/pkgs/tools/package-management/nix-eval-jobs/default.nix index 3677b4f1e882..9903f46fc483 100644 --- a/pkgs/tools/package-management/nix-eval-jobs/default.nix +++ b/pkgs/tools/package-management/nix-eval-jobs/default.nix @@ -11,12 +11,12 @@ }: stdenv.mkDerivation rec { pname = "nix-eval-jobs"; - version = "2.17.0"; + version = "2.17.1"; src = fetchFromGitHub { owner = "nix-community"; repo = pname; rev = "v${version}"; - hash = "sha256-5rhsYKYKKOxv9aL2dPcFehdHcO58+ptG4CWaSYR6lfo="; + hash = "sha256-UIwdw9Lw36GFgm7TFjOBdPHFKhbTSfLLT+4XxB39rh8="; }; buildInputs = [ boost From d4334f64b2f0919e797eb5df64a38ec9a77cbc26 Mon Sep 17 00:00:00 2001 From: Jonathan Davies Date: Tue, 17 Oct 2023 16:52:03 +0100 Subject: [PATCH 3/5] prometheus: 2.47.1 -> 2.47.2 --- pkgs/servers/monitoring/prometheus/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/default.nix b/pkgs/servers/monitoring/prometheus/default.nix index 77bb07b35816..d50fac3c7112 100644 --- a/pkgs/servers/monitoring/prometheus/default.nix +++ b/pkgs/servers/monitoring/prometheus/default.nix @@ -31,10 +31,10 @@ }: let - version = "2.47.1"; + version = "2.47.2"; webUiStatic = fetchurl { url = "https://github.com/prometheus/prometheus/releases/download/v${version}/prometheus-web-ui-${version}.tar.gz"; - hash = "sha256-NgVwxKhag/acE5sdP3910CuGWVWfmTSnXSSztEjLobs="; + hash = "sha256-QLJXY6WzmKcOoLmBTVvCRhTRCAt3IXiHmd9KeLrfz+I="; }; in buildGoModule rec { @@ -47,7 +47,7 @@ buildGoModule rec { owner = "prometheus"; repo = "prometheus"; rev = "v${version}"; - hash = "sha256-AK2DLFDWrpnkvOUb9dFYjdAa6+Vm6ftZQpexy/FULrs="; + hash = "sha256-mV5sfv4+2a9R34wWcqMu/h/VqBSutmnSWnx0Q3K9L6M="; }; vendorHash = "sha256-qFp+tMHhXmJGY9MSukVRjBVzaIBgfxB0BorWiuInMwk="; From 3f6b4aa3659b9edd1af49305a1b0fdcf97c29ba4 Mon Sep 17 00:00:00 2001 From: Emily Trau Date: Wed, 18 Oct 2023 01:08:53 +0000 Subject: [PATCH 4/5] minimal-bootstrap.gcc{8,-latest}: prune dependency on previous compiler --- pkgs/os-specific/linux/minimal-bootstrap/gcc/8.nix | 5 +++-- pkgs/os-specific/linux/minimal-bootstrap/gcc/latest.nix | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/minimal-bootstrap/gcc/8.nix b/pkgs/os-specific/linux/minimal-bootstrap/gcc/8.nix index d6a6560e01e7..ea9fdaf8854a 100644 --- a/pkgs/os-specific/linux/minimal-bootstrap/gcc/8.nix +++ b/pkgs/os-specific/linux/minimal-bootstrap/gcc/8.nix @@ -130,11 +130,12 @@ bash.runCommand "${pname}-${version}" { --disable-libmpx \ --disable-libsanitizer \ --disable-lto \ - --disable-multilib + --disable-multilib \ + --disable-plugin # Build make -j $NIX_BUILD_CORES # Install - make -j $NIX_BUILD_CORES install + make -j $NIX_BUILD_CORES install-strip '' diff --git a/pkgs/os-specific/linux/minimal-bootstrap/gcc/latest.nix b/pkgs/os-specific/linux/minimal-bootstrap/gcc/latest.nix index f8a7d2126b8d..fba3b731a004 100644 --- a/pkgs/os-specific/linux/minimal-bootstrap/gcc/latest.nix +++ b/pkgs/os-specific/linux/minimal-bootstrap/gcc/latest.nix @@ -126,11 +126,12 @@ bash.runCommand "${pname}-${version}" { --disable-bootstrap \ --disable-libsanitizer \ --disable-lto \ - --disable-multilib + --disable-multilib \ + --disable-plugin # Build make -j $NIX_BUILD_CORES # Install - make -j $NIX_BUILD_CORES install + make -j $NIX_BUILD_CORES install-strip '' From b9e9e443a9e65726388ea4d6e74e1535cdfd8e8e Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 17 Oct 2023 21:19:30 -0500 Subject: [PATCH 5/5] rclone: 1.64.0 -> 1.64.1 (#261739) Diff: https://github.com/rclone/rclone/compare/v1.64.0...v1.64.1 Changelog: https://github.com/rclone/rclone/blob/v1.64.1/docs/content/changelog.md --- pkgs/applications/networking/sync/rclone/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/sync/rclone/default.nix b/pkgs/applications/networking/sync/rclone/default.nix index d82981f2f086..2e6dd8fa7fde 100644 --- a/pkgs/applications/networking/sync/rclone/default.nix +++ b/pkgs/applications/networking/sync/rclone/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "rclone"; - version = "1.64.0"; + version = "1.64.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-miXYBKUTmsqAvVLmxcVCpjgEO3HeKQpUZKSvzaxhqdU="; + hash = "sha256-JaUsclhAZpmVi3K9VdRfAber++ghiEfzmJDmeku9IXA="; }; - vendorHash = "sha256-rpF44yd8ElOkXTT1lSW0l3ZwTqeNdGS1OxrvNY8atzA="; + vendorHash = "sha256-eYIGVCTvUfGbsIMFthEfD0r6aeA7Ly9xJ8PJ6hR2SjA="; subPackages = [ "." ];