Commit Graph
51 Commits
Author SHA1 Message Date
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
Alyssa Ross 33a1044c32 linuxPackages*.openafs*: use modDirVersion
`version` doesn't include .0 patch versions, or suffixes (eg -gnu).
For .0 patch versions, this isn't a problem, since the glob takes care
of everything after a `.`. It does, however, prevent openafs installing
for suffixed kernels.
2018-08-21 00:39:38 +02:00
Alyssa Ross 54903b3c12 linuxPackages_4_18.tbs: broken 2018-08-21 00:34:57 +02:00
Alyssa Ross 9f55f04da2 linuxPackages_4_18.spl: broken 2018-08-21 00:34:56 +02:00
Alyssa Ross 462c91d02a linuxPackages_4_18.phc-intel: broken 2018-08-21 00:34:55 +02:00
Alyssa Ross 358ca401da linuxPackages_4_18.openafs_1_8: broken 2018-08-21 00:34:54 +02:00
Alyssa Ross 8a66aacad7 linuxPackages_4_18.openafs: broken 2018-08-21 00:34:53 +02:00
Alyssa Ross dd2f3fd8f8 linuxPackages_4_18.exfat-nofuse: broken 2018-08-21 00:34:38 +02:00
Alyssa Ross 29cdef4b89 linuxPackages_4_18.beegfs-module: broken 2018-08-21 00:34:09 +02:00
Alyssa Ross 0e374a1b9c slack-cli: fix dirname hack 2018-08-15 16:59:05 +01:00
Alyssa Ross 026f49e28c slack-cli: remove wrapper package 2018-08-15 15:48:23 +01:00
Alyssa Ross 0a57de6f5b slack-cli: add metadata 2018-08-15 15:47:24 +01:00
Alyssa Ross e276965a16 slack-cli: warn when not using SLACK_CLI_TOKEN 2018-08-15 15:47:19 +01:00
Alyssa Ross 3116e6e6b9 gem-config: add curses (#45068) 2018-08-15 14:32:50 +01:00
Alyssa Ross dac2235c1a slack-cli: quote shell variables 2018-08-15 12:32:19 +01:00
Alyssa Ross d2eacdcd65 slack-cli: use nativeBuildInputs for makeWrapper 2018-08-15 12:32:00 +01:00
Alyssa Ross 838473d3c5 slack-cli: add version to name 2018-08-15 12:28:43 +01:00
Alyssa Ross ccc8dd222e slack-cli: use fetchFromGitHub instead of fetchurl 2018-08-15 11:36:28 +01:00
Alyssa Ross 8d2ab1d914 slack-cli: init at 0.18.0
slack-cli must be configured using the SLACK_CLI_TOKEN environment
variable. Using `slack init` will not work because it tries to write to
the Nix store.
2018-08-15 09:56:04 +01:00
Alyssa Ross 98b8d4cfbc environment.extraInit: fix description typo 2018-08-13 14:28:52 +01:00
Alyssa Ross 0d3b2b6990 cargo-download: init at 0.1.1
Cargo.nix was generated from cargo-download 0.1.1 with this patch
applied, which was necessary to not confuse carnix about the version
being different between Cargo.toml and Cargo.lock.

See https://github.com/Xion/cargo-download/pull/3.

From 5efd4cf11ff9d5042712303404169016b1e05c33 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Thu, 26 Jul 2018 21:19:06 +0200
Subject: [PATCH] Fix Cargo.lock

Running `cargo build` on a clean checkout produces a diff in Cargo.lock,
because it wasn't updated after the version number was bumped.

After this commit, `cargo build` should no longer produce a modified
working tree.
---
 Cargo.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Cargo.lock b/Cargo.lock
index cc7357c..c384dc1 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -76,7 +76,7 @@ dependencies = [

 [[package]]
 name = "cargo-download"
-version = "0.1.0"
+version = "0.1.1"
 dependencies = [
  "ansi_term 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "clap 2.27.1 (registry+https://github.com/rust-lang/crates.io-index)",
--
2.17.1
2018-08-13 12:18:57 +01:00
Alyssa Ross 43b6d46f4f puppet-lint: init at 2.3.6 2018-08-13 11:37:59 +01:00
Alyssa Ross 1186bdbf7e triton: init at 6.1.2 2018-08-07 15:46:39 +01:00
Alyssa Ross 011c6411f3 bundler: 1.16.2 -> 1.16.3 2018-08-03 15:59:38 +01:00
Alyssa Ross 4e33431b62 pythonPackages.potr: 1.0.1 -> 1.0.2 (#44096) 2018-07-29 21:12:58 +02:00
Alyssa Ross 1f47fe8442 gem-config: add libxml2-ruby (#44099) 2018-07-26 18:51:17 +01:00
Alyssa Ross cfbe0ef315 gem-config: add zookeeper (#44100) 2018-07-26 18:50:42 +01:00
Alyssa Ross 14e5e8a15a gem-config: fix capybara-webkit on Darwin 2018-07-25 17:28:24 +01:00
Alyssa Ross 20070b4ba0 gotop: works on non-Linux Unixes
From the README:

> Working and tested on Linux and OSX, with Windows support being worked
> on.
2018-07-23 11:45:28 +00:00
Alyssa Ross 9e1e63ce0e doc: add missing semicolon to weechat example (#44003) 2018-07-23 10:48:11 +01:00
Alyssa Ross 165b6391fc vagrant: 2.1.1 -> 2.1.2 (#43416) 2018-07-14 00:41:37 +02:00
Alyssa Ross a269e5ab92 tor-browser-bundle: update license to free
The Tor Browser Bundle is free software under various licenses:

> Can I distribute Tor?
> 
> Yes.
> 
> The Tor software is free software. This means we give you the rights
> to redistribute the Tor software, either modified or unmodified,
> either for a fee or gratis. You don't have to ask us for specific
> permission.
> 
> However, if you want to redistribute the Tor software you must follow
> our LICENSE. Essentially this means that you need to include our
> LICENSE file along with whatever part of the Tor software you're
> distributing.
> 
> Most people who ask us this question don't want to distribute just the
> Tor software, though. They want to distribute the Tor Browser. This
> includes Firefox Extended Support Release, and the NoScript and
> HTTPS-Everywhere extensions. You will need to follow the license for
> those programs as well. Both of those Firefox extensions are
> distributed under the GNU General Public License, while Firefox ESR is
> released under the Mozilla Public License. The simplest way to obey
> their licenses is to include the source code for these programs
> everywhere you include the bundles themselves. 

(https://www.torproject.org/docs/faq.html.en#DistributingTor)

tor-browser-bundle-bin is already marked as licenses.free, so it doesn't
really make sense that this one is marked as unfree.
2018-07-11 23:55:58 +02:00
Alyssa Ross 79ab3370ed manual: fix buildPythonPackage example (#42866) 2018-07-03 17:19:18 +02:00
Alyssa Ross 925fe68e87 bundler: 1.16.1 -> 1.16.2 2018-07-02 11:19:11 +00:00