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

nixpkgs: update pinned nixpkgs to 20.09

Browse source
This commit is contained in:
Alexander Sosedkin 2020-11-02 03:42:05 +01:00
parent d8a1d446f9
commit af8d9623e0
3 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -85,8 +85,8 @@ in
prootStatic = prootStatic =
let let
crossCompiledPaths = { crossCompiledPaths = {
aarch64 = "/nix/store/aamylv572p3v56bi3wj2kfv4vvxfzizp-proot-termux-unstable-2020-04-25-aarch64-unknown-linux-android"; aarch64 = "/nix/store/r9mavszgwsd2260a252i696fr7j69a3a-proot-termux-unstable-2020-04-25-aarch64-unknown-linux-android";
i686 = "/nix/store/yjg49wzr7niyd2qwlk6lqnfg0wykkpyk-proot-termux-unstable-2020-04-25-i686-unknown-linux-android"; i686 = "/nix/store/wkzmc8ly7qgyrfi61pqsz31hxin9wmyz-proot-termux-unstable-2020-04-25-i686-unknown-linux-android";
}; };
in in
"${crossCompiledPaths.${config.build.arch}}"; "${crossCompiledPaths.${config.build.arch}}";

6
overlays/lib/nixpkgs.nix
View file

@ -3,12 +3,12 @@
{ super }: { super }:
let let
# head of nixos-20.03 as of 2020-06-11 # head of nixos-20.09 as of 2020-11-07
pinnedPkgsSrc = super.fetchFromGitHub { pinnedPkgsSrc = super.fetchFromGitHub {
owner = "NixOS"; owner = "NixOS";
repo = "nixpkgs"; repo = "nixpkgs";
rev = "8b071be7512bd2cd0ff5c3bdf60f01ab4eb94abd"; rev = "d105075a1fd870b1d1617a6008cb38b443e65433";
sha256 = "079rzd17y2pk48kh70pbp4a7mh56vi2b49lzd365ckh38gdv702z"; sha256 = "1jcs44wn0s6mlf2jps25bvcai1rij9b2dil6zcj8zqwf2i8xmqjh";
}; };
in in

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

@ -19,11 +19,11 @@ let
]; ];
}; };
# head of nixos-20.03 as of 2020-06-11 # head of nixos-20.09 as of 2020-11-07
# 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/8b071be7512bd2cd0ff5c3bdf60f01ab4eb94abd.tar.gz"; url = "https://github.com/NixOS/nixpkgs/archive/d105075a1fd870b1d1617a6008cb38b443e65433.tar.gz";
sha256 = "079rzd17y2pk48kh70pbp4a7mh56vi2b49lzd365ckh38gdv702z"; sha256 = "1jcs44wn0s6mlf2jps25bvcai1rij9b2dil6zcj8zqwf2i8xmqjh";
}; };
in in