public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
98,784 Commits 1 Branch 0 Tags
90b3648f9c36f4f078ed6d0ff3682fe88ddf663a
Commit Graph
98784 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Kier Davis 90b3648f9c i3blocks: search for config in correct system directory 
The SYSCONFDIR variable used in the Makefile servers two purposes:

1) During buildPhase, it is hardcoded into the executable as one of
   the locations that will be searched for the i3blocks.conf config
   file. We want this set to "/etc", so that "/etc/i3blocks.conf"
   will be automatically loaded if it exists, as specified in the
   manpage.

2) During installPhase, it specifies the location that the sample
   i3blocks.conf should be installed to. We want this to be "$out/etc".

Case 2 was already handled correctly, but case 1 was not. This resulted
in i3blocks instead searching for i3blocks.conf in the default value of
SYSCONFDIR, which is "/usr/local/etc", a directory which generally does
not exist on NixOS. This commit remedies this problem by setting
SYSCONFDIR=/etc during buildPhase.

A minor stylistic fix (correcting a usage of "makeFlags" to "buildFlags"
in the expression) has also been applied in this commit.
 2017-01-12 20:15:15 +00:00
Bjørn Forsman 05bb3fe22e avidemux: 2.6.16 -> 2.6.18 2017-01-12 20:13:12 +01:00
Tim Steinbach 558d13b255 Merge pull request #21838 from volth/scala-fix-version 
scala: fix versions and $PATH
 2017-01-12 13:43:15 -05:00
Vladimír Čunát cb6f49a61f man-pages: 4.08 -> 4.09 
Includes about a dozen new pages.
 2017-01-12 19:16:54 +01:00
Volth 9c489165af scala: fix versions and $PATH 2017-01-12 17:56:45 +00:00
Pascal Wittmann dd3c287642 Merge pull request #20318 from vdemeester/add-vndr 
vndr: init at 20161110-cf8678f
 2017-01-12 18:40:16 +01:00
