3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

135102 commits

Author SHA1 Message Date
Jörg Thalheim 41ec2c2223
Merge pull request #38362 from orbekk/acme-path
fix: nixos/nginx certificate location
2018-04-09 09:02:51 +01:00
Jörg Thalheim c757928697
Merge pull request #38513 from Ma27/clementine-license-fixes
clementine: provide free derivation by default
2018-04-09 08:59:19 +01:00
Peter Hoeg cb3cf8b3b9 textql: run tests and install man page 2018-04-09 15:55:47 +08:00
Jörg Thalheim 7578dde34e
Merge pull request #38503 from Chiiruno/submit/terraria-server
terraria-server: 1.3.1.1 -> 1.3.5.3
2018-04-09 08:51:12 +01:00
Jörg Thalheim df6638dcab
Merge pull request #38518 from bricewge/webtorrent-cli
nodePackages.webtorrent-cli: init at 1.11.0
2018-04-09 08:49:33 +01:00
Michael Raskin 27bafa07f6
Merge pull request #38120 from timokau/flint-improvements
flint: Always create proper so file, support blas
2018-04-09 07:27:58 +00:00
Jörg Thalheim c86c9b202e
Merge pull request #38625 from andrewchambers/updatepeg
peg: 0.1.4 -> 0.1.18
2018-04-09 08:16:59 +01:00
Jörg Thalheim e8cfda7f13 lxc: enable pam_cgfs and fix module
pam_cgfs was part in lxcfs before and moved here

