Commit graph

115464 commits

Author SHA1 Message Date
Graham Christensen 152c63c9ff
Convert libs to a fixed-point
This does break the API of being able to import any lib file and get
its libs, however I'm not sure people did this.

I made this while exploring being able to swap out docFn with a stub
in #2305, to avoid functor performance problems. I don't know if that
is going to move forward (or if it is a problem or not,) but after
doing all this work figured I'd put it up anyway :)

Two notable advantages to this approach:

1. when a lib inherits another lib's functions, it doesn't
   automatically get put in to the scope of lib
2. when a lib implements a new obscure functions, it doesn't
   automatically get put in to the scope of lib

Using the test script (later in this commit) I got the following diff
on the API:

  + diff master fixed-lib
  11764a11765,11766
  > .types.defaultFunctor
  > .types.defaultTypeMerge
  11774a11777,11778
  > .types.isOptionType
  > .types.isType
  11781a11786
  > .types.mkOptionType
  11788a11794
  > .types.setType
  11795a11802
  > .types.types

This means that this commit _adds_ to the API, however I can't find a
way to fix these last remaining discrepancies. At least none are
_removed_.

Test script (run with nix-repl in the PATH):

  #!/bin/sh

  set -eux

  repl() {
      suff=${1:-}
      echo "(import ./lib)$suff" \
          | nix-repl 2>&1
  }

  attrs_to_check() {
      repl "${1:-}" \
          | tr ';'  $'\n' \
          | grep "\.\.\." \
          | cut -d' ' -f2 \
          | sed -e "s/^/${1:-}./" \
          | sort
  }

  summ() {
      repl "${1:-}" \
          | tr ' ' $'\n' \
          | sort \
          | uniq
  }

  deep_summ() {
      suff="${1:-}"
      depth="${2:-4}"
      depth=$((depth - 1))
      summ "$suff"

      for attr in $(attrs_to_check "$suff" | grep -v "types.types"); do
          if [ $depth -eq 0 ]; then
              summ "$attr" | sed -e "s/^/$attr./"
          else
              deep_summ "$attr" "$depth" | sed -e "s/^/$attr./"
          fi
      done
  }

  (
      cd nixpkgs

      #git add .
      #git commit -m "Auto-commit, sorry" || true
      git checkout fixed-lib
      deep_summ > ../fixed-lib
      git checkout master
      deep_summ > ../master
  )

  if diff master fixed-lib; then
      echo "SHALLOW MATCH!"
  fi

  (
      cd nixpkgs
      git checkout fixed-lib
      repl .types
  )
2017-09-16 21:36:43 -04:00
Tuomas Tynkkynen 4d205eb044 policycoreutils: Fix setuid install 2017-09-13 14:21:18 +03:00
dywedir 15002fbf7e mpv: 0.26.0 -> 0.27.0 2017-09-13 12:23:04 +02:00
Jörg Thalheim 9e7db9a9f9 Merge pull request #28963 from nlewo/docker-readiness
dockerTools.pullImage: change the docker deamon readiness mechanism
2017-09-13 10:39:16 +01:00
Jörg Thalheim 2c01a6fc1f Merge pull request #29025 from dotlambda/seafile-client
seafile-client: add optional Shibboleth support
2017-09-13 10:36:29 +01:00
Frederik Rietdijk 8d4e37710f python.pkgs.jupyter_console: 5.0.0 -> 5.2.0 2017-09-13 10:24:44 +02:00
Eelco Dolstra e3b562e0e2 blender: 2.78c -> 2.79 2017-09-13 09:54:42 +02:00
Frederik Rietdijk 7aa2e6b590 Merge pull request #29263 from jyp/jyp-rename-maintainer
make my maintainer handle match my github username
2017-09-13 09:40:21 +02:00
Frederik Rietdijk 47dcf634bb python.pkgs.joblib: move expression 2017-09-13 09:34:39 +02:00
Frederik Rietdijk d6dec0a9e6 Merge pull request #29291 from rvl/fix-python-spacy
Fix build of python3Packages.spacy
2017-09-13 09:18:57 +02:00
Klaas van Schelven 50d36558a4 PyBrain: Mark as broken
It's broken on all versions of Python (I've tried 2.7, 3.4, 3.5, 3.6)

