Commit graph

39108 commits

Author SHA1 Message Date
John Ericson b53b8639a6 Merge remote-tracking branch 'upstream/master' into staging 2018-09-26 15:55:00 -04:00
Matthew Bauer 07cc937d60
Merge pull request #45934 from utdemir/master
bluejeans-gui: init at 1.6.39
2018-09-26 13:26:53 -05:00
Amin Bandali 4586ff7395 alloy: add alloy5 and take maintainership (#47262)
Add alloy5 (currently, 5.0.0.1), update homepage and downloadPage, and
take maintainership of the package.
2018-09-26 17:46:58 +01:00
John Ericson e2a2073011 Merge remote-tracking branch 'upstream/master' into staging 2018-09-26 11:23:18 -04:00
aszlig 593062ddc2
fetchFromGitLab: Fix grouping issue for group arg
Issue introduced by c3612b97e6.

Example output before that commit (witch a random package using
fetchFromGitLab):

$ nix-instantiate --eval -A hiawatha.src.urls
[ "https://gitlab.com/api/v4/projects/hsleisink%2Fhiawatha/repository/archive.tar.gz?sha=v10.8.1" ]

After the commit:

$ nix-instantiate --eval -A hiawatha.src.urls
[ "https://gitlab.com/api/v4/projects/%2Fhsleisink%2Fhiawatha/repository/archive.tar.gz?sha=v10.8.1" ]

And with this very commit, which fixes the issue:

$ nix-instantiate --eval -A hiawatha.src.urls
[ "https://gitlab.com/api/v4/projects/hsleisink%2Fhiawatha/repository/archive.tar.gz?sha=v10.8.1" ]

The problem was that it has used optionalString in conjunction with "+",
so the optionalString only applied to the left-hand side of the +
operator.

Thanks to @ryantm for reporting the issue at:

c3612b97e6 (r220576764)

Signed-off-by: aszlig <aszlig@nix.build>
Reported-by: Ryan Mulligan <ryan@ryantm.com>
2018-09-26 16:17:18 +02:00
Roman Volosatovs eb7b217182 go-2fa: Init at 1.1.0 2018-09-26 11:36:02 +02:00
volth 92a9c5ac7d net_snmp: build with default perl (#47373) 2018-09-26 08:51:22 +02:00
Will Dietz a0248a0b68
Merge pull request #47365 from dtzWill/feature/matrix-clients
spectral: init at 2018-09-24; nheko: 0.5.0 -> 0.6.0 and bump dep mtxclient
2018-09-25 22:14:29 -05:00
xeji 14a1907afa
Merge pull request #47358 from volth/perl-dev
perl: add devel version at 5.29.3
2018-09-26 00:20:07 +02:00
aszlig 65d0b082f3
Merge Paperwork update to version 1.2.4 (#46487)
Thanks to @symphorien for this work, which apart from the update itself
includes a few more fixes and cleanups.

I've tested building and running the upgraded Paperwork and while I
haven't done extensive testing on every little feature it seems to work
so far.

The changes also include an addition to fetchFromGitLab, which allows to
specify a group.

Merges: #46487
2018-09-25 23:13:08 +02:00
xeji 4ad424fbd6
qboot: 20150603 -> 20170330, fix build (#47364)
Switch back to original upstream project which is more recent
than the fork we used.
2018-09-25 22:32:46 +02:00
John Ericson 26272e52a0
Merge pull request #47362 from obsidiansystems/ghc-sphinx
ghc: Sphinx is a build-time dependency
2018-09-25 16:31:11 -04:00
John Ericson 21c2437cc6 ghc: Sphinx is a build-time dependency 2018-09-25 16:29:03 -04:00
Will Dietz 3ede6674a6 spectral: init at 2018-09-24
* needs at least qtgraphicaleffects not mentioned in docs
* doesn't want to use our libqmatrixclient, so let it use bundled
* took a few runs (or perhaps just patience with one) to populate,
  when my profile icon appeared it seemed ready-- then click it
  to see list of rooms and such.
2018-09-25 15:13:15 -05:00
volth 06faf5cc5c perl: add devel version at 5.29.3 2018-09-25 19:51:20 +00:00
John Ericson c701d6cb21 Merge remote-tracking branch 'upstream/master' into staging 2018-09-25 14:20:27 -04:00
Orivej Desh 42df4e6686 pokerth: build with protobuf 3.4
It fails to compile with 3.5 and 3.6.
2018-09-25 17:45:35 +00:00
Orivej Desh 9eb751496c python.pkgs.protobuf: build with the default protobuf 2018-09-25 17:45:35 +00:00
Orivej Desh 616c30af9f protobuf: default to protobuf3_6 2018-09-25 17:45:35 +00:00
Alexey Lebedeff a6ff5865d1 rabbitmq-server: 3.6.10 -> 3.7.8
- New dependency on 'getconf' binary for
  3aa619e9ef/src/vm_memory_monitor.erl (L448)
- New dependency on 'socat' for systemd notifications
  4a3ee3a336/src/rabbit.erl (L361)
- elixir_1_6 for a new 'rabbitmqctl' tool
- Replace patching with providing custom PATH, as we already have some
  other things here
- Renamed package in all-packages.nix from a legacy spelling
2018-09-25 11:19:23 +02:00
Sarah Brofeldt 0260747427
Merge pull request #46924 from colemickens/azcopy
azcopy: init at 10.0.1
2018-09-25 10:17:43 +02:00
Jan Tojnar aba011fe71
Merge pull request #47305 from worldofpeace/qgnome
Add adwaita-qt & qgnomeplatform
2018-09-25 10:16:53 +02:00
Samuel Dionne-Riel 12051db622 U-Boot: Add Orange Pi Zero Plus2 (H5) build 2018-09-25 10:04:14 +03:00
aszlig 19e83bc2ba
Merge autoPatchelfHook improvements (#47222)
This includes the initialy commit was done by @Mic92 plus a few fixes
from my side. So essentially this avoids patching statically linked
executables and also speeds up searching for ELF files altogether.

I've tested this by comparing the outputs of all the derivations which
make use of this hook using the following Nix expression:

  let
    getPackagesForRev = rev: with import (builtins.fetchGit {
      url = ./.;
      inherit rev;
    }) { config.allowUnfree = true; }; [
      cups-kyodialog3 elasticsearch franz gurobi javacard-devkit
      masterpdfeditor maxx oracle-instantclient powershell reaper
      teamviewer unixODBCDrivers.msodbcsql17 virtlyst wavebox zoom-us
    ];

    pkgs = import <nixpkgs> {};
    baseRev = "ef764eb0d8314b81a012dae04642b4766199956d";

  in pkgs.runCommand "diff-contents" {
    chset = pkgs.lib.zipListsWith (old: new: pkgs.runCommand "diff" {
      inherit old new;
      nativeBuildInputs = [ pkgs.nukeReferences ];
    } ''
      mkdir -p "''${NIX_STORE#/}"
      cp --no-preserve=all -r "$old" "''${NIX_STORE#/}"
      cp --no-preserve=all -r "$new" "''${NIX_STORE#/}"
      find "''${old#/}" "''${new#/}" \
        \( -type f -exec nuke-refs {} + \) -o \( -type l -delete \)
      mkdir "$out"
      echo "$old" > "$out/old-path"
      echo "$new" > "$out/new-path"
      diff -Nur "''${old#/}" "''${new#/}" > "$out/diff" || :
    '') (getPackagesForRev baseRev) (getPackagesForRev "");
  } ''
    err=0
    for c in $chset; do
      if [ -s "$c/diff" ]; then
        echo "$(< "$c/old-path") -> $(< "$c/new-path")" \
             "differs, report: $c/diff" >&2
        err=1
      fi
    done
    [ $err -eq 0 ] && touch "$out"
  ''

With these changes there is only one derivation which has altered
contents, which is "franz". However the reason why it has differing
contents is not directly because of the autoPatchelfHook changes, but
because the "env-vars" file from the builder is in
"$out/opt/franz/env-vars" (Cc: @gnidorah) and we now have different
contents for NIX_CFLAGS_COMPILE and other environment variables.

I also tested this against a random static binary and the hook no longer
tries to patch it.

Merges: #47222
2018-09-25 05:21:01 +02:00
Ryan Mulligan 8d865c9515
Merge pull request #44956 from puffnfresh/package/blastem
blastem: init at 0.5.1
2018-09-24 20:04:55 -07:00
Orivej Desh (NixOS) 9942ceef1f
Merge pull request #47307 from orivej/protobuf
protobuf3_6: init at 3.6.1
2018-09-25 02:20:51 +00:00
worldofpeace 94d079b6bc adwaita-qt: init at 1.0 2018-09-24 22:16:00 -04:00
worldofpeace 6793313708 qgnomeplatform: init at 0.4 2018-09-24 22:16:00 -04:00
Kristoffer Thømt Ravneberg 6946d97ce4 gitlab-ee: init at 11.2.3 2018-09-25 03:53:32 +02:00
Orivej Desh 1c3ecab0f7 protobuf3_6: init at 3.6.1 2018-09-25 01:44:46 +00:00
John Ericson 4adf621798 Merge remote-tracking branch 'upstream/master' into haskell-no-rec 2018-09-24 20:09:25 -04:00
John Ericson e6a476c862 ghc, ghcjs: Get rid of extraneous alex, happy, and hscolour args
The compilers themselves can pull them from `bootPkgs`, where they
should always come from anyways. This enforces that, simplifies that
code, and allows use to avoid more `rec { ... }` too.
2018-09-24 20:00:39 -04:00
Brian McKenna 77088b5d12 blastem: init at 0.5.1 2018-09-25 09:33:11 +10:00
John Ericson 5779fdb3d0 haskellPackages: Avoid outer rec { .. }
This is much nicer for overlays. For example, if someone binds a new
compiler / package set, its integer-simple variation will automatically
appear.
2018-09-24 18:42:04 -04:00
Jan Malakhovski 6ebad0821f bluez-alsa: init at 1.3.1 (#47236) 2018-09-24 22:42:20 +02:00
Jörg Thalheim 0fcf01958b
Merge pull request #47112 from Avaq/add/twa
twa: init at 1.3.1
2018-09-24 21:41:37 +01:00
Elis Hirwing a12787e61a phpPackages.phpcbf: 3.3.1 -> 3.3.2
Changelog: https://github.com/squizlabs/PHP_CodeSniffer/releases/tag/3.3.2
2018-09-24 22:17:51 +02:00
Elis Hirwing 1b0500e3f1 phpPackages.phpcs: 3.3.1 -> 3.3.2
Changelog: https://github.com/squizlabs/PHP_CodeSniffer/releases/tag/3.3.2
2018-09-24 22:17:51 +02:00
Jörg Thalheim 725b57ba11
Merge pull request #47283 from flokli/elasticsearch-dsl-6.2.1
pythonPackages.elasticsearch-dsl: 0.0.9 -> 6.2.1
2018-09-24 20:40:21 +01:00
Vladimír Čunát 3a09a4b579
Merge branch 'master' into staging
Hydra: ?compare=1480463
2018-09-24 21:18:23 +02:00
Florian Klink 18c7fbd78d pythonPackages.elasticsearch-dsl: 0.0.9 -> 6.2.1 2018-09-24 21:08:31 +02:00
Jörg Thalheim d123b30ed1
Merge pull request #47279 from asymmetric/asymmetric/remove-dapptools
Remove DappHub projects
2018-09-24 18:49:18 +01:00
Lorenzo Manacorda 6017c6fa5b *: remove DappHub projects
DappHub maintains a separate overlay at
https://github.com/dapphub/dapptools/blob/master/overlay.nix
2018-09-24 19:24:06 +02:00
José Romildo Malaquias 7cd824116a shades-of-gray-theme: init at 1.1.1 (#47280) 2018-09-24 19:22:56 +02:00
Edward Tjörnhammar 491a580716
pythonPackages.sharedmem: init at 0.3.5 2018-09-24 17:00:55 +02:00
Jörg Thalheim 3e270ff919
Merge pull request #46668 from mbode/doitlive_4
doitlive: 3.0.3 -> 4.0.1
2018-09-24 13:26:27 +01:00
Aldwin Vlasblom 6539722622
twa: init at 1.3.1 2018-09-24 13:31:54 +02:00
Jack Kelly 1def63c923 ultimate-oldschool-pc-font-pack: init at 1.0 2018-09-24 16:49:42 +10:00
Michael Raskin 610203c126
Merge pull request #47259 from AveryLychee/fix/treesheets
treesheets: 2017-03-27 -> 2018-08-18
2018-09-24 05:27:46 +00:00
Vincent Laporte cbc609ca8c ocamlPackages.odoc: init at 1.2.0 2018-09-24 05:08:37 +00:00