From bb055c9f00b9d6da77fa600840b4408be7e02c6f Mon Sep 17 00:00:00 2001 From: Jacek Generowicz Date: Fri, 12 Jan 2024 14:29:03 +0100 Subject: [PATCH 1/6] Bump Nix to 23.11 in python --- python/flake.lock | 8 ++++---- python/flake.nix | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/python/flake.lock b/python/flake.lock index aedb99c..91456fa 100644 --- a/python/flake.lock +++ b/python/flake.lock @@ -33,16 +33,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1685865905, - "narHash": "sha256-XJZ/o17eOd2sEsGif+/MQBnfa2DKmndWgJyc7CWajFc=", + "lastModified": 1704874635, + "narHash": "sha256-YWuCrtsty5vVZvu+7BchAxmcYzTMfolSPP5io8+WYCg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e7603eba51f2c7820c0a182c6bbb351181caa8e7", + "rev": "3dc440faeee9e889fe2d1b4d25ad0f430d449356", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-23.05", + "ref": "nixos-23.11", "repo": "nixpkgs", "type": "github" } diff --git a/python/flake.nix b/python/flake.nix index e958922..ab6c869 100644 --- a/python/flake.nix +++ b/python/flake.nix @@ -15,7 +15,7 @@ # # nix flake lock --update-input nixpkgs - nixpkgs .url = "github:nixos/nixpkgs/nixos-23.05"; + nixpkgs .url = "github:nixos/nixpkgs/nixos-23.11"; flake-utils .url = "github:numtide/flake-utils"; flake-compat = { url = "github:edolstra/flake-compat"; @@ -66,13 +66,13 @@ packages = [ pkgs.python3Packages.python-lsp-server pkgs.lolcat - pkgs.exa + pkgs.eza ]; shellHook = '' export PS1="${pythonVersion} devshell> " alias foo='cowsay Foo' - alias bar='exa -l | lolcat' + alias bar='eza -l | lolcat' alias baz='cowsay What is the difference between buildIntputs and packages? | lolcat' ''; }; From 6900623f5d3084a48389bf117002681477f31030 Mon Sep 17 00:00:00 2001 From: Jacek Generowicz Date: Fri, 12 Jan 2024 14:34:41 +0100 Subject: [PATCH 2/6] Bump Nix to 23.11 in rust --- rust/flake.lock | 14 +++++++------- rust/flake.nix | 12 ++++++------ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/rust/flake.lock b/rust/flake.lock index 24f5c25..3647580 100644 --- a/rust/flake.lock +++ b/rust/flake.lock @@ -51,16 +51,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1685865905, - "narHash": "sha256-XJZ/o17eOd2sEsGif+/MQBnfa2DKmndWgJyc7CWajFc=", + "lastModified": 1704874635, + "narHash": "sha256-YWuCrtsty5vVZvu+7BchAxmcYzTMfolSPP5io8+WYCg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e7603eba51f2c7820c0a182c6bbb351181caa8e7", + "rev": "3dc440faeee9e889fe2d1b4d25ad0f430d449356", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-23.05", + "ref": "nixos-23.11", "repo": "nixpkgs", "type": "github" } @@ -95,11 +95,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1685932304, - "narHash": "sha256-HUrE7Al6Rp9GeOjUycXz25TYhXXf1vtZLf/FFPVFRNw=", + "lastModified": 1705025860, + "narHash": "sha256-9vcqo5CJLOHU63S7pVlP0u4OhgJxrXebQR4vqMPXLRg=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "08b06ab2046bce2c3b5f53ec599a6550ab9a9485", + "rev": "d458975da373a37422577886566fce8201bc1254", "type": "github" }, "original": { diff --git a/rust/flake.nix b/rust/flake.nix index b5a9625..b037f6b 100644 --- a/rust/flake.nix +++ b/rust/flake.nix @@ -16,7 +16,7 @@ # # nix flake lock --update-input nixpkgs - nixpkgs .url = "github:nixos/nixpkgs/nixos-23.05"; + nixpkgs .url = "github:nixos/nixpkgs/nixos-23.11"; rust-overlay.url = "github:oxalica/rust-overlay"; flake-utils .url = "github:numtide/flake-utils"; flake-compat = { @@ -49,8 +49,8 @@ rust-tcfile = final.rust-bin.fromRustupToolchainFile ./rust-toolchain; rust-latest = final.rust-bin.stable .latest ; rust-beta = final.rust-bin.beta .latest ; - rust-nightly = final.rust-bin.nightly."2023-06-03"; - rust-stable = final.rust-bin.stable ."1.70.0" ; # nix flake lock --update-input rust-overlay + rust-nightly = final.rust-bin.nightly."2024-01-10"; + rust-stable = final.rust-bin.stable ."1.75.0" ; # nix flake lock --update-input rust-overlay rust-analyzer-preview-on = date: final.rust-bin.nightly.${date}.default.override { extensions = [ "rust-analyzer-preview" ]; @@ -67,7 +67,7 @@ # extensions = []; # targets = [ "wasm32-unknown-unknown" ]; }; - rust-analyzer-preview = rust-analyzer-preview-on "2023-06-03"; + rust-analyzer-preview = rust-analyzer-preview-on "2024-01-10"; rust-src = rust-stable.rust-src; }) ]; @@ -86,13 +86,13 @@ ]; packages = [ pkgs.lolcat - pkgs.exa + pkgs.eza ]; shellHook = '' export PS1="rust devshell> " alias foo='cowsay Foo' - alias bar='exa -l | lolcat' + alias bar='eza -l | lolcat' alias baz='cowsay What is the difference between buildIntputs and packages? | lolcat' ''; RUST_SRC_PATH = "${pkgs.rust-src}/lib/rustlib/src/rust/library"; From 46016e32f6fbe230b2f6393625aa51b2916d037f Mon Sep 17 00:00:00 2001 From: Jacek Generowicz Date: Fri, 12 Jan 2024 14:39:59 +0100 Subject: [PATCH 3/6] Remove Python 3.8 --- .github/workflows/test.yml | 2 +- python/flake.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 9ec26e2..0e4e71a 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -34,7 +34,7 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest, macos-12] - py: [python38, python39, python310, python311] + py: [python39, python310, python311] allow-fail: [false] include: - os: ubuntu-latest diff --git a/python/flake.nix b/python/flake.nix index ab6c869..ab3299b 100644 --- a/python/flake.nix +++ b/python/flake.nix @@ -77,7 +77,7 @@ ''; }; } - ) [ "python38" "python39" "python310" "python311" ] + ) [ "python39" "python310" "python311" ] ); } ); From 71d545de34ba1d6ce0adfd27db86c39917877891 Mon Sep 17 00:00:00 2001 From: Jacek Generowicz Date: Fri, 2 Feb 2024 13:51:47 +0100 Subject: [PATCH 4/6] Bump cachix/install-nix-action 21 -> 25 --- .github/workflows/test.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 0e4e71a..bdcac01 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -15,7 +15,7 @@ jobs: allow-fail: [false] steps: - uses: actions/checkout@v3.5.2 - - uses: cachix/install-nix-action@v21 + - uses: cachix/install-nix-action@v25 with: nix_path: nixpkgs=channel:nixos-23.05 - uses: Swatinem/rust-cache@v2.4.0 @@ -45,7 +45,7 @@ jobs: allow-fail: true steps: - uses: actions/checkout@v3.5.2 - - uses: cachix/install-nix-action@v21 + - uses: cachix/install-nix-action@v25 with: nix_path: nixpkgs=channel:nixos-23.05 - name: Test in nix develop @@ -65,7 +65,7 @@ jobs: allow-fail: [false] steps: - uses: actions/checkout@v3.5.2 - - uses: cachix/install-nix-action@v21 + - uses: cachix/install-nix-action@v25 with: nix_path: nixpkgs=channel:nixos-23.05 - name: Test in nix-shell From c050157cae21f163ed9590e1576160155ccd6b6e Mon Sep 17 00:00:00 2001 From: Jacek Generowicz Date: Fri, 2 Feb 2024 13:53:03 +0100 Subject: [PATCH 5/6] Bump swatinem/rust-cache 2.4.0 -> 2.7.3 --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index bdcac01..21d1a09 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -18,7 +18,7 @@ jobs: - uses: cachix/install-nix-action@v25 with: nix_path: nixpkgs=channel:nixos-23.05 - - uses: Swatinem/rust-cache@v2.4.0 + - uses: Swatinem/rust-cache@v2.7.3 - name: Test in nix-shell run: nix-shell rust/shell.nix --run "cd rust && cargo test --color=always" - name: Test in nix develop From 76634c5f358c99dd6c5e0c2d04ca4cd10355b43b Mon Sep 17 00:00:00 2001 From: Jacek Generowicz Date: Fri, 2 Feb 2024 13:55:07 +0100 Subject: [PATCH 6/6] Bump actions/checkout 3.5.2 -> 4.1.1 --- .github/workflows/test.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 21d1a09..4958526 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -14,7 +14,7 @@ jobs: os: [ubuntu-latest, macos-12] allow-fail: [false] steps: - - uses: actions/checkout@v3.5.2 + - uses: actions/checkout@v4.1.1 - uses: cachix/install-nix-action@v25 with: nix_path: nixpkgs=channel:nixos-23.05 @@ -44,7 +44,7 @@ jobs: py: python312 allow-fail: true steps: - - uses: actions/checkout@v3.5.2 + - uses: actions/checkout@v4.1.1 - uses: cachix/install-nix-action@v25 with: nix_path: nixpkgs=channel:nixos-23.05 @@ -64,7 +64,7 @@ jobs: py: [python311] allow-fail: [false] steps: - - uses: actions/checkout@v3.5.2 + - uses: actions/checkout@v4.1.1 - uses: cachix/install-nix-action@v25 with: nix_path: nixpkgs=channel:nixos-23.05