I think the root cause is that PyBrain is not working with numpy >= 1.12.0 as I reported here:
https://github.com/pybrain/pybrain/issues/217

(The relevant release notes may be found here):
https://docs.scipy.org/doc/numpy-1.12.0/release.html#compatibility-notes

The PyBrain github repo does not seem very active (last commit 18 months ago, last release 3 years),
so I have some doubts as to whether this will be fixed any time soon.

I suppose an alternative solution could be to reintroduce the explicit dependency to numpy 1.11. But,
this is not entirely trivial: in c9b4a2f319, the versions 1.10, 1.11, 1.12 were folded into a single version.
Also, the numpy dependency is not a direct one, but is implied via scipy
2017-09-13 09:08:34 +02:00
Vladimír Čunát 97ac29cafc
hpsa service: fallout from #28557 merge and revert 2017-09-13 07:55:48 +02:00
Peter Hoeg 3f56114223 arc-theme: docs were going to the wrong directory 2017-09-13 10:41:57 +08:00
Winnie Quinn abeb6af482 aspcud: add darwin platform support
This works because `gringo` now builds on Darwin.
2017-09-13 00:40:14 +02:00
Joachim F ddd8dc072e Merge pull request #29255 from orivej/aseprite
aseprite: 0.9.5 -> 1.1.7
2017-09-12 22:37:22 +00:00
Joachim F e7f90c9c22 Merge pull request #29270 from rnhmjoj/btfs
btfs: 2.13 -> 2.17
2017-09-12 22:35:38 +00:00
Joachim F 9b31035ea4 Merge pull request #29268 from rnhmjoj/pirate-get
pirate-get: 0.2.10 -> 0.2.12
2017-09-12 22:34:47 +00:00
Joachim F 01e642b15a Merge pull request #29284 from abuibrahim/master
odp-dpdk: fix a typo
2017-09-12 22:32:48 +00:00
Joachim F 026225e7c8 Merge pull request #29261 from mbrock/master
emacs: 25.2 -> 25.3
2017-09-12 22:32:29 +00:00
Joachim F 5488e42641 Merge pull request #29211 from fadenb/graylog_plugins
graylogPlugins: update existing and add new plugins
2017-09-12 22:23:10 +00:00
Jörg Thalheim 4f6850c80c Merge pull request #29276 from sigma/pr/hugo-0.27
hugo: 0.26 -> 0.27
2017-09-12 23:06:18 +01:00
Rodney Lorrimar 566f5e9e8d pythonPackages.ftfy: 5.1.1 -> 4.4.3
ftfy package was added for spaCy and is only used by spaCy.

This change downgrades its version to meet the bounds specified by
spaCy (>=4.4.2,<5.0.0).

Relevant to #28643.
2017-09-12 23:04:11 +01:00
Daiderd Jordan 734788b71d
nginx: disable pie on darwin 2017-09-12 22:42:04 +02:00
Robert Helgesson 3c14ef0c4a Merge pull request #29184 from Ma27/yabar/install-hooks
yabar: minor derivation improvements
2017-09-12 22:27:05 +02:00
Ruslan Babayev 4ac8529dd4 odp-dpdk: fix a typo 2017-09-12 13:23:36 -07:00
Daiderd Jordan 4d7c3b2f5f
kyotocabinet: fix darwin build 2017-09-12 22:13:58 +02:00
Maximilian Bosch 178251001a
yabar: add unstable package 2017-09-12 22:05:13 +02:00
Daiderd Jordan f0956b7baf
python-keyring: disable tests on darwin 2017-09-12 20:54:48 +02:00
Daiderd Jordan cd286d4d28 Merge pull request #29253 from knedlsepp/fix-pythonPackages.audiotools
pythonPackages.audiotools: Fix darwin build
2017-09-12 19:54:31 +02:00
Josef Kemetmueller 6d760d970f
pythonPackages.audiotools: Fix darwin build 2017-09-12 19:33:17 +02:00
Vladimír Čunát 422adc3063
Merge branch 'staging'
10k staging builds are not yet finished on Hydra (mostly darwin),
but we now have a 20k jobs rebuilding directly on master, so we would
never get to merge this way...
2017-09-12 19:17:52 +02:00
Jörg Thalheim 7786aab173 openssh: update gssapi patch 2017-09-12 14:28:33 +01:00
Jean-Philippe Bernardy 1ba197f225 make my maintainer handle match my github username 2017-09-12 15:17:18 +02:00
Joachim Fasting e2ddc7ffd2
libffcall: 1.10 -> 2.0
Thanks to Bruno Haible for a notifying me of this.
2017-09-12 15:08:38 +02:00
Jörg Thalheim 39e327eeb5 nixos/openafs-client: update cellServDB 2009-06-29 -> 2017-03-14 2017-09-12 13:12:41 +01:00
rnhmjoj b9dc49e847
btfs: 2.13 -> 2.17 2017-09-12 14:10:50 +02:00
rnhmjoj 375ff71380
pirate-get: 0.2.10 -> 0.2.12 2017-09-12 13:59:36 +02:00
Tuomas Tynkkynen 9275c3387e lib.cleanSourceFilter: Fix VIM swap file filtering
The backslash wasn't properly escaped, and "\." is apparently equal to
".". So it's accidentally filtering out these valid file names (in
Nixpkgs):

