Skip to content

Commit d221744

Browse files
committed
Use Nix 23.11 release
1 parent dd3b210 commit d221744

File tree

2 files changed

+20
-19
lines changed

2 files changed

+20
-19
lines changed

flake.lock

+10-10
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

+10-9
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,13 @@
22
description = "py-shiny-site";
33

44
inputs = {
5-
nixpkgs.url = "github:nixos/nixpkgs/nixos-23.05";
6-
# Use unstable channel for recent version of Quarto
7-
nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
5+
nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11";
6+
# Pin to this release of nixpkgs to use Quarto 1.3. (This is currently the same as
7+
# nixpkgs above but they may change independently in the future.)
8+
nixpkgs-quarto.url = "github:NixOS/nixpkgs/nixos-23.11";
89
};
910

10-
outputs = { self, nixpkgs, nixpkgs-unstable }:
11+
outputs = { self, nixpkgs, nixpkgs-quarto }:
1112
let
1213
allSystems =
1314
[ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ];
@@ -64,7 +65,7 @@
6465

6566
pkgs = import nixpkgs { inherit system; };
6667

67-
pkgs-unstable = import nixpkgs-unstable {
68+
pkgs-quarto = import nixpkgs-quarto {
6869
inherit system;
6970
overlays = [ quartoOverlay ];
7071
};
@@ -74,23 +75,23 @@
7475

7576
in {
7677
# Development environment output
77-
devShells = forAllSystems ({ pkgs, pkgs-unstable, system, ... }: {
78+
devShells = forAllSystems ({ pkgs, pkgs-quarto, system, ... }: {
7879
default = pkgs.mkShell {
7980
packages = with pkgs; [
8081
git
8182
which
8283
rsync
8384
(with rPackages; [ R rmarkdown reticulate ])
8485
python311
85-
pkgs-unstable.quarto
86+
pkgs-quarto.quarto
8687
# Quarto uses `rmarkdown::pandoc_available()` when running rmd files, which
8788
# in turn calls `find_pandoc()` -> `find_program("pandoc")`, and on Linux,
8889
# this calls `Sys.which("pandoc")` (it does something a bit different on
8990
# Mac). This means that pandoc needs to be in the PATH. So we'll explicitly
90-
# add it here, making sure that that it comes from pkgs-unstable, so it's
91+
# add it here, making sure that that it comes from pkgs-quarto, so it's
9192
# the same copy that quarto would find anyway.
9293
# https://github.com/quarto-dev/quarto-cli/blob/fee994d5/src/resources/rmd/rmd.R#L219C12-L228
93-
pkgs-unstable.pandoc
94+
pkgs-quarto.pandoc
9495
sysctl # Needed by Quarto to detect system
9596
];
9697
# Need to set LD_LIBRARY_PATH to load some Python packages on Linux (like zmq,

0 commit comments

Comments
 (0)