1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-04 19:45:54 +00:00
Commit graph

121709 commits

Author SHA1 Message Date
Will Dietz 3d4aa7e95d qemu: workaround 'struct sysinfo' conflict musl <--> linux
Most everyone using musl patches the linux headers instead,
but various software uses a local workaround like the
one added in this commit (psutils, for example).

It's not obvious to me which project has the "bug",
and I'm reluctant to even propose modifying our headers
without clear answer on the issue.

Also, modifying those headers triggers rebuild-all-the-things.

Hopefully upstream projects sort this out, in the meantime
adding this define is a bit of a kludge but does the job.

-------

For the curious, the patch usually is something like this:
https://patchwork.kernel.org/patch/3833241/

Here's an updated version that also ensures
kernel users get the sysinfo struct as expected too:
https://raw.githubusercontent.com/openwrt/openwrt/e3c43ade0bae9491aeea50fa361e846bb5002dc0/target/linux/generic/pending-4.14/270-uapi-kernel.h-glibc-specific-inclusion-of-sysinfo.h.patch

(cherry picked from commit dtzWill/nixpkgs@91b5f5a463)
2018-04-26 17:58:16 +02:00
xeji 3e3b39f173 qemu: 2.11.1 -> 2.12.0 2018-04-26 01:41:53 +02:00
Jörg Thalheim 18da50d8d3
Merge pull request #39503 from veprbl/pr/sacrifice_darwin_fix
sacrifice: fix runtime on darwin
2018-04-25 22:22:19 +01:00
Jörg Thalheim a21607c47d
Merge pull request #39485 from sorki/ipmicfg_patchelf
ipmicfg: fix patchelf args
2018-04-25 22:21:37 +01:00
Jörg Thalheim c3e137e7cb rubycop: 0.47.0 -> 0.55.0 2018-04-25 22:15:44 +01:00
Matthew Justin Bauer 160d9ed652
Merge pull request #36055 from ryantm/auto-update/thin-provisioning-tools-0.6.3-to-0.7.5
thin-provisioning-tools: 0.6.3 -> 0.7.5
2018-04-25 14:48:56 -05:00
Matthew Justin Bauer a4a2626cd9
Merge pull request #35280 from markus1189/logkeys
Logkeys: Update and add `device` option to service
2018-04-25 14:48:29 -05:00
Matthew Justin Bauer edf5548958
Merge pull request #35201 from xurei/app/postman
postman : 5.5.2 -> 5.5.3
2018-04-25 14:47:43 -05:00
Matthew Justin Bauer fb836946de
Merge pull request #35187 from xurei/app/yarssr
yarssr: init at git-2017-12-01
2018-04-25 14:47:08 -05:00
John Ericson ba52ae5048 treewide: isArm -> isAarch32
Following legacy packing conventions, `isArm` was defined just for
32-bit ARM instruction set. This is confusing to non packagers though,
because Aarch64 is an ARM instruction set.

The official ARM overview for ARMv8[1] is surprisingly not confusing,
given the overall state of affairs for ARM naming conventions, and
offers us a solution. It divides the nomenclature into three levels:

```
ISA:             ARMv8   {-A, -R, -M}
                 /    \
Mode:     Aarch32     Aarch64
             |         /   \
Encoding:   A64      A32   T32
```

At the top is the overall v8 instruction set archicture. Second are the
two modes, defined by bitwidth but differing in other semantics too, and
buttom are the encodings, (hopefully?) isomorphic if they encode the
same mode.

The 32 bit encodings are mostly backwards compatible with previous
non-Thumb and Thumb encodings, and if so we can pun the mode names to
instead mean "sets of compatable or isomorphic encodings", and then
voilà we have nice names for 32-bit and 64-bit arm instruction sets
which do not use the word ARM so as to not confused either laymen or
experienced ARM packages.

