ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-27 05:43:50 +03:00
Code Issues Projects Releases Wiki Activity
121,662 Commits 96 Branches 102 Tags 4.8 GiB
6c82383370
Commit Graph

23581 Commits

Author SHA1 Message Date
Orivej Desh
6c82383370 libskk: fix build 2017-11-29 10:30:03 +00:00
Orivej Desh
a88146d308 qt4: fix parallel building of moc_qtgradientviewdialog.o 
Previously the last of these commands:

```
make -j sub-tools-bootstrap
make -j sub-uic sub-moc sub-rcc
make -C tools/designer/src/lib .obj/release-shared/moc_qtgradientviewdialog.o
```

failed with this error:

```
In file included from .uic/release-shared/ui_qtgradientviewdialog.h:63:0,
                 from .moc/release-shared/../../../../../shared/qtgradienteditor/qtgradientviewdialog.h:47,
                 from .moc/release-shared/moc_qtgradientviewdialog.cpp:9:
../../../shared/qtgradienteditor/qtgradientview.h:47:31: fatal error: ui_qtgradientview.h: No such file or directory
```

because uic did not ensure that the build of moc_qtgradientviewdialog.o happens
after the build of moc_qtgradientview.o.
 2017-11-29 09:08:44 +00:00
Orivej Desh
8b0ef2a564 qt4: enable parallel building in the configure phase 2017-11-29 09:06:42 +00:00
Vladimír Čunát
5f020d5627
Merge branch 'staging' 
There are security fixes in multiple packages /cc #32117,
so I'm merging a little earlier, with a few thousand jobs
still not finished on Hydra for x86_64-darwin and aarch64-linux.
 2017-11-29 10:02:40 +01:00
Daiderd Jordan
d7039d5029 libmpack: fix darwin build 
On darwin we need the correct prefix during the buildPhase, otherwise
the dynamic libraries have an incorrect install_name.
 2017-11-29 02:38:16 +00:00
Mike Playle
3aecf95548 libamqpcpp: init at 2.7.4 2017-11-29 01:54:32 +00:00
Orivej Desh
0238e5ca93
Merge pull request #32108 from yuriaisaka/pr-libskk-init 
libskk: init at 1.0.2
 2017-11-29 01:03:40 +00:00
Vladimír Čunát
8b53b2ec2c
Merge branch 'master' into staging 2017-11-28 21:06:44 +01:00
Vladimír Čunát
e0368f5076
gnutls: use mirror://gnupg (fix #32147) 
ftp.gnutls.org stopped working with curl; it's not clear yet why.
 2017-11-28 20:43:56 +01:00
Vladimír Čunát
fac570a71d
Re-merge #32126: ffmpeg-3.4: fix CVE CVE-2017-16840 
I'm sorry, I merged older version of the PR by accident.
 2017-11-28 19:22:59 +01:00
Vladimír Čunát
c917950c05
Merge #32126: ffmpeg-3.4: fix CVE CVE-2017-16840 2017-11-28 19:00:43 +01:00
Andreas Rammhold
fe1f228580
ffmpeg-full-3.4: apply patch for CVE-2017-16840 2017-11-28 18:41:53 +01:00
Vladimír Čunát
e6a7a2e1fd
Merge #32134: pcre2: Patch for CVE-2017-8786 2017-11-28 18:20:01 +01:00
Vladimír Čunát
addd20e6f9
Merge branch 'master' into staging 2017-11-28 18:19:34 +01:00
Vladimír Čunát
d70d5c9ddb
gnutls: force rebuild 
If you have fixed-output derivation with correct hash but bad builder
on Hydra, it seems really difficult to restart it with a good builder.
 2017-11-28 09:38:05 +01:00
Vladimír Čunát
7393665803
gnutls: fixup download URL after update 
I'm sorry about that; I forgot 3.5 in there.
Still, I don't know why their ftp won't work well with curl;
wget is perfectly OK.
 2017-11-28 07:58:08 +01:00
adisbladis
93294fc5c8
pcre2: Patch for CVE-2017-8786 2017-11-28 12:47:37 +08:00
Mateusz Kowalczyk
c289d95aba
Merge pull request #32093 from peterhoeg/u/libao 
libao: 1.2.0 -> 1.2.2
 2017-11-27 23:48:09 +00:00
Andreas Rammhold
64d8cc7fc4
ffmpeg-full-3.4: apply patch for CVE-2017-16840 2017-11-28 00:24:02 +01:00
Andreas Rammhold
2492f45565
ffmpeg-3.4: apply fix CVE CVE-2017-16840 
Details at [1].

[1] http://git.videolan.org/?p=ffmpeg.git;a=commit;h=a94cb36ab2ad99d3a1331c9f91831ef593d94f74
 2017-11-28 00:14:05 +01:00
Orivej Desh
78af59354c glew: fix darwin install name 2017-11-27 15:59:50 +00:00
Orivej Desh
4a8caddb6e SDL2_image: support darwin 2017-11-27 15:59:50 +00:00
Orivej Desh
6c8763e0ca ftgl: enable darwin 2017-11-27 15:59:50 +00:00
Orivej Desh
90ab4ef5a8 ftgl212: delete 
It is no longer used and ftgl 2.1.3 is newer.
 2017-11-27 15:22:16 +00:00
