Skip to content

Commit

Permalink
Merge pull request #30 from gvolpe/enhancement/add-toc-bump-version
Browse files Browse the repository at this point in the history
Add TOC + bump version to 0.0.7
  • Loading branch information
gvolpe authored Oct 18, 2020
2 parents aab0019 + 3550645 commit 34c523e
Show file tree
Hide file tree
Showing 9 changed files with 41 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ jobs:
with:
name: dconf2nix
signingKey: "${{ secrets.CACHIX_SIGNING_KEY }}"
- run: nix-shell --run "nix-build-uncached default.nix" ci.nix
- run: nix-shell --run "nix-build-uncached default.nix" nix/ci.nix
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ dist-newstyle/
dist/
.ghc.*
.direnv
result
result*
12 changes: 12 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,18 @@

A convenient converter of [DConf](https://wiki.gnome.org/Projects/dconf) files to Nix, as expected by [Home Manager's dconf settings](https://rycee.gitlab.io/home-manager/options.html#opt-dconf.settings). So you can Nixify your [Gnome Shell](https://wiki.gnome.org/Projects/GnomeShell) configuration :wink:

<!--ts-->
* [Benchmarks](#benchmarks)
* [Introduction](#introduction)
* [Run](#run)
* [Custom root](#custom-root)
* [Supported types](#supported-types)
* [Gnome Shell configuration](#gnome-shell-configuration)
* [Installation](#installation)
* [Troubleshooting](#troubleshooting)
* [Development](#development)
<!--te-->

---

### Benchmarks
Expand Down
2 changes: 1 addition & 1 deletion dconf2nix.cabal
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
cabal-version: 2.4

name: dconf2nix
version: 0.0.6
version: 0.0.7
synopsis: Convert dconf files to Nix, as expected by Home Manager.
description: A convenient converter of DConf files to Nix, as expected by Home Manager's dconf settings. So you can Nixify your Gnome Shell configuration ;)
bug-reports: https://github.com/gvolpe/dconf2nix/issues
Expand Down
2 changes: 1 addition & 1 deletion default.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ packages ? import ./pkgs.nix { inherit compiler; }, compiler ? "ghc884" }:
{ packages ? import nix/pkgs.nix { inherit compiler; }, compiler ? "ghc884" }:

let
inherit (packages) hp;
Expand Down
File renamed without changes.
File renamed without changes.
24 changes: 24 additions & 0 deletions nix/toc.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{ compiler ? "ghc884" }:

let
pkgs = (import ./pkgs.nix { inherit compiler; }).pkgs;
toc = pkgs.stdenv.mkDerivation {
name = "gh-md-toc-24-05-2020";

src = builtins.fetchurl {
url = "https://raw.githubusercontent.com/ekalinin/github-markdown-toc/488f310064b16c1eb9c17862cc5844189ee65955/gh-md-toc";
sha256 = "1253n0qw3xgikl7gcdicg3vmc3wzz6122bmhmffj1irrachq89fi";
};

phases = ["installPhase" "patchPhase"];

installPhase = ''
mkdir -p $out/bin
cp $src $out/bin/gh-md-toc
chmod +x $out/bin/gh-md-toc
'';
};
in
pkgs.writeShellScriptBin "update-toc" ''
${toc}/bin/gh-md-toc --insert README.md
''
2 changes: 1 addition & 1 deletion shell.nix
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
let
packages = import ./pkgs.nix {};
packages = import nix/pkgs.nix {};
inherit (packages) pkgs hp;

drv = hp.callCabal2nix "dconf2nix" ./. {};
Expand Down

0 comments on commit 34c523e

Please sign in to comment.