Commit Graph

282209 Commits

Author SHA1 Message Date
Hubert Jasudowicz
fac3725e5b pythonPackages.karton-core: init at 4.2.0 2021-04-11 12:32:08 +02:00
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
Fabian Affolter
2df1ab3378 python3Packages.twilio: 6.51.1 -> 6.56.0 2021-04-11 12:24:00 +02:00
Alyssa Ross
441f0c894a mdevd: init at 0.1.3.0 2021-04-11 10:22:29 +00:00
Julien Moutinho
687e55bfc0 ifcopenshell: 0.6.0b0 -> 210410 2021-04-11 12:10:46 +02:00
Fabian Affolter
c1f31aaf22 python3Packages.pycognito: 0.1.5 -> 2021.03.1 2021-04-11 12:08:45 +02:00
Fabian Affolter
144cf60076 python3Packages.hass-nabucasa: 0.42.0 -> 0.43.0 2021-04-11 12:04:08 +02:00
06kellyjac
2ae947c401 octant-desktop: 0.18.0 -> 0.19.0 2021-04-11 10:27:51 +01:00
R. RyanTM
9430cc2da0 github-commenter: 0.8.0 -> 0.9.0 2021-04-11 09:08:43 +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
Fabian Affolter
c7557da36c python3Packages.wakeonlan: 2.0.0 -> 2.0.1 2021-04-11 10:40:37 +02:00
Vincent Laporte
0062afc050 ocamlPackages.printbox: 0.4 → 0.5 2021-04-11 10:10:38 +02:00
Thomas Gerbet
920ffc27cb fig2dev: 3.2.8 -> 3.2.8a
Changelog:
https://sourceforge.net/p/mcj/fig2dev/ci/3.2.8a/tree/CHANGES
2021-04-11 10:08:42 +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
Thomas Gerbet
1b662aa1fa xfig: 3.2.8 -> 3.2.8a
Changelog:
https://sourceforge.net/p/mcj/xfig/ci/3.2.8a/tree/CHANGES
2021-04-11 09:58:04 +02:00
Thomas Gerbet
da55ee488f tcpdump: 4.9.3 -> 4.99.0
Changelog:
https://www.tcpdump.org/tcpdump-changes.txt
2021-04-11 09:39:59 +02:00
storvik
cf25944d02 clpm: use sbcl 2.0.9 when building
Use SBCL < 2.1.0 when building as SB-VM::MAKE-EA was removed.
2021-04-11 09:21:35 +02: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
R. RyanTM
6b4de5afec air: 1.15.1 -> 1.25 2021-04-11 05:07:18 +00: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
Mario Rodas
ec2e4b2d74 bazel-buildtools: 3.5.0 -> 4.0.1 2021-04-11 04:20:00 +00: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
Fabian Affolter
e5b6e6f289 hfinger: init at 0.2.0 2021-04-11 00:22:19 +02: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
Hubert Jasudowicz
83838f7233 maintainers: add chivay 2021-04-11 00:16:41 +02: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
fortuneteller2k
b9e7778877 linux_xanmod: 5.11.12 -> 5.11.13 2021-04-11 04:14:34 +08:00
Ryan Horiguchi
b79e96e2ed
gnomeExtensions.unite: 48 -> 49 2021-04-10 21:41:26 +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
Fabian Affolter
7ff4a1eb79 home-assistant: update component-packages 2021-04-10 21:34:13 +02:00
Fabian Affolter
fb327d72df python3Packages.pyclimacell: init at 0.18.0 2021-04-10 21:31:54 +02:00
Fabian Affolter
fec6f0b152 python3Packages.aioemonitor: init at 1.0.5 2021-04-10 21:11:42 +02:00