From 6d965aeebac9ccd606466553c16200c48704eb89 Mon Sep 17 00:00:00 2001
From: guangtao <gtrunsec@hardenedlinux.org>
Date: Wed, 20 Dec 2023 15:44:43 -0800
Subject: [PATCH] chore: remove nixpkgs-julia(upstream merged)

---
 flake.lock                             | 29 ++++++--------------------
 flake.nix                              |  1 -
 modules/kernels/typescript/default.nix |  2 +-
 modules/types/nixpkgs.nix              |  2 --
 modules/types/overlays.nix             |  2 +-
 5 files changed, 8 insertions(+), 28 deletions(-)

diff --git a/flake.lock b/flake.lock
index 15cf33aa..9cac35b0 100644
--- a/flake.lock
+++ b/flake.lock
@@ -226,22 +226,6 @@
         "type": "github"
       }
     },
-    "nixpkgs-julia": {
-      "locked": {
-        "lastModified": 1694073329,
-        "narHash": "sha256-F6+k1FSgtFSXaGSQqf00u/jBHhvUvrsTx9qjEWAk0E0=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "ddadf5f46ac96423efbd67228ffe84361743c253",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "refs/pull/225513/head",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "nixpkgs-stable": {
       "locked": {
         "lastModified": 1698288402,
@@ -276,11 +260,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1697379843,
-        "narHash": "sha256-RcnGuJgC2K/UpTy+d32piEoBXq2M+nVFzM3ah/ZdJzg=",
+        "lastModified": 1702938738,
+        "narHash": "sha256-O7Vb0xC9s4Dmgxj8APEpuuMj7HsLgPbpy1UKvNVJp7o=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "12bdeb01ff9e2d3917e6a44037ed7df6e6c3df9d",
+        "rev": "dd8e82f3b4017b8faa52c2b1897a38d53c3c26cb",
         "type": "github"
       },
       "original": {
@@ -401,11 +385,11 @@
         "treefmt-nix": []
       },
       "locked": {
-        "lastModified": 1701642265,
-        "narHash": "sha256-d2fUQQCONzQ8nZuHqqsR4Vu603D1LZ4atxEGx7YrcpQ=",
+        "lastModified": 1703076010,
+        "narHash": "sha256-VaoDgib09zqtF0rREUvD2inmE9N4ECT1i02DVAhmOPk=",
         "owner": "nix-community",
         "repo": "poetry2nix",
-        "rev": "2edc0addf15d1fbbb86e7c58f5278e3604a93827",
+        "rev": "b76e91da74ad7af0bc397561a59a19fcbc2ad488",
         "type": "github"
       },
       "original": {
@@ -490,7 +474,6 @@
         "ihaskell": "ihaskell",
         "nix-dart": "nix-dart",
         "nixpkgs": "nixpkgs_2",
-        "nixpkgs-julia": "nixpkgs-julia",
         "nixpkgs-stable": "nixpkgs-stable",
         "npmlock2nix": "npmlock2nix",
         "opam-nix": "opam-nix",
diff --git a/flake.nix b/flake.nix
index 07191da5..c5d35a5b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -10,7 +10,6 @@
 
   inputs.nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
   inputs.nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-23.05";
-  inputs.nixpkgs-julia.url = "github:NixOS/nixpkgs/?ref=refs/pull/225513/head";
   inputs.flake-compat.url = "github:edolstra/flake-compat";
   inputs.flake-compat.flake = false;
   inputs.flake-utils.url = "github:numtide/flake-utils";
diff --git a/modules/kernels/typescript/default.nix b/modules/kernels/typescript/default.nix
index 1d53df07..70698186 100644
--- a/modules/kernels/typescript/default.nix
+++ b/modules/kernels/typescript/default.nix
@@ -31,7 +31,7 @@
       inherit (pkgs) lib stdenv writeScriptBin;
       inherit (lib) makeBinPath;
 
-      pkgs' = import pkgs.path {
+      pkgs' = import self.inputs.nixpkgs-stable.outPath {
         inherit system;
         config.permittedInsecurePackages = [
           "nodejs-14.21.3"
diff --git a/modules/types/nixpkgs.nix b/modules/types/nixpkgs.nix
index 2b660b44..c17bc4f7 100644
--- a/modules/types/nixpkgs.nix
+++ b/modules/types/nixpkgs.nix
@@ -20,8 +20,6 @@ in
     default =
       if kernelName == "scala"
       then applyOverlays self.inputs.nixpkgs-stable
-      else if kernelName == "julia"
-      then applyOverlays self.inputs.nixpkgs-julia
       else applyOverlays self.inputs.nixpkgs;
     defaultText = lib.literalExpression "self.inputs.nixpkgs";
     example = lib.literalExpression "self.inputs.nixpkgs";
diff --git a/modules/types/overlays.nix b/modules/types/overlays.nix
index 070250fb..0352c927 100644
--- a/modules/types/overlays.nix
+++ b/modules/types/overlays.nix
@@ -5,7 +5,7 @@
   kernelName,
 }: let
   overlays =
-    if (lib.elem kernelName ["python" "bash" "c" "elm" "zsh"])
+    if (lib.elem kernelName ["python" "bash" "c" "elm" "zsh" "postgres"])
     then [
       self.inputs.poetry2nix.overlays.default
     ]