mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-20 04:48:10 +00:00
Code Issues Wiki Activity
172995 commits 179 branches 125 tags 8.9 GiB
Commit graph

172995 commits

This branch
This branch
All branches
Author SHA1 Message Date
Peter Simons 7c04e3eb75 haskell-arbtt: add build products into $PATH for the check phase 
Fixes https://github.com/NixOS/nixpkgs/pull/57585.
 2019-03-17 09:43:14 +01:00
Christoph Neidahl 4708d3f84b hardinfo: fix not finding libc 2019-03-17 09:22:59 +01:00
Peter Simons e98e4d21fa hackage-packages.nix: automatic Haskell package set update 
This update was generated by hackage2nix v2.14.2-3-gea0f0ca from Hackage revision
83ddbaad89.
 2019-03-17 09:21:20 +01:00
Michael Peyton Jones 387c513d12 generic Haskell builder: don't copy packages from GHC 
In order to build the package databases that we will use when compiling
a Haskell package, we iterate over the relevant dependencies, and if
they contain a package db, we copy its contents over.

So far so good, except when one of those dependencies is GHC. This
doesn't happen ordinarily, but it will happen when we construct the
package database for compiling `Setup.hs`.  This is compiled for the
build architecture, so we get the build deps, including both the native
and the cross GHC (if there is one).

In this case, we end up copying the packages from the GHC's package
database. This is at best unnecessary, since we will get those packages
from the GHC when we compile with it.