[1]: https://developer.arm.com/products/architecture/a-profile
2018-04-25 15:28:55 -04:00
Matthew Justin Bauer e40213ed24
Merge pull request #39183 from r-ryantm/auto-update/xpra
xpra: 2.2.5 -> 2.2.6
2018-04-25 14:28:51 -05:00
Dmitry Kalinkin c1f45f76ad
sacrifice: fix runtime on darwin 2018-04-25 14:58:23 -04:00
Daiderd Jordan 5eea946c25
Merge pull request #39492 from LnL7/vim-nix
vim-nix: 2018-04-15 -> 2018-04-24
2018-04-25 20:09:29 +02:00
Will Dietz d6ca2d38a1
Merge pull request #39497 from dtzWill/update/lsof-4.91
lsof: 4.90 -> 4.91
2018-04-25 13:09:05 -05:00
Jan Tojnar 0009ae3d5e
onboard: fix missing typelibs 2018-04-25 19:55:39 +02:00
Will Dietz 30357e203a lsof: 4.90 -> 4.91 2018-04-25 12:53:37 -05:00
Daiderd Jordan 43c837b578
Merge pull request #39475 from hedning/nix-completions-bump
nix-zsh-completions: 0.3.8 -> 0.3.9 ,  nix-bash-completions: 0.6.5 -> 0.6.6
2018-04-25 18:51:06 +02:00
Daiderd Jordan e609551090
vim-nix: 2018-04-15 -> 2018-04-24 2018-04-25 18:48:16 +02:00
Vincent Laporte 5c4ee2a3ab ocaml: init at 4.07.0+beta2 2018-04-25 18:19:57 +02:00
Vincent Laporte c4b7bbf77e ocamlPackages.findlib: 1.7.3 -> 1.8.0 2018-04-25 18:19:27 +02:00
Michael Raskin a1349f0a3b
Merge pull request #39486 from dtzWill/fix/musl-provide-iconv-tool
musl: provide 'iconv' utility like other libc's
2018-04-25 15:42:26 +00:00
aszlig 6c748ae749
inkscape: Fix build on NixOS
The first problem that was introduced in a276d5160c
was a linking error:

ld: cannot find -licui18n
ld: cannot find -licuuc
ld: cannot find -licudata

So I added icu to the buildInputs.

The second problem was that the interpreter wasn't patched in
share/filters, apparently this is only needed when building with
autotools:

make[3]: Entering directory '/build/inkscape-0.92.3/share/filters'
./i18n.py ./filters.svg > ./filters.svg.h
./i18n.py: /usr/bin/env: bad interpreter: No such file or directory

A similar error also occurs for share/palettes, share/patterns,
share/symbols and share/templates, so I added patching the interpreter
there as well.

Switching to autotools in Inkscape is a very bad idea, because upstream
currently still has their own autotools files in the 0.92.x tree but
master already has them removed, see this commit:

e471a664f9

However for the sake of trying to not break Inkscape on Darwin again,
I tried to keep the fixes minimal and not went back to CMake.

I did however mark the stuff that's unneeded for CMake, so that we can
avoid forgetting to remove that crap once we get back to CMake.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @matthewbauer
2018-04-25 17:09:04 +02:00
Will Dietz 542f3dba06
Merge pull request #39414 from dtzWill/update/ngx_brotli-0.1.1
ngx_brotli: -> 0.1.1
2018-04-25 09:34:55 -05:00
Richard Marko ec371a5d98 ipmicfg: fix patchelf args 2018-04-25 16:08:05 +02:00
Will Dietz e1235e0fb6
Merge pull request #39484 from dtzWill/update/radiotray-ng-0.2.2
radiotray-ng: 0.2.1 -> 0.2.2
2018-04-25 09:03:27 -05:00
Jan Tojnar 0dec4fa1db
rarian: merge gnome{2,3}.rarian 2018-04-25 15:53:26 +02:00
Will Dietz 2236f418f5 radiotray-ng: disable tests, they now want to download unconditionally 2018-04-25 08:38:36 -05:00
Will Dietz 4f16b36fed radiotray-ng: 0.2.1 -> 0.2.2
https://github.com/ebruck/radiotray-ng/releases/tag/v0.2.2
2018-04-25 08:32:49 -05:00
Will Dietz 558f7424f2 musl: make libc -> {ldso,ldd} symlinks relative
Minor touchup while rebuilding things anyway.
2018-04-25 08:22:16 -05:00
Will Dietz 2d54f8f915 musl: build iconv using just-built pieces
This is a bit unusual for a package,
but not libc's as they should stand alone.
2018-04-25 08:18:07 -05:00
Jan Tojnar 4340a1582f
pitivi: 0.96 → 0.99 2018-04-25 15:14:17 +02:00
Will Dietz 97698b0d6d musl-stdenv: don't add special allowance for libiconv 2018-04-25 08:08:47 -05:00
aszlig a3502ba765
gn: Add libc++ and libc++abi from third_party
On GNU/Linux the build references these files, so let's fetch them from
the Chromium repository. I haven't checked whether they are heavily
patched or whether we can use the version from LLVM, but when looking at
the changes, they do seem to divert a bit from upstream LLVM.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @matthewbauer, @stesie
2018-04-25 15:01:41 +02:00
aszlig ac61ae50b7
gn: Switch to fetchzip for apple_apsl directory
The tarball from upstream seems to be generated on the fly, so the
output is not deterministic and using fetchzip makes this more reliable
as we have a recursively hashed output path without any of the
non-determinisms in tarballs.

