From 49e21620d5943ffeffde100b4f78796abb69bccb Mon Sep 17 00:00:00 2001 From: Alexander Sosedkin Date: Mon, 27 Jun 2022 12:16:28 +0200 Subject: [PATCH] Update pinned nixpkgs version to 22.05 --- modules/environment/login/default.nix | 4 ++-- overlays/lib/nixpkgs.nix | 8 ++++---- pkgs/lib/load-nixpkgs.nix | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/modules/environment/login/default.nix b/modules/environment/login/default.nix index 809bfb3..0d31048 100644 --- a/modules/environment/login/default.nix +++ b/modules/environment/login/default.nix @@ -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, ... }: @@ -82,7 +82,7 @@ in environment.files = { 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"; }; }; diff --git a/overlays/lib/nixpkgs.nix b/overlays/lib/nixpkgs.nix index 93dac63..2ad1437 100644 --- a/overlays/lib/nixpkgs.nix +++ b/overlays/lib/nixpkgs.nix @@ -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 }: let - # head of nixos-21.11 as of 2021-12-01 + # head of nixos-22.05 as of 2022-06-27 pinnedPkgsSrc = super.fetchFromGitHub { owner = "NixOS"; repo = "nixpkgs"; - rev = "a640d8394f34714578f3e6335fc767d0755d78f9"; - sha256 = "1dyyzgcmlhpsdb4ngiy8m0x10qmh0r56ky75r8ppvvh730m3lhfj"; + rev = "cd90e773eae83ba7733d2377b6cdf84d45558780"; + sha256 = "1b2wn1ncx9x4651vfcgyqrm93pd7ghnrgqjbkf6ckkpidah69m03"; }; in diff --git a/pkgs/lib/load-nixpkgs.nix b/pkgs/lib/load-nixpkgs.nix index e440b8f..ab25acf 100644 --- a/pkgs/lib/load-nixpkgs.nix +++ b/pkgs/lib/load-nixpkgs.nix @@ -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 defaultNixpkgsArgs = { @@ -6,11 +6,11 @@ let 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 pinnedPkgsSrc = builtins.fetchTarball { - url = "https://github.com/NixOS/nixpkgs/archive/a640d8394f34714578f3e6335fc767d0755d78f9.tar.gz"; - sha256 = "1dyyzgcmlhpsdb4ngiy8m0x10qmh0r56ky75r8ppvvh730m3lhfj"; + url = "https://github.com/NixOS/nixpkgs/archive/cd90e773eae83ba7733d2377b6cdf84d45558780.tar.gz"; + sha256 = "1b2wn1ncx9x4651vfcgyqrm93pd7ghnrgqjbkf6ckkpidah69m03"; }; in