From 902ae2fc45b3dec522423284b3b5500cbf5ba4df Mon Sep 17 00:00:00 2001 From: arne Date: Thu, 11 Apr 2024 14:16:18 +0200 Subject: [PATCH] fix clojure dep this caused nrepl completion to crash --- deps.edn | 2 +- flake.lock | 11 +++++------ flake.nix | 5 +++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/deps.edn b/deps.edn index 358ca83..390213c 100644 --- a/deps.edn +++ b/deps.edn @@ -1,4 +1,4 @@ -{:deps {org.clojure/clojure {:mvn/version "1.9.0"} +{:deps {#_#_ org.clojure/clojure {:mvn/version "1.11.1"} quil/quil {:mvn/version "3.1.0"} thi.ng/geom {:mvn/version "1.0.0-RC3" :exclusions [org.jogamp.jogl/jogl-all diff --git a/flake.lock b/flake.lock index 78fd844..9e7b90e 100644 --- a/flake.lock +++ b/flake.lock @@ -2,12 +2,11 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1667514353, - "narHash": "sha256-zaYpmXs2gWh/KeFyNTcNKd0ibuWLvNV0S62fagVEnQs=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "45b546681874b344a53bdeb01bd41f13a5cfeba0", - "type": "github" + "lastModified": 1709703039, + "narHash": "sha256-6hqgQ8OK6gsMu1VtcGKBxKQInRLHtzulDo9Z5jxHEFY=", + "path": "/nix/store/gig8j85kj7ybjy3ksn6k3aich8j2k59y-source", + "rev": "9df3e30ce24fd28c7b3e2de0d986769db5d6225d", + "type": "path" }, "original": { "owner": "NixOS", diff --git a/flake.nix b/flake.nix index 3d8c31c..ce85ab3 100644 --- a/flake.nix +++ b/flake.nix @@ -4,7 +4,7 @@ outputs = { self, nixpkgs }: let system = "x86_64-linux"; - pkgs = nixpkgs.legacyPackages.${system}; + pkgs = import nixpkgs { inherit system; }; lib = pkgs.lib; in { devShell.${system} = pkgs.mkShell rec { @@ -12,7 +12,7 @@ buildInputs = with pkgs; [ xorg_sys_opengl xorg.libXxf86vm - # xwayland + xwayland clojure ]; LD_LIBRARY_PATH = "${lib.makeLibraryPath buildInputs}"; @@ -27,6 +27,7 @@ # also, there's a bug that is avoided with the variable # https://github.com/processing/processing/issues/5476 JAVA_OPTS = "-Djogl.disable.openglcore=false"; + # XDG_SESSION_TYPE = "wayland"; # LIBGL_ALWAYS_SOFTWARE = true; # ← this is the same as passing -Djogl.disable.openglcore="true" }; };