From 31d617689a362023eeb1d19d2de10f89ec0900b2 Mon Sep 17 00:00:00 2001 From: Tim Van Baak Date: Wed, 10 Jan 2024 16:06:12 -0800 Subject: [PATCH] Move to 23.11 --- flake.lock | 8 ++++---- flake.nix | 14 ++------------ 2 files changed, 6 insertions(+), 16 deletions(-) diff --git a/flake.lock b/flake.lock index 642bc22..e994a05 100644 --- a/flake.lock +++ b/flake.lock @@ -2,16 +2,16 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1685566663, - "narHash": "sha256-btHN1czJ6rzteeCuE/PNrdssqYD2nIA4w48miQAFloM=", + "lastModified": 1701282334, + "narHash": "sha256-MxCVrXY6v4QmfTwIysjjaX0XUhqBbxTWWB4HXtDYsdk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4ecab3273592f27479a583fb6d975d4aba3486fe", + "rev": "057f9aecfb71c4437d2b27d3323df7f93c010b7e", "type": "github" }, "original": { "owner": "NixOS", - "ref": "23.05", + "ref": "23.11", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index ab63a76..cb4d9d8 100644 --- a/flake.nix +++ b/flake.nix @@ -1,19 +1,9 @@ { - inputs.nixpkgs.url = "github:NixOS/nixpkgs/23.05"; + inputs.nixpkgs.url = "github:NixOS/nixpkgs/23.11"; outputs = { self, nixpkgs }: let system = "x86_64-linux"; - patched = (import nixpkgs { inherit system; }).applyPatches { - name = "nixpkgs+247773"; - src = nixpkgs; - patches = [ - ./patches/b6910512a0789390af9db312ee8f08665bd662ab.patch - ./patches/f23952856444fe39fad622a0db9eae55cd0f6fe8.patch - ./patches/095afd88c41f08cb37e9cd67429baaa8d02e2d6f.patch - ]; - }; - pkgs = import patched { inherit system; }; - #pkgs = nixpkgs.legacyPackages.${system}; + pkgs = nixpkgs.legacyPackages.${system}; pyenv = pkgs.python3.withPackages (pypkgs: [ pypkgs.markdown pypkgs.beautifulsoup4