From 428754069593e4269d23fb5e17c6a4c84f621160 Mon Sep 17 00:00:00 2001 From: Luca Fulchir Date: Wed, 24 May 2023 22:32:41 +0200 Subject: [PATCH] Upgrade flakes to 23.05 Signed-off-by: Luca Fulchir --- flake.lock | 20 ++++++++++---------- flake.nix | 4 ++-- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index ce2e37c..7a5770d 100644 --- a/flake.lock +++ b/flake.lock @@ -38,27 +38,27 @@ }, "nixpkgs": { "locked": { - "lastModified": 1683478192, - "narHash": "sha256-7f7RR71w0jRABDgBwjq3vE1yY3nrVJyXk8hDzu5kl1E=", + "lastModified": 1684922889, + "narHash": "sha256-l0WZAmln8959O7RdYUJ3gnAIM9OPKFLKHKGX4q+Blrk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c568239bcc990050b7aedadb7387832440ad8fb1", + "rev": "04aaf8511678a0d0f347fdf1e8072fe01e4a509e", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-22.11", + "ref": "nixos-23.05", "repo": "nixpkgs", "type": "github" } }, "nixpkgs-unstable": { "locked": { - "lastModified": 1683408522, - "narHash": "sha256-9kcPh6Uxo17a3kK3XCHhcWiV1Yu1kYj22RHiymUhMkU=", + "lastModified": 1684844536, + "narHash": "sha256-M7HhXYVqAuNb25r/d3FOO0z4GxPqDIZp5UjHFbBgw0Q=", "owner": "nixos", "repo": "nixpkgs", - "rev": "897876e4c484f1e8f92009fd11b7d988a121a4e7", + "rev": "d30264c2691128adc261d7c9388033645f0e742b", "type": "github" }, "original": { @@ -98,11 +98,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1683512408, - "narHash": "sha256-QMJGp/37En+d5YocJuSU89GL14bBYkIJQ6mqhRfqkkc=", + "lastModified": 1684894917, + "narHash": "sha256-kwKCfmliHIxKuIjnM95TRcQxM/4AAEIZ+4A9nDJ6cJs=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "75b07756c3feb22cf230e75fb064c1b4c725b9bc", + "rev": "9ea38d547100edcf0da19aaebbdffa2810585495", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 37e97ab..4c4a18a 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "libFenrir"; inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-22.11"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-23.05"; nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; rust-overlay.url = "github:oxalica/rust-overlay"; flake-utils.url = "github:numtide/flake-utils"; @@ -46,7 +46,7 @@ shellHook = '' # use zsh or other custom shell USER_SHELL="$(grep $USER /etc/passwd | cut -d ':' -f 7)" - if [ -n "$USER_SHELL" ] && [ "$USER_SHELL" != "$SHELL" ]; then + if [ -n "$USER_SHELL" ]; then exec $USER_SHELL fi '';