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

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot] 2023-02-24 00:02:56 +00:00 committed by GitHub
commit 55aecca307
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
48 changed files with 1046 additions and 690 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/.gitignore vendored
View File

@ -6,3 +6,5 @@ functions/library/locations.xml
highlightjs
manual-full.xml
out
result
result-*

2
doc/languages-frameworks/emscripten.section.md
View File

@ -56,7 +56,7 @@ See the `zlib` example:
zlib = (pkgs.zlib.override {
stdenv = pkgs.emscriptenStdenv;
}).overrideDerivation
}).overrideAttrs
(old: rec {
buildInputs = old.buildInputs ++ [ pkg-config ];
# we need to reset this setting!

8
nixos/doc/manual/manpages/nixos-build-vms.8
View File

@ -1,10 +1,6 @@
.Dd January 1, 1980
.\" nixpkgs groff will use Nixpkgs as the OS in the title by default, taking it from
.\" doc-default-operating-system. mandoc doesn't have this register set by default,
.\" so we can use it as a groff/mandoc switch.
.ie ddoc-default-operating-system .Dt nixos-build-vms \&8 "NixOS System Manager's Manual"
.el .Dt nixos-build-vms 8
.Os NixOS
.Dt nixos-build-vms 8
.Os
.Sh NAME
.Nm nixos-build-vms
.Nd build a network of virtual machines from a network of NixOS configurations

8
nixos/doc/manual/manpages/nixos-enter.8
View File

@ -1,10 +1,6 @@
.Dd January 1, 1980
.\" nixpkgs groff will use Nixpkgs as the OS in the title by default, taking it from
.\" doc-default-operating-system. mandoc doesn't have this register set by default,
.\" so we can use it as a groff/mandoc switch.
.ie ddoc-default-operating-system .Dt nixos-enter \&8 "NixOS System Manager's Manual"
.el .Dt nixos-enter 8
.Os NixOS
.Dt nixos-enter 8
.Os
.Sh NAME
.Nm nixos-enter
.Nd run a command in a NixOS chroot environment

8
nixos/doc/manual/manpages/nixos-generate-config.8
View File

@ -1,10 +1,6 @@
.Dd January 1, 1980
.\" nixpkgs groff will use Nixpkgs as the OS in the title by default, taking it from
.\" doc-default-operating-system. mandoc doesn't have this register set by default,
.\" so we can use it as a groff/mandoc switch.
.ie ddoc-default-operating-system .Dt nixos-generate-config \&8 "NixOS System Manager's Manual"
.el .Dt nixos-generate-config 8
.Os NixOS
.Dt nixos-generate-config 8
.Os
.Sh NAME
.Nm nixos-generate-config
.Nd generate NixOS configuration modules

8
nixos/doc/manual/manpages/nixos-install.8
View File

@ -1,10 +1,6 @@
.Dd January 1, 1980
.\" nixpkgs groff will use Nixpkgs as the OS in the title by default, taking it from
.\" doc-default-operating-system. mandoc doesn't have this register set by default,
.\" so we can use it as a groff/mandoc switch.
.ie ddoc-default-operating-system .Dt nixos-install \&8 "NixOS System Manager's Manual"
.el .Dt nixos-install 8
.Os NixOS
.Dt nixos-install 8
.Os
.Sh NAME
.Nm nixos-install
.Nd install bootloader and NixOS

8
nixos/doc/manual/manpages/nixos-option.8
View File

@ -1,10 +1,6 @@
.Dd January 1, 1980
.\" nixpkgs groff will use Nixpkgs as the OS in the title by default, taking it from
.\" doc-default-operating-system. mandoc doesn't have this register set by default,
.\" so we can use it as a groff/mandoc switch.
.ie ddoc-default-operating-system .Dt nixos-option \&8 "NixOS System Manager's Manual"
.el .Dt nixos-option 8
.Os NixOS
.Dt nixos-option 8
.Os
.Sh NAME
.Nm nixos-option
.Nd inspect a NixOS configuration

8
nixos/doc/manual/manpages/nixos-rebuild.8
View File

@ -1,10 +1,6 @@
.Dd January 1, 1980
.\" nixpkgs groff will use Nixpkgs the OS in the title by default, taking it from
.\" doc-default-operating-system. mandoc doesn't have this register set by default,
.\" so we can use it as a groff/mandoc switch.
.ie ddoc-default-operating-system .Dt nixos-rebuild \&8 "NixOS System Manager's Manual"
.el .Dt nixos-rebuild 8
.Os NixOS
.Dt nixos-rebuild 8
.Os
.Sh NAME
.Nm nixos-rebuild
.Nd reconfigure a NixOS machine

8
nixos/doc/manual/manpages/nixos-version.8
View File

@ -1,10 +1,6 @@
.Dd January 1, 1980
.\" nixpkgs groff will use Nixpkgs as the OS in the title by default, taking it from
.\" doc-default-operating-system. mandoc doesn't have this register set by default,
.\" so we can use it as a groff/mandoc switch.
.ie ddoc-default-operating-system .Dt nixos-version \&8 "NixOS System Manager's Manual"
.el .Dt nixos-version 8
.Os NixOS
.Dt nixos-version 8
.Os
.Sh NAME
.Nm nixos-version
.Nd show the NixOS version

6
pkgs/applications/misc/charm/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "charm";
version = "0.12.4";
version = "0.12.5";
src = fetchFromGitHub {
owner = "charmbracelet";
repo = "charm";
rev = "v${version}";
sha256 = "sha256-1uxgiVJGdTE8R0gEQ515zxoKXSs5lTGAURNlgJYMuMI=";
sha256 = "sha256-lTjpvh0bl4Fk+d3mcDvVQY3Ef6UYE23qoS60nltVcsU=";
};
vendorSha256 = "sha256-ouqA4Rg03M9dAUu2Uxmvez7LJTcrqYvqPNVQQmqwoFQ=";
vendorSha256 = "sha256-TNxAtx+fT6CEpa2g/tNl9sCwt3kAmNq7G870TPt2MQ4=";
ldflags = [ "-s" "-w" "-X=main.Version=${version}" ];

10
pkgs/applications/networking/browsers/chromium/upstream-info.json
View File

@ -45,9 +45,9 @@
}
},
"ungoogled-chromium": {
"version": "110.0.5481.100",
"sha256": "0czn47gbyp91z6jfgssr2izhg096fm4h26q1i2i42b0z1ilhv1vd",
"sha256bin64": "11g71rr7fcp2bybd9z19lb8pb29yqscffkzn4ybjbhbvd74s4pjr",
"version": "110.0.5481.177",
"sha256": "1dy9l61r3fpl40ff790dbqqvw9l1svcgd7saz4whl9wm256labvv",
"sha256bin64": "0sylaf8b0rzr82dg7safvs5dxqqib26k4j6vlm75vs99dpnlznj2",
"deps": {
"gn": {
"version": "2022-12-12",
@ -56,8 +56,8 @@
"sha256": "1b5fwldfmkkbpp5x63n1dxv0nc965hphc8rm8ah7zg44zscm9z30"
},
"ungoogled-patches": {
"rev": "110.0.5481.100-1",
"sha256": "02bmlx2wk9jiqm4az7g8r5ycmpgm5pkb7nivpx2jbmrb0g3qcx9q"
"rev": "110.0.5481.177-1",
"sha256": "0rsvkbsrnfkdp3iw4s54kddw8r771h14hf1ivgahmn42yjafkk3n"
}
}
}

6
pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix
View File

