Page MenuHomePhabricator
Files F3356151

D10561.id35612.diff
No OneTemporary
Actions

D10561.id35612.diff
View Options

diff --git a/flake.lock b/flake.lock
--- a/flake.lock
+++ b/flake.lock
@@ -18,11 +18,11 @@
},
"nixpkgs-unstable": {
"locked": {
- "lastModified": 1692190437,
- "narHash": "sha256-yJUZzmzSmDYb9ONPnMQDru66RjZgGQZRvj3tQebkexk=",
+ "lastModified": 1704161960,
+ "narHash": "sha256-QGua89Pmq+FBAro8NriTuoO/wNaUtugt29/qqA8zeeM=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "9b2aa98db6b10503666a50f4eb93b2fc0d57bde5",
+ "rev": "63143ac2c9186be6d9da6035fa22620018c85932",
"type": "github"
},
"original": {
diff --git a/flake.nix b/flake.nix
--- a/flake.nix
+++ b/flake.nix
@@ -26,6 +26,7 @@
in
import nixpkgs-unstable {
inherit system;
+ config.allowUnfree = true;
overlays = overlays ++ [
# Re-introduce older packages that were removed in latest nixpkgs
(_: _: {
diff --git a/keyserver/.nvmrc b/keyserver/.nvmrc
--- a/keyserver/.nvmrc
+++ b/keyserver/.nvmrc
@@ -1 +1 @@
-18.12.1
+20.10.0
diff --git a/keyserver/Dockerfile b/keyserver/Dockerfile
--- a/keyserver/Dockerfile
+++ b/keyserver/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:18.12.1-bullseye
+FROM node:20.10.0-bullseye
#-------------------------------------------------------------------------------
# STEP 0: SET UP USER
diff --git a/native/ios/Podfile.lock b/native/ios/Podfile.lock
--- a/native/ios/Podfile.lock
+++ b/native/ios/Podfile.lock
@@ -948,4 +948,4 @@
PODFILE CHECKSUM: 8b75c667b4679ba1a92a975823401ba7614ea7a1
-COCOAPODS: 1.12.1
+COCOAPODS: 1.14.3
diff --git a/nix/dev-shell.nix b/nix/dev-shell.nix
--- a/nix/dev-shell.nix
+++ b/nix/dev-shell.nix
@@ -1,10 +1,8 @@
{ mkShell
, stdenv
, lib
-, amqp-cpp
, awscli2
, arcanist
-, aws-sdk-cpp
, better-prompt
, boost
, bundler
@@ -21,7 +19,6 @@
, fmt
, glog
, grpc
-, gtest
, libiconv
, libuv
, localstack
@@ -80,7 +77,6 @@
cargo-udeps
# Tunnelbroker + CMake
- amqp-cpp
c-ares_cmake-config
cmake
cmake-format # linting
@@ -100,11 +96,9 @@
# protobuf exposes both a library and a command
# thus should appear in both inputs
protobuf3_21
- aws-sdk-cpp # tunnelbroker
corrosion # tunnelbroker
double-conversion # tunnelbroker
glog # tunnelbroker
- gtest # testing services
folly # cpp tools
fmt # needed for folly
boost # needed for folly
diff --git a/services/electron-update-server/Dockerfile b/services/electron-update-server/Dockerfile
--- a/services/electron-update-server/Dockerfile
+++ b/services/electron-update-server/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:16.18.0-bullseye
+FROM node:20.10.0-bullseye
WORKDIR /home/comm/

File Metadata

Mime Type
text/plain
Expires
Sun, Nov 24, 5:08 PM (20 h, 22 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2576322
Default Alt Text
D10561.id35612.diff (2 KB)

Event Timeline