Unfortunately, the build still fails on NixOS systems, because we need a
few more stuff in the build tree.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @matthewbauer, @stesie
2018-04-25 15:01:38 +02:00
Rodney Lorrimar ca7d983999 buildkite-agent3: init at 3.0.1 (#39471)
New stable release. Version 2.6 is kept for backwards compatibility.

https://github.com/buildkite/agent/releases/tag/v3.0.0
https://github.com/buildkite/agent/releases/tag/v3.0.1
2018-04-25 13:47:26 +01:00
Lancelot SIX 8d58b1a0a0
Merge pull request #39360 from lsix/update_motu
motuclient: 1.4.00 -> 1.5.00
2018-04-25 11:46:19 +02:00
Peter Simons 1d0a71879d haskell-brick: update override for ghc 8.4.x 2018-04-25 11:43:57 +02:00
Peter Simons 33e046271a haskell-vector-sized: update override 2018-04-25 11:43:56 +02:00
Peter Simons 7724ead286 haskell-{hlint,hoogle}: drop obsolete overrides 2018-04-25 11:43:56 +02:00
Peter Simons a49dca6821 haskell-monad-logger: drop obsolete override 2018-04-25 11:43:56 +02:00
Peter Simons 93b3240930 all-cabal-hashes: update to latest version 2018-04-25 11:43:55 +02:00
Peter Simons 46cce6ef99 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.9.2-6-g7882850 from Hackage revision
5dcdcbfee8.
2018-04-25 11:43:49 +02:00
Peter Simons c60a874ef5 LTS Haskell 11.6 2018-04-25 11:28:16 +02:00
Tor Hedin Brønner 954e02f835 nix-bash-completions: 0.6.5 -> 0.6.6 2018-04-25 11:19:51 +02:00
Tor Hedin Brønner 2848b5db7d nix-zsh-completions: 0.3.8 -> 0.3.9 2018-04-25 11:16:06 +02:00
Jörg Thalheim ab5e6073d9
Merge pull request #39436 from LnL7/vim-ft-nix
vim_configurable: replace default ftNix patch with sources from vim-nix
2018-04-25 08:36:36 +01:00
Dmitry Kalinkin 31e9e752ae fio: 3.5 -> 3.6, enable on darwin (#39452) 2018-04-25 08:16:13 +01:00
Matthew Justin Bauer 42c87d4716
Merge pull request #39439 from Ma27/fix-free-clementine-plugin-path
clementine: each output should hav a wrapped `GST_PLUGIN_SYSTEM_PATH_1_0`
2018-04-25 00:41:55 -05:00
Frederik Rietdijk 304c3ebc6d
Merge pull request #39285 from florianjacob/synapse
matrix-synapse: 0.27.2 -> 0.27.4
2018-04-25 07:41:29 +02:00
Frederik Rietdijk fbd169ae5f
Merge pull request #39158 from catern/dataclass
pythonPackages.dataclasses: init at 0.5
2018-04-25 07:39:29 +02:00