diff --git a/flake.lock b/flake.lock index acd49ab..4a5784b 100644 --- a/flake.lock +++ b/flake.lock @@ -60,17 +60,17 @@ }, "nixpkgs-for-bootstrap": { "locked": { - "lastModified": 1669834992, - "narHash": "sha256-YnhZGHgb4C3Q7DSGisO/stc50jFb9F/MzHeKS4giotg=", + "lastModified": 1686921029, + "narHash": "sha256-J1bX9plPCFhTSh6E3TWn9XSxggBh/zDD4xigyaIQBy8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "596a8e828c5dfa504f91918d0fa4152db3ab5502", + "rev": "c7ff1b9b95620ce8728c0d7bd501c458e6da9e04", "type": "github" }, "original": { "owner": "NixOS", "repo": "nixpkgs", - "rev": "596a8e828c5dfa504f91918d0fa4152db3ab5502", + "rev": "c7ff1b9b95620ce8728c0d7bd501c458e6da9e04", "type": "github" } }, diff --git a/flake.nix b/flake.nix index d037aee..539f89d 100644 --- a/flake.nix +++ b/flake.nix @@ -5,9 +5,9 @@ nixpkgs.url = "github:NixOS/nixpkgs"; # for bootstrap zip ball creation and proot-termux builds, we use a fixed version of nixpkgs to ease maintanence. - # head of nixos-22.11 as of 2022-12-01 + # head of nixos-23.05 as of 2023-06-18 # note: when updating nixpkgs-for-bootstrap, update store paths of proot-termux in modules/environment/login/default.nix - nixpkgs-for-bootstrap.url = "github:NixOS/nixpkgs/596a8e828c5dfa504f91918d0fa4152db3ab5502"; + nixpkgs-for-bootstrap.url = "github:NixOS/nixpkgs/c7ff1b9b95620ce8728c0d7bd501c458e6da9e04"; home-manager = { url = "github:nix-community/home-manager"; diff --git a/modules/environment/login/default.nix b/modules/environment/login/default.nix index fb45f2d..701dc41 100644 --- a/modules/environment/login/default.nix +++ b/modules/environment/login/default.nix @@ -1,4 +1,4 @@ -# Copyright (c) 2019-2022, see AUTHORS. Licensed under MIT License, see LICENSE. +# Copyright (c) 2019-2023, see AUTHORS. Licensed under MIT License, see LICENSE. { config, lib, pkgs, initialPackageInfo, ... }: @@ -82,7 +82,7 @@ in environment.files = { inherit login loginInner; - prootStatic = "/nix/store/8xg8jnaczivjjrd9nq38qvrp9z7avib1-proot-termux-static-aarch64-unknown-linux-android-unstable-2022-05-03"; + prootStatic = "/nix/store/ri1shq027hlwsjk94vv82fdvdv37n69x-proot-termux-static-aarch64-unknown-linux-android-unstable-2022-05-03"; }; }; diff --git a/overlays/lib/nixpkgs.nix b/overlays/lib/nixpkgs.nix index 720dab7..324f474 100644 --- a/overlays/lib/nixpkgs.nix +++ b/overlays/lib/nixpkgs.nix @@ -1,14 +1,14 @@ -# Copyright (c) 2019-2022, see AUTHORS. Licensed under MIT License, see LICENSE. +# Copyright (c) 2019-2023, see AUTHORS. Licensed under MIT License, see LICENSE. { super }: let - # head of nixos-22.11 as of 2022-12-01 + # head of nixos-23.05 as of 2023-06-18 pinnedPkgsSrc = super.fetchFromGitHub { owner = "NixOS"; repo = "nixpkgs"; - rev = "596a8e828c5dfa504f91918d0fa4152db3ab5502"; - sha256 = "sha256-YnhZGHgb4C3Q7DSGisO/stc50jFb9F/MzHeKS4giotg="; + rev = "c7ff1b9b95620ce8728c0d7bd501c458e6da9e04"; + sha256 = "sha256-J1bX9plPCFhTSh6E3TWn9XSxggBh/zDD4xigyaIQBy8="; }; in