From 9f6bc9f1332c982a5c307181a3bd541257b18d46 Mon Sep 17 00:00:00 2001 From: chives101 Date: Sat, 19 Aug 2023 20:53:03 +0800 Subject: [PATCH] Update nixpkgs to release-23.11 --- flake.lock | 8 ++++---- flake.nix | 36 ++++++++++++++++++------------------ 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/flake.lock b/flake.lock index 581384362..5b4bb8771 100644 --- a/flake.lock +++ b/flake.lock @@ -2,16 +2,16 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1681411673, - "narHash": "sha256-23S0skJVstbQtrhy+65Bi4Jrdw74hY1OYbBnuuQausc=", + "lastModified": 1713564160, + "narHash": "sha256-YguPZpiejgzLEcO36/SZULjJQ55iWcjAmf3lYiyV1Fo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "80d54821fffaffbc90409a1262ea91071e0dff8f", + "rev": "bc194f70731cc5d2b046a6c1b3b15f170f05999c", "type": "github" }, "original": { "owner": "NixOS", - "ref": "release-22.11", + "ref": "release-23.11", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 44a631fd2..ab6e2d58d 100644 --- a/flake.nix +++ b/flake.nix @@ -2,45 +2,45 @@ description = "THE MIMBLEWIMBLE BLOCKCHAIN."; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/release-22.11"; + nixpkgs.url = "github:NixOS/nixpkgs/release-23.11"; }; - outputs = { self, nixpkgs, }: + outputs = + { self, nixpkgs }: let - forAllSystems = with nixpkgs; - lib.genAttrs lib.systems.flakeExposed; + forAllSystems = with nixpkgs; lib.genAttrs lib.systems.flakeExposed; - nixpkgsFor = forAllSystems (system: import nixpkgs - { inherit system; overlays = [ self.overlay ]; } + nixpkgsFor = forAllSystems ( + system: + import nixpkgs { + inherit system; + overlays = [ self.overlay ]; + } ); in { - overlay = final: prev: - with final; - { + overlay = + final: prev: with final; { grin = pkgs.rustPlatform.buildRustPackage { pname = "grin"; - version = "5.2.0-alpha.2"; + version = "5.3.0"; src = ./.; cargoLock = { lockFile = ./Cargo.lock; }; - nativeBuildInputs = [ pkgs.llvmPackages_latest.clang ]; + nativeBuildInputs = [ pkgs.clang ]; buildInputs = [ pkgs.ncurses ]; - LIBCLANG_PATH = - "${pkgs.llvmPackages_latest.libclang.lib}/lib"; + LIBCLANG_PATH = "${pkgs.libclang.lib}/lib"; # do not let test results block the build process doCheck = false; }; }; - packages = forAllSystems ( - system: { - default = nixpkgsFor.${system}.grin; - } - ); + packages = forAllSystems (system: { + default = nixpkgsFor.${system}.grin; + }); }; }