From 15fd6e2757f973b720ec6fe282cd994681da9d81 Mon Sep 17 00:00:00 2001 From: Maximilian Marx Date: Thu, 30 Nov 2023 10:57:10 +0100 Subject: [PATCH 1/2] Move nixpkgs to newly stable 23.11 --- flake.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/flake.nix b/flake.nix index 6b93c31b7..e5a63612b 100644 --- a/flake.nix +++ b/flake.nix @@ -2,8 +2,7 @@ rec { description = "nemo, a datalog-based rule engine for fast and scalable analytic data processing in memory"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05"; - nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11"; rust-overlay.url = "github:oxalica/rust-overlay"; rust-overlay.inputs = { @@ -25,7 +24,6 @@ rec { channels.nixpkgs.overlaysBuilder = channels: [ rust-overlay.overlays.default - (final: prev: {inherit (channels.nixpkgs-unstable) wasm-bindgen-cli;}) ]; overlays.default = final: prev: let From b5f7457934cc934e3241e9ce7cf8873d41600bf1 Mon Sep 17 00:00:00 2001 From: Maximilian Marx Date: Thu, 30 Nov 2023 10:58:27 +0100 Subject: [PATCH 2/2] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/9fb122519e9cd465d532f736a98c1e1eb541ef6f' (2023-11-16) → 'github:NixOS/nixpkgs/7c4c20509c4363195841faa6c911777a134acdf3' (2023-11-28) • Removed input 'nixpkgs-unstable' • Updated input 'rust-overlay': 'github:oxalica/rust-overlay/45066cb0b2505d8da581be8432a16238c867f199' (2023-11-19) → 'github:oxalica/rust-overlay/6d3c6e185198b8bf7ad639f22404a75aa9a09bff' (2023-11-30) --- flake.lock | 31 +++++++------------------------ 1 file changed, 7 insertions(+), 24 deletions(-) diff --git a/flake.lock b/flake.lock index 8e00391a4..1fcb221a8 100644 --- a/flake.lock +++ b/flake.lock @@ -20,32 +20,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1700097215, - "narHash": "sha256-ODQ3gBTv1iHd7lG21H+ErVISB5wVeOhd/dEogOqHs/I=", + "lastModified": 1701156937, + "narHash": "sha256-jpMJOFvOTejx211D8z/gz0ErRtQPy6RXxgD2ZB86mso=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9fb122519e9cd465d532f736a98c1e1eb541ef6f", + "rev": "7c4c20509c4363195841faa6c911777a134acdf3", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-23.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-unstable": { - "locked": { - "lastModified": 1700204040, - "narHash": "sha256-xSVcS5HBYnD3LTer7Y2K8ZQCDCXMa3QUD1MzRjHzuhI=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "c757e9bd77b16ca2e03c89bf8bc9ecb28e0c06ad", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "nixos-23.11", "repo": "nixpkgs", "type": "github" } @@ -53,7 +37,6 @@ "root": { "inputs": { "nixpkgs": "nixpkgs", - "nixpkgs-unstable": "nixpkgs-unstable", "rust-overlay": "rust-overlay", "utils": "utils" } @@ -69,11 +52,11 @@ ] }, "locked": { - "lastModified": 1700360261, - "narHash": "sha256-8fRSHx5osjDELHSL7OHEfj/cOh8q+B7M9EF/yPR3bw8=", + "lastModified": 1701310566, + "narHash": "sha256-CL9J3xUR2Ejni4LysrEGX0IdO+Y4BXCiH/By0lmF3eQ=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "45066cb0b2505d8da581be8432a16238c867f199", + "rev": "6d3c6e185198b8bf7ad639f22404a75aa9a09bff", "type": "github" }, "original": {