Commit Graph
100 Commits
Author SHA1 Message Date
Alyssa Ross 626cc7eb21 Merge pull request #52860 from marsam/init-ruby-26
ruby_2_6: init at 2.6.0
2018-12-26 20:49:08 +00:00
Alyssa Ross fea0e9fbf3 mailcore2: 0.6.2 -> 0.6.3 2018-12-22 18:26:03 +00:00
Alyssa Ross a2eed09a8c Merge pull request #52416 from alyssais/icu
icu63: init at 63.1
2018-12-21 16:07:40 +00:00
Alyssa Ross dafdadda3a Merge pull request #52440 from alyssais/bundler
bundler: 1.17.1 -> 1.17.2
2018-12-20 14:34:02 +00:00
Alyssa Ross 843b40ff6b bundix: add qyliss (me) to maintainers 2018-12-20 14:31:13 +00:00
Alyssa Ross ce66baaf71 CODEOWNERS: add @alyssais (me) to Ruby 2018-12-20 14:29:32 +00:00
Alyssa Ross 70b8ab6e72 icu63: init at 63.1 2018-12-17 15:14:45 +00:00
Alyssa Ross 8e98e48a43 bundler: 1.17.1 -> 1.17.2 2018-12-17 14:28:40 +00:00
Alyssa Ross 1f94515941 Merge pull request #52412 from marsam/update-gopass
gopass: 1.8.2 -> 1.8.3
2018-12-17 00:35:25 +00:00
Alyssa Ross fdc6caf144 nss: 3.40.1 -> 3.41 2018-12-16 14:22:54 +00:00
Alyssa Ross 24e6074a28 Merge pull request #51672 from acowley/vulkan-validation
vulkan-validation-layers: 1.1.82.0 -> 1.1.85.0
2018-12-16 11:28:25 +00:00
Alyssa Ross 18af61c1df Merge pull request #52197 from Tomahna/bloop
bloop: 1.1.1 -> 1.1.2
2018-12-15 14:19:59 +00:00
Alyssa Ross 6ccc922e1d Merge pull request #51953 from WilliButz/grafana-update
grafana: 5.4.1 -> 5.4.2
2018-12-13 21:55:29 +00:00
Alyssa Ross c5b825ca28 Merge pull request #51860 from ivan/fix-jdk11_headless
jdk11_headless: fix the build on amd64
2018-12-13 11:45:21 +00:00
Alyssa Ross 64f73752fc Merge pull request #51928 from neonfuz/retroarch-1.7.5
retroarch: 1.7.1 -> 1.7.5
2018-12-13 10:17:55 +00:00
Alyssa Ross b450083ee3 Merge pull request #51884 from alyssais/bundlerEnv-groups
bundlerEnv: improve handling of groups
2018-12-12 23:51:52 +00:00
Alyssa Ross 77d25015e6 Merge pull request #51909 from Izorkin/mysql55
mysql55: 5.5.60 -> 5.5.62
2018-12-12 17:21:34 +00:00
Alyssa Ross 812805110b Merge pull request #51887 from AtnNn/ikos
ikos: init at 2.1
2018-12-12 09:06:36 +00:00
Alyssa Ross 26053cae74 bundlerEnv: always include default gems
"default" isn't really a group, it's more the absence of one. With
Bundler, this means that a gem should be installed unconditionally,
regardless of which groups are specified. It doesn't really make sense
to allow these gems to be omitted from a bundlerEnv.
2018-12-11 21:26:09 +00:00
Alyssa Ross 83a2d993d4 bundlerEnv: include all groups by default
This wasn't really an issue until the latest minor release of Bundix
(2.4), because prior to then Bundix didn't emit group attributes, and so
this functionality of bundlerEnv wasn't really used. However, it is now
apparent that a better default for bundlerEnv would be to include all
gem groups by default, not just the default group. This matches the
behavior of Bundler, and makes more sense, because the default group
alone isn't necessarily useful for anything -- consider a Rails app with
production, development, and test groups. It has the additional benefit
of being backwards compatible with how this would have worked before the
Bundix update.
2018-12-11 21:26:08 +00:00
Alyssa Ross 67b1265fb3 bundlerEnv: ensure dependencies always included
Suppose I have a Gemfile like this:

    source "https://rubygems.org"
    gem "actioncable"
    gem "websocket-driver", group: :test