At worst, however, this is semantically questionable. We can end up
having multiple copies of e.g. Cabal with the same version, but
(potentially) different contents. At the moment, GHC will expose one of
these at semi-random depending on which one it looks at "first".
However, there is a MR open [in
GHC](https://gitlab.haskell.org/ghc/ghc/merge_requests/545) which as a
side effect will instead expose both, leading to ambiguous module
warnings (which is not unreasonable, since it *is* ambiguous).

So what can we do about it? The simplest solution is just to not copy
the package databases from GHC. GHC is special in this regard, so I
think it's okay to treat it specially.

This PR should have no effect on anything now, but will prevent any
breakage when/if the GHC patch lands.

Closes https://github.com/NixOS/nixpkgs/pull/57706.
 2019-03-17 09:21:20 +01:00
Will Dietz 4f7a762d6b
Merge pull request #57761 from dtzWill/update/radiotray-ng-0.2.5 
radiotray-ng: 0.2.4 -> 0.2.5
 2019-03-17 01:49:15 -05:00
Will Dietz 8fcb8b5e3a radiotray-ng: disable tests on aarch64, not sure why but failure 2019-03-17 01:03:32 -05:00
Will Dietz e37f63daaf
Merge pull request #57540 from dtzWill/update/sqlite-replication-and-dqlite 
dqlite,sqlite-replication,lxd: updates!
 2019-03-17 00:48:18 -05:00
worldofpeace 0125544e2a bamf: add wrapGAppsHook 2019-03-16 23:10:23 -04:00
Ryan Mulligan 5d5c24be36
Merge pull request #57576 from marsam/init-odyssey 
odyssey: init at 2019-03-12
 2019-03-16 20:00:07 -07:00
Vladyslav M b9ebc84f8d yarn: 1.14.0 -> 1.15.2 (#57727) 2019-03-17 00:32:18 +01:00
xeji 88ffb73636
Merge pull request #57411 from srhb/mitmproxy-wsproto-update 
mitmproxy: wsproto and pytest fixes
 2019-03-17 00:12:38 +01:00
xeji 0d88ab89dc
Merge pull request #57753 from NixOS/update-homebank 
homebank: 5.2.2 -> 5.2.3
 2019-03-17 00:03:46 +01:00
François-René Rideau 4b00757206 qiv: 2.3.1 -> 2.3.2 (#57729) 2019-03-16 23:58:58 +01:00
Sarah Brofeldt 44b5166f91
Merge pull request #57760 from LinArcX/jcal 
jcal: init at 0.4.1
 2019-03-16 22:35:48 +01:00
Timo Kaufmann e6fc8c7ac3
Merge pull request #57764 from timokau/pyzmq-upgrade 
python.pkgs.pyzmq: 17.1.3 -> 18.0.1, disable flaky test
 2019-03-16 21:22:44 +00:00
linarcx f7ad3e8aee Add linarcx to maintainer-list 2019-03-17 00:43:29 +03:30
linarcx c3e17e7d76 jcal: init at 0.4.1 2019-03-17 00:42:40 +03:30
Vladyslav M db4f3b1744
Merge pull request #57678 from dtzWill/update/ibm-plex-1.3.0 
ibm-plex: 1.2.3 -> 1.3.0
 2019-03-16 22:35:59 +02:00
Peter Simons 26073f4a8d vaultenv: disable broken build 
(cherry picked from commit 3642a3a69c)
 2019-03-16 20:31:23 +01:00
Peter Simons c333861954 hedgewars: disable broken build 
(cherry picked from commit 7a1432f0f1)
 2019-03-16 20:31:23 +01:00
Peter Simons bdd4e11278 haskell-pandoc: update overrides for the new 2.7.1 version 
(cherry picked from commit 96c7ea5f6d)
 2019-03-16 20:31:23 +01:00
Peter Simons b514a6d351 hackage-packages.nix: automatic Haskell package set update 
This update was generated by hackage2nix v2.14.2-3-gea0f0ca from Hackage revision
faa5a059ee.
 2019-03-16 20:31:23 +01:00
Peter Simons 2df9351953 LTS Haskell 13.13 
(cherry picked from commit fee2f975ec)
 2019-03-16 20:30:58 +01:00
Peter Simons 93e4a90502 ghc: switch our default compiler to version 8.6.4 
Also, drop obsolete 8.6.x minor releases 8.6.1, 8.6.2, and 8.6.3.

(cherry picked from commit 7fde42b8eb)
 2019-03-16 20:30:58 +01:00
Timo Kaufmann 4f2d842a98 python.pkgs.pyzmq: disable flaky test 
Recently failed on staging.
 2019-03-16 19:46:04 +01:00
Timo Kaufmann 92ed05be3b python.pkgs.pyzmq: 17.1.3 -> 18.0.1 2019-03-16 19:46:04 +01:00
Sarah Brofeldt 106db715f9
Merge pull request #57756 from marsam/update-brakeman 
brakeman: 4.4.0 -> 4.5.0
 2019-03-16 19:31:49 +01:00
Sarah Brofeldt 6d9649528c
Merge pull request #55002 from clacke/racket-gl 
racket: add libGL and libGLU to libPath
 2019-03-16 19:27:50 +01:00
Will Dietz c397b016f5 radiotray-ng: 0.2.4 -> 0.2.5 
patch to use provided gtest/gmock, fix+enable tests
 2019-03-16 12:40:50 -05:00
Mario Rodas ad219bcbc6
brakeman: 4.4.0 -> 4.5.0 2019-03-16 12:20:30 -05:00
Dmitry Kalinkin 7669144a27
texlive: add veprbl to maintainers 
cc #56797
 2019-03-16 12:04:04 -04:00
Sarah Brofeldt 271ce3f79e
Merge pull request #57592 from samueldr/solaar/update 
solaar: 2018-02-02 -> 2019-01-30 + udev rules inclusion
 2019-03-16 17:02:28 +01:00
Vladyslav M 33e9fa2367
Merge pull request #56622 from marsam/init-shadowsocks-rust 
shadowsocks-rust: init at 1.7.0
 2019-03-16 17:43:27 +02:00
Ryan Mulligan 96e4072057
Merge pull request #57662 from CrazedProgrammer/wf-recorder 
wf-recorder: init at unstable-2019-03-12
 2019-03-16 08:40:39 -07:00
Ryan Mulligan 3419fe6e5d
Merge pull request #57329 from r-ryantm/auto-update/ncpamixer 
ncpamixer: 1.3 -> 1.3.3
 2019-03-16 08:11:21 -07:00
Pascal Wittmann 27201851d6
homebank: 5.2.2 -> 5.2.3 2019-03-16 14:57:52 +01:00
Léo Gaspard 59c5630f60
Merge branch 'pr-57699' 
* pr-57699:
  nixos/matrix: add manual section about self-hosting a matrix client and server
 2019-03-16 14:48:39 +01:00
Florian Jacob ef52869ef1 nixos/matrix: add manual section 
about self-hosting a matrix client and server
 2019-03-16 14:26:07 +01:00
Mario Rodas fef17b195a
odyssey: init at 2019-03-12 2019-03-16 07:59:32 -05:00
Michael Weiss da1a2b1eea
tdesktopPackages.preview: 1.5.17 -> 1.5.18 2019-03-16 13:48:55 +01:00
Peter Simons 17c62c98d3
Merge pull request #57587 from erictapen/hakyll-pandoc-bump 
haskellPackages.hakyll: bump pandoc dependency to 2.7
 2019-03-16 13:47:33 +01:00
Mario Rodas 3039cfcfde
shadowsocks-rust: init at 1.7.0 2019-03-16 07:35:08 -05:00
xeji 0610d30e5b
Merge pull request #57735 from Ma27/rm-activator-attribute 
activator: remove attribute name
 2019-03-16 11:01:19 +01:00
Robert Schütz f7156588b2 python.pkgs.PyICU: fix build 
fallout of https://github.com/NixOS/nixpkgs/pull/54182
 2019-03-16 09:50:29 +01:00
Vladimír Čunát 3aecf21239
Merge #56922: nixos/knot: init basic service + tests 2019-03-16 09:17:15 +01:00
CrazedProgrammer bc9d5b7bef wf-recorder: init at unstable-2019-03-12 2019-03-16 08:52:50 +01:00
Silvan Mosberger 056b9d0085
Merge pull request #57633 from talyz/master 
amazon-image.nix: Resolve failure to include resize2fs
 2019-03-16 05:12:05 +01:00
Ryan Mulligan 54ce13ee84
Merge pull request #57737 from rixed/junkie-fix 
Fix SHA256 used by fetchFromGitHub
 2019-03-15 20:28:38 -07:00
Cedric Cellier e1fb3b5d3e junkie: fix src sha256 
No idea how ever built. TIL about nix-prefetch-url.
 2019-03-16 03:48:02 +01:00
Samuel Dionne-Riel 17a2e7329b
Merge pull request #57719 from r-ryantm/auto-update/dbeaver-ce 
dbeaver: 5.3.5 -> 6.0.0
 2019-03-15 21:36:17 -04:00