Skip to content

Commit 6d965ae

Browse files
committed
chore: remove nixpkgs-julia(upstream merged)
1 parent b124522 commit 6d965ae

File tree

5 files changed

+8
-28
lines changed

5 files changed

+8
-28
lines changed

flake.lock

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

flake.nix

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010

1111
inputs.nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
1212
inputs.nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-23.05";
13-
inputs.nixpkgs-julia.url = "github:NixOS/nixpkgs/?ref=refs/pull/225513/head";
1413
inputs.flake-compat.url = "github:edolstra/flake-compat";
1514
inputs.flake-compat.flake = false;
1615
inputs.flake-utils.url = "github:numtide/flake-utils";

modules/kernels/typescript/default.nix

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
inherit (pkgs) lib stdenv writeScriptBin;
3232
inherit (lib) makeBinPath;
3333

34-
pkgs' = import pkgs.path {
34+
pkgs' = import self.inputs.nixpkgs-stable.outPath {
3535
inherit system;
3636
config.permittedInsecurePackages = [
3737
"nodejs-14.21.3"

modules/types/nixpkgs.nix

-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@ in
2020
default =
2121
if kernelName == "scala"
2222
then applyOverlays self.inputs.nixpkgs-stable
23-
else if kernelName == "julia"
24-
then applyOverlays self.inputs.nixpkgs-julia
2523
else applyOverlays self.inputs.nixpkgs;
2624
defaultText = lib.literalExpression "self.inputs.nixpkgs";
2725
example = lib.literalExpression "self.inputs.nixpkgs";

modules/types/overlays.nix

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
kernelName,
66
}: let
77
overlays =
8-
if (lib.elem kernelName ["python" "bash" "c" "elm" "zsh"])
8+
if (lib.elem kernelName ["python" "bash" "c" "elm" "zsh" "postgres"])
99
then [
1010
self.inputs.poetry2nix.overlays.default
1111
]

0 commit comments

Comments
 (0)