Commit graph

282065 commits

Author SHA1 Message Date
sterni 2140791f9b
ocamlPackages.janeStreet{,_0_9_0}: join the ocamlPackages fix point, allowing overriding to work as expected (#113696)
* ocamlPackages.janeStreet_0_9_0: join the ocamlPackages fix point

Internal dependencies in the janeStreet sets were always taken from the
own rec attribute set. While this is pretty simple and convenient, it
has the disadvantage that it doesn't play nice with overriding: If you'd
override an attribute in a janeStreet set previously, it would be
changed when referenced directly, but the other packages in that
janeStreet set still would use the original, non-overridden version of
the derivation.

This is easily fixed by passing janeStreet_0_9_0 itself from the fix
point of ocamlPackages and using it to reference the dependencies.

Example showing it now works as expected:

test-overlay.nix:

    self: super: {
      ocamlPackages = super.ocamlPackages.overrideScope (old: _: {
        janeStreet_0_9_0 = old.janeStreet_0_9_0 // {
          base = old.janeStreet_0_9_0.base.overrideAttrs (_: {
            meta.broken = true;
          });
        };
      });
    }

nix-repl> (import ./. {
  overlays = [ (import ./test-overlay.nix) ];
}).ocamlPackages.janeStreet_0_9_0.stdio

error: Package ‘ocaml4.10.0-base-0.9.4’ in /home/lukas/src/nix/nixpkgs/pkgs/development/ocaml-modules/janestreet/janePackage.nix:6 is marked as broken, refusing to evaluate.

a) To temporarily allow broken packages, you can use an environment variable
   for a single invocation of the nix tools.

     $ export NIXPKGS_ALLOW_BROKEN=1

b) For `nixos-rebuild` you can set
  { nixpkgs.config.allowBroken = true; }
in configuration.nix to override this.

c) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowBroken = true; }
to ~/.config/nixpkgs/config.nix.

* ocamlPackages.janeStreet: take part in fixpoint for OCaml >= 4.08

This change makes overrides to the janeStreet set work as expected by
making the janeStreet set take part in the ocamlPackages fixpoint for
janeStreet 0.14, i. e. OCaml >= 4.08

* ocamlPackages.janeStreet: take part in fixpoint for OCaml == 4.07

This change makes overrides to the janeStreet set work as expected by
making the janeStreet set take part in the ocamlPackages fixpoint for
janeStreet 0.12, i. e. OCaml == 4.07

* ocamlPackages.janeStreet: take part in fixpoint for OCaml < 4.07

This change makes overrides to the janeStreet set work as expected by
making the janeStreet set take part in the ocamlPackages fixpoint for
janeStreet 0.11, i. e. OCaml < 4.07

* ocamlPackages.janeStreet: remove self - super distinction

Previously, we inherited non-janestreet ocaml dependencies from super
and janestreet dependencies from self which always was super.janeStreet.

This behavior is however not really what we want due to liftJaneStreet:
Users and other packages will use ocamlPackages.base etc. instead of
ocamlPackages.janeStreet.base and the like. Consequently they also would
override the top-level attributes which would mean that other janestreet
packages would not pick up on it however.

As a consequence however, overriding ocamlPackages.janeStreet.base
doesn't work. Since this was never possible, I don't think this is an
issue. It is probably a good idea to deprecate that set anyways and
printing a warning when it is used via trace.

janeStreet_0_9_0 is unchanged as the disticniton between self and super
makes sense for it.

Below is an example showing how overriding would work from an user's
perspective:

test-overlay.nix:

    self: super: {
      ocamlPackages = super.ocamlPackages.overrideScope (old: _: {
        base = old.base.overrideAttrs (_: {
          meta.broken = true;
        });
      });
    }

nix-repl> (import ./. { overlays = [ (import ./test-overlay.nix) ]; }).ocamlPackages.
stdio
error: Package ‘ocaml4.10.0-base-0.14.0’ in /home/lukas/src/nix/nixpkgs/pkgs/development/ocaml-modules/janestreet/janePackage_0_14.nix:12 is marked as broken, refusing to evaluate.

