From b2e28ea898277d0e72624886c868e92331926728 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 10 Aug 2021 13:56:11 +0200 Subject: [PATCH 1/2] bump nixpkgs to 21.05 --- flake.lock | 8 ++++---- flake.nix | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/flake.lock b/flake.lock index 0297b57a..a2fc179a 100644 --- a/flake.lock +++ b/flake.lock @@ -2,16 +2,16 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1606669556, - "narHash": "sha256-9rlqZ5JwnA6nK04vKhV0s5ndepnWL5hpkaTV1b4ASvk=", + "lastModified": 1628523294, + "narHash": "sha256-qMkH/JRRmcqb/eOa/pKksrKGOy2YEPQNH/457QyoyFg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ae47c79479a086e96e2977c61e538881913c0c08", + "rev": "b09c989b82f7a4f7319802a1dcf8bfe859d65362", "type": "github" }, "original": { "id": "nixpkgs", - "ref": "nixos-20.09", + "ref": "nixos-21.05", "type": "indirect" } }, diff --git a/flake.nix b/flake.nix index b7e16a41..1eb8a4d0 100644 --- a/flake.nix +++ b/flake.nix @@ -1,7 +1,7 @@ { description = "A tool for modifying ELF executables and libraries"; - inputs.nixpkgs.url = "nixpkgs/nixos-20.09"; + inputs.nixpkgs.url = "nixpkgs/nixos-21.05"; outputs = { self, nixpkgs }: From 818710e576b3f63f7e845ef429a7de5772d9a1a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 10 Aug 2021 13:57:18 +0200 Subject: [PATCH 2/2] fix typo in pr template --- .github/pull_request_template.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 92ee467a..13546224 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -1,4 +1,4 @@ Thank you! Please do your best to include [a regression test](https://github.com/NixOS/patchelf/blob/master/tests/build-id.sh) -so that the quality of future releases can be perserved. +so that the quality of future releases can be preserved.