Vladimír Čunát
b800aa18fe
harfbuzz: 1.5.1 -> 1.7.1 2017-11-27 15:10:06 +01:00
Vladimír Čunát
6705f30e2c
Merge branch 'master' into staging 2017-11-27 15:09:53 +01:00
Yuri Aisaka
42002eace9 libskk: init at 1.0.2 2017-11-27 22:46:35 +09:00
Vladimír Čunát
f71dfabad3
Merge #31891: gtk3: propagate gsettings_desktop_schemas 2017-11-27 13:57:13 +01:00
Vladimír Čunát
9642fb40e8
glib: maintenance 2.54.1 -> 2.54.2 2017-11-27 13:54:15 +01:00
Vladimír Čunát
6eb4a86954
pango: maintenance 1.40.12 -> 1.40.14 2017-11-27 13:30:59 +01:00
Vladimír Čunát
6a71852630
mesa: maintenance 17.2.4 -> 17.2.6 2017-11-27 13:05:52 +01:00
Vladimír Čunát
f37443483e
libdrm: 2.4.84 -> 2.4.88 2017-11-27 13:05:07 +01:00
Vladimír Čunát
529c5c50b1
gnutls: 3.5.15 -> 3.6.1 
No breaking changes expected, as the ABI is still 3.4.0.
 2017-11-27 12:42:11 +01:00
Vladimír Čunát
40a2973f14
Merge #31853: nettle: 3.3 -> 3.4 2017-11-27 12:24:16 +01:00
Vladimír Čunát
6345089ca0
Merge #29392: gnome3: 3.24 -> 3.26 
It might be slightly confusing that a couple of the changes will be twice
in the history, but let's merge this way.
 2017-11-27 12:19:01 +01:00
Vladimír Čunát
337e900c3d
Merge #31683: glib: Add variable for overriding schemas 2017-11-27 10:54:19 +01:00
John Ericson
1c44d5efc6
Merge pull request #32098 from obsidiansystems/binPrefix 
treewide: Use `targetPrefix` instead of `prefix` for platform name prefixes
 2017-11-27 03:20:53 -05:00
John Ericson
e755a8a27d treewide: Use targetPrefix instead of prefix for platform name prefixes 
Certain tools, e.g. compilers, are customarily prefixed with the name of
their target platform so that multiple builds can be used at once
without clobbering each other on the PATH. I was using identifiers named
`prefix` for this purpose, but that conflicts with the standard use of
`prefix` to mean the directory where something is installed. To avoid
conflict and confusion, I renamed those to `targetPrefix`.
 2017-11-27 03:15:50 -05:00
Austin Seipp
63428868af microsoft_gsl: fix crossSystem build support 
cmake needs to be part of nativeBuildInputs, otherwise you get a very unhelpful
debugging trace.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2017-11-27 01:40:31 -06:00
Peter Hoeg
d28c21bd6d libao: 1.2.0 -> 1.2.2 2017-11-27 12:25:24 +08:00
Peter Hoeg
50ad43bd39 libqmatrixclient: init at 0.1 2017-11-26 23:35:00 +08:00
adisbladis
747d0f50ee
Merge pull request #32041 from ck3d/libftdi1-1.4 
libftdi1: 1.3 -> 1.4
 2017-11-26 20:45:58 +08:00
Jörg Thalheim
8fa05d7eef
Merge pull request #32071 from adisbladis/libu2f-host-1_1_4 
libu2f-host: 1.1.1 -> 1.1.4
 2017-11-26 11:55:07 +00:00
adisbladis
5ca1c4007e
libu2f-host: 1.1.1 -> 1.1.4 2017-11-26 18:56:56 +08:00
Tuomas Tynkkynen
3b21645529 usbredir: Fix ARM build 
The error from -Wformat happens on all 32-bit plaforms, not just i686.
 2017-11-26 11:13:20 +02:00
Tuomas Tynkkynen
f689a6d1c6 snappy: 1.1.4 -> 1.1.7 
Fixes build on ARM
 2017-11-26 11:13:20 +02:00
Orivej Desh
9d2fcd33ea agg: do not enable parallel building 2017-11-26 07:40:21 +00:00
adisbladis
d1c525bc49
Merge pull request #32043 from ck3d/fix-missing-x11-in-vaapi-intel 
vaapi-intel: fix missing depency to get X11 backend
 2017-11-26 12:32:19 +08:00
Jan Tojnar
4920d4fff2
glib: recognize NIX_GSETTINGS_OVERRIDES_DIR variable 
For some reason, the GNOME 3.26 update broke the overrides. It turns
out the overrides now need to come before the overridden schemas in the
XDG_DATA_DIRS variable. This is not possible in general due to applications
prefixing the variable (e.g. in wrapGAppsHook).

To fix this, a new environment variable NIX_GSETTINGS_OVERRIDES_DIR
was introduced. It has greater priority than XDG_DATA_DIRS but lower
than GSETTINGS_SCHEMA_DIR. A separate variable was chosen in order not
to block the built-in one for users.
 2017-11-26 03:11:00 +01:00
Jan Tojnar
5a4320ab59
gnome3: get rid of extraneous NIX_CFLAGS_COMPILE 2017-11-26 03:10:53 +01:00