Commit Graph

42478 Commits

Author SHA1 Message Date
Alyssa Ross
c13cf1e76f
Merge remote-tracking branch 'nixpkgs/master' into staging-next 2021-09-01 07:47:01 +00:00
Vladimír Čunát
538f369fb5
Merge #134049: liburcu: 0.12.2 -> 0.13.0 2021-09-01 08:31:15 +02:00
adisbladis
bcddcb26be
Merge pull request #136232 from tweag/qt5-out-of-tree-modules
qt5: Expose internal variables to facilitate out-of-tree building of modules
2021-08-31 14:16:32 -05:00
Maximilian Bosch
f9ed3a190d
Merge pull request #134877 from r-ryantm/auto-update/tclap
tclap: 1.2.3 -> 1.2.4
2021-08-31 20:46:36 +02:00
Robert Scott
84260c7a6b
Merge pull request #136167 from risicle/ris-grilo-CVE-2021-39365
grilo: add patch for CVE-2021-39365
2021-08-31 19:32:18 +01:00
Alyssa Ross
7d471c8754 usbredir: fix cross 2021-08-31 12:27:03 +00:00
Niklas Hambüchen
ccc9139fc9
Merge pull request #136236 from nh2/libe57format-2.2.0
libe57format: 2.1 -> 2.2.0
2021-08-31 11:02:11 +02:00
Niklas Hambüchen
92a5eac48b libe57format: 2.1 -> 2.2.0 2021-08-31 11:01:23 +02:00
adisbladis
20ce363de4
qt5: Expose internal variables to facilitate out-of-tree building of modules
As it is currently it's almost impossible to accomplish something like:
```nix
...

(qt5.callPackage (
  { qtModule, qtbase, qtdeclarative }:
  qtModule {
    pname = "qt3d";
    qtInputs = [ qtbase qtdeclarative ];
    outputs = [ "out" "dev" "bin" ];
  }
) { })

...
```
because all the required variables such as qtModule are internal-only.

