BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge master into staging-next

Browse source
This commit is contained in:
github-actions[bot] 2023-10-18 06:01:16 +00:00 committed by GitHub
commit bf597f79ed
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 17 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/applications/networking/instant-messengers/beeper/default.nix
View file

@ -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;

6
pkgs/applications/networking/sync/rclone/default.nix
View file

@ -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 = [ "." ];

5
pkgs/os-specific/linux/minimal-bootstrap/gcc/8.nix
View file

@ -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
''

5
pkgs/os-specific/linux/minimal-bootstrap/gcc/latest.nix
View file

@ -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
''

6
pkgs/servers/monitoring/prometheus/default.nix
View file

@ -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=";

4
pkgs/tools/package-management/nix-eval-jobs/default.nix
View file

@ -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

2
pkgs/top-level/all-packages.nix
View file

@ -338,7 +338,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 { };