The gemset.nix generated by Bundix 2.4.1 will set ActionCable's groups
to [ "default" ], and websocket-driver's to [ "test" ]. This means that
the generated bundlerEnv wouldn't include websocket-driver unless the
test group was included, even though it's required by the default group.

This is arguably a bug in Bundix (websocket-driver's groups should
probably be [ "default" "test" ] or just [ "default" ]), but there's no
reason bundlerEnv should omit dependencies even given such an input --
it won't necessarily come from Bundix, and it would be good for
bundlerEnv to do the right thing.

To fix this, filterGemset is now a recursive function, that adds
dependencies of gems in the group to the filtered gemset until it
stabilises on the gems that match the required groups, and all of their
recursive dependencies.
2018-12-11 21:26:07 +00:00
Alyssa Ross 1a69b3303f Merge pull request #51865 from rawkode/feature/fix-wavebox-deps
wavebox: 4.5.3 -> 4.5.5
2018-12-11 13:02:45 +00:00
Alyssa Ross 3bfef3fe40 Merge pull request #51862 from Taneb/metamath-update
metamath: 0.167 -> 0.168
2018-12-11 09:43:46 +00:00
Alyssa Ross 017390185a Merge pull request #51817 from qolii/linux_hardkernel_4_14_78__4_14_85
linux_hardkernel_4_14: 4.14.78-150 -> 4.14.85.152
2018-12-10 17:08:37 +00:00
Alyssa Ross c9ead109ca Merge pull request #51725 from das-g/geckodriver-0.22.0
geckodriver: unstable-2018-02-24 -> 0.22.0
2018-12-10 15:57:45 +00:00
Alyssa Ross bef8c1344d Merge pull request #51669 from alyssais/vbox
virtualbox: 5.2.14 -> 5.2.22
2018-12-08 15:22:31 +00:00
Alyssa Ross 0e8e02e686 Merge pull request #51214 from rnhmjoj/wine
winePackages.wine: add SDL support
2018-12-07 22:44:13 +00:00
Alyssa Ross 716a38d015 Merge pull request #51620 from smaret/gildas-update
gildas: 20181101_a -> 20181201_a
2018-12-07 17:43:56 +00:00
Alyssa Ross 33c66f0e18 Merge pull request #51625 from vdemeester/update-skaffold
skaffold: 0.18.0 -> 0.19.0
2018-12-07 17:42:22 +00:00
Alyssa Ross 21ed8b1e40 Merge pull request #51665 from plapadoo/opus-tools-0.1.10-to-0.2
opusTools: 0.1.10 -> 0.2
2018-12-07 17:34:37 +00:00
Alyssa Ross 1efca5e558 Merge pull request #51667 from pacien/patch-2
todoman: 3.4.1 -> 3.5.0
2018-12-07 17:20:25 +00:00
Alyssa Ross c7798cffb6 Merge pull request #51666 from holidaycheck/update-grobi
grobi: 0.3.0 -> 0.5.1
2018-12-07 17:16:35 +00:00
Alyssa Ross 698b613564 virtualboxExtpack: 5.2.14 -> 5.2.22
Looks like the URL format has changed. Or maybe this is just the first
version and doesn't have a revision? I don't know.
2018-12-07 16:05:55 +00:00
Alyssa Ross d41661cea7 virtualbox: 5.2.14 -> 5.2.22
I had to drop xorriso because it didn't seem to want to compile with it
any more, and had to add libopus as a build input because it wouldn't
compile without that.
2018-12-07 16:04:49 +00:00
Alyssa Ross 703827f36c nginx: 1.14.1 -> 1.14.2 2018-12-05 10:56:06 -06:00
Alyssa Ross 6dc9347712 weechat: fix bad merge
Identified in https://github.com/NixOS/nixpkgs/pull/44102/commits/8887e1f697d9e13ad277ca7d7054bc42c2459548#r239097413.

9504292b1e accidentally reverted all the
changes that had been made to the weechat wrapper since
8887e1f697.

