Commit Graph
46 Commits
Author SHA1 Message Date
Kier Davis 7fb2103196 ckb-next: 0.3.2 -> 0.4.2 2020-01-02 22:53:32 +00:00
Kier Davis 443f1a43ef pythonPackages.pylint: add setuptools
Previously it was missing a runtime dependency on setuptools:

    [kier@saelli:~/checkouts/nixpkgs]$ $(nix-build -A python27Packages.pylint --no-out-link)/bin/pylint
    Traceback (most recent call last):
      File "/nix/store/0k8h6n6nxjcs2j5jp54mfppjbx37hrrg-python2.7-pylint-1.9.5/bin/.pylint-wrapped", line 6, in <module>
        from pylint import run_pylint
      File "/nix/store/0k8h6n6nxjcs2j5jp54mfppjbx37hrrg-python2.7-pylint-1.9.5/lib/python2.7/site-packages/pylint/__init__.py", line 11, in <module>
        from .__pkginfo__ import version as __version__
      File "/nix/store/0k8h6n6nxjcs2j5jp54mfppjbx37hrrg-python2.7-pylint-1.9.5/lib/python2.7/site-packages/pylint/__pkginfo__.py", line 25, in <module>
        from pkg_resources import parse_version
    ImportError: No module named pkg_resources

With this change, the same command now correctly prints pylint's help text.

This only applies to Python 2.
2019-10-28 10:52:50 +01:00
Kier Davis 5e54487080 pius: perl should be a runtime dependency, not a build-time one
Since 61bc03c017, patch-shebangs
now distinguishes between build-time and runtime dependencies.

Prior to this commit, perl was not being placed in patch-shebangs'
search path when it is run during the fixup phase.
2019-07-16 14:28:49 +01:00
Kier Davis 97ef23794b pius: use pname+version instead of name 2019-07-16 13:59:38 +01:00
Kier Davis d914be56a2 pius: dependency on package 'six' is no longer needed 2019-07-16 13:52:41 +01:00
Kier Davis 680ee0a45a pius: switch to Python 3
pius 3.0.0 requires Python 3.
2019-07-16 13:51:26 +01:00
Kier Davis d5c65caaae modd: init at 0.8 2019-04-22 22:18:42 +01:00
Kier Davis d700803323 pius: fix dependencies
`perl` needs to be a native build input to ensure that it is
present in `PATH` during the build, allowing `patchShebangs` to
correctly fix the shebang in `pius-party-worksheet`. Previously,
the shebang was left as `/usr/bin/perl` because `perl` could not
be found by `patchShebangs`.

`six` is a required dependency of `pius` and likely should have
been included in the derivation a long time ago, since the `pius`,
`pius-report` and `pius-keyring-mgr` commands are broken without it.
Annoyingly, `pius` still uses `distutils` rather than `setuptools`
which seems to happily install the package without checking that
its dependencies have been installed.
2019-03-11 13:43:49 +00:00
Kier Davis df462d09e4 hashcat: 4.2.1 -> 5.0.0
This introduces a dependency on xxHash. Unfortunately, hashcat's
build system wants to rebuild xxHash from the source code located
in `<hashcat source root>/deps/git/xxHash`, a Git submodule whose
contents are not included in the source tarball we currently
download.

This could be fixed by either using a recursive git clone instead
a tarball download, or patching the build files to use an existing
installation of xxHash (i.e. the one already provided by Nix). I
believe the latter is preferable since it avoids the situation in
which the xxHash version used by hashcat is different to the xxHash
version used by all other Nix packages.

Fortunately, this situation has been greatly improved [1] since
release 5.0.0; the next release of hashcat should drop usage of
git submodules and provide better support for using existing
installations of dependencies.

[1] https://github.com/hashcat/hashcat/commit/4177e1ee286f80c344f7bae6a65c40192f523e0a
2018-11-17 20:10:52 +00:00
Kier Davis cb750a6a8a freesweep: use fetchFromGitHub instead of fetchurl as per #32997 2018-11-15 06:48:39 +00:00
Kier Davis de009133d4 ckb-next: move option renames to nixos/modules/rename.nix for consistency 2018-11-06 00:50:00 +00:00
Kier Davis 3b7984dd51 Merge branch 'master' into ckb-update-and-cleanup 2018-11-06 00:47:14 +00:00
Kier Davis 7a0d849653 ckb-next: rename ckb-modprobe.patch to modprobe.patch
This keeps the naming consistent with the other two patches in
this directory.
2018-10-22 13:23:30 +01:00
Kier Davis dfdaf39ec3 ckb module: use exec when starting the daemon process
This avoids leaving the parent shell process (the one executing the
unit script) lying around.
2018-10-22 13:23:30 +01:00
Kier Davis 81178785c9 ckb, ckb module: rename to ckb-next
The upstream package has officially changed its name to ckb-next.
2018-10-22 13:23:30 +01:00
Kier Davis 8069b09d05 ckb module: update systemd service parameters to match upstream
This changes the description and restart mode to the values present
in lib/systemd/system/ckb.service within the ckb package.
2018-10-22 13:22:02 +01:00
Kier Davis 85526bce87 ckb-next: 0.2.9 -> 0.3.2
In this update:

