aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEelco Dolstra <edolstra@gmail.com>2023-09-25 15:05:25 +0200
committerGitHub <noreply@github.com>2023-09-25 15:05:25 +0200
commit9e212344f948e3f362807581bfe3e3d535372618 (patch)
tree542fae39e108331fd0a9932263a78c8e0ba5cd2e
parenta4445859abca0de3d8927c0719cbefc31d1dadbf (diff)
parent277ba907794e166195250f83e0dae6131bc58f52 (diff)
Merge pull request #9036 from NixOS/backport-9026-to-2.18-maintenance
[Backport 2.18-maintenance] flake: complete update to 23.05
-rw-r--r--flake.lock12
-rw-r--r--flake.nix3
2 files changed, 7 insertions, 8 deletions
diff --git a/flake.lock b/flake.lock
index 75b6ae6a7..56df9c3fb 100644
--- a/flake.lock
+++ b/flake.lock
@@ -34,16 +34,16 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1695124524,
- "narHash": "sha256-trXDytVCqf3KryQQQrHOZKUabu1/lB8/ndOAuZKQrOE=",
- "owner": "edolstra",
+ "lastModified": 1695283060,
+ "narHash": "sha256-CJz71xhCLlRkdFUSQEL0pIAAfcnWFXMzd9vXhPrnrEg=",
+ "owner": "NixOS",
"repo": "nixpkgs",
- "rev": "a3d30b525535e3158221abc1a957ce798ab159fe",
+ "rev": "31ed632c692e6a36cfc18083b88ece892f863ed4",
"type": "github"
},
"original": {
- "owner": "edolstra",
- "ref": "fix-aws-sdk-cpp",
+ "owner": "NixOS",
+ "ref": "nixos-23.05-small",
"repo": "nixpkgs",
"type": "github"
}
diff --git a/flake.nix b/flake.nix
index 81e072dad..1d629bb6a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,8 +1,7 @@
{
description = "The purely functional package manager";
- #inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05-small";
- inputs.nixpkgs.url = "github:edolstra/nixpkgs/fix-aws-sdk-cpp";
+ inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05-small";
inputs.nixpkgs-regression.url = "github:NixOS/nixpkgs/215d4d0fd80ca5163643b03a33fde804a29cc1e2";
inputs.lowdown-src = { url = "github:kristapsdz/lowdown"; flake = false; };
inputs.flake-compat = { url = "github:edolstra/flake-compat"; flake = false; };