Skip to content

Commit

Permalink
Upgrade to nixos 23.11
Browse files Browse the repository at this point in the history
  • Loading branch information
jacg committed Feb 2, 2024
2 parents 899ab6a + 76634c5 commit acc0f0e
Show file tree
Hide file tree
Showing 5 changed files with 29 additions and 29 deletions.
16 changes: 8 additions & 8 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ jobs:
os: [ubuntu-latest, macos-12]
allow-fail: [false]
steps:
- uses: actions/checkout@v3.5.2
- uses: cachix/install-nix-action@v21
- uses: actions/checkout@v4.1.1
- 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
Expand All @@ -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
Expand All @@ -44,8 +44,8 @@ jobs:
py: python312
allow-fail: true
steps:
- uses: actions/checkout@v3.5.2
- uses: cachix/install-nix-action@v21
- uses: actions/checkout@v4.1.1
- uses: cachix/install-nix-action@v25
with:
nix_path: nixpkgs=channel:nixos-23.05
- name: Test in nix develop
Expand All @@ -64,8 +64,8 @@ jobs:
py: [python311]
allow-fail: [false]
steps:
- uses: actions/checkout@v3.5.2
- uses: cachix/install-nix-action@v21
- uses: actions/checkout@v4.1.1
- uses: cachix/install-nix-action@v25
with:
nix_path: nixpkgs=channel:nixos-23.05
- name: Test in nix-shell
Expand Down
8 changes: 4 additions & 4 deletions python/flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions python/flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down Expand Up @@ -66,18 +66,18 @@
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'
'';
};
}
) [ "python38" "python39" "python310" "python311" ]
) [ "python39" "python310" "python311" ]
);
}
);
Expand Down
14 changes: 7 additions & 7 deletions rust/flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions rust/flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand Down Expand Up @@ -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" ];
Expand All @@ -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;
})
];
Expand All @@ -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";
Expand Down

0 comments on commit acc0f0e

Please sign in to comment.