trace: excluding clfswm
trace: excluding larswm
trace: excluding mkpasswd

While at it, turn the file filter stricter to what it was before
e2589b3ca2. That is, the file name must
start with a dot: '.swp', '.foo.swo' are filtered but 'bar.swf' is not.
2017-09-12 14:58:46 +03:00
Tuomas Tynkkynen 8f566f4bde pythonPackages.audiotools: Disable on Darwin
Last successful build 2015-09-20 07:44:17

https://hydra.nixos.org/build/60587519
2017-09-12 14:58:46 +03:00
Tuomas Tynkkynen 8d85d279f2 pythonPackages.alot: Disable on Darwin
Last successful build 2015-12-31 19:17:08

https://hydra.nixos.org/build/60775312
2017-09-12 14:58:46 +03:00
Tuomas Tynkkynen e6e8565131 toxic: Disable on Darwin
Last successful build 2014-03-12 17:47:58

https://hydra.nixos.org/build/59716009
2017-09-12 14:58:46 +03:00
Tuomas Tynkkynen 817c20c7ee chromaprint: Disable on Darwin
Last successful build 2015-09-20 08:03:33

https://hydra.nixos.org/build/60589826
2017-09-12 14:58:46 +03:00
Domen Kožar 8081505173
pyopenssl: 17.0.0 -> 17.2.0
An attempt to fix tests under 32bit linux to unblock nix build

(cherry picked from commit 3418e734698793e1272769a6cac2efe1498a0de1)
Signed-off-by: Domen Kožar <domen@dev.si>
2017-09-12 13:38:51 +02:00
Dmitry Vyal 6abb29f460
tensorflow-1.1.0 for python3.6
Google publishes prebuilt tensorflow whl for python 3.4, 3.5, 3.6,
but nix expression for tensorflow only supported 3.5.
This change adds support for python-3.6.
2017-09-12 12:52:35 +02:00
Jörg Thalheim cfb198015e Merge pull request #29012 from gnidorah/maxx
maxx: allow launching individual components
2017-09-12 11:37:22 +01:00
Jörg Thalheim 2d77958271 Merge pull request #29007 from mguentner/avrclean
avr-*: split avr-gcc-libc into separate packages
2017-09-12 10:28:56 +01:00
Tuomas Tynkkynen ab62b7e9b9 Revert "libgcrypt: Add pre-ARMv7 patch"
This reverts commit 1cfe9539f9.

No longer needed after the upgrade in 095af3e63b.
2017-09-12 12:23:53 +03:00
Bjørn Forsman 6b9ee30672 nixos/gitolite: don't leak nix store hash into gitolite-admin username/key
It doesn't look good when the initial admin user is named
"<hash>-gitolite-admin" and the key stored as
"<hash>-gitolite-admin.pub". Instead, make it simply "gitolite-admin"
and "gitolite-admin.pub".
2017-09-12 10:56:11 +02:00
Jörg Thalheim 58c2967c46 Merge pull request #29032 from yesbox/jackett_0.8.151
jackett: 0.7.1308 -> 0.8.151
2017-09-12 09:50:05 +01:00
Jörg Thalheim 445ca427a4 Merge pull request #28964 from chrisburr/patch-2
dns-root-data: 2017-07-26 -> 2017-08-29
2017-09-12 09:42:33 +01:00