Commit Graph
100 Commits
Author SHA1 Message Date
Tuomas Tynkkynen 7194179854 bash: Remove unnecessary 'Makefile.inc' that is keeping reference to bootstrap-tools
The file is an example makefile for developing bash plugins, and
contains stuff like:

````
example:	example.o
	$(SHOBJ_LD) $(SHOBJ_LDFLAGS) $(SHOBJ_XLDFLAGS) -o $@ example.o $(SHOBJ_LIBS)
````

So no package is really going to depend on that, and it's making the
.dev output keep a reference to the bootstrap tools. Just nuke it.
2017-04-26 13:19:51 +03:00
Tuomas Tynkkynen c90998d5cf Revert "rustc: don't build on i686"
This reverts commit 9f86136cef.

Rust is nowadays required for building Firefox, so the channel updates
are blocked on this.

(It also builds fine for me.)
2017-04-24 21:25:02 +03:00
Tuomas Tynkkynen 9437c36f19 perlPackages.ModuleBuild: 0.4214 -> 0.4222 2017-04-24 20:31:36 +03:00
Tuomas Tynkkynen 0537320062 networkmanager: Temporarily disable -Wformat-security until next release
Reportedly this is due to GLib 2.52 which added a G_GNUC_PRINTF attribute to
g_dbus_message_new_method_error().
2017-04-24 20:01:22 +03:00
Tuomas Tynkkynen cf3800b38c Merge remote-tracking branch 'upstream/staging' into master 2017-04-24 19:25:38 +03:00
Tuomas Tynkkynen 84982c28de Merge remote-tracking branch 'upstream/master' into staging 2017-04-24 15:04:43 +03:00
Tuomas Tynkkynen 814772e93e Revert "patchutils: 0.3.3 -> 0.3.4"
This reverts commit d550c90712.

This changes the output of filterpatch thus affects hashes of any
fetchpatch calls in nixpkgs:

https://github.com/NixOS/nixpkgs/issues/25154
2017-04-23 21:46:35 +03:00
Tuomas Tynkkynen f3b1d6925e Revert "patchutils: Drop patch applied upstream"
This reverts commit 1e1b68b4a0.
2017-04-23 21:46:29 +03:00
Tuomas Tynkkynen 28f87e4141 stdenv: ARM bootstrap: Update bootstrap tarballs to latest hydra-built ones
Fixes sandboxed build of glibc. Discussion about a similar failure on aarch64 at:
https://github.com/NixOS/nixpkgs/commit/8bfa9f528c88243578246798c7c2ddde045e0de0.

Picked from the following cross-trunk evaluation:
http://hydra.nixos.org/eval/1349278 based on nixpkgs
commit 1f32d4b4eb.

armv5tel job: http://hydra.nixos.org/build/51569718
armv6l job: http://hydra.nixos.org/build/51569717
armv7l job: http://hydra.nixos.org/build/51569713
2017-04-15 01:52:33 +03:00
Tuomas Tynkkynen 1f32d4b4eb make-bootstrap-tools.nix: Fix bzip2
Apparently our native bzip2 builds switched to using dynamic libraries at some point.
2017-04-13 17:22:55 +03:00
Tuomas Tynkkynen 0d86c0692f gawk: Disable tests that don't work in sandbox 2017-04-11 23:37:31 +03:00
Tuomas Tynkkynen 1e1b68b4a0 patchutils: Drop patch applied upstream 2017-04-11 23:13:28 +03:00
Tuomas Tynkkynen e4b48c7186 libsigsegv: Remove aarch64 patch, enable tests
The aarch64 patch has been applied upstream. Let's hope that the new
release fixes the tests as well.
2017-04-11 14:01:34 +03:00
Tuomas Tynkkynen 7f8202bf83 Fix tarball evaluation
http://hydra.nixos.org/build/51460386

This seems the path of least resistance. Adding "x86_64-darwin" to
supportedSystems causes other errors.
2017-04-11 13:45:29 +03:00
Tuomas Tynkkynen 1ccd871fde procps: 3.3.11 -> 3.3.12 2017-04-11 13:00:56 +03:00
Tuomas Tynkkynen d550c90712 patchutils: 0.3.3 -> 0.3.4 2017-04-11 13:00:56 +03:00
Tuomas Tynkkynen 8eb25e1245 lzo: 2.09 -> 2.10 2017-04-11 13:00:56 +03:00
Tuomas Tynkkynen 6b84ee9f96 lzma: 5.2.2 -> 5.2.3 2017-04-11 13:00:56 +03:00
Tuomas Tynkkynen 72b2cbe3b7 libsigsegv: 2.10 -> 2.11 2017-04-11 13:00:56 +03:00
Tuomas Tynkkynen 5de624e437 gmp: 6.1.1 -> 6.1.2 2017-04-11 13:00:56 +03:00
Tuomas Tynkkynen c7e1a25765 gawk: 4.1.3 -> 4.1.4 2017-04-11 13:00:56 +03:00
Tuomas Tynkkynen 52797fc600 Merge remote-tracking branch 'upstream/master' into staging 2017-04-11 12:58:43 +03:00
Tuomas Tynkkynen b002d6a868 Revert "btrfs-progs: 4.8.2 -> 4.10.2"
This reverts commit c0cef0425e.

