colin/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] 2022-04-15 18:01:30 +00:00 committed by GitHub
commit 40f288fa90
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
21 changed files with 183 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
View File

@ -504,6 +504,13 @@
</listitem>
</itemizedlist>
</listitem>
<listitem>
<para>
In the ncdns module, the default value of
<literal>services.ncdns.address</literal> has been changed to
the IPv6 loopback address (<literal>::1</literal>).
</para>
</listitem>
<listitem>
<para>
<literal>openssh</literal> has been update to 8.9p1, changing

2
nixos/doc/manual/release-notes/rl-2205.section.md
View File

@ -160,6 +160,8 @@ In addition to numerous new and upgraded packages, this release has the followin
(`services.pdns-recursor.dns.address`, `services.pdns-recursor.dns.allowFrom`);
- allow only local connections to the REST API server (`services.pdns-recursor.api.allowFrom`).
- In the ncdns module, the default value of `services.ncdns.address` has been changed to the IPv6 loopback address (`::1`).
- `openssh` has been update to 8.9p1, changing the FIDO security key middleware interface.
- `git` no longer hardcodes the path to openssh' ssh binary to reduce the amount of rebuilds. If you are using git with ssh remotes and do not have a ssh binary in your enviroment consider adding `openssh` to it or switching to `gitFull`.

4
nixos/modules/services/networking/ncdns.nix
View File

@ -58,7 +58,7 @@ in
address = mkOption {
type = types.str;
default = "127.0.0.1";
default = "[::1]";
description = ''
The IP address the ncdns resolver will bind to. Leave this unchanged
if you do not wish to directly expose the resolver.
@ -202,7 +202,7 @@ in
config = mkIf cfg.enable {
services.pdns-recursor = mkIf cfgs.pdns-recursor.resolveNamecoin {
forwardZonesRecurse.bit = "127.0.0.1:${toString cfg.port}";
forwardZonesRecurse.bit = "${cfg.address}:${toString cfg.port}";
luaConfig =
if cfg.dnssec.enable
then ''readTrustAnchorsFromFile("${cfg.dnssec.keys.public}")''

15
nixos/tests/ncdns.nix
View File

@ -29,10 +29,10 @@ in
};
nodes.server = { ... }: {
networking.nameservers = [ "127.0.0.1" ];
networking.nameservers = [ "::1" ];
services.namecoind.rpc = {
address = "127.0.0.1";
address = "::1";
user = "namecoin";
password = "secret";
port = 8332;
@ -45,7 +45,7 @@ in
script = ''
while true; do
echo -e "HTTP/1.1 200 OK\n\n $(<${fakeReply})\n" \
| ${pkgs.netcat}/bin/nc -N -l 127.0.0.1 8332
| ${pkgs.netcat}/bin/nc -N -l ::1 8332
done
'';
};
@ -58,14 +58,10 @@ in
identity.address = "1.0.0.1";
};
services.pdns-recursor = {
enable = true;
dns.allowFrom = [ "127.0.0.0/8" ];
resolveNamecoin = true;
};
services.pdns-recursor.enable = true;
services.pdns-recursor.resolveNamecoin = true;
environment.systemPackages = [ pkgs.dnsutils ];
};
testScript =
@ -91,6 +87,7 @@ in
assert "example.com" in server.succeed("dig SOA @localhost -p 5333 bit")
with subtest("bit. zone forwarding works"):
server.wait_for_unit("pdns-recursor")
assert "1.2.3.4" in server.succeed("host test.bit")
'';
})

53
pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/kotato-10.12-sdk.patch
View File

