mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-18 03:34:58 +00:00
Merge master into staging-next
This commit is contained in:
commit
f57b038275
pkgs
applications/networking/cluster
development
interpreters/elixir
libraries/webkitgtk
python-modules/motioneye-client
tools/continuous-integration/buildkite-agent
tools
top-level
@ -53,16 +53,6 @@ rec {
|
|||||||
|
|
||||||
mkKops = generic;
|
mkKops = generic;
|
||||||
|
|
||||||
kops_1_16 = mkKops {
|
|
||||||
version = "1.16.4";
|
|
||||||
sha256 = "0qi80hzd5wc8vn3y0wsckd7pq09xcshpzvcr7rl5zd4akxb0wl3f";
|
|
||||||
};
|
|
||||||
|
|
||||||
kops_1_17 = mkKops {
|
|
||||||
version = "1.17.2";
|
|
||||||
sha256 = "0fmrzjz163hda6sl1jkl7cmg8fw6mmqb9953048jnhmd3w428xlz";
|
|
||||||
};
|
|
||||||
|
|
||||||
kops_1_18 = mkKops {
|
kops_1_18 = mkKops {
|
||||||
version = "1.18.2";
|
version = "1.18.2";
|
||||||
sha256 = "17na83j6sfhk69w9ssvicc0xd1904z952ad3zzbpha50lcy6nlhp";
|
sha256 = "17na83j6sfhk69w9ssvicc0xd1904z952ad3zzbpha50lcy6nlhp";
|
||||||
@ -73,4 +63,10 @@ rec {
|
|||||||
sha256 = "15csxih1xy8myky37n5dyzp5mc31pc4bq9asaw6zz51mgw8ad5r9";
|
sha256 = "15csxih1xy8myky37n5dyzp5mc31pc4bq9asaw6zz51mgw8ad5r9";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
kops_1_20 = mkKops rec {
|
||||||
|
version = "1.20.1";
|
||||||
|
sha256 = "sha256-k6ODXbh7Bh+rBw6bjSNLxLY0fz7JLnrmJibnXz5qnSc=";
|
||||||
|
rev = "v${version}";
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
@ -70,10 +70,10 @@
|
|||||||
"owner": "hashicorp",
|
"owner": "hashicorp",
|
||||||
"provider-source-address": "registry.terraform.io/hashicorp/aws",
|
"provider-source-address": "registry.terraform.io/hashicorp/aws",
|
||||||
"repo": "terraform-provider-aws",
|
"repo": "terraform-provider-aws",
|
||||||
"rev": "v3.27.0",
|
"rev": "v3.39.0",
|
||||||
"sha256": "0hn55mpg64bibf10m7x7wpfkipvlm8q4avgqcf0rf8rmprwvdlxd",
|
"sha256": "05clqnrgh8ydwnsb1bacg9is7pzwqz5ncr806xgvryxybp8lz2jg",
|
||||||
"vendorSha256": "0ph106bqsy988s20adf6gyc5jfvvy9zsj74lkbciwx7mvw5f514s",
|
"vendorSha256": "104cmwlzrcggb6fd1h7igy30g8542mzzzb6i54ldn5s1dahhprmb",
|
||||||
"version": "3.27.0"
|
"version": "3.39.0"
|
||||||
},
|
},
|
||||||
"azuread": {
|
"azuread": {
|
||||||
"owner": "hashicorp",
|
"owner": "hashicorp",
|
||||||
@ -176,9 +176,10 @@
|
|||||||
"owner": "hashicorp",
|
"owner": "hashicorp",
|
||||||
"provider-source-address": "registry.terraform.io/hashicorp/cloudinit",
|
"provider-source-address": "registry.terraform.io/hashicorp/cloudinit",
|
||||||
"repo": "terraform-provider-cloudinit",
|
"repo": "terraform-provider-cloudinit",
|
||||||
"rev": "v1.0.0",
|
"rev": "v2.2.0",
|
||||||
"sha256": "0i926f4xkfydd2bxmim69xrvi9ymn1vrc66zl117axzsmy9200zx",
|
"sha256": "0yv52hz60whmqfwv2a6f9f1fpszcyzs78hhz3lq4imz9dv5bd29z",
|
||||||
"version": "1.0.0"
|
"vendorSha256": null,
|
||||||
|
"version": "2.2.0"
|
||||||
},
|
},
|
||||||
"cloudscale": {
|
"cloudscale": {
|
||||||
"owner": "terraform-providers",
|
"owner": "terraform-providers",
|
||||||
@ -310,10 +311,10 @@
|
|||||||
"owner": "hashicorp",
|
"owner": "hashicorp",
|
||||||
"provider-source-address": "registry.terraform.io/hashicorp/external",
|
"provider-source-address": "registry.terraform.io/hashicorp/external",
|
||||||
"repo": "terraform-provider-external",
|
"repo": "terraform-provider-external",
|
||||||
"rev": "v2.0.0",
|
"rev": "v2.1.0",
|
||||||
"sha256": "16wciz08gicicsirij2ql0gy8dg0372jjsqmaigkl2n07mqz2b6a",
|
"sha256": "0xc3mj0d4yrr1952c5ywrx19ny1k2475grka9v2w7szdy6p2rkk5",
|
||||||
"vendorSha256": null,
|
"vendorSha256": null,
|
||||||
"version": "2.0.0"
|
"version": "2.1.0"
|
||||||
},
|
},
|
||||||
"fastly": {
|
"fastly": {
|
||||||
"owner": "terraform-providers",
|
"owner": "terraform-providers",
|
||||||
@ -401,10 +402,10 @@
|
|||||||
"owner": "hashicorp",
|
"owner": "hashicorp",
|
||||||
"provider-source-address": "registry.terraform.io/hashicorp/helm",
|
"provider-source-address": "registry.terraform.io/hashicorp/helm",
|
||||||
"repo": "terraform-provider-helm",
|
"repo": "terraform-provider-helm",
|
||||||
"rev": "v2.0.2",
|
"rev": "v2.1.2",
|
||||||
"sha256": "119zvlkwa7ygwsjxxdl7z8cqb0c4m6gy21356jnsasf4c3557rrb",
|
"sha256": "1385r9wk6mpb9fj53bkq586v8lw2310dim3kgj3pkrc1fssvwj0z",
|
||||||
"vendorSha256": null,
|
"vendorSha256": null,
|
||||||
"version": "2.0.2"
|
"version": "2.1.2"
|
||||||
},
|
},
|
||||||
"heroku": {
|
"heroku": {
|
||||||
"owner": "terraform-providers",
|
"owner": "terraform-providers",
|
||||||
@ -521,23 +522,32 @@
|
|||||||
"sha256": "1vcx612bz2p0rjsrx11j6fdc0f0q2jm5m3xl94wrpx9jjb7aczvc",
|
"sha256": "1vcx612bz2p0rjsrx11j6fdc0f0q2jm5m3xl94wrpx9jjb7aczvc",
|
||||||
"version": "1.0.0"
|
"version": "1.0.0"
|
||||||
},
|
},
|
||||||
|
"kubectl": {
|
||||||
|
"owner": "gavinbunney",
|
||||||
|
"provider-source-address": "registry.terraform.io/gavinbunney/kubectl",
|
||||||
|
"repo": "terraform-provider-kubectl",
|
||||||
|
"rev": "v1.10.0",
|
||||||
|
"sha256": "1w8g47dh77i7bhvxwysn7ldrcxl999sivxc7ws71ly5mnsljhhz0",
|
||||||
|
"vendorSha256": "1qrw2mg8ik2n6xlrnbcrgs9zhr9mwh1niv47kzhbp3mxvj5vdskk",
|
||||||
|
"version": "1.10.0"
|
||||||
|
},
|
||||||
"kubernetes": {
|
"kubernetes": {
|
||||||
"owner": "hashicorp",
|
"owner": "hashicorp",
|
||||||
"provider-source-address": "registry.terraform.io/hashicorp/kubernetes",
|
"provider-source-address": "registry.terraform.io/hashicorp/kubernetes",
|
||||||
"repo": "terraform-provider-kubernetes",
|
"repo": "terraform-provider-kubernetes",
|
||||||
"rev": "v2.0.2",
|
"rev": "v2.1.0",
|
||||||
"sha256": "129aylw6hxa44syfnb0kkkihwvlaa6d1jnxrcbwkql6xxhn9zizf",
|
"sha256": "02ygydgi3fa8z6qd04hgcilbbwns8f21agaqxly2pf9j23fzi37g",
|
||||||
"vendorSha256": null,
|
"vendorSha256": null,
|
||||||
"version": "2.0.2"
|
"version": "2.1.0"
|
||||||
},
|
},
|
||||||
"kubernetes-alpha": {
|
"kubernetes-alpha": {
|
||||||
"owner": "hashicorp",
|
"owner": "hashicorp",
|
||||||
"provider-source-address": "registry.terraform.io/hashicorp/kubernetes-alpha",
|
"provider-source-address": "registry.terraform.io/hashicorp/kubernetes-alpha",
|
||||||
"repo": "terraform-provider-kubernetes-alpha",
|
"repo": "terraform-provider-kubernetes-alpha",
|
||||||
"rev": "v0.3.2",
|
"rev": "v0.3.3",
|
||||||
"sha256": "0lgh42fvfwvj6cw8i7800k016ay4babqiz38q0y7apq4s7vs62sb",
|
"sha256": "18i9yp0w6mmic95p6d6ah1hl3rmgkh264z1a05973yslpqhyx9yl",
|
||||||
"vendorSha256": null,
|
"vendorSha256": null,
|
||||||
"version": "0.3.2"
|
"version": "0.3.3"
|
||||||
},
|
},
|
||||||
"launchdarkly": {
|
"launchdarkly": {
|
||||||
"owner": "terraform-providers",
|
"owner": "terraform-providers",
|
||||||
@ -564,10 +574,10 @@
|
|||||||
"owner": "hashicorp",
|
"owner": "hashicorp",
|
||||||
"provider-source-address": "registry.terraform.io/hashicorp/local",
|
"provider-source-address": "registry.terraform.io/hashicorp/local",
|
||||||
"repo": "terraform-provider-local",
|
"repo": "terraform-provider-local",
|
||||||
"rev": "v2.0.0",
|
"rev": "v2.1.0",
|
||||||
"sha256": "0c1mk63lh3qmj8pl80lyvvsgyg4gg7673abr8cfxrj45635h74z5",
|
"sha256": "0lv1mvy4pkx0sc49xny4j0h30m64lvr3rnmqk85i5p0xhyn77gf2",
|
||||||
"vendorSha256": null,
|
"vendorSha256": null,
|
||||||
"version": "2.0.0"
|
"version": "2.1.0"
|
||||||
},
|
},
|
||||||
"logentries": {
|
"logentries": {
|
||||||
"owner": "terraform-providers",
|
"owner": "terraform-providers",
|
||||||
@ -671,10 +681,10 @@
|
|||||||
"owner": "hashicorp",
|
"owner": "hashicorp",
|
||||||
"provider-source-address": "registry.terraform.io/hashicorp/null",
|
"provider-source-address": "registry.terraform.io/hashicorp/null",
|
||||||
"repo": "terraform-provider-null",
|
"repo": "terraform-provider-null",
|
||||||
"rev": "v3.0.0",
|
"rev": "v3.1.0",
|
||||||
"sha256": "0r1kvsc96922i85hdvf1pk8aicxjr6bc69gc63qi21hrl0jpvr7r",
|
"sha256": "0s6j2py9bb3knrn0f8aga8ypkxj6v5ns08k7zgw26h3wwdxwyd12",
|
||||||
"vendorSha256": null,
|
"vendorSha256": null,
|
||||||
"version": "3.0.0"
|
"version": "3.1.0"
|
||||||
},
|
},
|
||||||
"nutanix": {
|
"nutanix": {
|
||||||
"owner": "terraform-providers",
|
"owner": "terraform-providers",
|
||||||
@ -848,10 +858,10 @@
|
|||||||
"owner": "hashicorp",
|
"owner": "hashicorp",
|
||||||
"provider-source-address": "registry.terraform.io/hashicorp/random",
|
"provider-source-address": "registry.terraform.io/hashicorp/random",
|
||||||
"repo": "terraform-provider-random",
|
"repo": "terraform-provider-random",
|
||||||
"rev": "v3.0.0",
|
"rev": "v3.1.0",
|
||||||
"sha256": "00dkpcri9ckp0kxwgh3p8175cyd44m8z13cb013pm4mrr61n4wq9",
|
"sha256": "1677mia6bbydqa8w50f1y85rynpv9lhg9ar5s6japsr5g78lrcqf",
|
||||||
"vendorSha256": null,
|
"vendorSha256": null,
|
||||||
"version": "3.0.0"
|
"version": "3.1.0"
|
||||||
},
|
},
|
||||||
"rightscale": {
|
"rightscale": {
|
||||||
"owner": "terraform-providers",
|
"owner": "terraform-providers",
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
# How to obtain `sha256`:
|
# How to obtain `sha256`:
|
||||||
# nix-prefetch-url --unpack https://github.com/elixir-lang/elixir/archive/v${version}.tar.gz
|
# nix-prefetch-url --unpack https://github.com/elixir-lang/elixir/archive/v${version}.tar.gz
|
||||||
mkDerivation {
|
mkDerivation {
|
||||||
version = "1.12.0";
|
version = "1.12.1";
|
||||||
sha256 = "sha256-Jnxi0vFYMnwEgTqkPncZbj+cR57hjvH77RCseJdUoFs=";
|
sha256 = "sha256-gRgGXb4btMriQwT/pRIYOJt+NM7rtYBd+A3SKfowC7k=";
|
||||||
minimumOTPVersion = "22";
|
minimumOTPVersion = "22";
|
||||||
}
|
}
|
||||||
|
86
pkgs/development/libraries/webkitgtk/428774.patch
Normal file
86
pkgs/development/libraries/webkitgtk/428774.patch
Normal file
@ -0,0 +1,86 @@
|
|||||||
|
diff -aru a/Source/WebKit/NetworkProcess/ServiceWorker/WebSWOriginStore.cpp b/Source/WebKit/NetworkProcess/ServiceWorker/WebSWOriginStore.cpp
|
||||||
|
--- a/Source/WebKit/NetworkProcess/ServiceWorker/WebSWOriginStore.cpp 2021-02-26 04:57:15.000000000 -0500
|
||||||
|
+++ b/Source/WebKit/NetworkProcess/ServiceWorker/WebSWOriginStore.cpp 2021-05-16 14:45:32.000000000 -0400
|
||||||
|
@@ -87,7 +87,7 @@
|
||||||
|
if (!m_store.createSharedMemoryHandle(handle))
|
||||||
|
return;
|
||||||
|
|
||||||
|
-#if OS(DARWIN) || OS(WINDOWS)
|
||||||
|
+#if (OS(DARWIN) || OS(WINDOWS)) && !USE(UNIX_DOMAIN_SOCKETS)
|
||||||
|
uint64_t dataSize = handle.size();
|
||||||
|
#else
|
||||||
|
uint64_t dataSize = 0;
|
||||||
|
diff -aru a/Source/WebKit/Platform/IPC/IPCSemaphore.cpp b/Source/WebKit/Platform/IPC/IPCSemaphore.cpp
|
||||||
|
--- a/Source/WebKit/Platform/IPC/IPCSemaphore.cpp 2021-02-26 04:57:15.000000000 -0500
|
||||||
|
+++ b/Source/WebKit/Platform/IPC/IPCSemaphore.cpp 2021-05-16 15:54:53.000000000 -0400
|
||||||
|
@@ -26,8 +26,6 @@
|
||||||
|
#include "config.h"
|
||||||
|
#include "IPCSemaphore.h"
|
||||||
|
|
||||||
|
-#if !OS(DARWIN)
|
||||||
|
-
|
||||||
|
namespace IPC {
|
||||||
|
|
||||||
|
Semaphore::Semaphore() = default;
|
||||||
|
@@ -46,5 +44,3 @@
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
-
|
||||||
|
-#endif
|
||||||
|
diff -aru a/Source/WebKit/Platform/IPC/IPCSemaphore.h b/Source/WebKit/Platform/IPC/IPCSemaphore.h
|
||||||
|
--- a/Source/WebKit/Platform/IPC/IPCSemaphore.h 2021-02-26 04:57:15.000000000 -0500
|
||||||
|
+++ b/Source/WebKit/Platform/IPC/IPCSemaphore.h 2021-05-16 14:46:13.000000000 -0400
|
||||||
|
@@ -29,7 +29,7 @@
|
||||||
|
#include <wtf/Optional.h>
|
||||||
|
#include <wtf/Seconds.h>
|
||||||
|
|
||||||
|
-#if OS(DARWIN)
|
||||||
|
+#if PLATFORM(COCOA)
|
||||||
|
#include <mach/semaphore.h>
|
||||||
|
#include <wtf/MachSendRight.h>
|
||||||
|
#endif
|
||||||
|
@@ -51,7 +51,7 @@
|
||||||
|
void encode(Encoder&) const;
|
||||||
|
static Optional<Semaphore> decode(Decoder&);
|
||||||
|
|
||||||
|
-#if OS(DARWIN)
|
||||||
|
+#if PLATFORM(COCOA)
|
||||||
|
explicit Semaphore(MachSendRight&&);
|
||||||
|
|
||||||
|
void signal();
|
||||||
|
@@ -64,7 +64,7 @@
|
||||||
|
#endif
|
||||||
|
|
||||||
|
private:
|
||||||
|
-#if OS(DARWIN)
|
||||||
|
+#if PLATFORM(COCOA)
|
||||||
|
void destroy();
|
||||||
|
MachSendRight m_sendRight;
|
||||||
|
semaphore_t m_semaphore { SEMAPHORE_NULL };
|
||||||
|
Only in b/Source/WebKit/Platform/IPC: IPCSemaphore.h.orig
|
||||||
|
diff -aru a/Source/WebKit/Platform/SharedMemory.h b/Source/WebKit/Platform/SharedMemory.h
|
||||||
|
--- a/Source/WebKit/Platform/SharedMemory.h 2021-02-26 04:57:15.000000000 -0500
|
||||||
|
+++ b/Source/WebKit/Platform/SharedMemory.h 2021-05-16 14:45:32.000000000 -0400
|
||||||
|
@@ -75,7 +75,7 @@
|
||||||
|
|
||||||
|
bool isNull() const;
|
||||||
|
|
||||||
|
-#if OS(DARWIN) || OS(WINDOWS)
|
||||||
|
+#if (OS(DARWIN) || OS(WINDOWS)) && !USE(UNIX_DOMAIN_SOCKETS)
|
||||||
|
size_t size() const { return m_size; }
|
||||||
|
#endif
|
||||||
|
|
||||||
|
diff -aru a/Source/WebKit/UIProcess/VisitedLinkStore.cpp b/Source/WebKit/UIProcess/VisitedLinkStore.cpp
|
||||||
|
--- a/Source/WebKit/UIProcess/VisitedLinkStore.cpp 2021-02-26 04:57:16.000000000 -0500
|
||||||
|
+++ b/Source/WebKit/UIProcess/VisitedLinkStore.cpp 2021-05-16 14:45:32.000000000 -0400
|
||||||
|
@@ -119,7 +119,7 @@
|
||||||
|
return;
|
||||||
|
|
||||||
|
// FIXME: Get the actual size of data being sent from m_linkHashStore and send it in the SharedMemory::IPCHandle object.
|
||||||
|
-#if OS(DARWIN) || OS(WINDOWS)
|
||||||
|
+#if (OS(DARWIN) || OS(WINDOWS)) && !USE(UNIX_DOMAIN_SOCKETS)
|
||||||
|
uint64_t dataSize = handle.size();
|
||||||
|
#else
|
||||||
|
uint64_t dataSize = 0;
|
||||||
|
Only in b/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics: DrawingAreaCoordinatedGraphics.cpp.orig
|
@ -1,5 +1,7 @@
|
|||||||
{ lib, stdenv
|
{ lib, stdenv
|
||||||
|
, runCommandNoCC
|
||||||
, fetchurl
|
, fetchurl
|
||||||
|
, fetchpatch
|
||||||
, perl
|
, perl
|
||||||
, python3
|
, python3
|
||||||
, ruby
|
, ruby
|
||||||
@ -34,6 +36,7 @@
|
|||||||
, libidn
|
, libidn
|
||||||
, libedit
|
, libedit
|
||||||
, readline
|
, readline
|
||||||
|
, sdk
|
||||||
, libGL
|
, libGL
|
||||||
, libGLU
|
, libGLU
|
||||||
, mesa
|
, mesa
|
||||||
@ -78,6 +81,32 @@ stdenv.mkDerivation rec {
|
|||||||
inherit (addOpenGLRunpath) driverLink;
|
inherit (addOpenGLRunpath) driverLink;
|
||||||
})
|
})
|
||||||
./libglvnd-headers.patch
|
./libglvnd-headers.patch
|
||||||
|
] ++ lib.optionals stdenv.isDarwin [
|
||||||
|
(fetchpatch {
|
||||||
|
url = "https://github.com/WebKit/WebKit/commit/94cdcd289b993ed4d39c17d4b8b90db7c81a9b10.diff";
|
||||||
|
sha256 = "sha256-ywrTEjf3ATqI0Vvs60TeAZ+m58kCibum4DamRWrQfaA=";
|
||||||
|
excludes = [ "Source/WebKit/ChangeLog" ];
|
||||||
|
})
|
||||||
|
|
||||||
|
# https://bugs.webkit.org/show_bug.cgi?id=225856
|
||||||
|
(fetchpatch {
|
||||||
|
url = "https://bug-225856-attachments.webkit.org/attachment.cgi?id=428797";
|
||||||
|
sha256 = "sha256-ffo5p2EyyjXe3DxdrvAcDKqxwnoqHtYBtWod+1fOjMU=";
|
||||||
|
excludes = [ "Source/WebCore/ChangeLog" ];
|
||||||
|
})
|
||||||
|
|
||||||
|
# https://bugs.webkit.org/show_bug.cgi?id=225850
|
||||||
|
./428774.patch # https://bug-225850-attachments.webkit.org/attachment.cgi?id=428774
|
||||||
|
(fetchpatch {
|
||||||
|
url = "https://bug-225850-attachments.webkit.org/attachment.cgi?id=428776";
|
||||||
|
sha256 = "sha256-ryNRYMsk72SL0lNdh6eaAdDV3OT8KEqVq1H0j581jmQ=";
|
||||||
|
excludes = [ "Source/WTF/ChangeLog" ];
|
||||||
|
})
|
||||||
|
(fetchpatch {
|
||||||
|
url = "https://bug-225850-attachments.webkit.org/attachment.cgi?id=428778";
|
||||||
|
sha256 = "sha256-78iP+T2vaIufO8TmIPO/tNDgmBgzlDzalklrOPrtUeo=";
|
||||||
|
excludes = [ "Source/WebKit/ChangeLog" ];
|
||||||
|
})
|
||||||
];
|
];
|
||||||
|
|
||||||
preConfigure = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
|
preConfigure = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
|
||||||
@ -96,6 +125,7 @@ stdenv.mkDerivation rec {
|
|||||||
gperf
|
gperf
|
||||||
ninja
|
ninja
|
||||||
perl
|
perl
|
||||||
|
perl.pkgs.FileCopyRecursive # used by copy-user-interface-resources.pl
|
||||||
pkg-config
|
pkg-config
|
||||||
python3
|
python3
|
||||||
ruby
|
ruby
|
||||||
@ -143,6 +173,12 @@ stdenv.mkDerivation rec {
|
|||||||
]) ++ lib.optionals stdenv.isDarwin [
|
]) ++ lib.optionals stdenv.isDarwin [
|
||||||
libedit
|
libedit
|
||||||
readline
|
readline
|
||||||
|
# Pull a header that contains a definition of proc_pid_rusage().
|
||||||
|
# (We pick just that one because using the other headers from `sdk` is not
|
||||||
|
# compatible with our C++ standard library)
|
||||||
|
(runCommandNoCC "${pname}_headers" {} ''
|
||||||
|
install -Dm444 "${lib.getDev sdk}"/include/libproc.h "$out"/include/libproc.h
|
||||||
|
'')
|
||||||
] ++ lib.optionals stdenv.isLinux [
|
] ++ lib.optionals stdenv.isLinux [
|
||||||
bubblewrap
|
bubblewrap
|
||||||
libseccomp
|
libseccomp
|
||||||
|
@ -11,7 +11,7 @@
|
|||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "motioneye-client";
|
pname = "motioneye-client";
|
||||||
version = "0.3.6";
|
version = "0.3.8";
|
||||||
format = "pyproject";
|
format = "pyproject";
|
||||||
disabled = pythonOlder "3.8";
|
disabled = pythonOlder "3.8";
|
||||||
|
|
||||||
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
|||||||
owner = "dermotduffy";
|
owner = "dermotduffy";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "0j28rn7059km7q6z1kalp0pjcrd42wcm5mnbi94j93bvfld97w70";
|
sha256 = "sha256-vTTjH4LhUcbh+/838wR0vnvml2y78Ro8SGwSZ6aApdQ=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
@ -3,16 +3,16 @@
|
|||||||
nixosTests }:
|
nixosTests }:
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
name = "buildkite-agent-${version}";
|
name = "buildkite-agent-${version}";
|
||||||
version = "3.29.0";
|
version = "3.30.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "buildkite";
|
owner = "buildkite";
|
||||||
repo = "agent";
|
repo = "agent";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-76yyqZi+ktcwRXo0ZIcdFJ9YCuHm9Te4AI+4meuhMNA=";
|
sha256 = "sha256-U2UnT41IpICy08jPQkr25wjAL1kBxiQCD4lysYnLAPk=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorSha256 = "sha256-6cejbCbr0Rn4jWFJ0fxG4v0L0xUM8k16cbACmcQ6m4o=";
|
vendorSha256 = "sha256-n3XRxpEKjHf7L7fcGscWTVKBtot9waZbLoS9cG0kHfI=";
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
substituteInPlace bootstrap/shell/shell.go --replace /bin/bash ${bash}/bin/bash
|
substituteInPlace bootstrap/shell/shell.go --replace /bin/bash ${bash}/bin/bash
|
||||||
|
@ -10,13 +10,13 @@
|
|||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "eternal-terminal";
|
pname = "eternal-terminal";
|
||||||
version = "6.1.7";
|
version = "6.1.8";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "MisterTea";
|
owner = "MisterTea";
|
||||||
repo = "EternalTerminal";
|
repo = "EternalTerminal";
|
||||||
rev = "et-v${version}";
|
rev = "et-v${version}";
|
||||||
sha256 = "0jpm1ilr1qfz55y4mqp75v4q433qla5jhi1b8nsmx48srs7f0j2q";
|
sha256 = "sha256-VSJ6AoVBvlCdKSirSDqsemixF+kAnvPgBQlyJxjoPcs=";
|
||||||
};
|
};
|
||||||
|
|
||||||
cmakeFlags= [
|
cmakeFlags= [
|
||||||
|
@ -11,13 +11,13 @@
|
|||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "ugrep";
|
pname = "ugrep";
|
||||||
version = "3.2.2";
|
version = "3.3";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "Genivia";
|
owner = "Genivia";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-0Vc+ORHnSG9W4OaKWGs4tI5+e5TJNMbBNQ+3NZRz6Ug=";
|
sha256 = "0qk8rzsll69pf220m6n41giyk3faqvwagml7i2xwgp7pcax607nl";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
|
@ -18411,6 +18411,7 @@ in
|
|||||||
webkitgtk = callPackage ../development/libraries/webkitgtk {
|
webkitgtk = callPackage ../development/libraries/webkitgtk {
|
||||||
harfbuzz = harfbuzzFull;
|
harfbuzz = harfbuzzFull;
|
||||||
inherit (gst_all_1) gst-plugins-base gst-plugins-bad;
|
inherit (gst_all_1) gst-plugins-base gst-plugins-bad;
|
||||||
|
inherit (darwin.apple_sdk) sdk;
|
||||||
};
|
};
|
||||||
|
|
||||||
websocketpp = callPackage ../development/libraries/websocket++ { };
|
websocketpp = callPackage ../development/libraries/websocket++ { };
|
||||||
@ -30432,12 +30433,11 @@ in
|
|||||||
# Exceptions are versions that we need to keep to allow upgrades from older NixOS releases
|
# Exceptions are versions that we need to keep to allow upgrades from older NixOS releases
|
||||||
inherit (callPackage ../applications/networking/cluster/kops {})
|
inherit (callPackage ../applications/networking/cluster/kops {})
|
||||||
mkKops
|
mkKops
|
||||||
kops_1_16
|
|
||||||
kops_1_17
|
|
||||||
kops_1_18
|
kops_1_18
|
||||||
kops_1_19
|
kops_1_19
|
||||||
|
kops_1_20
|
||||||
;
|
;
|
||||||
kops = kops_1_19;
|
kops = kops_1_20;
|
||||||
|
|
||||||
lguf-brightness = callPackage ../misc/lguf-brightness { };
|
lguf-brightness = callPackage ../misc/lguf-brightness { };
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user