@ -2,15 +2,15 @@
buildGoModule rec {
pname = "cloudfoundry-cli";
version = "8.5.0";
version = "8.6.0";
src = fetchFromGitHub {
owner = "cloudfoundry";
repo = "cli";
rev = "v${version}";
sha256 = "sha256-+fQnit2J3WQpir4HldkWKCex6byfp2IqEWCi4oJ5HgU=";
sha256 = "sha256-SApjp6rdyOyZD6onE0aZ1AeiR6XyPUT9SVJJe/ROEQQ=";
};
vendorSha256 = "sha256-Wz5OoCrIY/xEXk+eqXtqtgVGD8oGUPmhzT5mOcZRD8w=";
vendorHash = "sha256-xydewlruZvtWHm0IvVWuvv31+Z7/PLVC9gTZcQLaowk=";
subPackages = [ "." ];

13
pkgs/applications/office/appflowy/default.nix
View File

@ -6,18 +6,19 @@
, copyDesktopItems
, makeDesktopItem
, gtk3
, openssl
, openssl_1_1
, xdg-user-dirs
, keybinder3
}:
stdenv.mkDerivation rec {
pname = "appflowy";
version = "0.0.9";
version = "0.1.0";
src = fetchzip {
url = "https://github.com/AppFlowy-IO/appflowy/releases/download/${version}/AppFlowy-linux-x86.tar.gz";
sha256 = "sha256-E75ZqenCs5zWBERYoIrWc2v5CyjGKLrfsae1RCi/qNQ=";
url = "https://github.com/AppFlowy-IO/appflowy/releases/download/${version}/AppFlowy_x86_64-unknown-linux-gnu_ubuntu-20.04.tar.gz";
sha256 = "sha256-WuEwhJ1YhbldFfisfUsp3GCV2vQy9oTam6BkL/7QEgI=";
stripRoot = false;
};
nativeBuildInputs = [
@ -28,7 +29,7 @@ stdenv.mkDerivation rec {
buildInputs = [
gtk3
openssl
openssl_1_1
keybinder3
];
@ -38,6 +39,8 @@ stdenv.mkDerivation rec {
installPhase = ''
runHook preInstall
mv AppFlowy/* ./
mkdir -p $out/opt/
mkdir -p $out/bin/

4
pkgs/applications/version-management/gitmux/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "gitmux";
version = "0.9.0";
version = "0.9.1";
src = fetchFromGitHub {
owner = "arl";
repo = pname;
rev = "v${version}";
sha256 = "sha256-Q0V4nUW/oL7YP7/UEcITLls6uCz5OKqqZymJ9eXHGac=";
sha256 = "sha256-QbQykbZo8fMyCMd0MF7CGrPFECN0ehcTGGLeQXbnlxw=";
};
vendorHash = "sha256-talZSkf8lQXwXKdkQliHFv2K+42BFtcg13oB5Szkff0=";

16
pkgs/data/fonts/maple-font/default.nix
View File

@ -5,10 +5,11 @@
}:
let
maple-font = { pname, version, sha256, desc }: stdenv.mkDerivation
maple-font = { pname, sha256, desc }: stdenv.mkDerivation
rec{
inherit pname version desc;
inherit pname desc;
version = "6.2";
src = fetchurl {
url = "https://github.com/subframe7536/Maple-font/releases/download/v${version}/${pname}.zip";
inherit sha256;
@ -31,28 +32,25 @@ let
platforms = platforms.all;
maintainers = with maintainers; [ oluceps ];
};
};
in
{
Mono = maple-font {
pname = "MapleMono";
version = "6.1";
sha256 = "sha256-JWyZH2F9lwWt9ROhuOtVf8HIjUAWkhCbXium0iNQry8=";
sha256 = "sha256-KhG0gQRnHFvpoxdcySSEYWDtOgG4xIm8X0Ua9o1aGTw=";
desc = "monospace";
};
NF = maple-font {
pname = "MapleMono-NF";
version = "6.1";
sha256 = "sha256-z0qoPMvowasHRK1IUMnx+lufUXqZkT3WBLtpEkP4V4I=";
sha256 = "sha256-Ov6AEaLy80cwrFtmKWUceI809SwBlHsQf2F86/sc/6A=";
desc = "Nerd Font";
};
SC-NF = maple-font {
pname = "MapleMono-SC-NF";
version = "6.1";
sha256 = "sha256-cp7pASXEiP8Td8yR+5hKpZyTST0o0pxgck4llHps4go=";
sha256 = "sha256-bb62YGzdE9qvlyuZG7YI16gOxWC+AijlRLY8ET+q5Rg=";
desc = "Nerd Font SC";
};

4
pkgs/development/libraries/fb303/default.nix
View File

@ -16,13 +16,13 @@
stdenv.mkDerivation rec {
pname = "fb303";
version = "2023.01.30.00";
version = "2023.02.13.00";
src = fetchFromGitHub {
owner = "facebook";
repo = "fb303";
rev = "v${version}";
sha256 = "sha256-k0kDaiSLaGNPhgCgksAu/qM9e4ogISQaFvWq4/mZIeI=";
sha256 = "sha256-Dgef8Y8mvObbnXOsfWxTzMoqCph0i9lbusnjqn/WfTQ=";
};
nativeBuildInputs = [ cmake ];

6
pkgs/development/libraries/glm/default.nix
View File

@ -28,10 +28,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ];
env.NIX_CFLAGS_COMPILE =
lib.optionals (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "11") [
"-fno-ipa-modref" # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=102823
];
# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=102823
env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "11") "-fno-ipa-modref";
cmakeFlags = [
"-DBUILD_SHARED_LIBS=OFF"

2
pkgs/development/libraries/rocwmma/default.nix
View File

@ -36,7 +36,7 @@ let
};
in stdenv.mkDerivation (finalAttrs: {
pname = "rocwmma";
version = "5.4.2";
version = "5.4.3";
outputs = [
"out"

4
pkgs/development/python-modules/async-lru/default.nix
View File

@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "async-lru";
version = "2.0.0";
version = "2.0.2";
disabled = pythonOlder "3.8";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "aio-libs";
repo = "async-lru";
rev = "v${version}";
hash = "sha256-mCmEMN9D6kEkHb3GoYuVk4XxvhaSX5eOHqpKawrcoxs=";
hash = "sha256-kcvtF/p1L5OVXJSRxRQ0NMFtV29tAysZs8cnTHqOBOo=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/kiwisolver/default.nix
View File

@ -20,9 +20,7 @@ buildPythonPackage rec {
hash = "sha256-1BmXUZ/LpKHkbrSi/jG8EvD/lXsrgbrCjbJHRPMz6VU=";
};
env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin [
"-I${lib.getDev libcxx}/include/c++/v1"
];
env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${lib.getDev libcxx}/include/c++/v1";
nativeBuildInputs = [
setuptools-scm

4
pkgs/development/python-modules/nextcord/default.nix
View File

@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "nextcord";
version = "2.3.3";
version = "2.4.0";
format = "setuptools";
@ -26,7 +26,7 @@ buildPythonPackage rec {
owner = "nextcord";
repo = "nextcord";
rev = "refs/tags/v${version}";
hash = "sha256-0ZWPoDLlGwLWReOeZc2GgW1FbUufrxTzUndNe5h7Kas=";
hash = "sha256-TePUsyQ4DCuvfRQD4KAUs94o3MJRmZmu6jMPv4lJtHE=";
};
patches = [

27
pkgs/development/python-modules/nextcord/paths.patch
View File

@ -1,8 +1,8 @@
diff --git a/nextcord/opus.py b/nextcord/opus.py
index 52e4ddbd..d8b8090b 100644
index b1119a8e..b7c9c713 100644
--- a/nextcord/opus.py
+++ b/nextcord/opus.py
@@ -255,7 +255,7 @@ def _load_default() -> bool:
@@ -233,7 +233,7 @@ def _load_default() -> bool:
_filename = os.path.join(_basedir, "bin", f"libopus-0.{_target}.dll")
_lib = libopus_loader(_filename)
else:
@ -12,10 +12,10 @@ index 52e4ddbd..d8b8090b 100644
if opus is None:
_lib = None
diff --git a/nextcord/player.py b/nextcord/player.py
index 5d0674cc..fd1c20ef 100644
index 5c7daf52..48a11eb7 100644
--- a/nextcord/player.py
+++ b/nextcord/player.py
@@ -148,7 +148,7 @@ class FFmpegAudio(AudioSource):
@@ -127,7 +127,7 @@ class FFmpegAudio(AudioSource):
self,
source: Union[str, io.BufferedIOBase],
*,
@ -23,8 +23,8 @@ index 5d0674cc..fd1c20ef 100644
+ executable: str = "@ffmpeg@",
args: Any,
**subprocess_kwargs: Any,
):
@@ -275,7 +275,7 @@ class FFmpegPCMAudio(FFmpegAudio):
) -> None:
@@ -254,7 +254,7 @@ class FFmpegPCMAudio(FFmpegAudio):
self,
source: Union[str, io.BufferedIOBase],
*,
@ -33,16 +33,16 @@ index 5d0674cc..fd1c20ef 100644
pipe: bool = False,
stderr: Optional[IO[str]] = None,
before_options: Optional[str] = None,
@@ -378,7 +378,7 @@ class FFmpegOpusAudio(FFmpegAudio):
@@ -357,7 +357,7 @@ class FFmpegOpusAudio(FFmpegAudio):
*,
bitrate: int = 128,
codec: Optional[str] = None,
- executable: str = "ffmpeg",
+ executable: str = "@ffmpeg@",
pipe=False,
pipe: bool = False,
stderr=None,
before_options=None,
@@ -532,7 +532,7 @@ class FFmpegOpusAudio(FFmpegAudio):
@@ -510,7 +510,7 @@ class FFmpegOpusAudio(FFmpegAudio):
"""
method = method or "native"
@ -51,16 +51,19 @@ index 5d0674cc..fd1c20ef 100644
probefunc = fallback = None
if isinstance(method, str):
@@ -577,7 +577,7 @@ class FFmpegOpusAudio(FFmpegAudio):
@@ -555,9 +555,9 @@ class FFmpegOpusAudio(FFmpegAudio):
@staticmethod
def _probe_codec_native(
- source, executable: str = "ffmpeg"
+ source, executable: str = "@ffmpeg@"
) -> Tuple[Optional[str], Optional[int]]:
exe = executable[:2] + "probe" if executable in ("ffmpeg", "avconv") else executable
- exe = executable[:2] + "probe" if executable in ("ffmpeg", "avconv") else executable
+ exe = executable[:-4] + "probe" if executable.endswith(("ffmpeg", "avconv")) else executable
args = [
@@ -606,7 +606,7 @@ class FFmpegOpusAudio(FFmpegAudio):
exe,
"-v",
@@ -584,7 +584,7 @@ class FFmpegOpusAudio(FFmpegAudio):
@staticmethod
def _probe_codec_fallback(

1165
pkgs/development/python-modules/python-flirt/Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

12
pkgs/development/python-modules/python-flirt/default.nix
View File

@ -1,18 +1,20 @@
{ lib
, stdenv
, buildPythonPackage
, fetchFromGitHub
, rustPlatform
, libiconv
}:
buildPythonPackage rec {
pname = "python-flirt";
version = "0.7.0";
version = "0.8.6";
src = fetchFromGitHub {
owner = "williballenthin";
repo = "lancelot";
rev = "v${version}";
sha256 = "sha256-FsdnWWfyQte7FDz5ldo+S+3IEtbOIODOeh1fHDP2/4s=";
hash = "sha256-J48tRgJw6JjUrcAQdRELFE50pyDptbmbgYbr+rAK/PA=";
};
postPatch = ''
@ -26,12 +28,16 @@ buildPythonPackage rec {
maturinBuildHook
];
buildInputs = lib.optionals stdenv.isDarwin [
libiconv
];
buildAndTestSubdir = "pyflirt";
cargoDeps = rustPlatform.importCargoLock {
lockFile = ./Cargo.lock;
outputHashes = {
"zydis-3.1.1" = "sha256-/L28cBTCg/S7onDQXnqUoB5udoEO/depmxDUcnfIQEw=";
"zydis-3.1.3" = "sha256-X+aURjNfXGXO4eh6RJ3bi8Eb2kvF09I34ZHffvYjt9I=";
};
};

4
pkgs/development/python-modules/robotframework-pythonlibcore/default.nix
View File

@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "robotframework-pythonlibcore";
version = "4.1.0";
version = "4.1.2";
disabled = pythonOlder "3.7";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "robotframework";
repo = "PythonLibCore";
rev = "v${version}";
hash = "sha256-BgnllONYJjfeKIN8BLfMw1iZrVewtXB1KN8b9KjdtK0=";
hash = "sha256-uS0NwyFqidhrMG7thHM0qau22B/kI16c8aXEUuNdioQ=";
};
nativeCheckInputs = [

33
pkgs/development/python-modules/voluptuous-stubs/default.nix Normal file
View File

@ -0,0 +1,33 @@
{ lib
, buildPythonPackage
, fetchPypi
, mypy
}:
buildPythonPackage rec {
pname = "voluptuous-stubs";
version = "0.1.1";
format = "setuptools";
src = fetchPypi {
inherit pname version;
hash = "sha256-cPscCIJC8g4RAjJStWSM13+DH2ks2RDI+XE8wTXPjMg=";
};
nativeBuildInputs = [
mypy
];
pythonImportsCheck = [
"voluptuous-stubs"
];
doCheck = false;
meta = with lib; {
description = "Typing stubs for voluptuous";
homepage = "https://github.com/ryanwang520/voluptuous-stubs";
license = licenses.mit;
maintainers = with maintainers; [ hexa ];
};
}

143
pkgs/development/r-modules/default.nix
View File

@ -84,13 +84,13 @@ let
# results in
#
# {
# foo = old.foo.overrideDerivation (attrs: {
# foo = old.foo.overrideAttrs (attrs: {
# nativeBuildInputs = attrs.nativeBuildInputs ++ [ pkgs.bar ];
# });
# }
overrideNativeBuildInputs = overrides: old:
lib.mapAttrs (name: value:
(builtins.getAttr name old).overrideDerivation (attrs: {
(builtins.getAttr name old).overrideAttrs (attrs: {
nativeBuildInputs = attrs.nativeBuildInputs ++ value;
})
) overrides;
@ -105,13 +105,13 @@ let
# results in
#
# {
# foo = old.foo.overrideDerivation (attrs: {
# foo = old.foo.overrideAttrs (attrs: {
# buildInputs = attrs.buildInputs ++ [ pkgs.bar ];
# });
# }
overrideBuildInputs = overrides: old:
lib.mapAttrs (name: value:
(builtins.getAttr name old).overrideDerivation (attrs: {
(builtins.getAttr name old).overrideAttrs (attrs: {
buildInputs = attrs.buildInputs ++ value;
})
) overrides;
@ -146,14 +146,14 @@ let
# results in
#
# {
# foo = old.foo.overrideDerivation (attrs: {
# foo = old.foo.overrideAttrs (attrs: {
# nativeBuildInputs = attrs.nativeBuildInputs ++ [ self.bar ];
# propagatedNativeBuildInputs = attrs.propagatedNativeBuildInputs ++ [ self.bar ];
# });
# }
overrideRDepends = overrides: old:
lib.mapAttrs (name: value:
(builtins.getAttr name old).overrideDerivation (attrs: {
(builtins.getAttr name old).overrideAttrs (attrs: {
nativeBuildInputs = attrs.nativeBuildInputs ++ value;
propagatedNativeBuildInputs = attrs.propagatedNativeBuildInputs ++ value;
})
@ -913,7 +913,7 @@ let
];
otherOverrides = old: new: {
gifski = old.gifski.overrideDerivation (attrs: {
gifski = old.gifski.overrideAttrs (attrs: {
cargoDeps = pkgs.rustPlatform.fetchCargoTarball {
src = attrs.src;
sourceRoot = "gifski/src/myrustlib";
@ -929,7 +929,7 @@ let
];
});
stringi = old.stringi.overrideDerivation (attrs: {
stringi = old.stringi.overrideAttrs (attrs: {
postInstall = let
icuName = "icudt52l";
icuSrc = pkgs.fetchzip {
@ -943,72 +943,75 @@ let
'';
});
xml2 = old.xml2.overrideDerivation (attrs: {
xml2 = old.xml2.overrideAttrs (attrs: {
preConfigure = ''
export LIBXML_INCDIR=${pkgs.libxml2.dev}/include/libxml2
patchShebangs configure
'';
});
rzmq = old.rzmq.overrideDerivation (attrs: {
rzmq = old.rzmq.overrideAttrs (attrs: {
preConfigure = "patchShebangs configure";
});
clustermq = old.clustermq.overrideDerivation (attrs: {
clustermq = old.clustermq.overrideAttrs (attrs: {
preConfigure = "patchShebangs configure";
});
Cairo = old.Cairo.overrideDerivation (attrs: {
Cairo = old.Cairo.overrideAttrs (attrs: {
NIX_LDFLAGS = "-lfontconfig";
});
curl = old.curl.overrideDerivation (attrs: {
curl = old.curl.overrideAttrs (attrs: {
preConfigure = "patchShebangs configure";
});
RcppParallel = old.RcppParallel.overrideDerivation (attrs: {
RcppParallel = old.RcppParallel.overrideAttrs (attrs: {
preConfigure = "patchShebangs configure";
});
RcppArmadillo = old.RcppArmadillo.overrideDerivation (attrs: {
RcppArmadillo = old.RcppArmadillo.overrideAttrs (attrs: {
patchPhase = "patchShebangs configure";
});
data_table = old.data_table.overrideDerivation (attrs: {
env.NIX_CFLAGS_COMPILE = attrs.NIX_CFLAGS_COMPILE + " -fopenmp";
data_table = old.data_table.overrideAttrs (attrs: {
env = (attrs.env or { }) // {
NIX_CFLAGS_COMPILE = attrs.env.NIX_CFLAGS_COMPILE + " -fopenmp";
};
patchPhase = "patchShebangs configure";
});
ModelMetrics = old.ModelMetrics.overrideDerivation (attrs: {
env.NIX_CFLAGS_COMPILE = attrs.NIX_CFLAGS_COMPILE
+ lib.optionalString stdenv.isDarwin " -fopenmp";
ModelMetrics = old.ModelMetrics.overrideAttrs (attrs: {
env = (attrs.env or { }) // {
NIX_CFLAGS_COMPILE = attrs.env.NIX_CFLAGS_COMPILE + lib.optionalString stdenv.isDarwin " -fopenmp";
};
});
rpf = old.rpf.overrideDerivation (attrs: {
rpf = old.rpf.overrideAttrs (attrs: {
patchPhase = "patchShebangs configure";
});
rJava = old.rJava.overrideDerivation (attrs: {
rJava = old.rJava.overrideAttrs (attrs: {
preConfigure = ''
export JAVA_CPPFLAGS=-I${pkgs.jdk}/include/
export JAVA_HOME=${pkgs.jdk}
'';
});
JavaGD = old.JavaGD.overrideDerivation (attrs: {
JavaGD = old.JavaGD.overrideAttrs (attrs: {
preConfigure = ''
export JAVA_CPPFLAGS=-I${pkgs.jdk}/include/
export JAVA_HOME=${pkgs.jdk}
'';
});
jqr = old.jqr.overrideDerivation (attrs: {
jqr = old.jqr.overrideAttrs (attrs: {
preConfigure = ''
patchShebangs configure
'';
});
pbdZMQ = old.pbdZMQ.overrideDerivation (attrs: {
pbdZMQ = old.pbdZMQ.overrideAttrs (attrs: {
postPatch = lib.optionalString stdenv.isDarwin ''
for file in R/*.{r,r.in}; do
sed -i 's#system("which \(\w\+\)"[^)]*)#"${pkgs.darwin.cctools}/bin/\1"#g' $file
@ -1016,42 +1019,42 @@ let
'';
});
quarto = old.quarto.overrideDerivation (attrs: {
quarto = old.quarto.overrideAttrs (attrs: {
postPatch = ''
substituteInPlace "R/quarto.R" \
--replace "path_env <- Sys.getenv(\"QUARTO_PATH\", unset = NA)" "path_env <- Sys.getenv(\"QUARTO_PATH\", unset = '${lib.getBin pkgs.quarto}/bin/quarto')"
'';
});
s2 = old.s2.overrideDerivation (attrs: {
s2 = old.s2.overrideAttrs (attrs: {
PKGCONFIG_CFLAGS = "-I${pkgs.openssl.dev}/include";
PKGCONFIG_LIBS = "-Wl,-rpath,${lib.getLib pkgs.openssl}/lib -L${lib.getLib pkgs.openssl}/lib -lssl -lcrypto";
});
Rmpi = old.Rmpi.overrideDerivation (attrs: {
Rmpi = old.Rmpi.overrideAttrs (attrs: {
configureFlags = [
"--with-Rmpi-type=OPENMPI"
];
});
Rmpfr = old.Rmpfr.overrideDerivation (attrs: {
Rmpfr = old.Rmpfr.overrideAttrs (attrs: {
configureFlags = [
"--with-mpfr-include=${pkgs.mpfr.dev}/include"
];
});
RVowpalWabbit = old.RVowpalWabbit.overrideDerivation (attrs: {
RVowpalWabbit = old.RVowpalWabbit.overrideAttrs (attrs: {
configureFlags = [
"--with-boost=${pkgs.boost.dev}" "--with-boost-libdir=${pkgs.boost.out}/lib"
];
});
RAppArmor = old.RAppArmor.overrideDerivation (attrs: {
RAppArmor = old.RAppArmor.overrideAttrs (attrs: {
patches = [ ./patches/RAppArmor.patch ];
LIBAPPARMOR_HOME = pkgs.libapparmor;
});
RMySQL = old.RMySQL.overrideDerivation (attrs: {
RMySQL = old.RMySQL.overrideAttrs (attrs: {
MYSQL_DIR = "${pkgs.libmysqlclient}";
PKGCONFIG_CFLAGS = "-I${pkgs.libmysqlclient.dev}/include/mysql";
NIX_CFLAGS_LINK = "-L${pkgs.libmysqlclient}/lib/mysql -lmysqlclient";
@ -1060,24 +1063,24 @@ let
'';
});
devEMF = old.devEMF.overrideDerivation (attrs: {
devEMF = old.devEMF.overrideAttrs (attrs: {
NIX_CFLAGS_LINK = "-L${pkgs.xorg.libXft.out}/lib -lXft";
NIX_LDFLAGS = "-lX11";
});
slfm = old.slfm.overrideDerivation (attrs: {
slfm = old.slfm.overrideAttrs (attrs: {
PKG_LIBS = "-L${pkgs.blas}/lib -lblas -L${pkgs.lapack}/lib -llapack";
});
SamplerCompare = old.SamplerCompare.overrideDerivation (attrs: {
SamplerCompare = old.SamplerCompare.overrideAttrs (attrs: {
PKG_LIBS = "-L${pkgs.blas}/lib -lblas -L${pkgs.lapack}/lib -llapack";
});
spMC = old.spMC.overrideDerivation (attrs: {
spMC = old.spMC.overrideAttrs (attrs: {
patches = [ ./patches/spMC.patch ];
});
openssl = old.openssl.overrideDerivation (attrs: {
openssl = old.openssl.overrideAttrs (attrs: {
preConfigure = ''
patchShebangs configure
'';
@ -1085,19 +1088,19 @@ let
PKGCONFIG_LIBS = "-Wl,-rpath,${lib.getLib pkgs.openssl}/lib -L${lib.getLib pkgs.openssl}/lib -lssl -lcrypto";
});
websocket = old.websocket.overrideDerivation (attrs: {
websocket = old.websocket.overrideAttrs (attrs: {
PKGCONFIG_CFLAGS = "-I${pkgs.openssl.dev}/include";
PKGCONFIG_LIBS = "-Wl,-rpath,${lib.getLib pkgs.openssl}/lib -L${lib.getLib pkgs.openssl}/lib -lssl -lcrypto";
});
Rserve = old.Rserve.overrideDerivation (attrs: {
Rserve = old.Rserve.overrideAttrs (attrs: {
patches = [ ./patches/Rserve.patch ];
configureFlags = [
"--with-server" "--with-client"
];
});
V8 = old.V8.overrideDerivation (attrs: {
V8 = old.V8.overrideAttrs (attrs: {
postPatch = ''
substituteInPlace configure \
--replace " -lv8_libplatform" ""
@ -1115,45 +1118,45 @@ let
'');
});
acs = old.acs.overrideDerivation (attrs: {
acs = old.acs.overrideAttrs (attrs: {
preConfigure = ''
patchShebangs configure
'';
});
gdtools = old.gdtools.overrideDerivation (attrs: {
gdtools = old.gdtools.overrideAttrs (attrs: {
preConfigure = ''
patchShebangs configure
'';
NIX_LDFLAGS = "-lfontconfig -lfreetype";
});
magick = old.magick.overrideDerivation (attrs: {
magick = old.magick.overrideAttrs (attrs: {
preConfigure = ''
patchShebangs configure
'';
});
libgeos = old.libgeos.overrideDerivation (attrs: {
libgeos = old.libgeos.overrideAttrs (attrs: {
preConfigure = ''
patchShebangs configure
'';
});
protolite = old.protolite.overrideDerivation (attrs: {
protolite = old.protolite.overrideAttrs (attrs: {
preConfigure = ''
patchShebangs configure
'';
});
rpanel = old.rpanel.overrideDerivation (attrs: {
rpanel = old.rpanel.overrideAttrs (attrs: {
preConfigure = ''
export TCLLIBPATH="${pkgs.bwidget}/lib/bwidget${pkgs.bwidget.version}"
'';
TCLLIBPATH = "${pkgs.bwidget}/lib/bwidget${pkgs.bwidget.version}";
});
RPostgres = old.RPostgres.overrideDerivation (attrs: {
RPostgres = old.RPostgres.overrideAttrs (attrs: {
preConfigure = ''
export INCLUDE_DIR=${pkgs.postgresql}/include
export LIB_DIR=${pkgs.postgresql.lib}/lib
@ -1161,33 +1164,35 @@ let
'';
});
OpenMx = old.OpenMx.overrideDerivation (attrs: {
OpenMx = old.OpenMx.overrideAttrs (attrs: {
preConfigure = ''
patchShebangs configure
'';
});
odbc = old.odbc.overrideDerivation (attrs: {
odbc = old.odbc.overrideAttrs (attrs: {
preConfigure = ''
patchShebangs configure
'';
});
x13binary = old.x13binary.overrideDerivation (attrs: {
x13binary = old.x13binary.overrideAttrs (attrs: {
preConfigure = ''
patchShebangs configure
'';
});
geojsonio = old.geojsonio.overrideDerivation (attrs: {
geojsonio = old.geojsonio.overrideAttrs (attrs: {
buildInputs = [ cacert ] ++ attrs.buildInputs;
});
rstan = old.rstan.overrideDerivation (attrs: {
env.NIX_CFLAGS_COMPILE = "${attrs.NIX_CFLAGS_COMPILE} -DBOOST_PHOENIX_NO_VARIADIC_EXPRESSION";
rstan = old.rstan.overrideAttrs (attrs: {
env = (attrs.env or { }) // {
NIX_CFLAGS_COMPILE = attrs.env.NIX_CFLAGS_COMPILE + " -DBOOST_PHOENIX_NO_VARIADIC_EXPRESSION";
};
});
mongolite = old.mongolite.overrideDerivation (attrs: {
mongolite = old.mongolite.overrideAttrs (attrs: {
preConfigure = ''
patchShebangs configure
'';
@ -1195,15 +1200,15 @@ let
PKGCONFIG_LIBS = "-Wl,-rpath,${lib.getLib pkgs.openssl}/lib -L${lib.getLib pkgs.openssl}/lib -L${pkgs.cyrus_sasl.out}/lib -L${pkgs.zlib.out}/lib -lssl -lcrypto -lsasl2 -lz";
});
ps = old.ps.overrideDerivation (attrs: {
ps = old.ps.overrideAttrs (attrs: {
preConfigure = "patchShebangs configure";
});
rlang = old.rlang.overrideDerivation (attrs: {
rlang = old.rlang.overrideAttrs (attrs: {
preConfigure = "patchShebangs configure";
});
systemfonts = old.systemfonts.overrideDerivation (attrs: {
systemfonts = old.systemfonts.overrideAttrs (attrs: {
preConfigure = "patchShebangs configure";
});
@ -1219,13 +1224,13 @@ let
'';
});
lpsymphony = old.lpsymphony.overrideDerivation (attrs: {
lpsymphony = old.lpsymphony.overrideAttrs (attrs: {
preConfigure = ''
patchShebangs configure
'';
});
sodium = old.sodium.overrideDerivation (attrs: with pkgs; {
sodium = old.sodium.overrideAttrs (attrs: with pkgs; {
preConfigure = ''
patchShebangs configure
'';
@ -1233,19 +1238,19 @@ let
buildInputs = [ libsodium.dev ] ++ attrs.buildInputs;
});
keyring = old.keyring.overrideDerivation (attrs: {
keyring = old.keyring.overrideAttrs (attrs: {
preConfigure = ''
patchShebangs configure
'';
});
Rhtslib = old.Rhtslib.overrideDerivation (attrs: {
Rhtslib = old.Rhtslib.overrideAttrs (attrs: {
preConfigure = ''
substituteInPlace R/zzz.R --replace "-lcurl" "-L${pkgs.curl.out}/lib -lcurl"
'';
});
h2o = old.h2o.overrideDerivation (attrs: {
h2o = old.h2o.overrideAttrs (attrs: {
preConfigure = ''
# prevent download of jar file during install and postpone to first use
sed -i '/downloadJar()/d' R/zzz.R
@ -1258,26 +1263,26 @@ let
'';
});
SICtools = old.SICtools.overrideDerivation (attrs: {
SICtools = old.SICtools.overrideAttrs (attrs: {
preConfigure = ''
substituteInPlace src/Makefile --replace "-lcurses" "-lncurses"
'';
});
arrow = old.arrow.overrideDerivation (attrs: {
arrow = old.arrow.overrideAttrs (attrs: {
preConfigure = ''
patchShebangs configure
'';
});
proj4 = old.proj4.overrideDerivation (attrs: {
proj4 = old.proj4.overrideAttrs (attrs: {
preConfigure = ''
substituteInPlace configure \
--replace "-lsqlite3" "-L${lib.makeLibraryPath [ pkgs.sqlite ]} -lsqlite3"
'';
});
rrd = old.rrd.overrideDerivation (attrs: {
rrd = old.rrd.overrideAttrs (attrs: {
preConfigure = ''
patchShebangs configure
'';
@ -1285,7 +1290,7 @@ let
ChIPXpress = old.ChIPXpress.override { hydraPlatforms = []; };
rgl = old.rgl.overrideDerivation (attrs: {
rgl = old.rgl.overrideAttrs (attrs: {
RGL_USE_NULL = "true";
});
@ -1295,11 +1300,11 @@ let
flowClust = old.flowClust.override { platforms = lib.platforms.x86_64 ++ lib.platforms.x86; };
geomorph = old.geomorph.overrideDerivation (attrs: {
geomorph = old.geomorph.overrideAttrs (attrs: {
RGL_USE_NULL = "true";
});
Rhdf5lib = old.Rhdf5lib.overrideDerivation (attrs: {
Rhdf5lib = old.Rhdf5lib.overrideAttrs (attrs: {
propagatedBuildInputs = attrs.propagatedBuildInputs ++ [ pkgs.hdf5.dev ];
});
};

11
pkgs/development/tools/electron/default.nix
View File

@ -24,7 +24,7 @@ let
in
rec {
electron = electron_22;
electron = electron_23;
electron_9 = mkElectron "9.4.4" {
x86_64-linux = "781d6ca834d415c71078e1c2c198faba926d6fce19e31448bbf4450869135450";
@ -159,4 +159,13 @@ rec {
aarch64-darwin = "4ebf838308e93ad9956f3ce3a14b8d41607ffec5cd2054818d0c91b79df101a2";
headers = "1vydsk4fxk5hlpcs0r1s21gdr1kvxip8qc88ncs5w7ybqg31hzsh";
};
electron_23 = mkElectron "23.1.1" {
armv7l-linux = "0f2db28e672021b3c03309155e36d94ec59c7541497847140d500fdec45baf09";
aarch64-linux = "5b5b6bf0a40d063e2a21e2868f3f97ce08a400690389355f2b68d606d4ae614f";
x86_64-linux = "4e820dc1ca957fbe9dbd168925ddf496b9b14c2001bbe5362159411a6bed0cea";
x86_64-darwin = "fb93e045e57410ecf046aee46a0baf413c55256ab7cf170f648a53b5d2e2a055";
aarch64-darwin = "49b0357aa21f317832dd8f620ff18cbf6bcd9aef264113ac67b9d306186c8eef";
headers = "1jq77kqkcy234nsqlizkcmzqs3wsy53438r4cnhhyfr6zx50f5sb";
};
}

6
pkgs/development/tools/ginkgo/default.nix
View File

@ -2,15 +2,15 @@
buildGoModule rec {
pname = "ginkgo";
version = "2.8.0";
version = "2.8.3";
src = fetchFromGitHub {
owner = "onsi";
repo = "ginkgo";
rev = "v${version}";
sha256 = "sha256-KqDGnEvPGIRz41IMaHhmDWTMvTRVhGHwGDd8IpzxVDE=";
sha256 = "sha256-V10AFqCCe+SQeMQ+bBYqrKE/wSxyhpMQg+rNOH5P1e4=";
};
vendorHash = "sha256-jqDZmlCEgU4Nqc2vNH6NGdM74mywdVIj5v96tmRCvjQ=";
vendorHash = "sha256-CNpmcQ623ZINYKwV0ZJi7KuEwzyGOM7t9OOCTx7JKDs=";
# integration tests expect more file changes
# types tests are missing CodeLocation

32
pkgs/development/tools/misc/blackfire/php-probe.nix
View File

@ -13,47 +13,47 @@
let
phpMajor = lib.versions.majorMinor php.version;
version = "1.86.3";
version = "1.86.4";
hashes = {
"x86_64-linux" = {
system = "amd64";
sha256 = {
"8.0" = "Vl16ssG+47CvGNTQBR6aNkEzoSor7B8F71TSN3x2bm0=";
"8.1" = "27yLfDJYTQ3Izr8M6XFEsEWb7WDmuKjKCdSCPfL9HUw=";
"8.2" = "tnxlB+Tq8qeRoHjBNl/CMI0UZb02ayssiRJSMZaTwWI=";
"8.0" = "lgFetQ7Z9GeNOjhNvNnCJstdytC5OamoCNl9MFyoVww=";
"8.1" = "+xbnz3MSBvEV0sST/SGc+wHZe3S7+6HwWL1Gk1wVnJk=";
"8.2" = "isMrxPfmj6b4RBzurZX6Qpd/K2V+vP3k6myV57UjtvY=";
};
};
"i686-linux" = {
system = "i386";
sha256 = {
"8.0" = "NF5R470FC/nrAvk57Y3wStT4EQrWCvntniD9rD1Fv/Y=";
"8.1" = "aAl+oX0QfL6wStUrrhB44JHqAvA4ZLbc3dQyRHJbcNU=";
"8.2" = "SWAC9XlJs1vNWnDWeuXHPOMQoA5kCqiSrWxNpRcXHns=";
"8.0" = "yLxiJqL698ntQl3IVmTb3nEgwmkFMrqFafT8UQfHOLs=";
"8.1" = "eGSs9IAVhpG4al7qbeqOMSxN4OAkI84D7EidTvDgs/s=";
"8.2" = "cqYefnX4Q249W5fToX8nCL+BMSRwDBlEXjtxp0mveh4=";
};
};
"aarch64-linux" = {
system = "arm64";
sha256 = {
"8.0" = "jrTCMkJWzPzzJU7eET+VCwKaiRPqcQKPPIJZrLAuJ6s=";
"8.1" = "WjomQa3+27mW8tR5u++LyVDtyNa7Bj8uS3FHsmdsafo=";
"8.2" = "3SGtZkKosxKsJ/qTlP7BFpnroOTRaWFsvDHq1fK1UBE=";
"8.0" = "etASHFAlcGfR3kgtHfs337XL91QwG5e1GzC7D36JhUM=";
"8.1" = "dYqP7MjwuJcQNpBSteEV9na0C7pvA4sSHrlQ0NTUDJs=";
"8.2" = "+501L16rl5vlD7qFGa0o335GWLaIvrvN2nq11gf+W98=";
};
};
"aarch64-darwin" = {
system = "arm64";
sha256 = {
"8.0" = "MDPgDfIOfjr/VMGrxj7159xJl6P3jPYgoNOkISZBmX4=";
"8.1" = "zV5gjpA9tNGo/p/Is8n8WfGyIdb/IQDbfH1KuD8S4s8=";
"8.2" = "+zwX3r9X/avQvcmNtt5RT3smY+4yfXFo8XPCiV9xWT4=";
"8.0" = "j2DlfsuQw7y3gxc3JpMxR4d6x7pDYWWCQsA4ilkI8Z4=";
"8.1" = "Cg3m2VH1NH54TXe9+2FTpzTHQS2ex+43aJ7XGQqka4o=";
"8.2" = "JxMBqYMHkXMeqKuuum4cmTS+2BFq4OIEFmCCMTdlFoU=";
};
};
"x86_64-darwin" = {
system = "amd64";
sha256 = {
"8.0" = "wEsbQrowYgOlbWUkv+yPtPliC9b/iIUXBsvrCXCL6aM=";
"8.1" = "zl7OX3LlBLxn0oLYlNbVavxL4rho4LS3EZmAB2x6zZs=";
"8.2" = "fYGIDxNeBx+HyPx9lhfNZgKUeMJwZ4KvUcJ4jtwH5nQ=";
"8.0" = "j1K27FsITfpZzVVDIZJeooNv7iIBL8MTCMJHJCnS9XU=";
"8.1" = "JzR7fHg4P0H2I4ldZZYhojsDRVpGlPhg7UMrL4WbLyQ=";
"8.2" = "r48LRQlzMPjH11KH3T05x/nCSDmw6KSiiUt78NcKyOk=";
};
};
};

4
pkgs/development/tools/misc/deheader/default.nix
View File

@ -9,14 +9,14 @@
stdenv.mkDerivation rec {
pname = "deheader";
version = "1.8";
version = "1.10";
outputs = [ "out" "man" ];
src = fetchFromGitLab {
owner = "esr";
repo = "deheader";
rev = version;
sha256 = "sha256-sjxgUtdsi/sfxOViDj7l8591TSYwtCzDQcHsk9ClXuM=";
sha256 = "sha256-dYTHvFWlt3aM/fdZFge7GBdd9bfCrEcp7ULJuBl71Xs=";
};
buildInputs = [ python3 ];

6
pkgs/development/tools/rust/cargo-edit/default.nix
View File

@ -10,16 +10,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-edit";
version = "0.11.8";
version = "0.11.9";
src = fetchFromGitHub {
owner = "killercup";
repo = pname;
rev = "v${version}";
hash = "sha256-v6EhYfdub4zuWX5oPzNWpqEgv0qoZujt00SCP+RoKfU=";
hash = "sha256-2anmuenywCdmPncsof2nD0xrerMFMP3yhTMXs+Qux0s=";
};
cargoSha256 = "sha256-R7FFWVOpzQ/u/KVnJQuYwLmmqei2ZymP610XrA5HZr0=";
cargoSha256 = "sha256-S3Krmkr2sJO5m0ZlEvwrCqAqFWFuP1nKu4UAoJQP7Bg=";
nativeBuildInputs = [ pkg-config ];

6
pkgs/os-specific/linux/fscrypt/default.nix
View File

@ -4,13 +4,13 @@
buildGoModule rec {
pname = "fscrypt";
version = "0.3.3";
version = "0.3.4";
src = fetchFromGitHub {
owner = "google";
repo = "fscrypt";
rev = "v${version}";
hash = "sha256-kkcZuX8tB7N8l9O3X6H92EqEqdAcqSbX+pwr7GrcRFY=";
hash = "sha256-4Im3YWhLs5Q+o4DtpSuSMuKtKqXaICL9/EB0q5um6mQ=";
};
postPatch = ''
@ -19,7 +19,7 @@ buildGoModule rec {
--replace "/usr/local" "$out"
'';
vendorSha256 = "sha256-6zcHz7ePJFSxxfIlhVK2VEf6+soBoUInT9ZsZK/Ag78=";
vendorHash = "sha256-APW0XM6fTQOCw4tE1NA5VNN3fBUmsvn99NqqJnB3Q0s=";
doCheck = false;

4
pkgs/servers/freeradius/default.nix
View File

@ -24,11 +24,11 @@ assert withRest -> withJson;
stdenv.mkDerivation rec {
pname = "freeradius";
version = "3.2.1";
version = "3.2.2";
src = fetchurl {
url = "ftp://ftp.freeradius.org/pub/freeradius/freeradius-server-${version}.tar.gz";
hash = "sha256-Xw7seQike8dSV6SIAsrK1Sc/HBOyaA8fhHzwrISKyBA=";
hash = "sha256-FEv37X7fIcrL0HUdQWAI+s4VZwI7ODKxGm2wejsH2cA=";
};
nativeBuildInputs = [ autoreconfHook ];

36
pkgs/servers/geospatial/martin/default.nix
View File

@ -2,22 +2,50 @@
rustPlatform.buildRustPackage rec {
pname = "martin";
version = "0.7.0";
version = "0.7.2";
src = fetchFromGitHub {
owner = "maplibre";
repo = "martin";
rev = "v${version}";
hash = "sha256-UIAsij4fFxGAoKluQFAtrfgKIteM+LQtAKRDvRaNLSg=";
hash = "sha256-F7CAP7PrG71EdAe2hb13L/fKSiFyNHYHHweqg2GiJeU=";
};
cargoHash = "sha256-NtPI8MZNUn+QYPuG9WNMVZJW6jmyi5gEfNw8MrkiwUQ=";
cargoHash = "sha256-/bIMQJ2+39PShVx/W/tOeD+EjPNLw4NianwJl9wkwmk=";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security;
doCheck = false;
checkFlags = [
"--skip function_source_schemas"
"--skip function_source_tile"
"--skip function_source_tilejson"
"--skip pg_get_function_tiles"
"--skip pg_get_function_source_ok_rewrite"
"--skip pg_get_function_source_ok"
"--skip pg_get_composite_source_tile_minmax_zoom_ok"
"--skip pg_get_function_source_query_params_ok"
"--skip pg_get_composite_source_tile_ok"
"--skip pg_get_catalog"
"--skip pg_get_composite_source_ok"
"--skip pg_get_health_returns_ok"
"--skip pg_get_table_source_ok"
"--skip pg_get_table_source_rewrite"
"--skip pg_null_functions"
"--skip utils::test_utils::tests::test_bad_os_str"
"--skip utils::test_utils::tests::test_get_env_str"
"--skip pg_get_table_source_multiple_geom_tile_ok"
"--skip pg_get_table_source_tile_minmax_zoom_ok"
"--skip pg_tables_feature_id"
"--skip pg_get_table_source_tile_ok"
"--skip table_source_schemas"
"--skip tables_srid_ok"
"--skip tables_tile_ok"
"--skip table_source"
"--skip tables_tilejson"
"--skip tables_multiple_geom_ok"
];
meta = with lib; {
description = "Blazing fast and lightweight PostGIS vector tiles server";

38
pkgs/servers/home-assistant/stubs.nix Normal file
View File

@ -0,0 +1,38 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, poetry-core
, home-assistant
}:
buildPythonPackage rec {
pname = "homeassistant-stubs";
version = "2023.2.5";
format = "pyproject";
src = fetchFromGitHub {
owner = "KapJI";
repo = "homeassistant-stubs";
rev = "refs/tags/${version}";
hash = "sha256-MQYk4DWvmqtPl00L1c00JclKkTZe9EYMrm/LucUHBE0=";
};
nativeBuildInputs = [
poetry-core
home-assistant
];
pythonImportsCheck = [
"homeassistant-stubs"
];
doCheck = false;
meta = with lib; {
description = "Typing stubs for Home Assistant Core";
homepage = "https://github.com/KapJI/homeassistant-stubs";
changelog = "https://github.com/KapJI/homeassistant-stubs/releases/tag/${version}";
license = licenses.mit;
maintainers = teams.home-assistant.members;
};
}

6
pkgs/servers/minio/default.nix
View File

@ -15,16 +15,16 @@ let
in
buildGoModule rec {
pname = "minio";
version = "2023-01-25T00-19-54Z";
version = "2023-02-17T17-52-43Z";
src = fetchFromGitHub {
owner = "minio";
repo = "minio";
rev = "RELEASE.${version}";
sha256 = "sha256-1vXi9BnjTCH7B/I7tkfvm2AZtLK7a0GcMsW9gud8U/4=";
sha256 = "sha256-AVqGzb3abJotsHdUw7MScjut1E+5ZX2NrvQKQ0ck2lY=";
};
vendorHash = "sha256-NGuslbHh0tDPQp+zvKnylLkssMglhgesLX5VT2BjDo8=";
vendorHash = "sha256-Bg0AO2hV8dqOuSN9NJsdXbE/YVpYvU/3OkB+E83/QHU=";
doCheck = false;

6
pkgs/servers/soft-serve/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "soft-serve";
version = "0.4.5";
version = "0.4.6";
src = fetchFromGitHub {
owner = "charmbracelet";
repo = "soft-serve";
rev = "v${version}";
sha256 = "sha256-vNcM/eFz+vSEnJTgnvn7Cfx7ZDiXY9RlgU3zQlqYnss=";
sha256 = "sha256-7LegGf/fCWJQfiayqkbg0S13NOICzxxCWxS+vXHmP08=";
};
vendorHash = "sha256-DZlzgoQ8F3L4hErKnBD14R49pHPJy1/Ut5k004qZzUw=";
vendorHash = "sha256-k/IKpeSjgCYQRBRW/TMThQOFWfx1BFJpHpwMQxITkxY=";
doCheck = false;

19
pkgs/servers/web-apps/5etools/default.nix Normal file
View File

@ -0,0 +1,19 @@
{ fetchFromGitHub, lib }:
fetchFromGitHub rec {
pname = "5etools";
version = "1.175.2";
owner = "5etools-mirror-1";
repo = "5etools-mirror-1.github.io";
rev = "v${version}";
hash = "sha256-0+QjtcmKsfcSehvn4DChBhSVooy9wlqaSCgeAFgeL+w=";
meta = with lib; {
description = "A suite of browser-based tools for players and DMs of D&D 5e";
homepage = "https://5e.tools";
changelog = "https://github.com/5etools-mirror-1/5etools-mirror-1.github.io/releases/tag/v${version}";
license = [ licenses.mit ];
maintainers = with maintainers; [ urandom ];
};
}

3
pkgs/shells/zsh/zimfw/default.nix
View File

@ -31,7 +31,8 @@ stdenv.mkDerivation rec {
## the `zimfw.zsh` where we currently are.
postFixup = ''
substituteInPlace $out/zimfw.zsh \
--replace "\''${ZIM_HOME}/zimfw.zsh" "$out/zimfw.zsh"
--replace "\''${ZIM_HOME}/zimfw.zsh" "$out/zimfw.zsh" \
--replace "\''${(q-)ZIM_HOME}/zimfw.zsh" "$out/zimfw.zsh"
'';
meta = with lib; {

4
pkgs/tools/misc/esphome/default.nix
View File

@ -16,14 +16,14 @@ let
in
python.pkgs.buildPythonApplication rec {
pname = "esphome";
version = "2023.2.2";
version = "2023.2.4";
format = "setuptools";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-AhajZ9FaeG2WneYS2Gc8JU1Cii4StU+k+WMFF/fgP1w=";
hash = "sha256-xy4g0BVJz4NjM6NoKNa5TrUSvr96O+eviuBqLz9LWso=";
};
postPatch = ''

2
pkgs/tools/misc/mandoc/default.nix
View File

@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
configureLocal = ''
MANPATH_DEFAULT="/run/current-system/sw/share/man"
MANPATH_BASE="$MANPATH_DEFAULT"
OSNAME="NixOS"
OSNAME="Nixpkgs"
PREFIX="$out"
LD_OHASH="-lutil"
# Use symlinks instead of hardlinks (more commonly used in nixpkgs)

4
pkgs/tools/misc/toybox/default.nix
View File

@ -12,13 +12,13 @@ in
stdenv.mkDerivation rec {
pname = "toybox";
version = "0.8.8";
version = "0.8.9";
src = fetchFromGitHub {
owner = "landley";
repo = pname;
rev = version;
sha256 = "sha256-T3qE9xlcEoZOcY52XfYPpN34zzQl6mfcRnyuldnIvCk=";
sha256 = "sha256-3boPoq/wm0af0DqEWcUCUyCmVFopVMitRHJI1xsjAWM=";
};
depsBuildBuild = optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ buildPackages.stdenv.cc ];

3
pkgs/tools/networking/grpc_cli/default.nix
View File

@ -14,6 +14,7 @@ stdenv.mkDerivation rec {
buildInputs = [ curl numactl ];
cmakeFlags = [ "-DgRPC_BUILD_TESTS=ON" ];
makeFlags = [ "grpc_cli" ];
env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isAarch64 "-Wno-error=format-security";
installPhase = ''
runHook preInstall
@ -26,6 +27,6 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/grpc/grpc";
license = licenses.asl20;
maintainers = with maintainers; [ doriath ];
platforms = [ "x86_64-linux" ];
platforms = platforms.linux;
};
}

6
pkgs/tools/package-management/pdm/default.nix
View File

@ -24,13 +24,13 @@ in
with python.pkgs;
buildPythonApplication rec {
pname = "pdm";
version = "2.4.3";
version = "2.4.6";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-Gp8ju26XX0A2+LX+7b9OuEBJx4qUwR2tNUq+Chj56q4=";
hash = "sha256-g+fQxq2kwhNXXEJG2n5n4f9GMkmmLsjpHoay152fcVQ=";
};
nativeBuildInputs = [
@ -86,6 +86,8 @@ buildPythonApplication rec {
"test_use_invalid_wrapper_python"
];
__darwinAllowLocalNetworking = true;
meta = with lib; {
homepage = "https://pdm.fming.dev";
changelog = "https://github.com/pdm-project/pdm/releases/tag/${version}";

7
pkgs/top-level/all-packages.nix
View File

@ -17183,7 +17183,8 @@ with pkgs;
electron_19
electron_20
electron_21
electron_22;
electron_22
electron_23;
autobuild = callPackage ../development/tools/misc/autobuild { };
@ -24256,6 +24257,8 @@ with pkgs;
_389-ds-base = callPackage ../servers/ldap/389 { };
_5etools = callPackage ../servers/web-apps/5etools {};
adguardhome = callPackage ../servers/adguardhome {};
alerta = callPackage ../servers/monitoring/alerta/client.nix { };
@ -30965,7 +30968,7 @@ with pkgs;
kubernetes-helm-wrapped = wrapHelm kubernetes-helm {};
kubernetes-helmPlugins = dontRecurseIntoAttrs (callPackage ../applications/networking/cluster/helm/plugins { });
kubernetes-helmPlugins = recurseIntoAttrs (callPackage ../applications/networking/cluster/helm/plugins { });
chart-testing = callPackage ../applications/networking/cluster/helm/chart-testing { };

6
pkgs/top-level/emscripten-packages.nix
View File

@ -8,7 +8,7 @@ with pkgs;
rec {
json_c = (pkgs.json_c.override {
stdenv = pkgs.emscriptenStdenv;
}).overrideDerivation
}).overrideAttrs
(old: {
nativeBuildInputs = [ pkg-config cmake ];
propagatedBuildInputs = [ zlib ];
@ -47,7 +47,7 @@ rec {
libxml2 = (pkgs.libxml2.override {
stdenv = emscriptenStdenv;
pythonSupport = false;
}).overrideDerivation
}).overrideAttrs
(old: {
propagatedBuildInputs = [ zlib ];
nativeBuildInputs = (old.nativeBuildInputs or []) ++ [ pkg-config ];
@ -138,7 +138,7 @@ rec {
zlib = (pkgs.zlib.override {
stdenv = pkgs.emscriptenStdenv;
}).overrideDerivation
}).overrideAttrs
(old: {
nativeBuildInputs = (old.nativeBuildInputs or []) ++ [ pkg-config ];
# we need to reset this setting!

4
pkgs/top-level/python-packages.nix
View File

@ -4380,6 +4380,8 @@ self: super: with self; {
homeassistant-pyozw = callPackage ../development/python-modules/homeassistant-pyozw { };
homeassistant-stubs = callPackage ../servers/home-assistant/stubs.nix { };
homeconnect = callPackage ../development/python-modules/homeconnect { };
homematicip = callPackage ../development/python-modules/homematicip { };
@ -12180,6 +12182,8 @@ self: super: with self; {
voluptuous-serialize = callPackage ../development/python-modules/voluptuous-serialize { };
voluptuous-stubs = callPackage ../development/python-modules/voluptuous-stubs { };
volvooncall = callPackage ../development/python-modules/volvooncall { };
vowpalwabbit = callPackage ../development/python-modules/vowpalwabbit { };