* binaries `ckb` and `ckb-daemon` are renamed to `ckb-next` and `ckb-next-daemon`
* build system changed from qmake to cmake
* the directory searched for animation plugins no longer needs to be patched, as a result of the build system change
* modprobe patch has been bumped, since the source repository layout has changed
* the cmake scripts are quite FHS-centric and require patching to fix install locations
2018-10-22 13:22:01 +01:00
Kier Davis 6bfa42218d avrgcc: bake path to avr-ar into avr-gcc-ar
gcc provides wrappers for binutils' ar, nm and ranlib
executables, which must be used instead when using link-time
optimisation. See also:
http://manpages.ubuntu.com/manpages/zesty/man1/aarch64-linux-gnu-gcc-ar-5.1.html

The upstream version of avr-gcc-ar searches in paths passed to
the configure script for the avr-ar binary that it wraps, falling
back to searching PATH instead. Thus currently avr-gcc-ar works on
Nix, but only if avrbinutils is already in the environment.

This change bakes the path to avr-ar into avr-gcc-ar, since its path
is known at compile time. It also no longer searches PATH, meaning the
user's local environment won't override this path.

Note that avr-gcc-nm and avr-gcc-ranlib are compiled from the same
source file as avr-gcc-ar, just with different compiler flags.

Testing on master (without avrbinutils in the environment):

    $ nix-build -A avrgcc
    $ result/bin/avr-gcc-ar --version
    result/bin/avr-gcc-ar: Cannot find binary 'avr-ar'

Testing on branch with this fix:

    $ nix-build -A avrgcc
    $ result/bin/avr-gcc-ar --version
    GNU ar (GNU Binutils) 2.26.20160125
    ...
2018-01-12 00:48:35 +00:00
Kier Davis 397daef205 openvpn: make systemd dependency optional
systemd is a fairly large dependency, and it doesn't appear to
be necessary in all circumstances - e.g. when openvpn is
not run as a systemd service (as is usually the case when it is
run in a Docker container).

This change makes the dependency on systemd optional, controlled
by a new argument `useSystemd`. The default behaviour remains
the same as it was before this change: enabled only on Linux systems.

For me, this change reduces the size of my container image (dominated
by the closure of openvpn) from about 110 MB to 45 MB.

Version 2: rename argument to `useSystemd` (was `systemdSupport`), and
rebase onto master
2018-01-06 15:05:44 +00:00
Kier Davis 537f213ef7 hugo: update dependencies
Generated a new deps.nix by installing hugo into a clean
GOPATH with `go get` and running `go2nix save`.
2017-12-29 23:41:11 +00:00
Kier Davis 901fa266fb hugo: 0.29 -> 0.30.2
Also requires updating the github.com/alecthomas/chroma dependency.
2017-12-29 20:00:43 +00:00
Kier Davis cb9bf1c854 PySolFC: init at 2.0
PySolFC is a solitaire game written in Python, supporting thousands of
solitaire variants.
2017-11-25 09:43:42 +01:00
Kier Davis 4017f0f752 pius: add myself as a maintainer 2017-11-24 11:30:17 +00:00
Kier Davis 1f62cfa6f5 pius: 2.0.11 -> 2.2.4 2017-11-24 11:29:59 +00:00
Kier Davis b354f88327 pius: move source from Sourceforge to Github
Development of pius has moved to Github.
2017-11-24 11:12:51 +00:00
Kier Davis 82b4224a3c ckb: update to ckb-next 0.2.8
The original ckb is no longer maintained. ckb-next is an
active fork with a number of new patches and features.
2017-11-24 00:58:46 +00:00
Kier Davis 9fad70f1de boinc service: use an FHS environment
While BOINC itself is open source, many of the project applications
it runs are not. Additionally, these project applications are
checksummed before they are run, so they can't be patched. This
means we can't make the project applications find required binaries/libraries
on a NixOS system. The solution is therefore to make said binaries
and libraries appear in the expected locations, by wrapping BOINC
in an FHS-compatible environment [1].

An `extraEnvPackages` is also added to allow more packages to
be added into this environment. The documentation for this option
describes some practical use cases for it.

[1] https://nixos.org/nixpkgs/manual/#sec-fhs-environments

Version 2: fixed Docbook list formatting, minor rewording

Version 3: rebase onto master (9c048f4fb6)

