Browse Source

Update dependencies for NixOS 19.03

master
Peter J. Jones 2 months ago
parent
commit
184a50e74c
Signed by: Peter Jones <pjones@devalot.com> GPG Key ID: 9DAFAA8D01941E49
3 changed files with 15 additions and 16 deletions
  1. 1
    1
      LICENSE
  2. 8
    9
      default.nix
  3. 6
    6
      personal-webhooks.cabal

+ 1
- 1
LICENSE View File

@@ -1,4 +1,4 @@
1
-Copyright (c) 2017,2018 Peter Jones <pjones@devalot.com>
1
+Copyright (c) 2017-2019 Peter Jones <pjones@devalot.com>
2 2
 All rights reserved.
3 3
 
4 4
 Redistribution and use in source and binary forms, with or without

+ 8
- 9
default.nix View File

@@ -1,21 +1,20 @@
1
+{ pkgs ? (import <nixpkgs> {})
2
+}:
3
+
1 4
 let
2
-  # If no package source is specified then default to this URL:
3
-  commit  = "5b8a24a40ce11bbe1cb6ebf33ddb5adaaebbd43a";
4
-  nixpkgs = fetchTarball "https://github.com/NixOS/nixpkgs-channels/tarball/${commit}";
5
+  # Remove the broken flag:
6
+  unBreak = drv: pkgs.haskell.lib.overrideCabal drv (drv: { broken = false; });
5 7
 
6 8
   # Helper function to override Haskell packages:
7
-  haskellOverride = pkgs:
9
+  haskellOverride =
8 10
     pkgs.haskellPackages.override (orig: {
9 11
       overrides = pkgs.lib.composeExtensions
10 12
                     (orig.overrides or (_: _: {}))
11 13
                     (self: super: with pkgs.haskell.lib; {
12
-                      table-layout = dontCheck (doJailbreak super.table-layout);
14
+                      table-layout = unBreak (dontCheck (doJailbreak super.table-layout));
13 15
                     });
14 16
       });
15 17
 
16 18
 in
17 19
 
18
-{ pkgs ? (import nixpkgs {}).pkgs
19
-}:
20
-
21
-(haskellOverride pkgs).callPackage ./personal-webhooks.nix { }
20
+haskellOverride.callPackage ./personal-webhooks.nix { }

+ 6
- 6
personal-webhooks.cabal View File

@@ -1,11 +1,11 @@
1 1
 name:          personal-webhooks
2
-version:       0.1.0.0
2
+version:       0.1.0.1
3 3
 synopsis:      Trigger personal scripts from incoming HTTP requests
4 4
 license:       BSD2
5 5
 license-file:  LICENSE
6 6
 author:        Peter Jones <pjones@devalot.com>
7 7
 maintainer:    Peter Jones <pjones@devalot.com>
8
-copyright:     Copyright (c) 2017,2018 Peter J. Jones
8
+copyright:     Copyright (c) 2017-2019 Peter J. Jones
9 9
 category:      Web
10 10
 build-type:    Simple
11 11
 cabal-version: >=1.10
@@ -80,23 +80,23 @@ library
80 80
   build-depends: base                        >= 4.9  && < 5
81 81
                , aeson                       >= 1.1  && < 2.0
82 82
                , bytestring                  >= 0.10 && < 0.11
83
-               , containers                  >= 0.5  && < 0.6
83
+               , containers                  >= 0.5  && < 0.7
84 84
                , cryptonite                  >= 0.23 && < 0.26
85 85
                , data-default                >= 0.7  && < 1.0
86 86
                , directory                   >= 1.3  && < 1.4
87 87
                , filepath                    >= 1.4  && < 1.5
88 88
                , opaleye                     >= 0.6  && < 0.7
89 89
                , optparse-applicative        >= 0.13 && < 0.15
90
-               , postgresql-simple           >= 0.5  && < 0.6
90
+               , postgresql-simple           >= 0.5  && < 0.7
91 91
                , postgresql-simple-migration >= 0.1  && < 0.2
92 92
                , product-profunctors         >= 0.8  && < 0.11
93 93
                , resource-pool               >= 0.2  && < 0.3
94
-               , sandi                       >= 0.4  && < 0.5
94
+               , sandi                       >= 0.4  && < 0.6
95 95
                , template-haskell            >= 2.11 && < 2.15
96 96
                , text                        >= 1.2  && < 1.3
97 97
                , time                        >= 1.6  && < 1.9
98 98
                , transformers                >= 0.5  && < 1.0
99
-               , yaml                        >= 0.8  && < 0.9
99
+               , yaml                        >= 0.8  && < 0.12
100 100
 
101 101
 --------------------------------------------------------------------------------
102 102
 executable webhooks

Loading…
Cancel
Save