3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

135259 commits

Author SHA1 Message Date
Matthew Justin Bauer a2b9d84793
Merge pull request #38472 from symphorien/gramps
Gramps
2018-04-08 21:39:34 -05:00
ivanbrennan 6e4096d792 nixos/less: add configFile option
Expose the path to a lesskey file as a module option. This makes it
possible to maintain a single lesskey file, used for both NixOS and
non-nix systems. An example of how this can be done follows.

1. Write a derivation that fetches lesskey from a known location:

  { stdenv, fetchgit }:
  stdenv.mkDerivation {
    name = "foo";
    src = fetchgit { .. };
    phases = [ "unpackPhase" "installPhase" ];
    installPhase = "mkdir -p $out && cp $src/lesskey $out/lesskey";
  }

2. Set programs.less.configFile to the corresponding path:

    programs.less = {
      enable = true;
      configFile = "${pkgs.foo}/lesskey";
    };
2018-04-08 22:37:35 -04:00
Matthew Justin Bauer 5a36502503
Merge pull request #37985 from ryantm/auto-update/lxcfs
lxcfs: 2.0.8 -> 3.0.0
2018-04-08 21:35:33 -05:00
Matthew Justin Bauer def275ac17
Merge pull request #38524 from r-ryantm/auto-update/lxc
lxc: 2.1.1 -> 3.0.0
2018-04-08 21:35:24 -05:00
Matthew Justin Bauer d6ce4855b3
Merge pull request #38437 from jluttine/fix-k3b-libpath
k3b: fix build inputs and library/binary paths
2018-04-08 21:34:23 -05:00
Matthew Justin Bauer 43ee892341
Merge pull request #38418 from jbaum98/scheherazade
scheherazade: init at 2.100
2018-04-08 21:34:00 -05:00
Matthew Justin Bauer e349272b4b
Merge pull request #38234 from r-ryantm/auto-update/icoutils
icoutils: 0.32.2 -> 0.32.3
2018-04-08 21:32:24 -05:00
Matthew Justin Bauer 4f8e60f65a
Merge pull request #38319 from vbgl/ocamlnet-4.06
ocamlPackages.ocamlnet: fix build with OCaml 4.06
2018-04-08 21:32:08 -05:00
Matthew Justin Bauer eeece37e7a
Merge pull request #38273 from jlesquembre/clj
clojure: 1.9.0.329 -> 1.9.0.358
2018-04-08 21:31:36 -05:00
Matthew Justin Bauer ad563d7f08
Merge pull request #38267 from r-ryantm/auto-update/chromedriver
chromedriver: 2.36 -> 2.37
2018-04-08 21:31:22 -05:00
Matthew Justin Bauer 4e7293018b
Merge pull request #38250 from r-ryantm/auto-update/electrum-ltc
electrum-ltc: 3.0.6.2 -> 3.1.2.1
2018-04-08 21:30:55 -05:00
Matthew Justin Bauer 44c3e749d5
Merge pull request #38248 from r-ryantm/auto-update/easyloggingpp
easyloggingpp: 9.96.1 -> 9.96.2
2018-04-08 21:30:42 -05:00
Matthew Justin Bauer bdb463025d
Merge pull request #38244 from r-ryantm/auto-update/closure-compiler
closurecompiler: 20180204 -> 20180319
2018-04-08 21:30:33 -05:00
Matthew Justin Bauer 13fe3dc21e
Merge pull request #38239 from r-ryantm/auto-update/freeswitch
freeswitch: 1.6.19 -> 1.6.20
2018-04-08 21:30:24 -05:00
Matthew Justin Bauer bec0a9056d
Merge pull request #38214 from r-ryantm/auto-update/libsass
libsass: 3.5.1 -> 3.5.2
2018-04-08 21:30:14 -05:00
Matthew Justin Bauer b6d32f47ad
Merge pull request #38223 from r-ryantm/auto-update/jackett
jackett: 0.8.716 -> 0.8.823
2018-04-08 21:30:07 -05:00
Matthew Justin Bauer 1d951cfa4b
Merge pull request #38225 from mbode/click_0_3_1
click: init at 0.3.1
2018-04-08 21:29:47 -05:00
Matthew Justin Bauer e05cd54603
Merge pull request #38308 from ikervagyok/wine
wine: 3.4 -> 3.5
2018-04-08 21:29:20 -05:00
Matthew Justin Bauer 89bbbf9718
Merge pull request #38074 from ryantm/auto-update/mediainfo-gui
mediainfo-gui: 17.12 -> 18.03.1
2018-04-08 21:27:45 -05:00
Matthew Justin Bauer 9c66871784
Merge pull request #38094 from volth/patch-120
nixos/network-scripted: print error details
2018-04-08 21:27:38 -05:00
Matthew Justin Bauer 0528e18700
Merge pull request #38110 from oxij/pkgs/tahoe-lafs
tahoe-lafs: install documentation, run tests
2018-04-08 21:27:24 -05:00
Matthew Justin Bauer 4685d4d1f9
Merge pull request #38200 from r-ryantm/auto-update/matio
matio: 1.5.11 -> 1.5.12
2018-04-08 21:25:50 -05:00
Matthew Justin Bauer 3893581d45
Merge pull request #38201 from r-ryantm/auto-update/memcached
memcached: 1.5.6 -> 1.5.7
2018-04-08 21:25:42 -05:00
Matthew Justin Bauer 79b637a13c
Merge pull request #38204 from r-ryantm/auto-update/libmediainfo
libmediainfo: 18.03 -> 18.03.1
2018-04-08 21:25:34 -05:00
Matthew Justin Bauer 519b697048
Merge pull request #38205 from r-ryantm/auto-update/LanguageTool
languagetool: 4.0 -> 4.1
2018-04-08 21:25:24 -05:00
Matthew Justin Bauer f5813d7c66
Merge pull request #38209 from r-ryantm/auto-update/libsolv
libsolv: 0.6.33 -> 0.6.34
2018-04-08 21:25:07 -05:00
Matthew Justin Bauer 2037baae73
Merge pull request #38198 from r-ryantm/auto-update/mate-themes
mate.mate-themes: 3.22.15 -> 3.22.16
2018-04-08 21:24:35 -05:00
Matthew Justin Bauer ac162ce06a
Merge pull request #38188 from r-ryantm/auto-update/ocaml4.05.0-uchar
ocamlPackages.uchar: 0.0.1 -> 0.0.2
2018-04-08 21:24:21 -05:00
Matthew Justin Bauer 63a064e111
Merge pull request #38190 from r-ryantm/auto-update/openfst
openfst: 1.6.6 -> 1.6.7
2018-04-08 21:24:04 -05:00
Matthew Justin Bauer 06817a808f
Merge pull request #38186 from r-ryantm/auto-update/ocaml4.05.0-ppx_derivers
ocamlPackages.ppx_derivers: 1.0 -> 1.2
2018-04-08 21:23:25 -05:00
Matthew Justin Bauer 31d25252a4
Merge pull request #38185 from r-ryantm/auto-update/ocaml4.05.0-stdint
ocamlPackages.stdint: 0.3.0 -> 0.5.0
2018-04-08 21:23:16 -05:00
Matthew Justin Bauer 61e6b5cd39
Merge pull request #38184 from r-ryantm/auto-update/ocaml4.05.0-containers
ocamlPackages.containers: 1.3 -> 1.4
2018-04-08 21:23:07 -05:00
Matthew Justin Bauer aaae2c1f62
Merge pull request #38183 from r-ryantm/auto-update/ocaml4.05.0-ssl
ocamlPackages.ssl: 0.5.4 -> 0.5.5
2018-04-08 21:22:58 -05:00
Matthew Justin Bauer f8bb0982fe
Merge pull request #38182 from r-ryantm/auto-update/ocaml4.05.0-cstruct
ocamlPackages.cstruct: 3.0.2 -> 3.1.1
2018-04-08 21:22:47 -05:00
Matthew Justin Bauer c55d235606
Merge pull request #38175 from r-ryantm/auto-update/ocaml4.05.0-expat
ocamlPackages.ocaml_expat: 1.0.0 -> 1.1.0
2018-04-08 21:22:36 -05:00
Matthew Justin Bauer 3b9a01ecb6
Merge pull request #38173 from r-ryantm/auto-update/osinfo-db
osinfo-db: 20180311 -> 20180325
2018-04-08 21:22:11 -05:00
Matthew Justin Bauer 8f0bd1fba4
Merge pull request #38171 from r-ryantm/auto-update/ocaml4.05.0-alcotest
ocamlPackages.alcotest: 0.8.1 -> 0.8.2
2018-04-08 21:21:59 -05:00
Matthew Justin Bauer a926d98096
Merge pull request #38169 from r-ryantm/auto-update/pdns-recursor
pdns-recursor: 4.1.1 -> 4.1.2
2018-04-08 21:21:49 -05:00
Matthew Justin Bauer 7982b8c8a6
Merge pull request #38167 from r-ryantm/auto-update/pgroonga
pgroonga: 2.0.3 -> 2.0.4
2018-04-08 21:21:37 -05:00
Matthew Justin Bauer 209dce5ada
Merge pull request #38165 from r-ryantm/auto-update/picard-tools
picard-tools: 2.17.11 -> 2.18.1
2018-04-08 21:21:14 -05:00
Matthew Justin Bauer 7a3516b52f
Merge pull request #38160 from r-ryantm/auto-update/qtbitcointrader
qtbitcointrader: 1.10.01 -> 1.40.13
2018-04-08 21:21:03 -05:00
Matthew Justin Bauer 17389226ba
Merge pull request #38158 from r-ryantm/auto-update/rocksndiamonds
rocksndiamonds: 4.0.1.3 -> 4.0.1.4
2018-04-08 21:20:51 -05:00
Matthew Justin Bauer a34ca44e80
Merge pull request #38155 from r-ryantm/auto-update/renpy
renpy: 6.99.14 -> 6.99.14.2
2018-04-08 21:20:40 -05:00
Matthew Justin Bauer fb7f4afbdb
Merge pull request #38086 from ryantm/auto-update/libmowgli
libmowgli: 0.9.50 -> 2.1.3
2018-04-08 21:19:57 -05:00
Matthew Justin Bauer cf9e5dd1a5
Merge pull request #38081 from Ekleog/todiff
todiff: init at 0.4.0
2018-04-08 21:19:46 -05:00
Peter Hoeg 734397afa0
Merge pull request #38561 from r-ryantm/auto-update/freetds
freetds: 1.00.70 -> 1.00.80
2018-04-09 02:18:19 +00:00
Andrew Chambers 68639325de peg: 0.1.4 -> 0.1.18 2018-04-09 12:26:01 +12:00
Tim Steinbach c1e1690f62
linux: Hide test warnings from 4.16+ kernels 2018-04-08 19:09:11 -04:00
Tim Steinbach 8fe9b023b3
linux-copperhead: 4.15.15.a -> 4.15.16.a 2018-04-08 19:09:11 -04:00
Tim Steinbach 9adee13f38
linux: 4.16 -> 4.16.1 2018-04-08 19:09:11 -04:00