Commit Graph

1680 Commits

Author SHA1 Message Date
Vladimír Čunát
e62e4c1e4a
Merge #31210: licenses.ffsl: it's non-free 2017-11-10 19:46:21 +01:00
Drew Hess
67ba83a934 kernel: add beagleboard.org kernel
And update the existing platform variant to use it
2017-11-09 18:28:14 +02:00
Sergey Alexandrov
1f5c2833e9 mpdas: init at 0.4.4 (#31398)
* mpdas: init at 0.4.4

* mpdas: read config from /etc instead from nix store
2017-11-08 21:28:53 +00:00
Tom Macdonald
7b8e40c6b1 procodile: init at 1.0.17 2017-11-07 17:04:50 +01:00
Tor Hedin Brønner
6949cfa58e nix-zsh-completions: 0.3.1 -> 0.3.2
Adds support for nix1.12 and various improvements.
2017-11-06 19:07:36 +01:00
Sean Zicari
0711fe96f2 xosview2: init at 2.2.2 (#30629) 2017-11-06 09:55:23 +08:00
Michael Raskin
6475fa9b25
Merge pull request #31298 from timokau/sage-fix
sage: 6.8 -> 8.0
2017-11-06 01:25:28 +00:00
Timo Kaufmann
fe68ba81d2 sage: 6.8 -> 8.0
This "un-breaks" sage while also updating it to 8.0.

It compiles sage with its dependencies as one big pile, which is not
the best approach but definately better than nothing for now.

To be able to shrink the huge output pile a little, it also splits
docs from the rest of the output.
2017-11-05 17:37:40 -06:00
Tuomas Tynkkynen
8c190c3f7d lib/types.nix: Disable 32-bit integer types for now
This file doesn't evaluate in 32-bit versions of Nix because the integer
type is a signed 32-bit integer there, so 4294967296 causes an 'invalid
integer' error.  I see no other way around than commenting this out :(

(s32 could be made to work by tweaking the expressions a bit, but didn't
do that for now since it'd be asymmetric to have s32 but no u32).
2017-11-05 22:47:09 +02:00
Tuomas Tynkkynen
0d9f2f0bb4 platforms.nix: Clean up more 'uboot' legacy
For a while now, the only thing the 'uboot' attribute does is to tell
whether to add ubootTools to kernel/initrd builds. That can be
determined with platform.kernelTarget == "uImage" just as well.
2017-11-05 17:06:59 +02:00
Profpatsch
213bd2847b lib/types: fix up documentation formatting a bit 2017-11-05 15:56:32 +01:00
Profpatsch
462c048c77 lib/types: add ints.positive.
For values that are positive, but cannot be 0.
2017-11-05 15:56:32 +01:00
Profpatsch
1158910676 lib/types: match lowercase descriptions of other types 2017-11-05 15:56:32 +01:00
Profpatsch
c85f085062 lib/types: update docs to match the new type names 2017-11-05 15:56:32 +01:00
Profpatsch
f8e6cd3465 lib/types: add tests for ints.between and ints.unsigned
The int types are trivial invocations of `ints.between`, so they are not tested
explicitely.
2017-11-05 15:56:32 +01:00
Profpatsch
77648da233 lib/types: signed -> s, unsigned -> u, remove signed alias
Mirrors the way it’s done in modern low-level languages like Rust (by input of
@nbp).
Removes the signed alias for int.
2017-11-05 15:56:32 +01:00
Profpatsch
7fcd3892a9 lib/types: remove port type again
Will be introduced as a taggedUnion, once that type is in nixpkgs.
2017-11-05 15:56:32 +01:00
Profpatsch
c776489cac lib/types: add port type 2017-11-05 15:56:32 +01:00
Profpatsch
281d071b6a lib/types: add various signed/unsigned int types
It is sometimes necessary to restrict the domain of integers for configurations,
as well as restricting them to unsigned/positive values.
2017-11-05 15:56:32 +01:00
Profpatsch
af424a607c lib/modules: Change type error to be gramatically nicer
Before:
  <x> is not a integer between 0 and 100 (inclusively).
(notice that “a” is wrong, it should be “an”)
Now:
  <x> is not of type `integer between 0 and 100 (inclusively)'.

This sounds a bit more formal, but circumvents the grammatical problems.
Multi-word type descriptions are also easier to see.
2017-11-05 15:56:32 +01:00
Profpatsch
c53d874277 lib/types: add intBetween
An int type that checks the value range.
2017-11-05 15:56:32 +01:00
Michael Raskin
7be7698612
Merge pull request #25552 from antonxy/master
lightworks: init at 14.0.0
2017-11-05 00:01:48 +00:00
Keshav Kini
0094ca20cc acl2: 6.5 -> 7.4, refactor
The `make regression` line was failing because the expression was
downloading a core-system-only, no-libraries source tarball.  I
switched to using fetchFromGitHub, which downloads the full source
code -- the core system as well as the "community books",
i.e. libraries -- but the libraries unfortunately do not build yet
because they have more dependencies than the core system, and they
also run into some impurity problems during the build process.

This commit changes the ACL2 package so that at least the user will
obtain the latest version of the core system, even though they won't
get the community books.  In a later commit I hope to fix this; it
will require either changes to ACL2 itself, or a patch to be applied
to ACL2 in nixpkgs.

ACL2 7.4 has no trouble building on the current version of SBCL in
nixpkgs, so I let it do so instead of using the ancient SBCL version
1.2.0 from 2014.

I also added myself as a maintainer to this package, since I'm an
active contributor to the ACL2 project and am interested in seeing it
working on Nix.
2017-11-04 13:48:22 -07:00
Renaud
27114d45ae
stdenv.lib.maintainers: add c0bw3b 2017-11-04 19:56:04 +01:00
Orivej Desh
3ea077e638
Merge pull request #30942 from andrestylianos/joker
joker: init at 0.8.6
2017-11-04 07:09:56 +00:00
André Stylianos Ramos
49e0be1d4d joker: init at 0.8.6 2017-11-04 06:36:16 +01:00
Frank Doepper
9bda3f2943 licenses.ffsl: non-free
FFSL forbids commercial redistribution
2017-11-03 22:42:25 +01:00
Richard Marko
d1491f490f add sorki to maintainers 2017-11-02 22:19:35 +01:00
Andrew R. M
cbd65e7980 pythonPackages.rply: move to python-modules/ 2017-11-01 05:49:01 -04:00
Nicolas B. Pierron
1d56d0c8a7 types.submodule: Fix the NixOS Manual, by escaping the <> symbols. 2017-10-30 17:52:00 +00:00
Nicolas B. Pierron
d8987135c2 types.submodule: Replace a friendly comment by a more gentle one. 2017-10-30 13:06:18 +01:00
Christopher Singley
e697f10fc4 PlexPy: init at 1.4.25 2017-10-29 19:28:16 -05:00
Christian Kauhaus
afc66e121d vulnix: 1.2.2 -> 1.3.4
The build needs the ZODB fix in PR #30925 to succeed.
2017-10-29 15:43:58 +01:00
Daiderd Jordan
443d1f2e6e
Merge pull request #30907 from iblech/patch-1
maintainers.nix: fix tiny typo
2017-10-29 01:52:41 +02:00
Ingo Blechschmidt
443e7bf5f4 maintainers.nix: fix tiny typo 2017-10-28 22:42:18 +02:00
Sam Parkinson
5ac01066f2 gradio: init at 6.0.2 2017-10-29 06:32:38 +11:00
David Izquierdo
301fc3a33d maintainers: add dizfer 2017-10-28 12:32:54 +03:00
Ingo Blechschmidt
9f28f2dd38 sshlatex: init at 0.7 2017-10-28 11:08:05 +02:00
Milan Svoboda
c564e54f12 kitty: init at 0.4.2 (#30687)
* add new application: terminal kitty (opengl, c, python)

https://github.com/kovidgoyal/kitty.git

* kitty: nitpicks

* update kitty 0.4.0 -> 0.4.2, add maintainer
2017-10-25 22:03:20 +01:00
mehandes
17af9f8d4d svgcleaner: init at v0.9.1
Svgcleaner is a tool for fast and safe svg optymalization.
2017-10-25 18:43:10 +02:00
Franz Pletz
6df1cccfdf Merge pull request #30721 from xzfc/xpointerbarrier
xpointerbarrier: init at 17.10
2017-10-25 04:11:52 +02:00
Daniel Peebles
4bf221932e Merge pull request #30750 from kuznero/pr/dotnet-sdk
dotnet-sdk: init at 2.0.3
2017-10-24 19:10:03 -04:00
Joachim F
6a65235bac Merge pull request #30697 from earldouglas/avian-maintainers
avian: add meta.maintainers
2017-10-24 22:07:44 +00:00
Roman Kuznetsov
6b1b8487df
dotnet-sdk : init at 2.0.3 2017-10-25 00:04:16 +02:00
Yellow Ghost
646a77739b
notify-desktop: init at 0.2.0
notify-desktop package added

improved code synopsis
2017-10-24 15:25:49 +02:00
Alex Vorobiev
770bedbc20 meritous: init at 1.4 2017-10-24 09:52:52 +02:00
Albert Safin
2cbfe0a5db maintainers: add xzfc 2017-10-23 19:53:12 +07:00
James Earl Douglas
7562ed51f6
avian: add meta.maintainers 2017-10-22 18:31:24 -06:00
joncojonathan
2f540c31a2 Added joncojonathan to maintainers
Motivation for change: I'm working on things more, so figured it was wise.
2017-10-21 14:22:57 +02:00
Frederik Rietdijk
d854b3df2c Merge pull request #30503 from guibou/guibou_vfx_pkgs
Many packages used in computer animation industry
2017-10-19 15:38:56 +02:00
Kevin Quick
a1afec9c14 maintainers: add Kevin Quick 2017-10-19 08:18:55 +02:00
Guillaume Bouchard
bed68ed344 Add *guibou* in maintainers 2017-10-18 11:56:33 +02:00
Drew Hess
ceb2b71f69 kernel: Build Tegra PCI support. 2017-10-18 02:31:18 +03:00
Herwig Hochleitner
30b3b5d85f announce myself as a maintainer
added maintainer entries for `cdemu` (which i've created), as well as
`wine` and `chromium` (which I regularly contribute to)
2017-10-14 11:11:49 +02:00
Justin Humm
5cca8800a4 notmuch-bower: init at 2017-09-27 (#29856)
* bower: init and add erictapen as maintainer

* bower: fix up

* notmuch-bower: rename from bower
2017-10-14 10:08:04 +01:00
Jörg Thalheim
8bff56c09c Merge pull request #30079 from chpatrick/mate-power-manager
mate-power-manager: init at 1.18.0
2017-10-12 10:13:33 +01:00
Patrick Chilton
e3675fedc7 mate-power-manager: init at 1.18.0 2017-10-12 08:22:21 +02:00
Florian Klink
ab2cc75f78 guzzle_sphinx_theme: init at 0.7.11
* maintainers: add flokli

* sphinx_guzzle_theme: init at 0.7.11

This adds sphinx_guzzle_theme, which is used for sphinx documentation in
various projects, including BorgBackup.
2017-10-12 07:14:37 +01:00
dupgit
5b53ebd0a9 Adds dupgit to the maintainers 2017-10-11 20:51:01 +02:00
Jörg Thalheim
a08837622d Merge pull request #30203 from andir/add-dnstracer
dnstracer: init at 1.9
2017-10-07 22:11:22 +01:00
Andreas Rammhold
c1135606c0
maintainers: add andir 2017-10-07 22:33:32 +02:00
Spencer Baugh
6db9b65f65 maintainers: add catern 2017-10-07 12:01:44 +02:00
Jörg Thalheim
3fe7cddc30 Merge pull request #30146 from dpflug/master
tqsl: init at 2.3.1
2017-10-06 13:34:03 +01:00
Rommel Martinez
1d74f31a0a maintainers.nix: update email 2017-10-06 15:16:39 +08:00
David Pflug
a6d570dd49
tqsl: init at 2.3.1 2017-10-05 22:35:32 -04:00
tv
bc03222bde types: remove loeOf 2017-10-05 21:06:48 +02:00
Jörg Thalheim
f9991c9094 Merge pull request #30086 from TealG/axoloti-1.0.12
axoloti: init at 1.0.12-1
2017-10-04 16:19:28 +01:00
Teal Gaure
ed35c0761f axoloti: init at 1.0.12-1 2017-10-04 17:11:52 +02:00
Peter Romfeld
fca7a9af0f fastlane: init at 2.60.1 2017-10-04 15:02:23 +01:00
David Kuo
d514aa5c6a Add david50407 into maintainers.nix 2017-10-04 07:36:49 +00:00
mingchuan
d6b8ac6ca8 maintainers.nix: use my GitHub handle as maintainer name 2017-10-03 14:27:10 +00:00
Stuart Moss
796b3a2306
eclipse-plugin-vrapper: init at 0.72.0 2017-10-03 00:31:17 +02:00
John M. Harris, Jr
4219de070d
kore: init at 2.0.0 2017-10-01 14:08:36 -04:00
Orivej Desh
5bf29702b7 Merge pull request #29533 from sivteck/rosDevChan
vcstool: init at 0.1.31
2017-10-01 09:36:00 +00:00
Orivej Desh
432f9925a6 Merge pull request #29745 from mgdelacroix/gpac-update
gpac: 0.5.0 -> 0.7.1
2017-10-01 09:01:56 +00:00
Orivej Desh
9592bf8c24 Merge pull request #29947 from symphorien/giac
giac, xcas: init at 1.4.9
2017-09-30 22:50:53 +00:00
Symphorien Gibol
10a612120f xcas, giac: add myself as maintainer 2017-09-30 21:40:50 +02:00
Shea Levy
1a1ad1a17d Revert "Merge branch 'improved-make-overridable' of git://github.com/ElvishJerricco/nixpkgs"
This reverts commit c3af1210b4, reversing
changes made to 49f175cd0c.
2017-09-29 09:11:26 -04:00
Shea Levy
8f33315f8f Revert "Fix evaluation"
Reverting #27319

This reverts commit 751d397ad4.
2017-09-29 09:10:48 -04:00
Shea Levy
ca535da1fb Revert "Fix tarball"
Reverting #27319

This reverts commit 9ce7175cfe.
2017-09-29 09:10:30 -04:00
Shea Levy
d96da5af87 Revert "Avoid polluting lib namespace unncessarily"
Reverting #27319

This reverts commit 01a3f0b8aa.
2017-09-29 09:09:53 -04:00
Shea Levy
01a3f0b8aa Avoid polluting lib namespace unncessarily 2017-09-28 18:51:20 -04:00
Shea Levy
9ce7175cfe Fix tarball 2017-09-28 18:44:10 -04:00
Shea Levy
751d397ad4 Fix evaluation 2017-09-28 18:40:11 -04:00
Shea Levy
c3af1210b4 Merge branch 'improved-make-overridable' of git://github.com/ElvishJerricco/nixpkgs 2017-09-28 18:10:50 -04:00
Franz Pletz
46b0bca808 Merge pull request #29761 from Infinisil/xwinwrap
xwinwrap: init at 4
2017-09-28 01:18:02 +02:00
Yegor Timoshenko
0ddca0715a epsxe: init at 2.0.5 (#29810)
* epsxe: init at 2.0.5

* epsxe: nitpicks
2017-09-26 20:06:22 +01:00
Francesco Gazzetta
1d163835c8 bash-supergenpass: init at 2012-11-02 (#29797)
* Add fgaz to mantainers

* bash-supergenpass: init at 2012-11-02
2017-09-26 11:01:11 +01:00
Jörg Thalheim
8a1fb4b504 Merge pull request #29702 from robertodr/watson-ruby
watson-ruby: init at 1.6.3
2017-09-25 15:51:17 +01:00
Roberto Di Remigio
d1aed97aa0 maintainers.nix: add robertodr 2017-09-25 14:50:51 +01:00
Roberto Di Remigio
d706fc953d sort maintainers.nix 2017-09-25 14:50:31 +01:00
Joachim F
e23973fa4e Merge pull request #29694 from etu/testssl-sh
testssl.sh: init at 2.9.5-1
2017-09-25 12:58:12 +00:00
Silvan Mosberger
5a9e28190c
xwinwrap: init at 4 2017-09-25 05:27:00 +02:00
Miguel de la Cruz
4994e3f2c2 gpac: 0.5.0 -> 0.7.1 2017-09-24 17:45:47 +01:00
Richard Ipsum
3d278be9ae luxio: Add maintainer 2017-09-24 15:59:43 +01:00
Elis Hirwing
02d9d40d99
testssl.sh: init at 2.9.5-1
Add testssl.sh which is a nice utility for testing TLS/SSL
capabilities of servers without having to use any kind of
web-service. It's very useful for testing setups of services before
deployment and such.
2017-09-24 16:59:15 +02:00
Christopher Rosset
799d28480b ephem: init at 3.7.6.0 (#29710)
* ephem: init at 3.7.6.0

Compute positions of the planets and stars

* Update default.nix

* python.pkgs.ephem: enable tests for python2 at least
2017-09-24 11:17:24 +01:00
Ruben Maher
2948b570f5 maintainers.nix: Add myself 2017-09-23 08:23:43 +02:00
Jörg Thalheim
7833062986 Merge pull request #29648 from zzamboni/assh-2.6.0
assh: init at 2.6.0
2017-09-21 23:05:22 +01:00
Diego Zamboni
334dfc3086 assh: init at 2.6.0
Powerful wrapper around ssh.
2017-09-21 22:23:16 +02:00
Jörg Thalheim
e5b97e36c5 Merge pull request #29642 from Zimmi48/update-compcert
Update CompCert
2017-09-21 18:30:39 +01:00
Jörg Thalheim
31b7bc4c1e Merge pull request #29243 from hamhut1066/master
traefik: init at 1.3.8
2017-09-21 17:00:37 +01:00
Théo Zimmermann
8fde5790b4 compcert: fix license
The license of CompCert is not a generic "INRIA" license. It is "INRIA Non-Commercial
Agreement for the CompCert verified compiler". As unfortunate as it may seem, this
is a non-free license (clearly mentioned as such in its preamble). See also #20256.
2017-09-21 15:24:17 +02:00
John Ericson
bc9f471997 Merge pull request #27797 from grahamc/fixed-lib
Convert libs to a fixed-point
2017-09-19 10:52:15 -04:00
Sivaram Balakrishnan
1908e5efa4 add sivteck to maintainers list 2017-09-19 09:43:10 +05:30
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
Jörg Thalheim
419869269d Merge pull request #28635 from ThomasMader/ldc
Init ldc at 1.3.0, fix bootstrap dmd build, fix dtools test, run dmd-testsuite in checkPhase and fix Foundation framework
2017-09-15 10:32:10 +01:00
Muhammad Herdiansyah
0e09b79bcc
maintainer: change email 2017-09-15 10:17:12 +02:00
Jörg Thalheim
0febf8d43c Merge pull request #29304 from woffs/oysttyer
oysttyer-2.9.1
2017-09-13 23:17:45 +01:00
Joachim F
9580bafbb1 Merge pull request #25525 from emanueleperuffo/alc1100
epson-alc1100: init at version 1.2-0
2017-09-13 21:12:34 +00:00
John Ericson
8fccaa284d Merge pull request #29282 from obsidiansystems/soext
lib, treewide: Add `*Platform.extensions` and use it where possible
2017-09-13 11:20:06 -04:00
John Ericson
741839a687 lib: Add *Platform.extensions
This is used to platform specific library and exectuable extensions. In
the next commit I'll replace a bunch of ad-hoc logic with it.
2017-09-13 11:07:50 -04:00
Frank Doepper
9c4233f7b6 oysttyer: init at 2.9.1
A Perl Console Twitter Client
2017-09-13 16:38:15 +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
Will Fancher
dbd5009376 Merge branch 'master' into improved-make-overridable 2017-09-12 17:30:35 -04:00
Jean-Philippe Bernardy
1ba197f225 make my maintainer handle match my github username 2017-09-12 15:17:18 +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
Hamish Hutchings
e0b81b9c3c Traefik init at 1.3.8 2017-09-11 18:19:49 +01:00
Matthieu Coudron
f31c6c150a python.pkgs.secretstorage: init at 2.3.1 2017-09-07 09:28:02 +02:00
Gabriel Adomnicai
7c08e86be9 mmake: init at 1.2.0 (#28904)
* Package for mmake

* Package for mmake - build from sources

* Package name update

* Added maintainers
2017-09-05 15:00:22 +01:00
Laure Tavard
bf491f8794 cdo: init at 1.7.2 (#22496) 2017-09-05 13:40:20 +01:00
Vladimír Čunát
65f6e6ccb6
licenses: fix fullName capitalization
inspired by repology.org
2017-09-05 00:22:00 +02:00
Michele Catalano
4ea1d49643 nexus: Add module for nexus.
Add also myself as maintainer
Add simple test of the nexus service
2017-09-04 22:32:02 +02:00
Andrew Cobb
9dc256099f kupfer: init at 319 (#28719)
* kupfer: init at 319

* kupfer: wrap with wrapGAppsHook

* kupfer: fixing up runtime dependencies

* kupfer: added cobbal as maintainer
2017-09-02 14:11:10 +01:00
Thomas Mader
8a2a3dad80 ldc: Init at 1.3.0 2017-09-02 08:30:17 +02:00
Frederik Rietdijk
6d4bd78fad Merge commit '2858c41' into HEAD 2017-08-30 21:07:07 +02:00
Domen Kožar
97a4088d33
Add lib.mod: integer modulus 2017-08-30 14:32:27 +02:00
Dan Peebles
e2589b3ca2 Deduplicate some filterSource invocations
This version should have more conventional regexes that work across many
platforms and regex engines. This is an issue because up until Nix 1.11,
Nix called out to the libc regex matcher, which behaved differently on
Darwin and Linux. And in Nix 1.12, we're moving to std::regex which will
also behave differently here.

And yes, I do actually evaluate make-disk-image.nix on Darwin ;)
2017-08-29 20:27:04 -04:00
Jörg Thalheim
bf03f3c4cb Merge pull request #28570 from sorpaas/btc1-init
btc1: init at 1.14.5
2017-08-29 11:52:51 +01:00
Vladimír Čunát
2858c41823
Merge branch 'master' into staging
There were some conflicts in python modules, commented at #28314.
2017-08-29 10:51:54 +02:00
Claas Augner
03b08fca66 nextcloud-client 2.3.2 (#28645)
* nextcloud-client: init at 2.3.2

* nextcloud-client: nitpicks
2017-08-28 21:33:51 +01:00
Will Fancher
4d860389d8 Merge branch 'master' into improved-make-overridable 2017-08-26 11:39:13 -04:00
Alvar
ffa499f9ec et: init at 2017-03-04 (#28427) 2017-08-26 13:36:31 +01:00
Jörg Thalheim
c63a619820 Merge pull request #28458 from danbst/patch-11
Nix minimal version: 1.10 -> 1.11
2017-08-26 00:26:06 +01:00
Phil
4f2935390e nixos/usbguard: create package and module (#28363)
* nixos/usbguard: create package and module

No usbguard module or package existed for NixOS previously. USBGuard
will protect you from BadUSB attacks. (assuming configuration is done
correctly)

* nixos/usbguard: remove extra packages

Users can override this by themselves.

* nixos/usbguard: add maintainer and fix style
2017-08-25 23:35:18 +01:00
Frederik Rietdijk
665d393919 Merge remote-tracking branch 'upstream/master' into HEAD 2017-08-25 19:39:41 +02:00
Wei Tang
aabdd37cb9 btc1: init at 1.14.5
A portion of Bitcoin users (including the super-majority of the
miners) decided to hard fork to segwit2x around this November. At that
time this will not be compatible with the Bitcoin Core client. 1.14.5
is known as "the Production Release".
2017-08-26 01:05:46 +08:00
Jörg Thalheim
6ec7c5cff2 Merge pull request #28488 from alunduil/add-alunduil-maintainer
add alunduil as collection-json maintainer
2017-08-25 13:16:06 +01:00
WilliButz
3ac73fbb81
maintainers: add myself 2017-08-24 21:20:03 +02:00
Tuomas Tynkkynen
5674da5aed Fix "treewide: Consistently call ARM 'arm'"
0c0fad6141 was broken. I didn't realize there's some hidden
metaprogramming code where one can't even grep for 'isFoo' to find its
definition :(
2017-08-24 14:43:57 +03:00
Tuomas Tynkkynen
2fc7651b25 Merge remote-tracking branch 'upstream/master' into staging 2017-08-24 02:08:32 +03:00
Tuomas Tynkkynen
0c0fad6141 treewide: Consistently call ARM 'arm'
No need for silly differences.
2017-08-24 01:17:01 +03:00
Peter Hoeg
f15d7388d8 Revert "add apache2 license"
This reverts commit 508c998318.
2017-08-23 23:50:28 +08:00
Peter Hoeg
508c998318 add apache2 license 2017-08-23 22:50:25 +08:00
Alex Brandt
8b4fec00e0 add alunduil as collection-json maintainer 2017-08-22 18:31:08 -05:00
Dmitry Marakasov
6461b609db Fix maintainer email 2017-08-22 19:07:42 +02:00
Danylo Hlynskyi
cc28cf11f0 Nix minimal version: 1.10 -> 1.11
`ruby` attribute requires features from 1.11
```
$ nix-build -A ruby
error: cannot coerce a set to a string, at pkgs/development/interpreters/ruby/default.nix:57:17
```
2017-08-22 13:28:55 +03:00
Christian Albrecht
964799e556 sks and pgpkeyserver-lite modules: init (#27515)
* modules sks and pgpkeyserver-lite:
  runs the sks keyserver with optional nginx proxy for webgui.
* Add calbrecht to maintainers
* module sks: fix default hkpAddress value
* module pgpkeyserver-lite: make hkpAddress a string type option
  and use (builtins.head services.sks.hkpAddress) as default value
* module sks: remove leftover service dependencies
2017-08-22 12:27:00 +02:00
Divam
e5a43bd408 openfst: init at 1.6.3 (#28430) 2017-08-22 09:39:22 +02:00
Klaas van Schelven
53d67bcc26 readline 7.0 -> 7.0.3
Discussion: https://groups.google.com/forum/#!topic/nix-devel/agupzdm352Q
2017-08-18 08:55:44 +02:00