I removed the wrapper, then wrote it again, but this time taking the
code from the latest version of weechat before the bad merge.
2018-12-05 15:21:19 +00:00
Alyssa Ross 33e6c84753 jenkins: 2.138.3 -> 2.150.1
Fixes several security issues.

See https://jenkins.io/blog/2018/12/05/security-updates/.
2018-12-05 12:49:37 +00:00
Alyssa Ross fa749ac858 linux_latest-libre: document finding latest rev
https://github.com/NixOS/nixpkgs/pull/51403#issuecomment-444064006
2018-12-04 12:08:30 +00:00
Alyssa Ross d9eb8c760e doc: reminder to upgrade linux-libre with linux
https://github.com/NixOS/nixpkgs/pull/51403#issuecomment-444061264
2018-12-04 12:04:03 +00:00
Alyssa Ross 6bda83a64d doc: document upgrading Ruby packages
As requested[1] by @Ekleog.

[1]: https://github.com/NixOS/nixpkgs/pull/51040#issuecomment-441642763
2018-11-28 13:19:22 +00:00
Alyssa Ross dcae76862b nginxMainline: 1.15.6 -> 1.15.7 2018-11-27 21:28:49 +00:00
Alyssa Ross c41c195dc5 postgresql: disable parallel building on Darwin
There have been multiple reports of this failing.

Fixes https://github.com/NixOS/nixpkgs/issues/51093.
2018-11-27 20:13:23 +00:00
Alyssa Ross debe712d7a pew: add homepage 2018-11-25 23:07:06 +00:00
Alyssa Ross 40589583c5 pew: fix build
Fixes https://github.com/NixOS/nixpkgs/issues/51034.
2018-11-25 23:07:05 +00:00
Alyssa Ross 1268b38254 Revert "Use older version of jailbreak-cabal with ghcHEAD"
This reverts commit d13f7c54e3.

ghc802 is no longer in Nixpkgs as of
2f0de54ddb.

The Cabal bug that ghc802 was a workaround for was fixed in Cabal 2.2,
though, so this shouldn't be necessary any more.

Upstream bugs:
https://github.com/peti/jailbreak-cabal/issues/13
https://github.com/haskell/cabal/issues/4719

Fixes https://github.com/NixOS/nixpkgs/issues/51042.
2018-11-25 22:47:25 +00:00
Alyssa Ross 3ec6262cca rake: 12.0.0 -> 12.3.1
Fixes https://github.com/NixOS/nixpkgs/issues/36912.
2018-11-25 18:56:52 +00:00
Alyssa Ross d012516c44 openssl_1_1: 1.1.1 -> 1.1.1a
CVE-2018-0734: https://www.openssl.org/news/vulnerabilities.html#2018-0734
CVE-2018-0735: https://www.openssl.org/news/vulnerabilities.html#2018-0735
2018-11-20 16:52:22 +00:00
Alyssa Ross ae29a9e688 openssl: 1.0.2p -> 1.0.2q
CVE-2018-0734: https://www.openssl.org/news/vulnerabilities.html#2018-0734
CVE-2018-5407: https://www.openssl.org/news/vulnerabilities.html#2018-5407

No patches can any longer be shared between 1.0.2 and 1.1, so reorganize
patches into subdirectories (and remove an unused one).
2018-11-20 16:51:48 +00:00
Alyssa Ross cb0197cc65 libreoffice-fresh: 6.1.2.1 -> 6.1.3.2 2018-11-18 11:52:12 +00:00
Alyssa Ross c1f30daee4 libreoffice-still: 6.0.6.2 -> 6.0.7.3 2018-11-18 11:51:46 +00:00
Alyssa Ross 874468f23e qt59.qtwebkit: fix build on Darwin 2018-11-17 23:17:27 +00:00
Alyssa Ross de9026de6e nginxMainline: 1.15.5 -> 1.15.6
CVE-2018-16843, CVE-2018-16844

https://nginx.org/en/security_advisories.html
2018-11-15 17:52:05 +00:00
Alyssa Ross 1908322d10 nginxStable: 1.14.0 -> 1.14.1
CVE-2018-16843, CVE-2018-16844