By exposing these it's easier for external projects not to be bound
exactly by the module definitions explicitly listed in nixpkgs.
2021-08-30 15:15:44 -05:00
adisbladis
a7432ad311
qt5.qt3d: init module 2021-08-30 15:10:49 -05:00
Martin Weinelt
e2575c7de1
Merge branch 'master' into staging-next 2021-08-30 16:08:03 +02:00
Robert Scott
f4153fb02c grilo: add patch for CVE-2021-39365 2021-08-30 11:43:07 +01:00
Matthew Leach
a850ed0be8
portaudio: remove Werror (#136060) 2021-08-30 09:12:52 +01:00
Alyssa Ross
78d20f2200 pkgsMusl.libiscsi: fix build 2021-08-30 07:42:01 +00:00
Mario Rodas
f659bd7695
Merge pull request #135747 from urlordjames/drogon_bump
drogon: 1.7.1 -> 1.7.2
2021-08-29 18:04:09 -05:00
Robert Schütz
6b369a4de7
Merge pull request #136050 from dotlambda/libdeltachat-1.59.0
libdeltachat: 1.56.0 -> 1.59.0
2021-08-29 09:40:39 -07:00
Vladimír Čunát
75c8d45096
Merge #136035: openssl: 1.1.1k -> 1.1.1l (again)
Hydra has < 25% of x86_64-linux jobs remaining:
https://hydra.nixos.org/eval/1700096?filter=x86_64-linux
so let's go on and get unstable-small channel, etc.

x86_64-darwin users will probably have to stay on an older commit
for a while, e.g. the nixpkgs-unstable channel.
2021-08-29 12:59:18 +02:00
Mario Rodas
8f40bb53b0
Merge pull request #135645 from r-ryantm/auto-update/libquotient
libquotient: 0.6.7 -> 0.6.8
2021-08-29 01:37:02 -05:00
Mario Rodas
1aa6a11373
Merge pull request #135736 from r-ryantm/auto-update/cjson
cjson: 1.7.14 -> 1.7.15
2021-08-29 01:34:32 -05:00
Michael Raskin
f56bc01a16
Merge pull request #135992 from r-ryantm/auto-update/simgear
simgear: 2020.3.8 -> 2020.3.11
2021-08-29 06:25:37 +00:00
Martin Weinelt
3d245b3a37 Revert "Revert "openssl: 1.1.1k -> 1.1.1l" (#135999)"
This reverts commit b2b0115e70.
2021-08-28 16:58:44 +02:00
github-actions[bot]
dbad333a72
Merge master into staging-next 2021-08-28 12:01:06 +00:00
Alexandre Iooss
3e9661ce7f libguestfs: change license to gpl2Plus and lgpl21Plus 2021-08-28 10:53:44 +00:00
Alexandre Iooss
9c442fa901 libguestfs: enable strictDeps
Move bison, flex, getopt from buildInputs to nativeBuildInputs as they
are build tools. Move crdkit, cpio, gperf, qemu to nativeBuildInputs.
Enable strictDeps.
2021-08-28 10:53:44 +00:00
Alexandre Iooss
07c3195664 libguestfs: 1.40.2 -> 1.44.1 2021-08-28 10:53:44 +00:00
Dmitry Kalinkin
354470d0f9
Revert "Revert "openssl: 1.1.1k -> 1.1.1l" (#135999)"
This reverts commit b2b0115e70.
2021-08-28 00:52:27 -04:00
Dmitry Kalinkin
b2b0115e70
Revert "openssl: 1.1.1k -> 1.1.1l" (#135999) 2021-08-27 23:36:39 -04:00
happysalada
c65ec0c87d aws-cpp-sdk: disable flaky test 2021-08-28 10:06:09 +09:00
Dmitry Kalinkin
053e6bf855
Revert "srtp: support cross, switch to cmake, enable tests"
Breaks gstreamer-bad as discussed in #131986.

This reverts commit e4ade0952a.
2021-08-27 21:02:48 -04:00
Martin Weinelt
b4cc668277
Merge pull request #135611 from mweinelt/openssl 2021-08-28 02:27:54 +02:00
R. RyanTM
ff3aa121fd simgear: 2020.3.8 -> 2020.3.11 2021-08-28 00:22:39 +00:00
Martin Weinelt
174868d4fa
openssl: 1.1.1k -> 1.1.1l 2021-08-28 02:21:11 +02:00
github-actions[bot]
b7f2a7d1ba
Merge master into staging-next 2021-08-28 00:01:34 +00:00
Maximilian Bosch
3da886bf41
treewide: remove ma27 from the maintainer-list of a few packages
These are all packages that I stopped using and hence just create noise
in my inbox for each change affecting them and let's face it, while I
still enjoy contributing to nixpkgs, it doesn't really make sense to be
listed there if I can't do much anyways.

Each of these packages can be taken over by someone or removed if
people think that's reasonable.

Of course, if other maintainers face issues, I can answer some questions
if needed & possible.
2021-08-27 22:28:49 +02:00
github-actions[bot]
ad3f4eefab
Merge master into staging-next 2021-08-27 18:01:20 +00:00
Michael Weiss
9f01f3f267
intel-gmmlib: 21.2.1 -> 21.2.2 2021-08-27 15:36:39 +02:00
github-actions[bot]
aced2eb830
Merge master into staging-next 2021-08-27 12:01:10 +00:00
Ben Gamari
9c65427ba7
gdal: 3.2.2 -> 3.3.1 (#132852)
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
Co-authored-by: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
2021-08-27 09:07:06 +02:00
github-actions[bot]
fd0f377048
Merge master into staging-next 2021-08-27 06:00:59 +00:00
Sandro
6a9ecf048d
Merge pull request #133906 from r-ryantm/auto-update/xmlsec 2021-08-27 05:03:06 +02:00
tomberek
59b3fb4048
Merge pull request #87685 from ghost/local/gnurl770-fix1
libgnurl: reduce size of closure. Remove unnecessary/old dependencies,
2021-08-26 22:09:44 -04:00
github-actions[bot]
8fb1ff7c31
Merge master into staging-next 2021-08-26 18:01:02 +00:00
Sandro
14166c47a7
Merge pull request #135775 from fabaff/bump-libwebsockets 2021-08-26 18:43:01 +02:00
Ryan Mulligan
082a9d69eb
Merge pull request #135809 from r-ryantm/auto-update/tiledb
tiledb: 2.2.9 -> 2.3.3
2021-08-26 09:40:42 -07:00
R. RyanTM
35452764ac tiledb: 2.2.9 -> 2.3.3 2021-08-26 15:17:46 +00:00
Sandro
2777a9d66b
Merge pull request #135124 from r-ryantm/auto-update/tinyobjloader 2021-08-26 14:09:57 +02:00
Fabian Affolter
ddc3acae9d libwebsockets: 4.2.0 -> 4.2.1 2021-08-26 12:52:13 +02:00
Dmitry Kalinkin
262fd63a72
Merge branch 'master' into staging-next
Conflicts:
	pkgs/tools/networking/inetutils/default.nix
2021-08-26 00:57:08 -04:00
urlordjames
cd0fa6156f drogon: 1.7.1 -> 1.7.2 2021-08-26 00:05:13 -04:00
Robert Schütz
50968f2341 libdeltachat: 1.56.0 -> 1.59.0
https://github.com/deltachat/deltachat-core-rust/blob/1.59.0/CHANGELOG.md
2021-08-25 19:36:33 -07:00