Domen Kožar e5dcce837a nixos: fix terminal-server, fixes #21834 2017-01-12 16:41:33 +01:00
Domen Kožar 45a677b978 haskell.packages.ghc802: dontCheck vector-algorithms 2017-01-12 16:35:08 +01:00
Daiderd Jordan e91840cfb6 rustc: enable codegen units and parallel building (#21742) 2017-01-12 14:25:20 +01:00
Thomas Tuegel ce26a4d3d4 Merge pull request #21826 from mdorman/emacs-updates 
Automated emacs package updates
 2017-01-12 06:48:36 -06:00
Graham Christensen 193d206b17 Merge pull request #21804 from exi/include-rust-beta-nightly 
rust: make rust beta and nightly be build by hydra
 2017-01-12 07:33:26 -05:00
Graham Christensen f855f4a9e2 Merge pull request #21824 from peterhoeg/u/dropbox 
dropbox: 16.4.30 -> 17.4.33
 2017-01-12 07:29:45 -05:00
Ignat Loskutov c94c2666bb tdesktop: 0.10.19 -> 1.0.0 
abbradar: add vdpau to fix the build, use qt56 explicitly

Closes #21821.
 2017-01-12 15:27:24 +03:00
Domen Kožar 60435691f7 haskellPackages.servant-auth: fix build 2017-01-12 11:47:14 +01:00
Franz Pletz 44efd447b6 Merge pull request #21816 from NeQuissimus/linux_4_8_removal 
linux: Remove 4.8
 2017-01-12 10:22:29 +01:00
Vincent Laporte 086fbfa308 ocamlPackages.owee: init at 0.2 
Owee is an experimental library to work with DWARF format.

Homepage: https://github.com/let-def/owee
 2017-01-12 09:12:52 +00:00
Peter Simons b4fcbf4095 callHackage: update database to current version 2017-01-12 10:00:22 +01:00
Peter Simons 2fd0a9f3c7 bind: update to 9.10.4-P5 (CVE-2016-9131, CVE-2016-9147, CVE-2016-9444, CVE-2016-9778) 2017-01-12 10:00:22 +01:00
Aaron Bull Schaefer 715ff285b6 terraform: 0.8.2 -> 0.8.4 2017-01-12 07:29:17 +01:00
Michael Alan Dorman ac393d299c melpa-packages: 2017-01-11 
removals:
 - ctags: repository no longer available
 - latest-clojure-libraries: removed from melpa
 - slamhound: removed from melpa
 2017-01-11 20:49:26 -05:00
Michael Alan Dorman 2c4ee516d5 melpa-stable-package: 2017-01-11 
removals:
 - ctags: repository no longer available
 - ctags-update: version tags lost when moved to new repository
 - slamhound: removed from melpa
 2017-01-11 20:48:21 -05:00
Michael Alan Dorman adbc201147 elpa-packages: 2017-01-11 2017-01-11 20:46:20 -05:00
Tim Steinbach 575b0352b9 Merge pull request #21818 from NeQuissimus/rkt_1_22_0 
rkt: 1.21.0 -> 1.22.0
 2017-01-11 20:21:37 -05:00
Tim Steinbach 2c0f888f7e Merge pull request #21817 from NeQuissimus/atom_1_13_0 
atom: 1.12.9 -> 1.13.0
 2017-01-11 20:21:26 -05:00
Tim Steinbach fb0e159a97 Merge pull request #21823 from NeQuissimus/minecraft_1_11_2 
minecraft-server: 1.11.1 -> 1.11.2
 2017-01-11 20:21:14 -05:00
Tim Steinbach 4fce3aa442 minecraft-server: 1.11.1 -> 1.11.2 2017-01-11 20:18:38 -05:00
Peter Hoeg ef318d01e9 dropbox: 16.4.30 -> 17.4.33 2017-01-12 09:13:36 +08:00
Graham Christensen 18e2639924 jasper: 2.0.6 -> 2.0.10 for null pointer dereference 2017-01-11 20:11:30 -05:00
Graham Christensen d20d38e68d nvidia_x11_legacy340: 340.96 -> 340.101 for CVE-2016-7382, CVE-2016-7389, CVE-2016-8826 2017-01-11 20:11:20 -05:00
Graham Christensen 9837dce6d2 nvidia_x11_legacy304: 304.131 -> 304.134 for CVE-2016-7382, CVE-2016-7389, CVE-2016-8826 2017-01-11 20:11:14 -05:00
Graham Christensen 847647af6a pcsclite: 1.8.17 -> 1.8.20 for CVE-2016-10109 2017-01-11 20:11:08 -05:00
Graham Christensen 2dab7782f3 unrtf: patch against CVE-2016-10091 2017-01-11 20:11:01 -05:00
Daiderd Jordan b8b1892546 libtasn1: fix darwin build 2017-01-11 23:47:54 +01:00
Tim Steinbach 490c109928 rkt: 1.21.0 -> 1.22.0 2017-01-11 17:27:19 -05:00
Tim Steinbach f124cb7611 atom: 1.12.9 -> 1.13.0 2017-01-11 17:18:24 -05:00
Tim Steinbach d483a871d1 linux: Remove 4.8 2017-01-11 16:59:29 -05:00
Jörg Thalheim 5fa5ab0eed Merge pull request #21810 from volth/flashplayer-24.0.0.194 
flashplayer: 24.0.0.186 -> 24.0.0.194
 2017-01-11 22:31:04 +01:00
Jörg Thalheim 05a4fbd56d Merge pull request #21814 from gpyh/zsh-autosuggestions 
Fix zshrc ordering
 2017-01-11 22:29:25 +01:00
Jörg Thalheim 62708c29f8 Merge pull request #21570 from michaelpj/services/arbtt 
arbtt service: init
 2017-01-11 22:27:52 +01:00
gpyh 373e40736a Fix zshrc ordering 
The content of programs.zsh.interactiveShellInit was
inserted too soon in the generated zshrc
This caused some settings related to autocompletion to be ignored
 2017-01-11 22:03:27 +01:00
Daiderd Jordan 4488203d0c Merge pull request #20658 from matthewbauer/gimp-darwin 
GIMP on Darwin (use Quartz)
 2017-01-11 21:47:29 +01:00
Peter Simons e755dc3fd7 Merge pull request #21811 from shlevy/ghc-cross-hsc2hs-jailbreak 
GHC cross compilation native jailbreak and hsc2hs
 2017-01-11 21:33:00 +01:00
Robin Gloster 289782b94b xorg.xrandr: remove unnecessary xkeystone binary 
Fixes #21714 (see this for more information)
 2017-01-11 19:53:38 +01:00
Shea Levy 60918113af haskellPackages.mkDerivation: Use native hsc2hs when cross-compiling 2017-01-11 13:26:08 -05:00
Shea Levy 4687b6142c haskellPackages.mkDerivation: Use native jailbreak-cabal when cross-compiling 2017-01-11 13:25:50 -05:00
Daiderd Jordan 8ff396ae97 Merge pull request #21775 from yurrriq/update/pkgs/development/interpreters/erlang/R19 
erlangR19: 19.1.6 -> 19.2
 2017-01-11 19:22:20 +01:00
volth a3778f6e87 flashplayer: 24.0.0.186 -> 24.0.0.194 2017-01-11 18:06:55 +00:00
Joachim F 104c3db659 Merge pull request #21202 from kierdavis/unigine-valley 
unigine-valley: refactor
 2017-01-11 18:39:05 +01:00
Frederik Rietdijk 66bdcb4dfd sabnzbd: add yenc package 2017-01-11 18:12:32 +01:00
Frederik Rietdijk 87e67cb4e5 pythonPackages.yenc: init at 0.4.0 2017-01-11 18:12:32 +01:00