From 9398446615ed5649ed9d9116af593a833fb04042 Mon Sep 17 00:00:00 2001 From: Malik Date: Mon, 20 Jan 2025 13:39:24 +0100 Subject: [PATCH 01/11] Nix: init --- default.nix | 34 ++++++++++++++++++++++++++++++++ flake.lock | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++++ flake.nix | 16 +++++++++++++++ 3 files changed, 106 insertions(+) create mode 100644 default.nix create mode 100644 flake.lock create mode 100644 flake.nix diff --git a/default.nix b/default.nix new file mode 100644 index 0000000..de43896 --- /dev/null +++ b/default.nix @@ -0,0 +1,34 @@ +{ mkDerivation, aeson, ansi-terminal, ansi-wl-pprint, async, base, lib + , boxes, bytestring, containers, directory, filepath, formatting + , Glob, hspec, hspec-core, HUnit, language-javascript, mtl + , optparse-applicative, process, purescript, QuickCheck, safe, text + , transformers, unordered-containers, utf8-string + }: + +mkDerivation { + pname = "zephyr"; + version = "0.5.3"; + sha256 = "1chfs864kayq4xfl5yz4pcwfy1zpsq9ygbvlbj3s7lifg7khyffz"; + source = ./.; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson ansi-terminal base boxes containers formatting + language-javascript mtl purescript safe text unordered-containers + ]; + executableHaskellDepends = [ + aeson ansi-terminal ansi-wl-pprint async base bytestring containers + directory filepath formatting Glob language-javascript mtl + optparse-applicative purescript text transformers utf8-string + ]; + testHaskellDepends = [ + aeson base containers directory hspec hspec-core HUnit + language-javascript mtl optparse-applicative process purescript + QuickCheck text transformers + ]; + testToolDepends = [ purescript ]; + description = "Zephyr, tree-shaking for the PureScript language"; + license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; + mainProgram = "zephyr"; + } diff --git a/flake.lock b/flake.lock new file mode 100644 index 0000000..5182ff7 --- /dev/null +++ b/flake.lock @@ -0,0 +1,56 @@ +{ + "nodes": { + "flake-utils": { + "inputs": { + "systems": "systems" + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "narHash": "sha256-iAYIidDSvqRWMRQrCIn2X8edyrOg/uTBZc1M4bdpQjs=\n", + "path": "/nix/store/id9k7zxhiz7wqsy59alivmbz80dnrs82-zdns8ch4w4ibaspjhw4qjp791lkj14z1-source", + "type": "path" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, + "root": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs" + } + }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/flake.nix b/flake.nix new file mode 100644 index 0000000..3339820 --- /dev/null +++ b/flake.nix @@ -0,0 +1,16 @@ +{ + description = "Flake utils demo"; + + inputs.flake-utils.url = "github:numtide/flake-utils"; + + outputs = { self, nixpkgs, flake-utils }: + flake-utils.lib.eachDefaultSystem (system: + let pkgs = nixpkgs.legacyPackages.${system}; in + { + packages = rec { + default = zephyr; + zephyr = pkgs.callPackage ./default.nix { inherit pkgs; }; + }; + } + ); +} From 987b27c6d50623a071b37912204281df591bbca3 Mon Sep 17 00:00:00 2001 From: Malik Date: Mon, 20 Jan 2025 14:06:50 +0100 Subject: [PATCH 02/11] Nix: define dependencies --- default.nix | 94 ++++++++++++++++++++++++++++++++++------------------- flake.lock | 15 ++++++--- flake.nix | 7 ++-- 3 files changed, 76 insertions(+), 40 deletions(-) diff --git a/default.nix b/default.nix index de43896..516a4c2 100644 --- a/default.nix +++ b/default.nix @@ -1,34 +1,62 @@ -{ mkDerivation, aeson, ansi-terminal, ansi-wl-pprint, async, base, lib - , boxes, bytestring, containers, directory, filepath, formatting - , Glob, hspec, hspec-core, HUnit, language-javascript, mtl - , optparse-applicative, process, purescript, QuickCheck, safe, text - , transformers, unordered-containers, utf8-string - }: +{ pkgs ? import { }, ... }: -mkDerivation { - pname = "zephyr"; - version = "0.5.3"; - sha256 = "1chfs864kayq4xfl5yz4pcwfy1zpsq9ygbvlbj3s7lifg7khyffz"; - source = ./.; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson ansi-terminal base boxes containers formatting - language-javascript mtl purescript safe text unordered-containers - ]; - executableHaskellDepends = [ - aeson ansi-terminal ansi-wl-pprint async base bytestring containers - directory filepath formatting Glob language-javascript mtl - optparse-applicative purescript text transformers utf8-string - ]; - testHaskellDepends = [ - aeson base containers directory hspec hspec-core HUnit - language-javascript mtl optparse-applicative process purescript - QuickCheck text transformers - ]; - testToolDepends = [ purescript ]; - description = "Zephyr, tree-shaking for the PureScript language"; - license = lib.licenses.mpl20; - hydraPlatforms = lib.platforms.none; - mainProgram = "zephyr"; - } + let + mkDerivation = pkgs.stdenv.mkDerivation; + lib = pkgs.lib; + haskellPkg = pkgName: pkgs.haskellPackages."${pkgName}"; + + aeson = haskellPkg "aeson"; + ansi-terminal = haskellPkg "ansi-terminal"; + ansi-wl-pprint = haskellPkg "ansi-wl-pprint"; + async = haskellPkg "async"; + base = haskellPkg "base"; + boxes = haskellPkg "boxes"; + bytestring = haskellPkg "bytestring_0_12_1_0"; + containers = haskellPkg "containers_0_7"; + directory = haskellPkg "directory_1_3_9_0"; + filepath = haskellPkg "filepath_1_5_3_0"; + formatting = haskellPkg "formatting"; + Glob = haskellPkg "Glob"; + hspec = haskellPkg "hspec"; + hspec-core = haskellPkg "hspec-core"; + HUnit = haskellPkg "HUnit"; + language-javascript = haskellPkg "language-javascript"; + mtl = haskellPkg "mtl_2_3_1"; + optparse-applicative = haskellPkg "optparse-applicative"; + process = haskellPkg "process_1_6_25_0"; + purescript = haskellPkg "purescript"; + QuickCheck = haskellPkg "QuickCheck"; + safe = haskellPkg "safe"; + text = haskellPkg "text_2_1_1"; + transformers = haskellPkg "transformers_0_6_1_2"; + unordered-containers = haskellPkg "unordered-containers"; + utf8-string = haskellPkg "utf8-string"; + in mkDerivation rec { + name = "zephyr"; + pname = name; + src = ./.; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson ansi-terminal base boxes containers formatting language-javascript mtl purescript safe text unordered-containers + ]; + executableHaskellDepends = [ + aeson ansi-terminal ansi-wl-pprint async base bytestring containers + directory filepath formatting Glob language-javascript mtl + optparse-applicative purescript text transformers utf8-string + ]; + testHaskellDepends = [ + aeson base containers directory hspec hspec-core HUnit + language-javascript mtl optparse-applicative process purescript + QuickCheck text transformers + ]; + testToolDepends = [ purescript ]; + meta = { + description = "Zephyr, tree-shaking for the PureScript language"; + license = lib.licenses.mpl20; + homepage = "https://github.com/MaybeJustJames/zephyr"; + maintainers = with pkgs.lib.maintainers; [ malik ]; + }; + hydraPlatforms = lib.platforms.none; + mainProgram = name; + } diff --git a/flake.lock b/flake.lock index 5182ff7..e559397 100644 --- a/flake.lock +++ b/flake.lock @@ -20,13 +20,18 @@ }, "nixpkgs": { "locked": { - "narHash": "sha256-iAYIidDSvqRWMRQrCIn2X8edyrOg/uTBZc1M4bdpQjs=\n", - "path": "/nix/store/id9k7zxhiz7wqsy59alivmbz80dnrs82-zdns8ch4w4ibaspjhw4qjp791lkj14z1-source", - "type": "path" + "lastModified": 1737062831, + "narHash": "sha256-Tbk1MZbtV2s5aG+iM99U8FqwxU/YNArMcWAv6clcsBc=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "5df43628fdf08d642be8ba5b3625a6c70731c19c", + "type": "github" }, "original": { - "id": "nixpkgs", - "type": "indirect" + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" } }, "root": { diff --git a/flake.nix b/flake.nix index 3339820..6b013a5 100644 --- a/flake.nix +++ b/flake.nix @@ -1,7 +1,10 @@ { description = "Flake utils demo"; - inputs.flake-utils.url = "github:numtide/flake-utils"; + inputs = { + nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + flake-utils.url = "github:numtide/flake-utils"; + }; outputs = { self, nixpkgs, flake-utils }: flake-utils.lib.eachDefaultSystem (system: @@ -9,7 +12,7 @@ { packages = rec { default = zephyr; - zephyr = pkgs.callPackage ./default.nix { inherit pkgs; }; + zephyr = import ./default.nix { inherit pkgs; }; }; } ); From 6b1bb1ef4ec64b53a4c1b6c920d0f6d64935a556 Mon Sep 17 00:00:00 2001 From: Malik Date: Mon, 20 Jan 2025 16:32:29 +0100 Subject: [PATCH 03/11] Nix: use haskelPackages mkDerivation --- default.nix | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/default.nix b/default.nix index 516a4c2..21871cf 100644 --- a/default.nix +++ b/default.nix @@ -1,10 +1,10 @@ { pkgs ? import { }, ... }: let - mkDerivation = pkgs.stdenv.mkDerivation; lib = pkgs.lib; haskellPkg = pkgName: pkgs.haskellPackages."${pkgName}"; + mkDerivation = haskellPkg "mkDerivation"; aeson = haskellPkg "aeson"; ansi-terminal = haskellPkg "ansi-terminal"; ansi-wl-pprint = haskellPkg "ansi-wl-pprint"; @@ -32,8 +32,8 @@ unordered-containers = haskellPkg "unordered-containers"; utf8-string = haskellPkg "utf8-string"; in mkDerivation rec { - name = "zephyr"; - pname = name; + pname = "zephyr"; + version = "5.3"; src = ./.; isLibrary = true; isExecutable = true; @@ -51,12 +51,10 @@ QuickCheck text transformers ]; testToolDepends = [ purescript ]; - meta = { - description = "Zephyr, tree-shaking for the PureScript language"; - license = lib.licenses.mpl20; - homepage = "https://github.com/MaybeJustJames/zephyr"; - maintainers = with pkgs.lib.maintainers; [ malik ]; - }; + license = lib.licenses.mpl20; + description = "Zephyr, tree-shaking for the PureScript language"; + homepage = "https://github.com/MaybeJustJames/zephyr"; + maintainers = with pkgs.lib.maintainers; [ malik ]; hydraPlatforms = lib.platforms.none; - mainProgram = name; + mainProgram = pname; } From 15e4475ca8cd4485f0172cd665e840fc023be8b7 Mon Sep 17 00:00:00 2001 From: Malik Date: Tue, 21 Jan 2025 12:31:20 +0100 Subject: [PATCH 04/11] Bump: dependencies --- default.nix | 4 ++-- zephyr.cabal | 66 ++++++++++++++++++++++++++-------------------------- 2 files changed, 35 insertions(+), 35 deletions(-) diff --git a/default.nix b/default.nix index 21871cf..dab789e 100644 --- a/default.nix +++ b/default.nix @@ -7,7 +7,7 @@ mkDerivation = haskellPkg "mkDerivation"; aeson = haskellPkg "aeson"; ansi-terminal = haskellPkg "ansi-terminal"; - ansi-wl-pprint = haskellPkg "ansi-wl-pprint"; + ansi-wl-pprint = haskellPkg "ansi-wl-pprint_0_6_9"; async = haskellPkg "async"; base = haskellPkg "base"; boxes = haskellPkg "boxes"; @@ -18,7 +18,7 @@ formatting = haskellPkg "formatting"; Glob = haskellPkg "Glob"; hspec = haskellPkg "hspec"; - hspec-core = haskellPkg "hspec-core"; + hspec-core = haskellPkg "hspec-core_2_7_10"; HUnit = haskellPkg "HUnit"; language-javascript = haskellPkg "language-javascript"; mtl = haskellPkg "mtl_2_3_1"; diff --git a/zephyr.cabal b/zephyr.cabal index 7156acb..d56006d 100644 --- a/zephyr.cabal +++ b/zephyr.cabal @@ -65,18 +65,18 @@ library , Language.PureScript.DCE.Eval , Language.PureScript.DCE.Utils build-depends: - aeson >=2.0.3.0 && <2.1 - , ansi-terminal >=0.11 && <0.12 - , base >=4.16.2 && <4.17 + aeson >=2.1.2.1 && <2.2 + , ansi-terminal >=1.0.2 && <1.1 + , base >=4.20.0.1 && <4.21 , boxes >=0.1.5 && <0.2 - , containers >=0.6.5.1 && <0.7 + , containers >=0.7 && <0.8 , formatting - , language-javascript ==0.7.0.0 - , mtl >=2.2.2 && <2.3 - , purescript >=0.15.4 && <0.16 - , safe >=0.3.19 && <0.4 - , text >=1.2.5.0 && <1.3 - , unordered-containers == 0.2.19.1 + , language-javascript ==0.7.1.0 + , mtl >=2.3.1 && <2.4 + , purescript >=0.15.15 && <0.16 + , safe >=0.3.21 && <0.4 + , text >=2.1.1 && <2.2 + , unordered-containers == 0.2.20 default-language: Haskell2010 executable zephyr @@ -106,23 +106,23 @@ executable zephyr -rtsopts -with-rtsopts -N2 build-depends: - aeson >=2.0.3.0 && <2.1 + aeson >=2.1.2.1 && <2.2 , async - , ansi-terminal >=0.11 && <0.12 + , ansi-terminal >=1.0.2 && <1.1 , ansi-wl-pprint >=0.6.9 && <0.7 - , base >=4.16.2 && <4.17 - , bytestring >=0.11.3.1 && <0.12 - , containers >=0.6.5.1 && <0.7 - , directory >=1.3.6.2 && <1.4 - , filepath >=1.4.2.2 && <1.5 + , base >=4.20.0.1 && <4.21 + , bytestring >=0.12.1.0 && <0.13 + , containers >=0.7 && <0.8 + , directory >=1.3.9.0 && <1.4 + , filepath >=1.5.3.0 && <1.6 , formatting , Glob >=0.10.2 && <0.11 - , language-javascript ==0.7.0.0 - , mtl >=2.2.2 && <2.3 - , optparse-applicative >=0.17.0.0 && <0.18 - , purescript >=0.15.4 && <0.16 + , language-javascript ==0.7.1.0 + , mtl >=2.3.1 && <2.4 + , optparse-applicative >=0.18.1.0 && <0.19 + , purescript >=0.15.15 && <0.16 , text >=1.2.5.0 && <1.3 - , transformers >=0.5.6.2 && <0.6 + , transformers >=0.6.1.2 && <0.7 , utf8-string >=1.0.2 && <1.1 , zephyr >=0.5 && <0.6 default-language: Haskell2010 @@ -147,21 +147,21 @@ test-suite zephyr-test , Test.Karma , Test.Utils build-depends: - aeson >=2.0.3.0 && <2.1 - , base >=4.16.2 && <4.17 - , containers >=0.6.5.1 && <0.7 - , directory >=1.3.6.2 && <1.4 + aeson >=2.1.2.1 && <2.2 + , base >=4.20.0.1 && <4.21 + , containers >=0.7 && <0.8 + , directory >=1.3.9.0 && <1.4 , hspec , hspec-core <2.9.3 , HUnit - , language-javascript ==0.7.0.0 - , mtl >=2.2.2 && <2.3 - , optparse-applicative ==0.17.0.0 - , process ==1.6.13.1 - , purescript >=0.15.4 && <0.16 - , QuickCheck >=2.12.1 + , language-javascript ==0.7.1.0 + , mtl >=2.3.1 && <2.3 + , optparse-applicative ==0.18.1.0 + , process ==1.6.25.0 + , purescript >=0.15.15 && <0.16 + , QuickCheck >=2.14.3 , text >=1.2.5.0 && <1.3 - , transformers >=0.5.6.2 && <0.6 + , transformers >=0.6.1.2 && <0.7 , zephyr >=0.5 && <0.6 build-tool-depends: purescript:purs From c5c77800f740086385a313f326df6e9bbee0da94 Mon Sep 17 00:00:00 2001 From: Malik Date: Tue, 21 Jan 2025 12:33:23 +0100 Subject: [PATCH 05/11] Bump: hspec-core --- default.nix | 2 +- zephyr.cabal | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/default.nix b/default.nix index dab789e..4d1230d 100644 --- a/default.nix +++ b/default.nix @@ -18,7 +18,7 @@ formatting = haskellPkg "formatting"; Glob = haskellPkg "Glob"; hspec = haskellPkg "hspec"; - hspec-core = haskellPkg "hspec-core_2_7_10"; + hspec-core = haskellPkg "hspec-core"; HUnit = haskellPkg "HUnit"; language-javascript = haskellPkg "language-javascript"; mtl = haskellPkg "mtl_2_3_1"; diff --git a/zephyr.cabal b/zephyr.cabal index d56006d..8fd097c 100644 --- a/zephyr.cabal +++ b/zephyr.cabal @@ -152,7 +152,7 @@ test-suite zephyr-test , containers >=0.7 && <0.8 , directory >=1.3.9.0 && <1.4 , hspec - , hspec-core <2.9.3 + , hspec-core , HUnit , language-javascript ==0.7.1.0 , mtl >=2.3.1 && <2.3 From 63e42e699ac7469bf54296a9c41acd1c2582047f Mon Sep 17 00:00:00 2001 From: Malik Date: Tue, 21 Jan 2025 12:38:59 +0100 Subject: [PATCH 06/11] Fix: some dependency versions --- default.nix | 2 +- zephyr.cabal | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/default.nix b/default.nix index 4d1230d..9795b88 100644 --- a/default.nix +++ b/default.nix @@ -9,7 +9,7 @@ ansi-terminal = haskellPkg "ansi-terminal"; ansi-wl-pprint = haskellPkg "ansi-wl-pprint_0_6_9"; async = haskellPkg "async"; - base = haskellPkg "base"; + base = haskellPkg "base_4_20_0_1"; boxes = haskellPkg "boxes"; bytestring = haskellPkg "bytestring_0_12_1_0"; containers = haskellPkg "containers_0_7"; diff --git a/zephyr.cabal b/zephyr.cabal index 8fd097c..f125192 100644 --- a/zephyr.cabal +++ b/zephyr.cabal @@ -121,7 +121,7 @@ executable zephyr , mtl >=2.3.1 && <2.4 , optparse-applicative >=0.18.1.0 && <0.19 , purescript >=0.15.15 && <0.16 - , text >=1.2.5.0 && <1.3 + , text >=2.1.1 && <2.2 , transformers >=0.6.1.2 && <0.7 , utf8-string >=1.0.2 && <1.1 , zephyr >=0.5 && <0.6 @@ -155,12 +155,12 @@ test-suite zephyr-test , hspec-core , HUnit , language-javascript ==0.7.1.0 - , mtl >=2.3.1 && <2.3 + , mtl >=2.3.1 && <2.4 , optparse-applicative ==0.18.1.0 , process ==1.6.25.0 , purescript >=0.15.15 && <0.16 , QuickCheck >=2.14.3 - , text >=1.2.5.0 && <1.3 + , text >=2.1.1 && <2.2 , transformers >=0.6.1.2 && <0.7 , zephyr >=0.5 && <0.6 build-tool-depends: From 0be2a6d1567d6f976ee32dbac163a4f15e83d07c Mon Sep 17 00:00:00 2001 From: Malik Date: Sat, 1 Feb 2025 11:45:17 +0100 Subject: [PATCH 07/11] bump nixpkgs --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index e559397..7e7f869 100644 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1737062831, - "narHash": "sha256-Tbk1MZbtV2s5aG+iM99U8FqwxU/YNArMcWAv6clcsBc=", + "lastModified": 1738142207, + "narHash": "sha256-NGqpVVxNAHwIicXpgaVqJEJWeyqzoQJ9oc8lnK9+WC4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5df43628fdf08d642be8ba5b3625a6c70731c19c", + "rev": "9d3ae807ebd2981d593cddd0080856873139aa40", "type": "github" }, "original": { From 199b7a49b80c690ccdae8ee07536b8056963974a Mon Sep 17 00:00:00 2001 From: Malik Date: Sat, 1 Feb 2025 11:47:57 +0100 Subject: [PATCH 08/11] Bump: Base --- default.nix | 2 +- zephyr.cabal | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/default.nix b/default.nix index 9795b88..846b0f9 100644 --- a/default.nix +++ b/default.nix @@ -9,7 +9,7 @@ ansi-terminal = haskellPkg "ansi-terminal"; ansi-wl-pprint = haskellPkg "ansi-wl-pprint_0_6_9"; async = haskellPkg "async"; - base = haskellPkg "base_4_20_0_1"; + base = haskellPkg "base_4_21_0_0"; boxes = haskellPkg "boxes"; bytestring = haskellPkg "bytestring_0_12_1_0"; containers = haskellPkg "containers_0_7"; diff --git a/zephyr.cabal b/zephyr.cabal index f125192..f98ba82 100644 --- a/zephyr.cabal +++ b/zephyr.cabal @@ -67,7 +67,7 @@ library build-depends: aeson >=2.1.2.1 && <2.2 , ansi-terminal >=1.0.2 && <1.1 - , base >=4.20.0.1 && <4.21 + , base >=4.21.0.0 && <4.22 , boxes >=0.1.5 && <0.2 , containers >=0.7 && <0.8 , formatting @@ -110,7 +110,7 @@ executable zephyr , async , ansi-terminal >=1.0.2 && <1.1 , ansi-wl-pprint >=0.6.9 && <0.7 - , base >=4.20.0.1 && <4.21 + , base >=4.21.0.0 && <4.22 , bytestring >=0.12.1.0 && <0.13 , containers >=0.7 && <0.8 , directory >=1.3.9.0 && <1.4 @@ -148,7 +148,7 @@ test-suite zephyr-test , Test.Utils build-depends: aeson >=2.1.2.1 && <2.2 - , base >=4.20.0.1 && <4.21 + , base >=4.21.0.0 && <4.22 , containers >=0.7 && <0.8 , directory >=1.3.9.0 && <1.4 , hspec From f03f2a7e2db655fe8a620225b104ae39ff063bf2 Mon Sep 17 00:00:00 2001 From: Malik Date: Sat, 1 Feb 2025 11:50:16 +0100 Subject: [PATCH 09/11] Bump: text --- default.nix | 2 +- zephyr.cabal | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/default.nix b/default.nix index 846b0f9..133bd97 100644 --- a/default.nix +++ b/default.nix @@ -27,7 +27,7 @@ purescript = haskellPkg "purescript"; QuickCheck = haskellPkg "QuickCheck"; safe = haskellPkg "safe"; - text = haskellPkg "text_2_1_1"; + text = haskellPkg "text_2_1_2"; transformers = haskellPkg "transformers_0_6_1_2"; unordered-containers = haskellPkg "unordered-containers"; utf8-string = haskellPkg "utf8-string"; diff --git a/zephyr.cabal b/zephyr.cabal index f98ba82..258ec6e 100644 --- a/zephyr.cabal +++ b/zephyr.cabal @@ -75,7 +75,7 @@ library , mtl >=2.3.1 && <2.4 , purescript >=0.15.15 && <0.16 , safe >=0.3.21 && <0.4 - , text >=2.1.1 && <2.2 + , text >=2.1.2 && <2.2 , unordered-containers == 0.2.20 default-language: Haskell2010 @@ -121,7 +121,7 @@ executable zephyr , mtl >=2.3.1 && <2.4 , optparse-applicative >=0.18.1.0 && <0.19 , purescript >=0.15.15 && <0.16 - , text >=2.1.1 && <2.2 + , text >=2.1.2 && <2.2 , transformers >=0.6.1.2 && <0.7 , utf8-string >=1.0.2 && <1.1 , zephyr >=0.5 && <0.6 @@ -160,7 +160,7 @@ test-suite zephyr-test , process ==1.6.25.0 , purescript >=0.15.15 && <0.16 , QuickCheck >=2.14.3 - , text >=2.1.1 && <2.2 + , text >=2.1.2 && <2.2 , transformers >=0.6.1.2 && <0.7 , zephyr >=0.5 && <0.6 build-tool-depends: From 6710d546c99c3e413f325a55aa71af228b4d7853 Mon Sep 17 00:00:00 2001 From: Malik Date: Sat, 1 Feb 2025 11:52:18 +0100 Subject: [PATCH 10/11] Bump: bytestring --- default.nix | 2 +- zephyr.cabal | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/default.nix b/default.nix index 133bd97..f962360 100644 --- a/default.nix +++ b/default.nix @@ -11,7 +11,7 @@ async = haskellPkg "async"; base = haskellPkg "base_4_21_0_0"; boxes = haskellPkg "boxes"; - bytestring = haskellPkg "bytestring_0_12_1_0"; + bytestring = haskellPkg "bytestring_0_12_2_0"; containers = haskellPkg "containers_0_7"; directory = haskellPkg "directory_1_3_9_0"; filepath = haskellPkg "filepath_1_5_3_0"; diff --git a/zephyr.cabal b/zephyr.cabal index 258ec6e..e74f206 100644 --- a/zephyr.cabal +++ b/zephyr.cabal @@ -111,7 +111,7 @@ executable zephyr , ansi-terminal >=1.0.2 && <1.1 , ansi-wl-pprint >=0.6.9 && <0.7 , base >=4.21.0.0 && <4.22 - , bytestring >=0.12.1.0 && <0.13 + , bytestring >=0.12.2.0 && <0.13 , containers >=0.7 && <0.8 , directory >=1.3.9.0 && <1.4 , filepath >=1.5.3.0 && <1.6 From 32317608ad98c29f330d7229a1e0570c5a4f4537 Mon Sep 17 00:00:00 2001 From: Malik Date: Sat, 1 Feb 2025 11:54:11 +0100 Subject: [PATCH 11/11] Bump: filepath --- default.nix | 2 +- zephyr.cabal | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/default.nix b/default.nix index f962360..817aa96 100644 --- a/default.nix +++ b/default.nix @@ -14,7 +14,7 @@ bytestring = haskellPkg "bytestring_0_12_2_0"; containers = haskellPkg "containers_0_7"; directory = haskellPkg "directory_1_3_9_0"; - filepath = haskellPkg "filepath_1_5_3_0"; + filepath = haskellPkg "filepath_1_5_4_0"; formatting = haskellPkg "formatting"; Glob = haskellPkg "Glob"; hspec = haskellPkg "hspec"; diff --git a/zephyr.cabal b/zephyr.cabal index e74f206..4795c78 100644 --- a/zephyr.cabal +++ b/zephyr.cabal @@ -114,7 +114,7 @@ executable zephyr , bytestring >=0.12.2.0 && <0.13 , containers >=0.7 && <0.8 , directory >=1.3.9.0 && <1.4 - , filepath >=1.5.3.0 && <1.6 + , filepath >=1.5.4.0 && <1.6 , formatting , Glob >=0.10.2 && <0.11 , language-javascript ==0.7.1.0