https://nginx.org/en/security_advisories.html
2018-11-15 17:51:51 +00:00
Alyssa Ross b4bdaa0f18 bundler: 1.16.4 -> 1.17.1 2018-11-15 17:41:20 +00:00
Alyssa Ross 934e489401 rust: 1.30.0 -> 1.30.1 2018-11-09 15:27:52 +00:00
Alyssa Ross 652e59965a asciidoctor: rack: 2.0.5 -> 2.0.6
CVE-2018-16470: https://seclists.org/oss-sec/2018/q4/128
CVE-2018-16471: https://seclists.org/oss-sec/2018/q4/129
2018-11-06 09:23:28 +00:00
Alyssa Ross df68cd5ea3 bcat: rack: 1.6.8 -> 1.6.11
CVE-2018-16470: https://seclists.org/oss-sec/2018/q4/128
CVE-2018-16471: https://seclists.org/oss-sec/2018/q4/129
2018-11-06 09:23:27 +00:00
Alyssa Ross e2d72ed954 metasploit: rack: 1.6.8 -> 1.6.11
CVE-2018-16470: https://seclists.org/oss-sec/2018/q4/128
CVE-2018-16471: https://seclists.org/oss-sec/2018/q4/129
2018-11-06 09:23:26 +00:00
Alyssa Ross b5931668c2 oxidized: rack: 1.6.9 -> 1.6.11
CVE-2018-16470: https://seclists.org/oss-sec/2018/q4/128
CVE-2018-16471: https://seclists.org/oss-sec/2018/q4/129
2018-11-06 09:23:25 +00:00
Alyssa Ross 5c8d153326 frab: rack: 1.6.4 -> 1.6.11
CVE-2018-16470: https://seclists.org/oss-sec/2018/q4/128
CVE-2018-16471: https://seclists.org/oss-sec/2018/q4/129
2018-11-06 09:23:23 +00:00
Alyssa Ross 26bf4b3df3 riemann-dash: rack: 1.6.4 -> 1.6.11
CVE-2018-16470: https://seclists.org/oss-sec/2018/q4/128
CVE-2018-16471: https://seclists.org/oss-sec/2018/q4/129
2018-11-06 09:23:22 +00:00
Alyssa Ross f2d0e1800d mailcatcher: rack: 1.6.8 -> 1.6.11
CVE-2018-16470: https://seclists.org/oss-sec/2018/q4/128
CVE-2018-16471: https://seclists.org/oss-sec/2018/q4/129
2018-11-06 09:23:20 +00:00
Alyssa Ross 96f23c4cdd chefdk: rack: 2.0.3 -> 2.0.6
CVE-2018-16470: https://seclists.org/oss-sec/2018/q4/128
CVE-2018-16471: https://seclists.org/oss-sec/2018/q4/129
2018-11-06 09:23:19 +00:00
Alyssa Ross 63e5658222 redmine: rack: 1.6.10 -> 1.6.11
CVE-2018-16470: https://seclists.org/oss-sec/2018/q4/128
CVE-2018-16471: https://seclists.org/oss-sec/2018/q4/129
2018-11-06 09:23:18 +00:00
Alyssa Ross 3c7bbb5850 gitlab: rack: 1.6.10 -> 1.6.11
CVE-2018-16470: https://seclists.org/oss-sec/2018/q4/128
CVE-2018-16471: https://seclists.org/oss-sec/2018/q4/129
2018-11-06 09:23:17 +00:00
Alyssa Ross 9f750d959e ledger-web: rack: 1.6.4 -> 1.6.11
CVE-2018-16470: https://seclists.org/oss-sec/2018/q4/128
CVE-2018-16471: https://seclists.org/oss-sec/2018/q4/129
2018-11-06 09:23:16 +00:00
Alyssa Ross 5b2da1ab19 gollum: rack: 1.6.10 -> 1.6.11
CVE-2018-16470: https://seclists.org/oss-sec/2018/q4/128
CVE-2018-16471: https://seclists.org/oss-sec/2018/q4/129
2018-11-06 09:23:14 +00:00
Alyssa Ross 39edfe5a2d doh-proxy: init at 0.0.8 2018-10-31 17:47:25 +00:00
Alyssa Ross 1f1bd5c8e8 python3Packages.aioh2: init at 0.2.2
Tests skipped due to https://github.com/decentfox/aioh2/issues/17.
2018-10-31 17:47:24 +00:00
Alyssa Ross cd1ff3bede python3Packages.aiohttp_remotes: init at 0.1.2 2018-10-31 13:08:40 +00:00
Alyssa Ross 5bde0f6002 release notes: update for postgres rename 2018-10-30 14:33:36 +00:00
Alyssa Ross 91c746cacc postgresql_11: init at 11.0 2018-10-30 14:33:35 +00:00
Alyssa Ross c6c7d55790 postgresql*: use underscores in version numbers 2018-10-30 14:32:21 +00:00
Alyssa Ross 94360c11e9 docs: update sample postgresql package
postgresql90 no longer exists in nixpkgs.
2018-10-30 12:40:24 +00:00
Alyssa Ross 9594b59f13 postgresql10: rename from postgresql100 2018-10-30 12:40:20 +00:00
Alyssa Ross 69dcb1a2c0 bundlerApp: take buildInputs (#45435)
It would be reasonable to have a Ruby program that depends on some other
program being in the PATH. In this case, the obvious thing to do would
be something like this:

    bundlerApp {
      # ...
      buildInputs = [ makeWrapper ];
      postBuild = ''
        wrapProgram "$out/bin/foo" \
          --prefix PATH : ${lib.makeBinPath [ dep ]}
      '';
    }

However, this doesn't work, because even though it just forwards most of
its arguments to `runCommand`, `bundlerApp` won't take a `buildInputs`
parameter. It doesn't even specify its own `buildInputs`, which means
that the `scripts` parameter to `bundlerApp` (which depends on
`makeWrapper`) is completely broken, and, as far as I can tell, has been
since its inception. I've added a `makeWrapper` build input if the
scripts parameter is present to fix this.

I've added a `buildInputs` option to `bundlerApp`. It's also passed
through to bundled-common because `postBuild` scripts are run there as
well. This actually means that in this example we'd end up going through
two layers of wrappers (one from `bundlerApp` and one from
bundled-common), but that has always been the case and isn't likely to
break anything. That oddity does suggest that it might be prudent to
not forward `postBuild` to bundled-common (or to at least use a
different option) though...

FWIW, as far as I can tell no package in nixpkgs uses either the
`scripts` or `postBuild` options to `bundlerApp`.
2018-10-29 22:39:51 +01:00
Alyssa Ross a586c14cc4 python3Packages.priority: init at 1.3.0 2018-10-29 12:28:20 +00:00
Alyssa Ross c49aa0d0df bb: add Darwin compatibility
It even has working sound, unlike on Linux!
2018-10-29 10:53:24 +00:00
Alyssa Ross 2702772d2d weechat: 2.2 -> 2.3
Fixes https://github.com/NixOS/nixpkgs/issues/48798.
2018-10-25 11:44:22 +00:00
Alyssa Ross 4807e04283 libmikmod: remove duplicate libpulseaudio dep
This is already included as a propagatedBuildInput, so no need to have
it also be a buildInput.
2018-10-24 23:32:23 +01:00
Alyssa Ross 0db57307e6 perlPackages.XMLFeedPP: init at 0.95 (#48816) 2018-10-23 19:50:21 +02:00
Alyssa Ross c0ad5bc839 gem-config: capybara-webkit: qt48 -> qt59
> WARNING: The next major version of capybara-webkit will require at
> least version 5.0 of Qt. You're using version 4.8.7.

I went to 5.9 instead of 5.11 because 5.11 doesn't currently build on
Darwin, whereas 5.9 can build on both Darwin and Linux, and is still
well within the >=5.0 requirement.
2018-10-23 16:14:21 +01:00
Alyssa Ross e20e1e5c2c weechat: add perl.withPackages (#48815)
Allows for adding Perl libraries in the same way as for Python. Doesn't
really need to be a function, since there's only one perlPackages in
nixpkgs, but I went for consistency with the python plugin.
2018-10-23 12:23:47 +02:00
Alyssa Ross 1c70685fdb qt59.qtwebkit: fix build on Darwin
Why is qtmultimedia only needed on Darwin? Why does it only fix 5.9, not
5.11? These things I do not know. What I do know is that, for some
reason, this makes qt59.qtwebkit build on Darwin.

I think the reason it hasn't also fixed 5.11 might be something to do
with the version of qtmultimedia, but I don't know enough about Qt or
cmake to figure it out. The error when trying to build qt511.qtwebkit
(with or without these changes) is:

    CMake Error at Source/cmake/OptionsQt.cmake:739 (find_package):
      Could not find a package configuration file provided by "Qt5Multimedia"
      (requested version 5.2.0) with any of the following names:

        Qt5MultimediaConfig.cmake
        qt5multimedia-config.cmake

      Add the installation prefix of "Qt5Multimedia" to CMAKE_PREFIX_PATH or set
      "Qt5Multimedia_DIR" to a directory containing one of the above files.  If
      "Qt5Multimedia" provides a separate development package or SDK, be sure it
      has been installed.
    Call Stack (most recent call first):
      Source/cmake/WebKitCommon.cmake:50 (include)
      CMakeLists.txt:137 (include)

    -- Configuring incomplete, errors occurred!
    See also "/tmp/nix-build-qtwebkit-5.212-alpha-01-26-2018.drv-0/source/build/CMakeFiles/CMakeOutput.log".
    See also "/tmp/nix-build-qtwebkit-5.212-alpha-01-26-2018.drv-0/source/build/CMakeFiles/CMakeError.log".
2018-10-19 10:36:48 +01:00
Alyssa Ross 7026831c7a bundler: 1.16.3 -> 1.16.6 2018-10-17 16:20:03 +01:00
Alyssa Ross da3529718d gem-config: add sassc (#48212) 2018-10-11 21:04:29 +02:00
Alyssa Ross 7e3b43d75a webhook: init at 2.6.8 2018-10-05 12:14:49 +01:00
Alyssa Ross c1dbb90bfd lightdm: add extraConfig option (#47630) 2018-10-02 00:35:32 +02:00
Alyssa Ross d152089772 ranger: syntax highlight previews by default 2018-09-27 18:38:26 +01:00
Alyssa Ross 4f14ccee07 ranger: fix out-of-the-box previews
I'm guessing this became commented out by default at some point.
2018-09-27 18:21:29 +01:00
Alyssa Ross 1ec301ded2 openssl: 1.1.0 -> 1.1.1 (#46524) 2018-09-12 23:56:08 +00:00
Alyssa Ross e2bdf5ea3b zsh-history-substring-search: init at 1.0.1 2018-09-11 13:59:54 +01:00
Alyssa Ross 902dea15ec cargo-edit: use buildRustPackage instead of Carnix
Saving 3000 lines of Nix code.
2018-09-11 13:34:21 +01:00
Alyssa Ross 7cafc36d28 cargo-edit: 0.2.0 -> 0.3.0 2018-09-05 15:34:34 +01:00
Alyssa Ross 9f3707d83a cargo-download: add Security build input on darwin 2018-09-04 10:32:05 +01:00
Alyssa Ross 4af7278bc9 lib: ensure directories of linkFarm links exist (#45628)
There's no reason `linkFarm` can't be used for symlinks in
subdirectories, except that currently it doesn't ensure the directory
of the link exists. This backwards-compatible change expands the utility
of the function.
2018-09-01 14:53:23 +02:00
Alyssa Ross 7b4c7c4b59 extract_url: init at 1.6.2 (#45624)
Squashed from:
* extract_url: init at 1.6.2
* extract_url: purify build
* extract_url: move src to more conventional place
* extract_url: don't unnecessarily propagate
* extract_url: use installFlags instead of patch
* extract_url: use URL literal instead of string
* extract_url: fix make flags style
* extract_url: remove PodChecker dependency
2018-08-30 17:10:00 +02:00
Alyssa Ross f4745bef6c makeWrapper: document --set-default 2018-08-24 19:46:16 +02:00
Alyssa Ross a202c25ff7 linux-libre: add myself as a maintainer 2018-08-21 11:14:38 +01:00
Alyssa Ross 34a7e678b2 linux-libre: init 2018-08-21 00:39:39 +02:00