Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
- Linux

steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6

- name: verify-default-nix.sh
if: "!contains(github.event.head_commit.message, 'noci')"
Expand All @@ -37,7 +37,7 @@ jobs:
- Linux

steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6

- name: nix flake check
if: "!contains(github.event.head_commit.message, 'noci')"
Expand All @@ -60,7 +60,7 @@ jobs:
arch: aarch64-linux

steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6

- name: Build .#ui_metadata_farm
if: "!contains(github.event.head_commit.message, 'noci')"
Expand All @@ -84,7 +84,7 @@ jobs:
arch: aarch64-linux

steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6

- name: Build .#sample_environments_farm
if: "!contains(github.event.head_commit.message, 'noci')"
Expand Down Expand Up @@ -137,7 +137,7 @@ jobs:
- macOS
- Linux
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
with:
submodules: recursive

Expand Down
12 changes: 6 additions & 6 deletions default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -6,32 +6,32 @@
}:

let
stableRev = "3634657dc244b3e4868a9b37b7243ea33aa786ec"; # nixpkgs-rev
stableRev = "f5190b692864072e79a2fb7c52d72d1d57fcb269"; # nixpkgs-rev
stableFetchFromGitHub = fetchFromGitHub {
owner = "NixOS";
repo = "nixpkgs";
rev = stableRev;
hash = "sha256-B+oXXmNRTOajmEpzYJDrpZmYRFIBWA/fKCgY5CXCc5M="; # nixpkgs-hash
hash = "sha256-6mqKLf7ukajFOrVjO7EH1i37CQOVG22AnuU3wR84xK0="; # nixpkgs-hash
};
stableBuiltins = builtins.fetchTarball {
url = ''https://github.com/NixOS/nixpkgs/archive/${stableRev}.tar.gz'';
sha256 = "14vkq8jy861853ghyn01a929i6d5xf860wsak2iyck2icdg1gsh7"; # nixpkgs-sha256
sha256 = "1bf470gw2dz5ks06s6wm0c4znbfn0yqknqxm7b2si4gfzqnqlspa"; # nixpkgs-sha256
};
pkgsStableSrc = if fetchFromGitHub != null then stableFetchFromGitHub else stableBuiltins;
pkgsStable = import pkgsStableSrc ({
inherit overlays;
} // (if system == null then {} else { inherit system; }));

masterRev = "bb9c7537288d5410c0661f7762c175beffd75170"; # nixpkgs-master-rev
masterRev = "f4d46d85b687293bc8d872010fb66a4f23c23139"; # nixpkgs-master-rev
masterFetchFromGitHub = fetchFromGitHub {
owner = "NixOS";
repo = "nixpkgs";
rev = masterRev;
hash = "sha256-W0e4WJk3A1hmKN4AcoYujF9x9yXaReB+L32JoQFbkv8="; # nixpkgs-master-hash
hash = "sha256-j0P9+h7HX67KNlGki6puFfx8xO6wx4Jz23jXg3dpfCw="; # nixpkgs-master-hash
};
masterBuiltins = builtins.fetchTarball {
url = ''https://github.com/NixOS/nixpkgs/archive/${masterRev}.tar.gz'';
sha256 = "1zwjbc0s32bx5xzf0ifs4pvp2pwc5s37406y51k5h0rpk5cbhisv"; # nixpkgs-master-sha256
sha256 = "0b3wd5vq7mvqvdrq5ixhxv27rz0mdsm8p92i6v5awpy73vxgshwg"; # nixpkgs-master-sha256
};
pkgsMasterSrc = if fetchFromGitHub != null then masterFetchFromGitHub else masterBuiltins;
pkgsMaster = import pkgsMasterSrc ({
Expand Down
14 changes: 7 additions & 7 deletions flake.lock

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

7 changes: 3 additions & 4 deletions flake.nix
Original file line number Diff line number Diff line change
@@ -1,17 +1,16 @@
{
description = "CodeDown languages";

inputs.nixpkgs.url = "github:NixOS/nixpkgs/release-25.05";
inputs.nixpkgs.url = "github:NixOS/nixpkgs/release-25.11";
inputs.nixpkgs-master.url = "github:NixOS/nixpkgs/master";

inputs.flake-utils.url = "github:numtide/flake-utils";

outputs = { self, nixpkgs, nixpkgs-master, flake-utils }:
flake-utils.lib.eachDefaultSystem (system:
let
overlays = [];
pkgsStable = import nixpkgs { inherit system overlays; };
pkgsMaster = import nixpkgs-master { inherit system overlays; };
pkgsStable = import nixpkgs { inherit system; };
pkgsMaster = import nixpkgs-master { inherit system; };

codedown = import ./codedown.nix {
pkgsStableSrc = nixpkgs;
Expand Down
6 changes: 3 additions & 3 deletions modules/kernels/bash/default.nix
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{ callPackage
, lib
, python3
, nodePackages
, symlinkJoin

, bash
, bash-language-server

, settings
, settingsSchema
Expand Down Expand Up @@ -47,8 +47,8 @@ symlinkJoin {
};
versions = {
bash = bash.version;
bash-language-server = nodePackages.bash-language-server.version;
bash_kernel = python3.pkgs.bash_kernel.version;
bash-language-server = bash-language-server.version;
bash-kernel = python3.pkgs.bash-kernel.version;
};
inherit packageOptions packageSearch;
inherit settingsSchema settings;
Expand Down
4 changes: 2 additions & 2 deletions modules/kernels/bash/kernel.nix
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@
let
common = callPackage ../common.nix {};

python = python3.withPackages (ps: [ps.bash_kernel]);
python = python3.withPackages (ps: [ps.bash-kernel]);

# Checks failed on macOS on release-25.05. Disabling them is one option:
# python = python3.withPackages (ps: [(ps.bash_kernel.overrideAttrs (_oldAttrs: { doCheck = false; }))]);
# python = python3.withPackages (ps: [(ps.bash-kernel.overrideAttrs (_oldAttrs: { doCheck = false; }))]);

in

Expand Down
10 changes: 5 additions & 5 deletions modules/kernels/bash/language_server_bash/default.nix
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{ lib
, runCommand
, callPackage
{ callPackage
, lib
, makeWrapper
, nodePackages
, runCommand

, bash-language-server
, shellcheck
, unixtools

Expand All @@ -17,7 +17,7 @@ let
# will make it fail to hit in the cache.nixos.org and then the user will need
# to download pnpm in order to build it. But we submitted an upstream fix to reduce
# the closure size; see https://github.com/NixOS/nixpkgs/pull/521755
bashLanguageServer = nodePackages.bash-language-server;
bashLanguageServer = bash-language-server;

# manWithPages = (import ../shared.nix).manWithPages;

Expand Down
3 changes: 1 addition & 2 deletions modules/kernels/cpp/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
, clang
, xeus-cling
, llvmPackages
, system

, settings
, settingsSchema
Expand All @@ -25,7 +24,7 @@ let

languageServers = lib.optionals settings.lsp.clangd.enable
[(callPackage ./language_server_clangd {
inherit kernelName llvmPackages system cling;
inherit kernelName llvmPackages cling;
settings = settings.lsp.clangd;
})];

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ let
owner = "codedownio";
repo = "cpp-notebook-language-server";
rev = "v${version}";
hash = "sha256-KGCj8pH38sFIgYEBC7bRycav1+rY8nidzDwC1qM6h5c=";
hash = "sha256-unUZw2fG4ESxg4WIqEI6kkKspq1Bu+v2WzpinL3C17U=";
};

sourceRoot = "${src.name}/cling-parser";
Expand Down
4 changes: 2 additions & 2 deletions modules/kernels/cpp/language_server_clangd/cnls.nix
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{ fetchzip
, system
, stdenv
}:

# Fetch a static binary from GitHub releases
Expand Down Expand Up @@ -30,4 +30,4 @@
hash = "sha256-UGB6tVuWlMOxskNFdICaVTurdbd95auAMg7Ty4Iawng=";
};
# HASHES_END
}.${system}
}.${stdenv.hostPlatform.system}
3 changes: 1 addition & 2 deletions modules/kernels/cpp/language_server_clangd/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
, runCommand
, makeWrapper
, llvmPackages
, system
, cling

, kernelName
Expand All @@ -15,7 +14,7 @@ let

clangd = llvmPackages.clang-tools;

cnls = callPackage ./cnls.nix { inherit system; };
cnls = callPackage ./cnls.nix {};

cnlsVersion = import ./cnls-version.nix;

Expand Down
2 changes: 1 addition & 1 deletion modules/kernels/cpp/module.nix
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
with lib;

let
pkgsToUse = config.pkgsMaster;
pkgsToUse = config.pkgs;

in

Expand Down
3 changes: 1 addition & 2 deletions modules/kernels/go/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
, gopls
, lib
, symlinkJoin
, system

, go

Expand All @@ -23,7 +22,7 @@ let
languageServers =
[]
++ lib.optionals settings.lsp.gopls.enable [(callPackage ./language-server-gopls/language-server-gopls.nix {
inherit go attrs kernelName system;
inherit go attrs kernelName;
settings = settings.lsp.gopls;
})]
;
Expand Down
14 changes: 13 additions & 1 deletion modules/kernels/go/kernel.nix
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{ lib
, callPackage
, fetchFromGitHub
, gophernotes

, attrs
Expand All @@ -12,13 +13,24 @@ with lib;
let
common = callPackage ../common.nix {};

gophernotesPatched = gophernotes.overrideAttrs (_oldAttrs: {
src = fetchFromGitHub {
owner = "codedownio";
repo = "gophernotes";
rev = "6b18077f97aa913b73093beeb2152b2d51ee64af";
hash = "sha256-gSD2zUWka3cur5jkv4siYp2gJdxD+00bmJi6BZd0c+c="; # nixpkgs-hash
};

vendorHash = "sha256-bGaXnd0E6dRNiwvGIn7Ptddrt7dRzPfkPThgHPuL2Vo=";
});

in

common.makeJupyterKernel {
go = {
displayName = "Go";
argv = [
"${gophernotes}/bin/gophernotes"
"${gophernotesPatched}/bin/gophernotes"
"{connection_file}"
];
language = head attrs;
Expand Down
2 changes: 1 addition & 1 deletion modules/kernels/go/language-server-gopls/gnls-version.nix
Original file line number Diff line number Diff line change
@@ -1 +1 @@
"0.1.0.3"
"0.1.0.4"
28 changes: 14 additions & 14 deletions modules/kernels/go/language-server-gopls/gnls.nix
Original file line number Diff line number Diff line change
@@ -1,33 +1,33 @@
{ fetchzip
, system
, stdenv
}:

# Fetch a static binary from GitHub releases
{
# HASHES_START
"aarch64-linux" = fetchzip {
name = "go-notebook-language-server-0.1.0.3";
name = "go-notebook-language-server-0.1.0.4";
stripRoot = false;
url = "https://github.com/codedownio/go-notebook-language-server/releases/download/v0.1.0.3/go-notebook-language-server-0.1.0.3-aarch64-linux.tar.gz";
hash = "sha256-q2u2Iyy5cZCnxcXppZbbahtsZ+sQi1QrKLw1JDqUeJM=";
url = "https://github.com/codedownio/go-notebook-language-server/releases/download/v0.1.0.4/go-notebook-language-server-0.1.0.4-aarch64-linux.tar.gz";
hash = "sha256-GZG3miAdBqLKat4arB1isjMKKpnRl8m2LOYtKUBT8oM=";
};
"x86_64-linux" = fetchzip {
name = "go-notebook-language-server-0.1.0.3";
name = "go-notebook-language-server-0.1.0.4";
stripRoot = false;
url = "https://github.com/codedownio/go-notebook-language-server/releases/download/v0.1.0.3/go-notebook-language-server-0.1.0.3-x86_64-linux.tar.gz";
hash = "sha256-Yq6AYnaYO1JIblz8d8oUdVWZb18trpr4JgkKcLN2IuM=";
url = "https://github.com/codedownio/go-notebook-language-server/releases/download/v0.1.0.4/go-notebook-language-server-0.1.0.4-x86_64-linux.tar.gz";
hash = "sha256-0hMofbVtiAmIRhWihDBYZ9pXy9yfpiqeBLX+L0PwreE=";
};
"x86_64-darwin" = fetchzip {
name = "go-notebook-language-server-0.1.0.3";
name = "go-notebook-language-server-0.1.0.4";
stripRoot = false;
url = "https://github.com/codedownio/go-notebook-language-server/releases/download/v0.1.0.3/go-notebook-language-server-0.1.0.3-x86_64-darwin.tar.gz";
hash = "sha256-ovu3YFTB8vDwBp0hcFE/hV09W7vqjkC1fzKrfumXDws=";
url = "https://github.com/codedownio/go-notebook-language-server/releases/download/v0.1.0.4/go-notebook-language-server-0.1.0.4-x86_64-darwin.tar.gz";
hash = "sha256-8z71FB5mV4s9gW5QCBdPE6a3jRRx/OX/6JA/hX3T2Zc=";
};
"aarch64-darwin" = fetchzip {
name = "go-notebook-language-server-0.1.0.3";
name = "go-notebook-language-server-0.1.0.4";
stripRoot = false;
url = "https://github.com/codedownio/go-notebook-language-server/releases/download/v0.1.0.3/go-notebook-language-server-0.1.0.3-aarch64-darwin.tar.gz";
hash = "sha256-9n1ExuhRLioeGfdQlLTyRCr+P0+YR4yc3BLBd9W2jww=";
url = "https://github.com/codedownio/go-notebook-language-server/releases/download/v0.1.0.4/go-notebook-language-server-0.1.0.4-aarch64-darwin.tar.gz";
hash = "sha256-cAcGaKANex4kMnYD4JZb+JeEcidkNIxj8CF3pns03gE=";
};
# HASHES_END
}.${system}
}.${stdenv.hostPlatform.system}
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
, runCommand
, makeWrapper
, pkgs
, system

, attrs
, kernelName
Expand All @@ -18,7 +17,7 @@ let

gnlsVersion = import ./gnls-version.nix;

gnls = callPackage ./gnls.nix { inherit system; };
gnls = callPackage ./gnls.nix {};

go-parser = callPackage ./go-parser.nix {};

Expand Down
Loading
Loading