gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot]
2023-02-07 18:01:43 +00:00
committed by GitHub
parent 3356399453 12053de9e5
commit 7244b4babe
14 changed files with 55 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/editors/eclipse/default.nix
+1 -1
View File
@@ -103,7 +103,7 @@ in rec {
fetchurl {
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops${platform_major}/R-${platform_major}.${platform_minor}-${timestamp}/eclipse-SDK-${platform_major}.${platform_minor}-linux-gtk-${arch}.tar.gz";
hash = {
x86_64 = "sha512-hmdWGteMDt4HhYq+k9twuftalpTzHtGnVVLphZcpJcw+6vJfersciDMaeLRqbCAeFbzJdgzjYo76bpP6FubySw==";
x86_64 = "sha512-yH4/K9sBLCUc2EVYwPL0dLql/S3AfaV6fFh7ewAuIb7yHtcsOWMqy/h1hZUlFFg2ykfwDWDDHEK7qfTI0hM7BQ==";
aarch64 = "sha512-UYp8t7r2RrN3rKN180cWpJyhyO5LVXL8LrTRKJzttUgB7kM1nroTEI3DesBu+Hw4Ynl7eLiBK397rqcpOAfxJw==";
}.${arch};
};
pkgs/applications/emulators/rpcs3/default.nix
+4 -4
View File
@@ -9,10 +9,10 @@
let
# Keep these separate so the update script can regex them
rpcs3GitVersion = "14637-c471120a8";
rpcs3Version = "0.0.26-14637-c471120a8";
rpcs3Revision = "c471120a80ec6f12cd4489e1a9be073d7d9c96f2";
rpcs3Sha256 = "1fl7zarxbjaz6mi3lqv55kdwpvjfz8d02qfl0655zihwm6zzdny5";
rpcs3GitVersion = "14684-8652b7d35";
rpcs3Version = "0.0.26-14684-8652b7d35";
rpcs3Revision = "8652b7d358fe975242dd2c51c91fd2968e6bcb82";
rpcs3Sha256 = "08cd082cih9pcppipkhid1x1s7bq4grsz0zfa1rlxkzw3lajxnrf";
ittapi = fetchFromGitHub {
owner = "intel";
pkgs/applications/graphics/ImageMagick/default.nix
+2 -2
View File
@@ -47,13 +47,13 @@ in
stdenv.mkDerivation rec {
pname = "imagemagick";
version = "7.1.0-60";
version = "7.1.0-61";
src = fetchFromGitHub {
owner = "ImageMagick";
repo = "ImageMagick";
rev = version;
hash = "sha256-dQfmW9rt66eWOaKbZ9j8jc1k8v+F8B9TpTx12L+0VE4=";
hash = "sha256-g7WeqPpPd1gceU+s+vRDpb41IX1lzpiqh3cAYeFdUlg=";
};
outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big
pkgs/development/libraries/aravis/default.nix
+2 -2
View File
@@ -29,13 +29,13 @@ assert enableViewer -> wrapGAppsHook != null;
stdenv.mkDerivation rec {
pname = "aravis";
version = "0.8.22";
version = "0.8.24";
src = fetchFromGitHub {
owner = "AravisProject";
repo = pname;
rev = version;
sha256 = "sha256-S9DmXjywxNr5Rpx605zip76vGKBSrUwyerqXlBm05VI=";
sha256 = "sha256-2d2CZzRfVr45gfgIg43Rr+1SoVIxzy8YjaQJhwi5owE=";
};
outputs = [ "bin" "dev" "out" "lib" ];
pkgs/development/python-modules/oralb-ble/default.nix
+2 -2
View File
@@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "oralb-ble";
version = "0.17.2";
version = "0.17.4";
format = "pyproject";
disabled = pythonOlder "3.9";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "Bluetooth-Devices";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-v2c1FoLgG6HH02d+YBr4Qh12ztRsiwWyueUNOBpWqPM=";
hash = "sha256-KvvcyeYXBtV/sUKMv+1xoXH9ALUX46EWS/STFZkCnUQ=";
};
nativeBuildInputs = [
pkgs/development/python-modules/schwifty/default.nix
+2 -2
View File
@@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "schwifty";
version = "2022.9.0";
version = "2023.2.0";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-/zxK0pUfg5G5w9E+QBt1H12Ld5gWc+WakQdNVRMSFiA=";
sha256 = "sha256-YEBBrU+Xcl5zFPEt/EvPD5eFPUYSpGJ3ZoIK6PRVwlc=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/sensorpro-ble/default.nix
+2 -2
View File
@@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "sensorpro-ble";
version = "0.5.1";
version = "0.5.3";
format = "pyproject";
disabled = pythonOlder "3.9";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "Bluetooth-Devices";
repo = pname;
rev = "v${version}";
hash = "sha256-D0xHNPsGlNBoHR3LqR6TbVhqXWapzwYsG+uN3kSF1oE=";
hash = "sha256-Zqa6qa0Jw79Iu4VEw6KN0GsZcC1X7OpiYUiyT4zwKyY=";
};
nativeBuildInputs = [
pkgs/development/python-modules/sensorpush-ble/default.nix
+4 -3
View File
@@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "sensorpush-ble";
version = "1.5.2";
version = "1.5.5";
format = "pyproject";
disabled = pythonOlder "3.9";
@@ -19,8 +19,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "Bluetooth-Devices";
repo = pname;
rev = "v${version}";
hash = "sha256-64DywtZwfDFjW8WUzw3ZTT462sBGFgAHGc0bGnKCJpY=";
rev = "refs/tags/v${version}";
hash = "sha256-17Yzpbcy/r+GlkLktgghehfAEboZHMbB/Dze1no4I80=";
};
nativeBuildInputs = [
@@ -49,6 +49,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Library for SensorPush BLE devices";
homepage = "https://github.com/Bluetooth-Devices/sensorpush-ble";
changelog = "https://github.com/Bluetooth-Devices/sensorpush-ble/releases/tag/v${version}";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
pkgs/development/python-modules/thermopro-ble/default.nix
+2 -2
View File
@@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "thermopro-ble";
version = "0.4.3";
version = "0.4.5";
format = "pyproject";
disabled = pythonOlder "3.9";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "bluetooth-devices";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-y8Uh1REZqfrS3Y/L/uCmHYkdPQzwzdx7eSz003oz05o=";
hash = "sha256-z3RrPOV7NGl3aNor+baeVivn+DKwYHcrdlM5sNMGVD0=";
};
nativeBuildInputs = [
pkgs/development/python-modules/tilt-ble/default.nix
+4 -3
View File
@@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "tilt-ble";
version = "0.2.3";
version = "0.2.4";
format = "pyproject";
disabled = pythonOlder "3.9";
@@ -19,8 +19,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "Bluetooth-Devices";
repo = pname;
rev = "v${version}";
hash = "sha256-PR+BA0wUljUeUYCTRMKxkG+kj6PfklksbO/k9L7sWdE=";
rev = "refs/tags/v${version}";
hash = "sha256-ok9XWx47hcke535480NORfS1pSagaOJvMR48lYTa/Tg=";
};
nativeBuildInputs = [
@@ -49,6 +49,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Library for Tilt BLE devices";
homepage = "https://github.com/Bluetooth-Devices/tilt-ble";
changelog = "https://github.com/Bluetooth-Devices/tilt-ble/releases/tag/v${version}";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
pkgs/development/python-modules/xiaomi-ble/default.nix
+2 -2
View File
@@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "xiaomi-ble";
version = "0.15.0";
version = "0.16.1";
format = "pyproject";
disabled = pythonOlder "3.9";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "Bluetooth-Devices";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-6j5hZ9NGmAFpbgYTyC4UuI4XkQwotZND1UMHnmJHCdo=";
hash = "sha256-JsrOt6LmmhJZ4MBwLVKKt3IMbvAnxJx70AZROhb9gbc=";
};
nativeBuildInputs = [
pkgs/servers/caddy/xcaddy/default.nix
+10 -3
View File
@@ -2,7 +2,7 @@
buildGoModule rec {
pname = "xcaddy";
version = "0.3.1";
version = "0.3.2";
subPackages = [ "cmd/xcaddy" ];
@@ -10,19 +10,26 @@ buildGoModule rec {
owner = "caddyserver";
repo = pname;
rev = "v${version}";
hash = "sha256-oGTtS5UlEebIqv4SM4q0YclASJNu8DNOLrGLRRAtkd8=";
hash = "sha256-M0eMI/TtUNVqE4F1ifizVb0e4ACGa+yLkG3pJLaaDNs=";
};
patches = [
./inject_version_info.diff
./use_tmpdir_on_darwin.diff
];
ldflags = [
"-s"
"-w"
"-X github.com/caddyserver/xcaddy/cmd.customVersion=v${version}"
];
vendorHash = "sha256-RpbnoXyTrqGOI7DpgkO+J47P17T4QCVvM1CfS6kRO9Y=";
meta = with lib; {
homepage = "https://github.com/caddyserver/xcaddy";
description = "Build Caddy with plugins";
license = licenses.asl20;
maintainers = with maintainers; [ tjni ];
maintainers = with maintainers; [ tjni indeednotjames ];
};
}
pkgs/servers/caddy/xcaddy/inject_version_info.diff
+16
View File
@@ -0,0 +1,16 @@
diff --git a/cmd/main.go b/cmd/main.go
index ede7cd8..c553140 100644
--- a/cmd/main.go
+++ b/cmd/main.go
@@ -401,8 +401,11 @@ func splitWith(arg string) (module, version, replace string, err error) {
return
}
+var customVersion string
+
// xcaddyVersion returns a detailed version string, if available.
func xcaddyVersion() string {
+ return customVersion
mod := goModule()
ver := mod.Version
if mod.Sum != "" {
pkgs/servers/icingaweb2/default.nix
+2 -2
View File
@@ -2,13 +2,13 @@
stdenvNoCC.mkDerivation rec {
pname = "icingaweb2";
version = "2.11.3";
version = "2.11.4";
src = fetchFromGitHub {
owner = "Icinga";
repo = "icingaweb2";
rev = "v${version}";
hash = "sha256-DxAWSU6nleTRkgtU6cW5KEJ0aQuzom+kGwTOk1Kg8CI=";
hash = "sha256-UMC1puEM0PhIu+lJouOj81tI/E6fz1PzPN0FU7TNwTg=";
};
nativeBuildInputs = [ makeWrapper ];