Commit Graph

116029 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
Samuel Leathers
0f0aeed803 python pies: remove packages 2017-09-16 21:36:12 -04:00
Samuel Leathers
dce4276d5e logilab_common: 0.63.2 -> 1.4.1 2017-09-16 21:14:11 -04:00
Samuel Leathers
4db4f70be6 logilab-constraint: move to python-modules 2017-09-16 21:13:48 -04:00
Samuel Leathers
80625b6012 internetarchive: 0.8.3 -> 1.7.2 2017-09-16 19:24:29 -04:00
Samuel Leathers
d8848c0202 backports.csv: init at 1.0.5 2017-09-16 19:23:05 -04:00
Samuel Leathers
c8f55331df schema: init at 0.6.6 2017-09-16 17:25:21 -04:00
Vladimír Čunát
222e18698a
gtkmm3: maintenance 3.22.0 -> 3.22.2 2017-09-16 23:05:55 +02:00
Eelco Dolstra
afc0218ecd blender: Fix CUDA support
CUDA toolkit 8 doesn't support gcc 6, so we have to build opensubdiv
and blender with gcc 5.
2017-09-16 22:45:22 +02:00
Eelco Dolstra
bb1c9b027d cudatoolkit: Move libcudart to a separate output
This prevents opensubdiv (and thus blender) from having all of
cudatoolkit in its closure.
2017-09-16 22:45:14 +02:00
Eelco Dolstra
63f3b35204 opencollada: 1.3 -> 1.6.59 2017-09-16 22:44:39 +02:00
Eelco Dolstra
9f740f1f7c openimage: 1.7.12 -> 1.7.17 2017-09-16 22:44:35 +02:00
Georges Dubus
94400c0cd2 nox: 0.0.5 -> 0.0.6 2017-09-16 21:29:40 +01:00
Michael Weiss
337380ea1d gitRepo: Fix an error due to missing TLS certificates
This was a problem when run inside a sandbox, e.g. via
"fetchRepoProject". The error message from repo seems unrelated:

fatal: Cannot get https://gerrit.googlesource.com/git-repo/clone.bundle
fatal: error no host given

But the exception is actually thrown due to missing certificates
(/etc/ssl/certs). It should be possible to provide another location via
environment variables (e.g. SSL_CERT_FILE, REQUESTS_CA_BUNDLE or
CURL_CA_BUNDLE) but apparently that doesn't actually work for some
reason (would have to study our Python packaging).

Now "fetchRepoProject" works without the "--no-clone-bundle" option.
2017-09-16 22:13:56 +02:00
Joachim F
8ceb209830 Merge pull request #29462 from joachifm/trivial-misc-tests
nixos/tests: move kernel-params & sysctl test to misc
2017-09-16 19:51:58 +00:00
aszlig
8180085733
krita: 3.1.4 -> 3.2.1
New features since version 3.2.0:

  * G'MIC Plugin
  * Touch Painting
  * Smart Patch Tool
  * New Brush Presets

The full release notes can be found at:

https://krita.org/en/release-notes-for-krita-3-2/

Version 3.2.1 contains these fixes:

  * Crash on startup if only OpenGL 2.1 is found: if you had to disable
    opengl for 3.2.0, you can try to enable it again
  * A crash when changing layer types in the gmic-qt plugin
  * A bug where gmic-qt could crash on odd-sized images
  * A regression where using the text tool would break the brush tool
  * The option to use the native platform's file dialogs was restored
  * A bug where selecting the line tool would disable the flow slider
  * Some issues with the LUT docker were fixed

Upstream release notes for 3.2.1:

https://krita.org/en/item/krita-3-2-1-released/

I've dropped the patch, because it was already from the upstream
development version and thus is also included in this release.

Built and tested using a few images and just playing around with a few
new features.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @abbradar, @Mic92, @kragniz
2017-09-16 19:34:28 +02:00
Michael Weiss
62b9d78b18 fetchRepoProject: Fix the GnuPG verification
The verification was failing with the following error:
gpg: keyblock resource '/tmp/nix-build-XYZ.drv-0/.repo/repo/./.repoconfig/gnupg/pubring.kbx': No such file or directory

Using an absolute path for $HOME fixes this.

