From ab9cb6a9aa443d55f9d199d2edd6a1ee18799022 Mon Sep 17 00:00:00 2001 From: Henri Saudubray Date: Fri, 26 Dec 2025 14:35:40 +0100 Subject: [PATCH] feat (shells): haskell, java, switch to unstable --- shells/haskell/flake.lock | 27 +++++++++++++++++++++++++++ shells/haskell/flake.nix | 25 +++++++++++++++++++++++++ shells/java/flake.lock | 27 +++++++++++++++++++++++++++ shells/java/flake.nix | 25 +++++++++++++++++++++++++ shells/ocaml/flake.lock | 8 ++++---- shells/ocaml/flake.nix | 2 +- shells/why3-dev/flake.lock | 27 +++++++++++++++++++++++++++ shells/why3-dev/flake.nix | 8 +++----- 8 files changed, 139 insertions(+), 10 deletions(-) create mode 100644 shells/haskell/flake.lock create mode 100644 shells/haskell/flake.nix create mode 100644 shells/java/flake.lock create mode 100644 shells/java/flake.nix create mode 100644 shells/why3-dev/flake.lock diff --git a/shells/haskell/flake.lock b/shells/haskell/flake.lock new file mode 100644 index 0000000..d9b607f --- /dev/null +++ b/shells/haskell/flake.lock @@ -0,0 +1,27 @@ +{ + "nodes": { + "nixpkgs": { + "locked": { + "lastModified": 1766651565, + "narHash": "sha256-QEhk0eXgyIqTpJ/ehZKg9IKS7EtlWxF3N7DXy42zPfU=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "3e2499d5539c16d0d173ba53552a4ff8547f4539", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "root": { + "inputs": { + "nixpkgs": "nixpkgs" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/shells/haskell/flake.nix b/shells/haskell/flake.nix new file mode 100644 index 0000000..16cc022 --- /dev/null +++ b/shells/haskell/flake.nix @@ -0,0 +1,25 @@ +{ + description = ""; + inputs = { + nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable"; + }; + + outputs = + { self, nixpkgs, ... }: + let + system = "x86_64-linux"; + in + { + devShells."${system}".default = + let + pkgs = import nixpkgs { inherit system; }; + in + pkgs.mkShell { + packages = with pkgs; [ + ghc + haskell-language-server + haskellPackages.recursion-schemes + ]; + }; + }; +} diff --git a/shells/java/flake.lock b/shells/java/flake.lock new file mode 100644 index 0000000..8fdad34 --- /dev/null +++ b/shells/java/flake.lock @@ -0,0 +1,27 @@ +{ + "nodes": { + "nixpkgs": { + "locked": { + "lastModified": 1767116409, + "narHash": "sha256-5vKw92l1GyTnjoLzEagJy5V5mDFck72LiQWZSOnSicw=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "cad22e7d996aea55ecab064e84834289143e44a0", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "root": { + "inputs": { + "nixpkgs": "nixpkgs" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/shells/java/flake.nix b/shells/java/flake.nix new file mode 100644 index 0000000..aacaa28 --- /dev/null +++ b/shells/java/flake.nix @@ -0,0 +1,25 @@ +{ + description = "Java nix-flake devshell."; + + inputs = { + nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable"; + }; + + outputs = + { self, nixpkgs, ... }: + let + system = "x86_64-linux"; + in + { + devShells."${system}".default = + let + pkgs = import nixpkgs { inherit system; }; + in + pkgs.mkShell { + packages = with pkgs; [ + jdk + jdt-language-server + ]; + }; + }; +} diff --git a/shells/ocaml/flake.lock b/shells/ocaml/flake.lock index 6afaf12..8fdad34 100644 --- a/shells/ocaml/flake.lock +++ b/shells/ocaml/flake.lock @@ -2,16 +2,16 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1765762245, - "narHash": "sha256-3iXM/zTqEskWtmZs3gqNiVtRTsEjYAedIaLL0mSBsrk=", + "lastModified": 1767116409, + "narHash": "sha256-5vKw92l1GyTnjoLzEagJy5V5mDFck72LiQWZSOnSicw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c8cfcd6ccd422e41cc631a0b73ed4d5a925c393d", + "rev": "cad22e7d996aea55ecab064e84834289143e44a0", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-25.11", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } diff --git a/shells/ocaml/flake.nix b/shells/ocaml/flake.nix index ac8d7e6..7f4c23f 100644 --- a/shells/ocaml/flake.nix +++ b/shells/ocaml/flake.nix @@ -2,7 +2,7 @@ description = "OCaml nix-flake devshell."; inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11"; + nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable"; }; outputs = diff --git a/shells/why3-dev/flake.lock b/shells/why3-dev/flake.lock new file mode 100644 index 0000000..8fdad34 --- /dev/null +++ b/shells/why3-dev/flake.lock @@ -0,0 +1,27 @@ +{ + "nodes": { + "nixpkgs": { + "locked": { + "lastModified": 1767116409, + "narHash": "sha256-5vKw92l1GyTnjoLzEagJy5V5mDFck72LiQWZSOnSicw=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "cad22e7d996aea55ecab064e84834289143e44a0", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "root": { + "inputs": { + "nixpkgs": "nixpkgs" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/shells/why3-dev/flake.nix b/shells/why3-dev/flake.nix index 6b34381..09071e5 100644 --- a/shells/why3-dev/flake.nix +++ b/shells/why3-dev/flake.nix @@ -2,7 +2,7 @@ description = "Nix flake devshell for why3 development"; inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11"; + nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable"; }; outputs = @@ -23,11 +23,9 @@ ocamlPackages.menhir ocamlPackages.menhirLib ocamlPackages.zarith + ocamlPackages.lablgtk3 + ocamlPackages.lablgtk3-sourceview3 ]; - - shellHook = '' - echo "Test."; - ''; }; }; }