The output of the command-line tool has changed somewhat and at least
nixos-generate-config.pl needs modifications to match. I'm leaving that
to someone who knows a bit more about btrfs.

Issue #24810.
2017-04-11 09:54:43 +03:00
Tuomas Tynkkynen 9ae8ce813e dosfstools: Use --enable-compat-symlinks
http://hydra.nixos.org/build/51461475
2017-04-11 09:37:45 +03:00
Tuomas Tynkkynen c0cef0425e btrfs-progs: 4.8.2 -> 4.10.2 2017-04-10 17:09:22 +03:00
Tuomas Tynkkynen 199be99c6f dosfstools: 3.0.28 -> 4.1 2017-04-10 17:09:22 +03:00
Tuomas Tynkkynen 183279002d f2fs-tools: 1.7.0 -> 1.8.0 2017-04-10 17:09:22 +03:00
Tuomas Tynkkynen c334daa5c2 f2fs-tools: Cleanup a bit 2017-04-10 17:09:22 +03:00
Tuomas Tynkkynen a05959e191 Merge remote-tracking branch 'upstream/master' into staging 2017-04-10 01:41:49 +03:00
Tuomas Tynkkynen b64163a90d bonnie: 1.97 -> 1.97.3 2017-04-10 01:16:39 +03:00
Tuomas Tynkkynen 1b94c30beb fio: 2.17 -> 2.19 2017-04-09 22:34:19 +03:00
Tuomas Tynkkynen d284082b9f yle-dl: 2.11 -> 2.15 2017-04-09 22:17:16 +03:00
Tuomas Tynkkynen a7b572805c strace: 4.15 -> 4.16 2017-04-09 21:48:25 +03:00
Tuomas Tynkkynen aef593fcbf picocom: 2.1 -> 2.2 2017-04-09 21:48:25 +03:00
Tuomas Tynkkynen 1f625ce93e ntfs3g: 2016.2.22 -> 2017.3.23 2017-04-09 21:48:25 +03:00
Tuomas Tynkkynen 64306e29d7 less: 481 -> 487 2017-04-09 21:48:25 +03:00
Tuomas Tynkkynen 15efefa832 lcov: 1.12 -> 1.13 2017-04-09 21:48:25 +03:00
Tuomas Tynkkynen 997b77cd38 iperf: 3.1.3 -> 3.1.7 2017-04-09 21:48:25 +03:00
Tuomas Tynkkynen 6be6396804 i2c-tools: 3.1.1 -> 3.1.2 2017-04-09 21:48:25 +03:00
Tuomas Tynkkynen caccd11442 dtc: 1.4.2 -> 1.4.4 2017-04-09 21:48:25 +03:00
Tuomas Tynkkynen affce1e246 nixos hibernate test: Use waitForOpenPort
There was one confusing recent failure of this:

http://cache.nixos.org/log/myla8bc17j8spmifdxmrz9jswxwsf5w6-vm-test-run-hibernate.drv