And since 175ecbab91 the dependencies on
"git" and "gnupg" aren't required anymore as "gitRepo" already covers
them.
2017-09-16 17:57:14 +02:00
Michael Weiss
50ce8abccf fetchRepoProject: Refactor the code
Should hopefully make it a bit more readable and less redundant.
2017-09-16 17:25:25 +02:00
Jan Malakhovski
701db44ab9 palemoon: just use the default gcc 2017-09-16 18:18:26 +03:00
Matt Smith
21e135c8bd monero: 0.10.3.1 -> 0.11.0.0 2017-09-16 09:45:03 -05:00
Frederik Rietdijk
8c4f230122 Merge pull request #29471 from LnL7/cffi-clang
python-cffi: fix test failures when using clang
2017-09-16 16:41:12 +02:00
Daiderd Jordan
35649750c3
python-cffi: fix test failures when using clang 2017-09-16 16:32:40 +02:00
Jaka Hudoklin
1adaad1371 Merge pull request #28927 from xtruder/nixos/logkeys/init
logkeys module: init
2017-09-16 16:23:13 +02:00
Jaka Hudoklin
4dc3551397 Merge pull request #29315 from xtruder/pkgs/telepresence/init
pkgs/telepresence: init at 0.65
2017-09-16 15:51:15 +02:00
Vladimír Čunát
d5724ef2dd
vivaldi-ffmpeg-codecs: fix evaluation (forgotten file) 2017-09-16 15:27:33 +02:00
Jörg Thalheim
9313bd7388 Merge pull request #29435 from disassembler/arelle
arelle: 2017-06-01 -> 2017-08-24
2017-09-16 14:04:21 +01:00
Samuel Leathers
d15c019edd arelle: 2017-06-01 -> 2017-08-24 2017-09-16 09:01:48 -04:00
Tim Steinbach
08229bba30
linux-copperhead: 4.13.1.b -> 4.13.2.a 2017-09-16 08:57:45 -04:00
Jörg Thalheim
27e87d8bc8 gns3: 2.0.3 -> 2.1.0rc1 2017-09-16 13:56:00 +01:00
Samuel Leathers
eb125adf24 aiohttp-cors: 0.5.1 -> 0.5.3 2017-09-16 13:56:00 +01:00
Joachim F
c0616a3234 Merge pull request #28892 from ryantm/matterbridge2
matterbridge, modules/matterbridge: init at 1.1.0
2017-09-16 12:43:35 +00:00
Vladimír Čunát
9a55f74e43
vivaldi-ffmpeg-codecs: fix evaluation
The patch was removed during chromium update.
It won't build, but the error seems the same as before chromium update...
2017-09-16 14:30:58 +02:00
Jörg Thalheim
a5ed2f141c Merge pull request #29456 from disassembler/hglib
hglib: 1.7 -> 2.4
2017-09-16 13:27:02 +01:00
Tuomas Tynkkynen
9a6aa33422 kernel: Disable DEBUG_INFO
Since we don't have a split debug info output yet, don't waste time
writing several gigabytes of debug info that's all going to be stripped
out at the end.

This change only affects Aarch64 (where some joker has enabled it in the
architecture defconfig) and is a no-op on the others.
2017-09-16 15:09:10 +03:00
Jörg Thalheim
97b66c8f5f Merge pull request #29447 from disassembler/hcs_utils
hcs_utils: 1.5 -> 2.0
2017-09-16 13:07:23 +01:00
Jörg Thalheim
46c30b2232 python.pkgs.hcs_utils: fix tests; disable python2 2017-09-16 13:06:12 +01:00
Vladimír Čunát
75471c141a
fix master's first-parent history line
It started to track the history of staging after 03fa6965ad.
I find the first-parent property very useful.  This fixes the line
except for several of the newest commits.
2017-09-16 13:55:07 +02:00
Jörg Thalheim
7ef737d9b1 Merge pull request #29459 from adisbladis/caddy-0_10_9
caddy: 0.10.7 -> 0.10.9
2017-09-16 12:46:34 +01:00
Samuel Leathers
7ffea453b8 jscoverage: fix build with gcc6 (#29423) 2017-09-16 13:20:38 +02:00
Joachim Fasting
586d04c588
nixos/tests: expand hardened tests 2017-09-16 13:14:07 +02:00
Jan Malakhovski
62fa45eac5
linuxPackages: hardened-config: enable DEBUG_PI_LIST 2017-09-16 13:14:05 +02:00
Jan Malakhovski
c345761c13
linuxPackages: hardened-config: check kernelArch, not system 2017-09-16 13:14:04 +02:00
Jan Malakhovski
616a7fe237
linuxPackages: hardened-config: disable BUG_ON_DATA_CORRUPTION for older kernels
They don't support it.
2017-09-16 13:14:03 +02:00
Michael Weiss
b37de8b67b android-studio-preview: 3.0.0.13 -> 3.0.0.14 2017-09-16 13:12:24 +02:00
Frederik Rietdijk
91f7042aa0 aspellWithDicts: use a single env
In c0cf19608f the function
`aspellWithDicts` was introduced, that allows to build a derivation
consisting of aspell and specified dictionaries. In
96457d26dd a fix was included to properly
find the dictionaries.

Issue #29429 describes that, while the current method works for the
aspell binary, it does not in case of the API.

This commit rewrites the wrapper into a single derivation, create a
single tree of symbolic references to both the binary and the
dictionaries so that its possible to find the dictionaries with the API.
Furthermore, the binary is wrapped so it can still find the dictionaries
as well.
2017-09-16 13:06:26 +02:00
Matt McHenry
cfbac1beb4 systemd: better document enabled, wantedBy, and requiredBy (#29453)
the systemd.unit(5) discussion of wantedBy and requiredBy is in the
[Install] section, and thus focused on stateful 'systemctl enable'.
so, clarify that in NixOS, wantedBy & requiredBy are still what most
users want, and not to be confused with enabled.
2017-09-16 12:48:16 +02:00
Joachim Fasting
e05459584e
nixos/release-combined: remove basic kernel tests
Arguably, breaking linux-latest should not block a release.  Also, booting
the kernel + basic sanity checking is implicitly exercised by every other
vm test.
2017-09-16 12:45:30 +02:00
Joachim Fasting
ffd56ba4f6
nixos/tests: move kernel-params test to misc 2017-09-16 12:45:28 +02:00
Joachim Fasting
c85cf60c83
nixos/tests: move sysctl test to misc 2017-09-16 12:45:23 +02:00
Frederik Rietdijk
03fa6965ad Merge remote-tracking branch 'upstream/master' into HEAD 2017-09-16 12:34:32 +02:00