Skip to content

Commit 34c523e

Browse files
authored
Merge pull request #30 from gvolpe/enhancement/add-toc-bump-version
Add TOC + bump version to 0.0.7
2 parents aab0019 + 3550645 commit 34c523e

File tree

9 files changed

+41
-5
lines changed

9 files changed

+41
-5
lines changed

.github/workflows/ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@ jobs:
1616
with:
1717
name: dconf2nix
1818
signingKey: "${{ secrets.CACHIX_SIGNING_KEY }}"
19-
- run: nix-shell --run "nix-build-uncached default.nix" ci.nix
19+
- run: nix-shell --run "nix-build-uncached default.nix" nix/ci.nix

.gitignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ dist-newstyle/
55
dist/
66
.ghc.*
77
.direnv
8-
result
8+
result*

README.md

+12
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,18 @@
44

55
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:
66

7+
<!--ts-->
8+
* [Benchmarks](#benchmarks)
9+
* [Introduction](#introduction)
10+
* [Run](#run)
11+
* [Custom root](#custom-root)
12+
* [Supported types](#supported-types)
13+
* [Gnome Shell configuration](#gnome-shell-configuration)
14+
* [Installation](#installation)
15+
* [Troubleshooting](#troubleshooting)
16+
* [Development](#development)
17+
<!--te-->
18+
719
---
820

921
### Benchmarks

dconf2nix.cabal

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
cabal-version: 2.4
22

33
name: dconf2nix
4-
version: 0.0.6
4+
version: 0.0.7
55
synopsis: Convert dconf files to Nix, as expected by Home Manager.
66
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 ;)
77
bug-reports: https://github.com/gvolpe/dconf2nix/issues

default.nix

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{ packages ? import ./pkgs.nix { inherit compiler; }, compiler ? "ghc884" }:
1+
{ packages ? import nix/pkgs.nix { inherit compiler; }, compiler ? "ghc884" }:
22

33
let
44
inherit (packages) hp;

ci.nix nix/ci.nix

File renamed without changes.

pkgs.nix nix/pkgs.nix

File renamed without changes.

nix/toc.nix

+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
{ compiler ? "ghc884" }:
2+
3+
let
4+
pkgs = (import ./pkgs.nix { inherit compiler; }).pkgs;
5+
toc = pkgs.stdenv.mkDerivation {
6+
name = "gh-md-toc-24-05-2020";
7+
8+
src = builtins.fetchurl {
9+
url = "https://raw.githubusercontent.com/ekalinin/github-markdown-toc/488f310064b16c1eb9c17862cc5844189ee65955/gh-md-toc";
10+
sha256 = "1253n0qw3xgikl7gcdicg3vmc3wzz6122bmhmffj1irrachq89fi";
11+
};
12+
13+
phases = ["installPhase" "patchPhase"];
14+
15+
installPhase = ''
16+
mkdir -p $out/bin
17+
cp $src $out/bin/gh-md-toc
18+
chmod +x $out/bin/gh-md-toc
19+
'';
20+
};
21+
in
22+
pkgs.writeShellScriptBin "update-toc" ''
23+
${toc}/bin/gh-md-toc --insert README.md
24+
''

shell.nix

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
let
2-
packages = import ./pkgs.nix {};
2+
packages = import nix/pkgs.nix {};
33
inherit (packages) pkgs hp;
44

55
drv = hp.callCabal2nix "dconf2nix" ./. {};

0 commit comments

Comments
 (0)