@ -1,8 +1,8 @@
diff --git a/Telegram/SourceFiles/platform/mac/file_bookmark_mac.mm b/Telegram/SourceFiles/platform/mac/file_bookmark_mac.mm
index 337055443..09604b117 100644
index 9e9a1744b..ae55f873f 100644
--- a/Telegram/SourceFiles/platform/mac/file_bookmark_mac.mm
+++ b/Telegram/SourceFiles/platform/mac/file_bookmark_mac.mm
@@ -12,6 +12,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
@@ -14,6 +14,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include <Cocoa/Cocoa.h>
#include <CoreFoundation/CFURL.h>
@ -11,10 +11,10 @@ index 337055443..09604b117 100644
namespace Platform {
namespace {
diff --git a/Telegram/SourceFiles/platform/mac/specific_mac.mm b/Telegram/SourceFiles/platform/mac/specific_mac.mm
index 3b4395ae3..7f8ee401f 100644
index 1d68457bb..ac8c4e0ab 100644
--- a/Telegram/SourceFiles/platform/mac/specific_mac.mm
+++ b/Telegram/SourceFiles/platform/mac/specific_mac.mm
@@ -119,6 +119,7 @@ PermissionStatus GetPermissionStatus(PermissionType type) {
@@ -118,6 +118,7 @@ PermissionStatus GetPermissionStatus(PermissionType type) {
switch (type) {
case PermissionType::Microphone:
case PermissionType::Camera:
@ -22,7 +22,7 @@ index 3b4395ae3..7f8ee401f 100644
const auto nativeType = (type == PermissionType::Microphone)
? AVMediaTypeAudio
: AVMediaTypeVideo;
@@ -133,6 +134,7 @@ PermissionStatus GetPermissionStatus(PermissionType type) {
@@ -132,6 +133,7 @@ PermissionStatus GetPermissionStatus(PermissionType type) {
return PermissionStatus::Denied;
}
}
@ -30,7 +30,7 @@ index 3b4395ae3..7f8ee401f 100644
break;
}
return PermissionStatus::Granted;
@@ -142,6 +144,7 @@ void RequestPermission(PermissionType type, Fn<void(PermissionStatus)> resultCal
@@ -141,6 +143,7 @@ void RequestPermission(PermissionType type, Fn<void(PermissionStatus)> resultCal
switch (type) {
case PermissionType::Microphone:
case PermissionType::Camera:
@ -38,7 +38,7 @@ index 3b4395ae3..7f8ee401f 100644
const auto nativeType = (type == PermissionType::Microphone)
? AVMediaTypeAudio
: AVMediaTypeVideo;
@@ -152,6 +155,7 @@ void RequestPermission(PermissionType type, Fn<void(PermissionStatus)> resultCal
@@ -151,6 +154,7 @@ void RequestPermission(PermissionType type, Fn<void(PermissionStatus)> resultCal
});
}];
}
@ -217,7 +217,7 @@ index 464f87c9c..9a008c75e 100644
controller:(not_null<Window::Controller*>)controller
Submodule Telegram/ThirdParty/tgcalls contains modified content
diff --git a/Telegram/ThirdParty/tgcalls/tgcalls/platform/darwin/TGRTCDefaultVideoDecoderFactory.mm b/Telegram/ThirdParty/tgcalls/tgcalls/platform/darwin/TGRTCDefaultVideoDecoderFactory.mm
index 8a4417b..2d9794e 100644
index b280c1b..a1ed0d2 100644
--- a/Telegram/ThirdParty/tgcalls/tgcalls/platform/darwin/TGRTCDefaultVideoDecoderFactory.mm
+++ b/Telegram/ThirdParty/tgcalls/tgcalls/platform/darwin/TGRTCDefaultVideoDecoderFactory.mm
@@ -71,7 +71,7 @@
@ -239,10 +239,10 @@ index 8a4417b..2d9794e 100644
if ([info.name isEqualToString:kRTCVideoCodecH265Name]) {
return [[TGRTCVideoDecoderH265 alloc] init];
diff --git a/Telegram/ThirdParty/tgcalls/tgcalls/platform/darwin/TGRTCDefaultVideoEncoderFactory.mm b/Telegram/ThirdParty/tgcalls/tgcalls/platform/darwin/TGRTCDefaultVideoEncoderFactory.mm
index 2901417..ac9ec2a 100644
index 9960607..f3659b3 100644
--- a/Telegram/ThirdParty/tgcalls/tgcalls/platform/darwin/TGRTCDefaultVideoEncoderFactory.mm
+++ b/Telegram/ThirdParty/tgcalls/tgcalls/platform/darwin/TGRTCDefaultVideoEncoderFactory.mm
@@ -76,7 +76,7 @@
@@ -89,7 +89,7 @@
[result addObject:h265Info];
}
}
@ -251,7 +251,7 @@ index 2901417..ac9ec2a 100644
if (@available(macOS 10.13, *)) {
if ([[AVAssetExportSession allExportPresets] containsObject:AVAssetExportPresetHEVCHighestQuality]) {
[result addObject:h265Info];
@@ -112,7 +112,7 @@
@@ -129,7 +129,7 @@
return [[TGRTCVideoEncoderH265 alloc] initWithCodecInfo:info];
}
}
@ -261,7 +261,7 @@ index 2901417..ac9ec2a 100644
if ([info.name isEqualToString:kRTCVideoCodecH265Name]) {
return [[TGRTCVideoEncoderH265 alloc] initWithCodecInfo:info];
diff --git a/Telegram/ThirdParty/tgcalls/tgcalls/platform/darwin/VideoCameraCapturerMac.mm b/Telegram/ThirdParty/tgcalls/tgcalls/platform/darwin/VideoCameraCapturerMac.mm
index de92427..9a5b20d 100644
index bf99063..b717645 100644
--- a/Telegram/ThirdParty/tgcalls/tgcalls/platform/darwin/VideoCameraCapturerMac.mm
+++ b/Telegram/ThirdParty/tgcalls/tgcalls/platform/darwin/VideoCameraCapturerMac.mm
@@ -507,8 +507,7 @@ static tgcalls::DarwinVideoTrackSource *getObjCVideoSource(const rtc::scoped_ref
@ -274,11 +274,20 @@ index de92427..9a5b20d 100644
RTCLogError(@"Dropped sample buffer. Reason: %@", droppedReason);
}
@@ -682,7 +681,7 @@ static tgcalls::DarwinVideoTrackSource *getObjCVideoSource(const rtc::scoped_ref
int closest = -1;
CMTime result;
for (int i = 0; i < format.videoSupportedFrameRateRanges.count; i++) {
- const auto rateRange = format.videoSupportedFrameRateRanges[i];
+ const AVFrameRateRange *rateRange = format.videoSupportedFrameRateRanges[i];
int gap = abs(rateRange.minFrameRate - target);
if (gap <= closest || closest == -1) {
closest = gap;
diff --git a/Telegram/ThirdParty/tgcalls/tgcalls/platform/darwin/VideoMetalViewMac.mm b/Telegram/ThirdParty/tgcalls/tgcalls/platform/darwin/VideoMetalViewMac.mm
index bcabcf7..de7b6c7 100644
index 4ef8630..3fc753c 100644
--- a/Telegram/ThirdParty/tgcalls/tgcalls/platform/darwin/VideoMetalViewMac.mm
+++ b/Telegram/ThirdParty/tgcalls/tgcalls/platform/darwin/VideoMetalViewMac.mm
@@ -245,9 +245,11 @@ private:
@@ -243,9 +243,11 @@ private:
layer.framebufferOnly = true;
layer.opaque = false;
// layer.cornerRadius = 4;
@ -290,7 +299,7 @@ index bcabcf7..de7b6c7 100644
// layer.presentsWithTransaction = YES;
layer.backgroundColor = [NSColor clearColor].CGColor;
layer.contentsGravity = kCAGravityResizeAspectFill;
@@ -334,9 +336,7 @@ private:
@@ -332,9 +334,7 @@ private:
- (RTCVideoRotation)rtcFrameRotation {
if (_rotationOverride) {
RTCVideoRotation rotation;
@ -323,10 +332,10 @@ index 5491702..32befc6 100644
}
diff --git a/Telegram/lib_base/base/platform/mac/base_info_mac.mm b/Telegram/lib_base/base/platform/mac/base_info_mac.mm
index 29e368f..ea1f65f 100644
index f1f259a..6629eb6 100644
--- a/Telegram/lib_base/base/platform/mac/base_info_mac.mm
+++ b/Telegram/lib_base/base/platform/mac/base_info_mac.mm
@@ -203,16 +203,20 @@ void Finish() {
@@ -226,16 +226,20 @@ void Finish() {
}
void OpenInputMonitoringPrivacySettings() {
@ -348,10 +357,10 @@ index 29e368f..ea1f65f 100644
}
diff --git a/Telegram/lib_base/base/platform/mac/base_system_media_controls_mac.mm b/Telegram/lib_base/base/platform/mac/base_system_media_controls_mac.mm
index c86ac77..b081162 100644
index 6102705..8981239 100644
--- a/Telegram/lib_base/base/platform/mac/base_system_media_controls_mac.mm
+++ b/Telegram/lib_base/base/platform/mac/base_system_media_controls_mac.mm
@@ -271,6 +271,7 @@ void SystemMediaControls::setThumbnail(const QImage &thumbnail) {
@@ -277,6 +277,7 @@ void SystemMediaControls::setThumbnail(const QImage &thumbnail) {
if (thumbnail.isNull()) {
return;
}
@ -359,7 +368,7 @@ index c86ac77..b081162 100644
if (@available(macOS 10.13.2, *)) {
const auto copy = thumbnail;
[_private->info
@@ -284,6 +285,7 @@ void SystemMediaControls::setThumbnail(const QImage &thumbnail) {
@@ -290,6 +291,7 @@ void SystemMediaControls::setThumbnail(const QImage &thumbnail) {
forKey:MPMediaItemPropertyArtwork];
updateDisplay();
}
@ -367,7 +376,7 @@ index c86ac77..b081162 100644
}
void SystemMediaControls::setDuration(int duration) {
@@ -302,10 +304,12 @@ void SystemMediaControls::setVolume(float64 volume) {
@@ -308,10 +310,12 @@ void SystemMediaControls::setVolume(float64 volume) {
}
void SystemMediaControls::clearThumbnail() {
@ -380,7 +389,7 @@ index c86ac77..b081162 100644
}
void SystemMediaControls::clearMetadata() {
@@ -367,9 +371,11 @@ bool SystemMediaControls::volumeSupported() const {
@@ -373,9 +377,11 @@ bool SystemMediaControls::volumeSupported() const {
}
bool SystemMediaControls::Supported() {

21
pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt-10.12-sdk.patch
View File

@ -1,3 +1,16 @@
diff --git a/src/rtc_base/async_resolver.cc b/src/rtc_base/async_resolver.cc
index ad1598f2..fe9c3832 100644
--- a/src/rtc_base/async_resolver.cc
+++ b/src/rtc_base/async_resolver.cc
@@ -57,7 +57,7 @@ void GlobalGcdRunTask(void* context) {
// Post a task into the system-defined global concurrent queue.
void PostTaskToGlobalQueue(std::unique_ptr<webrtc::QueuedTask> task) {
- dispatch_queue_global_t global_queue =
+ dispatch_queue_t global_queue =
dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0);
webrtc::QueuedTask* context = task.release();
dispatch_async_f(global_queue, context, &GlobalGcdRunTask);
diff --git a/src/rtc_base/system/gcd_helpers.m b/src/rtc_base/system/gcd_helpers.m
index fd9a361f..3a63be6d 100644
--- a/src/rtc_base/system/gcd_helpers.m
@ -13,10 +26,10 @@ index fd9a361f..3a63be6d 100644
dispatch_set_target_queue(queue, target);
return queue;
diff --git a/src/sdk/objc/components/video_codec/nalu_rewriter.cc b/src/sdk/objc/components/video_codec/nalu_rewriter.cc
index 61c1e7d6..b19f3f91 100644
index 1121c921..f21926b0 100644
--- a/src/sdk/objc/components/video_codec/nalu_rewriter.cc
+++ b/src/sdk/objc/components/video_codec/nalu_rewriter.cc
@@ -245,10 +245,7 @@ bool H265CMSampleBufferToAnnexBBuffer(
@@ -242,10 +242,7 @@ bool H265CMSampleBufferToAnnexBBuffer(
int nalu_header_size = 0;
size_t param_set_count = 0;
OSStatus status = noErr;
@ -28,7 +41,7 @@ index 61c1e7d6..b19f3f91 100644
RTC_LOG(LS_ERROR) << "Not supported.";
return false;
}
@@ -271,10 +268,7 @@ bool H265CMSampleBufferToAnnexBBuffer(
@@ -268,10 +265,7 @@ bool H265CMSampleBufferToAnnexBBuffer(
size_t param_set_size = 0;
const uint8_t* param_set = nullptr;
for (size_t i = 0; i < param_set_count; ++i) {
@ -40,7 +53,7 @@ index 61c1e7d6..b19f3f91 100644
RTC_LOG(LS_ERROR) << "Not supported.";
return false;
}
@@ -514,11 +508,7 @@ CMVideoFormatDescriptionRef CreateH265VideoFormatDescription(
@@ -501,11 +495,7 @@ CMVideoFormatDescriptionRef CreateH265VideoFormatDescription(
// Parse the SPS and PPS into a CMVideoFormatDescription.
CMVideoFormatDescriptionRef description = nullptr;
OSStatus status = noErr;

25
pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix
View File

@ -25,8 +25,8 @@
, abseil-cpp
, pipewire
, mesa
, libglvnd
, libepoxy
, libdrm
, libGL
, Cocoa
, AppKit
, IOKit
@ -46,13 +46,13 @@
stdenv.mkDerivation {
pname = "tg_owt";
version = "unstable-2022-02-26";
version = "unstable-2022-04-13";
src = fetchFromGitHub {
owner = "desktop-app";
repo = "tg_owt";
rev = "a264028ec71d9096e0aa629113c49c25db89d260";
sha256 = "sha256-JR+M+4w0QsQLfIunZ/7W+5Knn+gX+RR3DBrpOz7q44I=";
rev = "63a934db1ed212ebf8aaaa20f0010dd7b0d7b396";
sha256 = "sha256-WddSsQ9KW1zYyYckzdUOvfFZArYAbyvXmABQNMtK6cM=";
fetchSubmodules = true;
};
@ -61,6 +61,17 @@ stdenv.mkDerivation {
./tg_owt-10.12-sdk.patch
];
postPatch = lib.optionalString stdenv.isLinux ''
substituteInPlace src/modules/desktop_capture/linux/egl_dmabuf.cc \
--replace '"libEGL.so.1"' '"${libGL}/lib/libEGL.so.1"'
substituteInPlace src/modules/desktop_capture/linux/egl_dmabuf.cc \
--replace '"libGL.so.1"' '"${libGL}/lib/libGL.so.1"'
substituteInPlace src/modules/desktop_capture/linux/egl_dmabuf.cc \
--replace '"libgbm.so.1"' '"${mesa}/lib/libgbm.so.1"'
substituteInPlace src/modules/desktop_capture/linux/egl_dmabuf.cc \
--replace '"libdrm.so.2"' '"${libdrm}/lib/libdrm.so.2"'
'';
outputs = [ "out" "dev" ];
nativeBuildInputs = [ pkg-config cmake ninja yasm ];
@ -87,8 +98,8 @@ stdenv.mkDerivation {
glib
pipewire
mesa
libepoxy
libglvnd
libdrm
libGL
] ++ lib.optionals stdenv.isDarwin [
Cocoa
AppKit

11
pkgs/applications/version-management/git-and-tools/glab/default.nix
View File

@ -1,4 +1,4 @@
{ lib, buildGoModule, fetchFromGitHub }:
{ lib, buildGoModule, fetchFromGitHub, installShellFiles, stdenv }:
buildGoModule rec {
pname = "glab";
@ -24,6 +24,15 @@ buildGoModule rec {
subPackages = [ "cmd/glab" ];
nativeBuildInputs = [ installShellFiles ];
postInstall = lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) ''
installShellCompletion --cmd glab \
--bash <($out/bin/glab completion -s bash) \
--fish <($out/bin/glab completion -s fish) \
--zsh <($out/bin/glab completion -s zsh)
'';
meta = with lib; {
description = "An open-source GitLab command line tool";
license = licenses.mit;

10
pkgs/development/compilers/mruby/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, ruby, bison, rake, fetchFromGitHub }:
{ lib, stdenv, ruby, bison, rake, fetchFromGitHub, fetchpatch }:
stdenv.mkDerivation rec {
pname = "mruby";
@ -11,6 +11,14 @@ stdenv.mkDerivation rec {
sha256 = "sha256-C3K7ZooaOMa+V2HjxwiKxrrMb7ffl4QAgPsftRtb60c=";
};
patches = [
(fetchpatch {
name = "CVE-2022-1212.patch";
url = "https://github.com/mruby/mruby/commit/3cf291f72224715942beaf8553e42ba8891ab3c6.patch";
sha256 = "1bl8wm6v7v18zgxqvm4kbn8g97a75phzrdah279xqw1qvplbd2w7";
})
];
nativeBuildInputs = [ ruby bison rake ];
# Necessary so it uses `gcc` instead of `ld` for linking.

26
pkgs/development/coq-modules/smtcoq/default.nix Normal file
View File

@ -0,0 +1,26 @@
{ lib, stdenv, mkCoqDerivation, coq, trakt, cvc4, veriT, version ? null }:
with lib;
mkCoqDerivation {
pname = "smtcoq";
owner = "smtcoq";
release."itp22".rev = "1d60d37558d85a4bfd794220ec48849982bdc979";
release."itp22".sha256 = "sha256-CdPfgDfeJy8Q6ZlQeVCSR/x8ZlJ2kSEF6F5UnAespnQ=";
inherit version;
defaultVersion = with versions; switch [ coq.version mathcomp.version ] [
{ cases = [ (isGe "8.13") ]; out = "itp22"; }
] null;
propagatedBuildInputs = [ trakt cvc4 ] ++ lib.optionals (!stdenv.isDarwin) [ veriT ];
extraNativeBuildInputs = with coq.ocamlPackages; [ ocaml ocamlbuild ];
extraBuildInputs = with coq.ocamlPackages; [ findlib num zarith ];
meta = {
description = "Communication between Coq and SAT/SMT solvers ";
maintainers = with maintainers; [ siraben ];
license = licenses.cecill-b;
platforms = platforms.unix;
};
}

24
pkgs/development/coq-modules/trakt/default.nix Normal file
View File

@ -0,0 +1,24 @@
{ lib, mkCoqDerivation, coq, coq-elpi, version ? null }:
with lib;
mkCoqDerivation {
pname = "trakt";
owner = "ecranceMERCE";
release."1.0".rev = "d1c9daba8fe0584b526047862dd27ddf836dbbf2";
release."1.0".sha256 = "sha256-Qhw5fWFYxUFO2kIWWz/og+4fuy9aYG27szfNk3IglhY=";
inherit version;
defaultVersion = with versions; switch [ coq.version ] [
{ cases = [ (isGe "8.13") ]; out = "1.0"; }
] null;
propagatedBuildInputs = [ coq-elpi ];
meta = {
description = "A generic goal preprocessing tool for proof automation tactics in Coq";
maintainers = with maintainers; [ siraben ];
license = licenses.cecill-b;
platforms = platforms.unix;
};
}

9
pkgs/development/libraries/cln/default.nix
View File

@ -1,12 +1,13 @@
{ lib, stdenv, fetchurl, gmp }:
{ lib, stdenv, fetchgit, gmp }:
stdenv.mkDerivation rec {
pname = "cln";
version = "1.3.6";
src = fetchurl {
url = "${meta.homepage}${pname}-${version}.tar.bz2";
sha256 = "0jlq9l4hphk7qqlgqj9ihjp4m3rwjbhk6q4v00lsbgbri07574pl";
src = fetchgit {
url = "git://www.ginac.de/cln.git";
rev = "cln_${builtins.replaceStrings [ "." ] [ "-" ] version}";
sha256 = "sha256-P32F4TIDhE2Dwzydq8iFK6ch3kICJcXeeXHs5PBQG88=";
};
buildInputs = [ gmp ];

5
pkgs/development/libraries/igraph/default.nix
View File

@ -23,13 +23,13 @@
stdenv.mkDerivation rec {
pname = "igraph";
version = "0.9.7";
version = "0.9.8";
src = fetchFromGitHub {
owner = "igraph";
repo = pname;
rev = version;
sha256 = "sha256-SL9PcT18vFvykCv4VRXxXtlcDAcybmwEImnnKXMciFQ=";
hash = "sha256-t0GC6FVFcbVbmZ74XNSPCRRUsSr1Z8rRw6Rf++qk4I0=";
};
postPatch = ''
@ -106,6 +106,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "The network analysis package";
homepage = "https://igraph.org/";
changelog = "https://github.com/igraph/igraph/blob/${src.rev}/CHANGELOG.md";
license = licenses.gpl2Plus;
platforms = platforms.all;
maintainers = with maintainers; [ MostAwesomeDude dotlambda ];

4
pkgs/development/php-packages/composer/default.nix
View File

@ -1,14 +1,14 @@
{ mkDerivation, fetchurl, makeWrapper, unzip, lib, php }:
let
pname = "composer";
version = "2.3.3";
version = "2.3.5";
in
mkDerivation {
inherit pname version;
src = fetchurl {
url = "https://getcomposer.org/download/${version}/composer.phar";
sha256 = "sha256-1pMewrOLQb0K1i+dFXkI5miLrAkbvwvWphnBBnuSJAI=";
sha256 = "sha256-OztaiZwGpGrsKAcnvfUKrRQzT2vEBDbqdrB7ZQhw2PQ=";
};
dontUnpack = true;

5
pkgs/development/python-modules/igraph/default.nix
View File

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "igraph";
version = "0.9.9";
version = "0.9.10";
disabled = pythonOlder "3.6";
@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "igraph";
repo = "python-igraph";
rev = version;
hash = "sha256-jHK8whCg+WitRSL5LmkqfdqiAdi9vZPicygzKThnW2U=";
hash = "sha256-c20N8BtbQGxAK7ykQvyfqWYu7wVOlYfeGpNOwWPlGxs=";
};
nativeBuildInputs = [
@ -48,6 +48,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "High performance graph data structures and algorithms";
homepage = "https://igraph.org/python/";
changelog = "https://github.com/igraph/python-igraph/blob/${src.rev}/CHANGELOG.md";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ MostAwesomeDude dotlambda ];
};

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

@ -19,14 +19,14 @@
buildPythonPackage rec {
pname = "plugwise";
version = "0.17.6";
version = "0.17.7";
format = "setuptools";
src = fetchFromGitHub {
owner = pname;
repo = "python-plugwise";
rev = "refs/tags/v${version}";
sha256 = "sha256-Znhtw4VQ7r26rluLa5I+b3TMJ+Wyog7uaUReHORHOgU=";
sha256 = "sha256-PZoxI7s3LTb60oXFfsOi5mCaLOKzq6ed2yFKap0Q1Ng=";
};
postPatch = ''

10
pkgs/development/python-modules/sqlite-utils/default.nix
View File

@ -14,12 +14,14 @@
buildPythonPackage rec {
pname = "sqlite-utils";
version = "3.25.1";
version = "3.26";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-32lfUJoTbkflztLU/BDhbHbuOkW66OGpHLuiyAKFy8k=";
hash = "sha256-G2Fy9PEYtq0dIWhsgV4HZa5y+wLxcI3CYSgDL6ijkdo=";
};
propagatedBuildInputs = [
@ -35,6 +37,10 @@ buildPythonPackage rec {
hypothesis
];
pythonImportsCheck = [
"sqlite_utils"
];
meta = with lib; {
description = "Python CLI utility and library for manipulating SQLite databases";
homepage = "https://github.com/simonw/sqlite-utils";

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

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "skaffold";
version = "1.37.1";
version = "1.38.0";
src = fetchFromGitHub {
owner = "GoogleContainerTools";
repo = "skaffold";
rev = "v${version}";
sha256 = "sha256-hcP0BGzPQoYGvK+5Ro9Ts5882JhQYRT63mdTJbXhnzg=";
sha256 = "sha256-Sy8DpCZEFps6Z4x57ESofNm2EZsPUCHzLz1icl1MOVE=";
};
vendorSha256 = "sha256-LiNnTAI7iJkWL657eBw5OsCdvgWE2ZFZ3e+8vJtMhoE=";
vendorSha256 = "sha256-RA2KgUjYB3y6sOQdnLSZjr52VosZSaRrVU0BXZvjB1M=";
subPackages = ["cmd/skaffold"];

2
pkgs/servers/sql/patroni/default.nix
View File

@ -57,7 +57,7 @@ pythonPackages.buildPythonApplication rec {
homepage = "https://patroni.readthedocs.io/en/latest/";
description = "A Template for PostgreSQL HA with ZooKeeper, etcd or Consul";
license = licenses.mit;
platforms = platforms.linux;
platforms = platforms.unix;
maintainers = teams.deshaw.members;
};
}

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

@ -27094,13 +27094,13 @@ with pkgs;
# C++20 is required, darwin has Clang 7 by default, aarch64 has gcc 9 by default
stdenv = if stdenv.isDarwin
then llvmPackages_12.libcxxStdenv
then clang12Stdenv
else if stdenv.isAarch64 then gcc10Stdenv else stdenv;
# tdesktop has random crashes when jemalloc is built with gcc.
# Apparently, it triggers some bug due to usage of gcc's builtin
# functions like __builtin_ffsl by jemalloc when it's built with gcc.
jemalloc = (jemalloc.override { stdenv = llvmPackages.stdenv; }).overrideAttrs(_: {
jemalloc = (jemalloc.override { stdenv = clangStdenv; }).overrideAttrs(_: {
# no idea how to fix the tests :(
doCheck = false;
});

2
pkgs/top-level/coq-packages.nix
View File

@ -91,10 +91,12 @@ let
serapi = callPackage ../development/coq-modules/serapi {};
simple-io = callPackage ../development/coq-modules/simple-io { };
smpl = callPackage ../development/coq-modules/smpl { };
smtcoq = callPackage ../development/coq-modules/smtcoq { };
stdpp = callPackage ../development/coq-modules/stdpp { };
StructTact = callPackage ../development/coq-modules/StructTact {};
tlc = callPackage ../development/coq-modules/tlc {};
topology = callPackage ../development/coq-modules/topology {};
trakt = callPackage ../development/coq-modules/trakt {};
Velisarios = callPackage ../development/coq-modules/Velisarios {};
Verdi = callPackage ../development/coq-modules/Verdi {};
VST = callPackage ../development/coq-modules/VST {};