a) To temporarily allow broken packages, you can use an environment variable
   for a single invocation of the nix tools.

     $ export NIXPKGS_ALLOW_BROKEN=1

b) For `nixos-rebuild` you can set
  { nixpkgs.config.allowBroken = true; }
in configuration.nix to override this.

c) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowBroken = true; }
to ~/.config/nixpkgs/config.nix.
2021-04-11 12:26:10 +02:00
Alyssa Ross 441f0c894a mdevd: init at 0.1.3.0 2021-04-11 10:22:29 +00:00
Doron Behar cd5b07f01e
Merge pull request #112713 from r-ryantm/auto-update/python3.7-datadog
python37Packages.datadog: 0.39.0 -> 0.40.0
2021-04-11 08:47:50 +00:00
Doron Behar 1d110a147b
Merge pull request #112599 from r-ryantm/auto-update/clevis
clevis: 15 -> 16
2021-04-11 08:47:14 +00:00
Michael Weiss 5d775bb2b0
chromiumBeta: Fix the build (#119087) 2021-04-11 10:43:29 +02:00
Vincent Laporte 0062afc050 ocamlPackages.printbox: 0.4 → 0.5 2021-04-11 10:10:38 +02:00
Vladyslav M eb319f74dd
Merge pull request #119097 from marsam/update-watchexec
watchexec: 1.14.1 -> 1.15.0
2021-04-11 11:01:36 +03:00
Martin Weinelt 7644480555
python3Packages.snitun: disable failing test on darwin (#119009)
The upstream advertises this package as "OS independent", but from
issues it is clear they cannot test it on MacOS. So we simply disable
this test.

```
______________________ test_peer_listener_timeout[pyloop] ______________________

raise_timeout = None
peer_manager = <snitun.server.peer_manager.PeerManager object at 0x10a4a6df0>
peer_listener = <snitun.server.listener_peer.PeerListener object at 0x10a4a6a30>
test_client_peer = Client(reader=<StreamReader exception=ConnectionResetError(54, 'Connection reset by peer') transport=<_SelectorSocketT...by peer') transport=<_SelectorSocketTransport closed fd=19>>>, close=<asyncio.locks.Event object at 0x10909ee50 [set]>)

    async def test_peer_listener_timeout(
        raise_timeout, peer_manager, peer_listener, test_client_peer
    ):
        """Run a full flow of with a peer."""
        valid = datetime.utcnow() + timedelta(days=1)
        aes_key = os.urandom(32)
        aes_iv = os.urandom(16)
        hostname = "localhost"
        fernet_token = create_peer_config(valid.timestamp(), hostname, aes_key, aes_iv)

        crypto = CryptoTransport(aes_key, aes_iv)

        test_client_peer.writer.write(fernet_token)
        await test_client_peer.writer.drain()

        with pytest.raises(asyncio.IncompleteReadError):
>           token = await test_client_peer.reader.readexactly(32)

tests/server/test_listener_peer.py:110:
_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _
/nix/store/dpa7p7v00xvr26dv2myh3k5p1zkagqsm-python3-3.8.5/lib/python3.8/asyncio/streams.py:723: in readexactly
    await self._wait_for_data('readexactly')
/nix/store/dpa7p7v00xvr26dv2myh3k5p1zkagqsm-python3-3.8.5/lib/python3.8/asyncio/streams.py:517: in _wait_for_data
    await self._waiter
_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _

self = <_SelectorSocketTransport closed fd=19>

    def _read_ready__data_received(self):
        if self._conn_lost:
            return
        try:
>           data = self._sock.recv(self.max_size)
E           ConnectionResetError: [Errno 54] Connection reset by peer
```
2021-04-11 02:18:59 -04:00
Mario Rodas 026b9c9f57
Merge pull request #118942 from packetizeme/patch-1
git-review: 1.28.0 -> 2.0.0

Fixes https://github.com/NixOS/nixpkgs/issues/119037
2021-04-10 23:43:25 -05:00
Ryan Mulligan 04dd46c650
Merge pull request #119065 from r-ryantm/auto-update/openfpgaloader
openfpgaloader: 0.2.5 -> 0.2.6
2021-04-10 21:42:52 -07:00
Dmitry Kalinkin 79e46fe6b0
Merge pull request #118967 from veprbl/pr/rivet_3_1_4
rivet: 3.1.3 -> 3.1.4
2021-04-11 00:29:33 -04:00
Leah Ives f9cc32641f git-review: 1.28.0 -> 2.0.0
* Updates git-review to latest version
* Fixes build error due to dependency on old version of six library
2021-04-10 19:59:31 -07:00
John Ericson 4b21d06df0
Merge pull request #119068 from arcnmx/fix-cc-gccforlibs
cc-wrapper: match useGccForLibs conditional order
2021-04-10 22:41:57 -04:00
Alyssa Ross d45fc07bc2 nixos/postfix: add services.postfix.canonical opt
This mirrors the services.postfix.transport and
services.postfix.virtual options we already have.
2021-04-11 00:31:12 +00:00
Ryan Mulligan afca74b711
Merge pull request #119027 from r-ryantm/auto-update/jbang
jbang: 0.69.2 -> 0.70.0
2021-04-10 17:30:19 -07:00
Ryan Mulligan 39156b1bad
Merge pull request #119059 from r-ryantm/auto-update/obsidian
obsidian: 0.11.9 -> 0.11.13
2021-04-10 17:29:31 -07:00
Ryan Mulligan 57223384f8
Merge pull request #118969 from r-ryantm/auto-update/ciao
ciao: 1.19.0 -> 1.20.0
2021-04-10 17:27:42 -07:00
Ryan Mulligan 2c8e88dabe
Merge pull request #118962 from r-ryantm/auto-update/cargo-deny
cargo-deny: 0.9.0 -> 0.9.1
2021-04-10 16:01:53 -07:00
Ryan Mulligan 018a1fe921
Merge pull request #118956 from r-ryantm/auto-update/amber
amber: 0.5.8 -> 0.5.9
2021-04-10 16:01:09 -07:00
Fabian Affolter 089908b9db
Merge pull request #119033 from r-ryantm/auto-update/lazygit
lazygit: 0.26.1 -> 0.27.3
2021-04-11 00:35:19 +02:00
Fabian Affolter 2ea8e240ff home-assistant: update component-packages 2021-04-10 15:31:56 -07:00
Fabian Affolter 0b78980d67 python3Packages.pyenvisalink: init at 4.1 2021-04-10 15:31:56 -07:00
Bernardo Meurer a451d399d3
Merge pull request #118900 from Luis-Hebendanz/fixing_firefox_issue_#118860
firefox/wrapper.nix: Fixed issue #118860
2021-04-10 22:18:22 +00:00
Aaron Andersen e0fd737309
Merge pull request #107969 from corngood/jellyfin
jellyfin: add openFirewall option
2021-04-10 18:02:05 -04:00
Robert Scott f9951f50a5
Merge pull request #118995 from r-ryantm/auto-update/frangipanni
frangipanni: 0.4.0 -> 0.4.2
2021-04-10 21:58:28 +01:00
Mario Rodas b196ddbac4
Merge pull request #119072 from stephank/imgproxy-darwin
imgproxy: fix build on Darwin
2021-04-10 15:45:42 -05:00
Mario Rodas 4addb868bb
Merge pull request #119025 from r-ryantm/auto-update/imgproxy
imgproxy: 2.16.2 -> 2.16.3
2021-04-10 15:41:38 -05:00
Pascal Bach 51470b0390
Merge pull request #119053 from r-ryantm/auto-update/minio
minio: 2021-03-26T00-00-41Z -> 2021-04-06T23-11-00Z
2021-04-10 22:28:07 +02:00
Sandro 570652d728
Merge pull request #118994 from 06kellyjac/master
octant: 0.18.0 -> 0.19.0
2021-04-10 21:39:11 +02:00
Stéphan Kochen 37b3deb758 imgproxy: fix build on Darwin 2021-04-10 20:55:43 +02:00
arcnmx 2f1131cff7 cc-wrapper: match useGccForLibs conditional order
This breaks an evaluation cycle between `cc` and `gccForLibs` for cross
builds, fixing an infinite recursion error.
2021-04-10 10:39:07 -07:00
Mario Rodas 27d7c671af
Merge pull request #118972 from r-ryantm/auto-update/cloud-nuke
cloud-nuke: 0.1.27 -> 0.1.28
2021-04-10 12:31:55 -05:00
06kellyjac 5ac1f45541 octant: 0.18.0 -> 0.19.0 2021-04-10 18:25:40 +01:00
R. RyanTM 822c94a557 openfpgaloader: 0.2.5 -> 0.2.6 2021-04-10 17:24:56 +00:00
R. RyanTM ea4b7bdc57 obsidian: 0.11.9 -> 0.11.13 2021-04-10 16:53:54 +00:00
Sandro a73020b2a1
Merge pull request #119020 from dotlambda/splinter-fix
pythonPackages.splinter: fix build
2021-04-10 18:42:38 +02:00
Sandro 42f3ca2467
Merge pull request #119017 from fabaff/bump-pykwalify
python3Packages.pykwalify: 1.7.0 -> 1.8.0
2021-04-10 18:41:58 +02:00
Sandro baf5e666c6
Merge pull request #118957 from lovesegfault/pynvim-0.4.3
python3Packages.pynvim: 0.4.2 -> 0.4.3
2021-04-10 18:41:07 +02:00
Sandro 64a8f2b8e5
Merge pull request #118951 from kalbasit/update-west
python3Packages.west: 0.8.0 -> 0.10.1
2021-04-10 18:40:52 +02:00
Gabriel Ebner cb6a191c65
Merge pull request #119040 from r-ryantm/auto-update/libqalculate
libqalculate: 3.17.0 -> 3.18.0
2021-04-10 18:30:20 +02:00
R. RyanTM e0e9ab3b62 minio: 2021-03-26T00-00-41Z -> 2021-04-06T23-11-00Z 2021-04-10 16:06:11 +00:00
Sandro 7ed23e37bd
Merge pull request #112956 from r-ryantm/auto-update/openvswitch
openvswitch: 2.14.1 -> 2.14.2
2021-04-10 17:24:22 +02:00
nixinator 3314db5a56
cdogs-sdl: init at 0.11.0 (#118949)
Co-authored-by: Jonathan Ringer <jonringer@users.noreply.github.com>
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-04-10 17:23:57 +02:00
Sandro 69e3e6d07c
Merge pull request #118485 from risicle/ris-openvswitch-lts-2.5.12
openvswitch-lts: 2.5.9 -> 2.5.12
2021-04-10 17:23:25 +02:00
Sandro c5448a477a
Merge pull request #119041 from das-g/osm2pgsql
osm2pgsql: 1.4.1 -> 1.4.2
2021-04-10 17:20:32 +02:00
Sandro b87413a1e6
Merge pull request #118933 from alyssais/snd
snd: 20.3 -> 21.1; broaden platforms; parallelize
2021-04-10 17:16:29 +02:00
Sandro 8eaa3b08c9
Merge pull request #119036 from totoroot/update/qownnotes-21.4.0
qownnotes: 21.3.2 -> 21.4.0
2021-04-10 17:12:32 +02:00
Sandro 38b7f6b9c2
Merge pull request #119022 from veprbl/pr/pythia_8_304
pythia: 8.303 -> 8.304
2021-04-10 17:09:22 +02:00
Mario Rodas 763b66fef5
Merge pull request #119013 from r-ryantm/auto-update/go-toml
go-toml: 1.8.1 -> 1.9.0
2021-04-10 10:03:14 -05:00
Sandro aa05808456
Merge pull request #117677 from 06kellyjac/octant-desktop 2021-04-10 16:46:25 +02:00