status-im/status-react
2
0
Fork 0
mirror of https://github.com/status-im/status-react.git synced 2025-02-16 12:59:38 +00:00
Code Issues Projects Releases Wiki Activity

nix: use multiple nixpkgs sources (#21374)

Browse Source
This commit is contained in:
Siddarth Kumar 2024-10-08 17:51:30 +05:30 committed by GitHub
parent 80ad2b8fca
commit 4b93c8ff43
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nix/overlay.nix
View File

@ -51,7 +51,6 @@ in {
}; };
# Package version adjustments # Package version adjustments
gradle = super.gradle_8.override { java = super.openjdk17_headless; };
nodejs = super.nodejs_20; nodejs = super.nodejs_20;
ruby = super.ruby_3_1; ruby = super.ruby_3_1;
yarn = super.yarn.override { nodejs = super.nodejs_20; }; yarn = super.yarn.override { nodejs = super.nodejs_20; };

20
nix/pkgs.nix
View File

@ -6,8 +6,16 @@ let
# For testing local version of nixpkgs # For testing local version of nixpkgs
#nixpkgsSrc = (import <nixpkgs> { }).lib.cleanSource "/home/jakubgs/work/nixpkgs"; #nixpkgsSrc = (import <nixpkgs> { }).lib.cleanSource "/home/jakubgs/work/nixpkgs";
# We use a commit from the unstable channel of nixpkgs for gradle 8.8 # We follow release 24-05 of nixpkgs
# https://github.com/NixOS/nixpkgs/releases/tag/24.05
nixpkgsSrc = builtins.fetchTarball { nixpkgsSrc = builtins.fetchTarball {
url = "https://github.com/NixOS/nixpkgs/archive/df27247e6f3e636c119e2610bf12d38b5e98cc79.tar.gz";
sha256 = "sha256:0zynbk52khdfhg4qfv26h3r5156xff5p0cga2cin7b07i7lqminh";
};
# FIXME: remove this additional source when nixpkgs includes gradle 8.8 in stable channel
# We use a commit from the unstable channel of nixpkgs for gradle 8.8
gradleNixpkgsSrc = builtins.fetchTarball {
url = "https://github.com/NixOS/nixpkgs/archive/48d567fc7b299de90f70a48e4263e31f690ba03e.tar.gz"; url = "https://github.com/NixOS/nixpkgs/archive/48d567fc7b299de90f70a48e4263e31f690ba03e.tar.gz";
sha256 = "sha256:0zynbk52khdfhg4qfv26h3r5156xff5p0cga2cin7b07i7lqminh"; sha256 = "sha256:0zynbk52khdfhg4qfv26h3r5156xff5p0cga2cin7b07i7lqminh";
}; };
@ -21,6 +29,14 @@ let
# Override some packages and utilities # Override some packages and utilities
pkgsOverlay = import ./overlay.nix; pkgsOverlay = import ./overlay.nix;
# FIXME: remove this additional source when nixpkgs includes gradle 8.8 in stable channel
gradleOverlay = final: prev: {
gradle = (import gradleNixpkgsSrc {
inherit (prev) system;
config = defaultConfig // config;
}).gradle_8.override { java = prev.openjdk17_headless; };
};
# Fix for lack of Android SDK for M1 Macs. # Fix for lack of Android SDK for M1 Macs.
systemOverride = let systemOverride = let
inherit (builtins) currentSystem getEnv; inherit (builtins) currentSystem getEnv;
@ -35,5 +51,5 @@ in
(import nixpkgsSrc) { (import nixpkgsSrc) {
config = defaultConfig // config; config = defaultConfig // config;
system = systemOverride; system = systemOverride;
overlays = [ pkgsOverlay ]; overlays = [ pkgsOverlay gradleOverlay ];
} }