Version 4: fix usage of targetPkgs argument to buildFHSUserEnv
2017-11-24 00:41:29 +00:00
Kier Davis c09608f6a8 freesweep: init at 1.0.1
Freesweep is a console minesweeper game.
2017-11-24 00:34:28 +00:00
Kier Davis b81124b4fb Fix hooks not being called when overriding phases in various packages
It's necessary to do this in order to fix ckb's compilation, now that
fixupPhase rejects derivation results containing references to the temporary
build directory. It seems like good practice so I've added it to the
other packages that I maintain.
2017-06-05 19:13:19 +01:00
Kier Davis 5e3a26e07b Fix typo introduced by #22677 2017-02-15 23:44:11 +00:00
Kier Davis 83865b2c6c intel-ocl: init at r4.0-59481 2017-02-07 15:20:30 +03:00
Kier Davis 3aa218edbf ckb: add to module list
Not the first time I've forgotten to do this.
2017-01-17 23:12:21 +00:00
Kier Davis cb4ebb6749 docs: fix a couple of unmatched parentheses 2017-01-12 21:04:20 +00:00
Kier Davis 90b3648f9c i3blocks: search for config in correct system directory
The SYSCONFDIR variable used in the Makefile servers two purposes:

1) During buildPhase, it is hardcoded into the executable as one of
   the locations that will be searched for the i3blocks.conf config
   file. We want this set to "/etc", so that "/etc/i3blocks.conf"
   will be automatically loaded if it exists, as specified in the
   manpage.

2) During installPhase, it specifies the location that the sample
   i3blocks.conf should be installed to. We want this to be "$out/etc".

Case 2 was already handled correctly, but case 1 was not. This resulted
in i3blocks instead searching for i3blocks.conf in the default value of
SYSCONFDIR, which is "/usr/local/etc", a directory which generally does
not exist on NixOS. This commit remedies this problem by setting
SYSCONFDIR=/etc during buildPhase.

A minor stylistic fix (correcting a usage of "makeFlags" to "buildFlags"
in the expression) has also been applied in this commit.
2017-01-12 20:15:15 +00:00
Kier Davis ea7a8bf2d9 ckb: init at 0.2.6
ckb is a driver for Corsair keyboards/mice. It also contains a graphical tool for configuring their LED backlight settings.

The driver is implemented as a userland daemon. A NixOS module is included that runs this as a systemd service.
2017-01-12 18:25:14 +00:00
Kier Davis f3e8a6df6b multimc: update to Java 8 (#21485)
Technically, this changes the version of Java depended on from 7 to
the default, which is currently 7 on darwin and 8 on all other
systems.
2016-12-29 02:33:39 +01:00
Kier Davis d1226333e2 unigine-valley: clean up 2016-12-16 10:42:09 +00:00
Kier Davis aa53e1d17e unigine-valley: exclude non-ELF files from stripping during fix-up 2016-12-16 10:42:09 +00:00
Kier Davis c3f49dcaf0 unigine-valley: install files to a more idiomatic location
Previously, the entire installation was copied to $out/opt/unigine/valley.
Using $out/lib instead of $out/opt would be more consistent with other Nix packages.
2016-12-16 10:42:09 +00:00
Kier Davis 0d1d1bd7e2 unigine-valley: 1.0-1 -> 1.0 (remove unnecessary release version)
The upstream version is "1.0", so that's what the version of the Nix package should be too.
When I packaged this I wasn't aware that a Nix package could update without its version number
increasing, so I added an extra "release version" (like Arch Linux packages). Of course, this
isn't necessary.
2016-12-16 10:42:04 +00:00
Kier Davis 2606994cc6 boinc service: use <link> instead of <ulink> 2016-12-08 15:50:52 +00:00
Kier Davis 2994123161 boinc service: add to module list
The module itself was added in 811c39c6a4,
but it looks like I forgot to reference it to module-list.nix.
2016-12-08 15:46:51 +00:00
Kier Davis 7200424589 hashcat3: init at 3.10 2016-12-07 11:25:32 +00:00
Kier Davis db50ae78d0 boinc service: init 2016-11-22 01:14:40 +00:00
Kier Davis 9f4114a740 samsung-unified-linux-driver_1_00_37: fix build failing due to upstream change in 'cups'
This commit should fix the package building to build due to https://github.com/NixOS/nixpkgs/issues/16238

Printing tested on M2875FD and M2675FN models. Scanning not tested yet due to lack of access of Samsung scanning devices.

All work in this commit is attributed to @jokogr. Content of this commit is basically copied+pasted from https://github.com/jokogr/nixpkgs/commit/c41e771a388dca6cb5f15edab2fd36fd6f96c8a8
2016-11-02 15:13:46 +00:00
Kier Davis a057dfc57f unigine-valley: init at 1.0-1
Closes https://github.com/NixOS/nixpkgs/pull/19813
2016-10-24 19:35:06 -04:00