Skip to content

Commit

Permalink
[nix] Upgrade to latest version of nixpkgs-unstable
Browse files Browse the repository at this point in the history
Summary: This updates to the latest version of nixpkgs-unstable. This is in response to the need to update localstack from 1.4.0 to >2.3.2.

Test Plan: Successfully ran `nix develop` with working build environment

Reviewers: ashoat, varun, bartek, atul, O1 Nix

Reviewed By: ashoat, bartek, atul

Subscribers: atul, ashoat, tomek

Differential Revision: https://phab.comm.dev/D10561
  • Loading branch information
wyilio committed Jan 15, 2024
1 parent 4566286 commit da579ab
Show file tree
Hide file tree
Showing 7 changed files with 8 additions and 13 deletions.
6 changes: 3 additions & 3 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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
(_: _: {
Expand Down
2 changes: 1 addition & 1 deletion keyserver/.nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
18.12.1
20.10.0
2 changes: 1 addition & 1 deletion keyserver/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:18.12.1-bullseye
FROM node:20.10.0-bullseye

#-------------------------------------------------------------------------------
# STEP 0: SET UP USER
Expand Down
2 changes: 1 addition & 1 deletion native/ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -948,4 +948,4 @@ SPEC CHECKSUMS:

PODFILE CHECKSUM: 8b75c667b4679ba1a92a975823401ba7614ea7a1

COCOAPODS: 1.12.1
COCOAPODS: 1.14.3
6 changes: 0 additions & 6 deletions nix/dev-shell.nix
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
{ mkShell
, stdenv
, lib
, amqp-cpp
, awscli2
, arcanist
, aws-sdk-cpp
, better-prompt
, boost
, bundler
Expand All @@ -21,7 +19,6 @@
, fmt
, glog
, grpc
, gtest
, libiconv
, libuv
, localstack
Expand Down Expand Up @@ -80,7 +77,6 @@ mkShell {
cargo-udeps

# Tunnelbroker + CMake
amqp-cpp
c-ares_cmake-config
cmake
cmake-format # linting
Expand All @@ -100,11 +96,9 @@ mkShell {
# 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
Expand Down
2 changes: 1 addition & 1 deletion services/electron-update-server/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:16.18.0-bullseye
FROM node:20.10.0-bullseye

WORKDIR /home/comm/

Expand Down

0 comments on commit da579ab

Please sign in to comment.