fixes #37985
2018-04-09 08:15:00 +01:00
Peter Hoeg 8f9b21212d
Merge pull request #38195 from etu/php-upgrades
php: 7.0.28 -> 7.0.29, 7.1.15 -> 7.1.16, 5.6.34 -> 5.6.35
2018-04-09 07:00:11 +00:00
Jörg Thalheim 53611a9b6c
Merge pull request #38629 from ivanbrennan/less-configFile
nixos/less: add configFile option
2018-04-09 07:03:29 +01:00
Jörg Thalheim 4669e9aad2
Merge pull request #38630 from rail/py3status
py3status: 3.7 -> 3.8; add pytz tzlocal deps
2018-04-09 07:01:32 +01:00
Jörg Thalheim 5386ece072 python.pkgs.py3status: move to python-modules 2018-04-09 06:56:32 +01:00
Matthew Justin Bauer 39132f6d5d
Merge pull request #37312 from lprndn/luakit
luakit: init at 2018.08.10
2018-04-08 23:07:57 -05:00
Matthew Justin Bauer c472940c8b
Merge pull request #37383 from hedning/notmuch-fix-/bin/sh
notmuch: fix /bin/sh impurity in ./configure
2018-04-08 23:07:35 -05:00
Matthew Justin Bauer aaee915889
Merge pull request #37533 from ryantm/auto-update/ocamlbuild
ocamlPackages.ocamlbuild: 0.11.0 -> 0.12.0
2018-04-08 23:07:17 -05:00
Matthew Justin Bauer 160972a918
Merge pull request #37531 from ryantm/auto-update/ocaml-ppx_tools_versioned
ocamlPackages.ppx_tools_versioned: 5.0.1 -> 5.1
2018-04-08 23:06:58 -05:00
Matthew Justin Bauer 8dd875c324
Merge pull request #37530 from ryantm/auto-update/ocaml-pipebang
ocamlPackages.pipebang: 110.01.00 -> 113.00.00
2018-04-08 23:06:47 -05:00
Matthew Justin Bauer 381462979b
Merge pull request #37528 from ryantm/auto-update/ocaml-pa_bench
ocamlPackages.pa_bench: 112.06.00 -> 113.00.00
2018-04-08 23:06:37 -05:00
Matthew Justin Bauer af1955eab7
Merge pull request #37526 from ryantm/auto-update/ocaml-herelib
ocamlPackages.herelib: 109.35.02 -> 112.35.00
2018-04-08 23:06:27 -05:00
Matthew Justin Bauer 843cdc92e9
Merge pull request #37525 from ryantm/auto-update/ocaml-comparelib
ocamlPackages.comparelib: 109.60.00 -> 113.00.00
2018-04-08 23:06:07 -05:00
Matthew Justin Bauer fddad914d4
Merge pull request #37524 from ryantm/auto-update/ocaml-bitstring
ocamlPackages.bitstring: 2.1.0 -> 2.1.1
2018-04-08 23:05:59 -05:00
Matthew Justin Bauer 1eb2904d48
Merge pull request #37630 from ryantm/auto-update/gdal
gdal: 2.2.3 -> 2.2.4
2018-04-08 23:05:40 -05:00
Matthew Justin Bauer 6447e4f487
Merge pull request #38052 from ryantm/auto-update/sxhkd
sxhkd: 0.5.8 -> 0.5.9
2018-04-08 23:02:54 -05:00
Matthew Justin Bauer 22e7c83da7
Merge pull request #38043 from averelld/nxlib-updates
nx-libs updates
2018-04-08 23:02:38 -05:00
sephalon 33eb77bad1 pcsc-scm-scl011: init at 2.09 (#37732) 2018-04-08 23:01:55 -05:00
Matthew Justin Bauer 9191670c9e
Merge pull request #38059 from msiedlarek/master
gpu-switch: init at 2017-04-28
2018-04-08 23:00:19 -05:00
Rail Aliiev e1630344b0
py3status: 3.7 -> 3.8; add pytz tzlocal deps
* Bump version to 3.8
  * Add `pytz` and `tzlocal` to the dependencies in order to make the
    `clock` module work properly.
2018-04-08 23:20:37 -04:00
Matthew Justin Bauer e5dde2c94e
Merge pull request #37974 from Izorkin/mariadb-10.2.14
mariadb: 10.2.13 -> 10.2.14
2018-04-08 21:53:54 -05:00
Matthew Justin Bauer ac04a2e2f6
Merge pull request #38050 from ryantm/auto-update/stgit
gitAndTools.stgit: 0.17.1 -> 0.18
2018-04-08 21:53:27 -05:00
Matthew Justin Bauer 3085d34f98
Merge pull request #38051 from ryantm/auto-update/slurm
slurm: 17.11.3 -> 17.11.5
2018-04-08 21:53:20 -05:00
Matthew Justin Bauer 94c2176834
Merge pull request #38062 from ryantm/auto-update/ptex
ptex: 2.1.28 -> 2.1.33
2018-04-08 21:53:06 -05:00
Matthew Justin Bauer 2ce5d2a1ac
Merge pull request #38060 from ryantm/auto-update/polyml
polyml: 5.7 -> 5.7.1
2018-04-08 21:52:53 -05:00
Matthew Justin Bauer 54cb6affbd
Merge pull request #38056 from ryantm/auto-update/radamsa
radamsa: 0.4 -> 0.5
2018-04-08 21:52:42 -05:00
Matthew Justin Bauer 67bde55c42
Merge pull request #38055 from ryantm/auto-update/sylpheed
sylpheed: 3.6.0 -> 3.7.0
2018-04-08 21:52:34 -05:00
Matthew Justin Bauer cd63625420
Merge pull request #38064 from ryantm/auto-update/oidentd
oidentd: 2.0.8 -> 2.2.2
2018-04-08 21:51:09 -05:00
Matthew Justin Bauer 1381606b8e
Merge pull request #38533 from nyanloutre/duplicati-package
duplicati: init at 2.0.3.3
2018-04-08 21:49:48 -05:00
Matthew Justin Bauer 842278d675
Merge pull request #38546 from romildo/new.balsa
balsa: init at 2.5.5
2018-04-08 21:49:32 -05:00
Matthew Justin Bauer 6366973ea0
Merge pull request #38538 from Ralith/matrix-synapse
matrix-synapse: 0.26.1 -> 0.27.2
2018-04-08 21:49:17 -05:00
Matthew Justin Bauer 2fa95f0e11
Merge pull request #38560 from r-ryantm/auto-update/freewheeling
freewheeling: 0.6.2 -> 0.6.4
2018-04-08 21:48:55 -05:00
Matthew Justin Bauer 193cbc1103
Merge pull request #38029 from tomberek/uhd_update
uhd: 3.10.3.0 -> 3.11.0.0
2018-04-08 21:48:39 -05:00
Matthew Justin Bauer 9cb28035eb
Merge pull request #38143 from r-ryantm/auto-update/sonarr
sonarr: 2.0.0.5153 -> 2.0.0.5163
2018-04-08 21:47:28 -05:00
Matthew Justin Bauer 72a54f3b6d
Merge pull request #38260 from symphorien/tamarin-vim
tamarin-prover: install vim syntax highlighting files
2018-04-08 21:47:12 -05:00
Matthew Justin Bauer 79c0c491bd
Merge pull request #38213 from schneefux/pkg.shaarli-material
shaarli-material: 0.9.1 -> 0.9.5
2018-04-08 21:46:18 -05:00
Matthew Justin Bauer 15ab41c026
Merge pull request #38498 from r-ryantm/auto-update/wireshark-gtk
wireshark-gtk: 2.4.5 -> 2.4.6
2018-04-08 21:40:07 -05:00
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