I don't have any real ideas on what could cause the problem but there is
at least one theoretical one: the system starts hibernating before the
listener process manages to open the TCP port for listening, and it can't
open it after resuming because not enough pages from the netcat binary
have been paged in (and as the 9p filesystem holding it is now toast,
they can't be loaded anymore).
2017-04-02 02:33:21 +03:00
Tuomas Tynkkynen b65dc619f0 xfstests: Fixes 2017-04-01 19:50:09 +03:00
Tuomas Tynkkynen 097373e691 xfstests: Fix homepage 2017-04-01 19:43:05 +03:00
Tuomas Tynkkynen ba360f90f9 xfstests: Enable parallel build 2017-04-01 19:42:41 +03:00
Tuomas Tynkkynen 197bbe0e1b xfstests: 2016-08-26 -> 2017-03-26 2017-04-01 19:42:01 +03:00
Tuomas Tynkkynen 4df59beb01 fontconfig_210: Remove reference to obsolete patch
Commit 9b049849bf deleted the patch file
(and reference to it from fontconfig default.nix), but left the one in
2.10.nix which break evaluation.

As the package seems to build fine without the patch, just remove the
reference.

cc @ttuegel in case this was not the correct thing to do.
2017-03-30 23:19:45 +03:00
Tuomas Tynkkynen adb460b30f mesa: Enable imx gallium driver on ARM
And lighten the aarch64 build by disabling drivers for hardware that
doesn't run on aarch64 processors.
2017-03-30 02:56:10 +03:00
Tuomas Tynkkynen 49f1abec15 U-Boot: 2017.01 -> 2017,03 2017-03-30 02:56:02 +03:00
Tuomas Tynkkynen 186cc512a6 freicoin: Fix eval 2017-03-25 02:12:14 +02:00
Tuomas Tynkkynen 60788745c9 channel.nix: Use filterSource to exclude unnecessary files from nixpkgs
Currently, if you try to build a NixOS config including channel.nix, e.g.:

nix-build -I nixpkgs=. -I nixos-config=nixos/modules/installer/cd-dvd/installation-cd-minimal.nix nixos -A config.system.build.isoImage

twice in a row, you end up with two different build results. This is
caused by the 'result' symlink of the first build affecting the channel
contents of the second build.

If we use filterSource with a predicate that ignores the 'result'
symlinks, the problem is gone. Do the same thing for VIM/Emacs
swap/backup files to avoid even more 'spurious' rebuilds.

Additionally, filter out the '.git' directory at the same time, as we
'rm -rf' it from the result anyway. This avoids a considerable amount of
unnecessary file I/O copying and deleting the .git directory.
2017-03-25 01:42:28 +02:00
Tuomas Tynkkynen 74c4e30842 Revert "nixos: build for aarch64-linux"
This reverts commit b806e25d65.

This seems to push Hydra's memory usage out of the roof fail nixos
evaluating with:

Too many heap sections: Increase MAXHINCR or MAX_HEAP_SECTS

Let's revert this for now. It's not a big deal at all since the
nixpkgs-unstable jobset is still building the packages.
2017-03-20 10:30:51 +02:00
Tuomas Tynkkynen addffa41b4 kmscube: 2016-09-19 -> 2017-03-19 2017-03-20 07:27:57 +02:00
Tuomas Tynkkynen 72dc9c7f80 Merge remote-tracking branch 'upstream/master' into staging 2017-03-20 07:07:03 +02:00
Tuomas Tynkkynen 93446a2060 release.nix: Don't block release on aarch64 failures 2017-03-20 06:37:01 +02:00
Tuomas Tynkkynen 2e91b2d585 default.nix: Provide correct instructions how to upgrade Nix
Supersedes #17631.
2017-03-18 21:04:07 +02:00
Tuomas Tynkkynen cba956152f perl-packages: Fix syntax error 2017-03-18 20:09:53 +02:00
Tuomas Tynkkynen 5658324d82 neovim: Fix eval error
Not sure at all if this is the right thing to do. cc @edanaher
2017-03-18 20:01:15 +02:00
Tuomas Tynkkynen 194ff8a538 gcc-snapshot: Fix eval error 2017-03-18 19:58:45 +02:00
Tuomas Tynkkynen 3c57a37c55 sbt_0_12_4: Fix eval 2017-03-15 23:44:25 +02:00
Tuomas Tynkkynen 20d9edff17 stdenv: aarch64: Update bootstrap tarballs
Hopefully fixes sandboxed build of glibc on aarch64, as discussed on
https://github.com/NixOS/nixpkgs/commit/8bfa9f528c88243578246798c7c2ddde045e0de0.

Picked from the following cross-trunk evaluation:
http://hydra.nixos.org/eval/1341395 based on nixpkgs
commit bb3ef8a95c.

build job: http://hydra.nixos.org/build/50125932

(busybox's hash not changing is not a bug!)
2017-03-15 19:17:52 +02:00
Tuomas Tynkkynen aba0b45b86 Merge remote-tracking branch 'upstream/master' into staging
Conflicts:
      pkgs/development/libraries/qt-5/5.7/qtbase/default.nix
2017-03-14 00:49:22 +02:00
Tuomas Tynkkynen dff0ba38a2 bash: Set bash_cv_getcwd_malloc=yes when cross compiling
Because if you don't, the configure script assumes that your getcwd()
function is broken. Which then makes bash use it's own getcwd()
implementation, which doesn't work if the path to the current directory
contains bind mounts in its paths. This shows up as:

shell-init: error retrieving current directory: getcwd: cannot access parent directories: Bad file descriptor

... and fails the aarch64 glibc build with sandboxes enabled.

Sigh.
2017-03-14 00:33:29 +02:00
Tuomas Tynkkynen b2c96062ca kernel: Add a validity check for modDirVersion
Because if you get it wrong, you get a very confusing error message at
the end of the kernel build, which is quite painful as the build can
take a long time.
2017-03-13 18:47:21 +02:00
Tuomas Tynkkynen a241abf603 Revert "stdenv: aarch64 is also ARM"
This reverts commit a5f4e22289.

Breaks the stdenv build, e.g.: http://hydra.nixos.org/build/50015717
In general, the architectures are different enough that there is no
reason to consider both as ARM, just like we don't consider x86_64 as
32-bit x86.

cc @fpletz
2017-03-11 15:57:51 +02:00
Tuomas Tynkkynen 8d3c35ad02 SDL2_gfx: Fix non-x86 build 2017-03-11 02:37:00 +02:00
Tuomas Tynkkynen 77c49794cd linux_testing: 4.10-rc7 -> 4.11-rc1
Some config options got removed, so conditionalize them.
2017-03-11 01:27:06 +02:00
Tuomas Tynkkynen 2b450377bf boost155: Not supported on aarch64 2017-03-10 20:06:34 +02:00
Tuomas Tynkkynen c863aa384e cdparanoia: Fix aarch64 build
Hooray for autohelltools actually reducing portability!
2017-03-10 19:39:40 +02:00
Tuomas Tynkkynen 5bb99ca0f6 simavr: Disable parallel build
http://hydra.nixos.org/build/49945319/nixlog/1/raw
2017-03-10 01:57:59 +02:00
Tuomas Tynkkynen e7ce27f9ce john: Disable parallel build
http://hydra.nixos.org/build/49940032/nixlog/1/raw
2017-03-10 01:48:53 +02:00
Tuomas Tynkkynen fe20a32751 pshs: 0.3 -> 0.3.1, fix source location 2017-03-10 01:20:22 +02:00
Tuomas Tynkkynen dc94d1a2b5 release.nix: Fix another typo 2017-03-09 03:38:04 +02:00
Tuomas Tynkkynen 1508945755 treewide: Fix eval-release.nix for aarch64 2017-03-09 03:38:04 +02:00
Tuomas Tynkkynen 9188f2ed8a release.nix: Fix typo 2017-03-08 21:35:31 +02:00
Tuomas Tynkkynen 5f5b87107f raspberrypifw, linux_rpi: 1.20161020 -> 1.20170303 2017-03-08 21:35:31 +02:00
Tuomas Tynkkynen 8dce538640 gtkglextmm: Mark as broken
No release since 2010. Build broken. Sounds like a library, but no
users. GNOME 2 stuff.

http://hydra.nixos.org/build/49554500/nixlog/3
2017-03-08 20:15:36 +02:00
Tuomas Tynkkynen a3a21a7245 delve: Disable on i686 2017-03-08 20:10:06 +02:00
Tuomas Tynkkynen 413bc03986 mess: Mark broken
Even fixing the source urls doesn't make it build.
2017-03-08 16:14:19 +02:00
Tuomas Tynkkynen c8402dde15 libp11: Fetch src from GitHub 2017-03-08 15:31:34 +02:00
Tuomas Tynkkynen a9a706770a grub2: Make EFI grub work on aarch64 2017-03-07 16:11:41 +02:00
Tuomas Tynkkynen 064a1e09ad sbagen: Fix build 2017-03-06 17:13:24 +02:00
Tuomas Tynkkynen 57c6fac3e9 kernel config: Enable IP_MULTICAST
This is lacking on ARM and causes libuv tests to fail.
2017-03-04 12:49:50 +02:00
Tuomas Tynkkynen 2552b034ab unionfs-fuse: Use fetchFromGitHub 2017-03-04 02:14:22 +02:00
Tuomas Tynkkynen 1254f1a46a gf2x: Disable i686 build
http://hydra.nixos.org/build/49552136/nixlog/3/raw
2017-03-03 00:21:47 +02:00
Tuomas Tynkkynen 439facec2a lkl: Broken on i686
http://hydra.nixos.org/build/49534265
2017-03-02 03:59:31 +02:00
Tuomas Tynkkynen ce56c99edc mkDerivation: Don't pass buildInputs to stdenv builder in nativeBuildInputs
When not cross compiling, nativeBuildInputs and buildInputs have
identical behaviour. Currently that is implemented by having
mkDerivation do a concatenation of those variables in Nix code and pass
that to the builder via the nativeBuildInputs attribute.

However, that has some annoying side effects, like `foo.buildInputs`
evaluating to `[ ]` even if buildInputs were specified in the nix
expression for foo.

Instead, pass buildInputs and nativeBuildInputs in separate variables as
usual, and move the logic of cross compilation vs. native compilation to
the stdenv builder script. This is probably a tiny bit uglier but
fixes the previous problem.

Issue #4855.
2017-03-02 03:26:48 +02:00
Tuomas Tynkkynen 256e764226 radeontools: Mark as broken
The upstream release is from 2004. The website of this software talks
about configuring XFree86. I *highly* doubt this software is of any use
nowadays.
2017-03-02 02:30:00 +02:00
Tuomas Tynkkynen 8dcfa44a53 memtest86: Mark as broken
It fails with hardening-related errors like:

reloc.o: In function `.L41':
reloc.c:(.text+0x452): undefined reference to `__stack_chk_fail_local'

... and several others as well!

Since nobody has noticed that this package has been broken the entire
16.09 release, it's probably not worth to try fixing it.

(Note that this is a different package from memtest86plus!)
2017-03-01 22:19:35 +02:00
Tuomas Tynkkynen 0495b34782 trinity: Apply upstream commit as a patch to fix build
Needed since glibc 2.25.
2017-03-01 18:03:30 +02:00
Tuomas Tynkkynen 78d9414ce5 findutils: Fix cross compilation
Yes, setting crossAttrs.propagatedBuildInputs is the correct value to
set to override a buildInputs from the native drv!
2017-02-27 00:15:53 +02:00
Tuomas Tynkkynen fee43308ed platforms.nix: Remove unnecessary kernelExtraConfig for ARMv7
AHCI_IMX is already enabled in multi_v7_defconfig since kernel 4.9.
2017-02-20 15:22:14 +02:00
Tuomas Tynkkynen e5e1bdca53 firefox, thunderbird: Use common-updater/update-source-version script
Replace the custom patching code with the common script.

Also use callPackage and makeBinPath
2017-02-19 16:51:17 +02:00
Tuomas Tynkkynen 9483359887 linuxPackages.tp_smapi: Use common-updater/update-source-version script
This way we have the benefit of the usual Nixpkgs style, and gain a
slight reduction in amount of code in the updater.

Also use callPackage to reduce duplication of the dependencies of the
update script and use makeBinPath to make things neater.
2017-02-19 16:51:17 +02:00
Tuomas Tynkkynen b53c53b1b4 maintainers: Add script to patch version/sha256 in .nix files
Adds a script to help automatically upgrading packages: this one can
patch name/version attributes like:
    version = "50.1.0";
    name = "bc-1.06";
... to the given version, and updates the sha256 hash to match.

Usage is:

update-source-version <attr> <new-version> [<new-source-hash>]

where:
    - attr is the attribute path of the package
    - new-version is the version string to be patched in
    - new-source-hash is the optional sha256/etc. hash of the source.
      If not given, the script will automatically calculate it.

This is added to a subdirectory where other useful scripts can be added
in the future, like figuring out the newest version from a git repo or
GitHub releases etc.
2017-02-19 16:51:17 +02:00
Tuomas Tynkkynen da1f93f445 mesa: Remove obsolete patching
The code we're patching was removed in 2015:

http://comments.gmane.org/gmane.comp.video.mesa3d.devel/102524
2017-02-16 01:29:42 +02:00
Tuomas Tynkkynen 4d54324f7c mesa: 13.0.4 -> 17.0.0
Also enable the etnaviv driver on ARM, which got added in this release
(and I've confirmed that it can run glmark2 relatively successfully).
2017-02-16 01:29:42 +02:00
Tuomas Tynkkynen 2000f0941e nixos-rebuild: Don't build nixos-rebuild with --fast 2017-02-13 21:52:32 +02:00
Tuomas Tynkkynen 23fee8bfbd nixos-rebuild: Support passing e.g. '-j8'
Where there is no space between '-j' and the number.
2017-02-13 21:52:30 +02:00
Tuomas Tynkkynen 9e04b57dde nixos top-level: Add 'dtbs' symlink when kernel uses device trees
Currently e.g. extlinux-conf-builder.sh uses
`readlink -m "$toplevel/kernel/../dtbs"` to figure out the directory.
That is obscenely ugly.
2017-02-12 15:47:49 +02:00
Tuomas Tynkkynen 20578372e1 U-Boot: Fix ubootBananaPi & ubootPcduino3Nano by adding python2
Also enable parallel building.
2017-02-11 15:53:01 +02:00