From 57a95cd208377c04efdb4e615f3f0d049ba32598 Mon Sep 17 00:00:00 2001 From: Sridhar Ratnakumar <3998+srid@users.noreply.github.com> Date: Sun, 4 Dec 2022 13:13:42 -0500 Subject: [PATCH] Prep for final release (#389) --- CHANGELOG.md | 2 +- docs/start/install.md | 2 +- emanote.cabal | 2 +- flake.lock | 35 +++++++++-------------------------- flake.nix | 4 +--- 5 files changed, 13 insertions(+), 32 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2734e1193..ffb03e927 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Revision history for emanote -## 0.8.2.0 (Unreleased) +## 1.0.0.0 (2022-12-04) - UI - Index pages are no longer marked as 'experimental' diff --git a/docs/start/install.md b/docs/start/install.md index af2c863f0..447c73782 100644 --- a/docs/start/install.md +++ b/docs/start/install.md @@ -38,4 +38,4 @@ If you do not wish to use Nix, you may use Emanote in one of the following ways: | ---------- | ----------------- | ----------------- | | [[docker]] | Guaranteed | Linux, WSL, macOS | -Emanote is not on [Hackage](https://hackage.haskell.org/) yet, as 1.0 is yet to be released. Once on Hackage, Emanote can be packaged up in various ways like [Pandoc](https://pandoc.org/) (another Haskell software on Hackage) is. It will become the distributor's responsibility to create and maintain this long-term. Nix and [[docker]] are the only mechanisms the author intends to support in the long-term. +Nix and [[docker]] are the only mechanisms the author intends to support in the long-term. Emanote is also available in nixpkgs. diff --git a/emanote.cabal b/emanote.cabal index e933d6fec..b6e198202 100644 --- a/emanote.cabal +++ b/emanote.cabal @@ -1,6 +1,6 @@ cabal-version: 2.4 name: emanote -version: 0.8.1.14 +version: 1.0.0.0 license: AGPL-3.0-only copyright: 2022 Sridhar Ratnakumar maintainer: srid@srid.ca diff --git a/flake.lock b/flake.lock index 0edc3a613..6937d2f2b 100644 --- a/flake.lock +++ b/flake.lock @@ -1,29 +1,13 @@ { "nodes": { - "commonmark-wikilink": { - "flake": false, - "locked": { - "lastModified": 1667660916, - "narHash": "sha256-ZyYSsihq5nqP/YmkL2Tlr+XVwUu+3MquThpyc0yx65c=", - "owner": "srid", - "repo": "commonmark-wikilink", - "rev": "72c880b5dbe8521f8c424c7bd39cb11b26e8dbb8", - "type": "github" - }, - "original": { - "owner": "srid", - "repo": "commonmark-wikilink", - "type": "github" - } - }, "ema": { "flake": false, "locked": { - "lastModified": 1668883024, - "narHash": "sha256-fftvlkkAZgtExQ3vIiUPJbxIkMPDuvTi0XAZqo7jtNM=", + "lastModified": 1668972953, + "narHash": "sha256-WyTqCQg9xPqB2wC16PdjocaIL81MBLtjgC3eCzhN5hE=", "owner": "EmaApps", "repo": "ema", - "rev": "7cc73addf8191c4a2fbe157e6c02d9fed9644c3b", + "rev": "61faae56aa0f3c6ca815f344684cc566f6341662", "type": "github" }, "original": { @@ -68,11 +52,11 @@ "heist": { "flake": false, "locked": { - "lastModified": 1668478922, - "narHash": "sha256-HVIRUx90r0pvJKfLU6fM51/SdzvNOzv0466xIOeSFlo=", + "lastModified": 1668990382, + "narHash": "sha256-5GEnEdDmUBSxrF0IWwiu5eNvtublv0rY7OEpvaU1NG0=", "owner": "snapframework", "repo": "heist", - "rev": "a23f0b5d70556742644189d71d694f379738cdbc", + "rev": "88105c85996b8d621922b38e67b9460b36ccad51", "type": "github" }, "original": { @@ -99,11 +83,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1668443372, - "narHash": "sha256-lXNlVyNWwO22/JUdBtUWz68jZB3DM+Jq/irlsbwncI0=", + "lastModified": 1670086663, + "narHash": "sha256-hT8C8AQB74tdoCPwz4nlJypLMD7GI2F5q+vn+VE/qQk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "dad4de1694cd92d9a0e123bfdf134d0047b836a5", + "rev": "813836d64fa57285d108f0dbf2356457ccd304e3", "type": "github" }, "original": { @@ -133,7 +117,6 @@ }, "root": { "inputs": { - "commonmark-wikilink": "commonmark-wikilink", "ema": "ema", "flake-parts": "flake-parts", "haskell-flake": "haskell-flake", diff --git a/flake.nix b/flake.nix index 41d2af00d..e9298eac4 100644 --- a/flake.nix +++ b/flake.nix @@ -10,8 +10,6 @@ haskell-flake.url = "github:srid/haskell-flake"; # TODO: Dependencies waiting to go from Hackage to nixpkgs. - commonmark-wikilink.url = "github:srid/commonmark-wikilink"; - commonmark-wikilink.flake = false; heist-extra.url = "github:srid/heist-extra"; heist-extra.flake = false; heist.url = "github:snapframework/heist"; # Waiting for 1.1.1.0 on nixpkgs cabal hashes @@ -44,7 +42,7 @@ }; source-overrides = { inherit (inputs) - commonmark-wikilink heist-extra heist; + heist-extra heist; ema = inputs.ema + /ema; }; overrides = self: super: with pkgs.haskell.lib; {