nix-community/nix-on-droid
1
0
Fork 0
mirror of https://github.com/nix-community/nix-on-droid.git synced 2025-11-08 19:46:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update pinned nixpkgs version to 22.05

Browse source
This commit is contained in:
Alexander Sosedkin 2022-06-27 12:16:28 +02:00
parent 2d4d541334
commit 0dbf0f5618
3 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
modules/environment/login/default.nix
View file

@ -1,4 +1,4 @@
# Copyright (c) 2019-2021, see AUTHORS. Licensed under MIT License, see LICENSE. # Copyright (c) 2019-2022, see AUTHORS. Licensed under MIT License, see LICENSE.
{ config, lib, pkgs, customPkgs, ... }: { config, lib, pkgs, customPkgs, ... }:
@ -82,7 +82,7 @@ in
environment.files = { environment.files = {
inherit login loginInner; inherit login loginInner;
prootStatic = "/nix/store/dapbgzbpl426jrhz4a2sdl096a8l98ad-proot-termux-aarch64-unknown-linux-android-unstable-2021-11-21"; prootStatic = "/nix/store/w0p62nphry9saxvr2ngd2r0sm4y7vd1j-proot-termux-aarch64-unknown-linux-android-unstable-2021-11-21";
}; };
}; };

8
overlays/lib/nixpkgs.nix
View file

@ -1,14 +1,14 @@
# Copyright (c) 2019-2021, see AUTHORS. Licensed under MIT License, see LICENSE. # Copyright (c) 2019-2022, see AUTHORS. Licensed under MIT License, see LICENSE.
{ super }: { super }:
let let
# head of nixos-21.11 as of 2021-12-01 # head of nixos-22.05 as of 2022-06-27
pinnedPkgsSrc = super.fetchFromGitHub { pinnedPkgsSrc = super.fetchFromGitHub {
owner = "NixOS"; owner = "NixOS";
repo = "nixpkgs"; repo = "nixpkgs";
rev = "a640d8394f34714578f3e6335fc767d0755d78f9"; rev = "cd90e773eae83ba7733d2377b6cdf84d45558780";
sha256 = "1dyyzgcmlhpsdb4ngiy8m0x10qmh0r56ky75r8ppvvh730m3lhfj"; sha256 = "1b2wn1ncx9x4651vfcgyqrm93pd7ghnrgqjbkf6ckkpidah69m03";
}; };
in in

8
pkgs/lib/load-nixpkgs.nix
View file

@ -1,4 +1,4 @@
# Copyright (c) 2019-2021, see AUTHORS. Licensed under MIT License, see LICENSE. # Copyright (c) 2019-2022, see AUTHORS. Licensed under MIT License, see LICENSE.
let let
defaultNixpkgsArgs = { defaultNixpkgsArgs = {
@ -6,11 +6,11 @@ let
overlays = [ ]; overlays = [ ];
}; };
# head of nixos-21.11 as of 2021-12-01 # head of nixos-22.05 as of 2022-06-27
# note: when updating nixpkgs, update store paths of proot-termux in modules/environment/login/default.nix # note: when updating nixpkgs, update store paths of proot-termux in modules/environment/login/default.nix
pinnedPkgsSrc = builtins.fetchTarball { pinnedPkgsSrc = builtins.fetchTarball {
url = "https://github.com/NixOS/nixpkgs/archive/a640d8394f34714578f3e6335fc767d0755d78f9.tar.gz"; url = "https://github.com/NixOS/nixpkgs/archive/cd90e773eae83ba7733d2377b6cdf84d45558780.tar.gz";
sha256 = "1dyyzgcmlhpsdb4ngiy8m0x10qmh0r56ky75r8ppvvh730m3lhfj"; sha256 = "1b2wn1ncx9x4651vfcgyqrm93pd7ghnrgqjbkf6ckkpidah69m03";
}; };
in in