b12f/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-01-06 12:01:11 +00:00 committed by GitHub
parent ea5e5050f1 0dcf2ad93d
commit 60c812cecd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
14 changed files with 124 additions and 91 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/desktops/gnome/core/gnome-bluetooth/default.nix
View file

@ -27,14 +27,14 @@
stdenv.mkDerivation rec {
pname = "gnome-bluetooth";
version = "42.4";
version = "42.5";
# TODO: split out "lib"
outputs = [ "out" "dev" "devdoc" "man" ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
sha256 = "HW/PHNtsyZI6szSiwLw3osG7qdGN4VPUhO7cBPPAvNw=";
sha256 = "pPXxrC27e3uS99bStCwDD2Ku2bVCa53BFpRgQfPLqPc=";
};
nativeBuildInputs = [

4
pkgs/desktops/gnome/core/gnome-control-center/default.nix
View file

@ -64,11 +64,11 @@
stdenv.mkDerivation rec {
pname = "gnome-control-center";
version = "43.1";
version = "43.2";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
sha256 = "sha256-6YvGt4Sv0E8pfbXo5sWZEOLNCQMycQd08m3I3omvT8c=";
sha256 = "sha256-1/JWq6gKkscnsyn9AchgLaS3jw/drsk/zZEJaWRwBWM=";
};
patches = [

4
pkgs/desktops/gnome/games/aisleriot/default.nix
View file

@ -19,14 +19,14 @@
stdenv.mkDerivation rec {
pname = "aisleriot";
version = "3.22.26";
version = "3.22.27";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "GNOME";
repo = "aisleriot";
rev = version;
sha256 = "sha256-enUDJ6KM3QDsPb3ckKOxpRzMe4I0bj4TQR94oZWJJJY=";
sha256 = "sha256-XvYQ1JWMBWVZF5u3VL1zPADgMDMN/1FNuwZ4vaOeo7Y=";
};
nativeBuildInputs = [

19
pkgs/development/libraries/keybinder/default.nix
View file

@ -1,28 +1,29 @@
{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config, gnome
, gtk-doc, gtk2, python2Packages, lua, gobject-introspection
, gtk-doc, gtk2, lua, gobject-introspection
}:
let
inherit (python2Packages) python pygtk;
in stdenv.mkDerivation rec {
stdenv.mkDerivation rec {
pname = "keybinder";
version = "0.3.0";
version = "0.3.1";
src = fetchFromGitHub {
owner = "engla";
repo = "keybinder";
rev = "v${version}";
sha256 = "sha256-q/+hqhvXIknT+/5oENcWSr1OuF00kaZlXFUP1fdCMlk=";
sha256 = "sha256-elL6DZtzCwAtoyGZYP0jAma6tHPks2KAtrziWtBENGU=";
};
nativeBuildInputs = [ pkg-config autoconf automake ];
buildInputs = [
libtool gnome.gnome-common gtk-doc gtk2
python pygtk lua gobject-introspection
lua gobject-introspection
];
configureFlags = [ "--disable-python" ];
preConfigure = ''
./autogen.sh --prefix="$out"
./autogen.sh --prefix="$out" $configureFlags
'';
meta = with lib; {
@ -36,8 +37,6 @@ in stdenv.mkDerivation rec {
* A C library, ``libkeybinder``
* Gobject-Introspection (gir) generated bindings
* Lua bindings, ``lua-keybinder``
* Python bindings, ``python-keybinder``
* An ``examples`` directory with programs in C, Lua, Python and Vala.
'';
homepage = "https://github.com/engla/keybinder/";
license = licenses.gpl2Plus;

4
pkgs/development/ocaml-modules/containers/default.nix
View file

@ -5,14 +5,14 @@
}:
buildDunePackage rec {
version = "3.9";
version = "3.10";
pname = "containers";
src = fetchFromGitHub {
owner = "c-cube";
repo = "ocaml-containers";
rev = "v${version}";
sha256 = "sha256-uQyKBSXgf3kGx5HvS2VQrrkh0WqNZfxr5j8tTRjeTX4=";
hash = "sha256-eWmju4CD30+wX3sKI8rOUEbqbQygdOtc0U4sb9vYuNA=";
};
buildInputs = [ dune-configurator ];

34
pkgs/development/ocaml-modules/ppxlib/default.nix
View file

@ -1,4 +1,4 @@
{ lib, fetchFromGitHub, buildDunePackage, ocaml
{ lib, fetchurl, buildDunePackage, ocaml
, version ?
if lib.versionAtLeast ocaml.version "4.07"
then if lib.versionAtLeast ocaml.version "4.08"
@ -10,45 +10,49 @@
let param = {
"0.8.1" = {
sha256 = "0vm0jajmg8135scbg0x60ivyy5gzv4abwnl7zls2mrw23ac6kml6";
sha256 = "sha256-pct57oO7qAMEtlvEfymFOCvviWaLG0b5/7NzTC8vdSE=";
max_version = "4.10";
useDune2 = false;
useOMP2 = false;
};
"0.13.0" = {
sha256 = "0c54g22pm6lhfh3f7s5wbah8y48lr5lj3cqsbvgi99bly1b5vqvl";
sha256 = "sha256-geHz0whQDg5/YQjVsN2iuHlkClwh7z3Eqb2QOBzuOdk=";
max_version = "4.11";
useDune2 = false;
useOMP2 = false;
};
"0.15.0" = {
sha256 = "1p037kqj5858xrhh0dps6vbf4fnijla6z9fjz5zigvnqp4i2xkrn";
sha256 = "sha256-C2MNf410qJmlXMJxiLXOA+c1qT8H6gwt5WUy2P2TszA=";
min_version = "4.07";
max_version = "4.12";
useOMP2 = false;
};
"0.18.0" = {
sha256 = "1ciy6va2gjrpjs02kha83pzh0x1gkmfsfsdgabbs1v14a8qgfibm";
sha256 = "sha256-nUg8NkZ64GHHDfcWbtFGXq3MNEKu+nYPtcVDm/gEfcM=";
min_version = "4.07";
max_version = "4.12";
};
"0.22.0" = {
sha256 = "0kf7lgcwygf6zlx7rwddqpqvasa6v7xiq0bqal8vxlib6lpg074q";
sha256 = "sha256-PuuR4DlmZiKEoyIuYS3uf0+it2N8U9lXLSp0E0u5bXo=";
min_version = "4.07";
max_version = "4.13";
};
"0.22.2" = {
sha256 = "0fysjqcpv281n52wl3h0dy2lzf9d61wdzk90ldv3p63a4i3mr1j2";
sha256 = "sha256-0Oih69xiILFXTXqSbwCEYMURjM73m/mgzgJC80z/Ilo=";
min_version = "4.07";
max_version = "4.14";
};
"0.23.0" = {
sha256 = "0jg5v4pssbl66hn5davpin1i57a0r3r54l96vpz5y99xk5w70xi1";
sha256 = "sha256-G1g2wYa51aFqz0falPOWj08ItRm3cpzYao/TmXH+EuU=";
min_version = "4.07";
max_version = "4.14";
};
"0.24.0" = {
sha256 = "sha256-wuG7cUZiVP2PdM+nZloip7lGGiWn6Wpkh2YoF/Fuc9o=";
sha256 = "sha256-d2YCfC7ND1s7Rg6SEqcHCcZ0QngRPrkfMXxWxB56kMg=";
min_version = "4.07";
};
"0.28.0" = {
sha256 = "sha256-i/U++sosKQUjyxu9GscPb1Gfv2a3Hbmj+UgIZlewnCo=";
sha256 = "sha256-2Hrl+aCBIGMIypZICbUKZq646D0lSAHouWdUSLYM83c=";
min_version = "4.07";
};
}."${version}"; in
@ -62,12 +66,10 @@ buildDunePackage rec {
pname = "ppxlib";
inherit version;
useDune2 = param.useDune2 or true;
duneVersion = if param.useDune2 or true then "2" else "1";
src = fetchFromGitHub {
owner = "ocaml-ppx";
repo = pname;
rev = version;
src = fetchurl {
url = "https://github.com/ocaml-ppx/ppxlib/releases/download/${version}/ppxlib-${version}.tbz";
inherit (param) sha256;
};
@ -85,6 +87,6 @@ buildDunePackage rec {
description = "Comprehensive ppx tool set";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.vbgl ];
inherit (src.meta) homepage;
homepage = "https://github.com/ocaml-ppx/ppxlib";
};
}

48
pkgs/development/tools/godot/4/default.nix
View file

@ -9,11 +9,11 @@
, libX11
, libXcursor
, libXinerama
, libXi
, libXrandr
, libXext
, libXrandr
, libXrender
, libXi
, libXfixes
, libGLU
, freetype
, alsa-lib
, libpulseaudio
@ -21,6 +21,9 @@
, speechd
, fontconfig
, udev
, withPlatform ? "linuxbsd"
, withTarget ? "editor"
, withPrecision ? "single"
, withPulseaudio ? false
, withDbus ? true
, withSpeechd ? false
@ -29,9 +32,16 @@
, withTouch ? true
}:
assert lib.asserts.assertOneOf "withPrecision" withPrecision [ "single" "double" ];
let
# Options from godot/platform/linuxbsd/detect.py
options = {
# Options from 'godot/SConstruct'
platform = withPlatform;
target = withTarget;
precision = withPrecision; # Floating-point precision level
# Options from 'godot/platform/linuxbsd/detect.py'
pulseaudio = withPulseaudio;
dbus = withDbus; # Use D-Bus to handle screensaver and portal desktop settings
speechd = withSpeechd; # Use Speech Dispatcher for Text-to-Speech support
@ -42,13 +52,13 @@ let
in
stdenv.mkDerivation rec {
pname = "godot";
version = "4.0-beta3";
version = "4.0-beta10";
src = fetchFromGitHub {
owner = "godotengine";
repo = "godot";
rev = "01ae26d31befb6679ecd92cd3c73aa5a76162e95";
sha256 = "sha256-Q+zMviGevezjcQKJPOm7zAu4liJ5z8Rl73TYmjRR3MY=";
rev = "d0398f62f08ce0cfba80990b21c6af4181f93fe9";
sha256 = "sha256-h4DpK7YC7/qMc6GAD2nvNVmrlGjKT5d7OK+1NcuZCMg=";
};
nativeBuildInputs = [
@ -59,27 +69,26 @@ stdenv.mkDerivation rec {
buildInputs = [
scons
libGLU
]
++ runtimeDependencies;
runtimeDependencies = [
libX11
libXcursor
libXinerama
libXi
libXrandr
libXext
libXrandr
libXrender
libXi
libXfixes
]
++ runtimeDependencies
# Necessary to make godot see fontconfig.lib and dbus.lib
++ lib.optional withFontconfig fontconfig
++ lib.optional withDbus dbus;
runtimeDependencies = [
vulkan-loader
alsa-lib
vulkan-loader
]
++ lib.optional withPulseaudio libpulseaudio
++ lib.optional withDbus dbus
++ lib.optional withDbus dbus.lib
++ lib.optional withSpeechd speechd
++ lib.optional withFontconfig fontconfig
++ lib.optional withFontconfig fontconfig.lib
++ lib.optional withUdev udev;
@ -91,7 +100,8 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
sconsFlags = [ "platform=linuxbsd target=editor production=true" ];
# Options from 'godot/SConstruct' and 'godot/platform/linuxbsd/detect.py'
sconsFlags = [ "production=true" ];
preConfigure = ''
sconsFlags+=" ${
lib.concatStringsSep " "

12
pkgs/development/tools/godot/4/xfixes.patch
View file

@ -1,12 +1,12 @@
diff --git a/platform/linuxbsd/detect.py b/platform/linuxbsd/detect.py
index ac69f3806b..14acbf5c58 100644
index 844b15e9fb..0c8bee1757 100644
--- a/platform/linuxbsd/detect.py
+++ b/platform/linuxbsd/detect.py
@@ -191,6 +191,7 @@ def configure(env: "Environment"):
env.ParseConfig("pkg-config xrandr --cflags --libs")
env.ParseConfig("pkg-config xrender --cflags --libs")
env.ParseConfig("pkg-config xi --cflags --libs")
+ env.ParseConfig("pkg-config xfixes --cflags --libs")
@@ -192,6 +192,7 @@ def configure(env: "Environment"):
env.ParseConfig("pkg-config xrandr --cflags")
env.ParseConfig("pkg-config xrender --cflags")
env.ParseConfig("pkg-config xi --cflags")
+ env.ParseConfig("pkg-config xfixes --cflags")
if env["touch"]:
env.Append(CPPDEFINES=["TOUCH_ENABLED"])

17
pkgs/development/tools/rust/cargo-modules/default.nix
View file

@ -1,17 +1,26 @@
{ lib, rustPlatform, fetchFromGitHub, stdenv, darwin }:
{ lib, rustPlatform, fetchFromGitHub, fetchpatch, stdenv, darwin }:
rustPlatform.buildRustPackage rec {
pname = "cargo-modules";
version = "0.7.1";
version = "0.7.2";
src = fetchFromGitHub {
owner = "regexident";
repo = pname;
rev = version;
sha256 = "sha256-vMmbed2UOe/N8V7LbvYm7BbOOHD69qaizkYf66VCZMs=";
sha256 = "sha256-QRBhlSHqOTJCdzZhqpcfLeCDuCfJsjyxa2+6yzzN52g=";
};
cargoSha256 = "sha256-xo3EUDWoE1OFTaA9y3ymGA/l2fwNqnPBLpNc8xyjasY=";
cargoSha256 = "sha256-+asFAkUOHP9u/nOoHsr81KeqQkLqaRXhJH32oTG5vYo=";
cargoPatches = [
# https://github.com/regexident/cargo-modules/pull/161;
(fetchpatch {
name = "update-outdated-lock-file.patsh";
url = "https://github.com/regexident/cargo-modules/commit/ea9029b79acdadddbaf4067076690153c38cd09c.patch";
sha256 = "sha256-DOLvo/PP+4/6i1IYbl9oGC6BAnXNI88hK5he9549EJk=";
})
];
buildInputs = lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.CoreServices

8
pkgs/os-specific/linux/kernel/zen-kernels.nix
View file

@ -4,16 +4,16 @@ let
# comments with variant added for update script
# ./update-zen.py zen
zenVariant = {
version = "6.1.2"; #zen
version = "6.1.3"; #zen
suffix = "zen1"; #zen
sha256 = "0wys16f4z221r3g3fc8cb5i0hcymjsk780jk657ihx5xm3anv3kf"; #zen
sha256 = "JOOw24CroRTOaWqdGaiZBDMk0ITmIsZKXZV3KeoqGMw="; #zen
isLqx = false;
};
# ./update-zen.py lqx
lqxVariant = {
version = "6.1.2"; #lqx
version = "6.1.3"; #lqx
suffix = "lqx1"; #lqx
sha256 = "03kwp1c3amk87sjdji9643gr396hca8crqf2z614wkd84vdwary0"; #lqx
sha256 = "0vp6skhw4wsxk2nl3m8y975a9bx78h5wl574wsfgnc5nvzmh250l"; #lqx
isLqx = true;
};
zenKernelsFor = { version, suffix, sha256, isLqx }: buildLinux (args // {

48
pkgs/os-specific/linux/powertop/default.nix
View file

@ -1,44 +1,56 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch, gettext, libnl, ncurses, pciutils
, pkg-config, zlib, autoreconfHook }:
{ lib
, stdenv
, fetchFromGitHub
, gettext
, libnl
, ncurses
, pciutils
, pkg-config
, zlib
, autoreconfHook
, autoconf-archive
, nix-update-script
, testers
, powertop
}:
stdenv.mkDerivation rec {
pname = "powertop";
version = "2.14";
version = "2.15";
src = fetchFromGitHub {
owner = "fenrus75";
repo = pname;
rev = "v${version}";
sha256 = "1zkr2y5nb1nr22nq8a3zli87iyfasfq6489p7h1k428pv8k45w4f";
hash = "sha256-53jfqt0dtMqMj3W3m6ravUTzApLQcljDHfdXejeZa4M=";
};
patches = [
# Pull upstream patch for ncurses-6.3 compatibility
(fetchpatch {
name = "ncurses-6.3.patch";
url = "https://github.com/fenrus75/powertop/commit/9ef1559a1582f23d599c149601c3a8e06809296c.patch";
sha256 = "0qx69f3bwhxgsga9nas8lgrclf1rxvr7fq7fd2n8dv3x4lsb46j1";
})
];
outputs = [ "out" "man" ];
nativeBuildInputs = [ pkg-config autoreconfHook ];
nativeBuildInputs = [ pkg-config autoreconfHook autoconf-archive ];
buildInputs = [ gettext libnl ncurses pciutils zlib ];
NIX_LDFLAGS = [ "-lpthread" ];
postPatch = ''
substituteInPlace src/main.cpp --replace "/sbin/modprobe" "modprobe"
substituteInPlace src/calibrate/calibrate.cpp --replace "/usr/bin/xset" "xset"
substituteInPlace src/tuning/bluetooth.cpp --replace "/usr/bin/hcitool" "hcitool"
'';
passthru = {
updateScript = nix-update-script { };
tests.version = testers.testVersion {
package = powertop;
command = "powertop --version";
inherit version;
};
};
meta = with lib; {
inherit (src.meta) homepage;
changelog = "https://github.com/fenrus75/powertop/releases/tag/v${version}";
description = "Analyze power consumption on Intel-based laptops";
homepage = "https://01.org/powertop";
license = licenses.gpl2Only;
maintainers = with maintainers; [ fpletz ];
maintainers = with maintainers; [ fpletz anthonyroussel ];
platforms = platforms.linux;
};
}

4
pkgs/servers/http/nginx/modules.nix
View file

@ -204,8 +204,8 @@ let self = {
name = "geoip2";
owner = "leev";
repo = "ngx_http_geoip2_module";
rev = "3.3";
sha256 = "EEn/qxPsBFgVBqOgPYTrRhaLPwSBlSPWYYSr3SL8wZA=";
rev = "3.4";
sha256 = "CAs1JZsHY7RymSBYbumC2BENsXtZP3p4ljH5QKwz5yg=";
};
inputs = [ libmaxminddb ];

6
pkgs/tools/admin/scaleway-cli/default.nix
View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "scaleway-cli";
version = "2.7.0";
version = "2.8.0";
src = fetchFromGitHub {
owner = "scaleway";
repo = "scaleway-cli";
rev = "v${version}";
sha256 = "sha256-DWr5I6xMESRWhQCgDY/xJsSw0XhlNSJiVsHNvL+xmH4=";
sha256 = "sha256-2PDENdQmkcGU+nRjfr9QW5H3vzNPq1YStN4yew0+Ixw=";
};
vendorSha256 = "sha256-1Ke01pc+RyqxCuD1SGypTSKCFnnHazz6IaybL0TylhA=";
vendorSha256 = "sha256-EzZ18jXettkGbGgMIthqnyfwJ44hEh2SCdV6XpFv3GQ=";
ldflags = [
"-w"

3
pkgs/top-level/release.nix
View file

@ -130,7 +130,8 @@ let
jobs.tests.patch-shebangs.x86_64-linux
*/
]
++ lib.collect lib.isDerivation jobs.stdenvBootstrapTools
# FIXME: reintroduce aarch64-darwin after this builds again
++ lib.collect lib.isDerivation (removeAttrs jobs.stdenvBootstrapTools [ "aarch64-darwin" ])
++ lib.optionals supportDarwin.x86_64 [
jobs.stdenv.x86_64-darwin
jobs.cargo.x86_64-darwin